ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/AbstractCompany.cs

@@ -0,0 +1,116 @@
+using ProjectMotorBoat.Drawings;
+
+namespace ProjectMotorBoat.CollectionGenericObjects;
+
+/// <summary>
+/// Абстракция компании, хранящий коллекцию лодок
+/// </summary>
+public abstract class AbstractCompany
+{
+    /// <summary>
+	/// Размер места (ширина)
+	/// </summary>
+	protected readonly int _placeSizeWidth = 120;
+
+    /// <summary>
+    /// Размер места (высота)
+    /// </summary>
+    protected readonly int _placeSizeHeight = 60;
+
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    protected readonly int _pictureWidth;
+
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    protected readonly int _pictureHeight;
+
+    /// <summary>
+    /// Коллекция лодок
+    /// </summary>
+    protected ICollectionGenericObjects<DrawingBoat>? _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<DrawingBoat> 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, DrawingBoat boat)
+    {
+        return company._collection?.Insert(boat);
+    }
+
+    /// <summary>
+    /// Перегрузка оператора удаления для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="position">Номер удаляемого объекта</param>
+    /// <returns></returns>
+    public static DrawingBoat? operator -(AbstractCompany company, int position)
+    {
+        return company._collection?.Remove(position);
+    }
+
+    /// <summary>
+    /// Получение случайного объекта из коллекции
+    /// </summary>
+    /// <returns></returns>
+    public DrawingBoat? 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)
+        {
+            DrawingBoat? 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();
+}

ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/BoatHarborService.cs

@@ -0,0 +1,62 @@
+using ProjectMotorBoat.Drawings;
+using ProjectMotorBoat.Entities;
+using System.Drawing;
+
+namespace ProjectMotorBoat.CollectionGenericObjects;
+
+/// <summary>
+/// Реализация абстрактной компании - гавань 
+/// </summary>
+public class BoatHarborService : AbstractCompany
+{
+    /// <summary>
+	/// Конструктор
+	/// </summary>
+	/// <param name="picWidth"></param>
+	/// <param name="picHeight"></param>
+	/// <param name="collection"></param>
+    public BoatHarborService(int picWidth, int picHeight, ICollectionGenericObjects<DrawingBoat> collection) : base(picWidth, picHeight, collection)
+    {
+    }
+
+
+    protected override void DrawBackground(Graphics g)
+    {
+        Pen pen = new(Color.BurlyWood, 4);
+
+        for (int startPosX = 5; (startPosX + _placeSizeWidth) < _pictureWidth; startPosX += _placeSizeWidth)
+        {
+            for (int startPosY = 5; (startPosY + _placeSizeHeight) < _pictureHeight; startPosY += _placeSizeHeight)
+            {
+                Point[] points =
+                {
+                     new Point(startPosX + (_placeSizeWidth / 2), startPosY),
+                     new Point(startPosX + _placeSizeWidth, startPosY),
+                     new Point(startPosX + _placeSizeWidth, startPosY + _placeSizeHeight),
+                     new Point(startPosX + (_placeSizeWidth / 2), startPosY + _placeSizeHeight),
+                };
+                g.DrawLines(pen, points);
+            }
+        }
+    }
+
+    protected override void SetObjectsPosition()
+    {
+        int startPosX = 10;
+        int startPosY = 10;
+
+        for (int i = 0; _collection?.Get(i) != null; i++) 
+        {
+            if (startPosX + _placeSizeWidth > _pictureWidth)
+            {
+                startPosX = 10;
+                startPosY += _placeSizeHeight;
+            }
+
+            _collection.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
+            _collection.Get(i).SetPosition(startPosX, startPosY);
+
+            startPosX += _placeSizeWidth;
+        }
+    }
+}

ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -0,0 +1,48 @@
+namespace ProjectMotorBoat.CollectionGenericObjects;
+
+/// <summary>
+/// Интерфейс описания действий для набора хранимых объектов
+/// </summary>
+/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+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);
+}

ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -0,0 +1,110 @@
+namespace ProjectMotorBoat.CollectionGenericObjects;
+
+/// <summary>
+/// Параметризованный набор объектов
+/// </summary>
+/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+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)
+    {
+        // TODO проверка позиции ✔
+        if (_collection[position] != null && position < Count - 1)
+        {
+            return _collection[position];
+        }
+        return null;
+    }
+
+    public int Insert(T obj)
+    {
+        // TODO вставка в свободное место набора ✔
+        for (int i = 0; i < _collection.Length; i++)
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public int Insert(T obj, int position)
+    {
+        // TODO проверка позиции ✔
+        // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
+        //		ищется свободное место после этой позиции и идет вставка туда
+        //		если нет после, ищем до ✔
+        // TODO вставка ✔
+        if (_collection[position] != null)
+        {
+            for (int i = position; i < _collection.Length; i++)
+            {
+                if (_collection[i] == null)
+                {
+                    _collection[position] = obj;
+                    return position;
+                }
+            }
+
+            for (int i = position; i > 0; i--)
+            {
+                if (_collection[i] == null)
+                {
+                    _collection[position] = obj;
+                    return position;
+                }
+            }
+        }
+
+        return -1;
+    }
+
+    public T? Remove(int position)
+    {
+        // TODO проверка позиции ✔
+        // TODO удаление объекта из массива, присвоив элементу массива значение null ✔
+        if (_collection[position] != null)
+        {
+            _collection[position] = null;
+            return _collection[position];
+        }
+
+        return null;
+    }
+}

ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.Designer.cs

