.gitignore

@@ -398,4 +398,3 @@ FodyWeavers.xsd
 # JetBrains Rider
 *.sln.iml
 
-/ProjectCatamaran/ProjectCatamaran/Resources/Program.cs

ProjectCatamaran/ProjectCatamaran/CollectiongGenericObjects/AbstractCompany.cs

@@ -1,104 +0,0 @@
-using ProjectCatamaran.Drawnings;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectCatamaran.CollectiongGenericObjects;
-
-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) ?? 0;
-    }
-    /// <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);
-    }
-    /// <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);
-        DrawBackgound(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 DrawBackgound(Graphics g);
-    /// <summary>
-    /// Расстановка объектов
-    /// </summary>
-    protected abstract void SetObjectsPosition();
-}

ProjectCatamaran/ProjectCatamaran/CollectiongGenericObjects/BoatSharingService.cs

@@ -1,70 +0,0 @@
-using ProjectCatamaran.Drawnings;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectCatamaran.CollectiongGenericObjects;
-
-/// <summary>
-/// Реализация абстрактной компании - каршеринг
-/// </summary>
-public class BoatSharingService : AbstractCompany
-{
-    /// <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 DrawBackgound(Graphics g)
-    {
-        int width = _pictureWidth / _placeSizeWidth;
-        int height = _pictureHeight / _placeSizeHeight;
-        Pen pen = new(Color.Black, 2);
-        for (int i = 0; i < width; i++)
-        {
-            for (int j = 0; j < height + 1; ++j)
-            {
-                g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth - 20, j * _placeSizeHeight);
-                g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth - 20, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth - 20, j * _placeSizeHeight + _placeSizeHeight);
-            }
-        }
-    }
-
-    protected override void SetObjectsPosition()
-    {
-        int width = _pictureWidth / _placeSizeWidth;
-        int height = _pictureHeight / _placeSizeHeight;
-
-        int curWidth = 0;
-        int curHeight = 0;
-
-        for (int i = 0; i < (_collection?.Count ?? 0); i++)
-        {
-            if (_collection.Get(i) != null)
-            {
-                _collection.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
-                _collection.Get(i).SetPosition(_placeSizeWidth * curWidth + 30, curHeight * _placeSizeHeight);
-            }
-
-            if (curWidth < width - 1)
-                curWidth++;
-            else
-            {
-                curWidth = 0;
-                curHeight++;
-            }
-
-            if (curHeight >= height)
-            {
-                return;
-            }
-        }
-    }
-}

ProjectCatamaran/ProjectCatamaran/CollectiongGenericObjects/ICollectionGenericObjects.cs

@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectCatamaran.CollectiongGenericObjects;
-
-/// <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);
-
-}

ProjectCatamaran/ProjectCatamaran/CollectiongGenericObjects/MassiveGenericObjects.cs

@@ -1,114 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectCatamaran.CollectiongGenericObjects;
-
-/// <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) { _collection = new T?[value]; } } }
-
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    public MassiveGenericObjects()
-    {
-        _collection = Array.Empty<T>();
-    }
-
-    /// <summary>
-    ///  проверка позиции
-    /// </summary>
-    /// <param name="position"></param>
-    /// <returns></returns>
-    public T? Get(int position)
-    {
-        
-        if (position >= _collection.Length || position < 0)
-        {
-            return null;
-        }
-        return _collection[position];
-    }
-
-    /// <summary>
-    /// вставка в свободное место набора
-    /// </summary>
-    /// <param name="obj"></param>
-    /// <returns></returns>
-    public int Insert(T obj)
-    {
-        int index = 0;
-        while (index < _collection.Length)
-        {
-            if (_collection[index] == null)
-            {
-                _collection[index] = obj;
-                return index;
-            }
-            index++;
-        }
-        return -1;
-    }
-    
-    /// <summary>
-    /// проверка позиции
-    /// </summary>
-    /// <param name="obj"></param>
-    /// <param name="position"></param>
-    /// <returns></returns>
-    public int Insert(T obj, int position)
-    {
-        if (position >= _collection.Length || position < 0)
-        { return -1; }
-
-        if (_collection[position] == null)
-        {
-            _collection[position] = obj;
-            return position;
-        }
-        int index;
-
-        for (index = position + 1; index < _collection.Length; ++index)
-        {
-            if (_collection[index] == null)
-            {
-                _collection[position] = obj;
-                return position;
-            }
-        }
-
-        for (index = position - 1; index >= 0; --index)
-        {
-            if (_collection[index] == null)
-            {
-                _collection[position] = obj;
-                return position;
-            }
-        }
-        return -1;
-    }
-
-    public T? Remove(int position)
-    {
-        if (position >= _collection.Length || position < 0)
-        { 
-            return null; 
-        }
-        T drawningBoat = _collection[position];
-        _collection[position] = null;
-        return drawningBoat;
-    }
-}

