Сделанная 7 лабораторная

SailBoat/SailBoat/DrawningObjects/DrawningBoat.cs

@@ -13,9 +13,9 @@ namespace SailBoat.DrawningObjects
     {
         public EntityBoat? EntityBoat { get; protected set; }
 
-        private int _pictureWidth;
+        public int _pictureWidth;
 
-        private int _pictureHeight;
+        public int _pictureHeight;
 
         protected int _startPosX;
 

SailBoat/SailBoat/DrawningObjects/ExtentionDrawningBoat.cs

@@ -0,0 +1,41 @@
+using SailBoat.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SailBoat.DrawningObjects
+{
+    public static class ExtentionDrawningBoat
+    {
+        public static DrawningBoat? CreateDrawningBoat(this string info, char separatorForObject, int width, int height)
+        {
+            string[] strs = info.Split(separatorForObject);
+            if(strs.Length == 3)
+            {
+                return new DrawningBoat(Convert.ToInt32(strs[0]), Convert.ToInt32(strs[1]), Color.FromName(strs[2]), width, height);
+            }
+            if(strs.Length == 6)
+            {
+                return new DrawningSailBoat(Convert.ToInt32(strs[0]), Convert.ToInt32(strs[1]), Color.FromName(strs[2]), Color.FromName(strs[3]), Convert.ToBoolean(strs[4]), Convert.ToBoolean(strs[5]), width, height);
+            }
+            return null;
+        }
+
+        public static string GetDataForSave(this DrawningBoat drawningBoat, char separatorForObject)
+        {
+            var boat = drawningBoat.EntityBoat;
+            if(boat == null)
+            {
+                return string.Empty;
+            }
+            var str = $"{boat.Speed}{separatorForObject}{boat.Weight}{separatorForObject}{boat.BodyColor.Name}";
+            if(boat is not EntitySailBoat sailBoat)
+            {
+                return str;
+            }
+            return $"{str}{separatorForObject}{sailBoat.AdditionalColor.Name}{separatorForObject}{sailBoat.Sail}{separatorForObject}{sailBoat.RainforcedBody}";
+        }
+    }
+}

SailBoat/SailBoat/Entities/EntityBoat.cs

@@ -9,6 +9,11 @@ namespace SailBoat.Entities
     public class EntityBoat
     {
 
+        public void SetBodyColor(Color color)
+        {
+            BodyColor = color;
+        }
+
         public int Speed { get; private set; }
 
         public double Weight { get; private set; }

SailBoat/SailBoat/Entities/EntitySailBoat.cs

@@ -8,6 +8,10 @@ namespace SailBoat.Entities
 {
     public class EntitySailBoat : EntityBoat
     {
+        public void setAdditionalColor(Color color)
+        {
+            AdditionalColor = color;
+        }
         public Color AdditionalColor { get; private set; }
 
         public bool Sail { get; private set; }

SailBoat/SailBoat/Exceptions/BoatNotFoundException.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Runtime.Serialization;
+
+namespace SailBoat.Exceptions
+{
+    [Serializable]
+    internal class BoatNotFoundException : ApplicationException
+    {
+        public BoatNotFoundException(int i) : base($"Не найден объект по позиции {i}") { }
+
+        public BoatNotFoundException() : base() { }
+
+        public BoatNotFoundException(string message) : base(message) { }
+
+        public BoatNotFoundException(string message, Exception exception) : base(message, exception) { }
+
+        protected BoatNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+    }
+}

SailBoat/SailBoat/Exceptions/StorageOverflowException.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SailBoat.Exceptions
+{
+    [Serializable]
+    internal class StorageOverflowException : ApplicationException
+    {
+        public StorageOverflowException(int count) : base($"В наборе превышено допустимое количество: {count}") { }
+
+        public StorageOverflowException() : base() { }
+
+        public StorageOverflowException(string message) : base(message) { }
+
+        public StorageOverflowException(string message, Exception Exception) : base(message, Exception) { }
+
+        protected StorageOverflowException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+    }
+}

SailBoat/SailBoat/FormBoatCollection.Designer.cs

@@ -29,32 +29,96 @@
         private void InitializeComponent()
         {
             tools = new GroupBox();
+            sets = new GroupBox();
+            ButtonDelObject = new Button();
+            listBoxStorages = new ListBox();
+            ButtonAddObject = new Button();
+            textBoxStorageName = new TextBox();
             maskedTextBoxNumber = new MaskedTextBox();
             buttonRefreshCollection = new Button();
             buttonRemoveBoat = new Button();
             buttonAddBoat = new Button();
             pictureBoxCollection = new PictureBox();
+            menuStrip = new MenuStrip();
+            файлToolStripMenuItem = new ToolStripMenuItem();
+            SaveToolStripMenuItem = new ToolStripMenuItem();
+            LoadToolStripMenuItem = new ToolStripMenuItem();
+            openFileDialog = new OpenFileDialog();
+            saveFileDialog = new SaveFileDialog();
             tools.SuspendLayout();
+            sets.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit();
+            menuStrip.SuspendLayout();
             SuspendLayout();
             // 
             // tools
             // 
+            tools.Controls.Add(sets);
             tools.Controls.Add(maskedTextBoxNumber);
             tools.Controls.Add(buttonRefreshCollection);
             tools.Controls.Add(buttonRemoveBoat);
             tools.Controls.Add(buttonAddBoat);
             tools.Dock = DockStyle.Right;
-            tools.Location = new Point(716, 0);
+            tools.Location = new Point(716, 24);
             tools.Name = "tools";
-            tools.Size = new Size(200, 608);
+            tools.Size = new Size(200, 613);
             tools.TabIndex = 0;
             tools.TabStop = false;
             tools.Text = "Инструменты";
             // 
+            // sets
+            // 
+            sets.Controls.Add(ButtonDelObject);
+            sets.Controls.Add(listBoxStorages);
+            sets.Controls.Add(ButtonAddObject);
+            sets.Controls.Add(textBoxStorageName);
+            sets.Location = new Point(6, 22);
+            sets.Name = "sets";
+            sets.Size = new Size(188, 344);
+            sets.TabIndex = 5;
+            sets.TabStop = false;
+            sets.Text = "Наборы";
+            // 
+            // ButtonDelObject
+            // 
+            ButtonDelObject.Location = new Point(6, 263);
+            ButtonDelObject.Name = "ButtonDelObject";
+            ButtonDelObject.Size = new Size(176, 41);
+            ButtonDelObject.TabIndex = 3;
+            ButtonDelObject.Text = "Удалить набор";
+            ButtonDelObject.UseVisualStyleBackColor = true;
+            ButtonDelObject.Click += ButtonDelObject_Click;
+            // 
+            // listBoxStorages
+            // 
+            listBoxStorages.FormattingEnabled = true;
+            listBoxStorages.ItemHeight = 15;
+            listBoxStorages.Location = new Point(6, 148);
+            listBoxStorages.Name = "listBoxStorages";
+            listBoxStorages.Size = new Size(176, 109);
+            listBoxStorages.TabIndex = 2;
+            listBoxStorages.SelectedIndexChanged += listBoxStorages_SelectedIndexChanged;
+            // 
+            // ButtonAddObject
+            // 
+            ButtonAddObject.Location = new Point(6, 39);
+            ButtonAddObject.Name = "ButtonAddObject";
+            ButtonAddObject.Size = new Size(176, 41);
+            ButtonAddObject.TabIndex = 1;
+            ButtonAddObject.Text = "Добавить набор";
+            ButtonAddObject.UseVisualStyleBackColor = true;
+            ButtonAddObject.Click += ButtonAddObject_Click;
+            // 
+            // textBoxStorageName
+            // 
+            textBoxStorageName.Location = new Point(6, 97);
+            textBoxStorageName.Name = "textBoxStorageName";
+            textBoxStorageName.Size = new Size(176, 23);
+            textBoxStorageName.TabIndex = 0;
+            // 
             // maskedTextBoxNumber
             // 
-            maskedTextBoxNumber.Location = new Point(45, 104);
+            maskedTextBoxNumber.Location = new Point(45, 454);
             maskedTextBoxNumber.Mask = "00000";
             maskedTextBoxNumber.Name = "maskedTextBoxNumber";
             maskedTextBoxNumber.Size = new Size(112, 23);
@@ -63,7 +127,7 @@
             // 
             // buttonRefreshCollection
             // 
-            buttonRefreshCollection.Location = new Point(6, 211);
+            buttonRefreshCollection.Location = new Point(6, 545);
             buttonRefreshCollection.Name = "buttonRefreshCollection";
             buttonRefreshCollection.Size = new Size(188, 39);
             buttonRefreshCollection.TabIndex = 3;
@@ -73,7 +137,7 @@
             // 
             // buttonRemoveBoat
             // 
-            buttonRemoveBoat.Location = new Point(6, 133);
+            buttonRemoveBoat.Location = new Point(6, 483);
             buttonRemoveBoat.Name = "buttonRemoveBoat";
             buttonRemoveBoat.Size = new Size(188, 39);
             buttonRemoveBoat.TabIndex = 1;
@@ -83,7 +147,7 @@
             // 
             // buttonAddBoat
             // 
-            buttonAddBoat.Location = new Point(6, 22);
+            buttonAddBoat.Location = new Point(6, 372);
             buttonAddBoat.Name = "buttonAddBoat";
             buttonAddBoat.Size = new Size(188, 39);
             buttonAddBoat.TabIndex = 0;
@@ -93,25 +157,71 @@
             // 
             // pictureBoxCollection
             // 
-            pictureBoxCollection.Location = new Point(0, 0);
+            pictureBoxCollection.Location = new Point(0, 24);
             pictureBoxCollection.Name = "pictureBoxCollection";
-            pictureBoxCollection.Size = new Size(710, 608);
+            pictureBoxCollection.Size = new Size(710, 613);
             pictureBoxCollection.TabIndex = 1;
             pictureBoxCollection.TabStop = false;
             // 
+            // menuStrip
+            // 
+            menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
+            menuStrip.Location = new Point(0, 0);
+            menuStrip.Name = "menuStrip";
+            menuStrip.RenderMode = ToolStripRenderMode.System;
+            menuStrip.Size = new Size(916, 24);
+            menuStrip.TabIndex = 2;
+            menuStrip.Text = "menuStrip";
+            // 
+            // файлToolStripMenuItem
+            // 
+            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { SaveToolStripMenuItem, LoadToolStripMenuItem });
+            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
+            файлToolStripMenuItem.Size = new Size(48, 20);
+            файлToolStripMenuItem.Text = "Файл";
+            // 
+            // SaveToolStripMenuItem
+            // 
+            SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
+            SaveToolStripMenuItem.Size = new Size(180, 22);
+            SaveToolStripMenuItem.Text = "Сохранение";
+            SaveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
+            // 
+            // LoadToolStripMenuItem
+            // 
+            LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
+            LoadToolStripMenuItem.Size = new Size(180, 22);
+            LoadToolStripMenuItem.Text = "Загрузка";
+            LoadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
+            // 
+            // openFileDialog
+            // 
+            openFileDialog.FileName = "openFileDialog";
+            openFileDialog.Filter = "txt file | *.txt";
+            // 
+            // saveFileDialog
+            // 
+            saveFileDialog.Filter = "txt file | *.txt";
+            // 
             // FormBoatCollection
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(916, 608);
+            ClientSize = new Size(916, 637);
             Controls.Add(pictureBoxCollection);
             Controls.Add(tools);
+            Controls.Add(menuStrip);
             Name = "FormBoatCollection";
             Text = "Набор лодок";
             tools.ResumeLayout(false);
             tools.PerformLayout();
+            sets.ResumeLayout(false);
+            sets.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).EndInit();
+            menuStrip.ResumeLayout(false);
+            menuStrip.PerformLayout();
             ResumeLayout(false);
+            PerformLayout();
         }
 
         #endregion
@@ -122,5 +232,16 @@
         private Button buttonRefreshCollection;
         private PictureBox pictureBoxCollection;
         private MaskedTextBox maskedTextBoxNumber;
+        private GroupBox sets;
+        private Button ButtonDelObject;
+        private ListBox listBoxStorages;
+        private Button ButtonAddObject;
+        private TextBox textBoxStorageName;
+        private MenuStrip menuStrip;
+        private ToolStripMenuItem файлToolStripMenuItem;
+        private ToolStripMenuItem SaveToolStripMenuItem;
+        private ToolStripMenuItem LoadToolStripMenuItem;
+        private OpenFileDialog openFileDialog;
+        private SaveFileDialog saveFileDialog;
     }
 }

