Лабораторная работа №5

Reviewed-on: #6

ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/AbstractCompany.cs

@@ -59,7 +59,7 @@ public abstract class AbstractCompany
     /// <returns></returns>
     public static int operator +(AbstractCompany company, DrawningWarship warship)
     {
-        return company._collection.Insert(warship);
+        return company._collection.Insert(warship, 0);
     }
 
     /// <summary>

ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/CollectionType.cs

@@ -0,0 +1,22 @@
+namespace ProjectAircraftCarrier_.CollectionGenericObjects;
+
+/// <summary>
+/// Тип коллекции
+/// </summary>
+public enum CollectionType
+{
+    /// <summary>
+    /// Неопределено
+    /// </summary>
+    None = 0,
+
+    /// <summary>
+    /// Массив
+    /// </summary>
+    Massive = 1,
+
+    /// <summary>
+    /// Список
+    /// </summary>
+    List = 2
+}

ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -21,7 +21,7 @@ public interface ICollectionGenericObjects<T>
     /// Добавление объекта в коллекцию
     /// </summary>
     /// <param name="obj">Добавляемый объект</param>
-    /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
+    /// <returns>индекс добавленного элемента - вставка прошла удачно, -1 - вставка не удалась</returns>
     int Insert(T obj);
 
     /// <summary>
@@ -29,14 +29,14 @@ public interface ICollectionGenericObjects<T>
     /// </summary>
     /// <param name="obj">Добавляемый объект</param>
     /// <param name="position">Позиция</param>
-    /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
+    /// <returns>индекс добавленного элемента - вставка прошла удачно, -1 - вставка не удалась</returns>
     int Insert(T obj, int position);
 
     /// <summary>
     /// Удаление объекта из коллекции с конкретной позиции
     /// </summary>
     /// <param name="position">Позиция</param>
-    /// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
+    /// <returns>удаленный объект - удаление прошло удачно, null - удаление не удалось</returns>
     T? Remove(int position);
 
     /// <summary>

ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/ListGenericObject.cs

@@ -0,0 +1,78 @@
+using System.CodeDom.Compiler;
+
+namespace ProjectAircraftCarrier_.CollectionGenericObjects;
+
+/// <summary>
+/// Параметризованный набор объектов
+/// </summary>
+/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+public class ListGenericObject<T> : ICollectionGenericObjects<T>
+    where T : class
+{
+    /// <summary>
+    /// Список объектов, которые храним
+    /// </summary>
+    private readonly List<T?> _collection;
+
+    /// <summary>
+    /// Максимально допустимое число объектов в списке
+    /// </summary>
+    private int _maxCount;
+
+    public int Count => _collection.Count;
+
+    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public ListGenericObject()
+    {
+        _collection = new();
+    }
+
+    public T? Get(int position)
+    {
+        if (position < 0 || position >= Count)
+        {
+            return null;
+        }
+
+        return _collection[position];
+    }
+
+    public int Insert(T obj)
+    {
+        if (Count == _maxCount)
+        {
+            return -1;
+        }
+        
+        _collection.Add(obj);
+        return _collection.Count;
+    }
+
+    public int Insert(T obj, int position)
+    {
+        if (Count == _maxCount || position < 0 || position > Count)
+        {
+            return -1;
+        }
+        
+        _collection.Insert(position, obj);
+        return position;
+    }
+
+    public T? Remove(int position)
+    {
+        if (position < 0 || position > Count)
+        {
+            return null;
+        }
+
+        T? obj = _collection[position];
+        _collection.RemoveAt(position);
+
+        return obj;
+    }
+}

ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -14,7 +14,23 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Count => _collection.Length;
 
-    public int SetMaxCount { set { if (value > 0) { _collection = new T?[value]; } } }
+    public int SetMaxCount
+    {
+        set
+        {
+            if (value > 0)
+            {
+                if (_collection.Length > 0)
+                {
+                    Array.Resize(ref _collection, value);
+                }
+                else
+                {
+                    _collection = new T?[value];
+                }
+            }
+        }
+    }
 
     /// <summary>
     /// Конструктор
