готова к сдаче

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/AbstractCompany.cs

@@ -0,0 +1,115 @@
+using ProjectContainerShip.Drawnings;
+
+namespace ProjectContainerShip.CollectionGenericObjects;
+/// <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<DrawningShip>? _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<DrawningShip> collection)
+    {
+        _pictureWidth = picWidth;
+        _pictureHeight = picHeight;
+        _collection = collection;
+        _collection.SetMaxCount = GetMaxCount;
+    }
+
+    /// <summary>
+    /// Перегрузка оператора сложения для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="ship">Добавляемый объект</param>
+    /// <returns></returns>
+    public static int operator +(AbstractCompany company, DrawningShip boat)
+    {
+        return company._collection?.Insert(boat) ?? -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);
+        DrawBackground(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 DrawBackground(Graphics g);
+
+    /// <summary>
+    /// Расстановка объектов
+    /// </summary>
+    protected abstract void SetObjectsPosition();
+}

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+
 namespace ProjectContainerShip.CollectionGenericObjects;
 
 public interface ICollectionGenericObjects <T>
@@ -24,7 +19,7 @@ public interface ICollectionGenericObjects <T>
     /// </summary>
     /// <param name="obj">Добавляемый объект</param>
     /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-    bool Insert (T obj);
+    int Insert (T obj);
 
     /// <summary>
     /// Добавление объекта в коллекцию на конкретную позицию
@@ -32,14 +27,14 @@ public interface ICollectionGenericObjects <T>
     /// /// <param name="obj">Добавляемый объект</param>
     /// /// <param name="position">Позиция</param>
     /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-    bool Insert (T obj, int position);
+    int Insert (T obj, int position);
 
     /// <summary>
     /// Удаление объекта из коллекции с конктретной позиции
     /// </summary>
     /// /// <param name="obj">Добавляемый объект</param>
     /// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
-    bool Remove (int position);
+    T Remove (int position);
 
     /// <summary>
     /// Получение объекта по позиции

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -65,7 +65,6 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Insert(T obj, int position)
     {
-        
         if (position < 0 || position >= Count)
         {
             return -1;
@@ -75,6 +74,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             _collection[position] = obj;
             return position;
         }
+
         for (int i = position + 1; i < Count; i++)
         {
             if (_collection[i] == null)
@@ -106,4 +106,3 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         return obj;
     }
 }
-}

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ShipSharingService.cs

@@ -0,0 +1,65 @@
+using ProjectContainerShip.Drawnings;
+
+namespace ProjectContainerShip.CollectionGenericObjects;
+
+public class ShipSharingService : 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 ShipSharingService(int picWidth, int picHeight, ICollectionGenericObjects<DrawningShip> collection) : base(picWidth, picHeight, collection)
+    {
+    }
+
+    protected override void DrawBackground(Graphics g)
+    {
+        //Color backgroundColor = Color.SkyBlue;
+        //using (Brush brush = new SolidBrush(backgroundColor))
+        //{
+        //    g.FillRectangle(brush, new Rectangle(0, 0, _pictureWidth, _pictureHeight));
+        //}
+        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 + 8);
+                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--;
+            }
+        }
+    }
+}

ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs

@@ -29,7 +29,7 @@ public class EntityContainerShip : EntityShip
     /// <param name="additionalColor">Дополнительный цвет</param>
     /// <param name="crane">Признак наличия крана</param>
     /// <param name="container">Признак наличия контейнеров</param>
