Изменил выбор цвета

AntiAircraftGun/AntiAircraftGun/AntiAircraftGun.csproj

@@ -8,4 +8,9 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="EntityFramework" Version="6.2.0" />
+    <PackageReference Include="EntityFramework.ru" Version="6.2.0" />
+  </ItemGroup>
+
 </Project>

AntiAircraftGun/AntiAircraftGun/CollectionGenericObjects/AbstractCompany.cs

@@ -49,19 +49,21 @@ public abstract class AbstractCompany
     /// <param name="company">Компания</param>
     /// <param name="gun">Добавляемый объект</param>
     /// <returns></returns>
-    public static int operator +(AbstractCompany company, DrawningGun gun)
+    public static bool operator +(AbstractCompany company, DrawningGun gun)
     {
-        return company._collection.Insert(gun);
+        return company._collection?.Insert(gun) ?? false;
     }
+
     /// <summary>
     /// Перегрузка оператора удаления для класса
     /// </summary>
     /// <param name="company">Компания</param>
     /// <param name="position">Номер удаляемого объекта</param>
     /// <returns></returns>
-    public static DrawningGun? operator -(AbstractCompany company, int position)
+    public static bool operator -(AbstractCompany company, int position)
     {
-        return company._collection?.Remove(position);
+        return company._collection?.Remove(position) ?? false;
+
     }
     /// <summary>
     /// Получение случайного объекта из коллекции

AntiAircraftGun/AntiAircraftGun/CollectionGenericObjects/CollectionType.cs

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

AntiAircraftGun/AntiAircraftGun/CollectionGenericObjects/GunSharingService.cs

@@ -48,13 +48,15 @@ public class GunSharingService : AbstractCompany
 
         for (int j = 0; j < maxCountY; j++)
         {
-            for (int i = 0; i < maxCountX; i++)
+            for (int i = 0; i < maxCountX; i++) 
             {
                 currentIndex++;
-                if (_collection.Get(currentIndex) == null) continue;
+                if (_collection.Get(currentIndex) != null)
+                {
 
-                _collection.Get(currentIndex).SetPictureSize(_pictureWidth, _pictureHeight);
-                _collection.Get(currentIndex).SetPosition(boarderOffsetX + i * _placeSizeWidth + i * offsetX, boarderOffsetY + j * _placeSizeHeight);
+                    _collection.Get(currentIndex).SetPictureSize(_pictureWidth, _pictureHeight);
+                    _collection.Get(currentIndex).SetPosition(boarderOffsetX + i * _placeSizeWidth + i * offsetX, boarderOffsetY + j * _placeSizeHeight);
+                }
             }
         }
     }

AntiAircraftGun/AntiAircraftGun/CollectionGenericObjects/ICollectionGenericObjects.cs

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

AntiAircraftGun/AntiAircraftGun/CollectionGenericObjects/ListGenericObjects.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AntiAircraftGun.CollectionGenericObjects;
+/// <summary>
+/// Параметризованный набор объектов
+/// </summary>
+/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+public class ListGenericObjects<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 ListGenericObjects()
+    {
+        _collection = new();
+    }
+    public T? Get(int position)
+    {
+        // TODO проверка позиции
+        if (!_collection.Any()) { return null; }
+        if (_collection.Count <= position || position < 0 || position >= _maxCount) { return null; }
+        return _collection[position];
+    }
+    public bool Insert(T obj)
+    {
+        // TODO проверка, что не превышено максимальное количество элементов
+        // TODO вставка в конец набора
+        if (_collection.Count>=_maxCount) return false;
+        _collection.Add(obj);
+        return true;
+    }
+    public bool Insert(T obj, int position)
+    {
+        // TODO проверка, что не превышено максимальное количество элементов
+        // TODO проверка позиции
+        // TODO вставка по позиции
+        if (_collection.Count >= _maxCount || _collection[position] == null || position < 0) { return false; }
+        _collection.Insert(position, obj);
+        return true;
+    }
+    public bool Remove(int position)
+    {
+        // TODO проверка позиции
+        // TODO удаление объекта из списка
+        if (_collection[position] == null)
+        {
+            return false;
+        }
+        _collection.RemoveAt(position);
+        return true;
+    }
+}

AntiAircraftGun/AntiAircraftGun/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -44,46 +44,44 @@ internal class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             return null;
         return _collection[position];
     }
-    public int Insert(T obj)
+    public bool Insert(T obj)
     {
         // TODO вставка в свободное место набора
         for (int i = 0; i < Count; i++)
         {
-            if (InsertingElementCollection(i, obj)) return i;
+            if (InsertingElementCollection(i, obj)) return true;
         }
 
-        return -1;
+        return false;
     }
-    public int Insert(T obj, int position)
+    public bool Insert(T obj, int position)
     {
         // TODO проверка позиции
         // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
         // ищется свободное место после этой позиции и идет вставка туда
         // если нет после, ищем до
         // TODO вставка
-        if (InsertingElementCollection(position, obj)) return position;
+        if (InsertingElementCollection(position, obj)) return true;
 
         for (int i = position + 1; i < Count; i++)
         {
-            if (InsertingElementCollection(i, obj)) return position;
+            if (InsertingElementCollection(i, obj)) return true;
         }
 
         for (int i = position - 1; i >= 0; i--)
         {
-            if (InsertingElementCollection(i, obj)) return position;
+            if (InsertingElementCollection(i, obj)) return true;
         }
 
-        return -1;
+        return false;
     }
