4 лаба

ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/AbstractCompany.cs

@@ -0,0 +1,116 @@
+namespace ProjectGasolineTanker.CollectionGenericObjects;
+using ProjectGasolineTanker.Drawnings;
+
+
+/// <summary>
+/// Абстракция компании, хранящий коллекцию машин
+/// </summary>
+public abstract class AbstractCompany
+{
+    /// <summary>
+	/// Размер места (ширина)
+	/// </summary>
+	protected readonly int _placeSizeWidth = 210;
+
+    /// <summary>
+    /// Размер места (высота)
+    /// </summary>
+    protected readonly int _placeSizeHeight = 80;
+
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    protected readonly int _pictureWidth;
+
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    protected readonly int _pictureHeight;
+
+    /// <summary>
+    /// Коллекция машин
+    /// </summary>
+    protected ICollectionGenericObjects<DrawningTanker>? _collection = null;
+
+    /// <summary>
+    /// Вычисление максимального количества элементов, который можно разместить в окне
+    /// </summary>
+    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="picWidth">Ширина окна</param>
+    /// <param name="picHeight">Высота окна</param>
+    /// <param name="collection">Коллекция машин</param>
+    public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningTanker> collection)
+    {
+        _pictureWidth = picWidth;
+        _pictureHeight = picHeight;
+        _collection = collection;
+        _collection.SetMaxCount = GetMaxCount;
+    }
+
+    /// <summary>
+    /// Перегрузка оператора сложения для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="tanker">Добавляемый объект</param>
+    /// <returns></returns>
+    public static int operator +(AbstractCompany company, DrawningTanker tanker)
+    {
+        return company._collection?.Insert(tanker) ?? -1;
+    }
+
+    /// <summary>
+    /// Перегрузка оператора удаления для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="position">Номер удаляемого объекта</param>
+    /// <returns></returns>
+    public static DrawningTanker operator -(AbstractCompany company, int position)
+    {
+        return company._collection?.Remove(position) ?? null;
+    }
+
+    /// <summary>
+    /// Получение случайного объекта из коллекции
+    /// </summary>
+    /// <returns></returns>
+    public DrawningTanker? GetRandomObject()
+    {
+        Random rnd = new();
+        return _collection?.Get(rnd.Next(GetMaxCount));
+    }
+
+    /// <summary>
+    /// Вывод всей коллекции
+    /// </summary>
+    /// <returns></returns>
+    public Bitmap? Show()
+    {
+        Bitmap bitmap = new(_pictureWidth, _pictureHeight);
+        Graphics graphics = Graphics.FromImage(bitmap);
+        DrawBackground(graphics);
+
+        SetObjectsPosition();
+        for (int i = 0; i < (_collection?.Count ?? 0); ++i)
+        {
+            DrawningTanker? obj = _collection?.Get(i);
+            obj?.DrawTransport(graphics);
+        }
+
+        return bitmap;
+    }
+
+    /// <summary>
+    /// Вывод заднего фона
+    /// </summary>
+    /// <param name="g"></param>
+    protected abstract void DrawBackground(Graphics g);
+
+    /// <summary>
+    /// Расстановка объектов
+    /// </summary>
+    protected abstract void SetObjectsPosition();
+}

ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/CarPark.cs

