diff --git a/Stormtrooper/Stormtrooper/DrawningMilitary.cs b/Stormtrooper/Stormtrooper/DrawningMilitary.cs
index 0781a3f..38a28a4 100644
--- a/Stormtrooper/Stormtrooper/DrawningMilitary.cs
+++ b/Stormtrooper/Stormtrooper/DrawningMilitary.cs
@@ -18,6 +18,10 @@ namespace Stormtrooper
/// Признак наличия обвеса
/// Признак наличия антикрыла
/// Признак наличия гоночной полосы
+ public void SetDopColor(Color color)
+ {
+ ((EntityMilitaryStormtrooper)Storm).DopColor = color;
+ }
public DrawningMilitary(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool rocket, bool sportLine) :
base(speed, weight, bodyColor, 135, 100)
{
diff --git a/Stormtrooper/Stormtrooper/EntityMilitaryStormtrooper.cs b/Stormtrooper/Stormtrooper/EntityMilitaryStormtrooper.cs
index e41946a..61bd3eb 100644
--- a/Stormtrooper/Stormtrooper/EntityMilitaryStormtrooper.cs
+++ b/Stormtrooper/Stormtrooper/EntityMilitaryStormtrooper.cs
@@ -11,7 +11,7 @@ namespace Stormtrooper
///
/// Дополнительный цвет
///
- public Color DopColor { get; private set; }
+ public Color DopColor { get; set; }
///
/// Признак наличия обвеса
///
diff --git a/Stormtrooper/Stormtrooper/EntityStormtrooper.cs b/Stormtrooper/Stormtrooper/EntityStormtrooper.cs
index aef3d43..a4d39aa 100644
--- a/Stormtrooper/Stormtrooper/EntityStormtrooper.cs
+++ b/Stormtrooper/Stormtrooper/EntityStormtrooper.cs
@@ -22,7 +22,7 @@ namespace Stormtrooper
///
/// Цвет корпуса
///
- public Color BodyColor { get; private set; }
+ public Color BodyColor { get; set; }
///
/// Шаг перемещения
///
diff --git a/Stormtrooper/Stormtrooper/FormMapWithSetStormtroopers.cs b/Stormtrooper/Stormtrooper/FormMapWithSetStormtroopers.cs
index f956c5d..2da22d7 100644
--- a/Stormtrooper/Stormtrooper/FormMapWithSetStormtroopers.cs
+++ b/Stormtrooper/Stormtrooper/FormMapWithSetStormtroopers.cs
@@ -45,16 +45,21 @@ namespace Stormtrooper
///
///
private void ButtonAddStorm_Click(object sender, EventArgs e)
+ {
+ var formStormConfig = new FormStormtrooperConfig();
+ formStormConfig.AddEvent(AddStormtrooper);
+ formStormConfig.Show();
+ }
+
+ private void AddStormtrooper (Drawning storm)
{
if (listBoxMaps.SelectedIndex == -1)
{
return;
}
- FormStormtrooper form = new();
- if (form.ShowDialog() == DialogResult.OK)
+ DrawningObjectStorm st = new(storm);
{
- DrawningObjectStorm airBomber = new(form.SelectedStormtrooper);
- if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + airBomber != -1)
+ if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + st != -1)
{
MessageBox.Show("Объект добавлен");
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
diff --git a/Stormtrooper/Stormtrooper/FormStormtrooperConfig.Designer.cs b/Stormtrooper/Stormtrooper/FormStormtrooperConfig.Designer.cs
index 039b3fe..bf6b875 100644
--- a/Stormtrooper/Stormtrooper/FormStormtrooperConfig.Designer.cs
+++ b/Stormtrooper/Stormtrooper/FormStormtrooperConfig.Designer.cs
@@ -73,9 +73,11 @@
this.groupBoxConfig.Controls.Add(this.labelWeight);
this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed);
this.groupBoxConfig.Controls.Add(this.labelSpeed);
- this.groupBoxConfig.Location = new System.Drawing.Point(12, 12);
+ this.groupBoxConfig.Location = new System.Drawing.Point(14, 16);
+ this.groupBoxConfig.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.groupBoxConfig.Name = "groupBoxConfig";
- this.groupBoxConfig.Size = new System.Drawing.Size(520, 220);
+ this.groupBoxConfig.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.groupBoxConfig.Size = new System.Drawing.Size(594, 293);
this.groupBoxConfig.TabIndex = 0;
this.groupBoxConfig.TabStop = false;
this.groupBoxConfig.Text = "Параметры";
@@ -83,9 +85,9 @@
// labelModifiedObject
//
this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.labelModifiedObject.Location = new System.Drawing.Point(394, 162);
+ this.labelModifiedObject.Location = new System.Drawing.Point(450, 216);
this.labelModifiedObject.Name = "labelModifiedObject";
- this.labelModifiedObject.Size = new System.Drawing.Size(97, 38);
+ this.labelModifiedObject.Size = new System.Drawing.Size(111, 50);
this.labelModifiedObject.TabIndex = 16;
this.labelModifiedObject.Text = "Продвинутый";
this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -94,9 +96,9 @@
// labelSimpleObject
//
this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.labelSimpleObject.Location = new System.Drawing.Point(282, 162);
+ this.labelSimpleObject.Location = new System.Drawing.Point(322, 216);
this.labelSimpleObject.Name = "labelSimpleObject";
- this.labelSimpleObject.Size = new System.Drawing.Size(97, 38);
+ this.labelSimpleObject.Size = new System.Drawing.Size(111, 50);
this.labelSimpleObject.TabIndex = 15;
this.labelSimpleObject.Text = "Простой";
this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -112,9 +114,11 @@
this.groupBoxColors.Controls.Add(this.panelGreen);
this.groupBoxColors.Controls.Add(this.panelWhite);
this.groupBoxColors.Controls.Add(this.panelRed);
- this.groupBoxColors.Location = new System.Drawing.Point(267, 22);
+ this.groupBoxColors.Location = new System.Drawing.Point(305, 29);
+ this.groupBoxColors.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.groupBoxColors.Name = "groupBoxColors";
- this.groupBoxColors.Size = new System.Drawing.Size(241, 127);
+ this.groupBoxColors.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.groupBoxColors.Size = new System.Drawing.Size(275, 169);
this.groupBoxColors.TabIndex = 14;
this.groupBoxColors.TabStop = false;
this.groupBoxColors.Text = "Цвета";
@@ -122,83 +126,101 @@
// panelPurple
//
this.panelPurple.BackColor = System.Drawing.Color.Purple;
- this.panelPurple.Location = new System.Drawing.Point(184, 73);
+ this.panelPurple.Location = new System.Drawing.Point(210, 97);
+ this.panelPurple.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelPurple.Name = "panelPurple";
- this.panelPurple.Size = new System.Drawing.Size(40, 40);
+ this.panelPurple.Size = new System.Drawing.Size(46, 53);
this.panelPurple.TabIndex = 3;
+ this.panelPurple.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
//
// panelYellow
//
this.panelYellow.BackColor = System.Drawing.Color.Yellow;
- this.panelYellow.Location = new System.Drawing.Point(184, 22);
+ this.panelYellow.Location = new System.Drawing.Point(210, 29);
+ this.panelYellow.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelYellow.Name = "panelYellow";
- this.panelYellow.Size = new System.Drawing.Size(40, 40);
+ this.panelYellow.Size = new System.Drawing.Size(46, 53);
this.panelYellow.TabIndex = 1;
+ this.panelYellow.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
//
// panelBlack
//
this.panelBlack.BackColor = System.Drawing.Color.Black;
- this.panelBlack.Location = new System.Drawing.Point(127, 73);
+ this.panelBlack.Location = new System.Drawing.Point(145, 97);
+ this.panelBlack.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelBlack.Name = "panelBlack";
- this.panelBlack.Size = new System.Drawing.Size(40, 40);
+ this.panelBlack.Size = new System.Drawing.Size(46, 53);
this.panelBlack.TabIndex = 4;
+ this.panelBlack.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
//
// panelBlue
//
this.panelBlue.BackColor = System.Drawing.Color.Blue;
- this.panelBlue.Location = new System.Drawing.Point(127, 22);
+ this.panelBlue.Location = new System.Drawing.Point(145, 29);
+ this.panelBlue.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelBlue.Name = "panelBlue";
- this.panelBlue.Size = new System.Drawing.Size(40, 40);
+ this.panelBlue.Size = new System.Drawing.Size(46, 53);
this.panelBlue.TabIndex = 1;
+ this.panelBlue.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
//
// panelGray
//
this.panelGray.BackColor = System.Drawing.Color.Gray;
- this.panelGray.Location = new System.Drawing.Point(72, 73);
+ this.panelGray.Location = new System.Drawing.Point(82, 97);
+ this.panelGray.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelGray.Name = "panelGray";
- this.panelGray.Size = new System.Drawing.Size(40, 40);
+ this.panelGray.Size = new System.Drawing.Size(46, 53);
this.panelGray.TabIndex = 5;
+ this.panelGray.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
//
// panelGreen
//
this.panelGreen.BackColor = System.Drawing.Color.Green;
- this.panelGreen.Location = new System.Drawing.Point(72, 22);
+ this.panelGreen.Location = new System.Drawing.Point(82, 29);
+ this.panelGreen.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelGreen.Name = "panelGreen";
- this.panelGreen.Size = new System.Drawing.Size(40, 40);
+ this.panelGreen.Size = new System.Drawing.Size(46, 53);
this.panelGreen.TabIndex = 1;
+ this.panelGreen.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
//
// panelWhite
//
this.panelWhite.BackColor = System.Drawing.Color.White;
- this.panelWhite.Location = new System.Drawing.Point(15, 73);
+ this.panelWhite.Location = new System.Drawing.Point(17, 97);
+ this.panelWhite.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelWhite.Name = "panelWhite";
- this.panelWhite.Size = new System.Drawing.Size(40, 40);
+ this.panelWhite.Size = new System.Drawing.Size(46, 53);
this.panelWhite.TabIndex = 2;
+ this.panelWhite.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
//
// panelRed
//
this.panelRed.BackColor = System.Drawing.Color.Red;
- this.panelRed.Location = new System.Drawing.Point(15, 22);
+ this.panelRed.Location = new System.Drawing.Point(17, 29);
+ this.panelRed.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelRed.Name = "panelRed";
- this.panelRed.Size = new System.Drawing.Size(40, 40);
+ this.panelRed.Size = new System.Drawing.Size(46, 53);
this.panelRed.TabIndex = 0;
+ this.panelRed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
//
// checkBoxSportLine
//
this.checkBoxSportLine.AutoSize = true;
- this.checkBoxSportLine.Location = new System.Drawing.Point(22, 185);
+ this.checkBoxSportLine.Location = new System.Drawing.Point(25, 247);
+ this.checkBoxSportLine.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.checkBoxSportLine.Name = "checkBoxSportLine";
- this.checkBoxSportLine.Size = new System.Drawing.Size(226, 19);
+ this.checkBoxSportLine.Size = new System.Drawing.Size(283, 24);
this.checkBoxSportLine.TabIndex = 13;
this.checkBoxSportLine.Text = "Признак наличия гоночной полосы";
this.checkBoxSportLine.UseVisualStyleBackColor = true;
//
- // checkBoxWing
+ // checkBoxRocket
//
this.checkBoxRocket.AutoSize = true;
- this.checkBoxRocket.Location = new System.Drawing.Point(22, 149);
- this.checkBoxRocket.Name = "checkBoxWing";
- this.checkBoxRocket.Size = new System.Drawing.Size(186, 19);
+ this.checkBoxRocket.Location = new System.Drawing.Point(25, 199);
+ this.checkBoxRocket.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.checkBoxRocket.Name = "checkBoxRocket";
+ this.checkBoxRocket.Size = new System.Drawing.Size(196, 24);
this.checkBoxRocket.TabIndex = 12;
this.checkBoxRocket.Text = "Признак наличия ракет";
this.checkBoxRocket.UseVisualStyleBackColor = true;
@@ -206,16 +228,18 @@
// checkBoxBodyKit
//
this.checkBoxBodyKit.AutoSize = true;
- this.checkBoxBodyKit.Location = new System.Drawing.Point(22, 115);
+ this.checkBoxBodyKit.Location = new System.Drawing.Point(25, 153);
+ this.checkBoxBodyKit.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.checkBoxBodyKit.Name = "checkBoxBodyKit";
- this.checkBoxBodyKit.Size = new System.Drawing.Size(164, 19);
+ this.checkBoxBodyKit.Size = new System.Drawing.Size(198, 24);
this.checkBoxBodyKit.TabIndex = 11;
this.checkBoxBodyKit.Text = "Признак наличия винта";
this.checkBoxBodyKit.UseVisualStyleBackColor = true;
//
// numericUpDownWeight
//
- this.numericUpDownWeight.Location = new System.Drawing.Point(90, 72);
+ this.numericUpDownWeight.Location = new System.Drawing.Point(103, 96);
+ this.numericUpDownWeight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.numericUpDownWeight.Maximum = new decimal(new int[] {
1000,
0,
@@ -227,7 +251,7 @@
0,
0});
this.numericUpDownWeight.Name = "numericUpDownWeight";
- this.numericUpDownWeight.Size = new System.Drawing.Size(79, 23);
+ this.numericUpDownWeight.Size = new System.Drawing.Size(90, 27);
this.numericUpDownWeight.TabIndex = 10;
this.numericUpDownWeight.Value = new decimal(new int[] {
100,
@@ -238,15 +262,16 @@
// labelWeight
//
this.labelWeight.AutoSize = true;
- this.labelWeight.Location = new System.Drawing.Point(22, 74);
+ this.labelWeight.Location = new System.Drawing.Point(25, 99);
this.labelWeight.Name = "labelWeight";
- this.labelWeight.Size = new System.Drawing.Size(29, 15);
+ this.labelWeight.Size = new System.Drawing.Size(36, 20);
this.labelWeight.TabIndex = 9;
this.labelWeight.Text = "Вес:";
//
// numericUpDownSpeed
//
- this.numericUpDownSpeed.Location = new System.Drawing.Point(90, 30);
+ this.numericUpDownSpeed.Location = new System.Drawing.Point(103, 40);
+ this.numericUpDownSpeed.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.numericUpDownSpeed.Maximum = new decimal(new int[] {
1000,
0,
@@ -258,7 +283,7 @@
0,
0});
this.numericUpDownSpeed.Name = "numericUpDownSpeed";
- this.numericUpDownSpeed.Size = new System.Drawing.Size(79, 23);
+ this.numericUpDownSpeed.Size = new System.Drawing.Size(90, 27);
this.numericUpDownSpeed.TabIndex = 8;
this.numericUpDownSpeed.Value = new decimal(new int[] {
100,
@@ -269,9 +294,9 @@
// labelSpeed
//
this.labelSpeed.AutoSize = true;
- this.labelSpeed.Location = new System.Drawing.Point(22, 32);
+ this.labelSpeed.Location = new System.Drawing.Point(25, 43);
this.labelSpeed.Name = "labelSpeed";
- this.labelSpeed.Size = new System.Drawing.Size(62, 15);
+ this.labelSpeed.Size = new System.Drawing.Size(76, 20);
this.labelSpeed.TabIndex = 7;
this.labelSpeed.Text = "Скорость:";
//
@@ -281,9 +306,10 @@
this.panelObject.Controls.Add(this.labelDopColor);
this.panelObject.Controls.Add(this.labelBaseColor);
this.panelObject.Controls.Add(this.pictureBoxObject);
- this.panelObject.Location = new System.Drawing.Point(538, 12);
+ this.panelObject.Location = new System.Drawing.Point(615, 16);
+ this.panelObject.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelObject.Name = "panelObject";
- this.panelObject.Size = new System.Drawing.Size(262, 184);
+ this.panelObject.Size = new System.Drawing.Size(299, 245);
this.panelObject.TabIndex = 2;
this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop);
this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter);
@@ -292,46 +318,53 @@
//
this.labelDopColor.AllowDrop = true;
this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.labelDopColor.Location = new System.Drawing.Point(141, 9);
+ this.labelDopColor.Location = new System.Drawing.Point(161, 12);
this.labelDopColor.Name = "labelDopColor";
- this.labelDopColor.Size = new System.Drawing.Size(104, 32);
+ this.labelDopColor.Size = new System.Drawing.Size(119, 42);
this.labelDopColor.TabIndex = 2;
this.labelDopColor.Text = "Доп. цвет";
this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop);
+ this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter);
//
// labelBaseColor
//
this.labelBaseColor.AllowDrop = true;
this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.labelBaseColor.Location = new System.Drawing.Point(20, 9);
+ this.labelBaseColor.Location = new System.Drawing.Point(23, 12);
this.labelBaseColor.Name = "labelBaseColor";
- this.labelBaseColor.Size = new System.Drawing.Size(104, 32);
+ this.labelBaseColor.Size = new System.Drawing.Size(119, 42);
this.labelBaseColor.TabIndex = 1;
this.labelBaseColor.Text = "Цвет";
this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop);
+ this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter);
//
// pictureBoxObject
//
- this.pictureBoxObject.Location = new System.Drawing.Point(20, 44);
+ this.pictureBoxObject.Location = new System.Drawing.Point(23, 59);
+ this.pictureBoxObject.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pictureBoxObject.Name = "pictureBoxObject";
- this.pictureBoxObject.Size = new System.Drawing.Size(225, 125);
+ this.pictureBoxObject.Size = new System.Drawing.Size(257, 167);
this.pictureBoxObject.TabIndex = 0;
this.pictureBoxObject.TabStop = false;
//
// buttonCancel
//
- this.buttonCancel.Location = new System.Drawing.Point(679, 202);
+ this.buttonCancel.Location = new System.Drawing.Point(776, 269);
+ this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.buttonCancel.Name = "buttonCancel";
- this.buttonCancel.Size = new System.Drawing.Size(104, 30);
+ this.buttonCancel.Size = new System.Drawing.Size(119, 40);
this.buttonCancel.TabIndex = 5;
this.buttonCancel.Text = "Отмена";
this.buttonCancel.UseVisualStyleBackColor = true;
//
// buttonOk
//
- this.buttonOk.Location = new System.Drawing.Point(558, 202);
+ this.buttonOk.Location = new System.Drawing.Point(638, 269);
+ this.buttonOk.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.buttonOk.Name = "buttonOk";
- this.buttonOk.Size = new System.Drawing.Size(104, 30);
+ this.buttonOk.Size = new System.Drawing.Size(119, 40);
this.buttonOk.TabIndex = 4;
this.buttonOk.Text = "Добавить";
this.buttonOk.UseVisualStyleBackColor = true;
@@ -339,13 +372,14 @@
//
// FormStormtrooperConfig
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(810, 242);
+ this.ClientSize = new System.Drawing.Size(926, 323);
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonOk);
this.Controls.Add(this.panelObject);
this.Controls.Add(this.groupBoxConfig);
+ this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.Name = "FormStormtrooperConfig";
this.Text = "Создание объекта";
this.groupBoxConfig.ResumeLayout(false);
@@ -356,6 +390,7 @@
this.panelObject.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit();
this.ResumeLayout(false);
+
}
#endregion
diff --git a/Stormtrooper/Stormtrooper/FormStormtrooperConfig.cs b/Stormtrooper/Stormtrooper/FormStormtrooperConfig.cs
index 0b449c4..a12211d 100644
--- a/Stormtrooper/Stormtrooper/FormStormtrooperConfig.cs
+++ b/Stormtrooper/Stormtrooper/FormStormtrooperConfig.cs
@@ -42,7 +42,7 @@ namespace Stormtrooper
panelYellow.MouseDown += PanelColor_MouseDown;
panelBlue.MouseDown += PanelColor_MouseDown;
- // TODO buttonCancel.Click with lambda
+ buttonCancel.Click += (object sender, EventArgs a) => Close();
}
///
/// Отрисовать машину
@@ -51,7 +51,7 @@ namespace Stormtrooper
{
Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
Graphics gr = Graphics.FromImage(bmp);
- _storm?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height);
+ _storm?.SetPosition(5, 105, pictureBoxObject.Width, pictureBoxObject.Height);
_storm?.DrawTransport(gr);
pictureBoxObject.Image = bmp;
}
@@ -146,7 +146,16 @@ namespace Stormtrooper
///
private void LabelBaseColor_DragDrop(object sender, DragEventArgs e)
{
- // TODO Call method from object _car and set color
+ var color = e.Data.GetData(typeof(Color));
+ if (color != null)
+ {
+ (sender as Label).BackColor = (Color)color;
+ }
+ if (_storm != null)
+ {
+ _storm.Storm.BodyColor = (Color)color;
+ DrawStorm();
+ }
}
///
/// Принимаем дополнительный цвет
@@ -155,7 +164,20 @@ namespace Stormtrooper
///
private void LabelDopColor_DragDrop(object sender, DragEventArgs e)
{
- // TODO Call method from object _car if _car is DrawningSportCar and set dop color
+ var color = e.Data.GetData(typeof(Color));
+ if (color != null)
+ {
+ (sender as Label).BackColor = (Color)color;
+ }
+ if (_storm != null)
+ {
+ if (_storm is DrawningMilitary storm)
+ {
+ storm.SetDopColor((Color)color);
+ DrawStorm();
+ }
+ DrawStorm();
+ }
}
///
/// Добавление машины
diff --git a/Stormtrooper/Stormtrooper/FormStormtrooperConfig.resx b/Stormtrooper/Stormtrooper/FormStormtrooperConfig.resx
index 1af7de1..f298a7b 100644
--- a/Stormtrooper/Stormtrooper/FormStormtrooperConfig.resx
+++ b/Stormtrooper/Stormtrooper/FormStormtrooperConfig.resx
@@ -1,64 +1,4 @@
-
-
-
+