-    public T? Remove(int position)
+    public bool Remove(int position)
     {
         // TODO проверка позиции
         // TODO удаление объекта из массива, присвоив элементу массива значение null
-        if (_collection[position] == null) return null;
-
-        T? temp = _collection[position];
+        if (_collection[position] == null) return false;
         _collection[position] = null;
-        return temp;
+        return true;
     }
 
 

AntiAircraftGun/AntiAircraftGun/CollectionGenericObjects/StorageCollection.cs

@@ -0,0 +1,73 @@
+namespace AntiAircraftGun.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)
+    {
+        // TODO проверка, что name не пустой и нет в словаре записи с таким ключом
+        // TODO Прописать логику для добавления
+        if (name.Length<=0 || _storages.ContainsKey(name))
+        {
+            return;
+        }
+        switch(collectionType)
+        {
+            case CollectionType.List:
+                _storages.Add(name, new ListGenericObjects<T>());
+                break;
+            case CollectionType.Massive:
+                _storages.Add(name, new MassiveGenericObjects<T>());
+                break;
+            default:
+                return;
+        }
+    }
+    /// <summary>
+    /// Удаление коллекции
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    public void DelCollection(string name)
+    {
+        // TODO Прописать логику для удаления коллекции
+        if(!_storages.ContainsKey(name)) { return; }
+        _storages.Remove(name);
+    }
+    /// <summary>
+    /// Доступ к коллекции
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    /// <returns></returns>
+    public ICollectionGenericObjects<T>? this[string name]
+    {
+        get
+        {
+            // TODO Продумать логику получения объекта
+            if (!_storages.ContainsKey(name)) { return null; }
+            return _storages[name];
+        }
+    }
+}

AntiAircraftGun/AntiAircraftGun/Entities/EntityAntiAircraftGun.cs

