Удаление пустого класса.

AirplaneWithRadar/AirplaneWithRadar/AirplaneDelegate.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirplaneWithRadar
+{
+    /// <summary>
+    /// Делегат для передачи объекта-самолета
+    /// </summary>
+    /// <param name="airplane"></param>
+    public delegate void AirplaneDelegate(DrawingAirplane airplane);
+}

AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs

@@ -63,6 +63,12 @@ namespace AirplaneWithRadar
             _airplaneWidth = airplaneWidth;
             _airplaneHeight = airplaneHeight;
         }
+
+        public void SetColor(Color color)
+        {
+           Airplane.BodyColor = color;
+        }
+
         /// <summary>
         /// Установка позиции самолета
         /// </summary>

AirplaneWithRadar/AirplaneWithRadar/DrawingAirplaneWithRadar.cs

@@ -21,6 +21,12 @@ namespace AirplaneWithRadar
         {
             Airplane = new EntityAirplaneWithRadar(speed, weight, bodyColor, dopColor, radar, extraFuelTank);
         }
+
+        public void SetDopColor(Color dopColor)
+        {
+            ((EntityAirplaneWithRadar)Airplane).DopColor = dopColor;
+        }
+
         public override void DrawTransport(Graphics g)
         {
             if (Airplane is not EntityAirplaneWithRadar airplaneWithRadar)

AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs

@@ -23,7 +23,7 @@ namespace AirplaneWithRadar
         /// <summary>
         /// Цвет кузова
         /// </summary>
-        public Color BodyColor { get; private set; }
+        public Color BodyColor { get; set; }
         /// <summary>
         /// Шаг перемещения самолета
         /// </summary>

AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs

@@ -11,7 +11,7 @@ namespace AirplaneWithRadar
         /// <summary>
         /// Дополнительный цвет
         /// </summary>
-        public Color DopColor { get; private set; }
+        public Color DopColor { get; set; }
         /// <summary>
         /// Признак наличия радара
         /// </summary>

AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.Designer.cs

@@ -0,0 +1,361 @@
+namespace AirplaneWithRadar
+{
+    partial class FormAirplaneConfig
+    {
+        /// <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.labelModifiedObject = new System.Windows.Forms.Label();
+            this.labelSimpleObject = new System.Windows.Forms.Label();
+            this.groupBoxColors = new System.Windows.Forms.GroupBox();
+            this.panelBlack = new System.Windows.Forms.Panel();
+            this.panelWhite = new System.Windows.Forms.Panel();
+            this.panelHotPink = new System.Windows.Forms.Panel();
+            this.panelBlueViolet = new System.Windows.Forms.Panel();
+            this.panelDodgerBlue = new System.Windows.Forms.Panel();
+            this.panelYellowGreen = new System.Windows.Forms.Panel();
+            this.panelGold = new System.Windows.Forms.Panel();
+            this.panelRed = new System.Windows.Forms.Panel();
+            this.checkBoxExtraFuelTank = new System.Windows.Forms.CheckBox();
+            this.checkBoxRadar = 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.pictureBoxObject = new System.Windows.Forms.PictureBox();
+            this.panelObject = new System.Windows.Forms.Panel();
+            this.labelDopColor = new System.Windows.Forms.Label();
+            this.labelBaseColor = new System.Windows.Forms.Label();
+            this.buttonOk = new System.Windows.Forms.Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.groupBoxConfig.SuspendLayout();
+            this.groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
+            this.panelObject.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBoxConfig
+            // 
+            this.groupBoxConfig.Controls.Add(this.labelModifiedObject);
+            this.groupBoxConfig.Controls.Add(this.labelSimpleObject);
+            this.groupBoxConfig.Controls.Add(this.groupBoxColors);
+            this.groupBoxConfig.Controls.Add(this.checkBoxExtraFuelTank);
+            this.groupBoxConfig.Controls.Add(this.checkBoxRadar);
+            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.Location = new System.Drawing.Point(12, 12);
+            this.groupBoxConfig.Name = "groupBoxConfig";
+            this.groupBoxConfig.Size = new System.Drawing.Size(593, 306);
+            this.groupBoxConfig.TabIndex = 0;
+            this.groupBoxConfig.TabStop = false;
+            this.groupBoxConfig.Text = "Параметры";
+            // 
+            // labelModifiedObject
+            // 
+            this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelModifiedObject.Location = new System.Drawing.Point(436, 212);
+            this.labelModifiedObject.Name = "labelModifiedObject";
+            this.labelModifiedObject.Size = new System.Drawing.Size(138, 38);
+            this.labelModifiedObject.TabIndex = 8;
+            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(292, 212);
+            this.labelSimpleObject.Name = "labelSimpleObject";
+            this.labelSimpleObject.Size = new System.Drawing.Size(138, 38);
+            this.labelSimpleObject.TabIndex = 7;
+            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.panelBlack);
+            this.groupBoxColors.Controls.Add(this.panelWhite);
+            this.groupBoxColors.Controls.Add(this.panelHotPink);
+            this.groupBoxColors.Controls.Add(this.panelBlueViolet);
+            this.groupBoxColors.Controls.Add(this.panelDodgerBlue);
+            this.groupBoxColors.Controls.Add(this.panelYellowGreen);
+            this.groupBoxColors.Controls.Add(this.panelGold);
+            this.groupBoxColors.Controls.Add(this.panelRed);
+            this.groupBoxColors.Location = new System.Drawing.Point(318, 30);
+            this.groupBoxColors.Name = "groupBoxColors";
+            this.groupBoxColors.Size = new System.Drawing.Size(230, 159);
+            this.groupBoxColors.TabIndex = 6;
+            this.groupBoxColors.TabStop = false;
+            this.groupBoxColors.Text = "Цвета";
+            // 
+            // panelBlack
+            // 
+            this.panelBlack.BackColor = System.Drawing.Color.Black;
+            this.panelBlack.Location = new System.Drawing.Point(174, 86);
+            this.panelBlack.Name = "panelBlack";
+            this.panelBlack.Size = new System.Drawing.Size(50, 50);
+            this.panelBlack.TabIndex = 1;
+            // 
+            // panelWhite
+            // 
+            this.panelWhite.BackColor = System.Drawing.Color.White;
+            this.panelWhite.Location = new System.Drawing.Point(118, 86);
+            this.panelWhite.Name = "panelWhite";
+            this.panelWhite.Size = new System.Drawing.Size(50, 50);
+            this.panelWhite.TabIndex = 1;
+            // 
+            // panelHotPink
+            // 
+            this.panelHotPink.BackColor = System.Drawing.Color.HotPink;
+            this.panelHotPink.Location = new System.Drawing.Point(62, 86);
+            this.panelHotPink.Name = "panelHotPink";
+            this.panelHotPink.Size = new System.Drawing.Size(50, 50);
+            this.panelHotPink.TabIndex = 1;
+            // 
+            // panelBlueViolet
+            // 
+            this.panelBlueViolet.BackColor = System.Drawing.Color.BlueViolet;
+            this.panelBlueViolet.Location = new System.Drawing.Point(6, 86);
+            this.panelBlueViolet.Name = "panelBlueViolet";
+            this.panelBlueViolet.Size = new System.Drawing.Size(50, 50);
+            this.panelBlueViolet.TabIndex = 1;
+            // 
+            // panelDodgerBlue
+            // 
+            this.panelDodgerBlue.BackColor = System.Drawing.Color.DodgerBlue;
+            this.panelDodgerBlue.Location = new System.Drawing.Point(174, 30);
+            this.panelDodgerBlue.Name = "panelDodgerBlue";
+            this.panelDodgerBlue.Size = new System.Drawing.Size(50, 50);
+            this.panelDodgerBlue.TabIndex = 1;
+            // 
+            // panelYellowGreen
+            // 
+            this.panelYellowGreen.BackColor = System.Drawing.Color.YellowGreen;
+            this.panelYellowGreen.Location = new System.Drawing.Point(118, 30);
+            this.panelYellowGreen.Name = "panelYellowGreen";
+            this.panelYellowGreen.Size = new System.Drawing.Size(50, 50);
+            this.panelYellowGreen.TabIndex = 1;
+            // 
+            // panelGold
+            // 
+            this.panelGold.BackColor = System.Drawing.Color.Gold;
+            this.panelGold.Location = new System.Drawing.Point(62, 30);
+            this.panelGold.Name = "panelGold";
+            this.panelGold.Size = new System.Drawing.Size(50, 50);
+            this.panelGold.TabIndex = 1;
+            // 
+            // panelRed
+            // 
+            this.panelRed.BackColor = System.Drawing.Color.Red;
+            this.panelRed.Location = new System.Drawing.Point(6, 30);
+            this.panelRed.Name = "panelRed";
+            this.panelRed.Size = new System.Drawing.Size(50, 50);
+            this.panelRed.TabIndex = 0;
+            // 
+            // checkBoxExtraFuelTank
+            // 
+            this.checkBoxExtraFuelTank.AutoSize = true;
+            this.checkBoxExtraFuelTank.Location = new System.Drawing.Point(7, 262);
+            this.checkBoxExtraFuelTank.Name = "checkBoxExtraFuelTank";
+            this.checkBoxExtraFuelTank.Size = new System.Drawing.Size(367, 29);
+            this.checkBoxExtraFuelTank.TabIndex = 5;
+            this.checkBoxExtraFuelTank.Text = "Признак наличия доп. топливных баков";
+            this.checkBoxExtraFuelTank.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxRadar
+            // 
+            this.checkBoxRadar.AutoSize = true;
+            this.checkBoxRadar.Location = new System.Drawing.Point(7, 218);
+            this.checkBoxRadar.Name = "checkBoxRadar";
+            this.checkBoxRadar.Size = new System.Drawing.Size(244, 29);
+            this.checkBoxRadar.TabIndex = 4;
+            this.checkBoxRadar.Text = "Признак наличия радара";
+            this.checkBoxRadar.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            this.numericUpDownWeight.Location = new System.Drawing.Point(149, 114);
+            this.numericUpDownWeight.Name = "numericUpDownWeight";
+            this.numericUpDownWeight.Size = new System.Drawing.Size(87, 31);
+            this.numericUpDownWeight.TabIndex = 3;
+            this.numericUpDownWeight.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // numericUpDownSpeed
+            // 
+            this.numericUpDownSpeed.Location = new System.Drawing.Point(149, 58);
+            this.numericUpDownSpeed.Name = "numericUpDownSpeed";
+            this.numericUpDownSpeed.Size = new System.Drawing.Size(87, 31);
+            this.numericUpDownSpeed.TabIndex = 2;
+            this.numericUpDownSpeed.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // labelWeight
+            // 
+            this.labelWeight.AutoSize = true;
+            this.labelWeight.Location = new System.Drawing.Point(23, 116);
+            this.labelWeight.Name = "labelWeight";
+            this.labelWeight.Size = new System.Drawing.Size(43, 25);
+            this.labelWeight.TabIndex = 1;
+            this.labelWeight.Text = "Вес:";
+            // 
+            // labelSpeed
+            // 
+            this.labelSpeed.AutoSize = true;
+            this.labelSpeed.Location = new System.Drawing.Point(23, 60);
+            this.labelSpeed.Name = "labelSpeed";
+            this.labelSpeed.Size = new System.Drawing.Size(93, 25);
+            this.labelSpeed.TabIndex = 0;
+            this.labelSpeed.Text = "Скорость:";
+            // 
+            // pictureBoxObject
+            // 
+            this.pictureBoxObject.Location = new System.Drawing.Point(3, 50);
+            this.pictureBoxObject.Name = "pictureBoxObject";
+            this.pictureBoxObject.Size = new System.Drawing.Size(396, 213);
+            this.pictureBoxObject.TabIndex = 1;
+            this.pictureBoxObject.TabStop = false;
+            // 
+            // panelObject
+            // 
+            this.panelObject.AllowDrop = true;
+            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(611, 12);
+            this.panelObject.Name = "panelObject";
+            this.panelObject.Size = new System.Drawing.Size(402, 266);
+            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);
+            // 
+            // labelDopColor
+            // 
+            this.labelDopColor.AllowDrop = true;
+            this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelDopColor.Location = new System.Drawing.Point(211, 9);
+            this.labelDopColor.Name = "labelDopColor";
+            this.labelDopColor.Size = new System.Drawing.Size(138, 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.LabelColor_DragEnter);
+            // 
+            // labelBaseColor
+            // 
+            this.labelBaseColor.AllowDrop = true;
+            this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelBaseColor.Location = new System.Drawing.Point(44, 9);
+            this.labelBaseColor.Name = "labelBaseColor";
+            this.labelBaseColor.Size = new System.Drawing.Size(138, 38);
+            this.labelBaseColor.TabIndex = 9;
+            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.LabelColor_DragEnter);
+            // 
+            // buttonOk
+            // 
+            this.buttonOk.Location = new System.Drawing.Point(681, 284);
+            this.buttonOk.Name = "buttonOk";
+            this.buttonOk.Size = new System.Drawing.Size(112, 34);
+            this.buttonOk.TabIndex = 3;
+            this.buttonOk.Text = "Добавить";
+            this.buttonOk.UseVisualStyleBackColor = true;
+            this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(822, 284);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(112, 34);
+            this.buttonCancel.TabIndex = 4;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // FormAirplaneConfig
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1025, 330);
+            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.groupBoxColors.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit();
+            this.panelObject.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBoxConfig;
+        private GroupBox groupBoxColors;
+        private CheckBox checkBoxExtraFuelTank;
+        private CheckBox checkBoxRadar;
+        private NumericUpDown numericUpDownWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private Label labelWeight;
+        private Label labelSpeed;
+        private Label labelModifiedObject;
+        private Label labelSimpleObject;
+        private Panel panelBlack;
+        private Panel panelWhite;
+        private Panel panelHotPink;
+        private Panel panelBlueViolet;
+        private Panel panelDodgerBlue;
+        private Panel panelYellowGreen;
+        private Panel panelGold;
+        private Panel panelRed;
+        private PictureBox pictureBoxObject;
+        private Panel panelObject;
+        private Label labelDopColor;
+        private Label labelBaseColor;
+        private Button buttonOk;
+        private Button buttonCancel;
+    }
+}

AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.cs

@@ -0,0 +1,174 @@
+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 AirplaneWithRadar
+{
+    /// <summary>
+    /// Форма создания объекта
+    /// </summary>
+    public partial class FormAirplaneConfig : Form
+    {
+        /// <summary>
+        /// Переменная-выбранный самолет
+        /// </summary>
+        DrawingAirplane _airplane = null;
+        /// <summary>
+        /// Событие
+        /// </summary>
+        public event AirplaneDelegate EventAddAirplane;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormAirplaneConfig()
+        {
+            InitializeComponent();
+            panelRed.MouseDown += PanelColor_MouseDown;
+            panelGold.MouseDown += PanelColor_MouseDown;
+            panelYellowGreen.MouseDown += PanelColor_MouseDown;
+            panelDodgerBlue.MouseDown += PanelColor_MouseDown;
+            panelBlueViolet.MouseDown += PanelColor_MouseDown;
+            panelHotPink.MouseDown += PanelColor_MouseDown;
+            panelWhite.MouseDown += PanelColor_MouseDown;
+            panelBlack.MouseDown += PanelColor_MouseDown;
+            // TODO buttonCancel.Click with lambda
+            buttonCancel.Click += (object sender, EventArgs e) => Close();
+        }
+        /// <summary>
+        /// Отрисовать самолет
+        /// </summary>
+        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;
+        }
+        /// <summary>
+        /// Добавление события
+        /// </summary>
+        /// <param name="ev"></param>
+        public void AddEvent(AirplaneDelegate ev)
+        {
+            if (EventAddAirplane == null)
+            {
+                EventAddAirplane = ev;
+            }
+            else
+            {
+                EventAddAirplane += 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 "labelSimpleObject":
+                    _airplane = new DrawingAirplane((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White);
+                    break;
+                case "labelModifiedObject":
+                    _airplane = new DrawingAirplaneWithRadar((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxRadar.Checked, checkBoxExtraFuelTank.Checked);
+                    break;
+            }
+            DrawAirplane();
+        }
+        /// <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_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 LabelBaseColor_DragDrop(object sender, DragEventArgs e)
+        {
+            Color BodyColor = (Color)e.Data.GetData(typeof(Color));
+            _airplane.SetColor(BodyColor);
+            DrawAirplane();
+        }
+        /// <summary>
+        /// Принимаем дополнительный цвет
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelDopColor_DragDrop(object sender, DragEventArgs e)
+        {
+            Color ModifColor = (Color)e.Data.GetData(typeof(Color));
+            if (_airplane is DrawingAirplaneWithRadar airplaneWithRadar)
+            {
+                airplaneWithRadar.SetDopColor(ModifColor);
+                DrawAirplane();
+            }
+        }
+        /// <summary>
+        /// Добавление самолета
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonOk_Click(object sender, EventArgs e)
+        {
+            EventAddAirplane?.Invoke(_airplane);
+            Close();
+        }
+    } 
+}

AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.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>

AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs

@@ -48,7 +48,11 @@ namespace AirplaneWithRadar
             SetData();
             Draw();
         }
