Компания

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/AbstractCompany.cs

@@ -0,0 +1,113 @@
+using SelfPropelledArtilleryUnit.Drawnings;
+
+namespace SelfPropelledArtilleryUnit.CollectionGenericObjects;
+
+public abstract class AbstractCompany
+{
+    /// <summary>
+    /// Размер места (ширина)
+    /// </summary>
+    protected readonly int _placeSizeWidth = 190;
+
+    /// <summary>
+    /// Размер места (высота)
+    /// </summary>
+    protected readonly int _placeSizeHeight = 100;
+
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    protected readonly int _pictureWidth;
+
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    protected readonly int _pictureHeight;
+
+    /// <summary>
+    /// Коллекция автомобилей
+    /// </summary>
+    protected ICollectionGenericObjects<DrawningTank>? _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<DrawningTank> collection)
+    {
+        _pictureWidth = picWidth;
+        _pictureHeight = picHeight;
+        _collection = collection;
+        _collection.SetMaxCount = GetMaxCount;
+    }
+
+    /// <summary>
+    /// Перегрузка оператора сложения для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="tank">Добавляемый объект</param>
+    /// <returns></returns>
+    public static int operator +(AbstractCompany company, DrawningTank tank)
+    {
+        return company._collection.Insert(tank);
+    }
+
+    /// <summary>
+    /// Перегрузка оператора удаления для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="position">Номер удаляемого объекта</param>
+    /// <returns></returns>
+    public static DrawningTank? operator -(AbstractCompany company, int position)
+    {
+        return company._collection?.Remove(position);
+    }
+
+    /// <summary>
+    /// Получение случайного объекта из коллекции
+    /// </summary>
+    /// <returns></returns>
+    public DrawningTank? 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);
+        DrawBackgound(graphics);
+
+        SetObjectsPosition();
+        for (int i = 0; i < (_collection?.Count ?? 0); ++i)
+        {
+            DrawningTank? obj = _collection?.Get(i);
+            obj?.DrawTransport(graphics);
+        }
+
+        return bitmap;
+    }
+
+    /// <summary>
+    /// Вывод заднего фона
+    /// </summary>
+    /// <param name="g"></param>
+    protected abstract void DrawBackgound(Graphics g);
+
+    /// <summary>
+    /// Расстановка объектов
+    /// </summary>
+    protected abstract void SetObjectsPosition();
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/ICollectionGenericObjects.cs

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

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -16,8 +16,23 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Count => _collection.Length;
 
-    public int SetMaxCount { set { if (value > 0) { _collection = new T?[value]; } } }
- 
+    public int SetMaxCount
+    {
+        set
+        {
+            if (value > 0)
+            {
+                if (_collection.Length > 0)
+                {
+                    Array.Resize(ref _collection, value);
+                }
+                else
+                {
+                    _collection = new T?[value];
+                }
+            }
+        }
+    }
 
     /// <summary>
     /// Конструктор
@@ -29,30 +44,59 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T? Get(int position)
     {
-        // TODO проверка позиции
+        if (position < 0 || position >= _collection.Length)
+            return null;
         return _collection[position];
     }
 
-    public bool Insert(T obj)
+    public int Insert(T obj)
     {
-        // TODO вставка в свободное место набора
-        return false;
+        for (int i = 0; i < _collection.Length; i++)
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return i;
+            }
+        }
+        return -1;
     }
 
     public bool Insert(T obj, int position)
     {
-        // TODO проверка позиции
-        // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
-        //		ищется свободное место после этой позиции и идет вставка туда
-        //		если нет после, ищем до
-        // TODO вставка
+        if (position < 0 || position >= _collection.Length)
             return false;
-    }
-
-    public bool Remove(int position)
+        if (_collection[position] == null)
         {
-        // TODO проверка позиции
-        // TODO удаление объекта из массива, присвоив элементу массива значение null
+            _collection[position] = obj;
+            return true;
+        }
+        for (int i = position; i < _collection.Length; i++)
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
                 return true;
             }
         }
+        for (int i = 0; i < position; i++)
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public T? Remove(int position)
+    {
+        if (position < 0 || position >= _collection.Length || _collection[position] == null) // проверка позиции и наличия объекта
+            return null;
+        T? temp = _collection[position];
+        _collection[position] = null;
+
+        return temp;
+    }
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/TankSharingService.cs