@@ -26,8 +42,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T? Get(int position)
     {
-        // TODO проверка позиции
-        if (position < 0 || position > Count)
+        if (position < 0 || position >= Count)
         {
             return null;
         }
@@ -36,7 +51,6 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Insert(T obj)
     {
-        // TODO вставка в свободное место набора
         for (int i = 0; i < Count; i++)
         {
             if (_collection[i] == null)
@@ -50,12 +64,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Insert(T obj, int position)
     {
-        // TODO проверка позиции
-        // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
-        // ищется свободное место после этой позиции и идет вставка туда
-        // если нет после, ищем до
-        // TODO вставка
-        if (position < 0 || position > Count)
+        if (position < 0 || position >= Count)
         {
             return -1;
         }
@@ -71,7 +80,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             if (_collection[i] == null)
             {
                 _collection[i] = obj;
-                return position;
+                return i;
             }
         }
 
@@ -80,7 +89,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             if (_collection[i] == null)
             {
                 _collection[i] = obj;
-                return position;
+                return i;
             }
         }
 
@@ -89,9 +98,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T? Remove(int position)
     {
-        // TODO проверка позиции
-        // TODO удаление объекта из массива, присвоив элементу массива значение null
-        if (position < 0 || position > Count || _collection[position] == null)
+        if (position < 0 || position >= Count || _collection[position] == null)
         {
             return null;
         }

ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/StorageCollection.cs

@@ -0,0 +1,86 @@
+using ProjectAircraftCarrier_.Drawnings;
+using ProjectAircraftCarrier_.CollectionGenericObjects;
+using System.Xml.Linq;
+
+namespace ProjectAircraftCarrier_.CollectionGenericObjects;
+
+/// <summary>
+/// Класс-хранилище коллекций
+/// </summary>
+/// <typeparam name="T"></typeparam>
+public class StorageCollection<T>
+    where T : class
+{
+    /// <summary>
+    /// Словарь (хранилище) с коллекциями
+    /// </summary>
+    readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
+
+    /// <summary>
+    /// Возвращение списка названий коллекций
+    /// </summary>
+    public List<string> Keys => _storages.Keys.ToList();
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public StorageCollection()
+    {
+        _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
+    }
+
+    /// <summary>
+    /// Добавление коллекции в хранилище
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    /// <param name="collectionType">Тип коллекции</param>
+    public void AddCollection(string name, CollectionType collectionType)
+    {
+        if (name == null || _storages.ContainsKey(name))
+        {
+            return;
+        }
+
+        if (collectionType == CollectionType.Massive)
+        {
+            _storages.Add(name, new MassiveGenericObjects<T>());
+        }
+
+        if (collectionType == CollectionType.List)
+        {
+            _storages.Add(name, new ListGenericObject<T>());
+        }
+    }
+
+    /// <summary>
+    /// Удаление коллекции
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    public void DelCollection(string name)
+    {
+        if (name == null || !_storages.ContainsKey(name))
+        {
+            return;
+        }
+
+        _storages.Remove(name);
+    }
+
+    /// <summary>
+    /// Доступ к коллекции
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    /// <returns></returns>
+    public ICollectionGenericObjects<T>? this[string name]
+    {
+        get
+        {
+            if (_storages.ContainsKey(name))
+            {
+                return _storages[name];
+            }
+            
+            return null;
+        }
+    }
+}

ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityAircraftCarrier.cs

@@ -42,4 +42,13 @@ public class EntityAircraftCarrier : EntityWarship
         ControlCabin = controlCabin;
         FighterJet = fighterJet;
     }
+
+    /// <summary>
+    /// Смена дополнительного цвета
+    /// </summary>
+    /// <param name="newColor"></param>
+    public void AdditionalColorChange(Color newColor)
+    {
+        AdditionalColor = newColor;
+    }
 }

ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityWarship.cs

@@ -38,4 +38,12 @@ public class EntityWarship
         BodyColor = bodyColor;
     }
 
+    /// <summary>
+    /// Смена основного цвета
+    /// </summary>
+    /// <param name="newColor"></param>
+    public void BodyColorChange(Color newColor)
+    {
+        BodyColor = newColor;
+    }
 }

ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.Designer.cs