-
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void ButtonMove_Click(object sender, EventArgs e)
         {
             string name = ((Button)sender)?.Name ?? string.Empty;

AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.Designer.cs

@@ -29,6 +29,12 @@
         private void InitializeComponent()
         {
             this.groupBox = new System.Windows.Forms.GroupBox();
+            this.groupBoxMaps = new System.Windows.Forms.GroupBox();
+            this.buttonDeleteMap = new System.Windows.Forms.Button();
+            this.listBoxMaps = new System.Windows.Forms.ListBox();
+            this.buttonAddMap = new System.Windows.Forms.Button();
+            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonLeft = new System.Windows.Forms.Button();
@@ -38,14 +44,15 @@
             this.buttonRemoveAirplane = new System.Windows.Forms.Button();
             this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
             this.buttonAddAirplane = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
             this.pictureBox = new System.Windows.Forms.PictureBox();
             this.groupBox.SuspendLayout();
+            this.groupBoxMaps.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
             this.SuspendLayout();
             // 
             // groupBox
             // 
+            this.groupBox.Controls.Add(this.groupBoxMaps);
             this.groupBox.Controls.Add(this.buttonRight);
             this.groupBox.Controls.Add(this.buttonDown);
             this.groupBox.Controls.Add(this.buttonLeft);
@@ -55,20 +62,82 @@
             this.groupBox.Controls.Add(this.buttonRemoveAirplane);
             this.groupBox.Controls.Add(this.maskedTextBoxPosition);
             this.groupBox.Controls.Add(this.buttonAddAirplane);
-            this.groupBox.Controls.Add(this.comboBoxSelectorMap);
             this.groupBox.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBox.Location = new System.Drawing.Point(723, 0);
+            this.groupBox.Location = new System.Drawing.Point(896, 0);
             this.groupBox.Name = "groupBox";
-            this.groupBox.Size = new System.Drawing.Size(257, 526);
+            this.groupBox.Size = new System.Drawing.Size(257, 754);
             this.groupBox.TabIndex = 0;
             this.groupBox.TabStop = false;
             this.groupBox.Text = "Инструменты";
             // 
+            // groupBoxMaps
+            // 
+            this.groupBoxMaps.Controls.Add(this.buttonDeleteMap);
+            this.groupBoxMaps.Controls.Add(this.listBoxMaps);
+            this.groupBoxMaps.Controls.Add(this.buttonAddMap);
+            this.groupBoxMaps.Controls.Add(this.textBoxNewMapName);
+            this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBoxMaps.Location = new System.Drawing.Point(6, 30);
+            this.groupBoxMaps.Name = "groupBoxMaps";
+            this.groupBoxMaps.Size = new System.Drawing.Size(245, 348);
+            this.groupBoxMaps.TabIndex = 11;
+            this.groupBoxMaps.TabStop = false;
+            this.groupBoxMaps.Text = "Карты";
+            // 
+            // buttonDeleteMap
+            // 
+            this.buttonDeleteMap.Location = new System.Drawing.Point(17, 298);
+            this.buttonDeleteMap.Name = "buttonDeleteMap";
+            this.buttonDeleteMap.Size = new System.Drawing.Size(222, 34);
+            this.buttonDeleteMap.TabIndex = 4;
+            this.buttonDeleteMap.Text = "Удалить карту";
+            this.buttonDeleteMap.UseVisualStyleBackColor = true;
+            this.buttonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
+            // 
+            // listBoxMaps
+            // 
+            this.listBoxMaps.FormattingEnabled = true;
+            this.listBoxMaps.ItemHeight = 25;
+            this.listBoxMaps.Location = new System.Drawing.Point(17, 156);
+            this.listBoxMaps.Name = "listBoxMaps";
+            this.listBoxMaps.Size = new System.Drawing.Size(222, 129);
+            this.listBoxMaps.TabIndex = 3;
+            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
+            // 
+            // buttonAddMap
+            // 
+            this.buttonAddMap.Location = new System.Drawing.Point(17, 104);
+            this.buttonAddMap.Name = "buttonAddMap";
+            this.buttonAddMap.Size = new System.Drawing.Size(222, 34);
+            this.buttonAddMap.TabIndex = 2;
+            this.buttonAddMap.Text = "Добавить карту";
+            this.buttonAddMap.UseVisualStyleBackColor = true;
+            this.buttonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
+            // 
+            // textBoxNewMapName
+            // 
+            this.textBoxNewMapName.Location = new System.Drawing.Point(17, 28);
+            this.textBoxNewMapName.Name = "textBoxNewMapName";
+            this.textBoxNewMapName.Size = new System.Drawing.Size(222, 31);
+            this.textBoxNewMapName.TabIndex = 1;
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Карта с линиями",
+            "Карта с блоками"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(17, 65);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(222, 33);
+            this.comboBoxSelectorMap.TabIndex = 0;
+            // 
             // buttonRight
             // 
             this.buttonRight.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.right;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(160, 433);
+            this.buttonRight.Location = new System.Drawing.Point(153, 701);
             this.buttonRight.Name = "buttonRight";
             this.buttonRight.Size = new System.Drawing.Size(30, 30);
             this.buttonRight.TabIndex = 10;
@@ -79,7 +148,7 @@
             // 
             this.buttonDown.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.down;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(124, 433);
+            this.buttonDown.Location = new System.Drawing.Point(117, 701);
             this.buttonDown.Name = "buttonDown";
             this.buttonDown.Size = new System.Drawing.Size(30, 30);
             this.buttonDown.TabIndex = 9;
@@ -90,7 +159,7 @@
             // 
             this.buttonLeft.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.left;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(88, 433);
+            this.buttonLeft.Location = new System.Drawing.Point(81, 701);
             this.buttonLeft.Name = "buttonLeft";
             this.buttonLeft.Size = new System.Drawing.Size(30, 30);
             this.buttonLeft.TabIndex = 8;
@@ -101,7 +170,7 @@
             // 
             this.buttonUp.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.up;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(124, 397);
+            this.buttonUp.Location = new System.Drawing.Point(117, 665);
             this.buttonUp.Name = "buttonUp";
             this.buttonUp.Size = new System.Drawing.Size(30, 30);
             this.buttonUp.TabIndex = 7;
@@ -110,7 +179,7 @@
             // 
             // buttonShowOnMap
             // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(23, 319);
+            this.buttonShowOnMap.Location = new System.Drawing.Point(23, 603);
             this.buttonShowOnMap.Name = "buttonShowOnMap";
             this.buttonShowOnMap.Size = new System.Drawing.Size(222, 34);
             this.buttonShowOnMap.TabIndex = 6;
@@ -120,7 +189,7 @@
             // 
             // buttonShowStorage
             // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(23, 251);
+            this.buttonShowStorage.Location = new System.Drawing.Point(23, 549);
             this.buttonShowStorage.Name = "buttonShowStorage";
             this.buttonShowStorage.Size = new System.Drawing.Size(222, 37);
             this.buttonShowStorage.TabIndex = 5;
@@ -130,7 +199,7 @@
             // 
             // buttonRemoveAirplane
             // 
-            this.buttonRemoveAirplane.Location = new System.Drawing.Point(23, 186);
+            this.buttonRemoveAirplane.Location = new System.Drawing.Point(23, 497);
             this.buttonRemoveAirplane.Name = "buttonRemoveAirplane";
             this.buttonRemoveAirplane.Size = new System.Drawing.Size(222, 34);
             this.buttonRemoveAirplane.TabIndex = 4;
@@ -140,7 +209,7 @@
             // 
             // maskedTextBoxPosition
             // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(23, 149);
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(23, 460);
             this.maskedTextBoxPosition.Mask = "00";
             this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
             this.maskedTextBoxPosition.Size = new System.Drawing.Size(222, 31);
@@ -148,7 +217,7 @@
             // 
             // buttonAddAirplane
             // 
-            this.buttonAddAirplane.Location = new System.Drawing.Point(23, 94);
+            this.buttonAddAirplane.Location = new System.Drawing.Point(23, 406);
             this.buttonAddAirplane.Name = "buttonAddAirplane";
             this.buttonAddAirplane.Size = new System.Drawing.Size(222, 34);
             this.buttonAddAirplane.TabIndex = 2;
@@ -156,25 +225,12 @@
             this.buttonAddAirplane.UseVisualStyleBackColor = true;
             this.buttonAddAirplane.Click += new System.EventHandler(this.ButtonAddAirplane_Click);
             // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Карта с линиями",
-            "Карта с блоками"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(23, 44);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(222, 33);
-            this.comboBoxSelectorMap.TabIndex = 0;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
             // pictureBox
             // 
             this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureBox.Location = new System.Drawing.Point(0, 0);
             this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(723, 526);
+            this.pictureBox.Size = new System.Drawing.Size(896, 754);
             this.pictureBox.TabIndex = 1;
             this.pictureBox.TabStop = false;
             // 
@@ -182,13 +238,15 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(980, 526);
+            this.ClientSize = new System.Drawing.Size(1153, 754);
             this.Controls.Add(this.pictureBox);
             this.Controls.Add(this.groupBox);
             this.Name = "FormMapWithSetAirplanes";
             this.Text = "FormMapWithSetAirplanes";
             this.groupBox.ResumeLayout(false);
             this.groupBox.PerformLayout();
+            this.groupBoxMaps.ResumeLayout(false);
+            this.groupBoxMaps.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
             this.ResumeLayout(false);
 
@@ -208,5 +266,10 @@
         private Button buttonAddAirplane;
         private ComboBox comboBoxSelectorMap;
         private PictureBox pictureBox;
+        private GroupBox groupBoxMaps;
+        private Button buttonDeleteMap;
+        private ListBox listBoxMaps;
+        private Button buttonAddMap;
+        private TextBox textBoxNewMapName;
     }
 }

AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.cs

@@ -1,45 +1,100 @@
-namespace AirplaneWithRadar
+using static System.Windows.Forms.DataFormats;
+
+namespace AirplaneWithRadar
 {
     public partial class FormMapWithSetAirplanes : Form
     {
         /// <summary>
-        /// Объект от класса карты с набором объектов
+        /// Словарь для выпадающего списка
         /// </summary>
-        private MapWithSetAirplanesGeneric<DrawingObjectAirplane, AbstractMap> _mapAirplanesCollectionGeneric;
+        private readonly Dictionary<string, AbstractMap> _mapsDict = new()
+        {
+            { "Простая карта", new SimpleMap() },
+            { "Карта с блоками", new BlockMap() },
+            { "Карта с линиями", new LineMap() }
+        };
+        /// <summary>
+        /// Объект от коллекции карт
+        /// </summary>
+        private readonly MapsCollection _mapsCollection;
+        private Action<DrawingAirplane> AddAction;
         /// <summary>
         /// Конструктор
         /// </summary>
         public FormMapWithSetAirplanes()
         {
             InitializeComponent();
+            _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
+            comboBoxSelectorMap.Items.Clear();
+            foreach (var elem in _mapsDict)
+            {
+                comboBoxSelectorMap.Items.Add(elem.Key);
+            }
+        }
+        /// <summary>
+        /// Заполнение listBoxMaps
+        /// </summary>
+        private void ReloadMaps()
+        {
+            int index = listBoxMaps.SelectedIndex;
+            listBoxMaps.Items.Clear();
+            for (int i = 0; i < _mapsCollection.Keys.Count; i++)
+            {
+                listBoxMaps.Items.Add(_mapsCollection.Keys[i]);
+            }
+            if (listBoxMaps.Items.Count > 0 && (index == -1 || index >= listBoxMaps.Items.Count))
+            {
+                listBoxMaps.SelectedIndex = 0;
+            }
+            else if (listBoxMaps.Items.Count > 0 && index > -1 && index < listBoxMaps.Items.Count)
+            {
+                listBoxMaps.SelectedIndex = index;
+            }
+        }
+        /// <summary>
+        /// Добавление карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddMap_Click(object sender, EventArgs e)
+        {
+            if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text))
+            {
+                MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]);
+            ReloadMaps();
         }
         /// <summary>
         /// Выбор карты
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+        private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
         {
-            AbstractMap map = null;
-            switch (comboBoxSelectorMap.Text)
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+        /// <summary>
+        /// Удаление карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonDeleteMap_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
             {
-                case "Простая карта":
-                    map = new SimpleMap();
-                    break;
-                case "Карта с линиями":
-                    map = new LineMap();
-                    break;
-                case "Карта с блоками":
-                    map = new BlockMap();
-                    break;
+                return;
             }
-            if (map != null)
+            if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
             {
-                _mapAirplanesCollectionGeneric = new MapWithSetAirplanesGeneric<DrawingObjectAirplane, AbstractMap>(pictureBox.Width, pictureBox.Height, map);
-            }
-            else
-            {
-                _mapAirplanesCollectionGeneric = null;
+                _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+                ReloadMaps();
             }
         }
         /// <summary>