@@ -5,7 +5,19 @@
 public class EntityAntiAircraftGun:EntityGun
 {
     private EntityGun? EntityGun;
+    /// <summary>
+    /// Дополнительный цвет
+    /// </summary>
     public Color OptionalElementsColor { get; private set; }
+    /// <summary>
+    /// Публичный сеттер для дополнительного цвета
+    /// </summary>
+    /// <param name="OptionalElementsColor"></param>
+    public void SetOptionalElemensColor(Color OptionalElementsColor) 
+    {
+        this.OptionalElementsColor = OptionalElementsColor;
+    }
+
     /// <summary>
     /// Длинна ствола
     /// </summary>

AntiAircraftGun/AntiAircraftGun/Entities/EntityGun.cs

@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
-
-namespace AntiAircraftGun.Entities;
+namespace AntiAircraftGun.Entities;
 /// <summary>
 /// Класс-сущности "Орудие"
 /// </summary>
@@ -27,6 +20,15 @@ public class EntityGun
     /// Шаг
     /// </summary>
     public double Step { get { return Speed * 100 / Weight; } private set { } }
+
+    /// <summary>
+    /// Публичный сеттер для основного цвета
+    /// </summary>
+    /// <param name="bodyColor"></param>
+    public void SetBodyColor(Color bodyColor)
+    {
+        this.BodyColor = bodyColor;
+    }
     /// <summary>
     /// Конструктор сущности
     /// </summary>

AntiAircraftGun/AntiAircraftGun/FormGunCollections.Designer.cs

@@ -29,41 +29,95 @@
         private void InitializeComponent()
         {
             groupBox1 = new GroupBox();
+            panelCompanyTools = new Panel();
+            buttonCreateCompany = new Button();
+            comboBoxSelectorCompany = new ComboBox();
+            buttonAddGun = new Button();
             buttonRefresh = new Button();
             buttonGoToCheck = new Button();
-            buttonRemoveGun = new Button();
             maskedTextBox = new MaskedTextBox();
-            buttonAddAntiAircraftGun = new Button();
-            buttonAddGun = new Button();
-            comboBoxSelectorCompany = new ComboBox();
+            buttonRemoveGun = new Button();
+            panelStorage = new Panel();
+            buttonCollectionDel = new Button();
+            listBoxCollection = new ListBox();
+            buttonCollectionAdd = new Button();
+            textBoxCollectionName = new TextBox();
+            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            labelNameCollection = new Label();
             pictureBox = new PictureBox();
             groupBox1.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
+            panelStorage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
             SuspendLayout();
             // 
             // groupBox1
             // 
-            groupBox1.Controls.Add(buttonRefresh);
-            groupBox1.Controls.Add(buttonGoToCheck);
-            groupBox1.Controls.Add(buttonRemoveGun);
-            groupBox1.Controls.Add(maskedTextBox);
-            groupBox1.Controls.Add(buttonAddAntiAircraftGun);
-            groupBox1.Controls.Add(buttonAddGun);
-            groupBox1.Controls.Add(comboBoxSelectorCompany);
+            groupBox1.Controls.Add(panelCompanyTools);
+            groupBox1.Controls.Add(panelStorage);
             groupBox1.Dock = DockStyle.Right;
-            groupBox1.Location = new Point(940, 0);
+            groupBox1.Location = new Point(981, 0);
             groupBox1.Name = "groupBox1";
-            groupBox1.Size = new Size(235, 669);
+            groupBox1.Size = new Size(235, 772);
             groupBox1.TabIndex = 0;
             groupBox1.TabStop = false;
             groupBox1.Text = "Инструменты";
             // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(buttonCreateCompany);
+            panelCompanyTools.Controls.Add(comboBoxSelectorCompany);
+            panelCompanyTools.Controls.Add(buttonAddGun);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Controls.Add(maskedTextBox);
+            panelCompanyTools.Controls.Add(buttonRemoveGun);
+            panelCompanyTools.Dock = DockStyle.Bottom;
+            panelCompanyTools.Location = new Point(3, 395);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(229, 374);
+            panelCompanyTools.TabIndex = 9;
+            // 
+            // buttonCreateCompany
+            // 
+            buttonCreateCompany.Location = new Point(9, 40);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(217, 29);
+            buttonCreateCompany.TabIndex = 8;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += ButtonCreateCompany_Click;
+            // 
+            // comboBoxSelectorCompany
+            // 
+            comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxSelectorCompany.FormattingEnabled = true;
+            comboBoxSelectorCompany.Items.AddRange(new object[] { "База" });
+            comboBoxSelectorCompany.Location = new Point(9, 6);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(214, 28);
+            comboBoxSelectorCompany.TabIndex = 0;
+            comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
+            // 
+            // buttonAddGun
+            // 
+            buttonAddGun.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddGun.Location = new Point(9, 87);
+            buttonAddGun.Name = "buttonAddGun";
+            buttonAddGun.Size = new Size(214, 52);
+            buttonAddGun.TabIndex = 1;
+            buttonAddGun.Text = "Добавление установки";
+            buttonAddGun.UseVisualStyleBackColor = true;
+            buttonAddGun.Click += ButtonAddGun_Click;
+            // 
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(32, 578);
+            buttonRefresh.Location = new Point(9, 313);
             buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(171, 70);
+            buttonRefresh.Size = new Size(214, 39);
             buttonRefresh.TabIndex = 6;
             buttonRefresh.Text = "Обновить";
             buttonRefresh.UseVisualStyleBackColor = true;
@@ -72,74 +126,122 @@
             // buttonGoToCheck
             // 
             buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(32, 465);
+            buttonGoToCheck.Location = new Point(9, 274);
             buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(171, 70);
+            buttonGoToCheck.Size = new Size(214, 33);
             buttonGoToCheck.TabIndex = 5;
             buttonGoToCheck.Text = "Передать на тесты";
             buttonGoToCheck.UseVisualStyleBackColor = true;
             buttonGoToCheck.Click += ButtonGoToCheck_Click;
             // 
+            // maskedTextBox
+            // 
+            maskedTextBox.Location = new Point(9, 203);
+            maskedTextBox.Mask = "00";
+            maskedTextBox.Name = "maskedTextBox";
+            maskedTextBox.Size = new Size(217, 27);
+            maskedTextBox.TabIndex = 3;
+            maskedTextBox.ValidatingType = typeof(int);
+            // 
             // buttonRemoveGun
             // 
             buttonRemoveGun.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRemoveGun.Location = new Point(32, 364);
+            buttonRemoveGun.Location = new Point(9, 236);
             buttonRemoveGun.Name = "buttonRemoveGun";
-            buttonRemoveGun.Size = new Size(171, 70);
+            buttonRemoveGun.Size = new Size(214, 32);
             buttonRemoveGun.TabIndex = 4;
             buttonRemoveGun.Text = "Удалить установку";
             buttonRemoveGun.UseVisualStyleBackColor = true;
             buttonRemoveGun.Click += ButtonRemoveGun_Click;
             // 
-            // maskedTextBox
+            // panelStorage
             // 
-            maskedTextBox.Location = new Point(32, 292);
-            maskedTextBox.Mask = "00";
-            maskedTextBox.Name = "maskedTextBox";
-            maskedTextBox.Size = new Size(171, 27);
-            maskedTextBox.TabIndex = 3;
-            maskedTextBox.ValidatingType = typeof(int);
+            panelStorage.Controls.Add(buttonCollectionDel);
+            panelStorage.Controls.Add(listBoxCollection);
+            panelStorage.Controls.Add(buttonCollectionAdd);
+            panelStorage.Controls.Add(textBoxCollectionName);
+            panelStorage.Controls.Add(radioButtonList);
+            panelStorage.Controls.Add(radioButtonMassive);
+            panelStorage.Controls.Add(labelNameCollection);
+            panelStorage.Dock = DockStyle.Top;
+            panelStorage.Location = new Point(3, 23);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(229, 366);
+            panelStorage.TabIndex = 7;
             // 
-            // buttonAddAntiAircraftGun
+            // buttonCollectionDel
             // 
-            buttonAddAntiAircraftGun.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddAntiAircraftGun.Location = new Point(33, 191);
-            buttonAddAntiAircraftGun.Name = "buttonAddAntiAircraftGun";
-            buttonAddAntiAircraftGun.Size = new Size(171, 70);
-            buttonAddAntiAircraftGun.TabIndex = 2;
-            buttonAddAntiAircraftGun.Text = "Добавление зенитной установки";
-            buttonAddAntiAircraftGun.UseVisualStyleBackColor = true;
-            buttonAddAntiAircraftGun.Click += ButtonAddAntiAircraftGun_Click;
+            buttonCollectionDel.Location = new Point(9, 326);
+            buttonCollectionDel.Name = "buttonCollectionDel";
+            buttonCollectionDel.Size = new Size(217, 29);
+            buttonCollectionDel.TabIndex = 6;
+            buttonCollectionDel.Text = "Удалить коллекцию";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += ButtonCollectionDel_Click;
             // 
-            // buttonAddGun
+            // listBoxCollection
             // 
-            buttonAddGun.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddGun.Location = new Point(32, 106);
-            buttonAddGun.Name = "buttonAddGun";
-            buttonAddGun.Size = new Size(171, 70);
-            buttonAddGun.TabIndex = 1;
-            buttonAddGun.Text = "Добавление установки";
-            buttonAddGun.UseVisualStyleBackColor = true;
-            buttonAddGun.Click += ButtonAddGun_Click;
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.ItemHeight = 20;
+            listBoxCollection.Location = new Point(9, 164);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(217, 144);
+            listBoxCollection.TabIndex = 5;
             // 
-            // comboBoxSelectorCompany
+            // buttonCollectionAdd
             // 
-            comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
-            comboBoxSelectorCompany.FormattingEnabled = true;
-            comboBoxSelectorCompany.Items.AddRange(new object[] { "База" });
-            comboBoxSelectorCompany.Location = new Point(33, 43);
-            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
-            comboBoxSelectorCompany.Size = new Size(171, 28);
-            comboBoxSelectorCompany.TabIndex = 0;
-            comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged;
+            buttonCollectionAdd.Location = new Point(9, 120);
+            buttonCollectionAdd.Name = "buttonCollectionAdd";
+            buttonCollectionAdd.Size = new Size(217, 29);
+            buttonCollectionAdd.TabIndex = 4;
+            buttonCollectionAdd.Text = "Добаваить коллекцию";
+            buttonCollectionAdd.UseVisualStyleBackColor = true;
+            buttonCollectionAdd.Click += ButtonCollectionAdd_Click;
+            // 
+            // textBoxCollectionName
+            // 
+            textBoxCollectionName.Location = new Point(9, 41);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(217, 27);
+            textBoxCollectionName.TabIndex = 3;
+            // 
+            // radioButtonList
+            // 
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(146, 74);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(80, 24);
+            radioButtonList.TabIndex = 2;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonMassive
+            // 
+            radioButtonMassive.AutoSize = true;
+            radioButtonMassive.Location = new Point(9, 74);
+            radioButtonMassive.Name = "radioButtonMassive";
+            radioButtonMassive.Size = new Size(82, 24);
+            radioButtonMassive.TabIndex = 1;
+            radioButtonMassive.TabStop = true;
+            radioButtonMassive.Text = "Массив";
+            radioButtonMassive.UseVisualStyleBackColor = true;
+            // 
+            // labelNameCollection
+            // 
+            labelNameCollection.AutoSize = true;
+            labelNameCollection.Location = new Point(41, 11);
+            labelNameCollection.Name = "labelNameCollection";
+            labelNameCollection.Size = new Size(155, 20);
+            labelNameCollection.TabIndex = 0;
+            labelNameCollection.Text = "Название коллекции";
             // 
             // pictureBox
             // 
             pictureBox.Dock = DockStyle.Fill;
             pictureBox.Location = new Point(0, 0);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(940, 669);
+            pictureBox.Size = new Size(981, 772);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             // 
@@ -147,13 +249,16 @@
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1175, 669);
+            ClientSize = new Size(1216, 772);
             Controls.Add(pictureBox);
             Controls.Add(groupBox1);
             Name = "FormGunCollections";
             Text = "Коллекция установок";
             groupBox1.ResumeLayout(false);
-            groupBox1.PerformLayout();
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
             ResumeLayout(false);
         }