SailBoat/SailBoat/FormBoatCollection.cs

@@ -10,58 +10,196 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using SailBoat.Exceptions;
+using Microsoft.Extensions.Logging;
+using System.Xml.Linq;
 
 namespace SailBoat
 {
     public partial class FormBoatCollection : Form
     {
-        private readonly BoatsGenericCollection<DrawningBoat, DrawningObjectBoat> _boats;
+        private readonly BoatsGenericStorage _storage;
 
-        public FormBoatCollection()
+        private readonly ILogger _logger;
+
+        public FormBoatCollection(ILogger<FormBoatCollection> logger)
         {
             InitializeComponent();
-            _boats = new BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>(pictureBoxCollection.Width, pictureBoxCollection.Height);
+            _storage = new BoatsGenericStorage(pictureBoxCollection.Width, pictureBoxCollection.Height);
+            _logger = logger;
         }
 
-        private void buttonAddBoat_Click(object sender, EventArgs e)
+        private void ReloadObjects()
         {
-            FormSailBoat form = new();
-            if (form.ShowDialog() == DialogResult.OK)
+            int index = listBoxStorages.SelectedIndex;
+
+            listBoxStorages.Items.Clear();
+            for (int i = 0; i < _storage.Keys.Count; i++)
             {
-                if ((_boats + form.SelectedBoat) == 0)
+                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;
+            }
+        }
+
+        private void ButtonAddObject_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxStorageName.Text))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogWarning($"!!Ошибка!! Не все данные заполнены");
+                return;
+            }
+            _storage.AddSet(textBoxStorageName.Text);
+            ReloadObjects();
+            _logger.LogInformation($"Добавлен набор: {textBoxStorageName.Text}");
+        }
+
+        private void listBoxStorages_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            pictureBoxCollection.Image = _storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowBoats();
+        }
+
+        private void ButtonDelObject_Click(object sender, EventArgs e)
+        {
+            if (listBoxStorages.SelectedIndex == -1)
+            {
+                _logger.LogWarning($"Удаление не выбранного набора");
+                return;
+            }
+            string name = listBoxStorages.SelectedItem.ToString() ?? string.Empty;
+            if (MessageBox.Show($"Удалить объект{listBoxStorages.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _storage.DelSet(listBoxStorages.SelectedItem.ToString() ?? string.Empty);
+                ReloadObjects();
+                _logger.LogInformation($"Удален набор: {name}");
+            }
+        }
+
+        private void AddBoat(DrawningBoat boat)
+        {
+            boat._pictureWidth = pictureBoxCollection.Width;
+            boat._pictureHeight = pictureBoxCollection.Height;
+            if (listBoxStorages.SelectedIndex == -1) return;
+            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
+            string name = listBoxStorages.SelectedItem.ToString() ?? string.Empty;
+            if (obj == null) return;
+
+            try
+            {
+
+                if (obj + boat)
                 {
                     MessageBox.Show("Объект добавлен");
-                    pictureBoxCollection.Image = _boats.ShowBoats();
+                    pictureBoxCollection.Image = obj.ShowBoats();
+                    _logger.LogInformation($"В набор {name} добавлен объект");
                 }
                 else
                 {
                     MessageBox.Show("Не удалось добавить объект");
+                    _logger.LogWarning("Не удалось добавить объект");
                 }
             }
+            catch(StorageOverflowException ex) {
+                MessageBox.Show(ex.Message);
+                _logger.LogWarning($"{ex.Message}. Не удалось добавить объект");
+            }
+        }
+
+        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;
+
+            FormBoatConfig form = new FormBoatConfig();
+            form.Show();
+            form.AddEvent(AddBoat);
         }
 
         private void buttonRemoveBoat_Click(object sender, EventArgs e)
         {
+            if (listBoxStorages.SelectedIndex == -1) return;
+            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
+            string name = listBoxStorages.SelectedItem.ToString() ?? string.Empty;
+            if (obj == null) return;
+
             if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
             {
                 return;
             }
             if (maskedTextBoxNumber.Text == "") { return; }
             int pos = Convert.ToInt32(maskedTextBoxNumber.Text);
-            if (_boats - pos)
+            try
             {
-                MessageBox.Show("Объект удален");
-                pictureBoxCollection.Image = _boats.ShowBoats();
-            }
-            else
+                if (obj - pos != null)
+                {
+                    MessageBox.Show("Объект удален");
+                    pictureBoxCollection.Image = obj.ShowBoats();
+                    _logger.LogInformation($"Из набора {name} удален объект");
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось удалить объект");
+                    _logger.LogWarning("Не удалось удалить объект");
+                }
+            } catch(BoatNotFoundException ex)
             {
-                MessageBox.Show("Не удалось удалить объект");
+                MessageBox.Show(ex.Message);
+                _logger.LogWarning($"{ex.Message}. Не удалось удалить объект");
             }
         }
 
         private void buttonRefreshCollection_Click(object sender, EventArgs e)
         {
-            pictureBoxCollection.Image = _boats.ShowBoats();
+            if (listBoxStorages.SelectedIndex == -1) return;
+            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
+            if (obj == null) return;
+            pictureBoxCollection.Image = obj.ShowBoats();
+        }
+
+        private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _storage.SaveData(saveFileDialog.FileName);
+                    MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogInformation("Сохранение");
+                }
+                catch(Exception ex)
+                {
+                    MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    _logger.LogWarning("Ошибка сохранения");
+                }
+            }
+        }
+
+        private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if(openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _storage.LoadData(openFileDialog.FileName);
+                    ReloadObjects();
+                    MessageBox.Show("Загрузка произошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogInformation("Загрузка");
+                }
+                catch(Exception ex)
+                {
+                    MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    _logger.LogWarning("Ошибка загрузки");
+                }
+            }
         }
     }
 }

