done lab5

MotorBoat/MotorBoat/BoatGenericCollection.cs

@@ -0,0 +1,152 @@
+using MotorBoat.Generics;
+using MotorBoat.DrawningObjects;
+using MotorBoat.MovementStrategy;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat.Generics
+{
+    /// <summary>
+    /// Параметризованный класс для набора объектов DrawningBoat
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <typeparam name="U"></typeparam>
+    internal class BoatsGenericCollection<T, U>
+        where T : DrawningBoat
+        where U : IMoveableObject
+    {
+        /// <summary>
+        /// Ширина окна прорисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+
+        /// <summary>
+        /// Высота окна прорисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+
+        /// <summary>
+        /// Размер занимаемого объектом места (ширина)
+        /// </summary>
+        private readonly int _placeSizeWidth = 180;
+
+        /// <summary>
+        /// Размер занимаемого объектом места (высота)
+        /// </summary>
+        private readonly int _placeSizeHeight = 80;
+
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly SetGeneric<T> _collection;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="picWidth"></param>
+        /// <param name="picHeight"></param>
+        public BoatsGenericCollection(int picWidth, int picHeight)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _collection = new SetGeneric<T>(width * height);
+        }
+
+        /// <summary>
+        /// Перегрузка оператора сложения
+        /// </summary>
+        /// <param name="collect"></param>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static bool operator +(BoatsGenericCollection<T, U> collect, T? obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+            return (bool)collect?._collection.Insert(obj);
+        }
+
+        /// <summary>
+        /// Перегрузка оператора вычитания
+        /// </summary>
+        /// <param name="collect"></param>
+        /// <param name="pos"></param>
+        /// <returns></returns>
+        public static bool operator -(BoatsGenericCollection<T, U>? collect, int pos)
+        {
+            T? obj = collect._collection[pos];
+            if (obj != null)
+            {
+                collect._collection.Remove(pos);
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Получение объекта IMoveableObject
+        /// </summary>
+        /// <param name="pos"></param>
+        /// <returns></returns>
+        public U? GetU(int pos)
+        {
+            return (U?)_collection[pos]?.GetMoveableObject;
+        }
+
+        /// <summary>
+        /// Вывод всего набора объектов
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowBoats()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawObjects(gr);
+            return bmp;
+        }
+
+        /// <summary>
+        /// Метод отрисовки фона
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBackground(Graphics g)
+        {
+            Pen pen = new(Color.Black, 3);
+            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
+            {
+                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
+                {//линия разметки места
+                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight,
+                    i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
+                }
+                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth,
+                _pictureHeight / _placeSizeHeight * _placeSizeHeight);
+            }
+        }
+
+        /// <summary>
+        /// Метод прорисовки объектов
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawObjects(Graphics g)
+        {
+            int i = 0;
+            int Rows = _pictureWidth / _placeSizeWidth;
+            foreach(var boat in _collection.GetBoats())
+            {
+                if (boat != null)
+                {
+                    boat.SetPosition(i % Rows * _placeSizeWidth, i / Rows * _placeSizeHeight + 5);
+                    boat.DrawTransport(g);
+                }
+                i++;
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/BoatsGenericStorage.cs

@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MotorBoat.DrawningObjects;
+using MotorBoat.MovementStrategy;
+
+namespace MotorBoat.Generics
+{
+    /// <summary>
+    /// Класс для хранения коллекции
+    /// </summary>
+    internal class BoatsGenericStorage
+    {
+        /// <summary>
+        /// Словарь (хранилище)
+        /// </summary>
+        readonly Dictionary<string, BoatsGenericCollection<DrawningBoat,DrawningObjectBoat>> _boatStorages;
+
+        /// <summary>
+        /// Возвращение списка названий наборов
+        /// </summary>
+        public List<string> Keys => _boatStorages.Keys.ToList();
+
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="pictureWidth"></param>
+        /// <param name="pictureHeight"></param>
+        public BoatsGenericStorage(int pictureWidth, int pictureHeight)
+        {
+            _boatStorages = new Dictionary<string, BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>>();
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+        }
+
+        /// <summary>
+        /// Добавление набора
+        /// </summary>
+        /// <param name="name">Название набора</param>
+        public void AddSet(string name)
+        {
+            if (_boatStorages.ContainsKey(name))
+                return;
+            _boatStorages[name] = new BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>(_pictureWidth, _pictureHeight);
+        }
+
+        /// <summary>
+        /// Удаление набора
+        /// </summary>
+        /// <param name="name">Название набора</param>
+        public void DelSet(string name)
+        {
+            if (!_boatStorages.ContainsKey(name))
+                return;
+            _boatStorages.Remove(name);
+        }
+
+        /// <summary>
+        /// Доступ к набору
+        /// </summary>
+        /// <param name="ind"></param>
+        /// <returns></returns>
+        public BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>?
+        this[string ind]
+        {
+            get
+            {
+                if (_boatStorages.ContainsKey(ind))
+                    return _boatStorages[ind];
+                return null;
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/DrawningBoat.cs

@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using MotorBoat.Entities;
 using MotorBoat;
+using MotorBoat.MovementStrategy;
 
 namespace MotorBoat.DrawningObjects
 {
@@ -69,6 +70,11 @@ namespace MotorBoat.DrawningObjects
             EntityBoat = new EntityBoat(speed, weight, bodyColor);
         }
 
+        /// <summary>
+        /// Получение объекта IMoveableObject из объекта DrawningCar
+        /// </summary>
+        public IMoveableObject GetMoveableObject => new DrawningObjectBoat(this);
+
         /// <summary>
         /// Конструктор
         /// </summary>
@@ -79,8 +85,7 @@ namespace MotorBoat.DrawningObjects
         /// <param name="height">Высота картинки</param> 
         /// <param name="boatWidth">Ширина прорисовки автомобиля</param>
         /// <param name="boatHeight">Высота прорисовки автомобиля</param>
-        protected DrawningBoat(int speed, double weight, Color bodyColor, int
-        width, int height, int boatWidth, int boatHeight)
+        protected DrawningBoat(int speed, double weight, Color bodyColor, int width, int height, int boatWidth, int boatHeight)
         {
             if (width <= _boatWeight || height <= _boatHeight)
                 return;

MotorBoat/MotorBoat/DrawningMotorBoat.cs

@@ -48,16 +48,23 @@ namespace MotorBoat.DrawningObjects
             Pen pen = new(Color.Black, 1);
             Brush additionalBrush = new SolidBrush(motorBoat.AdditionalColor);
 
+            base.DrawTransport(g);
+
             if (motorBoat.Glass)
             {
                 // стекло впереди
                 Brush glassBrush = new SolidBrush(Color.LightBlue);
-                g.FillEllipse(glassBrush, _startPosX + 20, _startPosY + 15, 100, 40);
-                g.DrawEllipse(pen, _startPosX + 20, _startPosY + 15, 100, 40);
+                Point[] glassPoints = new Point[]
+                {
+                new Point(_startPosX + 100, _startPosY + 15),
+                new Point(_startPosX + 120, _startPosY + 25),
+                new Point(_startPosX + 120, _startPosY + 45),
+                new Point(_startPosX + 100, _startPosY + 55)
+                };
+                g.FillPolygon(glassBrush, glassPoints);
+                g.DrawPolygon(pen, glassPoints);
             }
 
-            base.DrawTransport(g);
-
             if (motorBoat.Engine)
             {
                 // двигатель
@@ -66,4 +73,4 @@ namespace MotorBoat.DrawningObjects
             }
         }
     }
-}
+}

MotorBoat/MotorBoat/DrawningObjectBoat.cs

@@ -36,4 +36,4 @@ namespace MotorBoat.MovementStrategy
         public void MoveObject(DirectionType direction) =>
         _drawningBoat?.MoveTransport(direction);
     }
-}
+}

