Компания

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/AbstractCompany.cs

@@ -0,0 +1,113 @@
+using ProjectContainerShip.Drawings;
+namespace ProjectContainerShip.CollectionGenericObjects;
+
+    /// <summary>
+    /// Абстракция компании, хранящий коллекцию кораблей
+    /// </summary>
+    public abstract class AbstractCompany
+    {
+        /// <summary>
+        /// Размер места (ширина)
+        /// </summary>
+        protected readonly int _placeSizeWidth = 240;
+
+        /// <summary>
+        /// Размер места (высота)
+        /// </summary>
+        protected readonly int _placeSizeHeight = 80;
+
+        /// <summary>
+        /// Ширина окна
+        /// </summary>
+        protected readonly int _pictureWidth;
+
+        /// <summary>
+        /// Высота окна
+        /// </summary>
+        protected readonly int _pictureHeight;
+
+        /// <summary>
+        /// Коллекция кораблей
+        /// </summary>
+        protected ICollectionGenericObjects<DrawningShip>? _collection = null;
+
+        /// <summary>
+        /// Вычисление максимального количества элементов, который можно разместить в окне
+        /// </summary>
+        private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="pictureWidth">Ширина окна</param>
+        /// <param name="pictureHeight">Высота окна</param>
+        /// <param name="collection">Коллекция кораблей</param>
+        public AbstractCompany(int pictureWidth, int pictureHeight, ICollectionGenericObjects<DrawningShip> collection)
+        {
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+            _collection = collection;
+            _collection.SetMaxCount = GetMaxCount;
+        }
+
+        /// <summary>
+        /// Перегрузка оператора сложения для класса
+        /// </summary>
+        /// <param name="company">Компания</param>
+        /// <param name="ship">Добавляемый объект</param>
+        /// <returns></returns>
+        public static int operator +(AbstractCompany company, DrawningShip ship)
+        {
+            return company._collection?.Insert(ship) ?? -1;
+        }
+
+        /// <summary>
+        /// Перегрузка оператора удаления для класса
+        /// </summary>
+        /// <param name="company">Компания</param>
+        /// <param name="position">Номер удаляемого объекта</param>
+        /// <returns></returns>
+        public static DrawningShip operator -(AbstractCompany company, int position)
+        {
+            return company._collection?.Remove(position) ?? null;
+        }
+
+        /// <summary>
+        /// Получение случайного объекта из коллекции
+        /// </summary>
+        /// <returns></returns>
+        public DrawningShip? 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)
+            {
+                DrawningShip? 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();
+    }

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -0,0 +1,52 @@
+namespace ProjectContainerShip.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);
+    }
+}
+
+namespace ProjectContainerShip.CollectionGenericObjects
+{
+    internal interface ICollectionGenericObjects
+    {
+    }
+}

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectContainerShip.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) { _collection = new T?[value]; } } }
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public MassiveGenericObjects()
+        {
+            _collection = Array.Empty<T?>();
+        }
+        public T? Get(int position)
+        {
+            // TODO проверка позиции
+            if (position >= _collection.Length || position < 0) return null;
+            return _collection[position];
+        }
+        public int Insert(T obj)
+        {
+            // TODO вставка в свободное место набора
+            int index = 0;
+            while (index < _collection.Length)
+            {
+                if (_collection[index] == null)
+                {
+                    _collection[index] = obj;
+                    return index;
+                }
+                ++index;
+            }
+            return -1;
+        }
+        public int Insert(T obj, int position)
+        {
+            // TODO проверка позиции
+            // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
+            // ищется свободное место после этой позиции и идет вставка туда
+            // если нет после, ищем до
+            // TODO вставка
+            if (position >= _collection.Length || position < 0)
+                return -1;
+            if (_collection[position] == null)
+            {
+                _collection[position] = obj;
+                return position;
+            }
+            int index = position + 1;
+            while (index < _collection.Length)
+            {
+                if (_collection[index] == null)
+                {
+                    _collection[index] = obj;
+                    return index;
+                }
+                ++index;
+            }
+            index = position - 1;
+            while (index >= 0)
+            {
+                if (_collection[index] == null)
+                {
+                    _collection[index] = obj;
+                    return index;
+                }
+                --index;
+            }
+            return -1;
+        }
+        public T Remove(int position)
+        {
+            // TODO проверка позиции
+            // TODO удаление объекта из массива, присвоив элементу массива значение null
+
+            if (position >= _collection.Length || position < 0) { 
+                return null;
+            }
+
+            T obj = _collection[position];
+            _collection[position] = null;
+            return obj;
+        }
+    }
+}

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ShipSharingService.cs

