Lab05

MotorBoat/MotorBoat/BoatDelegate.cs

@@ -0,0 +1,9 @@
+using MotorBoat.Drawnings;
+namespace MotorBoat
+{
+    /// <summary>
+    /// Делегат передачи объекта класса-прорисовки
+    /// </summary>
+    /// <param name="boat"></param>
+    public delegate void BoatDelegate(DrawningBoat boat);
+}

MotorBoat/MotorBoat/CollectionGenericObjects/CollectionType.cs

@@ -0,0 +1,24 @@
+namespace MotorBoat.CollectionGenericObjects
+{
+    /// <summary>
+    /// Тип коллекции
+    /// </summary>
+    public enum CollectionType
+    {
+        /// <summary>
+        /// Неопределено
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Массив
+        /// </summary>
+        Massive = 1,
+
+        /// <summary>
+        /// Список
+        /// </summary>
+        List = 2
+    }
+}
+

MotorBoat/MotorBoat/CollectionGenericObjects/ListGenericObjects.cs

@@ -0,0 +1,91 @@
+namespace MotorBoat.CollectionGenericObjects
+{
+    /// <summary>
+    /// Параметризованный набор объектов
+    /// </summary>
+    /// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+    public class ListGenericObjects<T> : ICollectionGenericObjects<T>
+        where T : class
+    {
+        /// <summary>
+        /// Список объектов, которые храним
+        /// </summary>
+        private readonly List<T?> _collection;
+
+        /// <summary>
+        /// Максимально допустимое число объектов в списке
+        /// </summary>
+        private int _maxCount;
+
+        public int Count => _collection.Count;
+
+        public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public ListGenericObjects()
+        {
+            _collection = new();
+        }
+
+        ////////////////////////////////////////////////////////////////////////
+        //---------------TODO ПРОВЕРКА ПО ПОЗИЦИИ----------------------------//
+        //---------------TODO НЕ ВЫХОДИТ ЛИ ЗА ГРАНИЦЫ СПИСКА---------------//
+        /// /////////////////////////////////////////////////////////////////
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T? Get(int position)
+        {
+            if (position < 0 || position >= _maxCount)
+            {
+                return null;
+            }
+            return _collection[position];
+        }
+
+        ///////////////////////////////////////////////////////////////
+        //---------------TODO ПРОВЕРКА ВСТАВКИ----------------------//
+        //---------------TODO ВСТАВКА В КОНЕЦ НАБОРА---------------//
+        ////////////////////////////////////////////////////////////
+        public bool Insert(T obj)
+        {
+            if (Count == _maxCount)
+            {
+                return false;
+            }
+            _collection.Add(obj);
+            return true;
+        }
+
+        /////////////////////////////////////////////////////////////////////////////////////////////////
+        //---------------TODO ПРОВЕРКА ВСТАВКИ--------------------------------------------------------//
+        //---------------TODO ОТСУТСТВИЕ ПРЕВЫШЕНИЯ МАКСИМАЛЬНОГО КОЛИЧЕСТВА ЭЛЕМЕНТОВ---------------//
+        //---------------TODO ПРОВЕРКА ПОЗИЦИИ------------------------------------------------------//
+        //---------------TODO ВСТАВКА ПО ПОЗИЦИИ---------------------------------------------------//
+        ////////////////////////////////////////////////////////////////////////////////////////////
+        public bool Insert(T obj, int position)
+        {
+            if (position < 0 || position >= _maxCount || Count == _maxCount)
+            {
+                return false;
+            }
+            _collection.Insert(position, obj);
+            return true;
+        }
+
+        ///////////////////////////////////////////////////////////////////
+        //---------------TODO ПРОВЕРКА ПОЗИЦИИ--------------------------//
+        //---------------TODO УДАЛЕНИЕ ОБЪЕКТА ИЗ СПИСКА---------------//
+        ////////////////////////////////////////////////////////////////
+        public bool Remove(int position)
+        {
+            if (_collection.Count == 0 || position < 0 || position >= _collection.Count)
+            {
+                return false;
+            }
+            _collection.RemoveAt(position);
+            return true;
+        }
+    }
+}

MotorBoat/MotorBoat/CollectionGenericObjects/StorageCollection.cs