@@ -29,39 +29,70 @@
         private void InitializeComponent()
         {
             groupBoxTools = new GroupBox();
-            buttonRefresh = new Button();
-            buttonGoToCheck = new Button();
-            buttonRemoveWarship = new Button();
+            panelCompanyTools = new Panel();
             maskedTextBoxPosition = new MaskedTextBox();
-            buttonAddAircraftCarrier = new Button();
-            buttonAddWarship = new Button();
+            buttonRefresh = new Button();
+            buttonRemoveWarship = new Button();
+            buttonGoToCheck = new Button();
+            buttonCreateCompany = new Button();
+            panelStorage = new Panel();
+            buttonCollectionDel = new Button();
+            listBoxCollection = new ListBox();
+            buttonCollectionAdd = new Button();
+            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            textBoxCollectionName = new TextBox();
+            labelCollectionName = new Label();
             comboBoxSelectorCompany = new ComboBox();
             pictureBox = new PictureBox();
+            buttonAddWarship = new Button();
             groupBoxTools.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
+            panelStorage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
             SuspendLayout();
             // 
             // groupBoxTools
             // 
-            groupBoxTools.Controls.Add(buttonRefresh);
-            groupBoxTools.Controls.Add(buttonGoToCheck);
-            groupBoxTools.Controls.Add(buttonRemoveWarship);
-            groupBoxTools.Controls.Add(maskedTextBoxPosition);
-            groupBoxTools.Controls.Add(buttonAddAircraftCarrier);
-            groupBoxTools.Controls.Add(buttonAddWarship);
+            groupBoxTools.Controls.Add(panelCompanyTools);
+            groupBoxTools.Controls.Add(buttonCreateCompany);
+            groupBoxTools.Controls.Add(panelStorage);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(1126, 0);
+            groupBoxTools.Location = new Point(1176, 0);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(326, 912);
+            groupBoxTools.Size = new Size(326, 961);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
             // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(buttonAddWarship);
+            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(buttonRemoveWarship);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Dock = DockStyle.Bottom;
+            panelCompanyTools.Enabled = false;
+            panelCompanyTools.Location = new Point(3, 529);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(320, 429);
+            panelCompanyTools.TabIndex = 9;
+            // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Location = new Point(3, 159);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(314, 35);
+            maskedTextBoxPosition.TabIndex = 3;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(6, 767);
+            buttonRefresh.Location = new Point(3, 356);
             buttonRefresh.Name = "buttonRefresh";
             buttonRefresh.Size = new Size(314, 72);
             buttonRefresh.TabIndex = 6;
@@ -69,21 +100,10 @@
             buttonRefresh.UseVisualStyleBackColor = true;
             buttonRefresh.Click += ButtonRefresh_Click;
             // 
-            // buttonGoToCheck
-            // 
-            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(6, 595);
-            buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(314, 72);
-            buttonGoToCheck.TabIndex = 5;
-            buttonGoToCheck.Text = "Передать на тесты";
-            buttonGoToCheck.UseVisualStyleBackColor = true;
-            buttonGoToCheck.Click += ButtonGoToCheck_Click;
-            // 
             // buttonRemoveWarship
             // 
             buttonRemoveWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRemoveWarship.Location = new Point(6, 432);
+            buttonRemoveWarship.Location = new Point(3, 200);
             buttonRemoveWarship.Name = "buttonRemoveWarship";
             buttonRemoveWarship.Size = new Size(314, 72);
             buttonRemoveWarship.TabIndex = 4;
@@ -91,36 +111,108 @@
             buttonRemoveWarship.UseVisualStyleBackColor = true;
             buttonRemoveWarship.Click += ButtonRemoveWarship_Click;
             // 
-            // maskedTextBoxPosition
+            // buttonGoToCheck
             // 
-            maskedTextBoxPosition.Location = new Point(6, 391);
-            maskedTextBoxPosition.Mask = "00";
-            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            maskedTextBoxPosition.Size = new Size(314, 35);
-            maskedTextBoxPosition.TabIndex = 3;
-            maskedTextBoxPosition.ValidatingType = typeof(int);
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(3, 278);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(314, 72);
+            buttonGoToCheck.TabIndex = 5;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_Click;
             // 
-            // buttonAddAircraftCarrier
+            // buttonCreateCompany
             // 
-            buttonAddAircraftCarrier.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddAircraftCarrier.Location = new Point(6, 232);
-            buttonAddAircraftCarrier.Name = "buttonAddAircraftCarrier";
-            buttonAddAircraftCarrier.Size = new Size(314, 72);
-            buttonAddAircraftCarrier.TabIndex = 2;
-            buttonAddAircraftCarrier.Text = "Добавление авианосца";
-            buttonAddAircraftCarrier.UseVisualStyleBackColor = true;
-            buttonAddAircraftCarrier.Click += ButtonAddAircraftCarrier_Click;
+            buttonCreateCompany.Location = new Point(6, 472);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(314, 40);
+            buttonCreateCompany.TabIndex = 8;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += ButtonCreateCompany_Click;
             // 
-            // buttonAddWarship
+            // panelStorage
             // 
-            buttonAddWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddWarship.Location = new Point(6, 154);
-            buttonAddWarship.Name = "buttonAddWarship";
-            buttonAddWarship.Size = new Size(314, 72);
-            buttonAddWarship.TabIndex = 1;
-            buttonAddWarship.Text = "Добавление военного корабля";
-            buttonAddWarship.UseVisualStyleBackColor = true;
-            buttonAddWarship.Click += ButtonAddWarship_Click;
+            panelStorage.Controls.Add(buttonCollectionDel);
+            panelStorage.Controls.Add(listBoxCollection);
+            panelStorage.Controls.Add(buttonCollectionAdd);
+            panelStorage.Controls.Add(radioButtonList);
+            panelStorage.Controls.Add(radioButtonMassive);
+            panelStorage.Controls.Add(textBoxCollectionName);
+            panelStorage.Controls.Add(labelCollectionName);
+            panelStorage.Dock = DockStyle.Top;
+            panelStorage.Location = new Point(3, 31);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(320, 382);
+            panelStorage.TabIndex = 7;
+            // 
+            // buttonCollectionDel
+            // 
+            buttonCollectionDel.Location = new Point(3, 331);
+            buttonCollectionDel.Name = "buttonCollectionDel";
+            buttonCollectionDel.Size = new Size(314, 40);
+            buttonCollectionDel.TabIndex = 6;
+            buttonCollectionDel.Text = "Удалить коллекцию";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += ButtonCollectionDel_Click;
+            // 
+            // listBoxCollection
+            // 
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.ItemHeight = 30;
+            listBoxCollection.Location = new Point(3, 171);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(314, 154);
+            listBoxCollection.TabIndex = 5;
+            // 
+            // buttonCollectionAdd
+            // 
+            buttonCollectionAdd.Location = new Point(3, 125);
+            buttonCollectionAdd.Name = "buttonCollectionAdd";
+            buttonCollectionAdd.Size = new Size(314, 40);
+            buttonCollectionAdd.TabIndex = 4;
+            buttonCollectionAdd.Text = "Добавить коллекцию";
+            buttonCollectionAdd.UseVisualStyleBackColor = true;
+            buttonCollectionAdd.Click += ButtonCollectionAdd_Click;
+            // 
+            // radioButtonList
+            // 
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(193, 85);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(107, 34);
+            radioButtonList.TabIndex = 3;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonMassive
+            // 
+            radioButtonMassive.AutoSize = true;
+            radioButtonMassive.Location = new Point(23, 85);
+            radioButtonMassive.Name = "radioButtonMassive";
+            radioButtonMassive.Size = new Size(111, 34);
+            radioButtonMassive.TabIndex = 2;
+            radioButtonMassive.TabStop = true;
+            radioButtonMassive.Text = "Массив";
+            radioButtonMassive.UseVisualStyleBackColor = true;
+            // 
+            // textBoxCollectionName
+            // 
+            textBoxCollectionName.Location = new Point(3, 44);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(314, 35);
+            textBoxCollectionName.TabIndex = 1;
+            // 
+            // labelCollectionName
+            // 
+            labelCollectionName.AutoSize = true;
+            labelCollectionName.Location = new Point(58, 11);
+            labelCollectionName.Name = "labelCollectionName";
+            labelCollectionName.Size = new Size(213, 30);
+            labelCollectionName.TabIndex = 0;
+            labelCollectionName.Text = "Название коллекции";
             // 
             // comboBoxSelectorCompany
             // 
@@ -128,7 +220,7 @@
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(6, 34);
+            comboBoxSelectorCompany.Location = new Point(6, 428);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
             comboBoxSelectorCompany.Size = new Size(314, 38);
             comboBoxSelectorCompany.TabIndex = 0;
@@ -139,21 +231,35 @@
             pictureBox.Dock = DockStyle.Fill;
             pictureBox.Location = new Point(0, 0);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(1126, 912);
+            pictureBox.Size = new Size(1176, 961);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             // 
+            // buttonAddWarship
+            // 
+            buttonAddWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddWarship.Location = new Point(3, 3);
+            buttonAddWarship.Name = "buttonAddWarship";
+            buttonAddWarship.Size = new Size(314, 72);
+            buttonAddWarship.TabIndex = 1;
+            buttonAddWarship.Text = "Добавление военного корабля";
+            buttonAddWarship.UseVisualStyleBackColor = true;
+            buttonAddWarship.Click += ButtonAddWarship_Click;
+            // 
             // FormWarshipCollection
             // 
             AutoScaleDimensions = new SizeF(12F, 30F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1452, 912);
+            ClientSize = new Size(1502, 961);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
             Name = "FormWarshipCollection";
             Text = "Коллекция военных кораблей";
             groupBoxTools.ResumeLayout(false);
-            groupBoxTools.PerformLayout();
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
             ResumeLayout(false);
         }