MotorBoat/MotorBoat/EntityBoat.cs

@@ -43,5 +43,9 @@ namespace MotorBoat.Entities
             Weight = weight;
             BodyColor = bodyColor;
         }
+        internal void setBodyColor(Color color)
+        {
+            BodyColor = color;
+        }
     }
 }

MotorBoat/MotorBoat/EntityMotorBoat.cs

@@ -44,5 +44,10 @@ namespace MotorBoat.Entities
             Engine = engine;
             Glass = glass;
         }
+
+        internal void setAdditionalColor(Color color)
+        {
+            AdditionalColor = color;
+        }
     }
-}
+}

MotorBoat/MotorBoat/FormBoatCollection.Designer.cs

@@ -0,0 +1,189 @@
+namespace MotorBoat
+{
+    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()
+        {
+            pictureBoxCollection = new PictureBox();
+            maskedTextBoxNumber = new MaskedTextBox();
+            ButtonAddBoat = new Button();
+            ButtonRemoveBoat = new Button();
+            ButtonRefreshCollection = new Button();
+            groupBoxTools = new GroupBox();
+            groupBoxCollections = new GroupBox();
+            ButtonRemoveObject = new Button();
+            listBoxStorages = new ListBox();
+            ButtonAddObject = new Button();
+            textBoxStorageName = new MaskedTextBox();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit();
+            groupBoxTools.SuspendLayout();
+            groupBoxCollections.SuspendLayout();
+            SuspendLayout();
+            // 
+            // pictureBoxCollection
+            // 
+            pictureBoxCollection.Dock = DockStyle.Left;
+            pictureBoxCollection.Location = new Point(0, 0);
+            pictureBoxCollection.Name = "pictureBoxCollection";
+            pictureBoxCollection.Size = new Size(578, 500);
+            pictureBoxCollection.TabIndex = 1;
+            pictureBoxCollection.TabStop = false;
+            // 
+            // maskedTextBoxNumber
+            // 
+            maskedTextBoxNumber.Location = new Point(51, 371);
+            maskedTextBoxNumber.Name = "maskedTextBoxNumber";
+            maskedTextBoxNumber.Size = new Size(100, 23);
+            maskedTextBoxNumber.TabIndex = 0;
+            // 
+            // ButtonAddBoat
+            // 
+            ButtonAddBoat.Location = new Point(6, 325);
+            ButtonAddBoat.Name = "ButtonAddBoat";
+            ButtonAddBoat.Size = new Size(188, 40);
+            ButtonAddBoat.TabIndex = 1;
+            ButtonAddBoat.Text = "Добавить лодку";
+            ButtonAddBoat.UseVisualStyleBackColor = true;
+            ButtonAddBoat.Click += ButtonAddBoat_Click;
+            // 
+            // ButtonRemoveBoat
+            // 
+            ButtonRemoveBoat.Location = new Point(6, 407);
+            ButtonRemoveBoat.Name = "ButtonRemoveBoat";
+            ButtonRemoveBoat.Size = new Size(188, 41);
+            ButtonRemoveBoat.TabIndex = 2;
+            ButtonRemoveBoat.Text = "Удалить лодку";
+            ButtonRemoveBoat.UseVisualStyleBackColor = true;
+            ButtonRemoveBoat.Click += ButtonRemoveBoat_Click;
+            // 
+            // ButtonRefreshCollection
+            // 
+            ButtonRefreshCollection.Location = new Point(6, 454);
+            ButtonRefreshCollection.Name = "ButtonRefreshCollection";
+            ButtonRefreshCollection.Size = new Size(188, 39);
+            ButtonRefreshCollection.TabIndex = 3;
+            ButtonRefreshCollection.Text = "Обновить коллекцию";
+            ButtonRefreshCollection.UseVisualStyleBackColor = true;
+            ButtonRefreshCollection.Click += ButtonRefreshCollection_Click;
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(groupBoxCollections);
+            groupBoxTools.Controls.Add(ButtonRefreshCollection);
+            groupBoxTools.Controls.Add(ButtonRemoveBoat);
+            groupBoxTools.Controls.Add(ButtonAddBoat);
+            groupBoxTools.Controls.Add(maskedTextBoxNumber);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.Location = new Point(584, 0);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Size = new Size(200, 500);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "Инструменты";
+            // 
+            // groupBoxCollections
+            // 
+            groupBoxCollections.Controls.Add(ButtonRemoveObject);
+            groupBoxCollections.Controls.Add(listBoxStorages);
+            groupBoxCollections.Controls.Add(ButtonAddObject);
+            groupBoxCollections.Controls.Add(textBoxStorageName);
+            groupBoxCollections.Location = new Point(6, 22);
+            groupBoxCollections.Name = "groupBoxCollections";
+            groupBoxCollections.Size = new Size(188, 261);
+            groupBoxCollections.TabIndex = 4;
+            groupBoxCollections.TabStop = false;
+            groupBoxCollections.Text = "Наборы";
+            // 
+            // ButtonRemoveObject
+            // 
+            ButtonRemoveObject.Location = new Point(6, 214);
+            ButtonRemoveObject.Name = "ButtonRemoveObject";
+            ButtonRemoveObject.Size = new Size(176, 41);
+            ButtonRemoveObject.TabIndex = 3;
+            ButtonRemoveObject.Text = "Удалить набор";
+            ButtonRemoveObject.UseVisualStyleBackColor = true;
+            ButtonRemoveObject.Click += ButtonRemoveObject_Click;
+            // 
+            // listBoxStorages
+            // 
+            listBoxStorages.FormattingEnabled = true;
+            listBoxStorages.ItemHeight = 15;
+            listBoxStorages.Location = new Point(6, 99);
+            listBoxStorages.Name = "listBoxStorages";
+            listBoxStorages.Size = new Size(176, 109);
+            listBoxStorages.TabIndex = 2;
+            listBoxStorages.SelectedIndexChanged += ListBoxObjects_SelectedIndexChanged;
+            // 
+            // ButtonAddObject
+            // 
+            ButtonAddObject.Location = new Point(6, 54);
+            ButtonAddObject.Name = "ButtonAddObject";
+            ButtonAddObject.Size = new Size(176, 39);
+            ButtonAddObject.TabIndex = 1;
+            ButtonAddObject.Text = "Добавить набор";
+            ButtonAddObject.UseVisualStyleBackColor = true;
+            ButtonAddObject.Click += buttonAddObject_Click;
+            // 
+            // textBoxStorageName
+            // 
+            textBoxStorageName.Location = new Point(6, 25);
+            textBoxStorageName.Name = "textBoxStorageName";
+            textBoxStorageName.Size = new Size(176, 23);
+            textBoxStorageName.TabIndex = 0;
+            // 
+            // FormBoatCollection
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(784, 500);
+            Controls.Add(groupBoxTools);
+            Controls.Add(pictureBoxCollection);
+            Name = "FormBoatCollection";
+            Text = "Набор лодок";
+            ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).EndInit();
+            groupBoxTools.ResumeLayout(false);
+            groupBoxTools.PerformLayout();
+            groupBoxCollections.ResumeLayout(false);
+            groupBoxCollections.PerformLayout();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private PictureBox pictureBoxCollection;
+        private MaskedTextBox maskedTextBoxNumber;
+        private Button ButtonAddBoat;
+        private Button ButtonRemoveBoat;
+        private Button ButtonRefreshCollection;
+        private GroupBox groupBoxTools;
+        private GroupBox groupBoxCollections;
+        private Button ButtonRemoveObject;
+        private ListBox listBoxStorages;
+        private Button ButtonAddObject;
+        private MaskedTextBox textBoxStorageName;
+    }
+}