-    public EntityContainerShip(int speed, double weight, Color bodyColor, Color additionalColor, bool crane, bool container) : base(speed, weight, Color.Black)
+    public EntityContainerShip(int speed, double weight, Color bodyColor, Color additionalColor, bool crane, bool container) : base(speed, weight, bodyColor)
     {
         AdditionalColor = additionalColor;
         Crane = crane;

ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs

@@ -33,12 +33,10 @@ namespace ProjectContainerShip
         private void InitializeComponent()
         {
             pictureBoxContainerShip = new PictureBox();
-            buttonCreateContainerShip = new Button();
             buttonLeft = new Button();
             buttonUp = new Button();
             buttonDown = new Button();
             buttonRight = new Button();
-            buttonCreateShip = new Button();
             comboBoxStrategy = new ComboBox();
             buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxContainerShip).BeginInit();
@@ -53,17 +51,6 @@ namespace ProjectContainerShip
             pictureBoxContainerShip.TabIndex = 0;
             pictureBoxContainerShip.TabStop = false;
             // 
-            // buttonCreateContainerShip
-            // 
-            buttonCreateContainerShip.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateContainerShip.Location = new Point(12, 546);
-            buttonCreateContainerShip.Name = "buttonCreateContainerShip";
-            buttonCreateContainerShip.Size = new Size(196, 26);
-            buttonCreateContainerShip.TabIndex = 1;
-            buttonCreateContainerShip.Text = "Создать контейнеровоз";
-            buttonCreateContainerShip.UseVisualStyleBackColor = true;
-            buttonCreateContainerShip.Click += ButtonCreateContainerShip_Click;
-            // 
             // buttonLeft
             // 
             buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
@@ -112,17 +99,6 @@ namespace ProjectContainerShip
             buttonRight.UseVisualStyleBackColor = true;
             buttonRight.Click += ButtonMove_Click;
             // 
-            // buttonCreateShip
-            // 
-            buttonCreateShip.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateShip.Location = new Point(214, 546);
-            buttonCreateShip.Name = "buttonCreateShip";
-            buttonCreateShip.Size = new Size(196, 26);
-            buttonCreateShip.TabIndex = 6;
-            buttonCreateShip.Text = "Создать корабль";
-            buttonCreateShip.UseVisualStyleBackColor = true;
-            buttonCreateShip.Click +=ButtonCreateShip_Click;
-            // 
             // comboBoxStrategy
             // 
             comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
@@ -150,12 +126,10 @@ namespace ProjectContainerShip
             ClientSize = new Size(934, 586);
             Controls.Add(buttonStrategyStep);
             Controls.Add(comboBoxStrategy);
-            Controls.Add(buttonCreateShip);
             Controls.Add(buttonRight);
             Controls.Add(buttonDown);
             Controls.Add(buttonUp);
             Controls.Add(buttonLeft);
-            Controls.Add(buttonCreateContainerShip);
             Controls.Add(pictureBoxContainerShip);
             Name = "FormContainerShip";
             Text = "Спортивный автомобиль";
@@ -166,13 +140,11 @@ namespace ProjectContainerShip
         #endregion
 
         private PictureBox pictureBoxContainerShip;
-        private Button buttonCreateContainerShip;
         private Button buttonLeft;
         private Button buttonUp;
         private Button buttonDown;
         private Button buttonRight;
         private Button button1;
-        private Button buttonCreateShip;
         private ComboBox comboBoxStrategy;
         private Button buttonStrategyStep;
     }

ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs

@@ -18,6 +18,21 @@ public partial class FormContainerShip : Form
 	/// </summary>
     private AbstractStrategy? _strategy;
 
+    /// <summary>
+    /// Получение объекта
+    /// </summary>
+    public DrawningShip SetShip
+    {
+        set
+        {
+            _drawningShip = value;
+            _drawningShip.SetPictureSize(pictureBoxContainerShip.Width, pictureBoxContainerShip.Height);
+            comboBoxStrategy.Enabled = true;
+            _strategy = null;
+            Draw();
+        }
+    }
+
     /// <summary>
     /// Конструктор формы
     /// </summary>
@@ -43,50 +58,6 @@ public partial class FormContainerShip : Form
         pictureBoxContainerShip.Image = bmp;
     }
 