@@ -161,13 +267,22 @@
         #endregion
 
         private GroupBox groupBoxTools;
-        private Button buttonAddWarship;
         private ComboBox comboBoxSelectorCompany;
-        private Button buttonAddAircraftCarrier;
         private PictureBox pictureBox;
         private Button buttonRefresh;
         private Button buttonGoToCheck;
         private Button buttonRemoveWarship;
         private MaskedTextBox maskedTextBoxPosition;
+        private Panel panelStorage;
+        private RadioButton radioButtonList;
+        private RadioButton radioButtonMassive;
+        private TextBox textBoxCollectionName;
+        private Label labelCollectionName;
+        private Button buttonCollectionDel;
+        private ListBox listBoxCollection;
+        private Button buttonCollectionAdd;
+        private Button buttonCreateCompany;
+        private Panel panelCompanyTools;
+        private Button buttonAddWarship;
     }
 }

ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.cs

@@ -8,6 +8,11 @@ namespace ProjectAircraftCarrier_;
 /// </summary>
 public partial class FormWarshipCollection : Form
 {
+    /// <summary>
+    /// Хранилище коллекций
+    /// </summary>
+    private readonly StorageCollection<DrawningWarship> _storageCollection;
+
     /// <summary>
     /// Компания
     /// </summary>
@@ -19,6 +24,7 @@ public partial class FormWarshipCollection : Form
     public FormWarshipCollection()
     {
         InitializeComponent();
+        _storageCollection = new();
     }
 
     /// <summary>
@@ -28,42 +34,34 @@ public partial class FormWarshipCollection : Form
     /// <param name="e"></param>
     private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
     {
-        switch (comboBoxSelectorCompany.Text)
-        {
-            case "Хранилище":
-                _company = new Docks(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningWarship>());
-                break;
-        }
+        panelCompanyTools.Enabled = false;
     }
 
     /// <summary>
-    /// Создание объекта класса-перемещения
+    /// Добавление военного корабля
     /// </summary>
-    /// <param name="type">Тип создаваемого объекта</param>
-    private void CreateObject(string type)
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddWarship_Click(object sender, EventArgs e)
     {
-        if (_company == null)
+        FormWarshipConfig form = new();
+        // TODO передать метод +
+        form.AddEvent(SetWarship);
+        form.Show();
+    }
+
+    /// <summary>
+    /// Добавление военного корабля в коллекцию
+    /// </summary>
+    /// <param name="warship"></param>
+    private void SetWarship(DrawningWarship? warship)
+    {
+        if (_company == null || warship == null)
         {
             return;
         }
 
-        Random random = new();
-        DrawningWarship drawningWarship;
-        switch (type)
-        {
-            case nameof(DrawningWarship):
-                drawningWarship = new DrawningWarship(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
-                break;
-            case nameof(DrawningAircraftCarrier):
-                // TODO вызов диалогового окна для выбора цвета
-                drawningWarship = new DrawningAircraftCarrier(random.Next(100, 300), random.Next(1000, 3000), GetColor(random), GetColor(random), 
-                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-                break;
-            default:
-                return;
-        }
-
-        if (_company + drawningWarship != -1)
+        if (_company + warship != -1)
         {
             MessageBox.Show("Объект добавлен");
             pictureBox.Image = _company.Show();
@@ -74,37 +72,6 @@ public partial class FormWarshipCollection : Form
         }
     }
 
-    /// <summary>
-    /// Получение цвета
-    /// </summary>
-    /// <param name="random">Генератор случайных чисел</param>
-    /// <returns></returns>
-    private static Color GetColor(Random random)
-    {
-        Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-        ColorDialog dialog = new();
-        if (dialog.ShowDialog() == DialogResult.OK)
-        {
-            color = dialog.Color;
-        }
-
-        return color;
-    }
-
-    /// <summary>
-    /// Добавление военного корабля
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonAddWarship_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningWarship));
-
-    /// <summary>
-    /// Добавление авианосца
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonAddAircraftCarrier_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAircraftCarrier));
-
     /// <summary>
     /// Удаление объекта
     /// </summary>