@@ -0,0 +1,61 @@
+namespace ProjectGasolineTanker.CollectionGenericObjects;
+using ProjectGasolineTanker.Drawnings;
+
+public class CarPark : AbstractCompany
+{
+    private List<Tuple<int, int>> locCoord = new List<Tuple<int, int>>();
+    private int numRows, numCols;
+    /// <summary>
+	/// Конструктор
+	/// </summary>
+	/// <param name="picWidth"></param>
+	/// <param name="picHeight"></param>
+	/// <param name="collection"></param>
+	public CarPark(int picWidth, int picHeight, ICollectionGenericObjects<DrawningTanker> collection) : base(picWidth, picHeight, collection)
+    {
+    }
+
+    protected override void DrawBackground(Graphics g)
+    {
+
+
+        Pen pen = new Pen(Color.Brown, 3);
+        int offsetX = 10, offsetY = -12;
+        int x = 1 + offsetX, y = _pictureHeight - _placeSizeHeight + offsetY;
+        numRows = 0;
+        while (y >= 0)
+        {
+            int numCols = 0;
+            while (x + _placeSizeWidth <= _pictureWidth)
+            {
+                numCols++;
+                g.DrawLine(pen, x, y, x + _placeSizeWidth / 2, y);
+                g.DrawLine(pen, x, y, x, y + _placeSizeHeight + 4);
+                locCoord.Add(new Tuple<int, int>(x, y));
+                x += _placeSizeWidth + 2;
+            }
+            numRows++;
+            x = 1 + offsetX;
+            y -= _placeSizeHeight + 5 + offsetY;
+        }
+    }
+
+    protected override void SetObjectsPosition()
+    {
+        if (locCoord == null || _collection == null)
+        {
+            return;
+        }
+        int row = numRows - 1, col = numCols;
+        for (int i = 0; i < _collection?.Count; i++, col--)
+        {
+            _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
+            _collection?.Get(i)?.SetPosition(locCoord[row * numCols - col].Item1 + 5, locCoord[row * numCols - col].Item2 + 9);
+            if (col == 1)
+            {
+                col = numCols + 1;
+                row--;
+            }
+        }
+    }
+}

ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/CollectionType.cs

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

ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -0,0 +1,44 @@
+namespace ProjectGasolineTanker.CollectionGenericObjects;
+
+public interface ICollectionGenericObjects<T>
+    where T : class
+{
+    /// <summary>
+    /// Количество объектов в коллекции
+    /// </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>
+    /// <param name="obj">Добавляемый объект</param>
+    /// <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>
+    /// <param name="position">Позиция</param>
+    /// <returns>Объект</returns>
+    T? Get(int position);
+}

ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ListGenericObjects.cs

