Merge branch 'LabWork_05' into LabWork_06
This commit is contained in:
commit
f3ce9dd416
@ -57,7 +57,7 @@ namespace Catamaran
|
||||
private void buttonCreateSailCatamaran_Click(object sender, EventArgs e)
|
||||
{
|
||||
Random random = new();
|
||||
//ё TODO выбор основного цвета
|
||||
//TODO выбор основного цвета
|
||||
Color color = Color.FromArgb(random.Next(0, 256),
|
||||
random.Next(0, 256), random.Next(0, 256));
|
||||
ColorDialog dialogColor = new();
|
||||
|
@ -118,7 +118,7 @@ namespace Catamaran
|
||||
case "labelModifiedObject":
|
||||
_catamaran = new DrawningSailCatamaran((int)numericUpDownSpeed.Value,
|
||||
(int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxSail.Checked,
|
||||
checkBoxFloatDetails.Checked, pictureBoxObject.Width,
|
||||
checkBoxFloatDetails.Checked, pictureBoxObject.Width,
|
||||
pictureBoxObject.Height);
|
||||
break;
|
||||
}
|
||||
@ -164,6 +164,7 @@ namespace Catamaran
|
||||
EventAddCatamaran?.Invoke(_catamaran);
|
||||
Close();
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user