@@ -117,7 +84,7 @@ public partial class FormWarshipCollection : Form
             return;
         }
 
-        if (MessageBox.Show("Удалить объект", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
         {
             return;
         }
@@ -184,4 +151,98 @@ public partial class FormWarshipCollection : Form
 
         pictureBox.Image = _company.Show();
     }
+
+    /// <summary>
+    /// Добавление коллекции
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonCollectionAdd_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+        {
+            MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            return;
+        }
+
+        CollectionType collectionType = CollectionType.None;
+        if (radioButtonMassive.Checked)
+        {
+            collectionType = CollectionType.Massive;
+        }
+        else if (radioButtonList.Checked)
+        {
+            collectionType = CollectionType.List;
+        }
+
+        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+        RerfreshListBoxItems();
+    }
+
+    /// <summary>
+    /// Удаление коллекции
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonCollectionDel_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+
+        if (MessageBox.Show("Вы уверены, что хотите удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+        {
+            return;
+        }
+        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+        RerfreshListBoxItems();
+    }
+
+    /// <summary>
+    /// Обновление списка в listBoxCollection
+    /// </summary>
+    private void RerfreshListBoxItems()
+    {
+        listBoxCollection.Items.Clear();
+        for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
+        {
+            string? colName = _storageCollection.Keys?[i];
+            if (!string.IsNullOrEmpty(colName))
+            {
+                listBoxCollection.Items.Add(colName);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Создание компании
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonCreateCompany_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+
+        ICollectionGenericObjects<DrawningWarship>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+        if (collection == null)
+        {
+            MessageBox.Show("Коллекция не проинициализирована");
+            return;
+        }
+
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new Docks(pictureBox.Width, pictureBox.Height, collection);
+                break;
+        }
+        panelCompanyTools.Enabled = true;
+        RerfreshListBoxItems();
+    }
 }

ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipConfig.Designer.cs

