diff --git a/Stormtrooper/Stormtrooper/Drawnings/DrawningStormtrooper.cs b/Stormtrooper/Stormtrooper/Drawnings/DrawningStormtrooper.cs
index 21d7fab..aeabdad 100644
--- a/Stormtrooper/Stormtrooper/Drawnings/DrawningStormtrooper.cs
+++ b/Stormtrooper/Stormtrooper/Drawnings/DrawningStormtrooper.cs
@@ -20,11 +20,10 @@ public class DrawningStormtrooper : DrawningAircraft
/// Дополнительный цвет
/// Признак наличия ракет
/// Признак наличия бомбы
- /// Признак наличия крыла
public DrawningStormtrooper(int speed, double weight, Color bodyColor, Color
- additionalColor, bool rocket, bool bomb, bool wing) : base(140,135)
+ additionalColor, bool rocket, bool bomb) : base(140,135)
{
- EntityAircraft = new EntityStormtrooper(speed, weight, bodyColor, additionalColor, rocket, bomb, wing);
+ EntityAircraft = new EntityStormtrooper(speed, weight, bodyColor, additionalColor, rocket, bomb);
}
diff --git a/Stormtrooper/Stormtrooper/Entities/EntityAircraft.cs b/Stormtrooper/Stormtrooper/Entities/EntityAircraft.cs
index c81d626..985683d 100644
--- a/Stormtrooper/Stormtrooper/Entities/EntityAircraft.cs
+++ b/Stormtrooper/Stormtrooper/Entities/EntityAircraft.cs
@@ -17,6 +17,10 @@ public class EntityAircraft
// вес
public Color BodyColor { get; private set; }
// цвет
+ public void SetBodyColor(Color bodyColor)
+ {
+ BodyColor = bodyColor;
+ }
public double Step => Speed * 100 / Weight;
// шаг в поле
/// Конструктор сущности
diff --git a/Stormtrooper/Stormtrooper/Entities/EntityStormtrooper.cs b/Stormtrooper/Stormtrooper/Entities/EntityStormtrooper.cs
index bbc70c5..b7ebe92 100644
--- a/Stormtrooper/Stormtrooper/Entities/EntityStormtrooper.cs
+++ b/Stormtrooper/Stormtrooper/Entities/EntityStormtrooper.cs
@@ -15,13 +15,17 @@ public class EntityStormtrooper : EntityAircraft
public Color BodyColor { get; private set; }
// цвет
public Color AdditionalColor { get; private set; }
+
+ public void SetAdditionalColor(Color additionalColor)
+ {
+ AdditionalColor = additionalColor;
+ }
// дополнительные цвета
public bool Rocket { get; private set; }
// ракета
public bool Bomb { get; private set; }
// бомба
- public bool Wing { get; private set; }
- // крыло
+
/// Инициализация полей объекта-класса штурмовика
@@ -31,14 +35,12 @@ public class EntityStormtrooper : EntityAircraft
/// Дополнительный цвет
/// Признак наличия ракет
/// Признак наличия бомб
- /// Признак наличия крыла а
public EntityStormtrooper(int speed, double weight, Color bodyColor, Color
- additionalColor, bool rocket, bool bomb, bool wing) : base(speed, weight, bodyColor)
+ additionalColor, bool rocket, bool bomb) : base(speed, weight, bodyColor)
{
AdditionalColor = additionalColor;
Rocket = rocket;
Bomb = bomb;
- Wing = wing;
}
}
diff --git a/Stormtrooper/Stormtrooper/FormAircraftCollection.Designer.cs b/Stormtrooper/Stormtrooper/FormAircraftCollection.Designer.cs
index 13b8629..b5f3397 100644
--- a/Stormtrooper/Stormtrooper/FormAircraftCollection.Designer.cs
+++ b/Stormtrooper/Stormtrooper/FormAircraftCollection.Designer.cs
@@ -29,6 +29,12 @@
private void InitializeComponent()
{
groupBoxTools = new GroupBox();
+ panelCompanyTools = new Panel();
+ buttonAddAiracft = new Button();
+ buttonRefresh = new Button();
+ maskedTextBox = new MaskedTextBox();
+ buttonGoToCheck = new Button();
+ buttonRemoveAircraft = new Button();
buttonCreateCompany = new Button();
panelStorage = new Panel();
buttonCollectionDel = new Button();
@@ -38,19 +44,12 @@
radioButtonMassive = new RadioButton();
textBoxCollectionName = new TextBox();
labelCollectionName = new Label();
- buttonRefresh = new Button();
- buttonGoToCheck = new Button();
- buttonRemoveAircraft = new Button();
- maskedTextBox = new MaskedTextBox();
- buttonAddStormtrooper = new Button();
- buttonAddAiracft = new Button();
comboBoxSelectorCompany = new ComboBox();
pictureBox = new PictureBox();
- panelCompanyTools = new Panel();
groupBoxTools.SuspendLayout();
+ panelCompanyTools.SuspendLayout();
panelStorage.SuspendLayout();
((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
- panelCompanyTools.SuspendLayout();
SuspendLayout();
//
// groupBoxTools
@@ -68,6 +67,73 @@
groupBoxTools.Tag = "";
groupBoxTools.Text = "Инструменты";
//
+ // panelCompanyTools
+ //
+ panelCompanyTools.Controls.Add(buttonAddAiracft);
+ panelCompanyTools.Controls.Add(buttonRefresh);
+ panelCompanyTools.Controls.Add(maskedTextBox);
+ panelCompanyTools.Controls.Add(buttonGoToCheck);
+ panelCompanyTools.Controls.Add(buttonRemoveAircraft);
+ panelCompanyTools.Enabled = false;
+ panelCompanyTools.Location = new Point(3, 391);
+ panelCompanyTools.Name = "panelCompanyTools";
+ panelCompanyTools.Size = new Size(258, 286);
+ panelCompanyTools.TabIndex = 9;
+ //
+ // buttonAddAiracft
+ //
+ buttonAddAiracft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonAddAiracft.Location = new Point(3, 3);
+ buttonAddAiracft.Name = "buttonAddAiracft";
+ buttonAddAiracft.Size = new Size(252, 41);
+ buttonAddAiracft.TabIndex = 1;
+ buttonAddAiracft.Text = "Добавление самолета";
+ buttonAddAiracft.UseVisualStyleBackColor = true;
+ buttonAddAiracft.Click += ButtonAddAircraft_Click;
+ //
+ // buttonRefresh
+ //
+ buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonRefresh.Location = new Point(3, 224);
+ buttonRefresh.Name = "buttonRefresh";
+ buttonRefresh.Size = new Size(252, 41);
+ buttonRefresh.TabIndex = 6;
+ buttonRefresh.Text = "Обновить";
+ buttonRefresh.UseVisualStyleBackColor = true;
+ buttonRefresh.Click += ButtonRefresh_Click;
+ //
+ // maskedTextBox
+ //
+ maskedTextBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ maskedTextBox.Location = new Point(3, 97);
+ maskedTextBox.Mask = "00";
+ maskedTextBox.Name = "maskedTextBox";
+ maskedTextBox.Size = new Size(252, 27);
+ maskedTextBox.TabIndex = 3;
+ maskedTextBox.ValidatingType = typeof(int);
+ //
+ // buttonGoToCheck
+ //
+ buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonGoToCheck.Location = new Point(3, 177);
+ buttonGoToCheck.Name = "buttonGoToCheck";
+ buttonGoToCheck.Size = new Size(252, 41);
+ buttonGoToCheck.TabIndex = 5;
+ buttonGoToCheck.Text = "Передать на тесты";
+ buttonGoToCheck.UseVisualStyleBackColor = true;
+ buttonGoToCheck.Click += ButtonGoToCheck_Click;
+ //
+ // buttonRemoveAircraft
+ //
+ buttonRemoveAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonRemoveAircraft.Location = new Point(3, 130);
+ buttonRemoveAircraft.Name = "buttonRemoveAircraft";
+ buttonRemoveAircraft.Size = new Size(252, 41);
+ buttonRemoveAircraft.TabIndex = 4;
+ buttonRemoveAircraft.Text = "Удалить самолет";
+ buttonRemoveAircraft.UseVisualStyleBackColor = true;
+ buttonRemoveAircraft.Click += ButtonRemoveAircraft_Click;
+ //
// buttonCreateCompany
//
buttonCreateCompany.Location = new Point(6, 356);
@@ -160,71 +226,6 @@
labelCollectionName.TabIndex = 0;
labelCollectionName.Text = "Название коллекции:";
//
- // buttonRefresh
- //
- buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
- buttonRefresh.Location = new Point(3, 224);
- buttonRefresh.Name = "buttonRefresh";
- buttonRefresh.Size = new Size(252, 41);
- buttonRefresh.TabIndex = 6;
- buttonRefresh.Text = "Обновить";
- buttonRefresh.UseVisualStyleBackColor = true;
- buttonRefresh.Click += ButtonRefresh_Click;
- //
- // buttonGoToCheck
- //
- buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
- buttonGoToCheck.Location = new Point(3, 177);
- buttonGoToCheck.Name = "buttonGoToCheck";
- buttonGoToCheck.Size = new Size(252, 41);
- buttonGoToCheck.TabIndex = 5;
- buttonGoToCheck.Text = "Передать на тесты";
- buttonGoToCheck.UseVisualStyleBackColor = true;
- buttonGoToCheck.Click += ButtonGoToCheck_Click;
- //
- // buttonRemoveAircraft
- //
- buttonRemoveAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
- buttonRemoveAircraft.Location = new Point(3, 130);
- buttonRemoveAircraft.Name = "buttonRemoveAircraft";
- buttonRemoveAircraft.Size = new Size(252, 41);
- buttonRemoveAircraft.TabIndex = 4;
- buttonRemoveAircraft.Text = "Удалить самолет";
- buttonRemoveAircraft.UseVisualStyleBackColor = true;
- buttonRemoveAircraft.Click += ButtonRemoveAircraft_Click;
- //
- // maskedTextBox
- //
- maskedTextBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
- maskedTextBox.Location = new Point(3, 97);
- maskedTextBox.Mask = "00";
- maskedTextBox.Name = "maskedTextBox";
- maskedTextBox.Size = new Size(252, 27);
- maskedTextBox.TabIndex = 3;
- maskedTextBox.ValidatingType = typeof(int);
- //
- // buttonAddStormtrooper
- //
- buttonAddStormtrooper.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
- buttonAddStormtrooper.Location = new Point(3, 50);
- buttonAddStormtrooper.Name = "buttonAddStormtrooper";
- buttonAddStormtrooper.Size = new Size(252, 41);
- buttonAddStormtrooper.TabIndex = 2;
- buttonAddStormtrooper.Text = "Добавление штурмовика";
- buttonAddStormtrooper.UseVisualStyleBackColor = true;
- buttonAddStormtrooper.Click += ButtonAddStormtrooper_Click;
- //
- // buttonAddAiracft
- //
- buttonAddAiracft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
- buttonAddAiracft.Location = new Point(3, 3);
- buttonAddAiracft.Name = "buttonAddAiracft";
- buttonAddAiracft.Size = new Size(252, 41);
- buttonAddAiracft.TabIndex = 1;
- buttonAddAiracft.Text = "Добавление самолета";
- buttonAddAiracft.UseVisualStyleBackColor = true;
- buttonAddAiracft.Click += ButtonAddAircraft_Click;
- //
// comboBoxSelectorCompany
//
comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
@@ -246,20 +247,6 @@
pictureBox.TabIndex = 1;
pictureBox.TabStop = false;
//
- // panelCompanyTools
- //
- panelCompanyTools.Controls.Add(buttonAddStormtrooper);
- panelCompanyTools.Controls.Add(buttonAddAiracft);
- panelCompanyTools.Controls.Add(buttonRefresh);
- panelCompanyTools.Controls.Add(maskedTextBox);
- panelCompanyTools.Controls.Add(buttonGoToCheck);
- panelCompanyTools.Controls.Add(buttonRemoveAircraft);
- panelCompanyTools.Enabled = false;
- panelCompanyTools.Location = new Point(3, 391);
- panelCompanyTools.Name = "panelCompanyTools";
- panelCompanyTools.Size = new Size(258, 286);
- panelCompanyTools.TabIndex = 9;
- //
// FormAircraftCollection
//
AutoScaleDimensions = new SizeF(8F, 20F);
@@ -270,11 +257,11 @@
Name = "FormAircraftCollection";
Text = "Коллекция самолетов";
groupBoxTools.ResumeLayout(false);
+ panelCompanyTools.ResumeLayout(false);
+ panelCompanyTools.PerformLayout();
panelStorage.ResumeLayout(false);
panelStorage.PerformLayout();
((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
- panelCompanyTools.ResumeLayout(false);
- panelCompanyTools.PerformLayout();
ResumeLayout(false);
}
@@ -282,7 +269,6 @@
private GroupBox groupBoxTools;
private ComboBox comboBoxSelectorCompany;
- private Button buttonAddStormtrooper;
private Button buttonAddAiracft;
private Button buttonRemoveAircraft;
private MaskedTextBox maskedTextBox;
diff --git a/Stormtrooper/Stormtrooper/FormAircraftCollection.cs b/Stormtrooper/Stormtrooper/FormAircraftCollection.cs
index fe42575..4921c6b 100644
--- a/Stormtrooper/Stormtrooper/FormAircraftCollection.cs
+++ b/Stormtrooper/Stormtrooper/FormAircraftCollection.cs
@@ -58,7 +58,7 @@ public partial class FormAircraftCollection : Form
break;
case nameof(DrawningStormtrooper):
drawningAircraft = new DrawningStormtrooper(random.Next(100, 300), random.Next(1000, 3000),
- GetColor(random), GetColor(random), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+ GetColor(random), GetColor(random), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
break;
default:
return;
diff --git a/Stormtrooper/Stormtrooper/FormAircraftConfig.Designer.cs b/Stormtrooper/Stormtrooper/FormAircraftConfig.Designer.cs
index afcdef7..597c9be 100644
--- a/Stormtrooper/Stormtrooper/FormAircraftConfig.Designer.cs
+++ b/Stormtrooper/Stormtrooper/FormAircraftConfig.Designer.cs
@@ -29,32 +29,33 @@
private void InitializeComponent()
{
groupBoxConfig = new GroupBox();
- labelSimpleObject = new Label();
- label1 = new Label();
- labelSpeed = new Label();
- numericUpDownSpeed = new NumericUpDown();
- labelWeight = new Label();
- numericUpDownWeight = new NumericUpDown();
- checkBoxRocket = new CheckBox();
- checkBoxWing = new CheckBox();
- checkBoxBomb = new CheckBox();
groupBoxColors = new GroupBox();
- panelRed = new Panel();
- panelYellow = new Panel();
- panelGreen = new Panel();
- panelBlue = new Panel();
- panelWhite = new Panel();
- panelGray = new Panel();
- panelBlack = new Panel();
panelPurple = new Panel();
+ panelBlack = new Panel();
+ panelGray = new Panel();
+ panelWhite = new Panel();
+ panelBlue = new Panel();
+ panelGreen = new Panel();
+ panelYellow = new Panel();
+ panelRed = new Panel();
+ checkBoxBomb = new CheckBox();
+ checkBoxRocket = new CheckBox();
+ numericUpDownWeight = new NumericUpDown();
+ labelWeight = new Label();
+ numericUpDownSpeed = new NumericUpDown();
+ labelSpeed = new Label();
+ label1 = new Label();
+ labelSimpleObject = new Label();
pictureBoxObject = new PictureBox();
buttonCancel = new Button();
button2 = new Button();
panelObject = new Panel();
+ labelAdditionalColor = new Label();
+ labelBodyColor = new Label();
groupBoxConfig.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
- ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
groupBoxColors.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
panelObject.SuspendLayout();
SuspendLayout();
@@ -63,7 +64,6 @@
//
groupBoxConfig.Controls.Add(groupBoxColors);
groupBoxConfig.Controls.Add(checkBoxBomb);
- groupBoxConfig.Controls.Add(checkBoxWing);
groupBoxConfig.Controls.Add(checkBoxRocket);
groupBoxConfig.Controls.Add(numericUpDownWeight);
groupBoxConfig.Controls.Add(labelWeight);
@@ -79,97 +79,6 @@
groupBoxConfig.TabStop = false;
groupBoxConfig.Text = "Параметры";
//
- // labelSimpleObject
- //
- labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
- labelSimpleObject.Location = new Point(254, 179);
- labelSimpleObject.Name = "labelSimpleObject";
- labelSimpleObject.Size = new Size(162, 36);
- labelSimpleObject.TabIndex = 0;
- labelSimpleObject.Text = "Простой объект";
- labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
- //
- // label1
- //
- label1.BorderStyle = BorderStyle.FixedSingle;
- label1.Location = new Point(422, 179);
- label1.Name = "label1";
- label1.Size = new Size(162, 36);
- label1.TabIndex = 1;
- label1.Text = "Продвинутый объект";
- label1.TextAlign = ContentAlignment.MiddleCenter;
- //
- // labelSpeed
- //
- labelSpeed.AutoSize = true;
- labelSpeed.Location = new Point(12, 34);
- labelSpeed.Name = "labelSpeed";
- labelSpeed.Size = new Size(76, 20);
- labelSpeed.TabIndex = 2;
- labelSpeed.Text = "Скорость:";
- labelSpeed.Click += labelSpeed_Click;
- //
- // numericUpDownSpeed
- //
- numericUpDownSpeed.Location = new Point(103, 34);
- numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
- numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
- numericUpDownSpeed.Name = "numericUpDownSpeed";
- numericUpDownSpeed.Size = new Size(122, 27);
- numericUpDownSpeed.TabIndex = 3;
- numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
- numericUpDownSpeed.ValueChanged += numericUpDownSpeed_ValueChanged;
- //
- // labelWeight
- //
- labelWeight.AutoSize = true;
- labelWeight.Location = new Point(12, 69);
- labelWeight.Name = "labelWeight";
- labelWeight.Size = new Size(36, 20);
- labelWeight.TabIndex = 4;
- labelWeight.Text = "Вес:";
- //
- // numericUpDownWeight
- //
- numericUpDownWeight.Location = new Point(103, 69);
- numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
- numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
- numericUpDownWeight.Name = "numericUpDownWeight";
- numericUpDownWeight.Size = new Size(122, 27);
- numericUpDownWeight.TabIndex = 5;
- numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
- //
- // checkBoxRocket
- //
- checkBoxRocket.AutoSize = true;
- checkBoxRocket.Location = new Point(20, 131);
- checkBoxRocket.Name = "checkBoxRocket";
- checkBoxRocket.Size = new Size(196, 24);
- checkBoxRocket.TabIndex = 6;
- checkBoxRocket.Text = "Признак наличия ракет";
- checkBoxRocket.UseVisualStyleBackColor = true;
- //
- // checkBoxWing
- //
- checkBoxWing.AutoSize = true;
- checkBoxWing.Location = new Point(20, 191);
- checkBoxWing.Name = "checkBoxWing";
- checkBoxWing.Size = new Size(205, 24);
- checkBoxWing.TabIndex = 7;
- checkBoxWing.Text = "Признак наличия крыла ";
- checkBoxWing.UseVisualStyleBackColor = true;
- checkBoxWing.CheckedChanged += checkBox1_CheckedChanged;
- //
- // checkBoxBomb
- //
- checkBoxBomb.AutoSize = true;
- checkBoxBomb.Location = new Point(20, 161);
- checkBoxBomb.Name = "checkBoxBomb";
- checkBoxBomb.Size = new Size(196, 24);
- checkBoxBomb.TabIndex = 8;
- checkBoxBomb.Text = "Признак наличия бомб";
- checkBoxBomb.UseVisualStyleBackColor = true;
- //
// groupBoxColors
//
groupBoxColors.Controls.Add(panelPurple);
@@ -187,53 +96,13 @@
groupBoxColors.TabStop = false;
groupBoxColors.Text = "Цвета";
//
- // panelRed
+ // panelPurple
//
- panelRed.BackColor = Color.Red;
- panelRed.Location = new Point(25, 21);
- panelRed.Name = "panelRed";
- panelRed.Size = new Size(43, 39);
- panelRed.TabIndex = 0;
- //
- // panelYellow
- //
- panelYellow.BackColor = Color.Yellow;
- panelYellow.Location = new Point(226, 21);
- panelYellow.Name = "panelYellow";
- panelYellow.Size = new Size(43, 39);
- panelYellow.TabIndex = 1;
- //
- // panelGreen
- //
- panelGreen.BackColor = Color.Green;
- panelGreen.Location = new Point(92, 21);
- panelGreen.Name = "panelGreen";
- panelGreen.Size = new Size(43, 39);
- panelGreen.TabIndex = 1;
- //
- // panelBlue
- //
- panelBlue.BackColor = Color.Blue;
- panelBlue.Location = new Point(159, 21);
- panelBlue.Name = "panelBlue";
- panelBlue.Size = new Size(43, 39);
- panelBlue.TabIndex = 2;
- //
- // panelWhite
- //
- panelWhite.BackColor = Color.White;
- panelWhite.Location = new Point(25, 80);
- panelWhite.Name = "panelWhite";
- panelWhite.Size = new Size(43, 39);
- panelWhite.TabIndex = 1;
- //
- // panelGray
- //
- panelGray.BackColor = Color.Gray;
- panelGray.Location = new Point(92, 80);
- panelGray.Name = "panelGray";
- panelGray.Size = new Size(43, 39);
- panelGray.TabIndex = 2;
+ panelPurple.BackColor = Color.Purple;
+ panelPurple.Location = new Point(226, 80);
+ panelPurple.Name = "panelPurple";
+ panelPurple.Size = new Size(43, 39);
+ panelPurple.TabIndex = 2;
//
// panelBlack
//
@@ -243,22 +112,142 @@
panelBlack.Size = new Size(43, 39);
panelBlack.TabIndex = 3;
//
- // panelPurple
+ // panelGray
//
- panelPurple.BackColor = Color.Purple;
- panelPurple.Location = new Point(226, 80);
- panelPurple.Name = "panelPurple";
- panelPurple.Size = new Size(43, 39);
- panelPurple.TabIndex = 2;
+ panelGray.BackColor = Color.Gray;
+ panelGray.Location = new Point(92, 80);
+ panelGray.Name = "panelGray";
+ panelGray.Size = new Size(43, 39);
+ panelGray.TabIndex = 2;
+ //
+ // panelWhite
+ //
+ panelWhite.BackColor = Color.White;
+ panelWhite.Location = new Point(25, 80);
+ panelWhite.Name = "panelWhite";
+ panelWhite.Size = new Size(43, 39);
+ panelWhite.TabIndex = 1;
+ //
+ // panelBlue
+ //
+ panelBlue.BackColor = Color.Blue;
+ panelBlue.Location = new Point(159, 21);
+ panelBlue.Name = "panelBlue";
+ panelBlue.Size = new Size(43, 39);
+ panelBlue.TabIndex = 2;
+ //
+ // panelGreen
+ //
+ panelGreen.BackColor = Color.Green;
+ panelGreen.Location = new Point(92, 21);
+ panelGreen.Name = "panelGreen";
+ panelGreen.Size = new Size(43, 39);
+ panelGreen.TabIndex = 1;
+ //
+ // panelYellow
+ //
+ panelYellow.BackColor = Color.Yellow;
+ panelYellow.Location = new Point(226, 21);
+ panelYellow.Name = "panelYellow";
+ panelYellow.Size = new Size(43, 39);
+ panelYellow.TabIndex = 1;
+ //
+ // panelRed
+ //
+ panelRed.BackColor = Color.Red;
+ panelRed.Location = new Point(25, 21);
+ panelRed.Name = "panelRed";
+ panelRed.Size = new Size(43, 39);
+ panelRed.TabIndex = 0;
+ //
+ // checkBoxBomb
+ //
+ checkBoxBomb.AutoSize = true;
+ checkBoxBomb.Location = new Point(20, 179);
+ checkBoxBomb.Name = "checkBoxBomb";
+ checkBoxBomb.Size = new Size(196, 24);
+ checkBoxBomb.TabIndex = 8;
+ checkBoxBomb.Text = "Признак наличия бомб";
+ checkBoxBomb.UseVisualStyleBackColor = true;
+
+ //
+ // checkBoxRocket
+ //
+ checkBoxRocket.AutoSize = true;
+ checkBoxRocket.Location = new Point(20, 131);
+ checkBoxRocket.Name = "checkBoxRocket";
+ checkBoxRocket.Size = new Size(196, 24);
+ checkBoxRocket.TabIndex = 6;
+ checkBoxRocket.Text = "Признак наличия ракет";
+ checkBoxRocket.UseVisualStyleBackColor = true;
+ //
+ // numericUpDownWeight
+ //
+ numericUpDownWeight.Location = new Point(103, 69);
+ numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+ numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+ numericUpDownWeight.Name = "numericUpDownWeight";
+ numericUpDownWeight.Size = new Size(122, 27);
+ numericUpDownWeight.TabIndex = 5;
+ numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+ //
+ // labelWeight
+ //
+ labelWeight.AutoSize = true;
+ labelWeight.Location = new Point(12, 69);
+ labelWeight.Name = "labelWeight";
+ labelWeight.Size = new Size(36, 20);
+ labelWeight.TabIndex = 4;
+ labelWeight.Text = "Вес:";
+ //
+ // numericUpDownSpeed
+ //
+ numericUpDownSpeed.Location = new Point(103, 34);
+ numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+ numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+ numericUpDownSpeed.Name = "numericUpDownSpeed";
+ numericUpDownSpeed.Size = new Size(122, 27);
+ numericUpDownSpeed.TabIndex = 3;
+ numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+ //
+ // labelSpeed
+ //
+ labelSpeed.AutoSize = true;
+ labelSpeed.Location = new Point(12, 34);
+ labelSpeed.Name = "labelSpeed";
+ labelSpeed.Size = new Size(76, 20);
+ labelSpeed.TabIndex = 2;
+ labelSpeed.Text = "Скорость:";
+ //
+ // label1
+ //
+ label1.BorderStyle = BorderStyle.FixedSingle;
+ label1.Location = new Point(422, 179);
+ label1.Name = "label1";
+ label1.Size = new Size(162, 36);
+ label1.TabIndex = 1;
+ label1.Text = "Продвинутый объект";
+ label1.TextAlign = ContentAlignment.MiddleCenter;
+ label1.MouseDown += labelObject_MouseDown;
+ //
+ // labelSimpleObject
+ //
+ labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+ labelSimpleObject.Location = new Point(254, 179);
+ labelSimpleObject.Name = "labelSimpleObject";
+ labelSimpleObject.Size = new Size(162, 36);
+ labelSimpleObject.TabIndex = 0;
+ labelSimpleObject.Text = "Простой объект";
+ labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+ labelSimpleObject.MouseDown += labelObject_MouseDown;
//
// pictureBoxObject
//
- pictureBoxObject.Location = new Point(3, 3);
+ pictureBoxObject.Location = new Point(12, 47);
pictureBoxObject.Name = "pictureBoxObject";
- pictureBoxObject.Size = new Size(197, 187);
+ pictureBoxObject.Size = new Size(180, 143);
pictureBoxObject.TabIndex = 1;
pictureBoxObject.TabStop = false;
- pictureBoxObject.Click += pictureBoxObject_Click_1;
//
// buttonCancel
//
@@ -281,11 +270,40 @@
// panelObject
//
panelObject.AllowDrop = true;
+ panelObject.Controls.Add(labelAdditionalColor);
+ panelObject.Controls.Add(labelBodyColor);
panelObject.Controls.Add(pictureBoxObject);
panelObject.Location = new Point(596, 0);
panelObject.Name = "panelObject";
panelObject.Size = new Size(203, 193);
panelObject.TabIndex = 5;
+ panelObject.DragDrop += panelObject_DragDrop;
+ panelObject.DragEnter += panelObject_DragEnter;
+ //
+ // labelAdditionalColor
+ //
+ labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+ labelAdditionalColor.Location = new Point(105, 9);
+ labelAdditionalColor.Name = "labelAdditionalColor";
+ labelAdditionalColor.Size = new Size(87, 36);
+ labelAdditionalColor.TabIndex = 11;
+ labelAdditionalColor.Text = "Доп. цвет";
+ labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
+ labelAdditionalColor.DragDrop += labelAdditionalColor_DragDrop;
+ labelAdditionalColor.DragEnter += labelAdditionalColor_DragEnter;
+ //
+ // labelBodyColor
+ //
+ labelBodyColor.AllowDrop = true;
+ labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
+ labelBodyColor.Location = new Point(12, 8);
+ labelBodyColor.Name = "labelBodyColor";
+ labelBodyColor.Size = new Size(87, 36);
+ labelBodyColor.TabIndex = 10;
+ labelBodyColor.Text = "Цвет";
+ labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
+ labelBodyColor.DragDrop += labelBodyColor_DragDrop;
+ labelBodyColor.DragEnter += labelBodyColor_DragEnter;
//
// FormAircraftConfig
//
@@ -298,12 +316,11 @@
Controls.Add(groupBoxConfig);
Name = "FormAircraftConfig";
Text = "Создание объекта";
- Load += FormAircraftConfig_Load;
groupBoxConfig.ResumeLayout(false);
groupBoxConfig.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
- ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
groupBoxColors.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
+ ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
panelObject.ResumeLayout(false);
ResumeLayout(false);
@@ -320,7 +337,6 @@
private Label labelWeight;
private CheckBox checkBoxRocket;
private CheckBox checkBoxBomb;
- private CheckBox checkBoxWing;
private GroupBox groupBoxColors;
private Panel panelBlue;
private Panel panelGreen;
@@ -334,5 +350,7 @@
private Button buttonCancel;
private Button button2;
private Panel panelObject;
+ private Label labelAdditionalColor;
+ private Label labelBodyColor;
}
}
\ No newline at end of file
diff --git a/Stormtrooper/Stormtrooper/FormAircraftConfig.cs b/Stormtrooper/Stormtrooper/FormAircraftConfig.cs
index 7d742bd..5cd8c2b 100644
--- a/Stormtrooper/Stormtrooper/FormAircraftConfig.cs
+++ b/Stormtrooper/Stormtrooper/FormAircraftConfig.cs
@@ -1,4 +1,6 @@
-using System;
+using Stormtrooper.Drawnings;
+using Stormtrooper.Entities;
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -8,48 +10,149 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
-namespace Stormtrooper
+namespace Stormtrooper;
+
+///
+/// Форма конфигурации объекта
+///
+public partial class FormAircraftConfig : Form
{
- public partial class FormAircraftConfig : Form
+ ///
+ /// Объект - прорисовка самолета
+ ///
+ private DrawningAircraft? _aircraft = null;
+
+ ///
+ /// Конструктор
+ ///
+ public FormAircraftConfig()
{
- public FormAircraftConfig()
+ InitializeComponent();
+
+ panelRed.MouseDown += panel_MouseDown;
+ panelGreen.MouseDown += panel_MouseDown;
+ panelBlue.MouseDown += panel_MouseDown;
+ panelYellow.MouseDown += panel_MouseDown;
+ panelWhite.MouseDown += panel_MouseDown;
+ panelGray.MouseDown += panel_MouseDown;
+ panelBlack.MouseDown += panel_MouseDown;
+ panelPurple.MouseDown += panel_MouseDown;
+ //TODO buttonCancel.Click with lambda с закрытием формы
+ buttonCancel.Click += (sender, e) => Close();
+ }
+
+ ///
+ /// Прорисовка объекта
+ ///
+ private void DrawObject()
+ {
+ Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+ Graphics gr = Graphics.FromImage(bmp);
+ _aircraft?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
+ _aircraft?.SetPosition(5, 5);
+ _aircraft?.DrawTransport(gr);
+ pictureBoxObject.Image = bmp;
+ }
+
+ ///
+ /// Проверяем информацию при нажатии на Label
+ ///
+ ///
+ ///
+ private void labelObject_MouseDown(object sender, MouseEventArgs e)
+ {
+ (sender as Label)?.DoDragDrop((sender as Label)?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy);
+ }
+
+ ///
+ /// Проверка полученной информации(ее типа на соответствие требоемому)
+ ///
+ ///
+ ///
+ private void panelObject_DragEnter(object sender, DragEventArgs e)
+ {
+ e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
+ }
+
+ ///
+ /// Действие при приеме перетаскиваемой информации
+ ///
+ ///
+ ///
+ private void panelObject_DragDrop(object sender, DragEventArgs e)
+ {
+ switch (e.Data?.GetData(DataFormats.Text)?.ToString())
{
- InitializeComponent();
+ case "labelSimpleObject":
+ _aircraft = new DrawningAircraft((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White);
+ break;
+ case "labelModifiedObject":
+ _aircraft = new DrawningStormtrooper((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxRocket.Checked, checkBoxBomb.Checked);
+ break;
}
+ DrawObject();
+ }
+ private void panel_MouseDown(object? sender, MouseEventArgs e)
+ {
+ //TODO отправка цвета в Drag&Drop
+ (sender as Control)?.DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+ }
- private void labelSpeed_Click(object sender, EventArgs e)
+ //TODO реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта)
+ private void labelBodyColor_DragEnter(object? sender, DragEventArgs e)
+ {
+ if (e.Data.GetDataPresent(typeof(Color)))
{
-
+ e.Effect = DragDropEffects.Copy;
}
-
- private void numericUpDownSpeed_ValueChanged(object sender, EventArgs e)
+ else
{
-
+ e.Effect = DragDropEffects.None;
}
+ }
- private void checkBox1_CheckedChanged(object sender, EventArgs e)
+ private void labelBodyColor_DragDrop(object? sender, DragEventArgs e)
+ {
+ if (_aircraft != null)
{
-
+ _aircraft.EntityAircraft.SetBodyColor((Color)e.Data.GetData(typeof(Color)));
+ DrawObject();
}
-
- private void pictureBoxObject_Click(object sender, EventArgs e)
+ }
+ private void labelAdditionalColor_DragEnter(object? sender, DragEventArgs e)
+ {
+ if (_aircraft is DrawningStormtrooper)
{
-
+ if (e.Data.GetDataPresent(typeof(Color)))
+ {
+ e.Effect = DragDropEffects.Copy;
+ }
+ else
+ {
+ e.Effect = DragDropEffects.None;
+ }
}
+ }
- private void pictureBoxObject_Click_1(object sender, EventArgs e)
+ private void labelAdditionalColor_DragDrop(object? sender, DragEventArgs e)
+ {
+ if (_aircraft.EntityAircraft is EntityStormtrooper stormtrooper)
{
-
+ stormtrooper.SetAdditionalColor((Color)e.Data.GetData(typeof(Color)));
+ DrawObject();
}
-
- private void FormAircraftConfig_Load(object sender, EventArgs e)
+ }
+ ///
+ /// Передача объекта
+ ///
+ ///
+ ///
+ private void buttonAdd_Click(object sender, EventArgs e)
+ {
+ if(_aircraft!= null)
{
-
- }
-
- private void buttonCancel_Click(object sender, EventArgs e)
- {
-
+ _stormtrooperDelegate?.Invoke(_aircraft);
+ Close();
}
}
}
diff --git a/Stormtrooper/Stormtrooper/FormStormtrooper.cs b/Stormtrooper/Stormtrooper/FormStormtrooper.cs
index e6dfb8d..1c1face 100644
--- a/Stormtrooper/Stormtrooper/FormStormtrooper.cs
+++ b/Stormtrooper/Stormtrooper/FormStormtrooper.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
-using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
diff --git a/Stormtrooper/Stormtrooper/FormStormtrooper.resx b/Stormtrooper/Stormtrooper/FormStormtrooper.resx
index af32865..e56a596 100644
--- a/Stormtrooper/Stormtrooper/FormStormtrooper.resx
+++ b/Stormtrooper/Stormtrooper/FormStormtrooper.resx
@@ -18,7 +18,8 @@
System.Resources.ResXResourceReader, System.Windows.Forms, ...
System.Resources.ResXResourceWriter, System.Windows.Forms, ...
this is my long stringthis is a comment
- Blue
+ Blue
[base64 mime encoded serialized .NET Framework object]
diff --git a/Stormtrooper/Stormtrooper/Program.cs b/Stormtrooper/Stormtrooper/Program.cs
index 8d32d67..edd4ec9 100644
--- a/Stormtrooper/Stormtrooper/Program.cs
+++ b/Stormtrooper/Stormtrooper/Program.cs
@@ -11,7 +11,7 @@ namespace Stormtrooper
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
- Application.Run(new FormAircraftCollection());
+ Application.Run(new FormAircraftConfig());
}
}
}
\ No newline at end of file