@@ -0,0 +1,173 @@
+namespace ProjectMotorBoat
+{
+    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()
+        {
+            groupBoxTools = new GroupBox();
+            buttonRefresh = new Button();
+            buttonGoToCheck = new Button();
+            buttonRemoveBoat = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
+            buttonAddMotorBoat = new Button();
+            buttonAddBoat = new Button();
+            comboBoxSelectorCompany = new ComboBox();
+            pictureBox = new PictureBox();
+            groupBoxTools.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(buttonRefresh);
+            groupBoxTools.Controls.Add(buttonGoToCheck);
+            groupBoxTools.Controls.Add(buttonRemoveBoat);
+            groupBoxTools.Controls.Add(maskedTextBoxPosition);
+            groupBoxTools.Controls.Add(buttonAddMotorBoat);
+            groupBoxTools.Controls.Add(buttonAddBoat);
+            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.Location = new Point(777, 0);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Size = new Size(201, 585);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "Инструменты";
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(12, 389);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(189, 32);
+            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(6, 289);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(189, 32);
+            buttonGoToCheck.TabIndex = 5;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_Click;
+            // 
+            // buttonRemoveBoat
+            // 
+            buttonRemoveBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemoveBoat.Location = new Point(6, 201);
+            buttonRemoveBoat.Name = "buttonRemoveBoat";
+            buttonRemoveBoat.Size = new Size(189, 32);
+            buttonRemoveBoat.TabIndex = 4;
+            buttonRemoveBoat.Text = "Удалить лодку";
+            buttonRemoveBoat.UseVisualStyleBackColor = true;
+            buttonRemoveBoat.Click += ButtonRemoveBoat_Click;
+            // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Location = new Point(6, 172);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(189, 23);
+            maskedTextBoxPosition.TabIndex = 3;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
+            // buttonAddMotorBoat
+            // 
+            buttonAddMotorBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddMotorBoat.Location = new Point(6, 107);
+            buttonAddMotorBoat.Name = "buttonAddMotorBoat";
+            buttonAddMotorBoat.Size = new Size(189, 32);
+            buttonAddMotorBoat.TabIndex = 2;
+            buttonAddMotorBoat.Text = "Добавление моторной лодки";
+            buttonAddMotorBoat.UseVisualStyleBackColor = true;
+            buttonAddMotorBoat.Click += ButtonAddMotorBoat_Click;
+            // 
+            // buttonAddBoat
+            // 
+            buttonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddBoat.Location = new Point(6, 69);
+            buttonAddBoat.Name = "buttonAddBoat";
+            buttonAddBoat.Size = new Size(189, 32);
+            buttonAddBoat.TabIndex = 1;
+            buttonAddBoat.Text = "Добавление лодки";
+            buttonAddBoat.UseVisualStyleBackColor = true;
+            buttonAddBoat.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(6, 22);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(189, 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(777, 585);
+            pictureBox.TabIndex = 1;
+            pictureBox.TabStop = false;
+            // 
+            // FormBoatCollection
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(978, 585);
+            Controls.Add(pictureBox);
+            Controls.Add(groupBoxTools);
+            Name = "FormBoatCollection";
+            Text = " Коллекция лодок";
+            groupBoxTools.ResumeLayout(false);
+            groupBoxTools.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private Button buttonAddMotorBoat;
+        private Button buttonAddBoat;
+        private ComboBox comboBoxSelectorCompany;
+        private Button buttonGoToCheck;
+        private Button buttonRemoveBoat;
+        private MaskedTextBox maskedTextBoxPosition;
+        private PictureBox pictureBox;
+        private Button buttonRefresh;
+    }
+}

ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.cs

@@ -0,0 +1,179 @@
+using ProjectMotorBoat.CollectionGenericObjects;
+using ProjectMotorBoat.Drawings;
+
+namespace ProjectMotorBoat;
+
+/// <summary>
+/// Форма работы с компанией и ее коллекцией
+/// </summary>
+public partial class FormBoatCollection : Form
+{
+    /// <summary>
+	/// Компания
+	/// </summary>
+    private AbstractCompany? _company = null;
+
+    /// <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 BoatHarborService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawingBoat>());
+                break;
+        }
+    }
+
+    /// <summary>
+    /// Добавление обычной лодки
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingBoat));
+
+    /// <summary>
+    /// Добавление моторной лодки
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddMotorBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingMotorBoat));
+
+    /// <summary>
+	/// Создание объекта класса-перемещения
+	/// </summary>
+	/// <param name="type">Тип создаваемого объекта</param>
+	private void CreateObject(string type)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        Random random = new();
+        DrawingBoat drawingBoat;
+        switch (type)
+        {
+            case nameof(DrawingBoat):
+                drawingBoat = new DrawingBoat(random.Next(100, 300), random.Next(1000, 3000),
+                    GetColor(random));
+                break;
+            case nameof(DrawingMotorBoat):
+                drawingBoat = new DrawingMotorBoat(random.Next(100, 300), random.Next(1000, 3000),
+                    GetColor(random),
+                    GetColor(random),
+                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+                break;
+            default:
+                return;
+        }
+
+        if (_company + drawingBoat >= 0)
+        {
+            MessageBox.Show("Объект добавлен");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось добавить объект");
+        }
+    }
+
+    /// <summary>
+	/// Получение цвета
+	/// </summary>
+	/// <param name="random">Генератор случайных чисел</param>
+	/// <returns></returns>
+	private static Color GetColor(Random random)
+    {
+        Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+        ColorDialog dialog = new();
+        if (dialog.ShowDialog() == DialogResult.OK)
+        {
+            color = dialog.Color;
+        }
+
+        return color;
+    }
+
+    /// <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("Не удалось удалить объект");
+        }
+    }
+
+    private void ButtonGoToCheck_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        DrawingBoat? boat = null;
+        int counter = 100;
+        while (boat == null)
+        {
+            boat = _company.GetRandomObject();
+            counter--;
+            if (counter <= 0)
+            {
+                break; 
+            }
+        }
+
+        if (boat == null)
+        {
+            return;
+        }
+
+        FormMotorBoat form = new()
+        {
+            SetBoat = boat
+        };
+        form.ShowDialog();
+    }
+
+    private void ButtonRefresh_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        pictureBox.Image = _company.Show();
+    }
+}