ProjectCatamaran/ProjectCatamaran/FormBoatCollection.Designer.cs

@@ -1,174 +0,0 @@
-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()
-        {
-            groupBoxTools = new GroupBox();
-            buttonRefresh = new Button();
-            buttonGoToCheck = new Button();
-            buttonRemoveBoat = new Button();
-            maskedTextBoxPosition = new MaskedTextBox();
-            buttonAddCatamaran = new Button();
-            buttonAddBoat = new Button();
-            comboBoxSelectorCompany = new ComboBox();
-            pictureBoxBoat = new PictureBox();
-            groupBoxTools.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxBoat).BeginInit();
-            SuspendLayout();
-            // 
-            // groupBoxTools
-            // 
-            groupBoxTools.Controls.Add(buttonRefresh);
-            groupBoxTools.Controls.Add(buttonGoToCheck);
-            groupBoxTools.Controls.Add(buttonRemoveBoat);
-            groupBoxTools.Controls.Add(maskedTextBoxPosition);
-            groupBoxTools.Controls.Add(buttonAddCatamaran);
-            groupBoxTools.Controls.Add(buttonAddBoat);
-            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
-            groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(728, 0);
-            groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(279, 633);
-            groupBoxTools.TabIndex = 0;
-            groupBoxTools.TabStop = false;
-            groupBoxTools.Text = "Инструменты";
-            // 
-            // buttonRefresh
-            // 
-            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(16, 522);
-            buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(250, 51);
-            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(16, 408);
-            buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(250, 51);
-            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(16, 301);
-            buttonRemoveBoat.Name = "buttonRemoveBoat";
-            buttonRemoveBoat.Size = new Size(250, 51);
-            buttonRemoveBoat.TabIndex = 4;
-            buttonRemoveBoat.Text = "Удалить лодку";
-            buttonRemoveBoat.UseVisualStyleBackColor = true;
-            buttonRemoveBoat.Click += ButtonRemoveBoat_Click;
-            // 
-            // maskedTextBoxPosition
-            // 
-            maskedTextBoxPosition.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            maskedTextBoxPosition.Location = new Point(16, 258);
-            maskedTextBoxPosition.Mask = "00";
-            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            maskedTextBoxPosition.Size = new Size(250, 27);
-            maskedTextBoxPosition.TabIndex = 3;
-            maskedTextBoxPosition.ValidatingType = typeof(int);
-            // 
-            // buttonAddCatamaran
-            // 
-            buttonAddCatamaran.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddCatamaran.Location = new Point(16, 174);
-            buttonAddCatamaran.Name = "buttonAddCatamaran";
-            buttonAddCatamaran.Size = new Size(250, 51);
-            buttonAddCatamaran.TabIndex = 2;
-            buttonAddCatamaran.Text = "Добавление катамарана";
-            buttonAddCatamaran.UseVisualStyleBackColor = true;
-            buttonAddCatamaran.Click += ButtonAddCatamaran_Click;
-            // 
-            // buttonAddBoat
-            // 
-            buttonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddBoat.Location = new Point(16, 117);
-            buttonAddBoat.Name = "buttonAddBoat";
-            buttonAddBoat.Size = new Size(250, 51);
-            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(16, 30);
-            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
-            comboBoxSelectorCompany.Size = new Size(250, 28);
-            comboBoxSelectorCompany.TabIndex = 0;
-            comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
-            // 
-            // pictureBoxBoat
-            // 
-            pictureBoxBoat.Dock = DockStyle.Fill;
-            pictureBoxBoat.Location = new Point(0, 0);
-            pictureBoxBoat.Name = "pictureBoxBoat";
-            pictureBoxBoat.Size = new Size(728, 633);
-            pictureBoxBoat.TabIndex = 1;
-            pictureBoxBoat.TabStop = false;
-            // 
-            // FormBoatCollection
-            // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1007, 633);
-            Controls.Add(pictureBoxBoat);
-            Controls.Add(groupBoxTools);
-            Name = "FormBoatCollection";
-            Text = "Коллекция лодок";
-            groupBoxTools.ResumeLayout(false);
-            groupBoxTools.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxBoat).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private GroupBox groupBoxTools;
-        private Button buttonAddCatamaran;
-        private Button buttonAddBoat;
-        private ComboBox comboBoxSelectorCompany;
-        private Button buttonRefresh;
-        private Button buttonGoToCheck;
-        private Button buttonRemoveBoat;
-        private MaskedTextBox maskedTextBoxPosition;
-        private PictureBox pictureBoxBoat;
-    }
-}