-    /// <summary>
-	/// Создание объекта класса-перемещения
-	/// </summary>
-	/// <param name="type">Тип создаваемого объекта</param>
-	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,177 @@
+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();
+            buttonRefresh = new Button();
+            buttonGoToCheck = new Button();
+            buttonDelShip = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
+            buttonAddContainerShip = new Button();
+            buttonAddShip = new Button();
+            comboBoxSelectorCompany = new ComboBox();
+            pictureBox = new PictureBox();
+            colorDialog = new ColorDialog();
+            groupBoxTools.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(buttonRefresh);
+            groupBoxTools.Controls.Add(buttonGoToCheck);
+            groupBoxTools.Controls.Add(buttonDelShip);
+            groupBoxTools.Controls.Add(maskedTextBoxPosition);
+            groupBoxTools.Controls.Add(buttonAddContainerShip);
+            groupBoxTools.Controls.Add(buttonAddShip);
+            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.Location = new Point(930, 0);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Size = new Size(206, 617);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "Инструменты";
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(6, 482);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.RightToLeft = RightToLeft.No;
+            buttonRefresh.Size = new Size(194, 34);
+            buttonRefresh.TabIndex = 6;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(6, 367);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.RightToLeft = RightToLeft.No;
+            buttonGoToCheck.Size = new Size(194, 34);
+            buttonGoToCheck.TabIndex = 5;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_Click;
+            // 
+            // buttonDelShip
+            // 
+            buttonDelShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonDelShip.Location = new Point(6, 234);
+            buttonDelShip.Name = "buttonDelShip";
+            buttonDelShip.RightToLeft = RightToLeft.No;
+            buttonDelShip.Size = new Size(194, 34);
+            buttonDelShip.TabIndex = 4;
+            buttonDelShip.Text = "Удалить";
+            buttonDelShip.UseVisualStyleBackColor = true;
+            buttonDelShip.Click += ButtonDelShip_Click;
+            // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Location = new Point(6, 203);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(188, 25);
+            maskedTextBoxPosition.TabIndex = 3;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
+            // buttonAddContainerShip
+            // 
+            buttonAddContainerShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddContainerShip.Location = new Point(6, 134);
+            buttonAddContainerShip.Name = "buttonAddContainerShip";
+            buttonAddContainerShip.Size = new Size(194, 34);
+            buttonAddContainerShip.TabIndex = 2;
+            buttonAddContainerShip.Text = "Добавление контейнеровоза";
+            buttonAddContainerShip.UseVisualStyleBackColor = true;
+            buttonAddContainerShip.Click += ButtonAddContainerShip_Click;
+            // 
+            // buttonAddShip
+            // 
+            buttonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddShip.Location = new Point(6, 94);
+            buttonAddShip.Name = "buttonAddShip";
+            buttonAddShip.Size = new Size(194, 34);
+            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(6, 24);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(194, 25);
+            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(930, 617);
+            pictureBox.TabIndex = 1;
+            pictureBox.TabStop = false;
+            // 
+            // FormShipCollection
+            // 
+            AutoScaleDimensions = new SizeF(7F, 17F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1136, 617);
+            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 Button buttonAddShip;
+        private ComboBox comboBoxSelectorCompany;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonAddContainerShip;
+        private PictureBox pictureBox;
+        private Button buttonDelShip;
+        private Button buttonRefresh;
+        private Button buttonGoToCheck;
+        private ColorDialog colorDialog;
+    }
+}

ProjectContainerShip/ProjectContainerShip/FormShipCollection.cs

@@ -0,0 +1,189 @@
+using ProjectContainerShip.CollectionGenericObjects;
+using ProjectContainerShip.Drawnings;
+
+
+namespace ProjectContainerShip
+{
+    /// <summary>
+    /// Форма работы с компанией и ее коллекцией
+    /// </summary>
+    public partial class FormShipCollection : Form
+    {
+        /// <summary>
+        /// Компания
+        /// </summary>
+        private AbstractCompany? _company;
+
+        /// <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;
+            }
+            DrawningShip _drawningShip;
+            Random random = new();
+            switch (type)
+            {
+                case nameof(DrawningShip):
+                    _drawningShip = new DrawningShip(random.Next(30, 70), random.Next(100, 500),
+                        GetColor(random));
+                    break;
+                case nameof(DrawningContainerShip):
+                    _drawningShip = new DrawningContainerShip(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 + _drawningShip != -1)
+            {
+                MessageBox.Show("Объект добавлен");
+                pictureBox.Image = _company.Show();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось добавить объект");
+            }
+        }
+
+
+        /// <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="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;
+        }
+
+        /// <summary>
+        /// Удаление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonDelShip_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;
+            }
+
+            DrawningShip? ship = null;
+            int counter = 100;
+            while (ship == null)
+            {
+                ship = _company.GetRandomObject();
+                counter--;
+                if (counter <= 0)
+                {
+                    break;
+                }
+            }
+
+            if (ship == null)
+            {
+                return;
+            }
+
+            FormContainerShip form = new FormContainerShip();
+            form.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,126 @@
+<?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>
+  <metadata name="colorDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>79</value>
+  </metadata>
+</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());
         }
     }
 }