Merge pull request 'DozorovaA.A_FifthLabWork' (#5) from FifthLabWork into FourthLabWork

Reviewed-on: http://student.git.athene.tech/DozorovaA.A/PIbd-22_DozorovaAA_ArmoredVehicle_Simple/pulls/5

ArmoredVehicle/DrawingArmoredVehicle.cs

@@ -53,7 +53,11 @@ namespace ArmoredVehicle
             _ArmoredVehicleHeight = ArmoredVehicleHeight + 50;
             _ArmoredVehicleWidth = ArmoredVehicleWidth + 150;
         }
-       
+
+        public DrawingArmoredVehicle Copy(int? speed = null, float? weight = null, Color? bodyColor = null)
+        {
+            return new DrawingArmoredVehicle(speed ?? ArmoredVehicle.Speed, weight ?? ArmoredVehicle.Weight, bodyColor ?? ArmoredVehicle.BodyColor);
+        }
 
         /// <summary>
         /// Установка позиции 

ArmoredVehicle/DrawingTank.cs

@@ -8,12 +8,19 @@ namespace ArmoredVehicle
 {
     internal class DrawingTank : DrawingArmoredVehicle
     {
-        public DrawingTank(int speed, float weight, Color bodyColor, Color dopColor, bool machineGun, bool tower, bool gun) 
+        public DrawingTank(int speed, float weight, Color bodyColor, Color dopColor, bool machineGun, bool tower) 
             : base(speed, weight, bodyColor, 200, 60)
         {
-            ArmoredVehicle = new TankEnity(speed, weight, bodyColor, dopColor, machineGun, tower, gun);
+            ArmoredVehicle = new TankEnity(speed, weight, bodyColor, dopColor, machineGun, tower);
+        }
+
+        public DrawingTank Copy(int? speed = null, float? weight = null, Color? bodyColor = null, 
+                            Color? dopColor = null, bool? machineGun = null, bool? tower = null)
+        {
+            var e = (TankEnity)ArmoredVehicle;
+            return new DrawingTank(speed ?? e.Speed, weight ?? e.Weight, bodyColor ?? e.BodyColor, dopColor ?? e.DopColor,
+                                machineGun ?? e.MachineGun, tower ?? e.Tower);
         }
-      
 
         public override void DrawTransport(Graphics g)
         {

ArmoredVehicle/FormMachineConfig.Designer.cs

@@ -0,0 +1,389 @@
+namespace ArmoredVehicle
+{
+    partial class FormMachineConfig
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.groupBoxConfig = new System.Windows.Forms.GroupBox();
+            this.labelHard = new System.Windows.Forms.Label();
+            this.labelSimple = new System.Windows.Forms.Label();
+            this.checkBoxMachineGun = new System.Windows.Forms.CheckBox();
+            this.checkBoxTower = new System.Windows.Forms.CheckBox();
+            this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown();
+            this.labelWeight = new System.Windows.Forms.Label();
+            this.labelSpeed = new System.Windows.Forms.Label();
+            this.groupBoxColors = new System.Windows.Forms.GroupBox();
+            this.panelPale = new System.Windows.Forms.Panel();
+            this.panelOrange = new System.Windows.Forms.Panel();
+            this.panelLightGreen = new System.Windows.Forms.Panel();
+            this.panelGreen = new System.Windows.Forms.Panel();
+            this.panelBlue = new System.Windows.Forms.Panel();
+            this.panelRed = new System.Windows.Forms.Panel();
+            this.panelIndigo = new System.Windows.Forms.Panel();
+            this.panelCoral = new System.Windows.Forms.Panel();
+            this.panelObject = new System.Windows.Forms.Panel();
+            this.labelDopColor = new System.Windows.Forms.Label();
+            this.labelColor = new System.Windows.Forms.Label();
+            this.pictureBoxObject = new System.Windows.Forms.PictureBox();
+            this.buttonAdd = new System.Windows.Forms.Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.groupBoxConfig.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit();
+            this.groupBoxColors.SuspendLayout();
+            this.panelObject.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBoxConfig
+            // 
+            this.groupBoxConfig.Controls.Add(this.labelHard);
+            this.groupBoxConfig.Controls.Add(this.labelSimple);
+            this.groupBoxConfig.Controls.Add(this.checkBoxMachineGun);
+            this.groupBoxConfig.Controls.Add(this.checkBoxTower);
+            this.groupBoxConfig.Controls.Add(this.numericUpDownWeight);
+            this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed);
+            this.groupBoxConfig.Controls.Add(this.labelWeight);
+            this.groupBoxConfig.Controls.Add(this.labelSpeed);
+            this.groupBoxConfig.Controls.Add(this.groupBoxColors);
+            this.groupBoxConfig.Location = new System.Drawing.Point(8, 14);
+            this.groupBoxConfig.Name = "groupBoxConfig";
+            this.groupBoxConfig.Size = new System.Drawing.Size(667, 440);
+            this.groupBoxConfig.TabIndex = 0;
+            this.groupBoxConfig.TabStop = false;
+            this.groupBoxConfig.Text = "Параметры";
+            // 
+            // labelHard
+            // 
+            this.labelHard.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelHard.Location = new System.Drawing.Point(507, 318);
+            this.labelHard.Name = "labelHard";
+            this.labelHard.Size = new System.Drawing.Size(134, 38);
+            this.labelHard.TabIndex = 9;
+            this.labelHard.Text = "Продвинутый";
+            this.labelHard.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelHard.MouseDown += new System.Windows.Forms.MouseEventHandler(this.labelObject_MouseDown);
+            // 
+            // labelSimple
+            // 
+            this.labelSimple.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelSimple.Location = new System.Drawing.Point(292, 318);
+            this.labelSimple.Name = "labelSimple";
+            this.labelSimple.Size = new System.Drawing.Size(121, 38);
+            this.labelSimple.TabIndex = 8;
+            this.labelSimple.Text = "Простой";
+            this.labelSimple.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelSimple.MouseDown += new System.Windows.Forms.MouseEventHandler(this.labelObject_MouseDown);
+            // 
+            // checkBoxMachineGun
+            // 
+            this.checkBoxMachineGun.AutoSize = true;
+            this.checkBoxMachineGun.Location = new System.Drawing.Point(5, 235);
+            this.checkBoxMachineGun.Name = "checkBoxMachineGun";
+            this.checkBoxMachineGun.Size = new System.Drawing.Size(260, 29);
+            this.checkBoxMachineGun.TabIndex = 6;
+            this.checkBoxMachineGun.Text = "Признак наличия пулемета";
+            this.checkBoxMachineGun.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxTower
+            // 
+            this.checkBoxTower.AutoSize = true;
+            this.checkBoxTower.Location = new System.Drawing.Point(5, 202);
+            this.checkBoxTower.Name = "checkBoxTower";
+            this.checkBoxTower.Size = new System.Drawing.Size(238, 29);
+            this.checkBoxTower.TabIndex = 5;
+            this.checkBoxTower.Text = "Признак наличия башни";
+            this.checkBoxTower.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            this.numericUpDownWeight.Location = new System.Drawing.Point(96, 135);
+            this.numericUpDownWeight.Maximum = new decimal(new int[] {
+            100000,
+            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(106, 31);
+            this.numericUpDownWeight.TabIndex = 4;
+            this.numericUpDownWeight.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // numericUpDownSpeed
+            // 
+            this.numericUpDownSpeed.Location = new System.Drawing.Point(97, 94);
+            this.numericUpDownSpeed.Maximum = new decimal(new int[] {
+            100000,
+            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(105, 31);
+            this.numericUpDownSpeed.TabIndex = 3;
+            this.numericUpDownSpeed.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // labelWeight
+            // 
+            this.labelWeight.AutoSize = true;
+            this.labelWeight.Location = new System.Drawing.Point(6, 134);
+            this.labelWeight.Name = "labelWeight";
+            this.labelWeight.Size = new System.Drawing.Size(39, 25);
+            this.labelWeight.TabIndex = 2;
+            this.labelWeight.Text = "Вес";
+            // 
+            // labelSpeed
+            // 
+            this.labelSpeed.AutoSize = true;
+            this.labelSpeed.Location = new System.Drawing.Point(6, 91);
+            this.labelSpeed.Name = "labelSpeed";
+            this.labelSpeed.Size = new System.Drawing.Size(89, 25);
+            this.labelSpeed.TabIndex = 1;
+            this.labelSpeed.Text = "Скорость";
+            // 
+            // groupBoxColors
+            // 
+            this.groupBoxColors.Controls.Add(this.panelPale);
+            this.groupBoxColors.Controls.Add(this.panelOrange);
+            this.groupBoxColors.Controls.Add(this.panelLightGreen);
+            this.groupBoxColors.Controls.Add(this.panelGreen);
+            this.groupBoxColors.Controls.Add(this.panelBlue);
+            this.groupBoxColors.Controls.Add(this.panelRed);
+            this.groupBoxColors.Controls.Add(this.panelIndigo);
+            this.groupBoxColors.Controls.Add(this.panelCoral);
+            this.groupBoxColors.Location = new System.Drawing.Point(292, 91);
+            this.groupBoxColors.Name = "groupBoxColors";
+            this.groupBoxColors.Size = new System.Drawing.Size(349, 205);
+            this.groupBoxColors.TabIndex = 0;
+            this.groupBoxColors.TabStop = false;
+            this.groupBoxColors.Text = "Цвета";
+            // 
+            // panelPale
+            // 
+            this.panelPale.BackColor = System.Drawing.Color.PaleTurquoise;
+            this.panelPale.Location = new System.Drawing.Point(183, 111);
+            this.panelPale.Name = "panelPale";
+            this.panelPale.Size = new System.Drawing.Size(64, 57);
+            this.panelPale.TabIndex = 1;
+            this.panelPale.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panelColor_MouseDown);
+            // 
+            // panelOrange
+            // 
+            this.panelOrange.BackColor = System.Drawing.Color.Orange;
+            this.panelOrange.Location = new System.Drawing.Point(101, 111);
+            this.panelOrange.Name = "panelOrange";
+            this.panelOrange.Size = new System.Drawing.Size(64, 57);
+            this.panelOrange.TabIndex = 1;
+            this.panelOrange.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panelColor_MouseDown);
+            // 
+            // panelLightGreen
+            // 
+            this.panelLightGreen.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
+            this.panelLightGreen.Location = new System.Drawing.Point(19, 111);
+            this.panelLightGreen.Name = "panelLightGreen";
+            this.panelLightGreen.Size = new System.Drawing.Size(64, 57);
+            this.panelLightGreen.TabIndex = 1;
+            this.panelLightGreen.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panelColor_MouseDown);
+            // 
+            // panelGreen
+            // 
+            this.panelGreen.BackColor = System.Drawing.Color.Green;
+            this.panelGreen.Location = new System.Drawing.Point(262, 31);
+            this.panelGreen.Name = "panelGreen";
+            this.panelGreen.Size = new System.Drawing.Size(64, 57);
+            this.panelGreen.TabIndex = 1;
+            this.panelGreen.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panelColor_MouseDown);
+            // 
+            // panelBlue
+            // 
+            this.panelBlue.BackColor = System.Drawing.Color.Blue;
+            this.panelBlue.Location = new System.Drawing.Point(183, 30);
+            this.panelBlue.Name = "panelBlue";
+            this.panelBlue.Size = new System.Drawing.Size(64, 57);
+            this.panelBlue.TabIndex = 1;
+            this.panelBlue.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panelColor_MouseDown);
+            // 
+            // panelRed
+            // 
+            this.panelRed.BackColor = System.Drawing.Color.Red;
+            this.panelRed.Location = new System.Drawing.Point(101, 31);
+            this.panelRed.Name = "panelRed";
+            this.panelRed.Size = new System.Drawing.Size(64, 57);
+            this.panelRed.TabIndex = 1;
+            this.panelRed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panelColor_MouseDown);
+            // 
+            // panelIndigo
+            // 
+            this.panelIndigo.BackColor = System.Drawing.Color.Indigo;
+            this.panelIndigo.Location = new System.Drawing.Point(262, 111);
+            this.panelIndigo.Name = "panelIndigo";
+            this.panelIndigo.Size = new System.Drawing.Size(64, 57);
+            this.panelIndigo.TabIndex = 1;
+            this.panelIndigo.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panelColor_MouseDown);
+            // 
+            // panelCoral
+            // 
+            this.panelCoral.BackColor = System.Drawing.Color.Coral;
+            this.panelCoral.Location = new System.Drawing.Point(19, 31);
+            this.panelCoral.Name = "panelCoral";
+            this.panelCoral.Size = new System.Drawing.Size(64, 57);
+            this.panelCoral.TabIndex = 0;
+            this.panelCoral.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panelColor_MouseDown);
+            // 
+            // panelObject
+            // 
+            this.panelObject.AllowDrop = true;
+            this.panelObject.Controls.Add(this.labelDopColor);
+            this.panelObject.Controls.Add(this.labelColor);
+            this.panelObject.Controls.Add(this.pictureBoxObject);
+            this.panelObject.Location = new System.Drawing.Point(695, 27);
+            this.panelObject.Name = "panelObject";
+            this.panelObject.Size = new System.Drawing.Size(475, 399);
+            this.panelObject.TabIndex = 1;
+            this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.panelObject_DragDrop);
+            this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.panelObject_DragEnter);
+            // 
+            // labelDopColor
+            // 
+            this.labelDopColor.AllowDrop = true;
+            this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelDopColor.Location = new System.Drawing.Point(303, 14);
+            this.labelDopColor.Name = "labelDopColor";
+            this.labelDopColor.Size = new System.Drawing.Size(121, 38);
+            this.labelDopColor.TabIndex = 10;
+            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);
+            // 
+            // labelColor
+            // 
+            this.labelColor.AllowDrop = true;
+            this.labelColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelColor.Location = new System.Drawing.Point(78, 14);
+            this.labelColor.Name = "labelColor";
+            this.labelColor.Size = new System.Drawing.Size(121, 38);
+            this.labelColor.TabIndex = 9;
+            this.labelColor.Text = "Цвет";
+            this.labelColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.labelColor_DragDrop);
+            this.labelColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.labelColor_DragEnter);
+            // 
+            // pictureBoxObject
+            // 
+            this.pictureBoxObject.Location = new System.Drawing.Point(17, 59);
+            this.pictureBoxObject.Name = "pictureBoxObject";
+            this.pictureBoxObject.Size = new System.Drawing.Size(441, 321);
+            this.pictureBoxObject.TabIndex = 0;
+            this.pictureBoxObject.TabStop = false;
+            // 
+            // buttonAdd
+            // 
+            this.buttonAdd.Location = new System.Drawing.Point(695, 432);
+            this.buttonAdd.Name = "buttonAdd";
+            this.buttonAdd.Size = new System.Drawing.Size(138, 34);
+            this.buttonAdd.TabIndex = 2;
+            this.buttonAdd.Text = "Добавить";
+            this.buttonAdd.UseVisualStyleBackColor = true;
+            this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(862, 433);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(133, 34);
+            this.buttonCancel.TabIndex = 3;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // FormMachineConfig
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1182, 478);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonAdd);
+            this.Controls.Add(this.panelObject);
+            this.Controls.Add(this.groupBoxConfig);
+            this.Name = "FormMachineConfig";
+            this.Text = "Создание объектов";
+            this.groupBoxConfig.ResumeLayout(false);
+            this.groupBoxConfig.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit();
+            this.groupBoxColors.ResumeLayout(false);
+            this.panelObject.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBoxConfig;
+        private Label labelWeight;
+        private Label labelSpeed;
+        private GroupBox groupBoxColors;
+        private NumericUpDown numericUpDownWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private CheckBox checkBoxMachineGun;
+        private CheckBox checkBoxTower;
+        private Label labelHard;
+        private Label labelSimple;
+        private Panel panelPale;
+        private Panel panelOrange;
+        private Panel panelLightGreen;
+        private Panel panelGreen;
+        private Panel panelBlue;
+        private Panel panelRed;
+        private Panel panelIndigo;
+        private Panel panelCoral;
+        private Panel panelObject;
+        private Label labelDopColor;
+        private Label labelColor;
+        private PictureBox pictureBoxObject;
+        private Button buttonAdd;
+        private Button buttonCancel;
+    }
+}