@@ -0,0 +1,378 @@
+namespace ProjectAircraftCarrier_
+{
+    partial class FormWarshipConfig
+    {
+        /// <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()
+        {
+            groupBoxConfig = new GroupBox();
+            groupBoxColors = new GroupBox();
+            panelBlack = new Panel();
+            panelPink = new Panel();
+            panelGray = new Panel();
+            panelWhite = new Panel();
+            panelBlue = new Panel();
+            panelOrange = new Panel();
+            panelGreen = new Panel();
+            panelRed = new Panel();
+            checkBoxFighterJet = new CheckBox();
+            checkBoxControlCabin = new CheckBox();
+            checkBoxDeckForAircraftTakeOff = new CheckBox();
+            numericUpDownWeight = new NumericUpDown();
+            labelWeight = new Label();
+            numericUpDownSpeed = new NumericUpDown();
+            labelSpeed = new Label();
+            labelModifiedObject = new Label();
+            labelSimpleObject = new Label();
+            pictureBoxObject = new PictureBox();
+            buttonAdd = new Button();
+            buttonCancel = new Button();
+            panelObject = new Panel();
+            labelAdditionalColor = new Label();
+            labelBodyColor = new Label();
+            groupBoxConfig.SuspendLayout();
+            groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
+            panelObject.SuspendLayout();
+            SuspendLayout();
+            // 
+            // groupBoxConfig
+            // 
+            groupBoxConfig.Controls.Add(groupBoxColors);
+            groupBoxConfig.Controls.Add(checkBoxFighterJet);
+            groupBoxConfig.Controls.Add(checkBoxControlCabin);
+            groupBoxConfig.Controls.Add(checkBoxDeckForAircraftTakeOff);
+            groupBoxConfig.Controls.Add(numericUpDownWeight);
+            groupBoxConfig.Controls.Add(labelWeight);
+            groupBoxConfig.Controls.Add(numericUpDownSpeed);
+            groupBoxConfig.Controls.Add(labelSpeed);
+            groupBoxConfig.Controls.Add(labelModifiedObject);
+            groupBoxConfig.Controls.Add(labelSimpleObject);
+            groupBoxConfig.Dock = DockStyle.Left;
+            groupBoxConfig.Location = new Point(0, 0);
+            groupBoxConfig.Name = "groupBoxConfig";
+            groupBoxConfig.Size = new Size(918, 328);
+            groupBoxConfig.TabIndex = 0;
+            groupBoxConfig.TabStop = false;
+            groupBoxConfig.Text = "Параметры";
+            // 
+            // groupBoxColors
+            // 
+            groupBoxColors.Controls.Add(panelBlack);
+            groupBoxColors.Controls.Add(panelPink);
+            groupBoxColors.Controls.Add(panelGray);
+            groupBoxColors.Controls.Add(panelWhite);
+            groupBoxColors.Controls.Add(panelBlue);
+            groupBoxColors.Controls.Add(panelOrange);
+            groupBoxColors.Controls.Add(panelGreen);
+            groupBoxColors.Controls.Add(panelRed);
+            groupBoxColors.Location = new Point(533, 34);
+            groupBoxColors.Name = "groupBoxColors";
+            groupBoxColors.Size = new Size(362, 181);
+            groupBoxColors.TabIndex = 9;
+            groupBoxColors.TabStop = false;
+            groupBoxColors.Text = "Цвета";
+            // 
+            // panelBlack
+            // 
+            panelBlack.BackColor = Color.Black;
+            panelBlack.Location = new Point(193, 109);
+            panelBlack.Name = "panelBlack";
+            panelBlack.Size = new Size(55, 55);
+            panelBlack.TabIndex = 3;
+            panelBlack.MouseDown += Panel_MouseDown;
+            // 
+            // panelPink
+            // 
+            panelPink.BackColor = Color.Pink;
+            panelPink.Location = new Point(274, 109);
+            panelPink.Name = "panelPink";
+            panelPink.Size = new Size(55, 55);
+            panelPink.TabIndex = 4;
+            panelPink.MouseDown += Panel_MouseDown;
+            // 
+            // panelGray
+            // 
+            panelGray.BackColor = Color.Gray;
+            panelGray.Location = new Point(109, 109);
+            panelGray.Name = "panelGray";
+            panelGray.Size = new Size(55, 55);
+            panelGray.TabIndex = 5;
+            panelGray.MouseDown += Panel_MouseDown;
+            // 
+            // panelWhite
+            // 
+            panelWhite.BackColor = Color.White;
+            panelWhite.Location = new Point(27, 109);
+            panelWhite.Name = "panelWhite";
+            panelWhite.Size = new Size(55, 55);
+            panelWhite.TabIndex = 2;
+            panelWhite.MouseDown += Panel_MouseDown;
+            // 
+            // panelBlue
+            // 
+            panelBlue.BackColor = Color.Blue;
+            panelBlue.Location = new Point(193, 34);
+            panelBlue.Name = "panelBlue";
+            panelBlue.Size = new Size(55, 55);
+            panelBlue.TabIndex = 1;
+            panelBlue.MouseDown += Panel_MouseDown;
+            // 
+            // panelOrange
+            // 
+            panelOrange.BackColor = Color.Orange;
+            panelOrange.Location = new Point(274, 34);
+            panelOrange.Name = "panelOrange";
+            panelOrange.Size = new Size(55, 55);
+            panelOrange.TabIndex = 1;
+            panelOrange.MouseDown += Panel_MouseDown;
+            // 
+            // panelGreen
+            // 
+            panelGreen.BackColor = Color.Green;
+            panelGreen.Location = new Point(109, 34);
+            panelGreen.Name = "panelGreen";
+            panelGreen.Size = new Size(55, 55);
+            panelGreen.TabIndex = 1;
+            panelGreen.MouseDown += Panel_MouseDown;
+            // 
+            // panelRed
+            // 
+            panelRed.BackColor = Color.Red;
+            panelRed.Location = new Point(27, 34);
+            panelRed.Name = "panelRed";
+            panelRed.Size = new Size(55, 55);
+            panelRed.TabIndex = 0;
+            panelRed.MouseDown += Panel_MouseDown;
+            // 
+            // checkBoxFighterJet
+            // 
+            checkBoxFighterJet.AutoSize = true;
+            checkBoxFighterJet.Location = new Point(12, 143);
+            checkBoxFighterJet.Name = "checkBoxFighterJet";
+            checkBoxFighterJet.Size = new Size(333, 34);
+            checkBoxFighterJet.TabIndex = 8;
+            checkBoxFighterJet.Text = "Признак наличия истребителя";
+            checkBoxFighterJet.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxControlCabin
+            // 
+            checkBoxControlCabin.AutoSize = true;
+            checkBoxControlCabin.Location = new Point(12, 197);
+            checkBoxControlCabin.Name = "checkBoxControlCabin";
+            checkBoxControlCabin.Size = new Size(388, 34);
+            checkBoxControlCabin.TabIndex = 7;
+            checkBoxControlCabin.Text = "Признак наличия рубки управления";
+            checkBoxControlCabin.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxDeckForAircraftTakeOff
+            // 
+            checkBoxDeckForAircraftTakeOff.AutoSize = true;
+            checkBoxDeckForAircraftTakeOff.Location = new Point(12, 254);
+            checkBoxDeckForAircraftTakeOff.Name = "checkBoxDeckForAircraftTakeOff";
+            checkBoxDeckForAircraftTakeOff.Size = new Size(499, 34);
+            checkBoxDeckForAircraftTakeOff.TabIndex = 6;
+            checkBoxDeckForAircraftTakeOff.Text = "Признак наличия палубы для взлета самолетов";
+            checkBoxDeckForAircraftTakeOff.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            numericUpDownWeight.Location = new Point(125, 91);
+            numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownWeight.Name = "numericUpDownWeight";
+            numericUpDownWeight.Size = new Size(155, 35);
+            numericUpDownWeight.TabIndex = 5;
+            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelWeight
+            // 
+            labelWeight.AutoSize = true;
+            labelWeight.Location = new Point(12, 93);
+            labelWeight.Name = "labelWeight";
+            labelWeight.Size = new Size(51, 30);
+            labelWeight.TabIndex = 4;
+            labelWeight.Text = "Вес:";
+            // 
+            // numericUpDownSpeed
+            // 
+            numericUpDownSpeed.Location = new Point(125, 42);
+            numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownSpeed.Name = "numericUpDownSpeed";
+            numericUpDownSpeed.Size = new Size(155, 35);
+            numericUpDownSpeed.TabIndex = 3;
+            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelSpeed
+            // 
+            labelSpeed.AutoSize = true;
+            labelSpeed.Location = new Point(12, 44);
+            labelSpeed.Name = "labelSpeed";
+            labelSpeed.Size = new Size(107, 30);
+            labelSpeed.TabIndex = 2;
+            labelSpeed.Text = "Скорость:";
+            // 
+            // labelModifiedObject
+            // 
+            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+            labelModifiedObject.Location = new Point(726, 242);
+            labelModifiedObject.Name = "labelModifiedObject";
+            labelModifiedObject.Size = new Size(169, 56);
+            labelModifiedObject.TabIndex = 1;
+            labelModifiedObject.Text = "Продвинутый";
+            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelModifiedObject.MouseDown += LabelObject_MouseDown;
+            // 
+            // labelSimpleObject
+            // 
+            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+            labelSimpleObject.Location = new Point(533, 242);
+            labelSimpleObject.Name = "labelSimpleObject";
+            labelSimpleObject.Size = new Size(169, 56);
+            labelSimpleObject.TabIndex = 0;
+            labelSimpleObject.Text = "Простой";
+            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelSimpleObject.MouseDown += LabelObject_MouseDown;
+            // 
+            // pictureBoxObject
+            // 
+            pictureBoxObject.Location = new Point(9, 68);
+            pictureBoxObject.Name = "pictureBoxObject";
+            pictureBoxObject.Size = new Size(308, 171);
+            pictureBoxObject.TabIndex = 1;
+            pictureBoxObject.TabStop = false;
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(933, 276);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(138, 40);
+            buttonAdd.TabIndex = 2;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += ButtonAdd_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(1103, 276);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(138, 40);
+            buttonCancel.TabIndex = 3;
+            buttonCancel.Text = "Отменить";
+            buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // panelObject
+            // 
+            panelObject.AllowDrop = true;
+            panelObject.Controls.Add(labelAdditionalColor);
+            panelObject.Controls.Add(labelBodyColor);
+            panelObject.Controls.Add(pictureBoxObject);
+            panelObject.Location = new Point(924, 0);
+            panelObject.Name = "panelObject";
+            panelObject.Size = new Size(326, 254);
+            panelObject.TabIndex = 4;
+            panelObject.DragDrop += PanelObject_DragDrop;
+            panelObject.DragEnter += PanelObject_DragEnter;
+            // 
+            // labelAdditionalColor
+            // 
+            labelAdditionalColor.AllowDrop = true;
+            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+            labelAdditionalColor.Location = new Point(179, 9);
+            labelAdditionalColor.Name = "labelAdditionalColor";
+            labelAdditionalColor.Size = new Size(138, 41);
+            labelAdditionalColor.TabIndex = 3;
+            labelAdditionalColor.Text = "Доп. Цвет";
+            labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelAdditionalColor.DragDrop += LabelAdditionalColor_DragDrop;
+            labelAdditionalColor.DragEnter += LabelAdditionalColor_DragEnter;
+            // 
+            // labelBodyColor
+            // 
+            labelBodyColor.AllowDrop = true;
+            labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
+            labelBodyColor.Location = new Point(9, 9);
+            labelBodyColor.Name = "labelBodyColor";
+            labelBodyColor.Size = new Size(138, 41);
+            labelBodyColor.TabIndex = 2;
+            labelBodyColor.Text = "Цвет";
+            labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelBodyColor.DragDrop += LabelBodyColor_DragDrop;
+            labelBodyColor.DragEnter += LabelBodyColor_DragEnter;
+            // 
+            // FormWarshipConfig
+            // 
+            AutoScaleDimensions = new SizeF(12F, 30F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1253, 328);
+            Controls.Add(panelObject);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonAdd);
+            Controls.Add(groupBoxConfig);
+            Name = "FormWarshipConfig";
+            Text = "Создание объекта";
+            groupBoxConfig.ResumeLayout(false);
+            groupBoxConfig.PerformLayout();
+            groupBoxColors.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
+            panelObject.ResumeLayout(false);
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxConfig;
+        private Label labelModifiedObject;
+        private Label labelSimpleObject;
+        private Label labelSpeed;
+        private NumericUpDown numericUpDownWeight;
+        private Label labelWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private CheckBox checkBoxDeckForAircraftTakeOff;
+        private CheckBox checkBoxControlCabin;
+        private CheckBox checkBoxFighterJet;
+        private GroupBox groupBoxColors;
+        private Panel panelBlue;
+        private Panel panelOrange;
+        private Panel panelGreen;
+        private Panel panelRed;
+        private Panel panelBlack;
+        private Panel panelPink;
+        private Panel panelGray;
+        private Panel panelWhite;
+        private PictureBox pictureBoxObject;
+        private Button buttonAdd;
+        private Button buttonCancel;
+        private Panel panelObject;
+        private Label labelAdditionalColor;
+        private Label labelBodyColor;
+    }
+}

ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipConfig.cs