@@ -0,0 +1,20 @@
+using ProjectContainerShip.Drawings;
+
+namespace ProjectContainerShip.CollectionGenericObjects;
+
+public class ShipSharingService : AbstractCompany
+{
+    public ShipSharingService(int pictureWidth, int pictureHeight, ICollectionGenericObjects<DrawningShip> collection) : base(pictureWidth, pictureHeight, collection)
+    {
+    }
+
+    protected override void DrawBackgound(Graphics g)
+    {
+        throw new NotImplementedException();
+    }
+
+    protected override void SetObjectsPosition()
+    {
+        throw new NotImplementedException();
+    }
+}

ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs

@@ -30,12 +30,10 @@ namespace ProjectContainerShip
         private void InitializeComponent()
         {
             pictureBoxContainerShip = new PictureBox();
-            buttonCreateContainerShip = new Button();
             buttonLeft = new Button();
             buttonRight = new Button();
             buttonDown = new Button();
             buttonUp = new Button();
-            buttonCreateShip = new Button();
             comboBoxStrategy = new ComboBox();
             buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxContainerShip).BeginInit();
@@ -51,17 +49,6 @@ namespace ProjectContainerShip
             pictureBoxContainerShip.TabStop = false;
             pictureBoxContainerShip.Click += pictureBoxContainerShip_Click;
             // 
-            // buttonCreateContainerShip
-            // 
-            buttonCreateContainerShip.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateContainerShip.Location = new Point(12, 457);
-            buttonCreateContainerShip.Name = "buttonCreateContainerShip";
-            buttonCreateContainerShip.Size = new Size(316, 46);
-            buttonCreateContainerShip.TabIndex = 1;
-            buttonCreateContainerShip.Text = "Создать контейнеровоз";
-            buttonCreateContainerShip.UseVisualStyleBackColor = true;
-            buttonCreateContainerShip.Click += ButtonCreateContainerShip_Click;
-            // 
             // buttonLeft
             // 
             buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
@@ -110,17 +97,6 @@ namespace ProjectContainerShip
             buttonUp.UseVisualStyleBackColor = true;
             buttonUp.Click += ButtonMove_Click;
             // 
-            // buttonCreateShip
-            // 
-            buttonCreateShip.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateShip.Location = new Point(358, 457);
-            buttonCreateShip.Name = "buttonCreateShip";
-            buttonCreateShip.Size = new Size(316, 46);
-            buttonCreateShip.TabIndex = 6;
-            buttonCreateShip.Text = "Создать корабль";
-            buttonCreateShip.UseVisualStyleBackColor = true;
-            buttonCreateShip.Click += ButtonCreateShip_Click;
-            // 
             // comboBoxStrategy
             // 
             comboBoxStrategy.Anchor = AnchorStyles.Top | AnchorStyles.Right;
@@ -150,12 +126,10 @@ namespace ProjectContainerShip
             ClientSize = new Size(1256, 529);
             Controls.Add(buttonStrategyStep);
             Controls.Add(comboBoxStrategy);
-            Controls.Add(buttonCreateShip);
             Controls.Add(buttonUp);
             Controls.Add(buttonDown);
             Controls.Add(buttonRight);
             Controls.Add(buttonLeft);
-            Controls.Add(buttonCreateContainerShip);
             Controls.Add(pictureBoxContainerShip);
             Name = "FormContainerShip";
             Text = "Контейнеровоз";
@@ -173,12 +147,10 @@ namespace ProjectContainerShip
         #endregion
 
         private PictureBox pictureBoxContainerShip;
-        private Button buttonCreateContainerShip;
         private Button buttonLeft;
         private Button buttonRight;
         private Button buttonDown;
         private Button buttonUp;