ArmoredVehicle/FormMachineConfig.cs

@@ -0,0 +1,204 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ArmoredVehicle
+{
+    public partial class FormMachineConfig : Form
+    {
+        /// <summary>
+        /// Переменная-выбранная машина
+        /// </summary>
+        DrawingArmoredVehicle _machine = null;
+        /// <summary>
+        /// Событие
+        /// </summary>
+        public event Action<DrawingArmoredVehicle> EventAddMachine;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormMachineConfig()
+        {
+            InitializeComponent();
+            panelCoral.MouseDown += panelColor_MouseDown;
+            panelRed.MouseDown += panelColor_MouseDown;
+            panelBlue.MouseDown += panelColor_MouseDown;
+            panelOrange.MouseDown += panelColor_MouseDown;
+            panelPale.MouseDown += panelColor_MouseDown;
+            panelGreen.MouseDown += panelColor_MouseDown;
+            panelIndigo.MouseDown += panelColor_MouseDown;
+            panelLightGreen.MouseDown += panelColor_MouseDown;
+
+            buttonCancel.Click += (s, e) => Close();
+        }
+        /// <summary>
+        /// Отрисовать машину
+        /// </summary>
+        private void DrawMachine()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _machine?.SetPosition(5, 5, pictureBoxObject.Width,
+           pictureBoxObject.Height);
+            _machine?.DrawTransport(gr);
+            pictureBoxObject.Image = bmp;
+        }
+        /// <summary>
+        /// Добавление события
+        /// </summary>
+        /// <param name="ev"></param>
+        public void AddEvent(Action<DrawingArmoredVehicle> ev)
+        {
+            if(EventAddMachine == null)
+            {
+                EventAddMachine = new (ev);
+            }
+            else
+            {
+                EventAddMachine += ev;
+            }
+        }
+        /// <summary>
+        /// Передаем информацию при нажатии на Label
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void labelObject_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void panelObject_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.Text))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+
+        }
+        /// <summary>
+        /// Действия при приеме перетаскиваемой информации
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void panelObject_DragDrop(object sender, DragEventArgs e)
+        {
+            switch (e.Data.GetData(DataFormats.Text).ToString())
+            {
+                case "labelSimple":
+                    _machine = new DrawingArmoredVehicle((int)numericUpDownSpeed.Value,
+                   (int)numericUpDownWeight.Value, Color.White);
+                    break;
+                case "labelHard":
+                    _machine = new DrawingTank((int)numericUpDownSpeed.Value,
+                   (int)numericUpDownWeight.Value, Color.White, Color.Black,
+                    checkBoxMachineGun.Checked, checkBoxTower.Checked);
+                    break;
+            }
+            DrawMachine();
+        }
+        /// <summary>
+        /// Отправляем цвет с панели
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void panelColor_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+        /// <summary>
+        /// Принимаем основной цвет
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void labelColor_DragDrop(object sender, DragEventArgs e)
+        {
+            var color = (Color)e.Data.GetData(typeof(Color));
+            if (_machine is DrawingTank)
+            {
+                _machine = ((DrawingTank)_machine).Copy(bodyColor: color);
+            }
+            else if (_machine is DrawingArmoredVehicle)
+            {
+                _machine = _machine.Copy(bodyColor: color);
+            }
+            DrawMachine();
+        }
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void labelColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void labelDopColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if(_machine is DrawingTank)
+            {
+                if (e.Data.GetDataPresent(typeof(Color)))
+                {
+                    e.Effect = DragDropEffects.Copy;
+                }
+                else
+                {
+                    e.Effect = DragDropEffects.None;
+                }
+            }
+           
+            
+        }
+        /// <summary>
+        /// Принимаем дополнительный цвет
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void labelDopColor_DragDrop(object sender, DragEventArgs e)
+        {
+            var color = (Color)e.Data.GetData(typeof(Color));
+            var machine = _machine as DrawingTank;
+            if (machine != null)
+            {
+                _machine = machine.Copy(dopColor: color);
+            }
+            DrawMachine();
+        }
+        /// <summary>
+        /// Добавление машины
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonAdd_Click(object sender, EventArgs e)
+        {
+            EventAddMachine?.Invoke(_machine);
+            Close();
+        }
+    }
+}