@@ -0,0 +1,174 @@
+using ProjectAircraftCarrier_.Drawnings;
+using ProjectAircraftCarrier_.Entities;
+
+namespace ProjectAircraftCarrier_;
+
+/// <summary>
+/// Форма конфигурации объекта
+/// </summary>
+public partial class FormWarshipConfig : Form
+{
+    /// <summary>
+    /// Объект - прорисовка автомобиля
+    /// </summary>
+    private DrawningWarship? _warship;
+
+    /// <summary>
+    /// Событие для передачи объекта
+    /// </summary>
+    private event Action<DrawningWarship>? WarshipDelegate;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormWarshipConfig()
+    {
+        InitializeComponent();
+
+        panelRed.MouseDown += Panel_MouseDown;
+        panelGreen.MouseDown += Panel_MouseDown;
+        panelBlue.MouseDown += Panel_MouseDown;
+        panelOrange.MouseDown += Panel_MouseDown;
+        panelWhite.MouseDown += Panel_MouseDown;
+        panelGray.MouseDown += Panel_MouseDown;
+        panelBlack.MouseDown += Panel_MouseDown;
+        panelPink.MouseDown += Panel_MouseDown;
+
+        // TODO buttonCancel.Click привязать анонимный метод через lambda с закрытием формы +
+        buttonCancel.Click += (sender, e) => Close();
+    }
+
+    /// <summary>
+    /// Привязка внешнего метода к событию
+    /// </summary>
+    /// <param name="warshipDelegate"></param>
+    public void AddEvent(Action<DrawningWarship> warshipDelegate)
+    {
+        WarshipDelegate += warshipDelegate;
+    }
+
+    /// <summary>
+    /// Прорисовка объекта
+    /// </summary>
+    private void DrawObject()
+    {
+        Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+        Graphics gr = Graphics.FromImage(bmp);
+        _warship?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
+        _warship?.SetPosition(85, 60);
+        _warship?.DrawTransport(gr);
+        pictureBoxObject.Image = bmp;
+    }
+
+    /// <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 ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy);
+    }
+
+    /// <summary>
+    /// Проверка получаемой информации(Объект) (ее типа на соответствие требуемому)
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void PanelObject_DragEnter(object sender, DragEventArgs e)
+    {
+        e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : 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":
+                _warship = new DrawningWarship((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White);
+                break;
+            case "labelModifiedObject":
+                _warship = new DrawningAircraftCarrier((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White,
+                Color.Black, checkBoxDeckForAircraftTakeOff.Checked, checkBoxControlCabin.Checked, checkBoxFighterJet.Checked);
+                break;
+        }
+
+        DrawObject();
+    }
+
+    /// <summary>
+    /// Передаем информацию при нажатии на Panel(Цвет)
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void Panel_MouseDown(object? sender, MouseEventArgs e)
+    {
+        // TODO отправка цвета в Drag&Drop +
+        (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor ?? Color.Black, DragDropEffects.Move | DragDropEffects.Copy);
+    }
+
+    // TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта) +
+    /// <summary>
+    /// Проверка получаемой информации(Основной цвет) (ее типа на соответствие требуемому)
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void LabelBodyColor_DragEnter(object sender, DragEventArgs e)
+    {
+        e.Effect = e.Data?.GetDataPresent(typeof(Color)) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
+    }
+
+    /// <summary>
+    /// Действия при приеме перетаскиваемой информации(Основной цвет)
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void LabelBodyColor_DragDrop(object sender, DragEventArgs e)
+    {
+        _warship?.EntityWarship?.BodyColorChange((Color)e.Data?.GetData(typeof(Color)));
+        DrawObject();
+    }
+
+    /// <summary>
+    /// Проверка получаемой информации(Доп. цвет) (ее типа на соответствие требуемому)
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e)
+    {
+        e.Effect = e.Data?.GetDataPresent(typeof(Color)) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
+    }
+
+    /// <summary>
+    /// Действия при приеме перетаскиваемой информации(Доп. цвет)
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e)
+    {
+        if (_warship?.EntityWarship is EntityAircraftCarrier _aircraftCarrier)
+        {
+            _aircraftCarrier.AdditionalColorChange((Color)e.Data?.GetData(typeof(Color)));
+        }
+        DrawObject();
+    }
+
+    /// <summary>
+    /// Передача объекта
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAdd_Click(object sender, EventArgs e)
+    {
+        if (_warship != null)
+        {
+            WarshipDelegate?.Invoke(_warship);
+            Close();
+        }
+    }
+}

ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipConfig.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <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>

ProjectAircraftCarrier_/ProjectAircraftCarrier_/WarshipDelegate.cs

@@ -0,0 +1,9 @@
+using ProjectAircraftCarrier_.Drawnings;
+
+namespace ProjectAircraftCarrier_;
+
+/// <summary>
+/// Делегат передачи объекта класса-прорисовки
+/// </summary>
+/// <param name="warship"></param>
+public delegate void WarshipDelegate(DrawningWarship warship);