SailBoat/SailBoat/FormBoatCollection.resx

@@ -117,4 +117,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>132, 17</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>247, 17</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>387, 17</value>
+  </metadata>
 </root>

SailBoat/SailBoat/FormBoatConfig.Designer.cs

@@ -0,0 +1,358 @@
+namespace SailBoat
+{
+    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();
+            groupBox2 = new GroupBox();
+            panelPink = new Panel();
+            panelBlack = new Panel();
+            panelGray = new Panel();
+            panelWhite = new Panel();
+            panelYellow = new Panel();
+            panelBlue = new Panel();
+            panelGreen = new Panel();
+            panelRed = new Panel();
+            checkBoxSail = new CheckBox();
+            checkBoxRainforce = new CheckBox();
+            numericUpDownWeight = new NumericUpDown();
+            numericUpDownSpeed = new NumericUpDown();
+            label2 = new Label();
+            label1 = new Label();
+            pictureBoxObject = new PictureBox();
+            panelObject = new Panel();
+            labelAdditionalColor = new Label();
+            labelColor = new Label();
+            buttonOk = new Button();
+            buttonCancel = new Button();
+            groupBox1.SuspendLayout();
+            groupBox2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
+            panelObject.SuspendLayout();
+            SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            groupBox1.Controls.Add(labelModifiedObject);
+            groupBox1.Controls.Add(labelSimpleObject);
+            groupBox1.Controls.Add(groupBox2);
+            groupBox1.Controls.Add(checkBoxSail);
+            groupBox1.Controls.Add(checkBoxRainforce);
+            groupBox1.Controls.Add(numericUpDownWeight);
+            groupBox1.Controls.Add(numericUpDownSpeed);
+            groupBox1.Controls.Add(label2);
+            groupBox1.Controls.Add(label1);
+            groupBox1.Location = new Point(12, 12);
+            groupBox1.Name = "groupBox1";
+            groupBox1.Size = new Size(525, 241);
+            groupBox1.TabIndex = 0;
+            groupBox1.TabStop = false;
+            groupBox1.Text = "Праметры";
+            // 
+            // labelModifiedObject
+            // 
+            labelModifiedObject.AutoEllipsis = true;
+            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+            labelModifiedObject.Location = new Point(385, 185);
+            labelModifiedObject.Name = "labelModifiedObject";
+            labelModifiedObject.Size = new Size(96, 42);
+            labelModifiedObject.TabIndex = 8;
+            labelModifiedObject.Text = "Продвинутый";
+            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelModifiedObject.MouseDown += LabelObject_MouseDown;
+            // 
+            // labelSimpleObject
+            // 
+            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+            labelSimpleObject.Location = new Point(263, 185);
+            labelSimpleObject.Name = "labelSimpleObject";
+            labelSimpleObject.Size = new Size(96, 42);
+            labelSimpleObject.TabIndex = 7;
+            labelSimpleObject.Text = "Простой";
+            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelSimpleObject.MouseDown += LabelObject_MouseDown;
+            // 
+            // groupBox2
+            // 
+            groupBox2.Controls.Add(panelPink);
+            groupBox2.Controls.Add(panelBlack);
+            groupBox2.Controls.Add(panelGray);
+            groupBox2.Controls.Add(panelWhite);
+            groupBox2.Controls.Add(panelYellow);
+            groupBox2.Controls.Add(panelBlue);
+            groupBox2.Controls.Add(panelGreen);
+            groupBox2.Controls.Add(panelRed);
+            groupBox2.Location = new Point(248, 22);
+            groupBox2.Name = "groupBox2";
+            groupBox2.Size = new Size(250, 150);
+            groupBox2.TabIndex = 6;
+            groupBox2.TabStop = false;
+            groupBox2.Text = "Цвета";
+            // 
+            // panelPink
+            // 
+            panelPink.BackColor = Color.Fuchsia;
+            panelPink.Location = new Point(183, 82);
+            panelPink.Name = "panelPink";
+            panelPink.Size = new Size(50, 50);
+            panelPink.TabIndex = 1;
+            // 
+            // panelBlack
+            // 
+            panelBlack.BackColor = Color.Black;
+            panelBlack.Location = new Point(127, 82);
+            panelBlack.Name = "panelBlack";
+            panelBlack.Size = new Size(50, 50);
+            panelBlack.TabIndex = 1;
+            // 
+            // panelGray
+            // 
+            panelGray.BackColor = Color.Silver;
+            panelGray.Location = new Point(71, 82);
+            panelGray.Name = "panelGray";
+            panelGray.Size = new Size(50, 50);
+            panelGray.TabIndex = 1;
+            // 
+            // panelWhite
+            // 
+            panelWhite.BackColor = Color.White;
+            panelWhite.Location = new Point(15, 82);
+            panelWhite.Name = "panelWhite";
+            panelWhite.Size = new Size(50, 50);
+            panelWhite.TabIndex = 1;
+            // 
+            // panelYellow
+            // 
+            panelYellow.BackColor = Color.Yellow;
+            panelYellow.Location = new Point(183, 22);
+            panelYellow.Name = "panelYellow";
+            panelYellow.Size = new Size(50, 50);
+            panelYellow.TabIndex = 1;
+            // 
+            // panelBlue
+            // 
+            panelBlue.BackColor = Color.Blue;
+            panelBlue.Location = new Point(127, 22);
+            panelBlue.Name = "panelBlue";
+            panelBlue.Size = new Size(50, 50);
+            panelBlue.TabIndex = 1;
+            // 
+            // panelGreen
+            // 
+            panelGreen.BackColor = Color.LimeGreen;
+            panelGreen.Location = new Point(71, 22);
+            panelGreen.Name = "panelGreen";
+            panelGreen.Size = new Size(50, 50);
+            panelGreen.TabIndex = 1;
+            // 
+            // panelRed
+            // 
+            panelRed.BackColor = Color.Red;
+            panelRed.Location = new Point(15, 22);
+            panelRed.Name = "panelRed";
+            panelRed.Size = new Size(50, 50);
+            panelRed.TabIndex = 0;
+            // 
+            // checkBoxSail
+            // 
+            checkBoxSail.AutoSize = true;
+            checkBoxSail.Location = new Point(6, 114);
+            checkBoxSail.Name = "checkBoxSail";
+            checkBoxSail.Size = new Size(60, 19);
+            checkBoxSail.TabIndex = 5;
+            checkBoxSail.Text = "Парус";
+            checkBoxSail.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxRainforce
+            // 
+            checkBoxRainforce.AutoSize = true;
+            checkBoxRainforce.Location = new Point(6, 153);
+            checkBoxRainforce.Name = "checkBoxRainforce";
+            checkBoxRainforce.Size = new Size(239, 19);
+            checkBoxRainforce.TabIndex = 4;
+            checkBoxRainforce.Text = "Признак наличия усиленного корпуса";
+            checkBoxRainforce.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            numericUpDownWeight.Location = new Point(74, 71);
+            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(65, 23);
+            numericUpDownWeight.TabIndex = 3;
+            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // numericUpDownSpeed
+            // 
+            numericUpDownSpeed.Location = new Point(74, 30);
+            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(65, 23);
+            numericUpDownSpeed.TabIndex = 2;
+            numericUpDownSpeed.UseWaitCursor = true;
+            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // label2
+            // 
+            label2.AutoSize = true;
+            label2.Location = new Point(6, 73);
+            label2.Name = "label2";
+            label2.Size = new Size(29, 15);
+            label2.TabIndex = 1;
+            label2.Text = "Вес:";
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new Point(6, 32);
+            label1.Name = "label1";
+            label1.Size = new Size(62, 15);
+            label1.TabIndex = 0;
+            label1.Text = "Скорость:";
+            // 
+            // pictureBoxObject
+            // 
+            pictureBoxObject.Location = new Point(26, 58);
+            pictureBoxObject.Name = "pictureBoxObject";
+            pictureBoxObject.Size = new Size(345, 139);
+            pictureBoxObject.TabIndex = 1;
+            pictureBoxObject.TabStop = false;
+            // 
+            // panelObject
+            // 
+            panelObject.AllowDrop = true;
+            panelObject.Controls.Add(labelAdditionalColor);
+            panelObject.Controls.Add(pictureBoxObject);
+            panelObject.Controls.Add(labelColor);
+            panelObject.Location = new Point(543, 12);
+            panelObject.Name = "panelObject";
+            panelObject.Size = new Size(395, 207);
+            panelObject.TabIndex = 2;
+            panelObject.DragDrop += panelObject_DragDrop;
+            panelObject.DragEnter += panelObject_DragEnter;
+            // 
+            // labelAdditionalColor
+            // 
+            labelAdditionalColor.AllowDrop = true;
+            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+            labelAdditionalColor.Location = new Point(221, 14);
+            labelAdditionalColor.Name = "labelAdditionalColor";
+            labelAdditionalColor.Size = new Size(150, 36);
+            labelAdditionalColor.TabIndex = 3;
+            labelAdditionalColor.Text = "Доп. цвет";
+            labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelAdditionalColor.DragDrop += LabelColor_DragDrop;
+            labelAdditionalColor.DragEnter += LabelColor_DragEnter;
+            // 
+            // labelColor
+            // 
+            labelColor.AllowDrop = true;
+            labelColor.BorderStyle = BorderStyle.FixedSingle;
+            labelColor.Location = new Point(26, 14);
+            labelColor.Name = "labelColor";
+            labelColor.Size = new Size(150, 36);
+            labelColor.TabIndex = 2;
+            labelColor.Text = "Цвет";
+            labelColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelColor.DragDrop += LabelColor_DragDrop;
+            labelColor.DragEnter += LabelColor_DragEnter;
+            // 
+            // buttonOk
+            // 
+            buttonOk.Location = new Point(569, 225);
+            buttonOk.Name = "buttonOk";
+            buttonOk.Size = new Size(150, 28);
+            buttonOk.TabIndex = 3;
+            buttonOk.Text = "Добавить";
+            buttonOk.UseVisualStyleBackColor = true;
+            buttonOk.Click += buttonOk_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(764, 225);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(150, 28);
+            buttonCancel.TabIndex = 4;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // FormBoatConfig
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(950, 265);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonOk);
+            Controls.Add(panelObject);
+            Controls.Add(groupBox1);
+            Name = "FormBoatConfig";
+            Text = "FormBoatConfig";
+            groupBox1.ResumeLayout(false);
+            groupBox1.PerformLayout();
+            groupBox2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
+            panelObject.ResumeLayout(false);
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBox1;
+        private NumericUpDown numericUpDownWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private Label label2;
+        private Label label1;
+        private GroupBox groupBox2;
+        private Panel panelPink;
+        private Panel panelBlack;
+        private Panel panelGray;
+        private Panel panelWhite;
+        private Panel panelYellow;
+        private Panel panelBlue;
+        private Panel panelGreen;
+        private Panel panelRed;
+        private CheckBox checkBoxSail;
+        private CheckBox checkBoxRainforce;
+        private Label labelModifiedObject;
+        private Label labelSimpleObject;
+        private PictureBox pictureBoxObject;
+        private Panel panelObject;
+        private Label labelAdditionalColor;
+        private Label labelColor;
+        private Button buttonOk;
+        private Button buttonCancel;
+    }
+}

