fh

ProjectLocomotive/ProjectLocomotive/CollectionGenericObjects/CollectionType.cs

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

ProjectLocomotive/ProjectLocomotive/CollectionGenericObjects/ListGenericObjects.cs

@@ -0,0 +1,65 @@
+namespace ProjectLocomotive.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;
+        }
+    }
+}

ProjectLocomotive/ProjectLocomotive/CollectionGenericObjects/LocomotiveDockingService.cs

@@ -22,7 +22,7 @@ namespace ProjectLocomotive.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)
                 {
@@ -36,7 +36,7 @@ namespace ProjectLocomotive.CollectionGenericObjects
             int width = _pictureWidth / _placeSizeWidth;
             int height = _pictureHeight / _placeSizeHeight;
 
-            int curWidth = 0;
+            int curWidth = 2;
             int curHeight = 0;
 
             for (int i = 0; i < (_collection?.Count ?? 0); i++)
@@ -47,11 +47,11 @@ namespace ProjectLocomotive.CollectionGenericObjects
                     _collection.Get(i).SetPosition(_placeSizeWidth * curWidth + 10, curHeight * _placeSizeHeight + 10);
                 }
 
-                if (curWidth < width - 1)
+                if (curWidth > width - 2)
-                    curWidth++;
+                    curWidth--;
                 else
                 {
-                    curWidth = 0; 
+                    curWidth = 2; 
                     curHeight ++;
                 }
 

ProjectLocomotive/ProjectLocomotive/CollectionGenericObjects/StorageCollection.cs

@@ -0,0 +1,73 @@
+namespace ProjectLocomotive.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;
+            }
+        }
+    }
+}

ProjectLocomotive/ProjectLocomotive/FormLocomotivesCollection.Designer.cs

@@ -29,100 +29,179 @@
         private void InitializeComponent()
         {
             groupBoxTools = new GroupBox();
-            maskedTextBoxPosision = new MaskedTextBox();
+            buttonCreateCompany = new Button();
-            buttonRefresh = new Button();
+            panelStorage = new Panel();
-            buttonGetToTest = new Button();
+            buttonCollectionDel = new Button();
-            ButtonRemoveLocomotive = new Button();
+            listBoxCollection = new ListBox();
-            ButtonAddTLocomotive = new Button();
+            buttonCollecctionAdd = new Button();
-            ButtonAddLocomotive = new Button();
+            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            textBoxCollectionName = new TextBox();
+            labelCollectionName = new Label();
             comboBoxSelectorCompany = new ComboBox();
+            panelCompanyTools = new Panel();
+            ButtonAddLocomotive = new Button();
+            ButtonAddTLocomotive = new Button();
+            buttonRefresh = new Button();
+            ButtonRemoveLocomotive = new Button();
+            maskedTextBoxPosision = new MaskedTextBox();
+            buttonGetToTest = new Button();
             pictureBoxLocomotive = new PictureBox();
             groupBoxTools.SuspendLayout();
+            panelStorage.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBoxLocomotive).BeginInit();
             SuspendLayout();
             // 
             // groupBoxTools
             // 
-            groupBoxTools.Controls.Add(maskedTextBoxPosision);
+            groupBoxTools.Controls.Add(buttonCreateCompany);
-            groupBoxTools.Controls.Add(buttonRefresh);
+            groupBoxTools.Controls.Add(panelStorage);
-            groupBoxTools.Controls.Add(buttonGetToTest);
-            groupBoxTools.Controls.Add(ButtonRemoveLocomotive);
-            groupBoxTools.Controls.Add(ButtonAddTLocomotive);
-            groupBoxTools.Controls.Add(ButtonAddLocomotive);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Controls.Add(panelCompanyTools);
             groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(522, 0);
+            groupBoxTools.Location = new Point(536, 0);
             groupBoxTools.Margin = new Padding(3, 2, 3, 2);
             groupBoxTools.Name = "groupBoxTools";
             groupBoxTools.Padding = new Padding(3, 2, 3, 2);
-            groupBoxTools.Size = new Size(194, 430);
+            groupBoxTools.Size = new Size(215, 490);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "инструменты";
             // 
-            // maskedTextBoxPosision
+            // buttonCreateCompany
             // 