@@ -0,0 +1,90 @@
+namespace MotorBoat.CollectionGenericObjects
+{
+    /// <summary>
+    /// Класс-хранилище коллекций
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public class StorageCollection<T>
+        where T : class
+    {
+        /// <summary>
+        /// Словарь (хранилище) с коллекциями
+        /// </summary>
+        readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
+
+        /// <summary>
+        /// Возвращение списка названий коллекций
+        /// </summary>
+        public List<string> Keys => _storages.Keys.ToList();
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public StorageCollection()
+        {
+            _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
+        }
+
+        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        //---------------TODO ПРОВЕРКА ЧТО NAME НЕ ПУСТОЙ - ОТСУТСТВУЕТ ЗАПИСЬ В СЛОВАРЕ С ТАКИМ КЛЮЧОМ---------------//
+        //---------------TODO ЛОГИКА ДЛЯ ДОБАВЛЕНИЯ ЗАВИСИМОСТИ ОТ collectionType СОЗДАЕМ ОБЪЕКТ ЛИБО----------------//
+        //---------------TODO В MassiveGenericObjects ЛИБО в ListGenericObjects-------------------------------------//
+        /////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        /// <summary>
+        /// Добавление коллекции в хранилище
+        /// </summary>
+        /// <param name="name">Название коллекции</param>
+        /// <param name="collectionType">тип коллекции</param>
+        public void AddCollection(string name, CollectionType collectionType)
+        {
+            if (name == null || Keys.Contains(name))
+            {
+                return;
+            }
+            switch (collectionType)
+            {
+                case CollectionType.Massive:
+                    _storages.Add(name, new MassiveGenericObjects<T>());
+                    break;
+                case CollectionType.List:
+                    _storages.Add(name, new ListGenericObjects<T>());
+                    break;
+                case CollectionType.None:
+                    break;
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////////
+        //---------------TODO УДАЛЕНИЕ КОЛЛЕКЦИИ С ПРОВЕРКОЙ НАЛИЧИЯ КЛЮЧА---------------//
+        //////////////////////////////////////////////////////////////////////////////////
+        /// <summary>
+        /// Удаление коллекции
+        /// </summary>
+        /// <param name="name">Название коллекции</param>
+        public void DelCollection(string name)
+        {
+            if (name == null || !Keys.Contains(name))
+            {
+                return;
+            }
+            _storages.Remove(name);
+        }
+
+        ////////////////////////////////////////////////////////////////
+        //---------------TODO ЛОГИКА ПОЛУЧЕНИЯ ОБЪЕКТА---------------//
+        //////////////////////////////////////////////////////////////
+        /// <summary>
+        /// Доступ к коллекции
+        /// </summary>
+        /// <param name="name">Название коллекции</param>
+        /// <returns></returns>
+        public ICollectionGenericObjects<T>? this[string name]
+        {
+            get
+            {
+                return _storages.GetValueOrDefault(name, null);
+            }
+        }
+    }
+}
+

MotorBoat/MotorBoat/Entities/EntityBoat.cs

@@ -37,6 +37,22 @@
             Weight = weight;
             BodyColor = bodyColor;
         }
+
+        //////////////////////////////////////////////////////
+        //---------------Новый основной цвет---------------//
+        ////////////////////////////////////////////////////
+
+        /// <summary>
+        /// Новый основной цвет
+        /// </summary>
+        /// <param name="color"></param>
+        public void ChangeColor(Color color)
+        {
+            BodyColor = color;
+        }
+        //{
+        //    BodyColor = color != null ? color : Color.White;
+        //}
     }
 }
 

MotorBoat/MotorBoat/Entities/EntityMotorBoat.cs

@@ -47,5 +47,21 @@
             Sofa = sofa;
             SportLines = sportLines;
         }
+
+        /////////////////////////////////////////////////////////////
+        //---------------Новый дополнительныйй цвет---------------//
+        ///////////////////////////////////////////////////////////
+
+        /// <summary>
+        /// Новый дополнительный цвет
+        /// </summary>
+        /// <param name="color"></param>
+        public void ChangeAdditionalColor(Color color)
+        {
+            AdditionalColor = color;
+        }
+        //{
+        //    AdditionalColor = color != null ? color : Color.White;
+        //}
     }
 }

MotorBoat/MotorBoat/FormBoatCollection.Designer.cs

