s

ArtilleryUnit/ArtilleryUnit/ArtilleryUnitDelegate.cs

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

ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/AbstractCompany.cs

@@ -28,7 +28,7 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
         protected readonly int _pictureHeight;
 
         /// <summary>
-        /// Коллекция автомобилей
+        /// Коллекция артиллирийских установок
         /// </summary>
         protected ICollectionGenericObjects<DrawningArtilleryUnit>? _collection = null;
 

ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/ArtilleryUnitDockingService.cs

@@ -22,7 +22,7 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
             int width = _pictureWidth / _placeSizeWidth;
             int height = _pictureHeight / _placeSizeHeight;
             Pen pen = new(Color.Black, 2);
-            for (int i = 0; i < width; i++)
+            for (int i = 0; i < width + 1; i++)
             {
                 for (int j = 0; j < height + 1; ++j)
                 {
@@ -47,7 +47,7 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
                     _collection.Get(i).SetPosition(_placeSizeWidth * curWidth + 10, curHeight * _placeSizeHeight + 10);
                 }
 
-                if (curWidth < width - 1)
+                if (curWidth < width)
                     curWidth++;
                 else
                 {

ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/CollectionType.cs

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

ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -11,16 +11,19 @@
         /// Количество объектов в коллекции
         /// </summary>
         int Count { get; }
+
         /// <summary>
         /// Установка максимального количества элементов
         /// </summary>
         int SetMaxCount { set; }
+
         /// <summary>
         /// Добавление объекта в коллекцию
         /// </summary>
         /// <param name="obj">Добавляемый объект</param>
         /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
         int Insert(T obj);
+
         /// <summary>
         /// Добавление объекта в коллекцию на конкретную позицию
         /// </summary>
@@ -28,12 +31,14 @@
         /// <param name="position">Позиция</param>
         /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
         int Insert(T obj, int position);
+
         /// <summary>
         /// Удаление объекта из коллекции с конкретной позиции
         /// </summary>
         /// <param name="position">Позиция</param>
         /// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
         T? Remove(int position);
+
         /// <summary>
         /// Получение объекта по позиции
         /// </summary>

ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/ListGenericObjects.cs

@@ -0,0 +1,65 @@
+namespace ProjectArtilleryUnit.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 (position >= Count || position < 0) return null;
+            return _collection[position];
+        }
+
+        public int Insert(T obj)
+        {
+            // TODO проверка, что не превышено максимальное количество элементов
+            // TODO вставка в конец набора
+            if (Count == _maxCount) return -1;
+            _collection.Add(obj);
+            return Count;
+        }
+
+        public int Insert(T obj, int position)
+        {
+            // TODO проверка, что не превышено максимальное количество элементов
+            // TODO проверка позиции
+            // TODO вставка по позиции
+            if (Count == _maxCount) return -1;
+            if (position >= Count || position < 0) return -1;
+            _collection.Insert(position, obj);
+            return position;
+
+        }
+
+        public T Remove(int position)
+        {
+            // TODO проверка позиции
+            // TODO удаление объекта из списка
+            if (position >= Count || position < 0) return null;
+            T obj = _collection[position];
+            _collection.RemoveAt(position);
+            return obj;
+        }
+    }
+}

ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -14,7 +14,23 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
         /// </summary>
         private T?[] _collection;
         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>
         /// Конструктор
@@ -27,11 +43,10 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
         {
             // TODO проверка позиции
             if (position >= _collection.Length || position < 0)
-            {
-                return null;
-            }
+            { return null; }
             return _collection[position];
         }
+
         public int Insert(T obj)
         {
             // TODO вставка в свободное место набора
@@ -43,16 +58,18 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
                     _collection[index] = obj;
                     return index;
                 }
+
                 index++;
             }
             return -1;
         }
+
         public int Insert(T obj, int position)
         {
             // TODO проверка позиции
             // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
-            // ищется свободное место после этой позиции и идет вставка туда
-            // если нет после, ищем до
+            //		ищется свободное место после этой позиции и идет вставка туда
+            //		если нет после, ищем до
             // TODO вставка
             if (position >= _collection.Length || position < 0)
             { return -1; }
@@ -83,15 +100,16 @@ namespace ProjectArtilleryUnit.CollectionGenericObjects
             }
             return -1;
         }
+
         public T Remove(int position)
         {
             // TODO проверка позиции
             // TODO удаление объекта из массива, присвоив элементу массива значение null
             if (position >= _collection.Length || position < 0)
             { return null; }
-            T drawningArtilleryUnit = _collection[position];
+            T obj = _collection[position];
             _collection[position] = null;
-            return drawningArtilleryUnit;
+            return obj;
         }
     }
 }

ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/StorageCollection.cs

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

ArtilleryUnit/ArtilleryUnit/Drawnings/DrawningArtilleryUnit.cs

@@ -1,5 +1,4 @@
 using ProjectArtilleryUnit.Entities;
-using System.Drawing;
 
 namespace ProjectArtilleryUnit.Drawnings;
 /// <summary>
@@ -29,11 +28,11 @@ public class DrawningArtilleryUnit
     protected int? _startPosY;
 
     /// <summary>
-    /// Ширина прорисовки танка
+    /// Ширина прорисовки артиллирийской установки
     /// </summary>
     private readonly int _drawningArtilleryUnitWidth = 150;
     /// <summary>
-    /// Высота прорисовки танка 
+    /// Высота прорисовки артиллирийской установки
     /// </summary>
     private readonly int _drawningArtilleryUnitHeight = 50;
     private readonly int _drawningEnginesWidth = 3;
@@ -222,5 +221,6 @@ public class DrawningArtilleryUnit
         g.DrawArc(pen, _startPosX.Value + 70, _startPosY.Value + 24, 10, 10, 0, 170);
         g.DrawArc(pen, _startPosX.Value + 93, _startPosY.Value + 24, 10, 10, 0, 170);
 
+
     }
 }

ArtilleryUnit/ArtilleryUnit/Drawnings/DrawningMilitaryArtilleryUnit.cs