-        private Button buttonCreateShip;
         private ComboBox comboBoxStrategy;
         private Button buttonStrategyStep;
     }

ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs

@@ -19,6 +19,18 @@ public partial class FormContainerShip : Form
     /// </summary>
     private AbstractStrategy? _strategy;
 
+    public DrawningShip SetShip
+    {
+        set
+        {
+            _drawningShip = value;
+            _drawningShip.SetPictureSize(pictureBoxContainerShip.Width, pictureBoxContainerShip.Height);
+            comboBoxStrategy.Enabled = true;
+            _strategy = null;
+            Draw();
+        }
+    }
+
     /// <summary>
     /// Конструктор формы
     /// </summary>
@@ -44,46 +56,6 @@ public partial class FormContainerShip : Form
         pictureBoxContainerShip.Image = bmp;
     }
 
-    private void CreateObject(string type)
-    {
-        Random random = new();
-        switch (type)
-        {
-            case nameof(DrawningShip):
-                _drawningShip = new DrawningShip(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(DrawningContainerShip):
-                _drawningShip = new DrawningContainerShip(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;
-        }
-
-        _drawningShip.SetPictureSize(pictureBoxContainerShip.Width, pictureBoxContainerShip.Height);
-        _drawningShip.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 ButtonCreateContainerShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningContainerShip));
-
-    /// <summary>
-    /// Обработка нажатия кнопки "Создать корабль"
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonCreateShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningShip));
-
     /// <summary>
     /// Перемещение объекта по форме (нажатие кнопок навигации)
     /// </summary>

ProjectContainerShip/ProjectContainerShip/FormShipCollection.Designer.cs

@@ -0,0 +1,174 @@
+namespace ProjectContainerShip
+{
+    partial class FormShipCollection
+    {
+        /// <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();
+            buttonAddContainerShip = new Button();
+            buttonRefresh = new Button();
+            buttonGoToCheck = new Button();
+            buttonRemoveShip = new Button();
+            maskedTextBox = new MaskedTextBox();
+            buttonAddShip = new Button();
+            comboBoxSelectorCompany = new ComboBox();
+            pictureBox = new PictureBox();
+            groupBoxTools.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(buttonAddContainerShip);
+            groupBoxTools.Controls.Add(buttonRefresh);
+            groupBoxTools.Controls.Add(buttonGoToCheck);
+            groupBoxTools.Controls.Add(buttonRemoveShip);
+            groupBoxTools.Controls.Add(maskedTextBox);
+            groupBoxTools.Controls.Add(buttonAddShip);
+            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.ForeColor = Color.Black;
+            groupBoxTools.Location = new Point(1601, 0);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Size = new Size(388, 1112);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "Инструменты";
+            // 
+            // buttonAddContainerShip
+            // 
+            buttonAddContainerShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddContainerShip.Location = new Point(15, 247);
+            buttonAddContainerShip.Name = "buttonAddContainerShip";
+            buttonAddContainerShip.Size = new Size(367, 77);
+            buttonAddContainerShip.TabIndex = 7;
+            buttonAddContainerShip.Text = "Добавление контейнеровоза";
+            buttonAddContainerShip.UseVisualStyleBackColor = true;
+            buttonAddContainerShip.Click += ButtonAddContainerShip_Click;
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(15, 887);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(367, 77);
+            buttonRefresh.TabIndex = 6;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += ButtonRefresh_Click;
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(15, 641);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(367, 77);
+            buttonGoToCheck.TabIndex = 5;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_Click;
+            // 
+            // buttonRemoveShip
+            // 
+            buttonRemoveShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemoveShip.Location = new Point(15, 473);
+            buttonRemoveShip.Name = "buttonRemoveShip";
+            buttonRemoveShip.Size = new Size(367, 77);
+            buttonRemoveShip.TabIndex = 4;
+            buttonRemoveShip.Text = "Удалить корабль";
+            buttonRemoveShip.UseVisualStyleBackColor = true;
+            buttonRemoveShip.Click += ButtonRemoveShip_Click;
+            // 
+            // maskedTextBox
+            // 
+            maskedTextBox.Location = new Point(15, 416);
+            maskedTextBox.Mask = "00";
+            maskedTextBox.Name = "maskedTextBox";
+            maskedTextBox.Size = new Size(367, 39);
+            maskedTextBox.TabIndex = 3;
+            maskedTextBox.ValidatingType = typeof(int);
+            // 
+            // buttonAddShip
+            // 
+            buttonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddShip.Location = new Point(15, 164);
+            buttonAddShip.Name = "buttonAddShip";
+            buttonAddShip.Size = new Size(367, 77);
+            buttonAddShip.TabIndex = 1;
+            buttonAddShip.Text = "Добавление корабля";
+            buttonAddShip.UseVisualStyleBackColor = true;
+            buttonAddShip.Click += ButtonAddShip_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(15, 47);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(367, 40);
+            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(1601, 1112);
+            pictureBox.TabIndex = 1;
+            pictureBox.TabStop = false;
+            // 
+            // FormShipCollection
+            // 
+            AutoScaleDimensions = new SizeF(13F, 32F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1989, 1112);
+            Controls.Add(pictureBox);
+            Controls.Add(groupBoxTools);
+            Name = "FormShipCollection";
+            Text = "Коллекция кораблей";
+            groupBoxTools.ResumeLayout(false);
+            groupBoxTools.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private ComboBox comboBoxSelectorCompany;
+        private Button buttonAddShip;
+        private Button buttonGoToCheck;
+        private Button buttonRemoveShip;
+        private MaskedTextBox maskedTextBox;
+        private PictureBox pictureBox;
+        private Button buttonRefresh;
+        private Button buttonAddContainerShip;
+    }
+}