@@ -29,26 +29,34 @@
         private void InitializeComponent()
         {
             groupBoxTools = new GroupBox();
+            panelCompanyTools = new Panel();
+            buttonAddBoat = new Button();
             buttonRefresh = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
             buttonGoToCheck = new Button();
             buttonRemoveBoat = new Button();
-            maskedTextBoxPosition = new MaskedTextBox();
-            buttonAddMotorBoat = new Button();
-            buttonAddBoat = new Button();
+            buttonCreateCompany = new Button();
+            panelStorage = new Panel();
+            buttonCollectionDel = new Button();
+            listBoxCollection = new ListBox();
+            buttonCollectionAdd = new Button();
+            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            textBoxCollectionName = new TextBox();
+            labelCollectionName = new Label();
             comboBoxSelectorCompany = new ComboBox();
             pictureBox = new PictureBox();
             groupBoxTools.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
+            panelStorage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
             SuspendLayout();
             // 
             // groupBoxTools
             // 
-            groupBoxTools.Controls.Add(buttonRefresh);
-            groupBoxTools.Controls.Add(buttonGoToCheck);
-            groupBoxTools.Controls.Add(buttonRemoveBoat);
-            groupBoxTools.Controls.Add(maskedTextBoxPosition);
-            groupBoxTools.Controls.Add(buttonAddMotorBoat);
-            groupBoxTools.Controls.Add(buttonAddBoat);
+            groupBoxTools.Controls.Add(panelCompanyTools);
+            groupBoxTools.Controls.Add(buttonCreateCompany);
+            groupBoxTools.Controls.Add(panelStorage);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Dock = DockStyle.Right;
             groupBoxTools.Location = new Point(884, 0);
@@ -58,23 +66,57 @@
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
             // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(buttonAddBoat);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Controls.Add(buttonRemoveBoat);
+            panelCompanyTools.Dock = DockStyle.Bottom;
+            panelCompanyTools.Location = new Point(3, 384);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(194, 174);
+            panelCompanyTools.TabIndex = 9;
+            // 
+            // buttonAddBoat
+            // 
+            buttonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddBoat.Location = new Point(14, 3);
+            buttonAddBoat.Name = "buttonAddBoat";
+            buttonAddBoat.Size = new Size(167, 24);
+            buttonAddBoat.TabIndex = 1;
+            buttonAddBoat.Text = "Добавить лодку";
+            buttonAddBoat.UseVisualStyleBackColor = true;
+            buttonAddBoat.Click += ButtonAddBoat_Click;
+            // 
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(15, 363);
+            buttonRefresh.Location = new Point(14, 147);
             buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(173, 33);
+            buttonRefresh.Size = new Size(167, 21);
             buttonRefresh.TabIndex = 6;
             buttonRefresh.Text = "Обновить";
             buttonRefresh.UseVisualStyleBackColor = true;
             buttonRefresh.Click += buttonRefresh_Click;
             // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            maskedTextBoxPosition.Location = new Point(14, 62);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(167, 23);
+            maskedTextBoxPosition.TabIndex = 3;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
             // buttonGoToCheck
             // 
             buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(15, 278);
+            buttonGoToCheck.Location = new Point(14, 118);
             buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(173, 33);
+            buttonGoToCheck.Size = new Size(167, 23);
             buttonGoToCheck.TabIndex = 5;
             buttonGoToCheck.Text = "Передать на тесты";
             buttonGoToCheck.UseVisualStyleBackColor = true;
@@ -83,45 +125,105 @@
             // buttonRemoveBoat
             // 
             buttonRemoveBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRemoveBoat.Location = new Point(15, 196);
+            buttonRemoveBoat.Location = new Point(14, 91);
             buttonRemoveBoat.Name = "buttonRemoveBoat";
-            buttonRemoveBoat.Size = new Size(173, 33);
+            buttonRemoveBoat.Size = new Size(167, 21);
             buttonRemoveBoat.TabIndex = 4;
             buttonRemoveBoat.Text = "Удалить лодку";
             buttonRemoveBoat.UseVisualStyleBackColor = true;
             buttonRemoveBoat.Click += ButtonRemoveBoat_Click;
             // 
-            // maskedTextBoxPosition
+            // buttonCreateCompany
             // 
-            maskedTextBoxPosition.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            maskedTextBoxPosition.Location = new Point(15, 167);
-            maskedTextBoxPosition.Mask = "00";
-            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            maskedTextBoxPosition.Size = new Size(173, 23);
-            maskedTextBoxPosition.TabIndex = 3;
-            maskedTextBoxPosition.ValidatingType = typeof(int);
+            buttonCreateCompany.Location = new Point(15, 303);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(173, 23);
+            buttonCreateCompany.TabIndex = 8;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += ButtonCreateCompany_Click;
             // 
-            // buttonAddMotorBoat
+            // panelStorage
             // 
-            buttonAddMotorBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddMotorBoat.Location = new Point(15, 88);
-            buttonAddMotorBoat.Name = "buttonAddMotorBoat";
-            buttonAddMotorBoat.Size = new Size(173, 33);
-            buttonAddMotorBoat.TabIndex = 2;
-            buttonAddMotorBoat.Text = "Добавить спортивную лодку";
-            buttonAddMotorBoat.UseVisualStyleBackColor = true;
-            buttonAddMotorBoat.Click += ButtonAddMotorBoat_Click;
+            panelStorage.Controls.Add(buttonCollectionDel);
+            panelStorage.Controls.Add(listBoxCollection);
+            panelStorage.Controls.Add(buttonCollectionAdd);
+            panelStorage.Controls.Add(radioButtonList);
+            panelStorage.Controls.Add(radioButtonMassive);
+            panelStorage.Controls.Add(textBoxCollectionName);
+            panelStorage.Controls.Add(labelCollectionName);
+            panelStorage.Dock = DockStyle.Top;
+            panelStorage.Location = new Point(3, 19);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(194, 249);
+            panelStorage.TabIndex = 7;
             // 
-            // buttonAddBoat
+            // buttonCollectionDel
             // 
-            buttonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddBoat.Location = new Point(15, 51);
-            buttonAddBoat.Name = "buttonAddBoat";
-            buttonAddBoat.Size = new Size(173, 31);
-            buttonAddBoat.TabIndex = 1;
-            buttonAddBoat.Text = "Добавить обычную лодку";
-            buttonAddBoat.UseVisualStyleBackColor = true;
-            buttonAddBoat.Click += ButtonAddBoat_Click;
+            buttonCollectionDel.Location = new Point(12, 219);
+            buttonCollectionDel.Name = "buttonCollectionDel";
+            buttonCollectionDel.Size = new Size(173, 23);
+            buttonCollectionDel.TabIndex = 6;
+            buttonCollectionDel.Text = "Удалить коллекцию";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += ButtonCollectionDel_Click;
+            // 
+            // listBoxCollection
+            // 
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.ItemHeight = 15;
+            listBoxCollection.Location = new Point(12, 119);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(173, 94);
+            listBoxCollection.TabIndex = 5;
+            // 
+            // buttonCollectionAdd
+            // 
+            buttonCollectionAdd.Location = new Point(12, 86);
+            buttonCollectionAdd.Name = "buttonCollectionAdd";
+            buttonCollectionAdd.Size = new Size(173, 23);
+            buttonCollectionAdd.TabIndex = 4;
+            buttonCollectionAdd.Text = "Добавить коллекцию";
+            buttonCollectionAdd.UseVisualStyleBackColor = true;
+            buttonCollectionAdd.Click += ButtonCollectionAdd_Click;
+            // 
+            // radioButtonList
+            // 
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(119, 61);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(66, 19);
+            radioButtonList.TabIndex = 3;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonMassive
+            // 
+            radioButtonMassive.AutoSize = true;
+            radioButtonMassive.Location = new Point(16, 61);
+            radioButtonMassive.Name = "radioButtonMassive";
+            radioButtonMassive.Size = new Size(67, 19);
+            radioButtonMassive.TabIndex = 2;
+            radioButtonMassive.TabStop = true;
+            radioButtonMassive.Text = "Массив";
+            radioButtonMassive.UseVisualStyleBackColor = true;
+            // 
+            // textBoxCollectionName
+            // 
+            textBoxCollectionName.Location = new Point(12, 27);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(173, 23);
+            textBoxCollectionName.TabIndex = 1;
+            // 
+            // labelCollectionName
+            // 
+            labelCollectionName.AutoSize = true;
+            labelCollectionName.Location = new Point(35, 9);
+            labelCollectionName.Name = "labelCollectionName";
+            labelCollectionName.Size = new Size(125, 15);
+            labelCollectionName.TabIndex = 0;
+            labelCollectionName.Text = "Название коллекции:";
             // 
             // comboBoxSelectorCompany
             // 
@@ -129,7 +231,7 @@
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(15, 22);
+            comboBoxSelectorCompany.Location = new Point(15, 274);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
             comboBoxSelectorCompany.Size = new Size(173, 23);
             comboBoxSelectorCompany.TabIndex = 0;
@@ -138,6 +240,7 @@
             // pictureBox
             // 
             pictureBox.Dock = DockStyle.Fill;
+            pictureBox.Enabled = false;
             pictureBox.Location = new Point(0, 0);
             pictureBox.Name = "pictureBox";
             pictureBox.Size = new Size(884, 561);
@@ -154,7 +257,10 @@
             Name = "FormBoatCollection";
             Text = "Коллекция лодок";
             groupBoxTools.ResumeLayout(false);
-            groupBoxTools.PerformLayout();
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
             ResumeLayout(false);
         }