-            maskedTextBoxPosision.Location = new Point(18, 172);
+            buttonCreateCompany.Location = new Point(18, 259);
-            maskedTextBoxPosision.Margin = new Padding(3, 2, 3, 2);
+            buttonCreateCompany.Margin = new Padding(3, 2, 3, 2);
-            maskedTextBoxPosision.Mask = "00";
+            buttonCreateCompany.Name = "buttonCreateCompany";
-            maskedTextBoxPosision.Name = "maskedTextBoxPosision";
+            buttonCreateCompany.Size = new Size(163, 20);
-            maskedTextBoxPosision.Size = new Size(163, 23);
+            buttonCreateCompany.TabIndex = 7;
-            maskedTextBoxPosision.TabIndex = 2;
+            buttonCreateCompany.Text = "Создать компанию";
-            maskedTextBoxPosision.ValidatingType = typeof(int);
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += ButtonCreateCompany_Click;
             // 
-            // buttonRefresh
+            // panelStorage
             // 
-            buttonRefresh.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            panelStorage.Controls.Add(buttonCollectionDel);
-            buttonRefresh.Location = new Point(18, 359);
+            panelStorage.Controls.Add(listBoxCollection);
-            buttonRefresh.Margin = new Padding(3, 2, 3, 2);
+            panelStorage.Controls.Add(buttonCollecctionAdd);
-            buttonRefresh.Name = "buttonRefresh";
+            panelStorage.Controls.Add(radioButtonList);
-            buttonRefresh.Size = new Size(163, 30);
+            panelStorage.Controls.Add(radioButtonMassive);
-            buttonRefresh.TabIndex = 5;
+            panelStorage.Controls.Add(textBoxCollectionName);
-            buttonRefresh.Text = "обновить";
+            panelStorage.Controls.Add(labelCollectionName);
-            buttonRefresh.UseVisualStyleBackColor = true;
+            panelStorage.Dock = DockStyle.Top;
-            buttonRefresh.Click += ButtonRefresh_Click;
+            panelStorage.Location = new Point(3, 18);
+            panelStorage.Margin = new Padding(3, 2, 3, 2);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(209, 212);
+            panelStorage.TabIndex = 6;
             // 
-            // buttonGetToTest
+            // buttonCollectionDel
             // 
-            buttonGetToTest.Anchor = AnchorStyles.Right;
+            buttonCollectionDel.Location = new Point(15, 185);
-            buttonGetToTest.Location = new Point(18, 274);
+            buttonCollectionDel.Margin = new Padding(3, 2, 3, 2);
-            buttonGetToTest.Margin = new Padding(3, 2, 3, 2);
+            buttonCollectionDel.Name = "buttonCollectionDel";
-            buttonGetToTest.Name = "buttonGetToTest";
+            buttonCollectionDel.Size = new Size(163, 20);
-            buttonGetToTest.Size = new Size(163, 30);
+            buttonCollectionDel.TabIndex = 6;
-            buttonGetToTest.TabIndex = 4;
+            buttonCollectionDel.Text = "Удалить коллекцию";
-            buttonGetToTest.Text = "передать на тесты";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
-            buttonGetToTest.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += ButtonCollectionDel_Click;
-            buttonGetToTest.Click += ButtonGetToTest_Click;
             // 
-            // ButtonRemoveLocomotive
+            // listBoxCollection
             // 
-            ButtonRemoveLocomotive.Anchor = AnchorStyles.Right;
+            listBoxCollection.FormattingEnabled = true;
-            ButtonRemoveLocomotive.Location = new Point(18, 203);
+            listBoxCollection.ItemHeight = 15;
-            ButtonRemoveLocomotive.Margin = new Padding(3, 2, 3, 2);
+            listBoxCollection.Location = new Point(15, 103);
-            ButtonRemoveLocomotive.Name = "ButtonRemoveLocomotive";
+            listBoxCollection.Margin = new Padding(3, 2, 3, 2);
-            ButtonRemoveLocomotive.Size = new Size(163, 30);
+            listBoxCollection.Name = "listBoxCollection";
-            ButtonRemoveLocomotive.TabIndex = 3;
+            listBoxCollection.Size = new Size(163, 79);
-            ButtonRemoveLocomotive.Text = "удалить поезд";
+            listBoxCollection.TabIndex = 5;
-            ButtonRemoveLocomotive.UseVisualStyleBackColor = true;
+            listBoxCollection.SelectedIndexChanged += listBoxCollection_SelectedIndexChanged;
-            ButtonRemoveLocomotive.Click += ButtonRemoveLocomotive_Click;
             // 
-            // ButtonAddTLocomotive
+            // buttonCollecctionAdd
             // 