@@ -1,12 +1,10 @@
-using System.Drawing;
-using System.Drawing.Drawing2D;
+using System.Drawing.Drawing2D;
 using ProjectArtilleryUnit.Entities;
 
 namespace ProjectArtilleryUnit.Drawnings
 {
     public class DrawningMilitaryArtilleryUnit : DrawningArtilleryUnit
     {
-
         /// <summary>
         /// Конструктор
         /// </summary>
@@ -31,6 +29,7 @@ namespace ProjectArtilleryUnit.Drawnings
             {
                 return;
             }
+
             Pen pen = new(entityMilitaryArtilleryUnit.AdditionalColor, 2);
             Pen pen2 = new(Color.Black, 2);
             Pen pen3 = new(Color.Red, 4);
@@ -62,8 +61,6 @@ namespace ProjectArtilleryUnit.Drawnings
             {
                 g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 4, 25, 2);
             }
-
-             
         }
     }
 }

ArtilleryUnit/ArtilleryUnit/Entities/EntityArtilleryUnit.cs

@@ -1,7 +1,7 @@
 namespace ProjectArtilleryUnit.Entities;
 
 /// <summary>
-/// Класс-сущность "танк"
+/// Класс-сущность "артиллирийская установка"
 /// </summary>
 public class EntityArtilleryUnit
 {
@@ -10,21 +10,28 @@ public class EntityArtilleryUnit
     /// Скорость
     /// </summary>
     public int Speed { get; private set; }
+
     /// <summary>
     /// Вес
     /// </summary>
     public double Weight { get; private set; }
+
     /// <summary>
     /// Основной цвет
     /// </summary>
     public Color BodyColor { get; private set; }
+    public void setBodyColor(Color color)
+    {
+        BodyColor = color;
+    }
 
     /// <summary>
     /// Шаг перемещения автомобиля
     /// </summary>
     public double Step => Speed * 100 / Weight;
+
     /// <summary>
-    /// Инициализация полей объекта-класса танка
+    /// Инициализация полей объекта-класса артиллирийской установки
     /// </summary>
     /// <param name="speed">скорость</param>
     /// <param name="weight">вес</param>

ArtilleryUnit/ArtilleryUnit/Entities/EntityMilitaryArtilleryUnit.cs

@@ -6,23 +6,30 @@
         /// Признак (опция) наличие дула
         /// </summary>
         public bool Muzzle { get; private set; }
+
         /// <summary>
         /// Признак (опция) наличие ракетной установки
         /// </summary>
         public bool Gun { get; private set; }
+
         /// <summary>
         /// Признак (опция) наличие люка
         /// </summary>
         public bool Luke { get; private set; }
+
         /// <summary>
         /// Дополнительный цвет (для опциональных элементов)
         /// </summary>
         public Color AdditionalColor { get; private set; }
+        public void setAdditionalColor(Color color)
+        {
+            AdditionalColor = color;
+        }
 
-        public EntityMilitaryArtilleryUnit(int speed, double weight, Color bodyColor, Color additionalColor, bool мuzzle, bool gun, bool luke) : base(speed, weight, bodyColor)
+        public EntityMilitaryArtilleryUnit(int speed, double weight, Color bodyColor, Color additionalColor, bool muzzle, bool gun, bool luke) : base(speed, weight, bodyColor)
         {
             AdditionalColor = additionalColor;
-            Muzzle = мuzzle;
+            Muzzle = muzzle;
             Gun = gun;
             Luke = luke;
         }

ArtilleryUnit/ArtilleryUnit/FormArtilleryUnit.cs

@@ -41,7 +41,7 @@ namespace ProjectArtilleryUnit
         }
 
         /// <summary>