MotorBoat/MotorBoat/FormBoatCollection.cs

@@ -0,0 +1,193 @@
+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;
+using MotorBoat.DrawningObjects;
+using MotorBoat.Generics;
+using MotorBoat.MovementStrategy;
+
+namespace MotorBoat
+{
+    /// <summary>
+    /// Форма для работы с набором объектов класса DrawningBoat
+    /// </summary>
+    public partial class FormBoatCollection : Form
+    {
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly BoatsGenericStorage _storage;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormBoatCollection()
+        {
+            InitializeComponent();
+            _storage = new BoatsGenericStorage(pictureBoxCollection.Width, pictureBoxCollection.Height);
+        }
+
+        /// <summary>
+        /// Заполнение listBoxStorages
+        /// </summary>
+        private void ReloadObjects()
+        {
+            int index = listBoxStorages.SelectedIndex;
+            listBoxStorages.Items.Clear();
+            for (int i = 0; i < _storage.Keys.Count; i++)
+            {
+                listBoxStorages.Items.Add(_storage.Keys[i]);
+            }
+            if (listBoxStorages.Items.Count > 0 && (index == -1 || index >= listBoxStorages.Items.Count))
+            {
+                listBoxStorages.SelectedIndex = 0;
+            }
+            else if (listBoxStorages.Items.Count > 0 && index > -1 && index < listBoxStorages.Items.Count)
+            {
+                listBoxStorages.SelectedIndex = index;
+            }
+        }
+
+        /// <summary>
+        /// Добавление набора в коллекцию
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonAddObject_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxStorageName.Text))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _storage.AddSet(textBoxStorageName.Text);
+            ReloadObjects();
+        }
+
+        /// <summary>
+        /// Выбор набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ListBoxObjects_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            pictureBoxCollection.Image =
+            _storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowBoats();
+        }
+
+        /// <summary>
+        /// Удаление набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRemoveObject_Click(object sender, EventArgs e)
+        {
+            if (listBoxStorages.SelectedIndex == -1)
+            {
+                return;
+            }
+            if (MessageBox.Show($"Удалить объект {listBoxStorages.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _storage.DelSet(listBoxStorages.SelectedItem.ToString() ?? string.Empty);
+                ReloadObjects();
+            }
+        }
+
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddBoat_Click(object sender, EventArgs e)
+        {
+            if (listBoxStorages.SelectedIndex == -1)
+                return;
+
+            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
+
+            if (obj == null)
+                return;
+
+            var FormBoatConfig = new FormBoatConfig();
+            FormBoatConfig.AddEvent(AddBoat);
+            FormBoatConfig.Show();
+        }
+
+        private void AddBoat(DrawningBoat drawningBoat)
+        {
+            if (listBoxStorages.SelectedIndex == -1)
+                return;
+
+            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
+
+            if (obj == null)
+                return;
+
+            if (obj + drawningBoat)
+            {
+                MessageBox.Show("Объект добавлен");
+                pictureBoxCollection.Image = obj.ShowBoats();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось добавить объект");
+            }
+        }
+
+        /// <summary>
+        /// Удаление объекта из набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRemoveBoat_Click(object sender, EventArgs e)
+        {
+            if (listBoxStorages.SelectedIndex == -1)
+                return;
+
+            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
+
+            if (obj == null)
+                return;
+
+            if (MessageBox.Show("Удалить объект?", "Удаление",
+                MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            int pos = Convert.ToInt32(maskedTextBoxNumber.Text);
+            if (obj - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBoxCollection.Image = obj.ShowBoats();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+
+        /// <summary>
+        /// Обновление рисунка по набору
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRefreshCollection_Click(object sender, EventArgs e)
+        {
+            if (listBoxStorages.SelectedIndex == -1)
+                return;
+
+            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
+
+            if (obj == null)
+                return;
+
+            pictureBoxCollection.Image = obj.ShowBoats();
+        }
+    }
+}

MotorBoat/MotorBoat/FormBoatCollection.resx

@@ -0,0 +1,60 @@
+<root>
+  <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>

MotorBoat/MotorBoat/FormBoatConfig.Designer.cs

@@ -0,0 +1,393 @@
+namespace MotorBoat
+{
+    partial class FormBoatConfig
+    {
+        /// <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()
+        {
+            groupBox1 = new GroupBox();
+            labelModifiedObject = new Label();
+            labelSimpleObject = new Label();
+            PanelColor = new GroupBox();
+            panelMilky = new Panel();
+            panelRed = new Panel();
+            panel8 = new Panel();
+            panelCherry = new Panel();
+            panelPeach = new Panel();
+            panelGreen = new Panel();
+            panelOrange = new Panel();
+            panelGrey = new Panel();
+            panelBrown = new Panel();
+            checkBoxEngine = new CheckBox();
+            checkBoxGlass = new CheckBox();
+            label2 = new Label();
+            label1 = new Label();
+            numericUpDownWeight = new NumericUpDown();
+            numericUpDownSpeed = new NumericUpDown();
+            buttonAdd = new Button();
+            buttonCancel = new Button();
+            PanelObject = new Panel();
+            labelBodyColor = new Label();
+            labelAdditionalColor = new Label();
+            pictureBoxObject = new PictureBox();
+            groupBox1.SuspendLayout();
+            PanelColor.SuspendLayout();
+            panelRed.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+            PanelObject.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
+            SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            groupBox1.Controls.Add(labelModifiedObject);
+            groupBox1.Controls.Add(labelSimpleObject);
+            groupBox1.Controls.Add(PanelColor);
+            groupBox1.Controls.Add(checkBoxEngine);
+            groupBox1.Controls.Add(checkBoxGlass);
+            groupBox1.Controls.Add(label2);
+            groupBox1.Controls.Add(label1);
+            groupBox1.Controls.Add(numericUpDownWeight);
+            groupBox1.Controls.Add(numericUpDownSpeed);
+            groupBox1.Location = new Point(12, 12);
+            groupBox1.Name = "groupBox1";
+            groupBox1.Size = new Size(499, 264);
+            groupBox1.TabIndex = 1;
+            groupBox1.TabStop = false;
+            groupBox1.Text = "Настройки объекта";
+            // 
+            // labelModifiedObject
+            // 
+            labelModifiedObject.AllowDrop = true;
+            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+            labelModifiedObject.Location = new Point(368, 178);
+            labelModifiedObject.Margin = new Padding(0);
+            labelModifiedObject.Name = "labelModifiedObject";
+            labelModifiedObject.Padding = new Padding(12);
+            labelModifiedObject.Size = new Size(119, 42);
+            labelModifiedObject.TabIndex = 10;
+            labelModifiedObject.Text = "Продвинутый";
+            labelModifiedObject.TextAlign = ContentAlignment.TopCenter;
+            labelModifiedObject.MouseDown += labelSimpleObject_MouseDown;
+            // 
+            // labelSimpleObject
+            // 
+            labelSimpleObject.AllowDrop = true;
+            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+            labelSimpleObject.Location = new Point(242, 178);
+            labelSimpleObject.Name = "labelSimpleObject";
+            labelSimpleObject.Padding = new Padding(12);
+            labelSimpleObject.Size = new Size(120, 42);
+            labelSimpleObject.TabIndex = 9;
+            labelSimpleObject.Text = "Простой";
+            labelSimpleObject.TextAlign = ContentAlignment.TopCenter;
+            labelSimpleObject.MouseDown += labelSimpleObject_MouseDown;
+            // 
+            // PanelColor
+            // 
+            PanelColor.Controls.Add(panelMilky);
+            PanelColor.Controls.Add(panelRed);
+            PanelColor.Controls.Add(panelCherry);
+            PanelColor.Controls.Add(panelPeach);
+            PanelColor.Controls.Add(panelGreen);
+            PanelColor.Controls.Add(panelOrange);
+            PanelColor.Controls.Add(panelGrey);
+            PanelColor.Controls.Add(panelBrown);
+            PanelColor.Location = new Point(242, 22);
+            PanelColor.Name = "PanelColor";
+            PanelColor.Size = new Size(245, 141);
+            PanelColor.TabIndex = 8;
+            PanelColor.TabStop = false;
+            PanelColor.Text = "Выбор цвета";
+            // 
+            // panelMilky
+            // 
+            panelMilky.AllowDrop = true;
+            panelMilky.BackColor = Color.LightGoldenrodYellow;
+            panelMilky.BorderStyle = BorderStyle.FixedSingle;
+            panelMilky.Location = new Point(126, 19);
+            panelMilky.Name = "panelMilky";
+            panelMilky.Size = new Size(50, 50);
+            panelMilky.TabIndex = 7;
+            // 
+            // panelRed
+            // 
+            panelRed.AllowDrop = true;
+            panelRed.BackColor = Color.Firebrick;
+            panelRed.BorderStyle = BorderStyle.FixedSingle;
+            panelRed.Controls.Add(panel8);
+            panelRed.Location = new Point(70, 19);
+            panelRed.Name = "panelRed";
+            panelRed.Size = new Size(50, 50);
+            panelRed.TabIndex = 6;
+            // 
+            // panel8
+            // 
+            panel8.BackColor = Color.FromArgb(255, 255, 192);
+            panel8.Location = new Point(53, 8);
+            panel8.Name = "panel8";
+            panel8.Size = new Size(50, 50);
+            panel8.TabIndex = 7;
+            // 
+            // panelCherry
+            // 
+            panelCherry.AllowDrop = true;
+            panelCherry.BackColor = Color.Maroon;
+            panelCherry.BorderStyle = BorderStyle.FixedSingle;
+            panelCherry.Location = new Point(14, 78);
+            panelCherry.Name = "panelCherry";
+            panelCherry.Size = new Size(50, 50);
+            panelCherry.TabIndex = 5;
+            // 
+            // panelPeach
+            // 
+            panelPeach.AllowDrop = true;
+            panelPeach.BackColor = Color.SandyBrown;
+            panelPeach.BorderStyle = BorderStyle.FixedSingle;
+            panelPeach.Location = new Point(182, 19);
+            panelPeach.Name = "panelPeach";
+            panelPeach.Size = new Size(50, 50);
+            panelPeach.TabIndex = 4;
+            // 
+            // panelGreen
+            // 
+            panelGreen.AllowDrop = true;
+            panelGreen.BackColor = Color.DarkGreen;
+            panelGreen.BorderStyle = BorderStyle.FixedSingle;
+            panelGreen.Location = new Point(70, 78);
+            panelGreen.Name = "panelGreen";
+            panelGreen.Size = new Size(50, 50);
+            panelGreen.TabIndex = 3;
+            // 
+            // panelOrange
+            // 
+            panelOrange.AllowDrop = true;
+            panelOrange.BackColor = Color.Orange;
+            panelOrange.BorderStyle = BorderStyle.FixedSingle;
+            panelOrange.Location = new Point(126, 78);
+            panelOrange.Name = "panelOrange";
+            panelOrange.Size = new Size(50, 50);
+            panelOrange.TabIndex = 2;
+            // 
+            // panelGrey
+            // 
+            panelGrey.AllowDrop = true;
+            panelGrey.BackColor = Color.Silver;
+            panelGrey.BorderStyle = BorderStyle.FixedSingle;
+            panelGrey.Location = new Point(182, 78);
+            panelGrey.Name = "panelGrey";
+            panelGrey.Size = new Size(50, 50);
+            panelGrey.TabIndex = 1;
+            // 
+            // panelBrown
+            // 
+            panelBrown.AllowDrop = true;
+            panelBrown.BackColor = Color.SaddleBrown;
+            panelBrown.BorderStyle = BorderStyle.FixedSingle;
+            panelBrown.Location = new Point(14, 19);
+            panelBrown.Name = "panelBrown";
+            panelBrown.Size = new Size(50, 50);
+            panelBrown.TabIndex = 0;
+            // 
+            // checkBoxEngine
+            // 
+            checkBoxEngine.AutoSize = true;
+            checkBoxEngine.Location = new Point(11, 126);
+            checkBoxEngine.Name = "checkBoxEngine";
+            checkBoxEngine.Size = new Size(225, 19);
+            checkBoxEngine.TabIndex = 7;
+            checkBoxEngine.Text = "Признак наличия защитного стекла";
+            checkBoxEngine.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxGlass
+            // 
+            checkBoxGlass.AutoSize = true;
+            checkBoxGlass.Location = new Point(11, 99);
+            checkBoxGlass.Name = "checkBoxGlass";
+            checkBoxGlass.Size = new Size(180, 19);
+            checkBoxGlass.TabIndex = 6;
+            checkBoxGlass.Text = "Признак наличия двигателя";
+            checkBoxGlass.UseVisualStyleBackColor = true;
+            // 
+            // label2
+            // 
+            label2.AutoSize = true;
+            label2.Location = new Point(11, 51);
+            label2.Name = "label2";
+            label2.Size = new Size(29, 15);
+            label2.TabIndex = 5;
+            label2.Text = "Вес:";
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new Point(8, 24);
+            label1.Name = "label1";
+            label1.Size = new Size(62, 15);
+            label1.TabIndex = 4;
+            label1.Text = "Скорость:";
+            // 
+            // numericUpDownWeight
+            // 
+            numericUpDownWeight.Location = new Point(74, 51);
+            numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownWeight.Name = "numericUpDownWeight";
+            numericUpDownWeight.Size = new Size(120, 23);
+            numericUpDownWeight.TabIndex = 3;
+            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // numericUpDownSpeed
+            // 
+            numericUpDownSpeed.Location = new Point(74, 22);
+            numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownSpeed.Name = "numericUpDownSpeed";
+            numericUpDownSpeed.Size = new Size(120, 23);
+            numericUpDownSpeed.TabIndex = 2;
+            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(544, 230);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(112, 46);
+            buttonAdd.TabIndex = 13;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += buttonAdd_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(661, 230);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(111, 46);
+            buttonCancel.TabIndex = 14;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // PanelObject
+            // 
+            PanelObject.AllowDrop = true;
+            PanelObject.Controls.Add(labelBodyColor);
+            PanelObject.Controls.Add(labelAdditionalColor);
+            PanelObject.Controls.Add(pictureBoxObject);
+            PanelObject.Location = new Point(527, 16);
+            PanelObject.Name = "PanelObject";
+            PanelObject.Size = new Size(259, 208);
+            PanelObject.TabIndex = 15;
+            PanelObject.DragDrop += labelObject_DragDrop;
+            PanelObject.DragEnter += labelObject_DragEnter;
+            // 
+            // labelBodyColor
+            // 
+            labelBodyColor.AllowDrop = true;
+            labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
+            labelBodyColor.Location = new Point(16, 5);
+            labelBodyColor.Margin = new Padding(0);
+            labelBodyColor.Name = "labelBodyColor";
+            labelBodyColor.Padding = new Padding(12);
+            labelBodyColor.Size = new Size(112, 48);
+            labelBodyColor.TabIndex = 14;
+            labelBodyColor.Text = "Цвет";
+            labelBodyColor.TextAlign = ContentAlignment.TopCenter;
+            labelBodyColor.DragDrop += labelBodyColor_DragDrop;
+            labelBodyColor.DragEnter += labelColor_DragEnter;
+            // 
+            // labelAdditionalColor
+            // 
+            labelAdditionalColor.AllowDrop = true;
+            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+            labelAdditionalColor.Location = new Point(133, 5);
+            labelAdditionalColor.Margin = new Padding(0);
+            labelAdditionalColor.Name = "labelAdditionalColor";
+            labelAdditionalColor.Padding = new Padding(12);
+            labelAdditionalColor.Size = new Size(112, 48);
+            labelAdditionalColor.TabIndex = 13;
+            labelAdditionalColor.Text = "Доп. цвет";
+            labelAdditionalColor.TextAlign = ContentAlignment.TopCenter;
+            labelAdditionalColor.DragDrop += labelAdditionalColor_DragDrop;
+            labelAdditionalColor.DragEnter += labelColor_DragEnter;
+            // 
+            // pictureBoxObject
+            // 
+            pictureBoxObject.Location = new Point(16, 61);
+            pictureBoxObject.Name = "pictureBoxObject";
+            pictureBoxObject.Size = new Size(229, 137);
+            pictureBoxObject.TabIndex = 4;
+            pictureBoxObject.TabStop = false;
+            // 
+            // FormBoatConfig
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(802, 288);
+            Controls.Add(PanelObject);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonAdd);
+            Controls.Add(groupBox1);
+            Name = "FormBoatConfig";
+            Text = "Создание объекта";
+            groupBox1.ResumeLayout(false);
+            groupBox1.PerformLayout();
+            PanelColor.ResumeLayout(false);
+            panelRed.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
+            PanelObject.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+        private GroupBox groupBox1;
+        private CheckBox checkBoxEngine;
+        private CheckBox checkBoxGlass;
+        private Label label2;
+        private Label label1;
+        private NumericUpDown numericUpDownWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private GroupBox PanelColor;
+        private Panel panelMilky;
+        private Panel panelRed;
+        private Panel panel8;
+        private Panel panelCherry;
+        private Panel panelPeach;
+        private Panel panelGreen;
+        private Panel panelOrange;
+        private Panel panelGrey;
+        private Panel panelBrown;
+        private Label labelModifiedObject;
+        private Label labelSimpleObject;
+        private Button buttonAdd;
+        private Button buttonCancel;
+        private Panel PanelObject;
+        private PictureBox pictureBoxObject;
+        private Label labelBodyColor;
+        private Label labelAdditionalColor;
+    }
+}

MotorBoat/MotorBoat/FormBoatConfig.cs

@@ -0,0 +1,168 @@
+using MotorBoat.DrawningObjects;
+using MotorBoat.Entities;
+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 MotorBoat
+{
+    public partial class FormBoatConfig : Form
+    {
+        /// <summary>
+        /// Переменная-выбранная лодка
+        /// </summary>
+        DrawningBoat? _boat = null;
+
+        /// <summary>
+        /// Событие
+        /// </summary>
+        public event Action<DrawningBoat>? EventAddBoat;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormBoatConfig()
+        {
+            InitializeComponent();
+            panelBrown.MouseDown += PanelColor_MouseDown;
+            panelRed.MouseDown += PanelColor_MouseDown;
+            panelMilky.MouseDown += PanelColor_MouseDown;
+            panelPeach.MouseDown += PanelColor_MouseDown;
+            panelGrey.MouseDown += PanelColor_MouseDown;
+            panelOrange.MouseDown += PanelColor_MouseDown;
+            panelGreen.MouseDown += PanelColor_MouseDown;
+            panelCherry.MouseDown += PanelColor_MouseDown;
+
+            buttonCancel.Click += (s, e) => Close();
+        }
+
+        /// <summary>
+        /// Отрисовать лодку
+        /// </summary>
+        private void DrawBoat()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _boat?.SetPosition(5, 5);
+            _boat?.DrawTransport(gr);
+            pictureBoxObject.Image = bmp;
+        }
+
+        /// <summary>
+        /// Передаем информацию при нажатии на Label
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void labelSimpleObject_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Label)?.DoDragDrop((sender as Label)?.Name, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void labelObject_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data?.GetDataPresent(DataFormats.Text) ?? false)
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        /// <summary>
+        /// Действия при приеме перетаскиваемой информации
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void labelObject_DragDrop(object sender, DragEventArgs e)
+        {
+            switch (e.Data?.GetData(DataFormats.Text).ToString())
+            {
+                case "labelSimpleObject":
+                    _boat = new DrawningBoat((int)numericUpDownSpeed.Value,
+                   (int)numericUpDownWeight.Value, Color.White, pictureBoxObject.Width, pictureBoxObject.Height);
+                    break;
+                case "labelModifiedObject":
+                    _boat = new DrawningMotorBoat((int)numericUpDownSpeed.Value,
+                   (int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxGlass.Checked,
+                   checkBoxEngine.Checked, pictureBoxObject.Width, pictureBoxObject.Height);
+                    break;
+            }
+            DrawBoat();
+        }
+
+        /// <summary>
+        /// Добавление лодки
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelColor_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        /// <summary>
+        /// Добавление события
+        /// </summary>
+        /// <param name="ev">Привязанный метод</param>
+        internal void AddEvent(Action<DrawningBoat> ev)
+        {
+            if (EventAddBoat == null)
+            {
+                EventAddBoat = ev;
+            }
+            else
+            {
+                EventAddBoat += ev;
+            }
+        }
+
+        private void buttonAdd_Click(object sender, EventArgs e)
+        {
+            EventAddBoat?.Invoke(_boat);
+            Close();
+        }
+
+        private void labelBodyColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_boat == null)
+                return;
+            _boat?.EntityBoat?.setBodyColor((Color)e.Data.GetData(typeof(Color)));
+            DrawBoat();
+        }
+
+        private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_boat == null)
+                return;
+            if (!(_boat is DrawningMotorBoat))
+                return;
+            (_boat.EntityBoat as EntityMotorBoat)?.setAdditionalColor(color: (Color)e.Data.GetData(typeof(Color)));
+            DrawBoat();
+        }
+
+        private void labelColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data?.GetDataPresent(typeof(Color)) ?? false)
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/FormBoatConfig.resx