@@ -0,0 +1,58 @@
+
+namespace ProjectGasolineTanker.CollectionGenericObjects;
+public class ListGenericObjects<T> : ICollectionGenericObjects<T>
+    where T : class
+{
+    private readonly List<T?> _collection;
+    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)
+    {
+        if (position >= 0 && position < Count)
+        {
+            return _collection[position];
+        }
+        else
+        {
+            return null;
+        }
+
+    }
+
+    public int Insert(T obj)
+    {
+        if (Count == _maxCount) { return -1; }
+        _collection.Add(obj);
+        return Count;
+    }
+
+    public int Insert(T obj, int position)
+    {
+        if (position < 0 || position >= Count || Count == _maxCount)
+        {
+            return -1;
+        }
+        _collection.Insert(position, obj);
+        return position;
+
+    }
+
+    public T Remove(int position)
+    {
+        if (position >= Count || position < 0) return null;
+        T obj = _collection[position];
+        _collection.RemoveAt(position);
+        return obj;
+    }
+}

ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -0,0 +1,108 @@
+namespace ProjectGasolineTanker.CollectionGenericObjects;
+
+public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
+where T : class
+{
+    /// <summary>
+    /// Массив объектов, которые храним
+    /// </summary>
+    private T?[] _collection;
+
+    public int Count  => _collection.Length;
+
+    public int SetMaxCount
+    {
+        set
+        {
+            if (value > 0)
+            {
+                if (_collection.Length > 0)
+                {
+                    Array.Resize(ref _collection, value);
+                }
+                else
+                {
+                    _collection = new T?[value];
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public MassiveGenericObjects()
+    {
+        _collection = Array.Empty<T?>();
+    }
+
+    public T? Get(int position)
+    {
+        if (position >= 0 && position < Count)
+        {
+            return _collection[position];
+        }
+
+        return null;
+    }
+
+    public int Insert(T obj)
+    {
+        for (int i = 0; i < Count; i++)
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public int Insert(T obj, int position)
+    {
+        if (position < 0 || position >= Count)
+        {
+            return -1;
+        }
+        if (_collection[position] == null)
+        {
+            _collection[position] = obj;
+            return position;
+        }
+
+        for (int i = position + 1; i < Count; i++)
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return i;
+            }
+        }
+        for (int i = position - 1; i >= 0; i--)
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return i;
+            }
+        }
+
+        return -1;
+    }
+
+    public T? Remove(int position)
+    {
+        //  проверка позиции
+        if (position < 0 || position >= Count)
+        {
+            return null;
+        }
+
+        if (_collection[position] == null) return null;
+
+        T? temp = _collection[position];
+        _collection[position] = null;
+        return temp;
+    }
+}

ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/StorageCollection.cs

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

ProjectGasolineTanker/ProjectGasolineTanker/FormGasolineTanker.Designer.cs

@@ -29,12 +29,10 @@
         private void InitializeComponent()
         {
             pictureBoxGasolineTanker = new PictureBox();
-            buttonCreateGasolineTanker = new Button();
             buttonleft = new Button();
             buttonUp = new Button();
             buttonDown = new Button();
             buttonRight = new Button();
-            buttonCreateTanker = new Button();
             comboBoxStrategy = new ComboBox();
             buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxGasolineTanker).BeginInit();
@@ -48,17 +46,7 @@
             pictureBoxGasolineTanker.Size = new Size(923, 597);
             pictureBoxGasolineTanker.TabIndex = 0;
             pictureBoxGasolineTanker.TabStop = false;
-            // 
-            // buttonCreateGasolineTanker
-            // 
-            buttonCreateGasolineTanker.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateGasolineTanker.Location = new Point(12, 562);
-            buttonCreateGasolineTanker.Name = "buttonCreateGasolineTanker";
-            buttonCreateGasolineTanker.Size = new Size(223, 23);
-            buttonCreateGasolineTanker.TabIndex = 1;
-            buttonCreateGasolineTanker.Text = "Создать бензовоз";
-            buttonCreateGasolineTanker.UseVisualStyleBackColor = true;
-            buttonCreateGasolineTanker.Click += ButtonCreateGasolineTanker_Click;
+        
             // 
             // buttonleft
             // 
@@ -107,17 +95,7 @@
             buttonRight.TabIndex = 5;
             buttonRight.UseVisualStyleBackColor = true;
             buttonRight.Click += ButtonMove_Click;
-            // 
-            // buttonCreateTanker
-            // 
-            buttonCreateTanker.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateTanker.Location = new Point(250, 562);
-            buttonCreateTanker.Name = "buttonCreateTanker";
-            buttonCreateTanker.Size = new Size(223, 23);
-            buttonCreateTanker.TabIndex = 6;
-            buttonCreateTanker.Text = "Создать грузовик";
-            buttonCreateTanker.UseVisualStyleBackColor = true;
-            buttonCreateTanker.Click += ButtonCreateTanker_Click;
+     
             // 
             // comboBoxStrategy
             // 
@@ -145,13 +123,11 @@
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(923, 597);
             Controls.Add(buttonStrategyStep);
-            Controls.Add(comboBoxStrategy);
-            Controls.Add(buttonCreateTanker);
+            Controls.Add(comboBoxStrategy);     
             Controls.Add(buttonRight);
             Controls.Add(buttonDown);
             Controls.Add(buttonUp);
             Controls.Add(buttonleft);
-            Controls.Add(buttonCreateGasolineTanker);
             Controls.Add(pictureBoxGasolineTanker);
             Name = "FormGasolineTanker";
             Text = "Бензовоз";
@@ -162,12 +138,10 @@
         #endregion
 
         private PictureBox pictureBoxGasolineTanker;
-        private Button buttonCreateGasolineTanker;
         private Button buttonleft;
         private Button buttonRight;
         private Button buttonDown;
         private Button buttonUp;
-        private Button buttonCreateTanker;
         private ComboBox comboBoxStrategy;
         private Button buttonStrategyStep;
     }