ProjectCatamaran/ProjectCatamaran/FormBoatCollection.cs

@@ -1,190 +0,0 @@
-using ProjectCatamaran.CollectiongGenericObjects;
-using ProjectCatamaran.Drawnings;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace ProjectCatamaran;
-
-/// <summary>
-/// Форма работы с компанией и ее коллекцией
-/// </summary>
-public partial class FormBoatCollection : Form
-{
-    /// <summary>
-    /// Компания
-    /// </summary>
-    private AbstractCompany? _company = null;
-
-    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(pictureBoxBoat.Width,
-                pictureBoxBoat.Height, new MassiveGenericObjects<DrawningBoat>());
-                break;
-        }
-
-    }
-
-
-
-
-    /// <summary>
-    /// Создание объекта класса-перемещение
-    /// </summary>
-    /// <param name="type"></param>
-    private void CreateObject(string type)
-    {
-        if (_company == null)
-        {
-            return;
-        }
-        Random random = new();
-        DrawningBoat drawningBoat;
-        switch (type)
-        {
-            case nameof(DrawningBoat):
-                drawningBoat = new DrawningBoat(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
-                break;
-            case nameof(DrawningCatamaran):
-                drawningBoat = new DrawningCatamaran(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 + drawningBoat != -1)
-        {
-            MessageBox.Show("объект добавлен");
-            pictureBoxBoat.Image = _company.Show();
-        }
-        else
-        {
-            MessageBox.Show("не удалось добавить объект");
-        }
-    }
-
-    /// <summary>
-    /// Получение цвета
-    /// </summary>
-    /// <param name="random"></param>
-    /// <returns></returns>
-    private 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 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="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("объект удален");
-            pictureBoxBoat.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()
-        {
-            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;
-        }
-
-        pictureBoxBoat.Image = _company.Show();
-    }
-}

ProjectCatamaran/ProjectCatamaran/FormBoatCollection.resx

@@ -1,120 +0,0 @@
-<?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,10 +29,12 @@
         private void InitializeComponent()
         {
             pictureBoxCatamaran = new PictureBox();
+            buttonCreateCatamaran = new Button();
             buttonUp = new Button();
             buttonLeft = new Button();
             buttonDown = new Button();
             buttonRight = new Button();
+            buttonCreatBoat = new Button();
             comboBoxStrategy = new ComboBox();
             buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxCatamaran).BeginInit();