ArmoredVehicle/FormMachineConfig.resx

@@ -0,0 +1,60 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

ArmoredVehicle/FormMapWithSetMachine.cs

@@ -119,32 +119,36 @@ namespace ArmoredVehicle
         /// <param name="e"></param>
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-           
+            FormMachineConfig formMachine = new();
+            formMachine.AddEvent(new(AddMachine));
+            formMachine.Show();
+         
+        }
+        /// <summary>
+        /// Добавление объекта
+        /// </summary>
+        /// <param name="machine"></param>
+        private void AddMachine(DrawingArmoredVehicle machine)
+        {
             if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            MainForm form = new();
-            if (form.ShowDialog() == DialogResult.OK)
+            if(machine == null)
             {
-                if (form.SelectedMachine == null)
-                {
-                    MessageBox.Show("Вы не создали объект");
-                    return;
-                }
-                DrawningObject machine = new(form.SelectedMachine);
-                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + machine != -1)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBoxImage.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
+                MessageBox.Show("Необходимо выбрать объект перед добавлением!");
+                return;
+            }
+            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawningObject(machine) != -1)
+            {
+                MessageBox.Show("Объект добавлен");
+                pictureBoxImage.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось добавить объект");
             }
         }
-
         ///<summary>
         /// Удаление объекта
         /// </summary>