@@ -0,0 +1,63 @@
+using SelfPropelledArtilleryUnit.Drawnings;
+using SelfPropelledArtilleryUnit.CollectionGenericObjects;
+
+namespace SelfPropelledArtilleryUnit.CollectionGenericObjects;
+
+public class TankSharingService : AbstractCompany
+{
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="picWidth"></param>
+    /// <param name="picHeight"></param>
+    /// <param name="collection"></param>
+    public TankSharingService(int picWidth, int picHeight, ICollectionGenericObjects<DrawningTank> collection) : base(picWidth, picHeight, collection)
+    {
+    }
+
+    protected override void DrawBackgound(Graphics g)
+    {
+        int width = _pictureWidth / _placeSizeWidth;
+        int height = _pictureHeight / _placeSizeHeight;
+        Pen pen = new(Color.Black, 2);
+        for (int i = 0; i < width; i++)
+        {
+            for (int j = 0; j < height + 1; ++j)
+            {
+                g.DrawLine(pen, i * _placeSizeWidth + 5, j * _placeSizeHeight, i * _placeSizeWidth + 5 + _placeSizeWidth - 45, j * _placeSizeHeight);
+                g.DrawLine(pen, i * _placeSizeWidth + 5, j * _placeSizeHeight, i * _placeSizeWidth + 5, j * _placeSizeHeight - _placeSizeHeight);
+            }
+        }
+    }
+
+    protected override void SetObjectsPosition()
+    {
+
+        int width = _pictureWidth / _placeSizeWidth;
+        int height = _pictureHeight / _placeSizeHeight;
+
+        int locomotiveWidth = 0;
+        int locomotiveHeight = height - 1;
+
+        for (int i = 0; i < (_collection?.Count ?? 0); i++)
+        {
+            if (_collection.Get(i) != null)
+            {
+                _collection.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
+                _collection.Get(i).SetPosition(_placeSizeWidth * locomotiveWidth + 20, locomotiveHeight * _placeSizeHeight + 20);
+            }
+
+            if (locomotiveWidth < width - 1)
+                locomotiveWidth++;
+            else
+            {
+                locomotiveWidth = 0;
+                locomotiveHeight--;
+            }
+            if (locomotiveHeight < 0)
+            {
+                return;
+            }
+        }
+    }
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormArtillery.Designer.cs

@@ -30,12 +30,10 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormArtillery));
             pictureBoxArtillery = new PictureBox();
-            buttonCreate = new Button();
             buttonLeft = new Button();
             buttonUp = new Button();
             buttonDown = new Button();
             buttonRight = new Button();
-            buttonCreateTank = new Button();
             comboBoxStrategy = new ComboBox();
             buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxArtillery).BeginInit();
@@ -50,17 +48,6 @@
             pictureBoxArtillery.TabIndex = 0;
             pictureBoxArtillery.TabStop = false;
             // 
-            // buttonCreate
-            // 
-            buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreate.Location = new Point(12, 417);
-            buttonCreate.Name = "buttonCreate";
-            buttonCreate.Size = new Size(90, 23);
-            buttonCreate.TabIndex = 1;
-            buttonCreate.Text = "Создать САУ";
-            buttonCreate.UseVisualStyleBackColor = true;
-            buttonCreate.Click += ButtonCreate_Click;
-            // 
             // buttonLeft
             // 
             buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
@@ -109,17 +96,6 @@
             buttonRight.UseVisualStyleBackColor = true;
             buttonRight.Click += ButtonMove_Click;
             // 
-            // buttonCreateTank
-            // 
-            buttonCreateTank.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateTank.Location = new Point(117, 417);
-            buttonCreateTank.Name = "buttonCreateTank";
-            buttonCreateTank.Size = new Size(138, 23);
-            buttonCreateTank.TabIndex = 6;
-            buttonCreateTank.Text = "Создать самоходку";
-            buttonCreateTank.UseVisualStyleBackColor = true;
-            buttonCreateTank.Click += ButtonCreateTank_Click;
-            // 
             // comboBoxStrategy
             // 
             comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
@@ -147,12 +123,10 @@
             ClientSize = new Size(800, 461);
             Controls.Add(buttonStrategyStep);
             Controls.Add(comboBoxStrategy);
-            Controls.Add(buttonCreateTank);
             Controls.Add(buttonRight);
             Controls.Add(buttonDown);
             Controls.Add(buttonUp);
             Controls.Add(buttonLeft);
