немного рефакторинга

ProjectCatamaran/ProjectCatamaran/CollectionGenericObjects/AbstractCompany.cs

@@ -0,0 +1,114 @@
+namespace ProjectCatamaran.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<DrawningBoat>? _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<DrawningBoat> collection)
+    {
+        _pictureWidth = picWidth;
+        _pictureHeight = picHeight;
+        _collection = collection;
+        _collection.SetMaxCount = GetMaxCount;
+    }
+
+    /// <summary>
+    /// Перегрузка оператора сложения для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="boat">Добавляемый объект</param>
+    /// <returns></returns>
+    public static int operator +(AbstractCompany company, DrawningBoat boat)
+    {
+        return company._collection?.Insert(boat) ?? -1;
+    }
+
+    /// <summary>
+    /// Перегрузка оператора удаления для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="position">Номер удаляемого объекта</param>
+    /// <returns></returns>
+    public static DrawningBoat operator -(AbstractCompany company, int position)
+    {
+        return company._collection?.Remove(position) ?? null;
+    }
+
+    /// <summary>
+    /// Получение случайного объекта из коллекции
+    /// </summary>
+    /// <returns></returns>
+    public DrawningBoat? 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)
+        {
+            DrawningBoat? 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();
+}

ProjectCatamaran/ProjectCatamaran/CollectionGenericObjects/BoatSharingService.cs

@@ -0,0 +1,63 @@
+namespace ProjectCatamaran.CollectionGenericObjects;
+
+public class BoatSharingService : 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 BoatSharingService(int picWidth, int picHeight, ICollectionGenericObjects<DrawningBoat> 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 + 4);
+                locCoord.Add(new Tuple<int, int>(x, y));
+                x += _placeSizeWidth + 2;
+            }
+            numRows++;
+            x = 1 + offsetX;
+            y -= _placeSizeHeight + 5 + offsetY;
+        }
+    }
+
+    protected override void SetObjectsPosition()
+    {
+        if (locCoord == null || _collection == null)
+        {
+            return;
+        }
+        int row = numRows - 1, col = numCols;
+        for (int i = 0; i < _collection?.Count; i++, col--)
+        {
+            _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
+            _collection?.Get(i)?.SetPosition(locCoord[row * numCols - col].Item1 + 5, locCoord[row * numCols - col].Item2 + 9);
+            if (col == 1)
+            {
+                col = numCols + 1;
+                row--;
+            }
+        }
+    }
+}

ProjectCatamaran/ProjectCatamaran/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -0,0 +1,44 @@
+namespace ProjectCatamaran.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);
+}

ProjectCatamaran/ProjectCatamaran/CollectionGenericObjects/MassiveGenericObjects.cs

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

ProjectCatamaran/ProjectCatamaran/FormBoatCollection.Designer.cs

@@ -0,0 +1,172 @@
+namespace ProjectCatamaran
+{
+    partial class FormBoatCollection
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            Инструменты = new GroupBox();
+            buttonGoToCheck = new Button();
+            buttonRefresh = new Button();
+            buttonRemoveBoat = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
+            buttonAddCatamaran = new Button();
+            buttonAddCar = new Button();
+            comboBoxSelectorCompany = new ComboBox();
+            pictureBox = new PictureBox();
+            Инструменты.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            SuspendLayout();
+            // 
+            // Инструменты
+            // 
+            Инструменты.Controls.Add(buttonGoToCheck);
+            Инструменты.Controls.Add(buttonRefresh);
+            Инструменты.Controls.Add(buttonRemoveBoat);
+            Инструменты.Controls.Add(maskedTextBoxPosition);
+            Инструменты.Controls.Add(buttonAddCatamaran);
+            Инструменты.Controls.Add(buttonAddCar);
+            Инструменты.Controls.Add(comboBoxSelectorCompany);
+            Инструменты.Dock = DockStyle.Right;
+            Инструменты.Location = new Point(861, 0);
+            Инструменты.Name = "Инструменты";
+            Инструменты.Size = new Size(225, 592);
+            Инструменты.TabIndex = 0;
+            Инструменты.TabStop = false;
+            Инструменты.Text = "Инструменты";
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(22, 358);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(191, 49);
+            buttonGoToCheck.TabIndex = 6;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_Click;
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(22, 476);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(191, 49);
+            buttonRefresh.TabIndex = 5;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            // 
+            // buttonRemoveBoat
+            // 
+            buttonRemoveBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemoveBoat.Location = new Point(22, 251);
+            buttonRemoveBoat.Name = "buttonRemoveBoat";
+            buttonRemoveBoat.Size = new Size(191, 49);
+            buttonRemoveBoat.TabIndex = 4;
+            buttonRemoveBoat.Text = "Удаление лодки";
+            buttonRemoveBoat.UseVisualStyleBackColor = true;
+            buttonRemoveBoat.Click += ButtonRemoveBoat_Click;
+            // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Location = new Point(22, 212);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(187, 23);
+            maskedTextBoxPosition.TabIndex = 3;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
+            // buttonAddCatamaran
+            // 
+            buttonAddCatamaran.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddCatamaran.Location = new Point(22, 132);
+            buttonAddCatamaran.Name = "buttonAddCatamaran";
+            buttonAddCatamaran.Size = new Size(191, 49);
+            buttonAddCatamaran.TabIndex = 2;
+            buttonAddCatamaran.Text = "Добавление катамарана";
+            buttonAddCatamaran.UseVisualStyleBackColor = true;
+            buttonAddCatamaran.Click += buttonAddCatamaran_Click;
+            // 
+            // buttonAddCar
+            // 
+            buttonAddCar.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddCar.Location = new Point(22, 77);
+            buttonAddCar.Name = "buttonAddCar";
+            buttonAddCar.Size = new Size(191, 49);
+            buttonAddCar.TabIndex = 1;
+            buttonAddCar.Text = "Добавление лодки";
+            buttonAddCar.UseVisualStyleBackColor = true;
+            buttonAddCar.Click += buttonAddBoat_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(22, 22);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(197, 23);
+            comboBoxSelectorCompany.TabIndex = 0;
+            comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged;
+            // 
+            // pictureBox
+            // 
+            pictureBox.Dock = DockStyle.Fill;
+            pictureBox.Location = new Point(0, 0);
+            pictureBox.Name = "pictureBox";
+            pictureBox.Size = new Size(861, 592);
+            pictureBox.TabIndex = 1;
+            pictureBox.TabStop = false;
+            // 
+            // FormBoatCollection
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1086, 592);
+            Controls.Add(pictureBox);
+            Controls.Add(Инструменты);
+            Name = "FormBoatCollection";
+            Text = "Коллекция лодок";
+            Инструменты.ResumeLayout(false);
+            Инструменты.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox Инструменты;
+        private Button buttonAddCar;
+        private ComboBox comboBoxSelectorCompany;
+        private Button buttonAddCatamaran;
+        private MaskedTextBox maskedTextBoxPosition;
+        private PictureBox pictureBox;
+        private Button buttonRefresh;
+        private Button buttonRemoveBoat;
+        private Button buttonGoToCheck;
+    }
+}