ArmoredVehicle/MainForm.cs

@@ -114,7 +114,6 @@ namespace ArmoredVehicle
                                               color,
                                               dopColor,
                                               Convert.ToBoolean(rnd.Next(0, 2)), 
-                                              Convert.ToBoolean(rnd.Next(0, 2)), 
                                               Convert.ToBoolean(rnd.Next(0, 2)));
             SetData();
             Draw();

ArmoredVehicle/TankEnity.cs

@@ -17,14 +17,12 @@ namespace ArmoredVehicle
         /// <param name="dopColor">Дополнительный цвет</param>
         /// <param name="MachineGun">Признак наличия пулемета</param>
         /// <param name="Tower">Признак наличия башни</param>
-        /// <param name="Gun">Признак наличия орудия</param>
 
-        public TankEnity(int speed, float weight, Color bodyColor, Color dopColor, bool machineGun, bool tower, bool gun) : base(speed, weight, bodyColor)
+        public TankEnity(int speed, float weight, Color bodyColor, Color dopColor, bool machineGun, bool tower) : base(speed, weight, bodyColor)
         {
             DopColor = dopColor;
             MachineGun = machineGun;
             Tower = tower;
-            Gun = gun;
         }
 
         /// <summary>
@@ -39,10 +37,6 @@ namespace ArmoredVehicle
         /// Признак наличия башни
         /// </summary>
         public bool Tower { get; private set; }
-        /// <summary>
-        /// Признак наличия орудия
-        /// </summary>
-        public bool Gun { get; private set; }
         
         
     }