@@ -0,0 +1,60 @@
+<root>
+  <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>

MotorBoat/MotorBoat/FormMotorBoat.Designer.cs

@@ -37,6 +37,7 @@
             ButonCreateMotorBoat = new Button();
             comboBoxStrategy = new ComboBox();
             ButtonStep = new Button();
+            ButtonSelectBoat = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxMotorBoat).BeginInit();
             SuspendLayout();
             // 
@@ -139,11 +140,22 @@
             ButtonStep.UseVisualStyleBackColor = true;
             ButtonStep.Click += ButtonStep_Click;
             // 
+            // ButtonSelectBoat
+            // 
+            ButtonSelectBoat.Location = new Point(366, 412);
+            ButtonSelectBoat.Name = "ButtonSelectBoat";
+            ButtonSelectBoat.Size = new Size(171, 37);
+            ButtonSelectBoat.TabIndex = 9;
+            ButtonSelectBoat.Text = "Выбрать лодку";
+            ButtonSelectBoat.UseVisualStyleBackColor = true;
+            ButtonSelectBoat.Click += ButtonSelectBoat_Click;
+            // 
             // FormMotorBoat
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(884, 461);
+            Controls.Add(ButtonSelectBoat);
             Controls.Add(ButtonStep);
             Controls.Add(comboBoxStrategy);
             Controls.Add(ButonCreateMotorBoat);
