diff --git a/AirBomber/AirBomber/DrawningAirBomber.cs b/AirBomber/AirBomber/DrawningAirBomber.cs
index 6f41785..f4af376 100644
--- a/AirBomber/AirBomber/DrawningAirBomber.cs
+++ b/AirBomber/AirBomber/DrawningAirBomber.cs
@@ -26,6 +26,22 @@ namespace AirBomber
Airplane = new EntityAirBomber(speed, weight, bodyColor, dopColor, hasBombs, hasFuelTanks);
}
+ ///
+ /// Получения копии текущего объекта. Для перемены свойств изменить необязательные аргументы нужным значением
+ ///
+ /// The speed.
+ /// The weight.
+ /// Color of the body.
+ /// Копию или Измененную копию текущего объекта
+ public DrawningAirBomber Copy(int? speed = null, float? weight = null, Color? bodyColor = null,
+ Color? dopColor = null, bool? hasBombs = null, bool? hasFuelTanks = null, IAirplaneEngines? typeAirplaneEngines = null)
+ {
+ var e = (EntityAirBomber)Airplane;
+ var res = new DrawningAirBomber(speed ?? e.Speed, weight ?? e.Weight, bodyColor ?? e.BodyColor, dopColor ?? e.DopColor, hasBombs ?? e.HasBombs, hasFuelTanks ?? e.HasFuelTanks);
+ res.DrawningEngines = typeAirplaneEngines ?? DrawningEngines;
+ return res;
+ }
+
public override void DrawTransport(Graphics g)
{
if (Airplane is not EntityAirBomber airBomber)
diff --git a/AirBomber/AirBomber/DrawningAirplane.cs b/AirBomber/AirBomber/DrawningAirplane.cs
index da8b5d9..4c3c0c4 100644
--- a/AirBomber/AirBomber/DrawningAirplane.cs
+++ b/AirBomber/AirBomber/DrawningAirplane.cs
@@ -10,7 +10,7 @@
///
public EntityAirplane Airplane { get; protected set; }
- public IAirplaneEngines? DrawningEngines { get; private set; }
+ public IAirplaneEngines? DrawningEngines { get; protected set; }
///
/// Левая координата отрисовки самолета
///
@@ -52,6 +52,21 @@
Airplane = entityAirplane;
DrawningEngines = typeAirplaneEngines;
}
+
+ ///
+ /// Получения копии текущего объекта. Для перемены свойств изменить необязательные аргументы нужным значением
+ ///
+ /// The speed.
+ /// The weight.
+ /// Color of the body.
+ /// Копию или Измененную копию текущего объекта
+ public DrawningAirplane Copy(int? speed = null, float? weight = null, Color? bodyColor = null, IAirplaneEngines? typeAirplaneEngines = null)
+ {
+ var res = new DrawningAirplane(speed ?? Airplane.Speed, weight ?? Airplane.Weight, bodyColor ?? Airplane.BodyColor);
+ res.DrawningEngines = typeAirplaneEngines ?? DrawningEngines;
+ return res;
+ }
+
///
/// Инициализация свойств
///
diff --git a/AirBomber/AirBomber/FormAirplaneConfig.Designer.cs b/AirBomber/AirBomber/FormAirplaneConfig.Designer.cs
new file mode 100644
index 0000000..c6f382f
--- /dev/null
+++ b/AirBomber/AirBomber/FormAirplaneConfig.Designer.cs
@@ -0,0 +1,488 @@
+namespace AirBomber
+{
+ partial class FormAirplaneConfig
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.groupBoxConfig = new System.Windows.Forms.GroupBox();
+ this.TypesOfEngines = new System.Windows.Forms.GroupBox();
+ this.labelRoundedEngines = new System.Windows.Forms.Label();
+ this.labelRectEngines = new System.Windows.Forms.Label();
+ this.labelArrowEngines = new System.Windows.Forms.Label();
+ this.numericUpDownCountEngines = new System.Windows.Forms.NumericUpDown();
+ this.labelCountEngines = new System.Windows.Forms.Label();
+ this.labelModifiedObject = new System.Windows.Forms.Label();
+ this.labelSimpleObject = new System.Windows.Forms.Label();
+ this.groupBoxColors = new System.Windows.Forms.GroupBox();
+ this.panelPurple = new System.Windows.Forms.Panel();
+ this.panelYellow = new System.Windows.Forms.Panel();
+ this.panelBlack = new System.Windows.Forms.Panel();
+ this.panelBlue = new System.Windows.Forms.Panel();
+ this.panelGray = new System.Windows.Forms.Panel();
+ this.panelGreen = new System.Windows.Forms.Panel();
+ this.panelWhite = new System.Windows.Forms.Panel();
+ this.panelRed = new System.Windows.Forms.Panel();
+ this.checkBoxHasFuelTanks = new System.Windows.Forms.CheckBox();
+ this.checkBoxHasBombs = new System.Windows.Forms.CheckBox();
+ this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown();
+ this.labelWeight = new System.Windows.Forms.Label();
+ this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown();
+ this.labelSpeed = new System.Windows.Forms.Label();
+ this.panelObject = new System.Windows.Forms.Panel();
+ this.labelTypesOfEngines = new System.Windows.Forms.Label();
+ this.labelDopColor = new System.Windows.Forms.Label();
+ this.labelBaseColor = new System.Windows.Forms.Label();
+ this.pictureBoxObject = new System.Windows.Forms.PictureBox();
+ this.buttonCancel = new System.Windows.Forms.Button();
+ this.buttonOk = new System.Windows.Forms.Button();
+ this.groupBoxConfig.SuspendLayout();
+ this.TypesOfEngines.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCountEngines)).BeginInit();
+ this.groupBoxColors.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit();
+ this.panelObject.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
+ this.SuspendLayout();
+ //
+ // groupBoxConfig
+ //
+ this.groupBoxConfig.Controls.Add(this.TypesOfEngines);
+ this.groupBoxConfig.Controls.Add(this.numericUpDownCountEngines);
+ this.groupBoxConfig.Controls.Add(this.labelCountEngines);
+ this.groupBoxConfig.Controls.Add(this.labelModifiedObject);
+ this.groupBoxConfig.Controls.Add(this.labelSimpleObject);
+ this.groupBoxConfig.Controls.Add(this.groupBoxColors);
+ this.groupBoxConfig.Controls.Add(this.checkBoxHasFuelTanks);
+ this.groupBoxConfig.Controls.Add(this.checkBoxHasBombs);
+ this.groupBoxConfig.Controls.Add(this.numericUpDownWeight);
+ 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.Name = "groupBoxConfig";
+ this.groupBoxConfig.Size = new System.Drawing.Size(700, 253);
+ this.groupBoxConfig.TabIndex = 0;
+ this.groupBoxConfig.TabStop = false;
+ this.groupBoxConfig.Text = "Параметры";
+ //
+ // TypesOfEngines
+ //
+ this.TypesOfEngines.Controls.Add(this.labelRoundedEngines);
+ this.TypesOfEngines.Controls.Add(this.labelRectEngines);
+ this.TypesOfEngines.Controls.Add(this.labelArrowEngines);
+ this.TypesOfEngines.Location = new System.Drawing.Point(514, 22);
+ this.TypesOfEngines.Name = "TypesOfEngines";
+ this.TypesOfEngines.Size = new System.Drawing.Size(180, 225);
+ this.TypesOfEngines.TabIndex = 19;
+ this.TypesOfEngines.TabStop = false;
+ this.TypesOfEngines.Text = "Типы двигателей";
+ //
+ // labelRoundedEngines
+ //
+ this.labelRoundedEngines.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.labelRoundedEngines.Location = new System.Drawing.Point(6, 23);
+ this.labelRoundedEngines.Name = "labelRoundedEngines";
+ this.labelRoundedEngines.Size = new System.Drawing.Size(168, 52);
+ this.labelRoundedEngines.TabIndex = 24;
+ this.labelRoundedEngines.Text = "Закругленный";
+ this.labelRoundedEngines.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.labelRoundedEngines.MouseDown += new System.Windows.Forms.MouseEventHandler(this.labelsTypeOfEngines_MouseDown);
+ //
+ // labelRectEngines
+ //
+ this.labelRectEngines.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.labelRectEngines.Location = new System.Drawing.Point(6, 96);
+ this.labelRectEngines.Name = "labelRectEngines";
+ this.labelRectEngines.Size = new System.Drawing.Size(168, 52);
+ this.labelRectEngines.TabIndex = 23;
+ this.labelRectEngines.Text = "Квадратный";
+ this.labelRectEngines.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.labelRectEngines.MouseDown += new System.Windows.Forms.MouseEventHandler(this.labelsTypeOfEngines_MouseDown);
+ //
+ // labelArrowEngines
+ //
+ this.labelArrowEngines.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.labelArrowEngines.Location = new System.Drawing.Point(6, 165);
+ this.labelArrowEngines.Name = "labelArrowEngines";
+ this.labelArrowEngines.Size = new System.Drawing.Size(168, 52);
+ this.labelArrowEngines.TabIndex = 22;
+ this.labelArrowEngines.Text = "Стрелка";
+ this.labelArrowEngines.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.labelArrowEngines.MouseDown += new System.Windows.Forms.MouseEventHandler(this.labelsTypeOfEngines_MouseDown);
+ //
+ // numericUpDownCountEngines
+ //
+ this.numericUpDownCountEngines.Location = new System.Drawing.Point(151, 118);
+ this.numericUpDownCountEngines.Maximum = new decimal(new int[] {
+ 9,
+ 0,
+ 0,
+ 0});
+ this.numericUpDownCountEngines.Name = "numericUpDownCountEngines";
+ this.numericUpDownCountEngines.Size = new System.Drawing.Size(79, 23);
+ this.numericUpDownCountEngines.TabIndex = 18;
+ this.numericUpDownCountEngines.Value = new decimal(new int[] {
+ 2,
+ 0,
+ 0,
+ 0});
+ //
+ // labelCountEngines
+ //
+ this.labelCountEngines.AutoSize = true;
+ this.labelCountEngines.Location = new System.Drawing.Point(6, 120);
+ this.labelCountEngines.Name = "labelCountEngines";
+ this.labelCountEngines.Size = new System.Drawing.Size(139, 15);
+ this.labelCountEngines.TabIndex = 17;
+ this.labelCountEngines.Text = "Количество двигателей:";
+ //
+ // labelModifiedObject
+ //
+ this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.labelModifiedObject.Location = new System.Drawing.Point(279, 201);
+ this.labelModifiedObject.Name = "labelModifiedObject";
+ this.labelModifiedObject.Size = new System.Drawing.Size(212, 38);
+ this.labelModifiedObject.TabIndex = 16;
+ this.labelModifiedObject.Text = "Продвинутый";
+ this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
+ //
+ // labelSimpleObject
+ //
+ this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.labelSimpleObject.Location = new System.Drawing.Point(279, 151);
+ this.labelSimpleObject.Name = "labelSimpleObject";
+ this.labelSimpleObject.Size = new System.Drawing.Size(212, 38);
+ this.labelSimpleObject.TabIndex = 15;
+ this.labelSimpleObject.Text = "Простой";
+ this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
+ //
+ // groupBoxColors
+ //
+ this.groupBoxColors.Controls.Add(this.panelPurple);
+ this.groupBoxColors.Controls.Add(this.panelYellow);
+ this.groupBoxColors.Controls.Add(this.panelBlack);
+ this.groupBoxColors.Controls.Add(this.panelBlue);
+ this.groupBoxColors.Controls.Add(this.panelGray);
+ 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.Name = "groupBoxColors";
+ this.groupBoxColors.Size = new System.Drawing.Size(241, 127);
+ this.groupBoxColors.TabIndex = 14;
+ this.groupBoxColors.TabStop = false;
+ this.groupBoxColors.Text = "Цвета";
+ //
+ // panelPurple
+ //
+ this.panelPurple.BackColor = System.Drawing.Color.Purple;
+ this.panelPurple.Location = new System.Drawing.Point(184, 73);
+ this.panelPurple.Name = "panelPurple";
+ this.panelPurple.Size = new System.Drawing.Size(40, 40);
+ this.panelPurple.TabIndex = 3;
+ //
+ // panelYellow
+ //
+ this.panelYellow.BackColor = System.Drawing.Color.Yellow;
+ this.panelYellow.Location = new System.Drawing.Point(184, 22);
+ this.panelYellow.Name = "panelYellow";
+ this.panelYellow.Size = new System.Drawing.Size(40, 40);
+ this.panelYellow.TabIndex = 1;
+ //
+ // panelBlack
+ //
+ this.panelBlack.BackColor = System.Drawing.Color.Black;
+ this.panelBlack.Location = new System.Drawing.Point(127, 73);
+ this.panelBlack.Name = "panelBlack";
+ this.panelBlack.Size = new System.Drawing.Size(40, 40);
+ this.panelBlack.TabIndex = 4;
+ //
+ // panelBlue
+ //
+ this.panelBlue.BackColor = System.Drawing.Color.Blue;
+ this.panelBlue.Location = new System.Drawing.Point(127, 22);
+ this.panelBlue.Name = "panelBlue";
+ this.panelBlue.Size = new System.Drawing.Size(40, 40);
+ this.panelBlue.TabIndex = 1;
+ //
+ // panelGray
+ //
+ this.panelGray.BackColor = System.Drawing.Color.Gray;
+ this.panelGray.Location = new System.Drawing.Point(72, 73);
+ this.panelGray.Name = "panelGray";
+ this.panelGray.Size = new System.Drawing.Size(40, 40);
+ this.panelGray.TabIndex = 5;
+ //
+ // panelGreen
+ //
+ this.panelGreen.BackColor = System.Drawing.Color.Green;
+ this.panelGreen.Location = new System.Drawing.Point(72, 22);
+ this.panelGreen.Name = "panelGreen";
+ this.panelGreen.Size = new System.Drawing.Size(40, 40);
+ this.panelGreen.TabIndex = 1;
+ //
+ // panelWhite
+ //
+ this.panelWhite.BackColor = System.Drawing.Color.White;
+ this.panelWhite.Location = new System.Drawing.Point(15, 73);
+ this.panelWhite.Name = "panelWhite";
+ this.panelWhite.Size = new System.Drawing.Size(40, 40);
+ this.panelWhite.TabIndex = 2;
+ //
+ // panelRed
+ //
+ this.panelRed.BackColor = System.Drawing.Color.Red;
+ this.panelRed.Location = new System.Drawing.Point(15, 22);
+ this.panelRed.Name = "panelRed";
+ this.panelRed.Size = new System.Drawing.Size(40, 40);
+ this.panelRed.TabIndex = 0;
+ //
+ // checkBoxHasFuelTanks
+ //
+ this.checkBoxHasFuelTanks.AutoSize = true;
+ this.checkBoxHasFuelTanks.Location = new System.Drawing.Point(22, 201);
+ this.checkBoxHasFuelTanks.Name = "checkBoxHasFuelTanks";
+ this.checkBoxHasFuelTanks.RightToLeft = System.Windows.Forms.RightToLeft.No;
+ this.checkBoxHasFuelTanks.Size = new System.Drawing.Size(222, 19);
+ this.checkBoxHasFuelTanks.TabIndex = 12;
+ this.checkBoxHasFuelTanks.Text = "Признак наличия топливных баков";
+ this.checkBoxHasFuelTanks.UseVisualStyleBackColor = true;
+ //
+ // checkBoxHasBombs
+ //
+ this.checkBoxHasBombs.AutoSize = true;
+ this.checkBoxHasBombs.Location = new System.Drawing.Point(22, 162);
+ this.checkBoxHasBombs.Name = "checkBoxHasBombs";
+ this.checkBoxHasBombs.Size = new System.Drawing.Size(156, 19);
+ this.checkBoxHasBombs.TabIndex = 11;
+ this.checkBoxHasBombs.Text = "Признак наличия бомб";
+ this.checkBoxHasBombs.UseVisualStyleBackColor = true;
+ //
+ // numericUpDownWeight
+ //
+ this.numericUpDownWeight.Location = new System.Drawing.Point(151, 74);
+ this.numericUpDownWeight.Maximum = new decimal(new int[] {
+ 1000,
+ 0,
+ 0,
+ 0});
+ this.numericUpDownWeight.Minimum = new decimal(new int[] {
+ 100,
+ 0,
+ 0,
+ 0});
+ this.numericUpDownWeight.Name = "numericUpDownWeight";
+ this.numericUpDownWeight.Size = new System.Drawing.Size(79, 23);
+ this.numericUpDownWeight.TabIndex = 10;
+ this.numericUpDownWeight.Value = new decimal(new int[] {
+ 100,
+ 0,
+ 0,
+ 0});
+ //
+ // labelWeight
+ //
+ this.labelWeight.AutoSize = true;
+ this.labelWeight.Location = new System.Drawing.Point(6, 76);
+ this.labelWeight.Name = "labelWeight";
+ this.labelWeight.Size = new System.Drawing.Size(29, 15);
+ this.labelWeight.TabIndex = 9;
+ this.labelWeight.Text = "Вес:";
+ //
+ // numericUpDownSpeed
+ //
+ this.numericUpDownSpeed.Location = new System.Drawing.Point(151, 32);
+ this.numericUpDownSpeed.Maximum = new decimal(new int[] {
+ 1000,
+ 0,
+ 0,
+ 0});
+ this.numericUpDownSpeed.Minimum = new decimal(new int[] {
+ 100,
+ 0,
+ 0,
+ 0});
+ this.numericUpDownSpeed.Name = "numericUpDownSpeed";
+ this.numericUpDownSpeed.Size = new System.Drawing.Size(79, 23);
+ this.numericUpDownSpeed.TabIndex = 8;
+ this.numericUpDownSpeed.Value = new decimal(new int[] {
+ 100,
+ 0,
+ 0,
+ 0});
+ //
+ // labelSpeed
+ //
+ this.labelSpeed.AutoSize = true;
+ this.labelSpeed.Location = new System.Drawing.Point(6, 34);
+ this.labelSpeed.Name = "labelSpeed";
+ this.labelSpeed.Size = new System.Drawing.Size(62, 15);
+ this.labelSpeed.TabIndex = 7;
+ this.labelSpeed.Text = "Скорость:";
+ //
+ // panelObject
+ //
+ this.panelObject.AllowDrop = true;
+ this.panelObject.Controls.Add(this.labelTypesOfEngines);
+ 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(718, 12);
+ this.panelObject.Name = "panelObject";
+ this.panelObject.Size = new System.Drawing.Size(262, 220);
+ 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);
+ //
+ // labelTypesOfEngines
+ //
+ this.labelTypesOfEngines.AllowDrop = true;
+ this.labelTypesOfEngines.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.labelTypesOfEngines.Location = new System.Drawing.Point(20, 52);
+ this.labelTypesOfEngines.Name = "labelTypesOfEngines";
+ this.labelTypesOfEngines.Size = new System.Drawing.Size(225, 32);
+ this.labelTypesOfEngines.TabIndex = 3;
+ this.labelTypesOfEngines.Text = "Тип двигателей";
+ this.labelTypesOfEngines.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.labelTypesOfEngines.DragDrop += new System.Windows.Forms.DragEventHandler(this.labelTypesOfEngines_DragDrop);
+ this.labelTypesOfEngines.DragEnter += new System.Windows.Forms.DragEventHandler(this.labelTypesOfEngines_DragEnter);
+ //
+ // labelDopColor
+ //
+ this.labelDopColor.AllowDrop = true;
+ this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.labelDopColor.Location = new System.Drawing.Point(141, 9);
+ this.labelDopColor.Name = "labelDopColor";
+ this.labelDopColor.Size = new System.Drawing.Size(104, 32);
+ 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.LabelDopColor_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.Name = "labelBaseColor";
+ this.labelBaseColor.Size = new System.Drawing.Size(104, 32);
+ 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, 89);
+ this.pictureBoxObject.Name = "pictureBoxObject";
+ this.pictureBoxObject.Size = new System.Drawing.Size(225, 125);
+ this.pictureBoxObject.TabIndex = 0;
+ this.pictureBoxObject.TabStop = false;
+ //
+ // buttonCancel
+ //
+ this.buttonCancel.Location = new System.Drawing.Point(859, 235);
+ this.buttonCancel.Name = "buttonCancel";
+ this.buttonCancel.Size = new System.Drawing.Size(104, 30);
+ this.buttonCancel.TabIndex = 5;
+ this.buttonCancel.Text = "Отмена";
+ this.buttonCancel.UseVisualStyleBackColor = true;
+ //
+ // buttonOk
+ //
+ this.buttonOk.Location = new System.Drawing.Point(738, 235);
+ this.buttonOk.Name = "buttonOk";
+ this.buttonOk.Size = new System.Drawing.Size(104, 30);
+ this.buttonOk.TabIndex = 4;
+ this.buttonOk.Text = "Добавить";
+ this.buttonOk.UseVisualStyleBackColor = true;
+ this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click);
+ //
+ // FormAirplaneConfig
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(987, 277);
+ this.Controls.Add(this.buttonCancel);
+ this.Controls.Add(this.buttonOk);
+ this.Controls.Add(this.panelObject);
+ this.Controls.Add(this.groupBoxConfig);
+ this.Name = "FormAirplaneConfig";
+ this.Text = "Создание объекта";
+ this.groupBoxConfig.ResumeLayout(false);
+ this.groupBoxConfig.PerformLayout();
+ this.TypesOfEngines.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCountEngines)).EndInit();
+ this.groupBoxColors.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit();
+ this.panelObject.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private GroupBox groupBoxConfig;
+ private CheckBox checkBoxHasFuelTanks;
+ private CheckBox checkBoxHasBombs;
+ private NumericUpDown numericUpDownWeight;
+ private Label labelWeight;
+ private NumericUpDown numericUpDownSpeed;
+ private Label labelSpeed;
+ private Label labelModifiedObject;
+ private Label labelSimpleObject;
+ private GroupBox groupBoxColors;
+ private Panel panelPurple;
+ private Panel panelYellow;
+ private Panel panelBlack;
+ private Panel panelBlue;
+ private Panel panelGray;
+ private Panel panelGreen;
+ private Panel panelWhite;
+ private Panel panelRed;
+ private Panel panelObject;
+ private Label labelDopColor;
+ private Label labelBaseColor;
+ private PictureBox pictureBoxObject;
+ private Button buttonCancel;
+ private Button buttonOk;
+ private NumericUpDown numericUpDownCountEngines;
+ private Label labelCountEngines;
+ private GroupBox TypesOfEngines;
+ private Label labelTypesOfEngines;
+ private Label labelRoundedEngines;
+ private Label labelRectEngines;
+ private Label labelArrowEngines;
+ }
+}
\ No newline at end of file
diff --git a/AirBomber/AirBomber/FormAirplaneConfig.cs b/AirBomber/AirBomber/FormAirplaneConfig.cs
new file mode 100644
index 0000000..d70c1b4
--- /dev/null
+++ b/AirBomber/AirBomber/FormAirplaneConfig.cs
@@ -0,0 +1,228 @@
+using System.Drawing;
+using System.Xml.Linq;
+
+namespace AirBomber
+{
+ ///
+ /// Форма создания объекта
+ ///
+ public partial class FormAirplaneConfig : Form
+ {
+ ///
+ /// Переменная-выбранная самолет
+ ///
+ DrawningAirplane _airplane = null;
+ ///
+ /// Событие
+ ///
+ private event Action EventAddAirplane;
+ ///
+ /// Конструктор
+ ///
+ public FormAirplaneConfig()
+ {
+ InitializeComponent();
+ panelBlack.MouseDown += PanelColor_MouseDown;
+ panelPurple.MouseDown += PanelColor_MouseDown;
+ panelGray.MouseDown += PanelColor_MouseDown;
+ panelGreen.MouseDown += PanelColor_MouseDown;
+ panelRed.MouseDown += PanelColor_MouseDown;
+ panelWhite.MouseDown += PanelColor_MouseDown;
+ panelYellow.MouseDown += PanelColor_MouseDown;
+ panelBlue.MouseDown += PanelColor_MouseDown;
+
+ buttonCancel.Click += (s, e) => Close();
+ }
+ ///
+ /// Отрисовать самолет
+ ///
+ private void DrawAirplane()
+ {
+ Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+ Graphics gr = Graphics.FromImage(bmp);
+ _airplane?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height);
+ _airplane?.DrawTransport(gr);
+ pictureBoxObject.Image = bmp;
+ }
+ ///
+ /// Добавление события
+ ///
+ ///
+ public void AddEvent(Action ev)
+ {
+ if (EventAddAirplane == null)
+ {
+ EventAddAirplane = new(ev);
+ }
+ else
+ {
+ EventAddAirplane += ev;
+ }
+ }
+ ///
+ /// Передаем информацию при нажатии на Label
+ ///
+ ///
+ ///
+ private void LabelObject_MouseDown(object sender, MouseEventArgs e)
+ {
+ (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy);
+ }
+ ///
+ /// Проверка получаемой информации (ее типа на соответствие требуемому)
+ ///
+ ///
+ ///
+ private void PanelObject_DragEnter(object sender, DragEventArgs e)
+ {
+ if (e.Data.GetDataPresent(DataFormats.Text))
+ {
+ e.Effect = DragDropEffects.Copy;
+ }
+ else
+ {
+ e.Effect = DragDropEffects.None;
+ }
+ }
+ ///
+ /// Действия при приеме перетаскиваемой информации
+ ///
+ ///
+ ///
+ private void PanelObject_DragDrop(object sender, DragEventArgs e)
+ {
+ switch (e.Data.GetData(DataFormats.Text).ToString())
+ {
+ case "labelSimpleObject":
+ _airplane = new DrawningAirplane((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White,
+ new DrawningAirplaneEngines());
+ break;
+ case "labelModifiedObject":
+ _airplane = new DrawningAirBomber((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black,
+ checkBoxHasBombs.Checked, checkBoxHasFuelTanks.Checked, new DrawningAirplaneEngines());
+ break;
+ }
+ _airplane.DrawningEngines.CountEngines = (int)numericUpDownCountEngines.Value;
+ DrawAirplane();
+ }
+ ///
+ /// Отправляем цвет с панели
+ ///
+ ///
+ ///
+ private void PanelColor_MouseDown(object sender, MouseEventArgs e)
+ {
+ (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+ }
+ ///
+ /// Установливает статус перемещаемых данных
+ ///
+ ///
+ /// Тип которого должны соответствовать перемещаемые данные
+ /// условие на возможность копирования данных
+ private void setDragEffect(DragEventArgs e, Type needTypeData, bool condition)
+ {
+ if (e.Data.GetDataPresent(needTypeData) && condition)
+ {
+ e.Effect = DragDropEffects.Copy;
+ }
+ else
+ {
+ e.Effect = DragDropEffects.None;
+ }
+ }
+ ///
+ /// Проверка получаемой информации (ее типа на соответствие требуемому)
+ ///
+ ///
+ ///
+ private void LabelBaseColor_DragEnter(object sender, DragEventArgs e) => setDragEffect(e, typeof(Color), _airplane != null);
+ private void LabelDopColor_DragEnter(object sender, DragEventArgs e) => setDragEffect(e, typeof(Color), _airplane != null && _airplane is DrawningAirBomber);
+ ///
+ /// Принимаем основной цвет
+ ///
+ ///
+ ///
+ private void LabelBaseColor_DragDrop(object sender, DragEventArgs e)
+ {
+ var color = (Color)e.Data.GetData(typeof(Color));
+ if (_airplane is DrawningAirBomber)
+ {
+ _airplane = ((DrawningAirBomber)_airplane).Copy(bodyColor: color);
+ }
+ else if (_airplane is DrawningAirplane)
+ {
+ _airplane = _airplane.Copy(bodyColor: color);
+ }
+ DrawAirplane();
+ }
+ ///
+ /// Принимаем дополнительный цвет
+ ///
+ ///
+ ///
+ private void LabelDopColor_DragDrop(object sender, DragEventArgs e)
+ {
+ var color = (Color)e.Data.GetData(typeof(Color));
+ var airplane = _airplane as DrawningAirBomber;
+ if (airplane != null)
+ {
+ _airplane = airplane.Copy(dopColor: color);
+ }
+ DrawAirplane();
+ }
+ ///
+ /// Добавление самолета
+ ///
+ ///
+ ///
+ private void ButtonOk_Click(object sender, EventArgs e)
+ {
+ EventAddAirplane?.Invoke(_airplane);
+ Close();
+ }
+ ///
+ /// Создание DragAndDrop перемещения по нажатию мыши
+ ///
+ ///
+ ///
+ private void labelsTypeOfEngines_MouseDown(object sender, MouseEventArgs e)
+ {
+ string text = ((Label)sender)?.Text ?? string.Empty;
+ IAirplaneEngines typesOfEngines;
+ switch (text)
+ {
+ case "Закругленный":
+ typesOfEngines = new DrawningAirplaneEngines();
+ break;
+ case "Квадратный":
+ typesOfEngines = new AirplaneRectEngines();
+ break;
+ case "Стрелка":
+ typesOfEngines = new AirplaneArrowEngines();
+ break;
+ default:
+ return;
+ }
+ (sender as Label).DoDragDrop(Tuple.Create(typesOfEngines.GetType(), typesOfEngines), DragDropEffects.Move | DragDropEffects.Copy);
+ }
+
+ private void labelTypesOfEngines_DragDrop(object sender, DragEventArgs e)
+ {
+ var data = (Tuple)e.Data.GetData(typeof(Tuple));
+ var engines = data.Item2;
+ engines.CountEngines = _airplane.DrawningEngines.CountEngines;
+ if (_airplane is DrawningAirBomber)
+ {
+ _airplane = ((DrawningAirBomber)_airplane).Copy(typeAirplaneEngines: engines);
+ }
+ else if (_airplane is DrawningAirplane)
+ {
+ _airplane = _airplane.Copy(typeAirplaneEngines: engines);
+ }
+ DrawAirplane();
+ }
+
+ private void labelTypesOfEngines_DragEnter(object sender, DragEventArgs e) => setDragEffect(e, typeof(Tuple), _airplane != null);
+ }
+}
\ No newline at end of file
diff --git a/AirBomber/AirBomber/FormAirplaneConfig.resx b/AirBomber/AirBomber/FormAirplaneConfig.resx
new file mode 100644
index 0000000..f298a7b
--- /dev/null
+++ b/AirBomber/AirBomber/FormAirplaneConfig.resx
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/AirBomber/AirBomber/FormMapWithSetAirplanes.cs b/AirBomber/AirBomber/FormMapWithSetAirplanes.cs
index 8d2b54e..88ec025 100644
--- a/AirBomber/AirBomber/FormMapWithSetAirplanes.cs
+++ b/AirBomber/AirBomber/FormMapWithSetAirplanes.cs
@@ -115,9 +115,9 @@ namespace AirBomber
{
if (listBoxMaps.SelectedIndex == -1)
{
- return;
+ MessageBox.Show("Перед добавлением объекта необходимо создать карту");
}
- if (airplane == null)
+ else if (airplane == null)
{
MessageBox.Show(text, caption);
}
@@ -216,21 +216,23 @@ namespace AirBomber
_generatorAirplane.AddTypeOfEngines(typeAirplaneEngines);
}
///
- /// Добавление объекта
+ /// Вызов формы для создания самолета
///
///
///
private void ButtonAddAirplane_Click(object sender, EventArgs e)
{
- if (listBoxMaps.SelectedIndex == -1)
- {
- return;
- }
- FormAirBomber form = new();
- if (form.ShowDialog() == DialogResult.OK && form.SelectedAirplane != null)
- {
- AddAirplaneInMap(form.SelectedAirplane);
- }
+ FormAirplaneConfig formAirplane = new();
+ formAirplane.AddEvent(new(AddAirplane));
+ formAirplane.Show();
+ }
+ ///
+ /// Добавление объекта
+ ///
+ ///
+ private void AddAirplane(DrawningAirplane airplane)
+ {
+ AddAirplaneInMap(new(airplane));
}
///
/// Удаление объекта