ProjectGasolineTanker/ProjectGasolineTanker/FormGasolineTanker.cs

@@ -1,4 +1,4 @@
-
+    
 using ProjectGasolineTanker.Drawnings;
 using ProjectGasolineTanker.MovementStrategy;
 using ProjectGasollineTanker.MovementStrategy;
@@ -9,12 +9,29 @@ public partial class FormGasolineTanker : Form
     private DrawningTanker? _drawningTanker;
 
     private AbstractStrategy? _strategy;
-
+    /// <summary>
+    /// Получение объекта
+    /// </summary>
+    public DrawningTanker SetTanker
+    {
+        set
+        {
+            _drawningTanker = value;
+            _drawningTanker.SetPictureSize(pictureBoxGasolineTanker.Width, pictureBoxGasolineTanker.Height);
+            comboBoxStrategy.Enabled = true;
+            _strategy = null;
+            Draw();
+        }
+    }
+    /// <summary>
+    /// Конструктор формы
+    /// </summary>
     public FormGasolineTanker()
     {
         InitializeComponent();
         _strategy = null;
     }
+
     private void Draw()
     {
         if (_drawningTanker == null)
@@ -24,49 +41,10 @@ public partial class FormGasolineTanker : Form
 
         Bitmap bmp = new(pictureBoxGasolineTanker.Width, pictureBoxGasolineTanker.Height);
         Graphics gr = Graphics.FromImage(bmp);
-        _drawningTanker.DrawTransport(gr);
+        _drawningTanker?.DrawTransport(gr);
         pictureBoxGasolineTanker.Image = bmp;
     }
 
-
-    /// <summary>
-    /// Создание объекта класса-перемещения
-    /// </summary>
-    /// <param name="type">Тип создаваемого объекта</param>
-    private void CreateObject(string type)
-    {
-        Random random = new Random();
-        switch (type)
-        {
-            case nameof(DrawningTanker):
-                _drawningTanker = new DrawningTanker(random.Next(100, 300), random.Next(1000, 3000),
-                    Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
-                break;
-            case nameof(DrawningGasolineTanker):
-                _drawningTanker = new DrawningGasolineTanker(random.Next(100, 300), random.Next(1000, 3000),
-                    Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-                    Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-                break;
-            default:
-                return;
-        }
-        _drawningTanker.SetPictureSize(pictureBoxGasolineTanker.Width, pictureBoxGasolineTanker.Height);
-        _drawningTanker.SetPosition(random.Next(10, 100), random.Next(10, 100));
-        _strategy = null;
-        comboBoxStrategy.Enabled = true;
-        Draw();
-
-    }
-
-        /// Обработка нажатия кнопки "Создать"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-       
-    private void ButtonCreateGasolineTanker_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningGasolineTanker));
-    private void ButtonCreateTanker_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTanker));
-
     /// <summary>
     /// Перемещение объекта по форме (нажатие кнопок навигации)
     /// </summary>

ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.Designer.cs