@@ -155,7 +167,7 @@
             Controls.Add(pictureBoxMotorBoat);
             Name = "FormMotorBoat";
             StartPosition = FormStartPosition.CenterScreen;
-            Text = "FormMotorBoat";
+            Text = "Моторная лодка";
             ((System.ComponentModel.ISupportInitialize)pictureBoxMotorBoat).EndInit();
             ResumeLayout(false);
             PerformLayout();
@@ -172,5 +184,6 @@
         private Button ButonCreateMotorBoat;
         private ComboBox comboBoxStrategy;
         private Button ButtonStep;
+        private Button ButtonSelectBoat;
     }
 }

MotorBoat/MotorBoat/FormMotorBoat.cs

@@ -23,7 +23,12 @@ namespace MotorBoat
         /// <summary>
         /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
         /// </summary>
-        private AbstractStrategy? _abstractStrategy;
+        private AbstractStrategy? _strategy;
+
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        public DrawningBoat? SelectedBoat { get; private set; }
 
         /// <summary>
         /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
@@ -31,6 +36,8 @@ namespace MotorBoat
         public FormMotorBoat()
         {
             InitializeComponent();
+            _strategy = null;
+            SelectedBoat = null;
         }
 
         /// <summary>
@@ -48,21 +55,6 @@ namespace MotorBoat
             pictureBoxMotorBoat.Image = bmp;
         }
 