SailBoat/SailBoat/FormBoatConfig.cs

@@ -0,0 +1,129 @@
+using SailBoat.DrawningObjects;
+using SailBoat.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 SailBoat
+{
+    public partial class FormBoatConfig : Form
+    {
+
+        public DrawningBoat? _boat = null;
+
+        private event Action<DrawningBoat>? EventAddBoat;
+
+        public void AddEvent(Action<DrawningBoat> ev)
+        {
+            if (EventAddBoat == null)
+            {
+                EventAddBoat = ev;
+            }
+            else
+            {
+                EventAddBoat += ev;
+            }
+        }
+
+        public FormBoatConfig()
+        {
+            InitializeComponent();
+            panelBlack.MouseDown += PanelColor_MouseDown;
+            panelPink.MouseDown += PanelColor_MouseDown;
+            panelGray.MouseDown += PanelColor_MouseDown;
+            panelGreen.MouseDown += PanelColor_MouseDown;
+            panelRed.MouseDown += PanelColor_MouseDown;
+            panelWhite.MouseDown += PanelColor_MouseDown;
+            panelYellow.MouseDown += PanelColor_MouseDown;
+            panelBlue.MouseDown += PanelColor_MouseDown;
+            buttonCancel.Click += (sender, e) => Close();
+        }
+
+        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;
+        }
+
+        private void LabelObject_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Label)?.DoDragDrop((sender as Label)?.Name, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        private void PanelColor_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        private void panelObject_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 DrawningSailBoat((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxSail.Checked, checkBoxRainforce.Checked, pictureBoxObject.Width, pictureBoxObject.Height);
+                    break;
+            }
+            DrawBoat();
+        }
+
+        private void panelObject_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data?.GetDataPresent(DataFormats.Text) ?? false)
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+
+
+        private void buttonOk_Click(object sender, EventArgs e)
+        {
+            EventAddBoat?.Invoke(_boat);
+            Close();
+        }
+
+        private void LabelColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_boat == null) return;
+            switch (((Label)sender).Name)
+            {
+                case "labelColor":
+                    _boat.EntityBoat.SetBodyColor((Color)e.Data.GetData(typeof(Color)));
+                    break;
+                case "labelAdditionalColor":
+                    if (_boat == null) return;
+                    (_boat.EntityBoat as EntitySailBoat).setAdditionalColor((Color)e.Data.GetData(typeof(Color)));
+                    break;
+            }
+            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;
+            }
+        }
+    }
+}

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