@@ -0,0 +1,303 @@
+using System.Runtime.ConstrainedExecution;
+
+namespace ProjectGasolineTanker
+{
+    partial class FormTankerCollection
+    {
+        /// <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()
+        {
+            Инструменты = new GroupBox();
+            panelCompanyTools = new Panel();
+            buttonAddTanker = new Button();
+            buttonAddGasolineTanker = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
+            buttonGoToCheck = new Button();
+            buttonRemoveTanker = new Button();
+            buttonRefresh = new Button();
+            buttonCreateCompany = new Button();
+            panelStorage = new Panel();
+            buttonCollectionDel = new Button();
+            listBoxCollection = new ListBox();
+            buttonCollectionAdd = new Button();
+            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            textBoxCollectionName = new TextBox();
+            labelCollectionName = new Label();
+            comboBoxSelectorCompany = new ComboBox();
+            pictureBox = new PictureBox();
+            Инструменты.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
+            panelStorage.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            SuspendLayout();
+            // 
+            // Инструменты
+            // 
+            Инструменты.Controls.Add(panelCompanyTools);
+            Инструменты.Controls.Add(buttonCreateCompany);
+            Инструменты.Controls.Add(panelStorage);
+            Инструменты.Controls.Add(comboBoxSelectorCompany);
+            Инструменты.Dock = DockStyle.Right;
+            Инструменты.Location = new Point(861, 0);
+            Инструменты.Name = "Инструменты";
+            Инструменты.Size = new Size(225, 651);
+            Инструменты.TabIndex = 0;
+            Инструменты.TabStop = false;
+            Инструменты.Text = "Инструменты";
+            // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(buttonAddTanker);
+            panelCompanyTools.Controls.Add(buttonAddGasolineTanker);
+            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Controls.Add(buttonRemoveTanker);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Dock = DockStyle.Bottom;
+            panelCompanyTools.Location = new Point(3, 383);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(219, 265);
+            panelCompanyTools.TabIndex = 8;
+            // 
+            // buttonAddTanker
+            // 
+            buttonAddTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddTanker.Location = new Point(3, 3);
+            buttonAddTanker.Name = "buttonAddTanker";
+            buttonAddTanker.Size = new Size(213, 37);
+            buttonAddTanker.TabIndex = 1;
+            buttonAddTanker.Text = "Добавление грузовика";
+            buttonAddTanker.UseVisualStyleBackColor = true;
+            buttonAddTanker.Click += buttonAddTanker_Click;
+            // 
+            // buttonAddGasolineTanker
+            // 
+            buttonAddGasolineTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddGasolineTanker.Location = new Point(3, 43);
+            buttonAddGasolineTanker.Name = "buttonAddGasolineTanker";
+            buttonAddGasolineTanker.Size = new Size(213, 37);
+            buttonAddGasolineTanker.TabIndex = 2;
+            buttonAddGasolineTanker.Text = "Добавление бензовоза\r\n";
+            buttonAddGasolineTanker.UseVisualStyleBackColor = true;
+            buttonAddGasolineTanker.Click += buttonAddGasolineTanker_Click;
+            // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Location = new Point(3, 86);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(213, 23);
+            maskedTextBoxPosition.TabIndex = 3;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(3, 161);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(213, 40);
+            buttonGoToCheck.TabIndex = 6;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_Click;
+            // 
+            // buttonRemoveTanker
+            // 
+            buttonRemoveTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemoveTanker.Location = new Point(3, 115);
+            buttonRemoveTanker.Name = "buttonRemoveTanker";
+            buttonRemoveTanker.Size = new Size(213, 40);
+            buttonRemoveTanker.TabIndex = 4;
+            buttonRemoveTanker.Text = "Удаление машины";
+            buttonRemoveTanker.UseVisualStyleBackColor = true;
+            buttonRemoveTanker.Click += ButtonRemoveTanker_Click;
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(3, 207);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(213, 40);
+            buttonRefresh.TabIndex = 5;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += ButtonRefresh_Click;
+            // 
+            // buttonCreateCompany
+            // 
+            buttonCreateCompany.Location = new Point(6, 350);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(213, 24);
+            buttonCreateCompany.TabIndex = 7;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += ButtonCreateCompany_Click;
+            // 
+            // panelStorage
+            // 
+            panelStorage.Controls.Add(buttonCollectionDel);
+            panelStorage.Controls.Add(listBoxCollection);
+            panelStorage.Controls.Add(buttonCollectionAdd);
+            panelStorage.Controls.Add(radioButtonList);
+            panelStorage.Controls.Add(radioButtonMassive);
+            panelStorage.Controls.Add(textBoxCollectionName);
+            panelStorage.Controls.Add(labelCollectionName);
+            panelStorage.Dock = DockStyle.Top;
+            panelStorage.Location = new Point(3, 19);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(219, 296);
+            panelStorage.TabIndex = 7;
+            // 
+            // buttonCollectionDel
+            // 
+            buttonCollectionDel.Location = new Point(3, 267);
+            buttonCollectionDel.Name = "buttonCollectionDel";
+            buttonCollectionDel.Size = new Size(213, 24);
+            buttonCollectionDel.TabIndex = 6;
+            buttonCollectionDel.Text = "Удалить коллекцию";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += ButtonCollectionDel_Click;
+            // 
+            // listBoxCollection
+            // 
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.ItemHeight = 15;
+            listBoxCollection.Location = new Point(3, 122);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(213, 139);
+            listBoxCollection.TabIndex = 5;
+            // 
+            // buttonCollectionAdd
+            // 
+            buttonCollectionAdd.Location = new Point(3, 85);
+            buttonCollectionAdd.Name = "buttonCollectionAdd";
+            buttonCollectionAdd.Size = new Size(213, 24);
+            buttonCollectionAdd.TabIndex = 4;
+            buttonCollectionAdd.Text = "Добавить коллекцию";
+            buttonCollectionAdd.UseVisualStyleBackColor = true;
+            buttonCollectionAdd.Click += ButtonCollectionAdd_Click;
+            // 
+            // radioButtonList
+            // 
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(139, 60);
+            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(19, 60);
+            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(3, 31);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(213, 23);
+            textBoxCollectionName.TabIndex = 1;
+            // 
+            // labelCollectionName
+            // 
+            labelCollectionName.AutoSize = true;
+            labelCollectionName.Location = new Point(47, 13);
+            labelCollectionName.Name = "labelCollectionName";
+            labelCollectionName.Size = new Size(125, 15);
+            labelCollectionName.TabIndex = 0;
+            labelCollectionName.Text = "Название коллекции:";
+            // 
+            // comboBoxSelectorCompany
+            // 
+            comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxSelectorCompany.FormattingEnabled = true;
+            comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
+            comboBoxSelectorCompany.Location = new Point(6, 321);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(213, 23);
+            comboBoxSelectorCompany.TabIndex = 0;
+            comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
+            // 
+            // pictureBox
+            // 
+            pictureBox.Dock = DockStyle.Fill;
+            pictureBox.Location = new Point(0, 0);
+            pictureBox.Name = "pictureBox";
+            pictureBox.Size = new Size(861, 651);
+            pictureBox.TabIndex = 1;
+            pictureBox.TabStop = false;
+            // 
+            // FormTankerCollection
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1086, 651);
+            Controls.Add(pictureBox);
+            Controls.Add(Инструменты);
+            Name = "FormTankerCollection";
+            Text = "Коллекция лодок";
+            Инструменты.ResumeLayout(false);
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox Инструменты;
+        private Button buttonAddTanker;
+        private ComboBox comboBoxSelectorCompany;
+        private Button buttonAddGasolineTanker;
+        private MaskedTextBox maskedTextBoxPosition;
+        private PictureBox pictureBox;
+        private Button buttonRefresh;
+        private Button buttonRemoveTanker;
+        private Button buttonGoToCheck;
+        private Panel panelStorage;
+        private Label labelCollectionName;
+        private RadioButton radioButtonMassive;
+        private TextBox textBoxCollectionName;
+        private Button buttonCollectionDel;
+        private ListBox listBoxCollection;
+        private Button buttonCollectionAdd;
+        private RadioButton radioButtonList;
+        private Button buttonCreateCompany;
+        private Panel panelCompanyTools;
+    }
+}

ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.cs