-        /// Метод прорисовки танка
+        /// Метод прорисовки круисера
         /// </summary>
         private void Draw()
         {

ArtilleryUnit/ArtilleryUnit/FormArtilleryUnitConfing.Designer.cs

@@ -0,0 +1,394 @@
+namespace ProjectArtilleryUnit
+{
+    partial class FormArtilleryUnitConfing
+    {
+        /// <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()
+        {
+            groupBoxConfing = new GroupBox();
+            groupBoxColors = new GroupBox();
+            panelPurple = new Panel();
+            panelBlack = new Panel();
+            panelGray = new Panel();
+            panelWhite = new Panel();
+            panelYellow = new Panel();
+            panelBlue = new Panel();
+            panelGreen = new Panel();
+            panelRed = new Panel();
+            checkBoxLuke = new CheckBox();
+            checkBoxGun = new CheckBox();
+            checkBoxMuzzle = 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();
+            groupBoxConfing.SuspendLayout();
+            groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
+            panelObject.SuspendLayout();
+            SuspendLayout();
+            // 
+            // groupBoxConfing
+            // 
+            groupBoxConfing.Controls.Add(groupBoxColors);
+            groupBoxConfing.Controls.Add(checkBoxLuke);
+            groupBoxConfing.Controls.Add(checkBoxGun);
+            groupBoxConfing.Controls.Add(checkBoxMuzzle);
+            groupBoxConfing.Controls.Add(numericUpDownWeight);
+            groupBoxConfing.Controls.Add(labelWeight);
+            groupBoxConfing.Controls.Add(numericUpDownSpeed);
+            groupBoxConfing.Controls.Add(labelSpeed);
+            groupBoxConfing.Controls.Add(labelModifiedObject);
+            groupBoxConfing.Controls.Add(labelSimpleObject);
+            groupBoxConfing.Dock = DockStyle.Left;
+            groupBoxConfing.Location = new Point(0, 0);
+            groupBoxConfing.Margin = new Padding(3, 2, 3, 2);
+            groupBoxConfing.Name = "groupBoxConfing";
+            groupBoxConfing.Padding = new Padding(3, 2, 3, 2);
+            groupBoxConfing.Size = new Size(548, 196);
+            groupBoxConfing.TabIndex = 0;
+            groupBoxConfing.TabStop = false;
+            groupBoxConfing.Text = "Параметры";
+            // 
+            // groupBoxColors
+            // 
+            groupBoxColors.Controls.Add(panelPurple);
+            groupBoxColors.Controls.Add(panelBlack);
+            groupBoxColors.Controls.Add(panelGray);
+            groupBoxColors.Controls.Add(panelWhite);
+            groupBoxColors.Controls.Add(panelYellow);
+            groupBoxColors.Controls.Add(panelBlue);
+            groupBoxColors.Controls.Add(panelGreen);
+            groupBoxColors.Controls.Add(panelRed);
+            groupBoxColors.Location = new Point(286, 20);
+            groupBoxColors.Margin = new Padding(3, 2, 3, 2);
+            groupBoxColors.Name = "groupBoxColors";
+            groupBoxColors.Padding = new Padding(3, 2, 3, 2);
+            groupBoxColors.Size = new Size(245, 116);
+            groupBoxColors.TabIndex = 9;
+            groupBoxColors.TabStop = false;
+            groupBoxColors.Text = "Цвета";
+            // 
+            // panelPurple
+            // 
+            panelPurple.BackColor = Color.Purple;
+            panelPurple.Location = new Point(190, 72);
+            panelPurple.Margin = new Padding(3, 2, 3, 2);
+            panelPurple.Name = "panelPurple";
+            panelPurple.Size = new Size(42, 35);
+            panelPurple.TabIndex = 1;
+            // 
+            // panelBlack
+            // 
+            panelBlack.BackColor = Color.Black;
+            panelBlack.Location = new Point(130, 72);
+            panelBlack.Margin = new Padding(3, 2, 3, 2);
+            panelBlack.Name = "panelBlack";
+            panelBlack.Size = new Size(42, 35);
+            panelBlack.TabIndex = 1;
+            // 
+            // panelGray
+            // 
+            panelGray.BackColor = Color.Gray;
+            panelGray.Location = new Point(72, 72);
+            panelGray.Margin = new Padding(3, 2, 3, 2);
+            panelGray.Name = "panelGray";
+            panelGray.Size = new Size(42, 35);
+            panelGray.TabIndex = 1;
+            // 
+            // panelWhite
+            // 
+            panelWhite.BackColor = Color.White;
+            panelWhite.Location = new Point(15, 72);
+            panelWhite.Margin = new Padding(3, 2, 3, 2);
+            panelWhite.Name = "panelWhite";
+            panelWhite.Size = new Size(42, 35);
+            panelWhite.TabIndex = 1;
+            // 
+            // panelYellow
+            // 
+            panelYellow.BackColor = Color.Yellow;
+            panelYellow.Location = new Point(190, 23);
+            panelYellow.Margin = new Padding(3, 2, 3, 2);
+            panelYellow.Name = "panelYellow";
+            panelYellow.Size = new Size(42, 35);
+            panelYellow.TabIndex = 1;
+            // 
+            // panelBlue
+            // 
+            panelBlue.BackColor = Color.Blue;
+            panelBlue.Location = new Point(130, 23);
+            panelBlue.Margin = new Padding(3, 2, 3, 2);
+            panelBlue.Name = "panelBlue";
+            panelBlue.Size = new Size(42, 35);
+            panelBlue.TabIndex = 1;
+            // 
+            // panelGreen
+            // 
+            panelGreen.BackColor = Color.Green;
+            panelGreen.Location = new Point(72, 23);
+            panelGreen.Margin = new Padding(3, 2, 3, 2);
+            panelGreen.Name = "panelGreen";
+            panelGreen.Size = new Size(42, 35);
+            panelGreen.TabIndex = 1;
+            // 
+            // panelRed
+            // 
+            panelRed.BackColor = Color.Red;
+            panelRed.Location = new Point(15, 23);
+            panelRed.Margin = new Padding(3, 2, 3, 2);
+            panelRed.Name = "panelRed";
+            panelRed.Size = new Size(42, 35);
+            panelRed.TabIndex = 0;
+            // 
+            // checkBoxLuke
+            // 
+            checkBoxLuke.AutoSize = true;
+            checkBoxLuke.Location = new Point(5, 163);
+            checkBoxLuke.Margin = new Padding(3, 2, 3, 2);
+            checkBoxLuke.Name = "checkBoxLuke";
+            checkBoxLuke.Size = new Size(155, 19);
+            checkBoxLuke.TabIndex = 8;
+            checkBoxLuke.Text = "Признак наличие люка";
+            checkBoxLuke.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxGun
+            // 
+            checkBoxGun.AutoSize = true;
+            checkBoxGun.Location = new Point(5, 127);
+            checkBoxGun.Margin = new Padding(3, 2, 3, 2);
+            checkBoxGun.Name = "checkBoxGun";
+            checkBoxGun.Size = new Size(182, 19);
+            checkBoxGun.TabIndex = 7;
+            checkBoxGun.Text = "Признак наличие установки";
+            checkBoxGun.UseVisualStyleBackColor = true;
+            checkBoxGun.CheckedChanged += checkBoxGun_CheckedChanged;
+            // 
+            // checkBoxMuzzle
+            // 
+            checkBoxMuzzle.AutoSize = true;
+            checkBoxMuzzle.Location = new Point(5, 92);
+            checkBoxMuzzle.Margin = new Padding(3, 2, 3, 2);
+            checkBoxMuzzle.Name = "checkBoxMuzzle";
+            checkBoxMuzzle.Size = new Size(151, 19);
+            checkBoxMuzzle.TabIndex = 6;
+            checkBoxMuzzle.Text = "Признак наличие дула";
+            checkBoxMuzzle.UseVisualStyleBackColor = true;
+            checkBoxMuzzle.CheckedChanged += checkBoxMuzzle_CheckedChanged;
+            // 
+            // numericUpDownWeight
+            // 
+            numericUpDownWeight.Location = new Point(82, 51);
+            numericUpDownWeight.Margin = new Padding(3, 2, 3, 2);
+            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(100, 23);
+            numericUpDownWeight.TabIndex = 5;
+            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelWeight
+            // 
+            labelWeight.AutoSize = true;
+            labelWeight.Location = new Point(24, 52);
+            labelWeight.Name = "labelWeight";
+            labelWeight.Size = new Size(29, 15);
+            labelWeight.TabIndex = 4;
+            labelWeight.Text = "Вес:";
+            // 
+            // numericUpDownSpeed
+            // 
+            numericUpDownSpeed.Location = new Point(82, 24);
+            numericUpDownSpeed.Margin = new Padding(3, 2, 3, 2);
+            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(100, 23);
+            numericUpDownSpeed.TabIndex = 3;
+            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelSpeed
+            // 
+            labelSpeed.AutoSize = true;
+            labelSpeed.Location = new Point(10, 24);
+            labelSpeed.Name = "labelSpeed";
+            labelSpeed.Size = new Size(62, 15);
+            labelSpeed.TabIndex = 2;
+            labelSpeed.Text = "Скорость:";
+            // 
+            // labelModifiedObject
+            // 
+            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+            labelModifiedObject.Location = new Point(416, 152);
+            labelModifiedObject.Name = "labelModifiedObject";
+            labelModifiedObject.Size = new Size(115, 34);
+            labelModifiedObject.TabIndex = 1;
+            labelModifiedObject.Text = "Продвинутый";
+            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelModifiedObject.MouseDown += labelObject_MouseDown;
+            // 
+            // labelSimpleObject
+            // 
+            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+            labelSimpleObject.Location = new Point(286, 152);
+            labelSimpleObject.Name = "labelSimpleObject";
+            labelSimpleObject.Size = new Size(114, 34);
+            labelSimpleObject.TabIndex = 0;
+            labelSimpleObject.Text = "Простой";
+            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelSimpleObject.MouseDown += labelObject_MouseDown;
+            // 
+            // pictureBoxObject
+            // 
+            pictureBoxObject.Location = new Point(10, 42);
+            pictureBoxObject.Margin = new Padding(3, 2, 3, 2);
+            pictureBoxObject.Name = "pictureBoxObject";
+            pictureBoxObject.Size = new Size(160, 94);
+            pictureBoxObject.TabIndex = 1;
+            pictureBoxObject.TabStop = false;
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(553, 159);
+            buttonAdd.Margin = new Padding(3, 2, 3, 2);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(82, 22);
+            buttonAdd.TabIndex = 2;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += buttonAdd_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(648, 159);
+            buttonCancel.Margin = new Padding(3, 2, 3, 2);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(82, 22);
+            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(553, 9);
+            panelObject.Margin = new Padding(3, 2, 3, 2);
+            panelObject.Name = "panelObject";
+            panelObject.Size = new Size(179, 146);
+            panelObject.TabIndex = 4;
+            panelObject.DragDrop += PanelObject_DragDrop;
+            panelObject.DragEnter += PanelObject_DragEnter;
+            // 
+            // labelAdditionalColor
+            // 
+            labelAdditionalColor.AllowDrop = true;
+            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+            labelAdditionalColor.Location = new Point(94, 8);
+            labelAdditionalColor.Name = "labelAdditionalColor";
+            labelAdditionalColor.Size = new Size(73, 28);
+            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(10, 8);
+            labelBodyColor.Name = "labelBodyColor";
+            labelBodyColor.Size = new Size(73, 28);
+            labelBodyColor.TabIndex = 2;
+            labelBodyColor.Text = "Цвет";
+            labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelBodyColor.DragDrop += labelBodyColor_DragDrop;
+            labelBodyColor.DragEnter += labelBodyColor_DragEnter;
+            // 
+            // FormArtilleryUnitConfing
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(733, 196);
+            Controls.Add(panelObject);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonAdd);
+            Controls.Add(groupBoxConfing);
+            Margin = new Padding(3, 2, 3, 2);
+            Name = "FormArtilleryUnitConfing";
+            Text = "Создание объекта";
+            groupBoxConfing.ResumeLayout(false);
+            groupBoxConfing.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 groupBoxConfing;
+        private Label labelSimpleObject;
+        private Label labelModifiedObject;
+        private Label labelWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private Label labelSpeed;
+        private NumericUpDown numericUpDownWeight;
+        private CheckBox checkBoxMuzzle;
+        private CheckBox checkBoxGun;
+        private CheckBox checkBoxLuke;
+        private GroupBox groupBoxColors;
+        private Panel panelPurple;
+        private Panel panelBlack;
+        private Panel panelGray;
+        private Panel panelWhite;
+        private Panel panelYellow;
+        private Panel panelBlue;
+        private Panel panelGreen;
+        private Panel panelRed;
+        private PictureBox pictureBoxObject;
+        private Button buttonAdd;
+        private Button buttonCancel;
+        private Panel panelObject;
+        private Label labelBodyColor;
+        private Label labelAdditionalColor;
+    }
+}

ArtilleryUnit/ArtilleryUnit/FormArtilleryUnitConfing.cs

@@ -0,0 +1,187 @@
+using ProjectArtilleryUnit.Drawnings;
+using ProjectArtilleryUnit.Entities;
+
+namespace ProjectArtilleryUnit
+{
+    /// <summary>
+    /// Форма конфигурации объекта
+    /// </summary>
+    public partial class FormArtilleryUnitConfing : Form
+    {
+        /// <summary>
+        /// Объект - прорисовка артиллерийской установки
+        /// </summary>
+        private DrawningArtilleryUnit _artilleryUnit;
+
+        /// <summary>
+        /// Событие для передачи объекта
+        /// </summary>
+        private event Action<DrawningArtilleryUnit>? ArtilleryUnitDelegate;
+
+        /// <summary>
+        /// Привязка внешнего метода к событию
+        /// </summary>
+        /// <param name="carDelegate"></param>
+        public void AddEvent(Action<DrawningArtilleryUnit> artilleryUnitDelegate)
+        {
+            ArtilleryUnitDelegate += artilleryUnitDelegate;
+        }
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormArtilleryUnitConfing()
+        {
+            InitializeComponent();
+
+            panelRed.MouseDown += Panel_MouseDown;
+            panelGreen.MouseDown += Panel_MouseDown;
+            panelBlue.MouseDown += Panel_MouseDown;
+            panelYellow.MouseDown += Panel_MouseDown;
+            panelWhite.MouseDown += Panel_MouseDown;
+            panelGray.MouseDown += Panel_MouseDown;
+            panelBlack.MouseDown += Panel_MouseDown;
+            panelPurple.MouseDown += Panel_MouseDown;
+            //TODO  buttonCancel.Click with lambda с закрытием формы
+            buttonCancel.Click += (sender, e) => Close();
+        }
+
+        /// <summary>
+        /// Прорисовка объекта
+        /// </summary>
+        private void DrawObject()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _artilleryUnit?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
+            _artilleryUnit?.SetPosition(15, 15);
+            _artilleryUnit?.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":
+                    _artilleryUnit = new DrawningArtilleryUnit((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White);
+                    break;
+                case "labelModifiedObject":
+                    _artilleryUnit = new
+                    DrawningMilitaryArtilleryUnit((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White,
+                        Color.Black, checkBoxMuzzle.Checked, checkBoxGun.Checked, checkBoxLuke.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 Control)?.DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        // TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта)
+
+        private void labelBodyColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        private void labelBodyColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_artilleryUnit != null)
+            {
+                _artilleryUnit.EntityArtilleryUnit.setBodyColor((Color)e.Data.GetData(typeof(Color)));
+                DrawObject();
+            }
+        }
+
+        private void labelAdditionalColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (_artilleryUnit is DrawningArtilleryUnit)
+            {
+                if (e.Data.GetDataPresent(typeof(Color)))
+                {
+                    e.Effect = DragDropEffects.Copy;
+                }
+                else
+                {
+                    e.Effect = DragDropEffects.None;
+                }
+            }
+        }
+
+        private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_artilleryUnit.EntityArtilleryUnit is EntityMilitaryArtilleryUnit militaryArtilleryUnit)
+            {
+                militaryArtilleryUnit.setAdditionalColor((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 (_artilleryUnit != null)
+            {
+                ArtilleryUnitDelegate?.Invoke(_artilleryUnit);
+                Close();
+            }
+
+        }
+
+        private void checkBoxMuzzle_CheckedChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void checkBoxGun_CheckedChanged(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

ArtilleryUnit/ArtilleryUnit/FormArtilleryUnitConfing.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>

ArtilleryUnit/ArtilleryUnit/FormArtilleryUnitsCollection.Designer.cs

@@ -29,63 +29,222 @@
         private void InitializeComponent()
         {
             groupBoxTools = new GroupBox();
-            maskedTextBoxPosision = new MaskedTextBox();
-            buttonRefresh = new Button();
-            buttonGetToTest = new Button();
-            ButtonRemoveArtilleryUnit = new Button();
-            ButtonAddMilitaryArtilleryUnit = new Button();
-            ButtonAddArtilleryUnit = new Button();
+            buttonCreateCompany = new Button();
+            panelStorage = new Panel();
+            buttonCollectionDel = new Button();
+            listBoxCollection = new ListBox();
+            buttonCollecctionAdd = new Button();
+            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            textBoxCollectionName = new TextBox();
+            labelCollectionName = new Label();
             comboBoxSelectorCompany = new ComboBox();
+            panelCompanyTools = new Panel();
+            ButtonAddArtilleryUnit = new Button();
+            buttonRefresh = new Button();
+            ButtonRemoveArtilleryUnit = new Button();
+            maskedTextBoxPosision = new MaskedTextBox();
+            buttonGetToTest = new Button();
             pictureBoxArtilleryUnit = new PictureBox();
             groupBoxTools.SuspendLayout();
+            panelStorage.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBoxArtilleryUnit).BeginInit();
             SuspendLayout();
             // 
             // groupBoxTools
             // 
-            groupBoxTools.Controls.Add(maskedTextBoxPosision);
-            groupBoxTools.Controls.Add(buttonRefresh);
-            groupBoxTools.Controls.Add(buttonGetToTest);
-            groupBoxTools.Controls.Add(ButtonRemoveArtilleryUnit);
-            groupBoxTools.Controls.Add(ButtonAddMilitaryArtilleryUnit);
-            groupBoxTools.Controls.Add(ButtonAddArtilleryUnit);
+            groupBoxTools.Controls.Add(buttonCreateCompany);
+            groupBoxTools.Controls.Add(panelStorage);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Controls.Add(panelCompanyTools);
             groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(590, 0);
+            groupBoxTools.Location = new Point(522, 0);
             groupBoxTools.Margin = new Padding(3, 2, 3, 2);
             groupBoxTools.Name = "groupBoxTools";
             groupBoxTools.Padding = new Padding(3, 2, 3, 2);
-            groupBoxTools.Size = new Size(177, 430);
+            groupBoxTools.Size = new Size(182, 490);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "инструменты";
             // 
-            // maskedTextBoxPosision
+            // buttonCreateCompany
             // 
-            maskedTextBoxPosision.Location = new Point(6, 172);
-            maskedTextBoxPosision.Margin = new Padding(3, 2, 3, 2);
-            maskedTextBoxPosision.Mask = "00";
-            maskedTextBoxPosision.Name = "maskedTextBoxPosision";
-            maskedTextBoxPosision.Size = new Size(163, 23);
-            maskedTextBoxPosision.TabIndex = 2;
-            maskedTextBoxPosision.ValidatingType = typeof(int);
+            buttonCreateCompany.Location = new Point(18, 259);
+            buttonCreateCompany.Margin = new Padding(3, 2, 3, 2);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(163, 20);
+            buttonCreateCompany.TabIndex = 7;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += ButtonCreateCompany_Click;
+            // 
+            // panelStorage
+            // 
+            panelStorage.Controls.Add(buttonCollectionDel);
+            panelStorage.Controls.Add(listBoxCollection);
+            panelStorage.Controls.Add(buttonCollecctionAdd);
+            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, 18);
+            panelStorage.Margin = new Padding(3, 2, 3, 2);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(176, 212);
+            panelStorage.TabIndex = 6;
+            // 
+            // buttonCollectionDel
+            // 
+            buttonCollectionDel.Location = new Point(15, 185);
+            buttonCollectionDel.Margin = new Padding(3, 2, 3, 2);
+            buttonCollectionDel.Name = "buttonCollectionDel";
+            buttonCollectionDel.Size = new Size(163, 20);
+            buttonCollectionDel.TabIndex = 6;
+            buttonCollectionDel.Text = "Удалить коллекцию";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += ButtonCollectionDel_Click;
+            // 
+            // listBoxCollection
+            // 
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.ItemHeight = 15;
+            listBoxCollection.Location = new Point(15, 103);
+            listBoxCollection.Margin = new Padding(3, 2, 3, 2);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(163, 79);
+            listBoxCollection.TabIndex = 5;
+            // 
+            // buttonCollecctionAdd
+            // 
+            buttonCollecctionAdd.Location = new Point(15, 78);
+            buttonCollecctionAdd.Margin = new Padding(3, 2, 3, 2);
+            buttonCollecctionAdd.Name = "buttonCollecctionAdd";
+            buttonCollecctionAdd.Size = new Size(163, 20);
+            buttonCollecctionAdd.TabIndex = 4;
+            buttonCollecctionAdd.Text = "Добавить коллекцию";
+            buttonCollecctionAdd.UseVisualStyleBackColor = true;
+            buttonCollecctionAdd.Click += ButtonCollecctionAdd_Click;
+            // 
+            // radioButtonList
+            // 
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(108, 56);
+            radioButtonList.Margin = new Padding(3, 2, 3, 2);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(66, 19);
+            radioButtonList.TabIndex = 3;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonMassive
+            // 
+            radioButtonMassive.AutoSize = true;
+            radioButtonMassive.Location = new Point(15, 56);
+            radioButtonMassive.Margin = new Padding(3, 2, 3, 2);
+            radioButtonMassive.Name = "radioButtonMassive";
+            radioButtonMassive.Size = new Size(67, 19);
+            radioButtonMassive.TabIndex = 2;
+            radioButtonMassive.TabStop = true;
+            radioButtonMassive.Text = "Массив";
+            radioButtonMassive.UseVisualStyleBackColor = true;
+            // 
+            // textBoxCollectionName
+            // 
+            textBoxCollectionName.Location = new Point(15, 24);
+            textBoxCollectionName.Margin = new Padding(3, 2, 3, 2);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(163, 23);
+            textBoxCollectionName.TabIndex = 1;
+            // 
+            // labelCollectionName
+            // 
+            labelCollectionName.AutoSize = true;
+            labelCollectionName.Location = new Point(23, 7);
+            labelCollectionName.Name = "labelCollectionName";
+            labelCollectionName.Size = new Size(122, 15);
+            labelCollectionName.TabIndex = 0;
+            labelCollectionName.Text = "Название коллекции";
+            // 
+            // comboBoxSelectorCompany
+            // 
+            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxSelectorCompany.FormattingEnabled = true;
+            comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
+            comboBoxSelectorCompany.Location = new Point(18, 233);
+            comboBoxSelectorCompany.Margin = new Padding(3, 2, 3, 2);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(163, 23);
+            comboBoxSelectorCompany.TabIndex = 0;
+            comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged_1;
+            // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(ButtonAddArtilleryUnit);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(ButtonRemoveArtilleryUnit);
+            panelCompanyTools.Controls.Add(maskedTextBoxPosision);
+            panelCompanyTools.Controls.Add(buttonGetToTest);
+            panelCompanyTools.Enabled = false;
+            panelCompanyTools.Location = new Point(3, 284);
+            panelCompanyTools.Margin = new Padding(3, 2, 3, 2);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(189, 206);
+            panelCompanyTools.TabIndex = 8;
+            // 
+            // ButtonAddArtilleryUnit
+            // 
+            ButtonAddArtilleryUnit.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            ButtonAddArtilleryUnit.BackgroundImageLayout = ImageLayout.Center;
+            ButtonAddArtilleryUnit.Location = new Point(16, 2);
+            ButtonAddArtilleryUnit.Margin = new Padding(3, 2, 3, 2);
+            ButtonAddArtilleryUnit.Name = "ButtonAddArtilleryUnit";
+            ButtonAddArtilleryUnit.Size = new Size(163, 55);
+            ButtonAddArtilleryUnit.TabIndex = 1;
+            ButtonAddArtilleryUnit.Text = "добваление артиллерийской установки";
+            ButtonAddArtilleryUnit.UseVisualStyleBackColor = true;
+            ButtonAddArtilleryUnit.Click += ButtonAddArtilleryUnit_Click;
             // 
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(6, 356);
+            buttonRefresh.Location = new Point(16, 170);
             buttonRefresh.Margin = new Padding(3, 2, 3, 2);
             buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(163, 30);
+            buttonRefresh.Size = new Size(163, 31);
             buttonRefresh.TabIndex = 5;
             buttonRefresh.Text = "обновить";
             buttonRefresh.UseVisualStyleBackColor = true;
             buttonRefresh.Click += ButtonRefresh_Click;
             // 
+            // ButtonRemoveArtilleryUnit
+            // 
+            ButtonRemoveArtilleryUnit.Anchor = AnchorStyles.Right;
+            ButtonRemoveArtilleryUnit.Location = new Point(16, 88);
+            ButtonRemoveArtilleryUnit.Margin = new Padding(3, 2, 3, 2);
+            ButtonRemoveArtilleryUnit.Name = "ButtonRemoveArtilleryUnit";
+            ButtonRemoveArtilleryUnit.Size = new Size(163, 46);
+            ButtonRemoveArtilleryUnit.TabIndex = 3;
+            ButtonRemoveArtilleryUnit.Text = "удалить артиллерийскую установку";
+            ButtonRemoveArtilleryUnit.UseVisualStyleBackColor = true;
+            ButtonRemoveArtilleryUnit.Click += ButtonRemoveArtilleryUnit_Click;
+            // 
+            // maskedTextBoxPosision
+            // 
+            maskedTextBoxPosision.Location = new Point(16, 61);
+            maskedTextBoxPosision.Margin = new Padding(3, 2, 3, 2);
+            maskedTextBoxPosision.Mask = "00";
+            maskedTextBoxPosision.Name = "maskedTextBoxPosision";
+            maskedTextBoxPosision.Size = new Size(164, 23);
+            maskedTextBoxPosision.TabIndex = 2;
+            maskedTextBoxPosision.ValidatingType = typeof(int);
+            // 
             // buttonGetToTest
             // 
             buttonGetToTest.Anchor = AnchorStyles.Right;
-            buttonGetToTest.Location = new Point(6, 269);
+            buttonGetToTest.Location = new Point(16, 138);
             buttonGetToTest.Margin = new Padding(3, 2, 3, 2);
             buttonGetToTest.Name = "buttonGetToTest";
             buttonGetToTest.Size = new Size(163, 30);
@@ -94,78 +253,31 @@
             buttonGetToTest.UseVisualStyleBackColor = true;
             buttonGetToTest.Click += ButtonGetToTest_Click;
             // 
-            // ButtonRemoveArtilleryUnit
-            // 
-            ButtonRemoveArtilleryUnit.Anchor = AnchorStyles.Right;
-            ButtonRemoveArtilleryUnit.Location = new Point(6, 199);
-            ButtonRemoveArtilleryUnit.Margin = new Padding(3, 2, 3, 2);
-            ButtonRemoveArtilleryUnit.Name = "ButtonRemoveArtilleryUnit";
-            ButtonRemoveArtilleryUnit.Size = new Size(163, 41);
-            ButtonRemoveArtilleryUnit.TabIndex = 3;
-            ButtonRemoveArtilleryUnit.Text = "удалить артиллерийскую установку";
-            ButtonRemoveArtilleryUnit.UseVisualStyleBackColor = true;
-            ButtonRemoveArtilleryUnit.Click += ButtonRemoveArtilleryUnit_Click;
-            // 
-            // ButtonAddMilitaryArtilleryUnit
-            // 
-            ButtonAddMilitaryArtilleryUnit.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            ButtonAddMilitaryArtilleryUnit.Location = new Point(6, 130);
-            ButtonAddMilitaryArtilleryUnit.Margin = new Padding(3, 2, 3, 2);
-            ButtonAddMilitaryArtilleryUnit.Name = "ButtonAddMilitaryArtilleryUnit";
-            ButtonAddMilitaryArtilleryUnit.Size = new Size(163, 38);
-            ButtonAddMilitaryArtilleryUnit.TabIndex = 2;
-            ButtonAddMilitaryArtilleryUnit.Text = "добавлене военной артиллерийской установки";
-            ButtonAddMilitaryArtilleryUnit.UseVisualStyleBackColor = true;
-            ButtonAddMilitaryArtilleryUnit.Click += ButtonAddMilitaryArtilleryUnit_Click;
-            // 
-            // ButtonAddArtilleryUnit
-            // 
-            ButtonAddArtilleryUnit.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            ButtonAddArtilleryUnit.BackgroundImageLayout = ImageLayout.Center;
-            ButtonAddArtilleryUnit.Location = new Point(6, 80);
-            ButtonAddArtilleryUnit.Margin = new Padding(3, 2, 3, 2);
-            ButtonAddArtilleryUnit.Name = "ButtonAddArtilleryUnit";
-            ButtonAddArtilleryUnit.Size = new Size(163, 46);
-            ButtonAddArtilleryUnit.TabIndex = 1;
-            ButtonAddArtilleryUnit.Text = "добваление артиллерийской установки";
-            ButtonAddArtilleryUnit.UseVisualStyleBackColor = true;
-            ButtonAddArtilleryUnit.Click += ButtonAddArtilleryUnit_Click;
-            // 
-            // comboBoxSelectorCompany
-            // 
-            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
-            comboBoxSelectorCompany.FormattingEnabled = true;
-            comboBoxSelectorCompany.Items.AddRange(new object[] { "хранилище" });
-            comboBoxSelectorCompany.Location = new Point(6, 20);
-            comboBoxSelectorCompany.Margin = new Padding(3, 2, 3, 2);
-            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
-            comboBoxSelectorCompany.Size = new Size(163, 23);
-            comboBoxSelectorCompany.TabIndex = 0;
-            comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged_1;
-            // 
             // pictureBoxArtilleryUnit
             // 
             pictureBoxArtilleryUnit.Dock = DockStyle.Fill;
             pictureBoxArtilleryUnit.Location = new Point(0, 0);
             pictureBoxArtilleryUnit.Margin = new Padding(3, 2, 3, 2);
             pictureBoxArtilleryUnit.Name = "pictureBoxArtilleryUnit";
-            pictureBoxArtilleryUnit.Size = new Size(590, 430);
+            pictureBoxArtilleryUnit.Size = new Size(522, 490);
             pictureBoxArtilleryUnit.TabIndex = 1;
             pictureBoxArtilleryUnit.TabStop = false;
-            pictureBoxArtilleryUnit.Click += pictureBoxArtilleryUnit_Click;
             // 
             // FormArtilleryUnitsCollection
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(767, 430);
+            ClientSize = new Size(704, 490);
             Controls.Add(pictureBoxArtilleryUnit);
             Controls.Add(groupBoxTools);
             Margin = new Padding(3, 2, 3, 2);
             Name = "FormArtilleryUnitsCollection";
             Text = "FormArtilleryUnitsCollection";
             groupBoxTools.ResumeLayout(false);
-            groupBoxTools.PerformLayout();
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBoxArtilleryUnit).EndInit();
             ResumeLayout(false);
         }
@@ -174,12 +286,21 @@
 
         private GroupBox groupBoxTools;
         private ComboBox comboBoxSelectorCompany;
-        private Button ButtonAddMilitaryArtilleryUnit;
         private Button ButtonAddArtilleryUnit;
         private Button ButtonRemoveArtilleryUnit;
         private Button buttonRefresh;
         private Button buttonGetToTest;
         private PictureBox pictureBoxArtilleryUnit;
         private MaskedTextBox maskedTextBoxPosision;
+        private Panel panelStorage;
+        private TextBox textBoxCollectionName;
+        private Label labelCollectionName;
+        private ListBox listBoxCollection;
+        private Button buttonCollecctionAdd;
+        private RadioButton radioButtonList;
+        private RadioButton radioButtonMassive;
+        private Button buttonCreateCompany;
+        private Button buttonCollectionDel;
+        private Panel panelCompanyTools;
     }
 }