-            Controls.Add(buttonCreate);
             Controls.Add(pictureBoxArtillery);
             Name = "FormArtillery";
             Text = "Самоходка";
@@ -163,12 +137,10 @@
         #endregion
 
         private PictureBox pictureBoxArtillery;
-        private Button buttonCreate;
         private Button buttonLeft;
         private Button buttonUp;
         private Button buttonDown;
         private Button buttonRight;
-        private Button buttonCreateTank;
         private ComboBox comboBoxStrategy;
         private Button buttonStrategyStep;
     }

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormArtillery.cs

@@ -22,6 +22,17 @@ namespace SelfPropelledArtilleryUnit
         /// Стратегия перемещения
         /// </summary>
         private AbstractStrategy? _strategy;
+        public DrawningTank SetTank
+        {
+            set
+            {
+                _drawningTank = value;
+                _drawningTank.SetPictureSize(pictureBoxArtillery.Width, pictureBoxArtillery.Height);
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+                Draw();
+            }
+        }
         public FormArtillery()
         {
             InitializeComponent();
@@ -41,44 +52,7 @@ namespace SelfPropelledArtilleryUnit
             _drawningTank.DrawTransport(gr);
             pictureBoxArtillery.Image = bmp;
         }
-        private void CreateObject(string type)
-        {
-            Random random = new();
-            switch (type)
-            {
-                case nameof(DrawningTank):
-                    _drawningTank = new DrawningTank(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(DrawningArtillery):
-                    _drawningTank = new DrawningArtillery(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;
-            }
-            _drawningTank.SetPictureSize(pictureBoxArtillery.Width, pictureBoxArtillery.Height);
-            _drawningTank.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            _strategy = null;
-            comboBoxStrategy.Enabled = true;
 
-            Draw();
-        }
-
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать сау"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreate_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningArtillery));
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать самоходку"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreateTank_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTank));
 
         private void ButtonMove_Click(object sender, EventArgs e)
         {

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankCollection.Designer.cs

@@ -0,0 +1,173 @@
+namespace SelfPropelledArtilleryUnit
+{
+    partial class FormTankCollection
+    {
+        /// <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()
+        {
+            groupBoxTools = new GroupBox();
+            buttonRefresh = new Button();
+            buttonGoToCheak = new Button();
+            buttonRemoveTank = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
+            buttonAddTank = new Button();
+            buttonAddArtillery = new Button();
+            comboBoxSelectorCompany = new ComboBox();
+            pictureBox = new PictureBox();
+            groupBoxTools.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(buttonRefresh);
+            groupBoxTools.Controls.Add(buttonGoToCheak);
+            groupBoxTools.Controls.Add(buttonRemoveTank);
+            groupBoxTools.Controls.Add(maskedTextBoxPosition);
+            groupBoxTools.Controls.Add(buttonAddTank);
+            groupBoxTools.Controls.Add(buttonAddArtillery);
+            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.Location = new Point(715, 0);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Size = new Size(200, 508);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "Инструменты";
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(12, 423);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(176, 41);
+            buttonRefresh.TabIndex = 6;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += ButtonRefresh_Click;
+            // 
+            // buttonGoToCheak
+            // 
+            buttonGoToCheak.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheak.Location = new Point(12, 337);
+            buttonGoToCheak.Name = "buttonGoToCheak";
+            buttonGoToCheak.Size = new Size(176, 41);
+            buttonGoToCheak.TabIndex = 5;
+            buttonGoToCheak.Text = "Передать на тесты";
+            buttonGoToCheak.UseVisualStyleBackColor = true;
+            buttonGoToCheak.Click += ButtonGoToCheak_Click;
+            // 
+            // buttonRemoveTank
+            // 
+            buttonRemoveTank.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemoveTank.Location = new Point(12, 215);
+            buttonRemoveTank.Name = "buttonRemoveTank";
+            buttonRemoveTank.Size = new Size(176, 41);
+            buttonRemoveTank.TabIndex = 4;
+            buttonRemoveTank.Text = "Удалить танк";
+            buttonRemoveTank.UseVisualStyleBackColor = true;
+            buttonRemoveTank.Click += ButtonRemoveTank_Click;
+            // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Location = new Point(12, 186);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(176, 23);
+            maskedTextBoxPosition.TabIndex = 3;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
+            // buttonAddTank
+            // 
+            buttonAddTank.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddTank.Location = new Point(12, 82);
+            buttonAddTank.Name = "buttonAddTank";
+            buttonAddTank.Size = new Size(176, 41);
+            buttonAddTank.TabIndex = 2;
+            buttonAddTank.Text = "Добавление танка";
+            buttonAddTank.UseVisualStyleBackColor = true;
+            buttonAddTank.Click += ButtonAddTank_Click;
+            // 
+            // buttonAddArtillery
+            // 
+            buttonAddArtillery.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddArtillery.Location = new Point(12, 129);
+            buttonAddArtillery.Name = "buttonAddArtillery";
+            buttonAddArtillery.Size = new Size(176, 41);
+            buttonAddArtillery.TabIndex = 1;
+            buttonAddArtillery.Text = "Добавление сау";
+            buttonAddArtillery.UseVisualStyleBackColor = true;
+            buttonAddArtillery.Click += ButtonAddArtillery_Click;
+            // 
+            // comboBoxSelectorCompany
+            // 
+            comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxSelectorCompany.FormattingEnabled = true;
+            comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
+            comboBoxSelectorCompany.Location = new Point(12, 33);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(182, 23);
+            comboBoxSelectorCompany.TabIndex = 0;
+            comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged_1;
+            // 
+            // pictureBox
+            // 
+            pictureBox.Dock = DockStyle.Fill;
+            pictureBox.Location = new Point(0, 0);
+            pictureBox.Name = "pictureBox";
+            pictureBox.Size = new Size(715, 508);
+            pictureBox.TabIndex = 1;
+            pictureBox.TabStop = false;
+            // 
+            // FormTankCollection
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(915, 508);
+            Controls.Add(pictureBox);
+            Controls.Add(groupBoxTools);
+            Name = "FormTankCollection";
+            Text = "Коллекция сау";
+            groupBoxTools.ResumeLayout(false);
+            groupBoxTools.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private ComboBox comboBoxSelectorCompany;
+        private Button buttonAddTank;
+        private Button buttonAddArtillery;
+        private MaskedTextBox maskedTextBoxPosition;
+        private PictureBox pictureBox;
+        private Button buttonRemoveTank;
+        private Button buttonRefresh;
+        private Button buttonGoToCheak;
+    }
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankCollection.cs

@@ -0,0 +1,164 @@
+
+
+using SelfPropelledArtilleryUnit.CollectionGenericObjects;
+using SelfPropelledArtilleryUnit.Drawnings;
+
+namespace SelfPropelledArtilleryUnit;
+
+public partial class FormTankCollection : Form
+{
+    /// <summary>
+    /// Компания
+    /// </summary>
+    private AbstractCompany? _company = null;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormTankCollection()
+    {
+        InitializeComponent();
+    }
+    /// <summary>
+    /// Выбор компании
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+
+
+    private void comboBoxSelectorCompany_SelectedIndexChanged_1(object sender, EventArgs e)
+    {
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new TankSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningTank>());
+                break;
+        }
+    }
+
+    private void CreateObject(string type)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        Random random = new();
+        DrawningTank drawningTank;
+        switch (type)
+        {
+            case nameof(DrawningTank):
+                drawningTank = new DrawningTank(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
+                break;
+            case nameof(DrawningArtillery):
+                // TODO вызов диалогового окна для выбора цвета
+                drawningTank = new DrawningArtillery(random.Next(100, 300), random.Next(1000, 3000),
+                    GetColor(random),
+                GetColor(random),
+                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+                break;
+            default:
+                return;
+        }
+
+        if (_company + drawningTank !=-1)
+        {
+            MessageBox.Show("Объект добавлен");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            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 ButtonAddTank_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTank));
+
+    private void ButtonAddArtillery_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningArtillery));
+
+
+
+    private void ButtonRemoveTank_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("Не удалось удалить объект");
+        }
+    }
+
+    private void ButtonGoToCheak_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        DrawningTank? tank = null;
+        int counter = 100;
+        while (tank == null)
+        {
+            tank = _company.GetRandomObject();
+            counter--;
+            if (counter <= 0)
+            {
+                break;
+            }
+        }
+
+        if (tank == null)
+        {
+            return;
+        }
+
+        FormArtillery form = new()
+        {
+            SetTank = tank
+        };
+        form.ShowDialog();
+
+
+
+    }
+
+    private void ButtonRefresh_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+        pictureBox.Image = _company.Show();
+
+    }
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankCollection.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>

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Program.cs

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