SailBoat/SailBoat/FormSailBoat.cs

@@ -10,7 +10,7 @@ namespace SailBoat
 
         private AbstractStrategy? _abstractStrategy;
 
-        public DrawningBoat? SelectedBoat { get; private set; }
+        public DrawningBoat? SelectedBoat { get; set; }
 
         public FormSailBoat()
         {

SailBoat/SailBoat/Generics/BoatsGenericCollection.cs

@@ -32,26 +32,23 @@ namespace SailBoat.Generics
             _collection = new SetGeneric<T>(width * height);
         }
 
-        public static int? operator +(BoatsGenericCollection<T,U> collect, T? obj)
+        public static bool operator +(BoatsGenericCollection<T,U> collect, T? obj)
         {
-            if (obj == null) return -1;
-            return collect?._collection.Insert(obj);
+            if (obj == null) return false;
+            return collect._collection.Insert(obj);
         }
 
-        public static bool operator -(BoatsGenericCollection<T,U> collect, int pos)
+        public static T? operator -(BoatsGenericCollection<T,U> collect, int pos)
         {
-            T? obj = collect._collection.Get(pos);
-            if(obj == null)
-            {
-                return false;
-            }
+            T? obj = collect._collection[pos];
+
             collect._collection.Remove(pos);
 
-            return true;
+            return obj;
         }
         public U? GetU(int pos)
         {
-            return (U?)_collection.Get(pos)?.GetMoveableObjects;
+            return (U?)_collection[pos]?.GetMoveableObjects;
         }
 
 