ArtilleryUnit/ArtilleryUnit/FormArtilleryUnitsCollection.cs

@@ -1,20 +1,28 @@
 using ProjectArtilleryUnit.CollectionGenericObjects;
 using ProjectArtilleryUnit.Drawnings;
+using System.Windows.Forms;
 
 namespace ProjectArtilleryUnit
 {
     public partial class FormArtilleryUnitsCollection : Form
     {
+        /// <summary>
+        /// Хранилише коллекций
+        /// </summary>
+        private readonly StorageCollection<DrawningArtilleryUnit> _storageCollection;
+
         /// <summary>
         /// Компания
         /// </summary>
         private AbstractCompany? _company = null;
+
         /// <summary>
         /// Конструктор
         /// </summary>
         public FormArtilleryUnitsCollection()
         {
             InitializeComponent();
+            _storageCollection = new();
         }
 
         /// <summary>
@@ -24,83 +32,45 @@ namespace ProjectArtilleryUnit
         /// <param name="e"></param>
         private void comboBoxSelectorCompany_SelectedIndexChanged_1(object sender, EventArgs e)
         {
-            switch (comboBoxSelectorCompany.Text)
-            {
-                case "хранилище":
-                    _company = new ArtilleryUnitDockingService(pictureBoxArtilleryUnit.Width,
-                    pictureBoxArtilleryUnit.Height, new MassiveGenericObjects<DrawningArtilleryUnit>());
-                    break;
-            }
+            panelCompanyTools.Enabled = false;
+        }
+
+        private void ButtonAddArtilleryUnit_Click(object sender, EventArgs e)
+        {
+            FormArtilleryUnitConfing form = new();
+            // TODO передать метод
+
+            form.Show();
+            form.AddEvent(SetArtilleryUnit);
         }
 
         /// <summary>
-        /// Создание объекта класса-перемещения
+        /// Добавление артиллерийской установки в коллекцию
         /// </summary>
-        /// <param name="type">Тип создаваемого объекта</param>
-        private void CreateObject(string type)
+        /// <param name="artilleryUnit"></param>
+        private void SetArtilleryUnit(DrawningArtilleryUnit artilleryUnit)
         {
-            if (_company == null)
+            if (_company == null || artilleryUnit == null)
             {
                 return;
             }
-            Random random = new();
-            DrawningArtilleryUnit drawningArtilleryUnit;
-            switch (type)
+
+            if (_company + artilleryUnit != -1)
             {
-                case nameof(DrawningArtilleryUnit):
-                    drawningArtilleryUnit = new DrawningArtilleryUnit(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
-                    break;
-                case nameof(DrawningMilitaryArtilleryUnit):
-                    drawningArtilleryUnit = new DrawningMilitaryArtilleryUnit(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 + drawningArtilleryUnit != -1)
-            {
-                MessageBox.Show("объект добавлен");
+                MessageBox.Show("Объект добавлен");
                 pictureBoxArtilleryUnit.Image = _company.Show();
             }
             else
             {
-                MessageBox.Show("не удалось добавить объект");
+                MessageBox.Show("Не удалось добавить объект");
             }
         }
 
         /// <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;
-        }
-
-        //private void ButtonAddArtilleryUnit_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningArtilleryUnit));
-
-        //private void ButtonAddMilitaryArtilleryUnit_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMilitaryArtilleryUnit));
-        private void ButtonAddArtilleryUnit_Click(object sender, EventArgs e)
-        {
-            CreateObject(nameof(DrawningArtilleryUnit));
-        }
-
-        private void ButtonAddMilitaryArtilleryUnit_Click(object sender, EventArgs e)
-        {
-            CreateObject(nameof(DrawningMilitaryArtilleryUnit));
-        }
-
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void ButtonRemoveArtilleryUnit_Click(object sender, EventArgs e)
         {
             if (string.IsNullOrEmpty(maskedTextBoxPosision.Text) || _company == null)
@@ -131,24 +101,24 @@ namespace ProjectArtilleryUnit
                 return;
             }
 
-            DrawningArtilleryUnit? tank = null;
+            DrawningArtilleryUnit? artilleryUnit = null;
             int counter = 100;
-            while (tank == null)
+            while (artilleryUnit == null)
             {
-                tank = _company.GetRandomObject();
+                artilleryUnit = _company.GetRandomObject();
                 counter--;
                 if (counter <= 0)
                 {
                     break;
                 }
             }
-            if (tank == null)
+            if (artilleryUnit == null)
             {
                 return;
             }
             FormArtilleryUnit form = new()
             {
-                SetArtilleryUnit = tank
+                SetArtilleryUnit = artilleryUnit
             };
             form.ShowDialog();
 
@@ -164,19 +134,97 @@ namespace ProjectArtilleryUnit
             pictureBoxArtilleryUnit.Image = _company.Show();
         }
 
-        private void pictureBoxArtilleryUnit_Click(object sender, EventArgs e)
+        /// <summary>
+        /// Добавление коллекции
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCollecctionAdd_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.No)
+            {
+                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<DrawningArtilleryUnit>? collection =
+                _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+            if (collection == null)
+            {
+                MessageBox.Show("Коллекция не проинициализирована");
+                return;
+            }
+            switch (comboBoxSelectorCompany.Text)
+            {
+                case "Хранилище":
+                    _company = new ArtilleryUnitDockingService(pictureBoxArtilleryUnit.Width, pictureBoxArtilleryUnit.Height, collection);
+                    break;
+            }
+            panelCompanyTools.Enabled = true;
 
         }
 
-        private void ButtonAddTank_Click(object sender, EventArgs e)
-        {
 
-        }
-
-        private void ButtonAddMilitaryTank_Click(object sender, EventArgs e)
-        {
-
-        }
     }
 }