@@ -164,11 +270,20 @@
         private GroupBox groupBoxTools;
         private Button buttonAddBoat;
         private ComboBox comboBoxSelectorCompany;
-        private Button buttonAddMotorBoat;
         private Button buttonRemoveBoat;
         private MaskedTextBox maskedTextBoxPosition;
         private PictureBox pictureBox;
         private Button buttonRefresh;
         private Button buttonGoToCheck;
+        private Panel panelStorage;
+        private RadioButton radioButtonList;
+        private RadioButton radioButtonMassive;
+        private TextBox textBoxCollectionName;
+        private Label labelCollectionName;
+        private Button buttonCreateCompany;
+        private Button buttonCollectionDel;
+        private ListBox listBoxCollection;
+        private Button buttonCollectionAdd;
+        private Panel panelCompanyTools;
     }
 }

MotorBoat/MotorBoat/FormBoatCollection.cs

@@ -17,6 +17,11 @@ namespace MotorBoat
     /// </summary>
     public partial class FormBoatCollection : Form
     {
+        /// <summary>
+        /// Хранилише коллекций
+        /// </summary>
+        private readonly StorageCollection<DrawningBoat> _storageCollection;
+
         /// <summary>
         /// Компания
         /// </summary>
@@ -28,6 +33,7 @@ namespace MotorBoat
         public FormBoatCollection()
         {
             InitializeComponent();
+            _storageCollection = new();
         }
 
         /// <summary>
@@ -37,13 +43,7 @@ namespace MotorBoat
         /// <param name="e"></param>
         private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
         {
-            switch (comboBoxSelectorCompany.Text)
-            {
-                case "Хранилище":
-                    _company = new BoatSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningBoat>());
-                    break;
-            }
-
+            panelCompanyTools.Enabled = false;
         }
 
         /// <summary>
@@ -51,45 +51,32 @@ namespace MotorBoat
         /// </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 ButtonAddMotorBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMotorBoat));
-
-        /// <summary>
-        /// Создание объекта класса-перемещения
-        /// </summary>
-        /// <param name="type">Тип создаваемого объекта</param>
-        private void CreateObject(string type)
+        private void ButtonAddBoat_Click(object sender, EventArgs e)
         {
-            if (_company == null)
+            FormBoatConfig form = new();
+
+            //33 минута
+            //////////////////////////////////////////////////////////////////
+            //---------------передать метод в FormBoatConfig---------------//
+            ////////////////////////////////////////////////////////////////
+            
+            form.AddEvent(SetBoat);
+
+            form.Show();
+        }
+
+        /// <summary>
+        /// Добавление автомобиля в коллекцию
+        /// </summary>
+        /// <param name="boat"></param>
+        private void SetBoat(DrawningBoat? boat)
+        {
+            if (_company == null || boat == 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(DrawningMotorBoat):
-                    drawningBoat = new DrawningMotorBoat(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)
+            if (_company + boat)
             {
                 MessageBox.Show("Объект добавлен");
                 pictureBox.Image = _company.Show();
@@ -100,23 +87,6 @@ namespace MotorBoat
             }
         }
 
-        /// <summary>
-        /// Получение цвета
-        /// </summary>
-        /// <param name="random">Генератор случайных чисел</param>
-        /// <returns></returns>
-        private static Color GetColor(Random random)
-        {
-            Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-
-            return color;
-        }
-
         /// <summary>
         /// Удаление объекта
         /// </summary>
@@ -149,32 +119,32 @@ namespace MotorBoat
         private void buttonGoToCheck_Click(object sender, EventArgs e)
         {
             if (_company == null)
-		{
-			return;
-		}
+            {
+                return;
+            }
 
-		DrawningBoat? boat = null;
-		int counter = 100;
-		while (boat == null)
-		{
-			boat = _company.GetRandomObject();
-			counter--;
-			if (counter <= 0)
-			{
-				break;
-			}
-		}
+            DrawningBoat? boat = null;
+            int counter = 100;
+            while (boat == null)
+            {
+                boat = _company.GetRandomObject();
+                counter--;
+                if (counter <= 0)
+                {
+                    break;
+                }
+            }
 
-		if (boat == null)
-		{
-			return;
-		}
+            if (boat == null)
+            {
+                return;
+            }
 
-		FormMotorBoat form = new()
-		{
-			SetBoat = boat
-		};
-		form.ShowDialog();
+            FormMotorBoat form = new()
+            {
+                SetBoat = boat
+            };
+            form.ShowDialog();
         }
 
         private void buttonRefresh_Click(object sender, EventArgs e)
@@ -186,5 +156,100 @@ namespace MotorBoat
 
             pictureBox.Image = _company.Show();
         }