@@ -164,10 +269,19 @@
         private Button buttonAddGun;
         private ComboBox comboBoxSelectorCompany;
         private MaskedTextBox maskedTextBox;
-        private Button buttonAddAntiAircraftGun;
         private PictureBox pictureBox;
         private Button buttonRemoveGun;
         private Button buttonRefresh;
         private Button buttonGoToCheck;
+        private Panel panelStorage;
+        private ListBox listBoxCollection;
+        private Button buttonCollectionAdd;
+        private TextBox textBoxCollectionName;
+        private RadioButton radioButtonList;
+        private RadioButton radioButtonMassive;
+        private Label labelNameCollection;
+        private Button buttonCreateCompany;
+        private Button buttonCollectionDel;
+        private Panel panelCompanyTools;
     }
 }

AntiAircraftGun/AntiAircraftGun/FormGunCollections.cs

@@ -5,8 +5,10 @@ namespace AntiAircraftGun;
 
 public partial class FormGunCollections : Form
 {
+
+    private readonly StorageCollection<DrawningGun> _storageCollection;
     /// <summary>
-    /// 
+    /// Компания
     /// </summary>
     private AbstractCompany? _company = null;
     /// <summary>
@@ -15,53 +17,39 @@ public partial class FormGunCollections : Form
     public FormGunCollections()
     {
         InitializeComponent();
+        _storageCollection = new();
     }
     /// <summary>
     /// 
     /// </summary>
     /// <param name="sender"></param>
     /// <param name="e"></param>
-    private void comboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+    private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
     {
-        switch (comboBoxSelectorCompany.Text)
-        {
-            case "База":
-                _company = new GunSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningGun>());
-                break;
-        }
+        panelCompanyTools.Enabled = true;
     }
     /// <summary>
-    /// Создание объекта класса перемещения
+    /// Добавление установки
     /// </summary>