@@ -49,23 +104,27 @@
         /// <param name="e"></param>
         private void ButtonAddAirplane_Click(object sender, EventArgs e)
         {
-            if (_mapAirplanesCollectionGeneric == null)
+            // TODO Call method AddEvent from formCarConfig
+            var formAirplaneConfig = new FormAirplaneConfig();
+            formAirplaneConfig.AddEvent(AddAirplaneOnMap);
+            formAirplaneConfig.Show();
+
+        }
+        private void AddAirplaneOnMap(DrawingAirplane drawingAirplane)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            FormAirplaneWithRadar form = new();
-            if (form.ShowDialog() == DialogResult.OK)
+            DrawingObjectAirplane airplane = new(drawingAirplane);
+            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + airplane != -1)
             {
-                DrawingObjectAirplane airplane = new(form.SelectedAirplane);
-                if (_mapAirplanesCollectionGeneric + airplane != -1)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapAirplanesCollectionGeneric.ShowSet();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
+                MessageBox.Show("Объект добавлен");
+                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось добавить объект");
             }
         }
         /// <summary>
@@ -75,19 +134,23 @@
         /// <param name="e"></param>
         private void ButtonRemoveAirplane_Click(object sender, EventArgs e)
         {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
             if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
             {
                 return;
             }
-            if (MessageBox.Show("Удалить объект?", "Удаление",MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
             {
                 return;
             }
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapAirplanesCollectionGeneric - pos != null)
+            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
             {
                 MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapAirplanesCollectionGeneric.ShowSet();
+                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
             }
             else
             {
@@ -101,11 +164,11 @@
         /// <param name="e"></param>
         private void ButtonShowStorage_Click(object sender, EventArgs e)
         {
-            if (_mapAirplanesCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            pictureBox.Image = _mapAirplanesCollectionGeneric.ShowSet();
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
         }
         /// <summary>
         /// Вывод карты
@@ -114,11 +177,11 @@
         /// <param name="e"></param>
         private void ButtonShowOnMap_Click(object sender, EventArgs e)
         {
-            if (_mapAirplanesCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            pictureBox.Image = _mapAirplanesCollectionGeneric.ShowOnMap();
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
         }
         /// <summary>
         /// Перемещение
@@ -127,10 +190,11 @@
         /// <param name="e"></param>
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            if (_mapAirplanesCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
+            //получаем имя кнопки
             string name = ((Button)sender)?.Name ?? string.Empty;
             Direction dir = Direction.None;
             switch (name)
@@ -148,7 +212,7 @@
                     dir = Direction.Right;
                     break;
             }
-            pictureBox.Image = _mapAirplanesCollectionGeneric.MoveObject(dir);
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
         }
     }
 }

AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplanesGeneric.cs

@@ -94,13 +94,9 @@ namespace AirplaneWithRadar
         public Bitmap ShowOnMap()
         {
             Shaking();
-            for (int i = 0; i < _setAirplanes.Count; i++)
+            foreach (var airplane in _setAirplanes.GetAirplanes())
             {
-                var airplane = _setAirplanes.Get(i);
-                if (airplane != null)
-                {
-                    return _map.CreateMap(_pictureWidth, _pictureHeight, airplane);
-                }
+                return _map.CreateMap(_pictureWidth, _pictureHeight, airplane);
             }
             return new(_pictureWidth, _pictureHeight);
         }
@@ -125,11 +121,11 @@ namespace AirplaneWithRadar
             int j = _setAirplanes.Count - 1;
             for (int i = 0; i < _setAirplanes.Count; i++)
             {
-                if (_setAirplanes.Get(i) == null)
+                if (_setAirplanes[i] == null)
                 {
                     for (; j > i; j--)
                     {
-                        var airplane = _setAirplanes.Get(j);
+                        var airplane = _setAirplanes[j];
                         if (airplane != null)
                         {
                             _setAirplanes.Insert(airplane, i);
@@ -148,17 +144,6 @@ namespace AirplaneWithRadar
         /// Метод отрисовки фона
         /// </summary>
         /// <param name="g"></param>
-        private void DrawHangar(Graphics g, int x, int y, int width, int height)
-        {
-            Pen pen = new(Color.Black, 3);
-            g.DrawLine(pen, x, y, x + width, y);
-            g.DrawLine(pen, x, y, x, y + height + 20);
-            g.DrawLine(pen, x, y + height + 20, x + width, y + height + 20);
-        }
-        /// <summary>
-        /// Метод отрисовки фона
-        /// </summary>
-        /// <param name="g"></param>
         private void DrawBackground(Graphics g)
         {
             Pen pen = new(Color.White, 5);
@@ -167,7 +152,7 @@ namespace AirplaneWithRadar
             {
                 for (int j = 0; j < _pictureHeight / _placeSizeHeight; j++)
                 {
-                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth * 4/5, j * _placeSizeHeight);
+                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth * 4 / 5, j * _placeSizeHeight);
                 }
                 g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
             }
@@ -178,14 +163,17 @@ namespace AirplaneWithRadar
         /// <param name="g"></param>
         private void DrawAirplanes(Graphics g)
         {
-            int numInRow = _pictureWidth / _placeSizeWidth;
-            int maxLeft = (numInRow - 1) * _placeSizeWidth;
+            // TODO установка позиции
+            int numObjectsInRow = _pictureWidth / _placeSizeWidth;
+            int maxLeft = (numObjectsInRow - 1) * _placeSizeWidth;
             for (int i = 0; i < _setAirplanes.Count; i++)
             {
-                var airplane = _setAirplanes.Get(i);
-                airplane?.SetObject(maxLeft - i % numInRow * _placeSizeWidth + 5, i / numInRow * _placeSizeHeight + 10, _pictureWidth, _pictureHeight);
+                var airplane = _setAirplanes[i];
+                airplane?.SetObject(maxLeft - i % numObjectsInRow * _placeSizeWidth + 5, i / numObjectsInRow * _placeSizeHeight + 15, _pictureWidth, _pictureHeight);
                 airplane?.DrawingObject(g);
             }
         }
     }
+
 }
+

AirplaneWithRadar/AirplaneWithRadar/MapsCollection.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirplaneWithRadar
+{
+    /// <summary>
+    /// Класс для хранения коллекции карт
+    /// </summary>
+    internal class MapsCollection
+    {
+        /// <summary>
+        /// Словарь (хранилище) с картами
+        /// </summary>
+        readonly Dictionary<string, MapWithSetAirplanesGeneric<DrawingObjectAirplane, AbstractMap>> _mapStorages;
+        /// <summary>
+        /// Возвращение списка названий карт
+        /// </summary>
+        public List<string> Keys => _mapStorages.Keys.ToList();
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="pictureWidth"></param>
+        /// <param name="pictureHeight"></param>
+        public MapsCollection(int pictureWidth, int pictureHeight)
+        {
+            _mapStorages = new Dictionary<string, MapWithSetAirplanesGeneric<DrawingObjectAirplane, AbstractMap>>();
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+        }
+        /// <summary>
+        /// Добавление карты
+        /// </summary>
+        /// <param name="name">Название карты</param>
+        /// <param name="map">Карта</param>
+        public void AddMap(string name, AbstractMap map)
+        {
+            // TODO Прописать логику для добавления
+            if (!Keys.Contains(name))
+            {
+                _mapStorages.Add(name, new MapWithSetAirplanesGeneric<DrawingObjectAirplane, AbstractMap>(_pictureWidth, _pictureHeight, map));
+            }
+        }
+        /// <summary>
+        /// Удаление карты
+        /// </summary>
+        /// <param name="name">Название карты</param>
+        public void DelMap(string name)
+        {
+            // TODO Прописать логику для удаления
+            if (Keys.Contains(name))
+            {
+                _mapStorages.Remove(name);
+            }
+        }
+        /// <summary>
+        /// Доступ к парковке
+        /// </summary>
+        /// <param name="ind"></param>
+        /// <returns></returns>
+        public MapWithSetAirplanesGeneric<DrawingObjectAirplane, AbstractMap> this[string ind]
+        {
+            get
+            {
+                // TODO Продумать логику получения объекта
+                if (Keys.Contains(ind))
+                {
+                    return _mapStorages[ind];
+                }
+                return null;
+            }
+        }
+    }
+}

AirplaneWithRadar/AirplaneWithRadar/SetAirplanesGeneric.cs

@@ -14,20 +14,25 @@ namespace AirplaneWithRadar
         where T : class
     {
         /// <summary>
-        /// Массив объектов, которые храним
+        /// Список объектов, которые храним
         /// </summary>
-        private readonly T[] _places;
+        private readonly List<T> _places;
         /// <summary>
-        /// Количество объектов в массиве
+        /// Количество объектов в списке
         /// </summary>
-        public int Count => _places.Length;
+        public int Count => _places.Count;
+        /// <summary>
+        /// Максимальное количество объектов в списке
+        /// </summary>
+        private readonly int _maxCount;
         /// <summary>
         /// Конструктор
         /// </summary>
         /// <param name="count"></param>
         public SetAirplanesGeneric(int count)
         {
-            _places = new T[count];
+            _maxCount = count;
+            _places = new List<T>();
         }
         /// <summary>
         /// Добавление объекта в набор
@@ -36,7 +41,13 @@ namespace AirplaneWithRadar
         /// <returns></returns>
         public int Insert(T airplane)
         {
-            return Insert(airplane, 0);
+            // TODO вставка в начало набора
+            // TODO проверка на _maxCount
+            if (Count < _maxCount)
+            {
+                return Insert(airplane, 0);
+            }
+            return -1;
         }
         /// <summary>
         /// Добавление объекта в набор на конкретную позицию
@@ -46,21 +57,13 @@ namespace AirplaneWithRadar
         /// <returns></returns>
         public int Insert(T airplane, int position)
         {
-            int positionNullElement = position;
-            while (Get(positionNullElement) != null)
-            {
-                positionNullElement++;
-            }
-            if (positionNullElement > Count || positionNullElement < 0)
+            // TODO проверка позиции
+            // TODO вставка по позиции
+            if (position < 0 || position >= _maxCount)
             {
                 return -1;
             }
-            while (positionNullElement != position)
-            {
-                _places[positionNullElement] = _places[positionNullElement - 1];
-                positionNullElement--;
-            }
-            _places[position] = airplane;
+            _places.Insert(position, airplane);
             return position;
         }
         /// <summary>
@@ -70,32 +73,59 @@ namespace AirplaneWithRadar
         /// <returns></returns>
         public T Remove(int position)
         {
-            if (position > Count || position < 0)
+            // TODO проверка позиции
+            if (position < 0 || position >= Count)
             {
                 return null;
             }
-            else
-            {
-                var removedObject = _places[position];
-                _places[position] = null;
-                return removedObject;
-            }
+            T airplane = _places[position];
+            _places.RemoveAt(position);
+            return airplane;
         }
         /// <summary>
         /// Получение объекта из набора по позиции
         /// </summary>
         /// <param name="position"></param>
         /// <returns></returns>
-        public T Get(int position)
+        public T this[int position]
         {
-            if (position > Count || position < 0)
-            {
-                return null;
-            }
-            else
+            get
             {
+                // TODO проверка позиции
+                if (position < 0 || position >= Count)
+                {
+                    return null;
+                }
                 return _places[position];
             }
+            set
+            {
+                // TODO проверка позиции
+                // TODO вставка в список по позиции
+                if (position < 0 || position >= _maxCount)
+                {
+                    return;
+                }
+                _places.Add(value);
+            }
+        }
+        /// <summary>
+        /// Проход по набору до первого пустого
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<T> GetAirplanes()
+        {
+            foreach (var airplane in _places)
+            {
+                if (airplane != null)
+                {
+                    yield return airplane;
+                }
+                else
+                {
+                    yield break;
+                }
+            }
         }
     }
 }

AirplaneWithRadar/EntityAirplaneWithRadar.cs

@@ -1,8 +0,0 @@
-using System;
-
-public class Class1
-{
-	public Class1()
-	{
-	}
-}