@@ -80,16 +77,18 @@ namespace SailBoat.Generics
         {
             int height = _pictureHeight / _placeSizeHeight;
             int width = _pictureWidth / _placeSizeWidth;
-            for (int i = 0; i < _collection.Count ; i++)
+            int i = 0;
+            foreach (var boat in _collection.GetBoats())
             {
-                DrawningBoat boat = _collection.Get(i);
-                if(boat == null)
+                if(boat != null)
                 {
-                    continue;
+                    boat.SetPosition((i % width) * _placeSizeWidth, (i / (height - 1)) * _placeSizeHeight);
+                    boat.DrawTransport(g);
                 }
-                boat.SetPosition((i % width) * _placeSizeWidth, (i / (height - 1)) * _placeSizeHeight);
-                boat.DrawTransport(g);
+                i++;
             }
         }
+
+        public IEnumerable<T?> GetBoats => _collection.GetBoats();
     }
 }

SailBoat/SailBoat/Generics/BoatsGenericStorage.cs

@@ -0,0 +1,137 @@
+using SailBoat.DrawningObjects;
+using SailBoat.MovementStrategy;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SailBoat.Generics
+{
+    internal class BoatsGenericStorage
+    {
+        readonly Dictionary<string, BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>> _boatStorages;
+
+        public List<string> Keys => _boatStorages.Keys.ToList();
+
+        private readonly int _pictureWidth;
+
+        private readonly int _pictureHeight;
+
+        public BoatsGenericStorage(int pictureWidth, int pictureHeight)
+        {
+            _boatStorages = new Dictionary<string, BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>>();
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+        }
+
+        public void AddSet(string Name)
+        {
+            if (!_boatStorages.ContainsKey(Name))
+            {
+                _boatStorages[Name] = new BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>(_pictureWidth, _pictureHeight);
+            }
+        }
+
+        public void DelSet(string Name)
+        {
+            if (_boatStorages.ContainsKey(Name))
+            {
+                _boatStorages.Remove(Name);
+            }
+        }
+
+        public BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>? this[string ind]
+        {
+            get
+            {
+                if (_boatStorages.ContainsKey(ind)) return _boatStorages[ind];
+                return null;
+            }
+        }
+
+        private static readonly char _separatorForKeyValue = '|';
+        private readonly char _separatorRecords = ';';
+        private static readonly char _separatorForObject = ':';
+
+        public bool SaveData(string filename)
+        {
+            if (File.Exists(filename))
+            {
+                File.Delete(filename);
+            }
+
+            StringBuilder data = new();
+
+            foreach (KeyValuePair < string, BoatsGenericCollection < DrawningBoat, DrawningObjectBoat>> record in _boatStorages)
+{
+                StringBuilder records = new();
+                foreach (DrawningBoat? elem in record.Value.GetBoats)
+                {
+                    records.Append($"{elem?.GetDataForSave(_separatorForObject)}{_separatorRecords}");
+                }
+                data.Append($"{record.Key}{_separatorForKeyValue}{records}\n");
+            }
+
+            if (data.Length == 0)
+            {
+                throw new InvalidOperationException("Невалиданя операция, нет данных для сохранения");
+            }
+
+            using StreamWriter fs = new StreamWriter(filename);
+            string info = $"BoatStorage{Environment.NewLine}{data}";
+            fs.Write(info, 0, info.Length);
+            return true;
+        }
+
+        public bool LoadData(string filename)
+        {
+            if (!File.Exists(filename))
+            {
+                throw new FileNotFoundException("Файл не найден");
+            }
+
+            using (StreamReader fs = new StreamReader(filename))
+            {
+                string str = fs.ReadLine();
+
+                if(str == null || str.Length == 0)
+                {
+                    throw new NullReferenceException("Нет данных для загрузки");
+                }
+
+                if (!str.StartsWith("BoatStorage"))
+                {
+                    throw new FormatException("Неверный формат данных");
+                }
+                _boatStorages.Clear();
+                while ((str = fs.ReadLine()) != null)
+                {
+                    string[] record = str.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
+                    if (record.Length != 2)
+                    {
+                        continue;
+                    }
+
+                    BoatsGenericCollection<DrawningBoat, DrawningObjectBoat> collection = new(_pictureWidth, _pictureHeight);
+                    string[] set = record[1].Split(_separatorRecords, StringSplitOptions.RemoveEmptyEntries);
+                    foreach (string elem in set)
+                    {
+                        DrawningBoat? boat = elem?.CreateDrawningBoat(_separatorForObject, _pictureWidth, _pictureHeight);
+                        if (boat != null)
+                        {
+                            if (!(collection + boat))
+                            {
+                                throw new ApplicationException("Ошибка добавления в коллекцию");
+                            }
+                        }
+                    }
+
+                    _boatStorages.Add(record[0], collection);
+
+                }
+                return true;
+            }
+        }
+    }
+}