ProjectCatamaran/ProjectCatamaran/FormBoatCollection.cs

@@ -0,0 +1,186 @@
+using ProjectCatamaran.CollectionGenericObjects;
+using ProjectCatamaran.Drawnings;
+
+namespace ProjectCatamaran;
+
+/// <summary>
+/// Форма работы с компанией и ее коллекцией
+/// </summary>
+public partial class FormBoatCollection : Form
+{
+    /// <summary>
+    /// Компания
+    /// </summary>
+    private AbstractCompany? _company;
+
+    /// <summary>
+	/// Конструктор
+	/// </summary>
+    public FormBoatCollection()
+    {
+        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 BoatSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningBoat>());
+                break;
+        }
+    }
+
+    /// <summary>
+	/// Создание объекта класса-перемещения
+	/// </summary>
+	/// <param name="type">Тип создаваемого объекта</param>
+    private void CreateObject(string type)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+        DrawningBoat _drawningBoat;
+        Random random = new();
+        switch (type)
+        {
+            case nameof(DrawningBoat):
+                _drawningBoat = new DrawningBoat(random.Next(30, 70), random.Next(100, 500),
+                    GetColor(random));
+                break;
+            case nameof(DrawningCatamaran):                  
+                _drawningBoat = new DrawningCatamaran(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 + _drawningBoat != -1)
+        {
+            MessageBox.Show("Объект добавлен");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось добавить объект");
+        }
+    }
+
+    /// <summary>
+	/// Добавление обычного автомобиля
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+    private void buttonAddBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBoat));
+
+    /// <summary>
+    /// Добавление спортивного автомобиля
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonAddCatamaran_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningCatamaran));
+
+    /// <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 ButtonRemoveBoat_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;
+        }
+
+        DrawningBoat? boat = null;
+        int counter = 100;
+        while (boat == null)
+        {
+            boat = _company.GetRandomObject();
+            counter--;
+            if (counter <= 0)
+            {
+                break;
+            }
+        }
+
+        if (boat == null)
+        {
+            return;
+        }
+
+        FormCatamaran form = new FormCatamaran();
+        form.SetBoat = boat;      
+        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();
+    }
+}

ProjectCatamaran/ProjectCatamaran/FormBoatCollection.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>

ProjectCatamaran/ProjectCatamaran/FormCatamaran.Designer.cs

@@ -29,12 +29,10 @@
         private void InitializeComponent()
         {
             pictureBoxCatamaran = new PictureBox();
-            buttonCreateCatamaran = new Button();
             buttonLeft = new Button();
             buttonRight = new Button();
             buttonDown = new Button();
             buttonUp = new Button();
-            buttonCreateBoat = new Button();
             comboBoxStrategy = new ComboBox();
             buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxCatamaran).BeginInit();
@@ -49,18 +47,6 @@
             pictureBoxCatamaran.TabIndex = 0;
             pictureBoxCatamaran.TabStop = false;
             // 