-    /// <param name="type">Тип создаваемого объекта</param>
-    private void CreateObj(string type)
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddGun_Click(object sender, EventArgs e)
     {
-        if (_company == null)
-        {
-            return;
-        }
+        FormGunConfig form = new();
+        // TODO передать метод
+        form.AddEvent(SetGun);
+        form.Show();
+    }
 
-        DrawningGun _drawningGun;
-        Random random = new();
-        switch (type)
-        {
-            case nameof(DrawningGun):
-                _drawningGun = new DrawningGun(random.Next(100, 300),
-                    random.Next(1000, 3000), SetColor(random));
-                break;
-            case nameof(DrawningAntiAircraftGun):
-                _drawningGun = new DrawningAntiAircraftGun(random.Next(100, 300),
-                           random.Next(1000, 3000),
-                           SetColor(random),
-                           SetColor(random),
-                           random.Next(10, 100),
-                           Convert.ToBoolean(random.Next(0, 2)),
-                           Convert.ToBoolean(random.Next(0, 2)));
-                break;
-            default:
-                return;
-        }
-        if (_company + _drawningGun!=-1)
+
+    /// <summary>
+    /// Добавление автомобиля в коллекцию
+    /// </summary>
+    /// <param name="gun"></param>
+    private void SetGun(DrawningGun gun)
+    {
+        if (_company == null||gun==null) { return; }
+        if (_company + gun)
         {
             MessageBox.Show("Объект добавлен");
             pictureBox.Image = _company.Show();
@@ -70,30 +58,13 @@ public partial class FormGunCollections : Form
         {
             MessageBox.Show("Не удалось добавить объект");
         }
+
     }
     /// <summary>
-    /// Получение цвета
+    /// Удаление установки
     /// </summary>
-    /// <param name="random">Случайные числа</param>
-    /// <returns></returns>
-    private static Color SetColor(Random random)
-    {
-        Color color = Color.FromArgb(random.Next(0, 255), random.Next(0, 255), random.Next(0, 255));
-        ColorDialog dialog = new();
-        if (dialog.ShowDialog() == DialogResult.OK) { color = dialog.Color; }
-        return color;
-    }
-
-    private void ButtonAddGun_Click(object sender, EventArgs e)
-    {
-        CreateObj(nameof(DrawningGun));
-    }
-
-    private void ButtonAddAntiAircraftGun_Click(object sender, EventArgs e)
-    {
-        CreateObj(nameof(DrawningAntiAircraftGun));
-    }
-
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
     private void ButtonRemoveGun_Click(object sender, EventArgs e)
     {
         if (_company == null)
@@ -104,9 +75,9 @@ public partial class FormGunCollections : Form
         {
             return;
         }
-        if (MessageBox.Show("Удалить объект", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) { return; }
+        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) { return; }
         int pos = Convert.ToInt32(maskedTextBox.Text);
-        if (_company - pos is DrawningGun)
+        if (_company - pos)
         {
             MessageBox.Show("Объект удален");
             pictureBox.Image = _company.Show();
@@ -117,7 +88,11 @@ public partial class FormGunCollections : Form
         }
 
     }
-
+    /// <summary>
+    /// Передача объекта на тесты
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
     private void ButtonGoToCheck_Click(object sender, EventArgs e)
     {
         if (_company == null)
@@ -148,7 +123,11 @@ public partial class FormGunCollections : Form
         form.ShowDialog();
 
     }
-
+    /// <summary>
+    /// Обновление экрана
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
     private void ButtonRefresh_Click(object sender, EventArgs e)
     {
         if (_company == null)
@@ -157,4 +136,91 @@ public partial class FormGunCollections : 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.SelectedItem == null || listBoxCollection.SelectedIndex < 0)
+        {
+            MessageBox.Show("Коллекция для удаления не выбрана");
+            return;
+        }
+        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+        RerfreshListBoxItems();
+    }
+    /// <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<DrawningGun>? collection =
+        _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+        if (collection == null)
+        {
+            MessageBox.Show("Коллекция не проинициализирована");
+            return;
+        }
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "База":
+                _company = new GunSharingService(pictureBox.Width,
+                pictureBox.Height, collection);
+                break;
+        }
+        panelCompanyTools.Enabled = true;
+        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);
+            }
+        }
+    }
 }

AntiAircraftGun/AntiAircraftGun/FormGunConfig.Designer.cs