ProjectContainerShip/ProjectContainerShip/FormShipCollection.cs

@@ -0,0 +1,189 @@
+using ProjectContainerShip.CollectionGenericObjects;
+using ProjectContainerShip.Drawings;
+namespace ProjectContainerShip;
+
+/// <summary>
+/// Форма работы с компанией и ее коллекцией
+/// </summary>
+public partial class FormShipCollection : Form
+{
+    /// <summary>
+    /// Компания
+    /// </summary>
+    private AbstractCompany? _company = null;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormShipCollection()
+    {
+        InitializeComponent();
+    }
+
+    /// <summary>
+    /// Выбор компании
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new ShipSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningShip>());
+                break;
+        }
+    }
+
+    /// <summary>
+    /// Создание объекта класса-перемещения 
+    /// </summary>
+    /// <param name="type"></param>
+    private void CreateObject(string type)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        Random random = new();
+        DrawningShip drawningShip;
+        switch (type)
+        {
+            case nameof(DrawningShip):
+                drawningShip = new DrawningShip(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
+                break;
+            case nameof(DrawningContainerShip):
+                drawningShip = new DrawningContainerShip(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;
+        }
+
+        if (_company + drawningShip != -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 ColorDialog();
+
+        if (dialog.ShowDialog() == DialogResult.OK)
+        {
+            color = dialog.Color;
+        }
+
+        return color;
+    }
+
+    /// <summary>
+    /// Добавление корабля
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningShip));
+
+    /// <summary>
+    /// Добавление контейнеровоза
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddContainerShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningContainerShip));
+
+    /// <summary>
+    /// Удаление объекта
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonRemoveShip_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null)
+        {
+            return;
+        }
+
+        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+        {
+            return;
+        }
+
+        int position = Convert.ToInt32(maskedTextBox.Text);
+
+        if (_company - position != 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;
+        }
+
+        DrawningShip? ship = null;
+        int counter = 100;
+        while (ship == null)
+        {
+            ship = _company.GetRandomObject();
+            counter--;
+            if (counter <= 0)
+            {
+                break; 
+            }
+        }
+
+        if (ship == null)
+        {
+            return;
+        }
+
+        FormContainerShip form = new ()
+        {
+            SetShip = ship
+        };
+        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();
+    }
+}

ProjectContainerShip/ProjectContainerShip/FormShipCollection.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>

ProjectContainerShip/ProjectContainerShip/Program.cs

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