@@ -0,0 +1,263 @@
+using ProjectGasolineTanker.CollectionGenericObjects;
+using ProjectGasolineTanker.Drawnings;
+using System.Windows.Forms;
+
+namespace ProjectGasolineTanker;
+
+/// <summary>
+/// Форма работы с компанией и ее коллекцией
+/// </summary>
+public partial class FormTankerCollection : Form
+
+{
+    /// <summary>
+    /// Хранилише коллекций
+    /// </summary>
+    private readonly StorageCollection<DrawningTanker> _storageCollection;
+    /// <summary>
+    /// Компания
+    /// </summary>
+    private AbstractCompany? _company = null;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormTankerCollection()
+    {
+        InitializeComponent();
+        _storageCollection = new();
+    }
+
+    /// <summary>
+    /// Выбор компании
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new CarPark(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningTanker>());
+                break;
+        }
+    }
+
+    private void CreateObject(string type)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+        DrawningTanker _drawningTanker;
+        Random random = new();
+        switch (type)
+        {
+            case nameof(DrawningTanker):
+                _drawningTanker = new DrawningTanker(random.Next(30, 70), random.Next(100, 500),
+                    GetColor(random));
+                break;
+            case nameof(DrawningGasolineTanker):
+                _drawningTanker = new DrawningGasolineTanker(random.Next(30, 70), random.Next(100, 500),
+                    GetColor(random), GetColor(random),
+                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+                break;
+            default:
+                return;
+
+        }
+
+        if (_company + _drawningTanker != -1)
+        {
+            MessageBox.Show("Объект добавлен");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось добавить объект");
+        }
+    }
+
+    /// <summary>
+	/// Добавление обычного автомобиля
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+    private void buttonAddTanker_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTanker));
+
+    /// <summary>
+    /// Добавление спортивного автомобиля
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonAddGasolineTanker_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningGasolineTanker));
+
+    /// <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 ButtonRemoveTanker_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
+        {
+            return;
+        }
+
+        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+        {
+            return;
+        }
+
+        int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+        if (_company - pos != null)
+        {
+            MessageBox.Show("Объект удален");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось удалить объект");
+        }
+    }
+
+    /// <summary>
+    /// Передача объекта в другую форму
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonGoToCheck_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        DrawningTanker? car = null;
+        int counter = 100;
+        while (car == null)
+        {
+            car = _company.GetRandomObject();
+            counter--;
+            if (counter <= 0)
+            {
+                break;
+            }
+        }
+
+        if (car == null)
+        {
+            return;
+        }
+
+        FormGasolineTanker form = new()
+        {
+            SetTanker = car
+        };
+        form.ShowDialog();
+    }
+
+    /// <summary>
+    /// Перерисовка коллекции
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonRefresh_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        pictureBox.Image = _company.Show();
+    }
+    private void ButtonCollectionAdd_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+        {
+            MessageBox.Show("Не все данный заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            return;
+        }
+        CollectionType collectionType = CollectionType.None;
+        if (radioButtonMassive.Checked)
+        {
+            collectionType = CollectionType.Massive;
+        }
+        else if (radioButtonList.Checked)
+        {
+            collectionType = CollectionType.List;
+        }
+
+        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+        RefreshListBoxItems();
+    }
+    /// <summary>
+	/// Обновление списка в listBoxCollection
+	/// </summary>
+	private void RefreshListBoxItems()
+    {
+        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);
+            }
+        }
+
+    }
+
+    private void ButtonCollectionDel_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItems == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+        if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+        {
+            return;
+        }
+        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+        RefreshListBoxItems();
+    }
+
+    private void ButtonCreateCompany_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+
+        ICollectionGenericObjects<DrawningTanker>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+        if (collection == null)
+        {
+            MessageBox.Show("Коллекция не проинициализирована");
+            return;
+        }
+
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new CarPark(pictureBox.Width, pictureBox.Height, collection);
+                break;
+        }
+
+        panelCompanyTools.Enabled = true;
+        RefreshListBoxItems();
+    }
+}

ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.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>

ProjectGasolineTanker/ProjectGasolineTanker/Program.cs

@@ -11,7 +11,7 @@ namespace ProjectGasolineTanker
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormGasolineTanker());
+            Application.Run(new FormTankerCollection());
         }
     }
 }