SailBoat/SailBoat/Generics/SetGeneric.cs

@@ -1,4 +1,5 @@
-using System;
+using SailBoat.Exceptions;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,65 +10,76 @@ namespace SailBoat.Generics
     internal class SetGeneric<T>
         where T : class
     {
-        private readonly T?[] _places;
+        private readonly List<T?> _places;
 
-        public int Count => _places.Length;
+        public int Count => _places.Count;
+
+        private readonly int _maxCount;
 
         public SetGeneric(int Count)
         {
-            _places = new T[Count];
+            _maxCount = Count;
+            _places = new List<T?>(Count);
         }
 
-        public int Insert(T boat)
+        public bool Insert(T boat)
         {
-            int index = 0;
-            while (_places[index] != null) { 
-                index++; 
-                if(index == Count) { return -1; }
-            }
-
-            while (index != 0)
-            {
-                _places[index] = _places[index - 1];
-                index--;
-            }
-            _places[0] = boat;
-            return 0;
+            return Insert(boat, 0);
         }
 
         public bool Insert(T boat, int position)
         {
-            if (position < 0 || position >= Count)
+            if (position < 0 || position >= _maxCount)
             {
-                return false;
+                throw new BoatNotFoundException(position);
             }
-            if (_places[position] == null)
+            if (Count >= _maxCount)
             {
-                _places[position] = boat;
-                return true;
+                throw new StorageOverflowException(_maxCount);
             }
-            int index = position;
-            while (_places[index] != null) index++; 
-            if (index == Count) return false;
-            for(int i = index; i > position; i--)
-            {
-                _places[i] = _places[i - 1];
-            }
-            _places[position] = boat;
+            _places.Insert(position, boat);
             return true;
         }
 
         public bool Remove(int position)
         {
-            if (position < 0 || position >= Count) return false;
+            if (position < 0 || position >= _maxCount)
+            {
+                return false;
+            }
+            if (_places[position] == null)
+            {
+                throw new BoatNotFoundException(position);
+            }
+
             _places[position] = null;
             return true;
         }
 
-        public T? Get(int position)
+        public T? this[int position]
         {
-            if (position < 0 || position >= Count) return null;
-            return _places[position];
+            get
+            {
+                if (position < 0 || position >= Count) { return null; }
+                return _places[position];
+            }
+            set
+            {
+                if (position < 0 || position >= Count) { return; }
+                _places[position] = value;
+            }
+        }
+
+        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;
+                }
+            }
         }
     }
 }