-        /// <summary>
-        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            _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)),
-                pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
-            _drawningBoat.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            Draw();
-        }
-
         /// <summary>
         /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
         /// </summary>
@@ -71,15 +63,45 @@ namespace MotorBoat
         private void ButonCreateMotorBoat_Click(object sender, EventArgs e)
         {
             Random random = new();
+            Color bodyColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+            ColorDialog dialog = new ColorDialog();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                bodyColor = dialog.Color;
+            }
+            Color additionalColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                additionalColor = dialog.Color;
+            }
             _drawningBoat = new DrawningMotorBoat(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)),
+                bodyColor, additionalColor,
                 Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)),
                 pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
             _drawningBoat.SetPosition(random.Next(10, 100), random.Next(10, 100));
             Draw();
         }
 
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreate_Click(object sender, EventArgs e)
+        {
+            Random random = new();
+            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;
+            }
+            _drawningBoat = new DrawningBoat(random.Next(100, 300), random.Next(1000, 3000),
+                color, pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
+            _drawningBoat.SetPosition(random.Next(10, 100), random.Next(10, 100));
+            Draw();
+        }
+
         /// <summary>
         /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
         /// </summary>
@@ -123,35 +145,44 @@ namespace MotorBoat
             }
             if (comboBoxStrategy.Enabled)
             {
-                _abstractStrategy = comboBoxStrategy.SelectedIndex
+                _strategy = comboBoxStrategy.SelectedIndex
                 switch
                 {
                     0 => new MoveToCenter(),
                     1 => new MoveToBorder(),
                     _ => null,
                 };
-                if (_abstractStrategy == null)
+                if (_strategy == null)
                 {
                     return;
                 }
-                _abstractStrategy.SetData(new
+                _strategy.SetData(new
                 DrawningObjectBoat(_drawningBoat), pictureBoxMotorBoat.Width,
                 pictureBoxMotorBoat.Height);
                 comboBoxStrategy.Enabled = false;
             }
-            if (_abstractStrategy == null)
+            if (_strategy == null)
             {
                 return;
             }
-            _abstractStrategy.MakeStep();
+            _strategy.MakeStep();
             Draw();
-            if (_abstractStrategy.GetStatus() == Status.Finish)
+            if (_strategy.GetStatus() == Status.Finish)
             {
                 comboBoxStrategy.Enabled = true;
-                _abstractStrategy = null;
+                _strategy = null;
             }
-
         }
 
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <<param name="e"></param>
+        private void ButtonSelectBoat_Click(object sender, EventArgs e)
+        {
+            SelectedBoat = _drawningBoat;
+            DialogResult = DialogResult.OK;
+        }
     }
 }