ProjectMotorBoat/ProjectMotorBoat/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>

ProjectMotorBoat/ProjectMotorBoat/FormMotorBoat.Designer.cs

@@ -29,12 +29,10 @@
         private void InitializeComponent()
         {
             pictureBoxMotorBoat = new PictureBox();
-            buttonCreateMotorBoat = new Button();
             buttonLeft = new Button();
             buttonUp = new Button();
             buttonRight = new Button();
             buttonDown = new Button();
-            buttonCreateBoat = new Button();
             comboBoxStrategy = new ComboBox();
             buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxMotorBoat).BeginInit();
@@ -50,17 +48,6 @@
             pictureBoxMotorBoat.TabIndex = 0;
             pictureBoxMotorBoat.TabStop = false;
             // 
-            // buttonCreateMotorBoat
-            // 
-            buttonCreateMotorBoat.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateMotorBoat.Location = new Point(12, 448);
-            buttonCreateMotorBoat.Name = "buttonCreateMotorBoat";
-            buttonCreateMotorBoat.Size = new Size(160, 23);
-            buttonCreateMotorBoat.TabIndex = 1;
-            buttonCreateMotorBoat.Text = "Создать моторную лодку";
-            buttonCreateMotorBoat.UseVisualStyleBackColor = true;
-            buttonCreateMotorBoat.Click += ButtonCreateMotorBoat_Click;
-            // 
             // buttonLeft
             // 
             buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
@@ -109,17 +96,6 @@
             buttonDown.UseVisualStyleBackColor = true;
             buttonDown.Click += ButtonMoveMotorBoat_click;
             // 
-            // buttonCreateBoat
-            // 
-            buttonCreateBoat.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateBoat.Location = new Point(178, 448);
-            buttonCreateBoat.Name = "buttonCreateBoat";
-            buttonCreateBoat.Size = new Size(160, 23);
-            buttonCreateBoat.TabIndex = 6;
-            buttonCreateBoat.Text = "Создать лодку";
-            buttonCreateBoat.UseVisualStyleBackColor = true;
-            buttonCreateBoat.Click += ButtonCreateBoat_Click;
-            // 
             // comboBoxStrategy
             // 
             comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