SailBoat/SailBoat/Program.cs

@@ -1,3 +1,11 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Serilog;
+using System;
+using System.IO;
+using System.Windows.Forms;
+
 namespace SailBoat
 {
     internal static class Program
@@ -11,7 +19,29 @@ namespace SailBoat
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormBoatCollection());
+            var services = new ServiceCollection();
+            ConfigureServices(services);
+            using (ServiceProvider serviceProvider = services.BuildServiceProvider())
+            {
+                Application.Run(serviceProvider.GetRequiredService<FormBoatCollection>());
+            }
+        }
+
+        private static void ConfigureServices(IServiceCollection services)
+        {
+            services.AddSingleton<FormBoatCollection>().AddLogging(option =>
+            {
+                string[] path = Directory.GetCurrentDirectory().Split('\\');
+                string appPath = "";
+                for (int i = 0; i < path.Length - 3; i++)
+                {
+                    appPath += path[i] + "\\";
+                }
+                var configuration = new ConfigurationBuilder().AddJsonFile($"{appPath}appsettings.json").Build();
+                var logger = new LoggerConfiguration().ReadFrom.Configuration(configuration).CreateLogger();
+                option.SetMinimumLevel(LogLevel.Information);
+                option.AddSerilog(logger);
+            });
         }
     }
 }

SailBoat/SailBoat/SailBoat.csproj

@@ -8,6 +8,34 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="C:\Users\shotb\.nuget\packages\nlog.config\4.7.15\contentFiles\any\any\NLog.config" />
+    <None Remove="C:\Users\shotb\.nuget\packages\nlog.schema\5.2.7\contentFiles\any\any\NLog.xsd" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Primitives" Version="8.0.0" />
+    <PackageReference Include="NLog" Version="5.2.7" />
+    <PackageReference Include="NLog.Config" Version="4.7.15" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.5" />
+    <PackageReference Include="NLog.Schema" Version="5.2.7" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.5" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.AppSettings" Version="2.2.2" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

SailBoat/SailBoat/appsettings.json

@@ -0,0 +1,20 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File" ],
+    "MinimumLevel": "Information",
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "logs/boatlog-.log",
+          "rollingInterval": "Day",
+          "outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ],
+    "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ],
+    "Properties": {
+      "Application": "Loco"
+    }
+  }
+}