-            // buttonCreateCatamaran
-            // 
-            buttonCreateCatamaran.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateCatamaran.Location = new Point(12, 449);
-            buttonCreateCatamaran.Margin = new Padding(3, 2, 3, 2);
-            buttonCreateCatamaran.Name = "buttonCreateCatamaran";
-            buttonCreateCatamaran.Size = new Size(215, 23);
-            buttonCreateCatamaran.TabIndex = 1;
-            buttonCreateCatamaran.Text = "Создать катамаран";
-            buttonCreateCatamaran.UseVisualStyleBackColor = true;
-            buttonCreateCatamaran.Click += ButtonCreateCatamaran_Click;
-            // 
             // buttonLeft
             // 
             buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
@@ -113,18 +99,6 @@
             buttonUp.UseVisualStyleBackColor = true;
             buttonUp.Click += ButtonMove_Click;
             // 
-            // buttonCreateBoat
-            // 
-            buttonCreateBoat.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateBoat.Location = new Point(243, 449);
-            buttonCreateBoat.Margin = new Padding(3, 2, 3, 2);
-            buttonCreateBoat.Name = "buttonCreateBoat";
-            buttonCreateBoat.Size = new Size(215, 23);
-            buttonCreateBoat.TabIndex = 6;
-            buttonCreateBoat.Text = "Создать лодку";
-            buttonCreateBoat.UseVisualStyleBackColor = true;
-            buttonCreateBoat.Click += ButtonCreateBoat_Click;
-            // 
             // comboBoxStrategy
             // 
             comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
@@ -152,12 +126,10 @@
             ClientSize = new Size(1139, 474);
             Controls.Add(buttonStrategyStep);
             Controls.Add(comboBoxStrategy);
-            Controls.Add(buttonCreateBoat);
             Controls.Add(buttonUp);
             Controls.Add(buttonDown);
             Controls.Add(buttonRight);
             Controls.Add(buttonLeft);
-            Controls.Add(buttonCreateCatamaran);
             Controls.Add(pictureBoxCatamaran);
             Name = "FormCatamaran";
             Text = "Катамаран";

ProjectCatamaran/ProjectCatamaran/FormCatamaran.cs

@@ -17,6 +17,24 @@ public partial class FormCatamaran : Form
     /// Стратегия перемещения
     /// </summary>
     private AbstractStrategy? _strategy;
+
+    /// <summary>
+    /// Получение объекта
+    /// </summary>
+    public DrawningBoat SetBoat
+    {
+        set
+        {
+            _drawningBoat = value;
+            _drawningBoat.SetPictureSize(pictureBoxCatamaran.Width, pictureBoxCatamaran.Height);
+            comboBoxStrategy.Enabled = true;
+            _strategy = null;
+            Draw();
+        }
+    }
+    /// <summary>
+    /// Конструктор формы
+    /// </summary>
     public FormCatamaran()
     {
         InitializeComponent();
@@ -42,49 +60,7 @@ public partial class FormCatamaran : Form
         _drawningBoat?.DrawTransport(gr);
         pictureBoxCatamaran.Image = bmp;
     }
-    /// <summary>
-	/// Создание объекта класса-перемещения
-	/// </summary>
-	/// <param name="type">Тип создаваемого объекта</param>
-    private void CreateObject(string type)
-    {
-        Random random = new();
-        switch (type)
-        {
-            case nameof(DrawningBoat):
-                _drawningBoat = new DrawningBoat(random.Next(30, 70), random.Next(100, 500), 
-                    Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
-                break;
-            case nameof(DrawningCatamaran):
-                _drawningBoat = new DrawningCatamaran(random.Next(30, 70), random.Next(100, 500),
-                    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;
 
-        }
-        _drawningBoat.SetPictureSize(pictureBoxCatamaran.Width, pictureBoxCatamaran.Height);
-        _drawningBoat.SetPosition(random.Next(15, 100), random.Next(15, 100));
-        _strategy = null;
-        comboBoxStrategy.Enabled = true;
-        Draw();
-
-    }
-
-    /// <summary>
-    /// Обработка нажатия кнопки "Создать катамаран"
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonCreateCatamaran_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningCatamaran));
-    /// <summary>
-    /// Обработка нажатия кнопки "Создать лодку"
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonCreateBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBoat));
     /// <summary>
 	/// Перемещение объекта по форме (нажатие кнопок навигации)
 	/// </summary>

ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs

@@ -26,10 +26,10 @@ public class MoveToBorder : AbstractStrategy
             {
                 MoveLeft();
             }
-            else 
+            else
             {
                 MoveRight();
-            } 
+            }
         }
         int diffY = objParams.DownBorder - FieldHeight;
         if (Math.Abs(diffY) > GetStep())
@@ -38,11 +38,11 @@ public class MoveToBorder : AbstractStrategy
             {
                 MoveUp();
             }
-            else 
+            else
             {
                 MoveDown();
             }
-           
+
         }
     }
 }

ProjectCatamaran/ProjectCatamaran/Program.cs

@@ -12,7 +12,7 @@ namespace ProjectCatamaran
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
 
-            Application.Run(new FormCatamaran());
+            Application.Run(new FormBoatCollection());
         }
     }
 }