-            ButtonAddTLocomotive.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonCollecctionAdd.Location = new Point(15, 78);
-            ButtonAddTLocomotive.Location = new Point(18, 114);
+            buttonCollecctionAdd.Margin = new Padding(3, 2, 3, 2);
-            ButtonAddTLocomotive.Margin = new Padding(3, 2, 3, 2);
+            buttonCollecctionAdd.Name = "buttonCollecctionAdd";
-            ButtonAddTLocomotive.Name = "ButtonAddTLocomotive";
+            buttonCollecctionAdd.Size = new Size(163, 20);
-            ButtonAddTLocomotive.Size = new Size(163, 38);
+            buttonCollecctionAdd.TabIndex = 4;
-            ButtonAddTLocomotive.TabIndex = 2;
+            buttonCollecctionAdd.Text = "Добавить коллекцию";
-            ButtonAddTLocomotive.Text = "добваление тепловоза";
+            buttonCollecctionAdd.UseVisualStyleBackColor = true;
-            ButtonAddTLocomotive.UseVisualStyleBackColor = true;
+            buttonCollecctionAdd.Click += ButtonCollecctionAdd_Click;
-            ButtonAddTLocomotive.Click += ButtonAddTLocomotive_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(ButtonAddLocomotive);
+            panelCompanyTools.Controls.Add(ButtonAddTLocomotive);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(ButtonRemoveLocomotive);
+            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;
             // 
             // ButtonAddLocomotive
             // 
             ButtonAddLocomotive.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
             ButtonAddLocomotive.BackgroundImageLayout = ImageLayout.Center;
-            ButtonAddLocomotive.Location = new Point(18, 80);
+            ButtonAddLocomotive.Location = new Point(16, 2);
             ButtonAddLocomotive.Margin = new Padding(3, 2, 3, 2);
             ButtonAddLocomotive.Name = "ButtonAddLocomotive";
             ButtonAddLocomotive.Size = new Size(163, 30);
@@ -131,17 +210,63 @@
             ButtonAddLocomotive.UseVisualStyleBackColor = true;
             ButtonAddLocomotive.Click += ButtonAddLocomotive_Click;
             // 
-            // comboBoxSelectorCompany
+            // ButtonAddTLocomotive
             // 
-            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
+            ButtonAddTLocomotive.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            comboBoxSelectorCompany.FormattingEnabled = true;
+            ButtonAddTLocomotive.Location = new Point(16, 37);
-            comboBoxSelectorCompany.Items.AddRange(new object[] { "хранилище" });
+            ButtonAddTLocomotive.Margin = new Padding(3, 2, 3, 2);
-            comboBoxSelectorCompany.Location = new Point(18, 20);
+            ButtonAddTLocomotive.Name = "ButtonAddTLocomotive";
-            comboBoxSelectorCompany.Margin = new Padding(3, 2, 3, 2);
+            ButtonAddTLocomotive.Size = new Size(163, 38);
-            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            ButtonAddTLocomotive.TabIndex = 2;
-            comboBoxSelectorCompany.Size = new Size(163, 23);
+            ButtonAddTLocomotive.Text = "добваление тепловоза";
-            comboBoxSelectorCompany.TabIndex = 0;
+            ButtonAddTLocomotive.UseVisualStyleBackColor = true;
-            comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged_1;
+            ButtonAddTLocomotive.Click += ButtonAddTLocomotive_Click;
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(16, 170);
+            buttonRefresh.Margin = new Padding(3, 2, 3, 2);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(163, 31);
+            buttonRefresh.TabIndex = 5;
+            buttonRefresh.Text = "обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += ButtonRefresh_Click;
+            // 
+            // ButtonRemoveLocomotive
+            // 
+            ButtonRemoveLocomotive.Anchor = AnchorStyles.Right;
+            ButtonRemoveLocomotive.Location = new Point(16, 104);
+            ButtonRemoveLocomotive.Margin = new Padding(3, 2, 3, 2);
+            ButtonRemoveLocomotive.Name = "ButtonRemoveLocomotive";
+            ButtonRemoveLocomotive.Size = new Size(163, 30);
+            ButtonRemoveLocomotive.TabIndex = 3;
+            ButtonRemoveLocomotive.Text = "удалить поезд";
+            ButtonRemoveLocomotive.UseVisualStyleBackColor = true;
+            ButtonRemoveLocomotive.Click += ButtonRemoveLocomotive_Click;
+            // 
+            // maskedTextBoxPosision
+            // 
+            maskedTextBoxPosision.Location = new Point(15, 79);
+            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(16, 138);
+            buttonGetToTest.Margin = new Padding(3, 2, 3, 2);
+            buttonGetToTest.Name = "buttonGetToTest";
+            buttonGetToTest.Size = new Size(163, 30);
+            buttonGetToTest.TabIndex = 4;
+            buttonGetToTest.Text = "передать на тесты";
+            buttonGetToTest.UseVisualStyleBackColor = true;
+            buttonGetToTest.Click += ButtonGetToTest_Click;
             // 
             // pictureBoxLocomotive
             // 