@@ -0,0 +1,371 @@
+namespace AntiAircraftGun
+{
+    partial class FormGunConfig
+    {
+        /// <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();
+            labelSimpleOblect = new Label();
+            groupBoxColors = new GroupBox();
+            panelIndigo = new Panel();
+            panelGrey = new Panel();
+            panelBlack = new Panel();
+            panelWhite = new Panel();
+            panelGreen = new Panel();
+            panelBlue = new Panel();
+            panelYellow = new Panel();
+            panelRed = new Panel();
+            checkBoxRadar = new CheckBox();
+            checkBoxHatch = new CheckBox();
+            numericUpDownWeight = new NumericUpDown();
+            numericUpDownSpeed = new NumericUpDown();
+            labelWeight = new Label();
+            labelSpeed = new Label();
+            labelModifiedObject = new Label();
+            labelSimpleObject = new Label();
+            pictureBoxObjects = new PictureBox();
+            buttonAdd = new Button();
+            buttonCancel = new Button();
+            panelObjects = new Panel();
+            labelOptionalColor = new Label();
+            labelBodyColor = new Label();
+            groupBoxConfig.SuspendLayout();
+            groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObjects).BeginInit();
+            panelObjects.SuspendLayout();
+            SuspendLayout();
+            // 
+            // groupBoxConfig
+            // 
+            groupBoxConfig.Controls.Add(labelSimpleOblect);
+            groupBoxConfig.Controls.Add(groupBoxColors);
+            groupBoxConfig.Controls.Add(checkBoxRadar);
+            groupBoxConfig.Controls.Add(checkBoxHatch);
+            groupBoxConfig.Controls.Add(numericUpDownWeight);
+            groupBoxConfig.Controls.Add(numericUpDownSpeed);
+            groupBoxConfig.Controls.Add(labelWeight);
+            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(682, 345);
+            groupBoxConfig.TabIndex = 0;
+            groupBoxConfig.TabStop = false;
+            groupBoxConfig.Text = "Параметры";
+            // 
+            // labelSimpleOblect
+            // 
+            labelSimpleOblect.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            labelSimpleOblect.BorderStyle = BorderStyle.FixedSingle;
+            labelSimpleOblect.Location = new Point(277, 241);
+            labelSimpleOblect.Name = "labelSimpleOblect";
+            labelSimpleOblect.Size = new Size(131, 55);
+            labelSimpleOblect.TabIndex = 10;
+            labelSimpleOblect.Text = "Простой";
+            labelSimpleOblect.TextAlign = ContentAlignment.MiddleCenter;
+            labelSimpleOblect.MouseDown += LabelOblect_MouseDown;
+            // 
+            // groupBoxColors
+            // 
+            groupBoxColors.Controls.Add(panelIndigo);
+            groupBoxColors.Controls.Add(panelGrey);
+            groupBoxColors.Controls.Add(panelBlack);
+            groupBoxColors.Controls.Add(panelWhite);
+            groupBoxColors.Controls.Add(panelGreen);
+            groupBoxColors.Controls.Add(panelBlue);
+            groupBoxColors.Controls.Add(panelYellow);
+            groupBoxColors.Controls.Add(panelRed);
+            groupBoxColors.Location = new Point(277, 41);
+            groupBoxColors.Name = "groupBoxColors";
+            groupBoxColors.Size = new Size(314, 171);
+            groupBoxColors.TabIndex = 8;
+            groupBoxColors.TabStop = false;
+            groupBoxColors.Text = "Цвета";
+            // 
+            // panelIndigo
+            // 
+            panelIndigo.BackColor = Color.Indigo;
+            panelIndigo.Location = new Point(233, 91);
+            panelIndigo.Name = "panelIndigo";
+            panelIndigo.Size = new Size(39, 41);
+            panelIndigo.TabIndex = 4;
+            // 
+            // panelGrey
+            // 
+            panelGrey.BackColor = Color.Gray;
+            panelGrey.Location = new Point(163, 91);
+            panelGrey.Name = "panelGrey";
+            panelGrey.Size = new Size(39, 41);
+            panelGrey.TabIndex = 6;
+            // 
+            // panelBlack
+            // 
+            panelBlack.BackColor = Color.Black;
+            panelBlack.Location = new Point(92, 91);
+            panelBlack.Name = "panelBlack";
+            panelBlack.Size = new Size(39, 41);
+            panelBlack.TabIndex = 5;
+            // 
+            // panelWhite
+            // 
+            panelWhite.BackColor = Color.White;
+            panelWhite.Location = new Point(19, 91);
+            panelWhite.Name = "panelWhite";
+            panelWhite.Size = new Size(39, 41);
+            panelWhite.TabIndex = 3;
+            // 
+            // panelGreen
+            // 
+            panelGreen.BackColor = Color.Green;
+            panelGreen.Location = new Point(233, 37);
+            panelGreen.Name = "panelGreen";
+            panelGreen.Size = new Size(39, 41);
+            panelGreen.TabIndex = 1;
+            // 
+            // panelBlue
+            // 
+            panelBlue.BackColor = Color.Blue;
+            panelBlue.Location = new Point(163, 37);
+            panelBlue.Name = "panelBlue";
+            panelBlue.Size = new Size(39, 41);
+            panelBlue.TabIndex = 2;
+            // 
+            // panelYellow
+            // 
+            panelYellow.BackColor = Color.Yellow;
+            panelYellow.Location = new Point(92, 37);
+            panelYellow.Name = "panelYellow";
+            panelYellow.Size = new Size(39, 41);
+            panelYellow.TabIndex = 1;
+            // 
+            // panelRed
+            // 
+            panelRed.BackColor = Color.Red;
+            panelRed.Location = new Point(19, 37);
+            panelRed.Name = "panelRed";
+            panelRed.Size = new Size(39, 41);
+            panelRed.TabIndex = 0;
+            // 
+            // checkBoxRadar
+            // 
+            checkBoxRadar.AutoSize = true;
+            checkBoxRadar.Location = new Point(22, 203);
+            checkBoxRadar.Name = "checkBoxRadar";
+            checkBoxRadar.Size = new Size(72, 24);
+            checkBoxRadar.TabIndex = 7;
+            checkBoxRadar.Text = "Радар";
+            checkBoxRadar.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxHatch
+            // 
+            checkBoxHatch.AutoSize = true;
+            checkBoxHatch.Location = new Point(22, 149);
+            checkBoxHatch.Name = "checkBoxHatch";
+            checkBoxHatch.Size = new Size(60, 24);
+            checkBoxHatch.TabIndex = 6;
+            checkBoxHatch.Text = "Люк";
+            checkBoxHatch.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            numericUpDownWeight.Location = new Point(104, 92);
+            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(99, 27);
+            numericUpDownWeight.TabIndex = 5;
+            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // numericUpDownSpeed
+            // 
+            numericUpDownSpeed.Location = new Point(104, 41);
+            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(99, 27);
+            numericUpDownSpeed.TabIndex = 4;
+            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelWeight
+            // 
+            labelWeight.AutoSize = true;
+            labelWeight.Location = new Point(22, 94);
+            labelWeight.Name = "labelWeight";
+            labelWeight.Size = new Size(36, 20);
+            labelWeight.TabIndex = 3;
+            labelWeight.Text = "Вес:";
+            // 
+            // labelSpeed
+            // 
+            labelSpeed.AutoSize = true;
+            labelSpeed.Location = new Point(22, 43);
+            labelSpeed.Name = "labelSpeed";
+            labelSpeed.Size = new Size(76, 20);
+            labelSpeed.TabIndex = 2;
+            labelSpeed.Text = "Скорость:";
+            // 
+            // labelModifiedObject
+            // 
+            labelModifiedObject.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+            labelModifiedObject.Location = new Point(460, 241);
+            labelModifiedObject.Name = "labelModifiedObject";
+            labelModifiedObject.Size = new Size(131, 55);
+            labelModifiedObject.TabIndex = 1;
+            labelModifiedObject.Text = "Продвинутый";
+            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelModifiedObject.MouseDown += LabelOblect_MouseDown;
+            // 
+            // labelSimpleObject
+            // 
+            labelSimpleObject.Location = new Point(0, 0);
+            labelSimpleObject.Name = "labelSimpleObject";
+            labelSimpleObject.Size = new Size(100, 23);
+            labelSimpleObject.TabIndex = 9;
+            // 
+            // pictureBoxObjects
+            // 
+            pictureBoxObjects.Location = new Point(41, 95);
+            pictureBoxObjects.Name = "pictureBoxObjects";
+            pictureBoxObjects.Size = new Size(218, 169);
+            pictureBoxObjects.TabIndex = 0;
+            pictureBoxObjects.TabStop = false;
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(731, 304);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(94, 29);
+            buttonAdd.TabIndex = 2;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += ButtonAdd_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(931, 304);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(94, 29);
+            buttonCancel.TabIndex = 3;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // panelObjects
+            // 
+            panelObjects.AllowDrop = true;
+            panelObjects.Controls.Add(labelOptionalColor);
+            panelObjects.Controls.Add(labelBodyColor);
+            panelObjects.Controls.Add(pictureBoxObjects);
+            panelObjects.Location = new Point(731, 12);
+            panelObjects.Name = "panelObjects";
+            panelObjects.Size = new Size(294, 284);
+            panelObjects.TabIndex = 4;
+            panelObjects.DragDrop += PanelObjects_DragDrop;
+            panelObjects.DragEnter += PanelObjects_DragEnter;
+            // 
+            // labelOptionalColor
+            // 
+            labelOptionalColor.AllowDrop = true;
+            labelOptionalColor.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            labelOptionalColor.BorderStyle = BorderStyle.FixedSingle;
+            labelOptionalColor.Location = new Point(164, 14);
+            labelOptionalColor.Name = "labelOptionalColor";
+            labelOptionalColor.Size = new Size(118, 42);
+            labelOptionalColor.TabIndex = 12;
+            labelOptionalColor.Text = "Доп. Цвет";
+            labelOptionalColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelOptionalColor.DragDrop += labelOptionalColor_DragDrop;
+            labelOptionalColor.DragEnter += labelOptionalColor_DragEnter;
+            // 
+            // labelBodyColor
+            // 
+            labelBodyColor.AllowDrop = true;
+            labelBodyColor.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
+            labelBodyColor.Location = new Point(13, 14);
+            labelBodyColor.Name = "labelBodyColor";
+            labelBodyColor.Size = new Size(113, 42);
+            labelBodyColor.TabIndex = 11;
+            labelBodyColor.Text = "Цвет";
+            labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelBodyColor.DragDrop += labelBodyColor_DragDrop;
+            labelBodyColor.DragEnter += labelBodyColor_DragEnter;
+            // 
+            // FormGunConfig
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1056, 345);
+            Controls.Add(panelObjects);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonAdd);
+            Controls.Add(groupBoxConfig);
+            Name = "FormGunConfig";
+            Text = "Создание объекта";
+            groupBoxConfig.ResumeLayout(false);
+            groupBoxConfig.PerformLayout();
+            groupBoxColors.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObjects).EndInit();
+            panelObjects.ResumeLayout(false);
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxConfig;
+        private Label labelSimpleObject;
+        private Label labelModifiedObject;
+        private NumericUpDown numericUpDownWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private Label labelWeight;
+        private Label labelSpeed;
+        private CheckBox checkBoxRadar;
+        private CheckBox checkBoxHatch;
+        private GroupBox groupBoxColors;
+        private Panel panelRed;
+        private Panel panelIndigo;
+        private Panel panelGrey;
+        private Panel panelBlack;
+        private Panel panelWhite;
+        private Panel panelGreen;
+        private Panel panelBlue;
+        private Panel panelYellow;
+        private PictureBox pictureBoxObjects;
+        private Button buttonAdd;
+        private Button buttonCancel;
+        private Panel panelObjects;
+        private Label labelSimpleOblect;
+        private Label labelBodyColor;
+        private Label labelOptionalColor;
+    }
+}