MotorBoat/MotorBoat/MoveToBorder.cs

@@ -58,4 +58,4 @@ namespace MotorBoat.MovementStrategy
             }
         }
     }
-}
+}

MotorBoat/MotorBoat/Program.cs

@@ -11,7 +11,7 @@ namespace MotorBoat
             // 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());
         }
     }
 }

MotorBoat/MotorBoat/SetGeneric.cs

@@ -0,0 +1,123 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat.Generics
+{
+    /// <summary>
+    /// Параметризованный набор объектов
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class SetGeneric<T>
+        where T : class
+    {
+        /// <summary>
+        /// Список объектов, которые храним
+        /// </summary>
+        private readonly List<T?> _places;
+
+        /// <summary>
+        /// Количество объектов
+        /// </summary>
+        public int Count => _places.Count;
+
+        /// <summary>
+        /// Макс количество объектов в списке
+        /// </summary>
+        private readonly int _maxCount;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="count"></param>
+        public SetGeneric(int count)
+        {
+            _maxCount = count;
+            _places = new List<T?>(count);
+        }
+
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="boat">Добавляемая лодка</param>
+        /// <returns></returns>
+        public bool Insert(T boat)
+        {
+            if (_places.Count == _maxCount)
+            {
+                return false;
+            }
+            Insert(boat, 0);
+            return true;
+        }
+        /// <summary>
+        /// Добавление объекта в набор на конкретную позицию
+        /// </summary>
+        /// <param name="boat">Добавляемая лодка</param>
+        /// <param name="position">Позиция</param>
+        /// <returns></returns>
+        public bool Insert(T boat, int position)
+        {
+            if(!(position >= 0 && position <= Count && _places.Count < _maxCount))
+            {
+                return false;
+            }
+            _places.Insert(position, boat);
+            return true;
+        }
+
+        /// <summary>
+        /// Удаление объекта из набора с конкретной позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public bool Remove(int position)
+        {
+            if (position < 0 || position >= Count) return false;
+            _places.RemoveAt(position);
+            return true;
+        }
+        /// <summary>
+        /// Получение объекта из набора по позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T? this[int position]
+        {
+            get
+            {
+                if (position < 0 || position > _maxCount)
+                    return null;
+                return _places[position];
+            }
+            set
+            {
+                if (!(position >= 0 && position < Count && _places.Count < _maxCount))
+                {
+                    return;
+                }
+                _places.Insert(position, value);
+                return;
+            }
+        }
+
+        /// <summary>
+        /// Проход по списку
+        /// </summary>
+        /// <param name="maxShips"></param>
+        /// <returns></returns>
+        public IEnumerable<T?> GetBoats(int? maxBoats = null)
+        {
+            for (int i = 0; i < _places.Count; ++i)
+            {
+                yield return _places[i];
+                if (maxBoats.HasValue && i == maxBoats.Value)
+                {
+                    yield break;
+                }
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/Status.cs

@@ -15,4 +15,4 @@ namespace MotorBoat.MovementStrategy
         InProgress,
         Finish
     }
-}
+}