+
+        /// <summary>
+        /// Добавление коллекции
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCollectionAdd_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
+            CollectionType collectionType = CollectionType.None;
+            if (radioButtonMassive.Checked)
+            {
+                collectionType = CollectionType.Massive;
+            }
+            else if (radioButtonList.Checked)
+            {
+                collectionType = CollectionType.List;
+            }
+
+            _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+            RerfreshListBoxItems();
+        }
+
+        /// <summary>
+        /// Удаление коллекции
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCollectionDel_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+            {
+                MessageBox.Show("Коллекция не выбрана", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+            {
+                return;
+            }
+            _storageCollection.DelCollection(textBoxCollectionName.Text);
+            RerfreshListBoxItems();
+        }
+
+        /// <summary>
+        /// Обновление списка в listBoxCollection
+        /// </summary>
+        private void RerfreshListBoxItems()
+        {
+            listBoxCollection.Items.Clear();
+            for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
+            {
+                string? colName = _storageCollection.Keys?[i];
+                if (!string.IsNullOrEmpty(colName))
+                {
+                    listBoxCollection.Items.Add(colName);
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// Создание компании
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreateCompany_Click(object sender, EventArgs e)
+        {
+            if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+            {
+                MessageBox.Show("Коллекция не выбрана");
+                return;
+            }
+
+            ICollectionGenericObjects<DrawningBoat>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+            if (collection == null)
+            {
+                MessageBox.Show("Коллекция не проинициализирована");
+                return;
+            }
+
+            switch (comboBoxSelectorCompany.Text)
+            {
+                case "Хранилище":
+                    _company = new BoatSharingService(pictureBox.Width, pictureBox.Height, collection);
+                    break;
+            }
+
+            panelCompanyTools.Enabled = true;
+            RerfreshListBoxItems();
+        }
     }
 }

MotorBoat/MotorBoat/FormBoatConfig.Designer.cs

@@ -0,0 +1,375 @@
+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()
+        {
+            groupBoxConfig = new GroupBox();
+            groupBoxColors = new GroupBox();
+            panelPurple = new Panel();
+            panelBlack = new Panel();
+            panelGray = new Panel();
+            panelWhite = new Panel();
+            panelYellow = new Panel();
+            panelBlue = new Panel();
+            panelGreen = new Panel();
+            panelRed = new Panel();
+            checkBoxSportLines = new CheckBox();
+            checkBoxSofa = new CheckBox();
+            checkBoxAddTwoMotors = new CheckBox();
+            numericUpDownWeight = new NumericUpDown();
+            labelWeight = new Label();
+            numericUpDownSpeed = new NumericUpDown();
+            labelSpeed = new Label();
+            labelModifiedObject = new Label();
+            labelSimpleObject = new Label();
+            pictureBoxObject = new PictureBox();
+            buttonAdd = new Button();
+            buttonCancel = new Button();
+            panelObject = new Panel();
+            labelAdditionalColor = new Label();
+            labelBodyColor = new Label();
+            groupBoxConfig.SuspendLayout();
+            groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
+            panelObject.SuspendLayout();
+            SuspendLayout();
+            // 
+            // groupBoxConfig
+            // 
+            groupBoxConfig.Controls.Add(groupBoxColors);
+            groupBoxConfig.Controls.Add(checkBoxSportLines);
+            groupBoxConfig.Controls.Add(checkBoxSofa);
+            groupBoxConfig.Controls.Add(checkBoxAddTwoMotors);
+            groupBoxConfig.Controls.Add(numericUpDownWeight);
+            groupBoxConfig.Controls.Add(labelWeight);
+            groupBoxConfig.Controls.Add(numericUpDownSpeed);
+            groupBoxConfig.Controls.Add(labelSpeed);
+            groupBoxConfig.Controls.Add(labelModifiedObject);
+            groupBoxConfig.Controls.Add(labelSimpleObject);
+            groupBoxConfig.Dock = DockStyle.Left;
+            groupBoxConfig.Location = new Point(0, 0);
+            groupBoxConfig.Name = "groupBoxConfig";
+            groupBoxConfig.Size = new Size(370, 206);
+            groupBoxConfig.TabIndex = 0;
+            groupBoxConfig.TabStop = false;
+            groupBoxConfig.Text = "Параметры";
+            // 
+            // groupBoxColors
+            // 
+            groupBoxColors.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            groupBoxColors.Controls.Add(panelPurple);
+            groupBoxColors.Controls.Add(panelBlack);
+            groupBoxColors.Controls.Add(panelGray);
+            groupBoxColors.Controls.Add(panelWhite);
+            groupBoxColors.Controls.Add(panelYellow);
+            groupBoxColors.Controls.Add(panelBlue);
+            groupBoxColors.Controls.Add(panelGreen);
+            groupBoxColors.Controls.Add(panelRed);
+            groupBoxColors.Location = new Point(173, 35);
+            groupBoxColors.Name = "groupBoxColors";
+            groupBoxColors.Size = new Size(191, 122);
+            groupBoxColors.TabIndex = 9;
+            groupBoxColors.TabStop = false;
+            groupBoxColors.Text = "Цвета";
+            // 
+            // panelPurple
+            // 
+            panelPurple.BackColor = Color.Purple;
+            panelPurple.Location = new Point(144, 74);
+            panelPurple.Name = "panelPurple";
+            panelPurple.Size = new Size(40, 40);
+            panelPurple.TabIndex = 9;
+            // 
+            // panelBlack
+            // 
+            panelBlack.BackColor = Color.Black;
+            panelBlack.Location = new Point(98, 74);
+            panelBlack.Name = "panelBlack";
+            panelBlack.Size = new Size(40, 40);
+            panelBlack.TabIndex = 8;
+            // 
+            // panelGray
+            // 
+            panelGray.BackColor = Color.Gray;
+            panelGray.Location = new Point(52, 74);
+            panelGray.Name = "panelGray";
+            panelGray.Size = new Size(40, 40);
+            panelGray.TabIndex = 7;
+            // 
+            // panelWhite
+            // 
+            panelWhite.BackColor = Color.White;
+            panelWhite.Location = new Point(6, 74);
+            panelWhite.Name = "panelWhite";
+            panelWhite.Size = new Size(40, 40);
+            panelWhite.TabIndex = 6;
+            // 
+            // panelYellow
+            // 
+            panelYellow.BackColor = Color.Yellow;
+            panelYellow.Location = new Point(144, 28);
+            panelYellow.Name = "panelYellow";
+            panelYellow.Size = new Size(40, 40);
+            panelYellow.TabIndex = 5;
+            // 
+            // panelBlue
+            // 
+            panelBlue.BackColor = Color.Blue;
+            panelBlue.Location = new Point(98, 28);
+            panelBlue.Name = "panelBlue";
+            panelBlue.Size = new Size(40, 40);
+            panelBlue.TabIndex = 4;
+            // 
+            // panelGreen
+            // 
+            panelGreen.BackColor = Color.Green;
+            panelGreen.Location = new Point(52, 28);
+            panelGreen.Name = "panelGreen";
+            panelGreen.Size = new Size(40, 40);
+            panelGreen.TabIndex = 2;
+            // 
+            // panelRed
+            // 
+            panelRed.BackColor = Color.Red;
+            panelRed.Location = new Point(6, 28);
+            panelRed.Name = "panelRed";
+            panelRed.Size = new Size(40, 40);
+            panelRed.TabIndex = 1;
+            // 
+            // checkBoxSportLines
+            // 
+            checkBoxSportLines.AutoSize = true;
+            checkBoxSportLines.Location = new Point(6, 168);
+            checkBoxSportLines.Name = "checkBoxSportLines";
+            checkBoxSportLines.Size = new Size(121, 19);
+            checkBoxSportLines.TabIndex = 8;
+            checkBoxSportLines.Text = "Наличие 2 полос";
+            checkBoxSportLines.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxSofa
+            // 
+            checkBoxSofa.AutoSize = true;
+            checkBoxSofa.Location = new Point(6, 143);
+            checkBoxSofa.Name = "checkBoxSofa";
+            checkBoxSofa.Size = new Size(116, 19);
+            checkBoxSofa.TabIndex = 7;
+            checkBoxSofa.Text = "Наличие дивана";
+            checkBoxSofa.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxAddTwoMotors
+            // 
+            checkBoxAddTwoMotors.AutoSize = true;
+            checkBoxAddTwoMotors.Location = new Point(6, 118);
+            checkBoxAddTwoMotors.Name = "checkBoxAddTwoMotors";
+            checkBoxAddTwoMotors.Size = new Size(116, 19);
+            checkBoxAddTwoMotors.TabIndex = 6;
+            checkBoxAddTwoMotors.Text = "Два доп. мотора";
+            checkBoxAddTwoMotors.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            numericUpDownWeight.Location = new Point(74, 76);
+            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(72, 23);
+            numericUpDownWeight.TabIndex = 5;
+            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelWeight
+            // 
+            labelWeight.AutoSize = true;
+            labelWeight.Location = new Point(6, 78);
+            labelWeight.Name = "labelWeight";
+            labelWeight.Size = new Size(29, 15);
+            labelWeight.TabIndex = 4;
+            labelWeight.Text = "Вес:";
+            // 
+            // numericUpDownSpeed
+            // 
+            numericUpDownSpeed.Location = new Point(74, 35);
+            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(72, 23);
+            numericUpDownSpeed.TabIndex = 3;
+            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelSpeed
+            // 
+            labelSpeed.AutoSize = true;
+            labelSpeed.Location = new Point(6, 37);
+            labelSpeed.Name = "labelSpeed";
+            labelSpeed.Size = new Size(62, 15);
+            labelSpeed.TabIndex = 2;
+            labelSpeed.Text = "Скорость:";
+            // 
+            // labelModifiedObject
+            // 
+            labelModifiedObject.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+            labelModifiedObject.Location = new Point(271, 164);
+            labelModifiedObject.Name = "labelModifiedObject";
+            labelModifiedObject.Size = new Size(93, 33);
+            labelModifiedObject.TabIndex = 1;
+            labelModifiedObject.Text = "Продвинутый";
+            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelModifiedObject.MouseDown += LabelObject_MouseDown;
+            // 
+            // labelSimpleObject
+            // 
+            labelSimpleObject.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+            labelSimpleObject.Location = new Point(173, 164);
+            labelSimpleObject.Name = "labelSimpleObject";
+            labelSimpleObject.Size = new Size(92, 33);
+            labelSimpleObject.TabIndex = 0;
+            labelSimpleObject.Text = "Простой";
+            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelSimpleObject.MouseDown += LabelObject_MouseDown;
+            // 
+            // pictureBoxObject
+            // 
+            pictureBoxObject.Location = new Point(15, 60);
+            pictureBoxObject.Name = "pictureBoxObject";
+            pictureBoxObject.Size = new Size(184, 102);
+            pictureBoxObject.TabIndex = 1;
+            pictureBoxObject.TabStop = false;
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(376, 174);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(75, 23);
+            buttonAdd.TabIndex = 2;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += ButtonAdd_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(497, 174);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(75, 23);
+            buttonCancel.TabIndex = 3;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // panelObject
+            // 
+            panelObject.AllowDrop = true;
+            panelObject.Controls.Add(labelAdditionalColor);
+            panelObject.Controls.Add(labelBodyColor);
+            panelObject.Controls.Add(pictureBoxObject);
+            panelObject.Location = new Point(376, 3);
+            panelObject.Name = "panelObject";
+            panelObject.Size = new Size(202, 165);
+            panelObject.TabIndex = 4;
+            panelObject.DragDrop += PanelObject_DragDrop;
+            panelObject.DragEnter += PanelObject_DragEnter;
+            // 
+            // labelAdditionalColor
+            // 
+            labelAdditionalColor.AllowDrop = true;
+            labelAdditionalColor.AutoSize = true;
+            labelAdditionalColor.Image = Properties.Resources.White;
+            labelAdditionalColor.Location = new Point(137, 9);
+            labelAdditionalColor.Name = "labelAdditionalColor";
+            labelAdditionalColor.Size = new Size(59, 15);
+            labelAdditionalColor.TabIndex = 3;
+            labelAdditionalColor.Text = "Доп. цвет";
+            labelAdditionalColor.DragDrop += LabelColor_DragDrop;
+            labelAdditionalColor.DragEnter += LabelColor_DragEnter;
+            // 
+            // labelBodyColor
+            // 
+            labelBodyColor.AllowDrop = true;
+            labelBodyColor.AutoSize = true;
+            labelBodyColor.BackColor = SystemColors.Control;
+            labelBodyColor.Image = Properties.Resources.White;
+            labelBodyColor.Location = new Point(3, 9);
+            labelBodyColor.Name = "labelBodyColor";
+            labelBodyColor.Size = new Size(81, 15);
+            labelBodyColor.TabIndex = 2;
+            labelBodyColor.Text = "Базовый цвет";
+            labelBodyColor.DragDrop += LabelColor_DragDrop;
+            labelBodyColor.DragEnter += LabelColor_DragEnter;
+            // 
+            // FormBoatConfig
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(584, 206);
+            Controls.Add(panelObject);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonAdd);
+            Controls.Add(groupBoxConfig);
+            Name = "FormBoatConfig";
+            Text = "Создание объекта";
+            groupBoxConfig.ResumeLayout(false);
+            groupBoxConfig.PerformLayout();
+            groupBoxColors.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
+            panelObject.ResumeLayout(false);
+            panelObject.PerformLayout();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxConfig;
+        private Label labelSimpleObject;
+        private NumericUpDown numericUpDownSpeed;
+        private Label labelSpeed;
+        private Label labelModifiedObject;
+        private NumericUpDown numericUpDownWeight;
+        private Label labelWeight;
+        private CheckBox checkBoxAddTwoMotors;
+        private CheckBox checkBoxSofa;
+        private CheckBox checkBoxSportLines;
+        private GroupBox groupBoxColors;
+        private Panel panelYellow;
+        private Panel panelBlue;
+        private Panel panelGreen;
+        private Panel panelRed;
+        private Panel panelPurple;
+        private Panel panelBlack;
+        private Panel panelGray;
+        private Panel panelWhite;
+        private PictureBox pictureBoxObject;
+        private Button buttonAdd;
+        private Button buttonCancel;
+        private Panel panelObject;
+        private Label labelBodyColor;
+        private Label labelAdditionalColor;
+    }
+}