AntiAircraftGun/AntiAircraftGun/FormGunConfig.cs

@@ -0,0 +1,154 @@
+using AntiAircraftGun.Drawnings;
+using AntiAircraftGun.Entities;
+
+namespace AntiAircraftGun;
+/// <summary>
+/// Форма конфигурации объекта
+/// </summary>
+public partial class FormGunConfig : Form
+{
+    /// <summary>
+    /// Объект прорисовки класса
+    /// </summary>
+    private DrawningGun? _gun;
+    /// <summary>
+    /// Событие для передачи объекта
+    /// </summary>
+    private event GunDelegate? _gunDelegate;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormGunConfig()
+    {
+        InitializeComponent();
+        panelRed.MouseDown += Panel_MouseDown;
+        panelGreen.MouseDown += Panel_MouseDown;
+        panelBlue.MouseDown += Panel_MouseDown;
+        panelWhite.MouseDown += Panel_MouseDown;
+        panelBlack.MouseDown += Panel_MouseDown;
+        panelGrey.MouseDown += Panel_MouseDown;
+        panelIndigo.MouseDown += Panel_MouseDown;
+        panelYellow.MouseDown += Panel_MouseDown;
+
+        // TODO buttonCancel.Click with lambda
+        buttonCancel.Click += (sender, e) => Close();
+    }
+    /// <summary>
+    /// Привязка внешнего метода к союытию
+    /// </summary>
+    /// <param name="gunDelegate"></param>
+    public void AddEvent(GunDelegate gunDelegate)
+    {
+        _gunDelegate += gunDelegate;
+    }
+
+    // <summary>
+    /// Прорисовка объекта
+    /// </summary>
+    private void DrawObject()
+    {
+        Bitmap bmp = new(pictureBoxObjects.Width, pictureBoxObjects.Height);
+        Graphics gr = Graphics.FromImage(bmp);
+        _gun?.SetPictureSize(pictureBoxObjects.Width,
+        pictureBoxObjects.Height);
+        _gun?.SetPosition(15, 15);
+        _gun?.DrawTransport(gr);
+        pictureBoxObjects.Image = bmp;
+    }
+    /// <summary>
+    /// Передаем информацию при нажатии на Label
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void LabelOblect_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 PanelObjects_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 PanelObjects_DragDrop(object sender, DragEventArgs e)
+    {
+        switch (e.Data?.GetData(DataFormats.Text)?.ToString())
+        {
+            case "labelSimpleOblect":
+                _gun = new DrawningGun((int)numericUpDownSpeed.Value,
+                (double)numericUpDownWeight.Value, Color.White);
+                break;
+            case "labelModifiedObject":
+                Random random = new Random();
+                _gun = new
+                DrawningAntiAircraftGun((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value,
+                Color.White,
+                Color.Black, random.Next(10, 100),
+                checkBoxHatch.Checked, checkBoxRadar.Checked);
+                break;
+        }
+        DrawObject();
+    }
+
+    private void Panel_MouseDown(object? sender, MouseEventArgs e)
+    {
+        // TODO реализовать выбор цвета
+        (sender as Control)?.DoDragDrop((sender as Control)?.BackColor ?? Color.Black, DragDropEffects.Move | DragDropEffects.Copy);
+    }
+    /// <summary>
+    /// Передача объекта
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAdd_Click(object sender, EventArgs e)
+    {
+        if (_gun != null)
+        {
+            _gunDelegate?.Invoke(_gun);
+            Close();
+        }
+    }
+
+    private void labelBodyColor_DragDrop(object sender, DragEventArgs e)
+    {
+        if (_gun != null)
+        {
+            _gun.EntityGun.SetBodyColor((Color)e.Data.GetData(typeof(Color)));
+            DrawObject();
+        }
+    }
+
+    private void labelBodyColor_DragEnter(object? sender, DragEventArgs e)
+    {
+        e.Effect = e.Data?.GetDataPresent(typeof(Color)) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
+    }
+
+    private void labelOptionalColor_DragDrop(object sender, DragEventArgs e)
+    {
+        if (_gun.EntityGun is EntityAntiAircraftGun antiAircraftGun)
+        {
+            antiAircraftGun.SetOptionalElemensColor((Color)e.Data.GetData(typeof(Color)));
+            DrawObject();
+        }
+    }
+
+    private void labelOptionalColor_DragEnter(object sender, DragEventArgs e)
+    {
+        if (_gun is DrawningAntiAircraftGun)
+        {
+            e.Effect = e.Data?.GetDataPresent(typeof(Color)) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
+        }
+    }
+
+
+    // TODO Реализовать логику смены цветов: основного и дополнительного(для продвинутого объекта)
+}

AntiAircraftGun/AntiAircraftGun/FormGunConfig.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>

AntiAircraftGun/AntiAircraftGun/GunDelegate.cs

@@ -0,0 +1,7 @@
+using AntiAircraftGun.Drawnings;
+namespace AntiAircraftGun;
+/// <summary>
+/// Делегат для объекта класса прорисовки
+/// </summary>
+/// <param name="drawningGun"></param>
+public delegate void GunDelegate(DrawningGun drawningGun);