@@ -47,6 +49,17 @@
             pictureBoxCatamaran.TabIndex = 0;
             pictureBoxCatamaran.TabStop = false;
             // 
+            // buttonCreateCatamaran
+            // 
+            buttonCreateCatamaran.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreateCatamaran.Location = new Point(12, 409);
+            buttonCreateCatamaran.Name = "buttonCreateCatamaran";
+            buttonCreateCatamaran.Size = new Size(203, 29);
+            buttonCreateCatamaran.TabIndex = 1;
+            buttonCreateCatamaran.Text = "Создать катамаран";
+            buttonCreateCatamaran.UseVisualStyleBackColor = true;
+            buttonCreateCatamaran.Click += ButtonCreateCatamaran_Click;
+            // 
             // buttonUp
             // 
             buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
@@ -97,6 +110,17 @@
             buttonRight.UseVisualStyleBackColor = false;
             buttonRight.Click += ButtonMove_Click;
             // 
+            // buttonCreatBoat
+            // 
+            buttonCreatBoat.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreatBoat.Location = new Point(233, 409);
+            buttonCreatBoat.Name = "buttonCreatBoat";
+            buttonCreatBoat.Size = new Size(203, 29);
+            buttonCreatBoat.TabIndex = 6;
+            buttonCreatBoat.Text = "Создать лодку";
+            buttonCreatBoat.UseVisualStyleBackColor = true;
+            buttonCreatBoat.Click += ButtonCreatBoat_Click;
+            // 
             // comboBoxStrategy
             // 
             comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
@@ -124,10 +148,12 @@
             ClientSize = new Size(800, 450);
             Controls.Add(buttonStrategyStep);
             Controls.Add(comboBoxStrategy);
+            Controls.Add(buttonCreatBoat);
             Controls.Add(buttonRight);
             Controls.Add(buttonDown);
             Controls.Add(buttonLeft);
             Controls.Add(buttonUp);
+            Controls.Add(buttonCreateCatamaran);
             Controls.Add(pictureBoxCatamaran);
             Name = "FormCatamaran";
             Text = "Катамаран";
@@ -138,10 +164,12 @@
         #endregion
 
         private PictureBox pictureBoxCatamaran;
+        private Button buttonCreateCatamaran;
         private Button buttonUp;
         private Button buttonLeft;
         private Button buttonDown;
         private Button buttonRight;
+        private Button buttonCreatBoat;
         private ComboBox comboBoxStrategy;
         private Button buttonStrategyStep;
     }

ProjectCatamaran/ProjectCatamaran/FormCatamaran.cs

@@ -24,21 +24,6 @@ namespace ProjectCatamaran
         /// </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>
         /// Конструктор формы
@@ -49,6 +34,51 @@ namespace ProjectCatamaran
             _strategy = null;
         }
 
+        /// <summary>
+        /// Создание объекта класса-перемещения
+        /// </summary>
+        /// <param name="type"></param>
+        private void CreateObject(string type)
+        {
+            Random random = new();
+            switch (type)
+            {
+                case nameof(DrawningBoat):
+                    _drawningBoat = new DrawningBoat(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(DrawningCatamaran):
+                    _drawningBoat = new DrawningCatamaran(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;
+            }
+            _drawningBoat.SetPictureSize(pictureBoxCatamaran.Width, pictureBoxCatamaran.Height);
+            _drawningBoat.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 ButtonCreateCatamaran_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningCatamaran));
+
+
+        /// <summary>
+        /// Обработка нажатия кнопки "Создать лодку"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreatBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBoat));
 
         /// <summary>
         /// Метод прорисовки катамарана

ProjectCatamaran/ProjectCatamaran/Resources/Program.cs

@@ -1,4 +1,4 @@
-namespace ProjectCatamaran
+namespace ProjectCatamaran.Resources
 {
     internal static class Program
     {
@@ -11,7 +11,7 @@ namespace ProjectCatamaran
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormBoatCollection());
+            Application.Run(new FormCatamaran());
         }
     }
 }