@@ -147,12 +123,10 @@
             ClientSize = new Size(956, 483);
             Controls.Add(buttonStrategyStep);
             Controls.Add(comboBoxStrategy);
-            Controls.Add(buttonCreateBoat);
             Controls.Add(buttonDown);
             Controls.Add(buttonRight);
             Controls.Add(buttonUp);
             Controls.Add(buttonLeft);
-            Controls.Add(buttonCreateMotorBoat);
             Controls.Add(pictureBoxMotorBoat);
             Name = "FormMotorBoat";
             Text = "Катер";
@@ -164,12 +138,10 @@
         #endregion
 
         private PictureBox pictureBoxMotorBoat;
-        private Button buttonCreateMotorBoat;
         private Button buttonLeft;
         private Button buttonUp;
         private Button buttonRight;
         private Button buttonDown;
-        private Button buttonCreateBoat;
         private ComboBox comboBoxStrategy;
         private Button buttonStrategyStep;
     }

ProjectMotorBoat/ProjectMotorBoat/FormMotorBoat.cs

@@ -13,8 +13,26 @@ public partial class FormMotorBoat : Form
 	/// </summary>
     private DrawingBoat? _drawingBoat;
 
+    /// <summary>
+	/// Стратегия перемещения
+	/// </summary>
     private AbstractStrategy? _strategy;
 
+    /// <summary>
+	/// Получение объекта 
+	/// </summary>
+	public DrawingBoat SetBoat
+    {
+        set
+        {
+            _drawingBoat = value;
+            _drawingBoat.SetPictureSize(pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
+            comboBoxStrategy.Enabled = true;
+            _strategy = null;
+            Draw();
+        }
+    }
+
     /// <summary>
 	/// Конструктор формы
 	/// </summary>
@@ -40,50 +58,6 @@ public partial class FormMotorBoat : Form
         pictureBoxMotorBoat.Image = bmp;
     }
 
-    /// <summary>
-	/// Создание объекта класса-перемещения
-	/// </summary>
-	/// <param name="type">Тип создаваемого объекта</param>
-	private void CreateObject(string type)
-    {
-        Random random = new();
-        switch (type)
-        {
-            case nameof(DrawingBoat):
-                _drawingBoat = new DrawingBoat(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(DrawingMotorBoat):
-                _drawingBoat = new DrawingMotorBoat(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)), Convert.ToBoolean(random.Next(0, 2)));
-                break;
-            default:
-                return;
-        }
-
-        _drawingBoat.SetPictureSize(pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
-        _drawingBoat.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 ButtonCreateMotorBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingMotorBoat));
-
-    /// <summary>
-    /// Обработка нажатия кнопки "Создать лодку"
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonCreateBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingBoat));
-
     /// <summary>
 	/// Перемещение объекта по форме (нажатие кнопок навигации)
 	/// </summary>

ProjectMotorBoat/ProjectMotorBoat/MovementStrategy/MoveToBorder.cs

@@ -1,19 +1,10 @@
 namespace ProjectMotorBoat.MovementStrategy;
 
+/// <summary>
+/// Стратегия перемещения объекта к границе экрана
+/// </summary>
 public class MoveToBorder : AbstractStrategy
 {
-    protected override bool IsTargetDestinaion()
-    {
-        ObjectParameters? objParams = GetObjectParameters;
-        if (objParams == null)
-        {
-            return false;
-        }
-
-        return objParams.RightBorder - GetStep() <= FieldWidth && objParams.RightBorder + GetStep() >= FieldWidth &&
-            objParams.DownBorder - GetStep() <= FieldHeight && objParams.DownBorder + GetStep() >= FieldHeight;
-    }
-
     protected override void MoveToTarget()
     {
         ObjectParameters? objParams = GetObjectParameters;
@@ -48,4 +39,16 @@ public class MoveToBorder : AbstractStrategy
             }
         }
     }
+
+    protected override bool IsTargetDestinaion()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return false;
+        }
+
+        return objParams.RightBorder - GetStep() <= FieldWidth && objParams.RightBorder + GetStep() >= FieldWidth &&
+            objParams.DownBorder - GetStep() <= FieldHeight && objParams.DownBorder + GetStep() >= FieldHeight;
+    }
 }

ProjectMotorBoat/ProjectMotorBoat/Program.cs

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