MotorBoat/MotorBoat/FormBoatConfig.cs

@@ -0,0 +1,223 @@
+using MotorBoat.Drawnings;
+using MotorBoat.Entities;
+
+namespace MotorBoat
+{
+    /// <summary>
+    /// Форма конфигурации объекта
+    /// </summary>
+    public partial class FormBoatConfig : Form
+    {
+        /// <summary>
+        /// Объект - прорисовка лодки
+        /// </summary>
+        private DrawningBoat _boat;
+
+        /// <summary>
+        /// Событие для передачи объекта
+        /// </summary>
+        private event BoatDelegate? BoatDelegate;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormBoatConfig()
+        {
+            InitializeComponent();
+
+            panelRed.MouseDown += Panel_MouseDown;
+            panelGreen.MouseDown += Panel_MouseDown;
+            panelBlue.MouseDown += Panel_MouseDown;
+            panelYellow.MouseDown += Panel_MouseDown;
+            panelWhite.MouseDown += Panel_MouseDown;
+            panelGray.MouseDown += Panel_MouseDown;
+            panelBlack.MouseDown += Panel_MouseDown;
+            panelPurple.MouseDown += Panel_MouseDown;
+
+            //////////////////////////////////////////////////////////////////////////////////////////////////////////////
+            //---------------buttonCancel.Click привязать анонимный метод через lambda с закрытием формы---------------//
+            ////////////////////////////////////////////////////////////////////////////////////////////////////////////
+            
+            buttonCancel.Click += (sender, e) => Close();
+
+        }
+
+        /// <summary>
+        /// Привязка внешнего метода к событию
+        /// </summary>
+        /// <param name="boatDelegate"></param>
+        public void AddEvent(BoatDelegate boatDelegate)
+        {
+            BoatDelegate += boatDelegate;
+        }
+
+        //public void AddEvent(Action<DrawningBoat> ev)
+        //{
+        //    if (EventAddMotorBoat == null)
+        //    {
+        //        EventAddMotorBoat = new Action<DrawingBoat>(ev);
+        //    }
+        //    else
+        //    {
+        //        EventAddMotorBoat += ev;
+        //    }
+        //}
+
+        /// <summary>
+        /// Прорисовка объекта
+        /// </summary>
+        private void DrawObject()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _boat?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
+            _boat?.SetPosition(5, 5);
+            _boat?.DrawTransport(gr);
+            pictureBoxObject.Image = bmp;
+        }
+
+        /// <summary>
+        /// Передаем информацию при нажатии на Label
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelObject_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Label)?.DoDragDrop((sender as Label)?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelObject_DragEnter(object sender, DragEventArgs e)
+        {
+            e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
+        }
+
+        /// <summary>
+        /// Действия при приеме перетаскиваемой информации
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelObject_DragDrop(object sender, DragEventArgs e)
+        {
+            switch (e.Data?.GetData(DataFormats.Text)?.ToString())
+            {
+                case "labelSimpleObject":
+                    _boat = new DrawningBoat((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White);
+                    break;
+                case "labelModifiedObject":
+                    _boat = new DrawningMotorBoat((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White,
+                        Color.Black, checkBoxAddTwoMotors.Checked, checkBoxSofa.Checked, checkBoxSportLines.Checked);
+                    break;
+            }
+            DrawObject();
+        }
+
+        /// <summary>
+        /// Передаем информацию при нажатии на Panel
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Panel_MouseDown(object? sender, MouseEventArgs e)
+        {
+
+            //22/25 минута
+            /////////////////////////////////////////////////////////////
+            //---------------отправка цвета в Drag&Drop---------------//
+            ///////////////////////////////////////////////////////////
+
+            (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor ?? Color.White, DragDropEffects.Move | DragDropEffects.Copy);
+
+            //if (sender is Panel panel)
+            //{
+            //    panel.DoDragDrop(panel.BackColor != null ? panel.BackColor : Color.White, DragDropEffects.Move | DragDropEffects.Copy);
+            //}
+            //if (sender is Panel panel)
+            //{
+            //    panel.DoDragDrop(panel.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+            //}
+
+        }
+
+        //22/25 минута
+        //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        //---------------Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта)---------------//
+        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelColor_DragEnter(object sender, DragEventArgs e)
+        {
+            e.Effect = e.Data?.GetDataPresent(typeof(Color)) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
+        }
+        /// <summary>
+        /// Действия при приеме перетаскиваемой информации
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_boat == null || _boat.EntityBoat == null)
+                return;
+
+            ((Label)sender).BackColor = (Color)e.Data.GetData(typeof(Color));
+
+            switch (((Label)sender).Name)
+            {
+                case "labelBodyColor":
+                    _boat.EntityBoat.ChangeColor((Color)e.Data.GetData(typeof(Color)));
+                    break;
+                case "labelAdditionalColor":
+                    if (_boat is DrawningMotorBoat drawningMotorBoat && _boat.EntityBoat is EntityMotorBoat entityMotorBoat)
+                    {
+                        entityMotorBoat.ChangeAdditionalColor((Color)e.Data?.GetData(typeof(Color)));
+                    }
+                    break;
+            }
+
+            DrawObject();
+        }
+
+        //private void LabelColor_DragDrop(object sender, DragEventArgs e)
+        //{
+        //    if (_boat == null || _boat.EntityBoat == null)
+        //        return;
+
+        //    ((Label)sender).BackColor = (Color)e.Data.GetData(typeof(Color));
+        //    switch (((Label)sender).Name)
+        //    {
+        //        case "labelBodyColor":
+        //            _boat.EntityBoat.ChangeColor((Color)e.Data.GetData(typeof(Color)));
+        //            break;
+        //        case "labelAdditionalColor":
+        //            if (!(_boat is DrawningMotorBoat))
+        //            {
+        //                return;
+        //            }
+        //            ((EntityMotorBoat)_boat.EntityBoat).ChangeAdditionalColor((Color)e.Data?.GetData(typeof(Color)));
+        //            break;
+        //    }
+        //    DrawObject();
+        //}
+
+        /// <summary>
+        /// Передача объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAdd_Click(object sender, EventArgs e)
+        {
+            if (_boat != null)
+            {
+                BoatDelegate?.Invoke(_boat);
+                Close();
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/FormBoatConfig.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

MotorBoat/MotorBoat/Properties/Resources.Designer.cs

@@ -99,5 +99,15 @@ namespace MotorBoat.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap White {
+            get {
+                object obj = ResourceManager.GetObject("White", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }

MotorBoat/MotorBoat/Properties/Resources.resx

@@ -118,16 +118,19 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="down" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\down.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="left" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\left.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="right" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\right.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\down.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="up" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\up.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="White" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\White.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>