@@ -149,7 +274,7 @@
             pictureBoxLocomotive.Location = new Point(0, 0);
             pictureBoxLocomotive.Margin = new Padding(3, 2, 3, 2);
             pictureBoxLocomotive.Name = "pictureBoxLocomotive";
-            pictureBoxLocomotive.Size = new Size(522, 430);
+            pictureBoxLocomotive.Size = new Size(536, 490);
             pictureBoxLocomotive.TabIndex = 1;
             pictureBoxLocomotive.TabStop = false;
             // 
@@ -157,14 +282,17 @@
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(716, 430);
+            ClientSize = new Size(751, 490);
             Controls.Add(pictureBoxLocomotive);
             Controls.Add(groupBoxTools);
             Margin = new Padding(3, 2, 3, 2);
             Name = "FormLocomotivesCollection";
             Text = "FormLocomotivesCollection";
             groupBoxTools.ResumeLayout(false);
-            groupBoxTools.PerformLayout();
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBoxLocomotive).EndInit();
             ResumeLayout(false);
         }
@@ -180,5 +308,15 @@
         private Button buttonGetToTest;
         private PictureBox pictureBoxLocomotive;
         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;
     }
 }

ProjectLocomotive/ProjectLocomotive/FormLocomotivesCollection.cs

@@ -5,16 +5,23 @@ namespace ProjectLocomotive
 {
     public partial class FormLocomotivesCollection : Form
     {
+        /// <summary>
+        /// Хранилише коллекций
+        /// </summary>
+        private readonly StorageCollection<DrawningLocomotive> _storageCollection;
+
         /// <summary>
         /// Компания
         /// </summary>
         private AbstractCompany? _company = null;
+
         /// <summary>
         /// Конструктор
         /// </summary>
         public FormLocomotivesCollection()
         {
             InitializeComponent();
+            _storageCollection = new();
         }
 
         /// <summary>
@@ -24,13 +31,7 @@ namespace ProjectLocomotive
         /// <param name="e"></param>
         private void comboBoxSelectorCompany_SelectedIndexChanged_1(object sender, EventArgs e)
         {
-            switch (comboBoxSelectorCompany.Text)
+            panelCompanyTools.Enabled = false;
-            {
-                case "хранилище":
-                    _company = new LocomotiveDockingService(pictureBoxLocomotive.Width,
-                    pictureBoxLocomotive.Height, new MassiveGenericObjects<DrawningLocomotive>());
-                    break;
-            }
         }
 
         /// <summary>
@@ -51,23 +52,22 @@ namespace ProjectLocomotive
                     drawningLocomotive = new DrawningLocomotive(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
                     break;
                 case nameof(DrawningTLocomotive):
+                    // TODO вызов диалогового окна для выбора цвета
                     drawningLocomotive = new DrawningTLocomotive(random.Next(100, 300), random.Next(1000, 3000),
-                    GetColor(random),
+                    GetColor(random), GetColor(random),
-                    GetColor(random),
+                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-                    Convert.ToBoolean(random.Next(0, 2)),
-                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
                     break;
                 default:
                     return;
             }
             if (_company + drawningLocomotive != -1)
             {
-                MessageBox.Show("объект добавлен");
+                MessageBox.Show("Объект добавлен");
                 pictureBoxLocomotive.Image = _company.Show();
             }
             else
             {
-                MessageBox.Show("не удалось добавить объект");
+                MessageBox.Show("Не удалось добавить объект");
             }
         }
 
@@ -164,6 +164,100 @@ namespace ProjectLocomotive
             pictureBoxLocomotive.Image = _company.Show();
         }
 
+        /// <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<DrawningLocomotive>? collection =
+                _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+            if (collection == null)
+            {
+                MessageBox.Show("Коллекция не проинициализирована");
+                return;
+            }
+            switch (comboBoxSelectorCompany.Text)
+            {
+                case "Хранилище":
+                    _company = new LocomotiveDockingService(pictureBoxLocomotive.Width, pictureBoxLocomotive.Height, collection);
+                    break;
+            }
+            panelCompanyTools.Enabled = true;
+
+        }
+
+        private void listBoxCollection_SelectedIndexChanged(object sender, EventArgs e)
+        {
 
         }
     }
+}