лабораторная 7

MotorBoat/MotorBoat/BoatNotFoundException.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+    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) { }
+    }
+}

MotorBoat/MotorBoat/DrawningBoat.cs

@@ -128,5 +128,9 @@ namespace MotorBoat
         {
             return (_startPosX, _startPosY, _startPosX + _boatWidth, _startPosY + _boatHeight);
         }
+        public void SetBodyColor(Color color)
+        {
+            (Boat as EntityBoat).setColor(color);
+        }
     }
 }

MotorBoat/MotorBoat/DrawningMotorBoat.cs

@@ -89,7 +89,11 @@ namespace MotorBoat
                 };
                 g.FillPolygon(dopBrush, points);
                 g.DrawPolygon(pen, points);
-            }              
-        }    
+            }
+        }
+        public void SetExtraColor(Color color)
+        {
+            (Boat as EntityMotorBoat).DopColor = color;
+        }
     }
 }

MotorBoat/MotorBoat/DrawningObjectBoat.cs

@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Extensions.Logging;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -24,11 +25,14 @@ namespace MotorBoat
         }
         public void SetObject(int x, int y, int width, int height)
         {
-            _boat.SetPosition(x, y, width, height);
+           _boat.SetPosition(x, y, width, height);
+            
         }
         void IDrawningObject.DrawningObject(Graphics g)
         {
             _boat.DrawTransport(g);
         }
+        public string GetInfo() => _boat?.GetDataForSave();
+        public static IDrawningObject Create(string data) => new DrawningObjectBoat(data.CreateDrawningBoat());
     }
 }

MotorBoat/MotorBoat/EntityBoat.cs

@@ -11,7 +11,7 @@ namespace MotorBoat
     {
         public int Speed { get; private set; }
         public float Weight { get; private set; }
-        public Color BodyColor { get; private set; }
+        public Color BodyColor { get; set; }
         public float Step => Speed * 100 / Weight;
         public EntityBoat(int speed, float weight, Color bodyColor)
         {
@@ -20,5 +20,9 @@ namespace MotorBoat
             Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
             BodyColor = bodyColor;
         }
+        public void setColor(Color color)
+        {
+            BodyColor = color;
+        }
     }
 }

MotorBoat/MotorBoat/EntityMotorBoat.cs

@@ -8,7 +8,7 @@ namespace MotorBoat
 {
     internal class EntityMotorBoat : EntityBoat
     {
-        public Color DopColor { get; private set; }
+        public Color DopColor { get; set; }
         public bool BodyKit { get; private set; }
         public bool Wing { get; private set; }
         public bool SportLine { get; private set; }

MotorBoat/MotorBoat/ExtentionBoat.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+    internal static class ExtentionCar
+    {
+        /// <summary>
+        /// Разделитель для записи информации по объекту в файл
+        /// </summary>
+        private static readonly char _separatorForObject = ':';
+        /// <summary>
+        /// Создание объекта из строки
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        public static DrawningBoat CreateDrawningBoat(this string info)
+        {
+            string[] strs = info.Split(_separatorForObject);
+            if (strs.Length == 3)
+            {
+                return new DrawningBoat(Convert.ToInt32(strs[0]),
+                Convert.ToInt32(strs[1]), Color.FromName(strs[2]));
+            }
+            if (strs.Length == 7)
+            {
+                return new DrawningMotorBoat(Convert.ToInt32(strs[0]),
+                Convert.ToInt32(strs[1]), Color.FromName(strs[2]),
+                Color.FromName(strs[3]), Convert.ToBoolean(strs[4]),
+               Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]));
+            }
+            return null;
+        }
+        /// <summary>
+        /// Получение данных для сохранения в файл
+        /// </summary>
+        /// <param name="drawningCar"></param>
+        /// <returns></returns>
+        public static string GetDataForSave(this DrawningBoat drawningBoat)
+        {
+            var boat = drawningBoat.Boat;
+            var str =
+           $"{boat.Speed}{_separatorForObject}{boat.Weight}{_separatorForObject}{boat.BodyColor.Name}";
+            if (boat is not EntityMotorBoat motorBoat)
+            {
+                return str;
+            }
+            return
+           $"{str}{_separatorForObject}{motorBoat.DopColor.Name}{_separatorForObject}{motorBoat.BodyKit}{_separatorForObject}{motorBoat.Wing}{_separatorForObject}{motorBoat.SportLine}";
+        }
+
+    }
+}

MotorBoat/MotorBoat/FormBoatConfig.Designer.cs

@@ -0,0 +1,411 @@
+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()
+        {
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.checkBoxBackside = new System.Windows.Forms.CheckBox();
+            this.labelHardObject = new System.Windows.Forms.Label();
+            this.labelSimpleObject = new System.Windows.Forms.Label();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.panelWhite = new System.Windows.Forms.Panel();
+            this.panelYellow = new System.Windows.Forms.Panel();
+            this.panelGray = new System.Windows.Forms.Panel();
+            this.panelBlue = new System.Windows.Forms.Panel();
+            this.panelGreen = new System.Windows.Forms.Panel();
+            this.panelPurple = new System.Windows.Forms.Panel();
+            this.panelRed = new System.Windows.Forms.Panel();
+            this.panelBlack = new System.Windows.Forms.Panel();
+            this.checkBoxSide = new System.Windows.Forms.CheckBox();
+            this.checkBoxNose = new System.Windows.Forms.CheckBox();
+            this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.pictureBoxObject = new System.Windows.Forms.PictureBox();
+            this.panelobject = new System.Windows.Forms.Panel();
+            this.LabelDopColor = new System.Windows.Forms.Label();
+            this.LabelBaseColor = new System.Windows.Forms.Label();
+            this.buttonOk = new System.Windows.Forms.Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.groupBox1.SuspendLayout();
+            this.groupBox2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
+            this.panelobject.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.checkBoxBackside);
+            this.groupBox1.Controls.Add(this.labelHardObject);
+            this.groupBox1.Controls.Add(this.labelSimpleObject);
+            this.groupBox1.Controls.Add(this.groupBox2);
+            this.groupBox1.Controls.Add(this.checkBoxSide);
+            this.groupBox1.Controls.Add(this.checkBoxNose);
+            this.groupBox1.Controls.Add(this.numericUpDownWeight);
+            this.groupBox1.Controls.Add(this.numericUpDownSpeed);
+            this.groupBox1.Controls.Add(this.label2);
+            this.groupBox1.Controls.Add(this.label1);
+            this.groupBox1.Location = new System.Drawing.Point(12, 12);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(470, 201);
+            this.groupBox1.TabIndex = 0;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Параметры";
+            // 
+            // checkBoxBackside
+            // 
+            this.checkBoxBackside.AutoSize = true;
+            this.checkBoxBackside.Location = new System.Drawing.Point(6, 170);
+            this.checkBoxBackside.Name = "checkBoxBackside";
+            this.checkBoxBackside.Size = new System.Drawing.Size(115, 19);
+            this.checkBoxBackside.TabIndex = 10;
+            this.checkBoxBackside.Text = "Боковые стойки";
+            this.checkBoxBackside.UseVisualStyleBackColor = true;
+            // 
+            // labelHardObject
+            // 
+            this.labelHardObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelHardObject.Location = new System.Drawing.Point(334, 166);
+            this.labelHardObject.Name = "labelHardObject";
+            this.labelHardObject.RightToLeft = System.Windows.Forms.RightToLeft.No;
+            this.labelHardObject.Size = new System.Drawing.Size(100, 23);
+            this.labelHardObject.TabIndex = 9;
+            this.labelHardObject.Text = "Продвинутый";
+            this.labelHardObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelHardObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.labelSimpleObject_MouseDown);
+            // 
+            // labelSimpleObject
+            // 
+            this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelSimpleObject.Location = new System.Drawing.Point(228, 166);
+            this.labelSimpleObject.Name = "labelSimpleObject";
+            this.labelSimpleObject.Size = new System.Drawing.Size(100, 23);
+            this.labelSimpleObject.TabIndex = 8;
+            this.labelSimpleObject.Text = "Простой";
+            this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.labelSimpleObject_MouseDown);
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.panelWhite);
+            this.groupBox2.Controls.Add(this.panelYellow);
+            this.groupBox2.Controls.Add(this.panelGray);
+            this.groupBox2.Controls.Add(this.panelBlue);
+            this.groupBox2.Controls.Add(this.panelGreen);
+            this.groupBox2.Controls.Add(this.panelPurple);
+            this.groupBox2.Controls.Add(this.panelRed);
+            this.groupBox2.Controls.Add(this.panelBlack);
+            this.groupBox2.Location = new System.Drawing.Point(216, 22);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(228, 130);
+            this.groupBox2.TabIndex = 7;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "Цвета";
+            // 
+            // panelWhite
+            // 
+            this.panelWhite.AllowDrop = true;
+            this.panelWhite.BackColor = System.Drawing.Color.White;
+            this.panelWhite.Location = new System.Drawing.Point(167, 78);
+            this.panelWhite.Name = "panelWhite";
+            this.panelWhite.Size = new System.Drawing.Size(43, 44);
+            this.panelWhite.TabIndex = 3;
+            this.panelWhite.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelYellow
+            // 
+            this.panelYellow.AllowDrop = true;
+            this.panelYellow.BackColor = System.Drawing.Color.Yellow;
+            this.panelYellow.Location = new System.Drawing.Point(167, 28);
+            this.panelYellow.Name = "panelYellow";
+            this.panelYellow.Size = new System.Drawing.Size(43, 44);
+            this.panelYellow.TabIndex = 1;
+            this.panelYellow.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelGray
+            // 
+            this.panelGray.AllowDrop = true;
+            this.panelGray.BackColor = System.Drawing.Color.Gray;
+            this.panelGray.Location = new System.Drawing.Point(118, 78);
+            this.panelGray.Name = "panelGray";
+            this.panelGray.Size = new System.Drawing.Size(43, 44);
+            this.panelGray.TabIndex = 4;
+            this.panelGray.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelBlue
+            // 
+            this.panelBlue.AllowDrop = true;
+            this.panelBlue.BackColor = System.Drawing.Color.Blue;
+            this.panelBlue.Location = new System.Drawing.Point(69, 78);
+            this.panelBlue.Name = "panelBlue";
+            this.panelBlue.Size = new System.Drawing.Size(43, 44);
+            this.panelBlue.TabIndex = 5;
+            this.panelBlue.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelGreen
+            // 
+            this.panelGreen.AllowDrop = true;
+            this.panelGreen.BackColor = System.Drawing.Color.Green;
+            this.panelGreen.Location = new System.Drawing.Point(118, 28);
+            this.panelGreen.Name = "panelGreen";
+            this.panelGreen.Size = new System.Drawing.Size(43, 44);
+            this.panelGreen.TabIndex = 1;
+            this.panelGreen.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelPurple
+            // 
+            this.panelPurple.AllowDrop = true;
+            this.panelPurple.BackColor = System.Drawing.Color.Purple;
+            this.panelPurple.Location = new System.Drawing.Point(20, 78);
+            this.panelPurple.Name = "panelPurple";
+            this.panelPurple.Size = new System.Drawing.Size(43, 44);
+            this.panelPurple.TabIndex = 2;
+            this.panelPurple.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelRed
+            // 
+            this.panelRed.AllowDrop = true;
+            this.panelRed.BackColor = System.Drawing.Color.Red;
+            this.panelRed.Location = new System.Drawing.Point(69, 28);
+            this.panelRed.Name = "panelRed";
+            this.panelRed.Size = new System.Drawing.Size(43, 44);
+            this.panelRed.TabIndex = 1;
+            this.panelRed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelBlack
+            // 
+            this.panelBlack.AllowDrop = true;
+            this.panelBlack.BackColor = System.Drawing.Color.Black;
+            this.panelBlack.Location = new System.Drawing.Point(20, 28);
+            this.panelBlack.Name = "panelBlack";
+            this.panelBlack.Size = new System.Drawing.Size(43, 44);
+            this.panelBlack.TabIndex = 0;
+            this.panelBlack.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // checkBoxSide
+            // 
+            this.checkBoxSide.AutoSize = true;
+            this.checkBoxSide.Location = new System.Drawing.Point(6, 145);
+            this.checkBoxSide.Name = "checkBoxSide";
+            this.checkBoxSide.Size = new System.Drawing.Size(92, 19);
+            this.checkBoxSide.TabIndex = 5;
+            this.checkBoxSide.Text = "Острый нос";
+            this.checkBoxSide.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxNose
+            // 
+            this.checkBoxNose.AutoSize = true;
+            this.checkBoxNose.Location = new System.Drawing.Point(6, 120);
+            this.checkBoxNose.Name = "checkBoxNose";
+            this.checkBoxNose.Size = new System.Drawing.Size(116, 19);
+            this.checkBoxNose.TabIndex = 4;
+            this.checkBoxNose.Text = "Усеченные бока";
+            this.checkBoxNose.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            this.numericUpDownWeight.Location = new System.Drawing.Point(74, 71);
+            this.numericUpDownWeight.Maximum = new decimal(new int[] {
+            70,
+            0,
+            0,
+            0});
+            this.numericUpDownWeight.Minimum = new decimal(new int[] {
+            40,
+            0,
+            0,
+            0});
+            this.numericUpDownWeight.Name = "numericUpDownWeight";
+            this.numericUpDownWeight.Size = new System.Drawing.Size(120, 23);
+            this.numericUpDownWeight.TabIndex = 3;
+            this.numericUpDownWeight.Value = new decimal(new int[] {
+            50,
+            0,
+            0,
+            0});
+            // 
+            // numericUpDownSpeed
+            // 
+            this.numericUpDownSpeed.Location = new System.Drawing.Point(74, 42);
+            this.numericUpDownSpeed.Maximum = new decimal(new int[] {
+            150,
+            0,
+            0,
+            0});
+            this.numericUpDownSpeed.Minimum = new decimal(new int[] {
+            50,
+            0,
+            0,
+            0});
+            this.numericUpDownSpeed.Name = "numericUpDownSpeed";
+            this.numericUpDownSpeed.Size = new System.Drawing.Size(120, 23);
+            this.numericUpDownSpeed.TabIndex = 2;
+            this.numericUpDownSpeed.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(6, 73);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(29, 15);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "Вес:";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(6, 44);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(62, 15);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "Скорость:";
+            // 
+            // pictureBoxObject
+            // 
+            this.pictureBoxObject.Location = new System.Drawing.Point(12, 42);
+            this.pictureBoxObject.Name = "pictureBoxObject";
+            this.pictureBoxObject.Size = new System.Drawing.Size(212, 122);
+            this.pictureBoxObject.TabIndex = 1;
+            this.pictureBoxObject.TabStop = false;
+            // 
+            // panelobject
+            // 
+            this.panelobject.AllowDrop = true;
+            this.panelobject.Controls.Add(this.LabelDopColor);
+            this.panelobject.Controls.Add(this.LabelBaseColor);
+            this.panelobject.Controls.Add(this.pictureBoxObject);
+            this.panelobject.Location = new System.Drawing.Point(525, 12);
+            this.panelobject.Name = "panelobject";
+            this.panelobject.Size = new System.Drawing.Size(238, 172);
+            this.panelobject.TabIndex = 10;
+            this.panelobject.DragDrop += new System.Windows.Forms.DragEventHandler(this.panelobject_DragDrop);
+            this.panelobject.DragEnter += new System.Windows.Forms.DragEventHandler(this.panelobject_DragEnter);
+            // 
+            // LabelDopColor
+            // 
+            this.LabelDopColor.AllowDrop = true;
+            this.LabelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.LabelDopColor.Location = new System.Drawing.Point(124, 9);
+            this.LabelDopColor.Name = "LabelDopColor";
+            this.LabelDopColor.Size = new System.Drawing.Size(100, 23);
+            this.LabelDopColor.TabIndex = 3;
+            this.LabelDopColor.Text = "Доп.цвет";
+            this.LabelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.LabelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop);
+            this.LabelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragEnter);
+            // 
+            // LabelBaseColor
+            // 
+            this.LabelBaseColor.AllowDrop = true;
+            this.LabelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.LabelBaseColor.Location = new System.Drawing.Point(12, 9);
+            this.LabelBaseColor.Name = "LabelBaseColor";
+            this.LabelBaseColor.Size = new System.Drawing.Size(100, 23);
+            this.LabelBaseColor.TabIndex = 2;
+            this.LabelBaseColor.Text = "Цвет";
+            this.LabelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.LabelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop);
+            this.LabelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter);
+            // 
+            // buttonOk
+            // 
+            this.buttonOk.Location = new System.Drawing.Point(537, 190);
+            this.buttonOk.Name = "buttonOk";
+            this.buttonOk.Size = new System.Drawing.Size(75, 23);
+            this.buttonOk.TabIndex = 11;
+            this.buttonOk.Text = "Добавить";
+            this.buttonOk.UseVisualStyleBackColor = true;
+            this.buttonOk.Click += new System.EventHandler(this.buttonOk_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(674, 190);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(75, 23);
+            this.buttonCancel.TabIndex = 12;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // FormBoatConfig
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(783, 221);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonOk);
+            this.Controls.Add(this.panelobject);
+            this.Controls.Add(this.groupBox1);
+            this.Name = "FormBoatConfig";
+            this.Text = "FormLocomotiveConfig";
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.groupBox2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit();
+            this.panelobject.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBox1;
+        private Label labelHardObject;
+        private Label labelSimpleObject;
+        private GroupBox groupBox2;
+        private Panel panelWhite;
+        private Panel panelYellow;
+        private Panel panelGray;
+        private Panel panelBlue;
+        private Panel panelGreen;
+        private Panel panelPurple;
+        private Panel panelRed;
+        private Panel panelBlack;
+        private CheckBox checkBoxSide;
+        private CheckBox checkBoxNose;
+        private NumericUpDown numericUpDownWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private Label label2;
+        private Label label1;
+        private PictureBox pictureBoxObject;
+        private Panel panelobject;
+        private Label LabelDopColor;
+        private Label LabelBaseColor;
+        private Button buttonOk;
+        private Button buttonCancel;
+        private CheckBox checkBoxBackside;
+    }
+}

MotorBoat/MotorBoat/FormBoatConfig.cs

@@ -0,0 +1,144 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace MotorBoat
+{
+    public partial class FormBoatConfig : Form
+    {
+        private event Action<DrawningBoat> EventAddBoat;
+        DrawningBoat _boat = null;
+        public FormBoatConfig()
+        {
+            InitializeComponent();
+            panelBlack.MouseDown += PanelColor_MouseDown;
+            panelPurple.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 += (s, a) => Close();
+        }
+
+        public void AddEvent(Action<DrawningBoat> ev)
+        {
+            if (EventAddBoat == null)
+            {
+                EventAddBoat = new Action<DrawningBoat>(ev);
+            }
+            else
+            {
+                EventAddBoat += ev;
+            }
+        }
+
+        private void DrawBoat()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _boat?.SetPosition(5, 135, pictureBoxObject.Width,
+           pictureBoxObject.Height);
+            _boat?.DrawTransport(gr);
+            pictureBoxObject.Image = bmp;
+        }
+
+        private void labelSimpleObject_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Label).DoDragDrop((sender as Label).Name,DragDropEffects.Move | DragDropEffects.Copy);
+
+        }
+
+        private void panelobject_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.Text))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        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);
+                    }
+                    break;
+                case "labelHardObject":
+                    {
+                        _boat = new DrawningMotorBoat((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxNose.Checked, checkBoxSide.Checked, checkBoxBackside.Checked);
+                    }
+                    break;
+            }
+            DrawBoat();
+        }
+
+        private void buttonOk_Click(object sender, EventArgs e)
+        {
+            EventAddBoat?.Invoke(_boat);
+            Close();
+        }
+
+        private void PanelColor_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        private void LabelBaseColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_boat != null)
+            {
+                _boat.SetBodyColor((Color)e.Data.GetData(typeof(Color)));
+                DrawBoat();
+            }
+            else return;
+        }
+
+        private void LabelDopColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if(_boat is not DrawningMotorBoat MotorBoat || _boat==null)
+            {
+                return;
+            }
+            MotorBoat.SetExtraColor((Color)e.Data.GetData(typeof(Color)));
+            DrawBoat();
+        }
+
+        private void LabelBaseColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        private void LabelDopColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/FormBoatConfig.resx

@@ -0,0 +1,60 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

MotorBoat/MotorBoat/FormMapWithSetBoats.Designer.cs

@@ -44,8 +44,15 @@
             this.buttonAddBoat = new System.Windows.Forms.Button();
             this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
             this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+            this.файлToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.SaveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.LoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
+            this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
             this.groupBoxTools.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.menuStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
             // groupBoxTools
@@ -65,9 +72,9 @@
             this.groupBoxTools.Controls.Add(this.buttonAddBoat);
             this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
             this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(809, 0);
+            this.groupBoxTools.Location = new System.Drawing.Point(809, 24);
             this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Size = new System.Drawing.Size(251, 645);
+            this.groupBoxTools.Size = new System.Drawing.Size(251, 621);
             this.groupBoxTools.TabIndex = 0;
             this.groupBoxTools.TabStop = false;
             this.groupBoxTools.Text = "v";
@@ -143,7 +150,7 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::MotorBoat.Properties.Resources.d;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(112, 553);
+            this.buttonDown.Location = new System.Drawing.Point(112, 529);
             this.buttonDown.Name = "buttonDown";
             this.buttonDown.Size = new System.Drawing.Size(30, 30);
             this.buttonDown.TabIndex = 20;
@@ -155,7 +162,7 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::MotorBoat.Properties.Resources.up;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(148, 553);
+            this.buttonRight.Location = new System.Drawing.Point(148, 529);
             this.buttonRight.Name = "buttonRight";
             this.buttonRight.Size = new System.Drawing.Size(30, 30);
             this.buttonRight.TabIndex = 19;
@@ -167,7 +174,7 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::MotorBoat.Properties.Resources.left;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(76, 553);
+            this.buttonLeft.Location = new System.Drawing.Point(76, 529);
             this.buttonLeft.Name = "buttonLeft";
             this.buttonLeft.Size = new System.Drawing.Size(30, 30);
             this.buttonLeft.TabIndex = 18;
@@ -179,7 +186,7 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::MotorBoat.Properties.Resources.r;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(112, 517);
+            this.buttonUp.Location = new System.Drawing.Point(112, 493);
             this.buttonUp.Name = "buttonUp";
             this.buttonUp.Size = new System.Drawing.Size(30, 30);
             this.buttonUp.TabIndex = 17;
@@ -223,12 +230,54 @@
             // pictureBox
             // 
             this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox.Location = new System.Drawing.Point(0, 0);
+            this.pictureBox.Location = new System.Drawing.Point(0, 24);
             this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(809, 645);
+            this.pictureBox.Size = new System.Drawing.Size(809, 621);
             this.pictureBox.TabIndex = 0;
             this.pictureBox.TabStop = false;
             // 
+            // menuStrip1
+            // 
+            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.файлToolStripMenuItem});
+            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip1.Name = "menuStrip1";
+            this.menuStrip1.Size = new System.Drawing.Size(1060, 24);
+            this.menuStrip1.TabIndex = 1;
+            this.menuStrip1.Text = "menuStrip1";
+            // 
+            // файлToolStripMenuItem
+            // 
+            this.файлToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.SaveToolStripMenuItem,
+            this.LoadToolStripMenuItem});
+            this.файлToolStripMenuItem.Name = "файлToolStripMenuItem";
+            this.файлToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
+            this.файлToolStripMenuItem.Text = "Файл";
+            // 
+            // SaveToolStripMenuItem
+            // 
+            this.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
+            this.SaveToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.SaveToolStripMenuItem.Text = "Сохранение";
+            this.SaveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click);
+            // 
+            // LoadToolStripMenuItem
+            // 
+            this.LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
+            this.LoadToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.LoadToolStripMenuItem.Text = "Загрузка";
+            this.LoadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click);
+            // 
+            // openFileDialog
+            // 
+            this.openFileDialog.FileName = "openFileDialog1";
+            this.openFileDialog.Filter = "txt file | *.txt";
+            // 
+            // saveFileDialog
+            // 
+            this.saveFileDialog.Filter = "txt file | *.txt";
+            // 
             // FormMapWithSetBoats
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
@@ -236,12 +285,16 @@
             this.ClientSize = new System.Drawing.Size(1060, 645);
             this.Controls.Add(this.pictureBox);
             this.Controls.Add(this.groupBoxTools);
+            this.Controls.Add(this.menuStrip1);
             this.Name = "FormMapWithSetBoats";
             this.Text = "FormMapWithSetBoats";
             this.groupBoxTools.ResumeLayout(false);
             this.groupBoxTools.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.menuStrip1.ResumeLayout(false);
+            this.menuStrip1.PerformLayout();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
@@ -263,5 +316,11 @@
         private ListBox ListBoxMaps;
         private Button ButtonAddMap;
         private TextBox textBoxNewMapName;
+        private MenuStrip menuStrip1;
+        private ToolStripMenuItem файлToolStripMenuItem;
+        private ToolStripMenuItem SaveToolStripMenuItem;
+        private ToolStripMenuItem LoadToolStripMenuItem;
+        private OpenFileDialog openFileDialog;
+        private SaveFileDialog saveFileDialog;
     }
 }

MotorBoat/MotorBoat/FormMapWithSetBoats.cs

@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Extensions.Logging;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -12,6 +13,9 @@ namespace MotorBoat
 {
     public partial class FormMapWithSetBoats : Form
     {
+        /// <summary>
+        /// Объект от класса карты с набором объектов
+        /// </summary>
         private MapWithSetBoatsGeneric<DrawningObjectBoat, AbstractMap> _mapShipCollectionGeneric;
         private readonly Dictionary<string, AbstractMap> _mapDict = new()
         {
@@ -20,9 +24,14 @@ namespace MotorBoat
             {"Морская карта",new SeaMap() }
         };
         private readonly MapsCollection _mapsCollection;
-        public FormMapWithSetBoats()
+        private readonly ILogger _logger;
+        /// <summary>
+        /// Конструктор
+         /// </summary>
+        public FormMapWithSetBoats(ILogger<FormMapWithSetBoats> logger)
         {
             InitializeComponent();
+            _logger = logger;
             _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
             comboBoxSelectorMap.Items.Clear();
             foreach (var elem in _mapDict)
@@ -36,9 +45,8 @@ namespace MotorBoat
             int index = ListBoxMaps.SelectedIndex;
 
             ListBoxMaps.Items.Clear();
-            for (int i = 0; i < _mapsCollection.Keys.Count; i++)
+            foreach (var list in _mapsCollection.Keys)
             {
-                string? list = _mapsCollection.Keys[i];
                 ListBoxMaps.Items.Add(list);
             }
 
@@ -78,30 +86,59 @@ namespace MotorBoat
                 _mapShipCollectionGeneric = null;
             }
         }
+        /// <summary>
+        /// Выбор карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+
+        /// <summary>
+        /// Добавление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void ButtonAddBoat_Click(object sender, EventArgs e)
         {
-            if (ListBoxMaps.SelectedIndex == -1)
+            var FormBoatConfig = new FormBoatConfig();
+            FormBoatConfig.AddEvent(new(AddBoat));
+            FormBoatConfig.Show();
+
+        }
+
+        public void AddBoat(DrawningBoat boat)
+        {
+            try
             {
-                return;
-            }
-            FormBoat form = new();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                DrawningObjectBoat boat = new(form.SelectedBoat);
-                if (_mapsCollection[ListBoxMaps.SelectedItem?.ToString() ??
-               string.Empty] + boat !=-1)
+                if (ListBoxMaps.SelectedIndex == -1)
                 {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox.Image =
-                   _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                    return;
+                }
+
+                if (_mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawningObjectBoat(boat) != -1)
+                {
+                 
+                        MessageBox.Show("Объект добавлен");
+                        _logger.LogInformation("Добавлен объект {@Boat}", boat);
+                        pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                    
                 }
                 else
                 {
                     MessageBox.Show("Не удалось добавить объект");
+                    _logger.LogWarning("Не удалось добавить объект");
                 }
             }
-
+            catch (StorageOverflowException ex)
+            {
+                _logger.LogWarning("Ошибка, переполнение хранилища :{0}", ex.Message);
+                MessageBox.Show($"Ошибка хранилище переполнено: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
         }
+        /// <summary>
+        /// Удаление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void ButtonRemoveBoat_Click(object sender, EventArgs e)
         {
             if (ListBoxMaps.SelectedIndex == -1)
@@ -117,16 +154,37 @@ namespace MotorBoat
                 return;
             }
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
+            try
             {
-                MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                var boatForDel = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos;
+                if (boatForDel != null)
+                {
+                    MessageBox.Show("Объект удален");
+                    _logger.LogInformation("Из текущей карты удалён объект {@Boat}", boatForDel);
+                    pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                }
+                else
+                {
+                    _logger.LogWarning("Не удалось удалить объект по позиции {0}. Объект равен null", pos);
+                    MessageBox.Show("Не удалось удалить объект");
+                }
             }
-            else
+            catch (BoatNotFoundException ex)
             {
-                MessageBox.Show("Не удалось удалить объект");
+                _logger.LogWarning("Ошибка удаления: {0}", ex.Message);
+                MessageBox.Show($"Ошибка удаления: {ex.Message}");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning("Неизвестная ошибка удаления: {0}", ex.Message);
+                MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
             }
         }
+        /// <summary>
+        /// Вывод набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void ButtonShowStorage_Click(object sender, EventArgs e)
         {
             if (ListBoxMaps.SelectedIndex == -1)
@@ -135,6 +193,11 @@ namespace MotorBoat
             }
             pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
         }
+        /// <summary>
+        /// Вывод карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void ButtonShowOnMap_Click(object sender, EventArgs e)
         {
             if (ListBoxMaps.SelectedIndex == -1)
@@ -143,6 +206,11 @@ namespace MotorBoat
             }
             pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
         }
+        /// <summary>
+        /// Перемещение
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void ButtonMove_Click(object sender, EventArgs e)
         {
             if (ListBoxMaps.SelectedIndex == -1)
@@ -175,19 +243,23 @@ namespace MotorBoat
             if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
             {
                 MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogWarning("При добавлении карты {0}", comboBoxSelectorMap.SelectedIndex == -1 ? "Не была выбрана карта" : "Не была названа карта");
                 return;
             }
             if (!_mapDict.ContainsKey(comboBoxSelectorMap.Text))
             {
                 MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogWarning("Отсутствует карта с типом {0}", comboBoxSelectorMap.Text);
                 return;
             }
             _mapsCollection.AddMap(textBoxNewMapName.Text, _mapDict[comboBoxSelectorMap.Text]);
             ReloadMaps();
+            _logger.LogInformation($"Добавлена карта: {textBoxNewMapName.Text}");
         }
         private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
         {
             pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            _logger.LogInformation("Осуществлён переход на карту под названием {0}", ListBoxMaps.SelectedItem?.ToString() ?? string.Empty);
         }
 
         private void ButtonDeleteMap_Click(object sender, EventArgs e)
@@ -198,10 +270,50 @@ namespace MotorBoat
             }
             if (MessageBox.Show($"Удалить карту {ListBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
             {
+                _logger.LogInformation("Удалена карта {0}", ListBoxMaps.SelectedItem?.ToString() ?? string.Empty);
                 _mapsCollection.DelMap(ListBoxMaps.SelectedItem?.ToString() ?? string.Empty);
                 ReloadMaps();
             }
         }
+
+        private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _mapsCollection.SaveData(saveFileDialog.FileName);
+                    _logger.LogInformation("Сохранение прошло успешно. Расположение файла: {0}", saveFileDialog.FileName);
+                    MessageBox.Show("Сохранение прошло успешно", "Результат",
+                   MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogWarning("Не удалось сохранить файл '{0}'. Текст ошибки: {1}", saveFileDialog.FileName, ex.Message);
+                    MessageBox.Show("Не сохранилось", "Результат",
+                   MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+
+        private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _mapsCollection.LoadData(openFileDialog.FileName);
+                    _logger.LogInformation("Загрузка данных из файла '{0}' прошла успешно", openFileDialog.FileName);
+                    ReloadMaps();
+                    MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogWarning("Не удалось загрузить файл '{0}'. Текст ошибки: {1}", openFileDialog.FileName, ex.Message);
+                    MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
     }
     
 }

MotorBoat/MotorBoat/FormMapWithSetBoats.resx

@@ -57,4 +57,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>14, 13</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>129, 13</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>269, 13</value>
+  </metadata>
 </root>

MotorBoat/MotorBoat/IDrawningObject.cs

@@ -36,5 +36,9 @@ namespace MotorBoat
 		/// </summary>
 		/// <returns></returns>
 		(float Left, float Right, float Top, float Bottom) GetCurrentPosition();
+		/// Получение информации по объекту
+		/// </summary>
+		/// <returns></returns>
+		string GetInfo();
 	}
 }

MotorBoat/MotorBoat/MapWithSetBoatsGeneric.cs

@@ -22,7 +22,7 @@
         {
             int width = picWidth / _placeSizeWidth;
             int height = picHeight / _placeSizeHeight;
-            _setBoats = new SetBoatsGeneric<T>(width * height);
+            _setBoats = new SetBoatsGeneric<T>(21);
             _pictureWidth = picWidth;
             _pictureHeight = picHeight;
             _map = map;
@@ -30,6 +30,7 @@
         /// Перегрузка оператора сложения
         public static int operator +(MapWithSetBoatsGeneric<T, U> map, T boat)
         {
+           
             return map._setBoats.Insert(boat);
         }
         /// Перегрузка оператора вычитания
@@ -163,5 +164,22 @@
 
             }
         }
+        public string GetData(char separatorType, char separatorData)
+        {
+            string data = $"{_map.GetType().Name}{separatorType}";
+            foreach (var boat in _setBoats.GetBoat())
+            {
+                data += $"{boat.GetInfo()}{separatorData}";
+            }
+            return data;
+        }
+        public void LoadData(string[] records)
+        {
+            foreach (var rec in records)
+            {
+                _setBoats.Insert(DrawningObjectBoat.Create(rec) as T);
+            }
+        }
+
     }
 }

MotorBoat/MotorBoat/MapsCollection.cs

@@ -8,13 +8,16 @@ namespace MotorBoat
 {
     internal class MapsCollection
     {
-        readonly Dictionary<string, MapWithSetBoatsGeneric<DrawningObjectBoat, AbstractMap>> _mapStorages;
+
+        readonly Dictionary<string, MapWithSetBoatsGeneric<IDrawningObject, AbstractMap>> _mapStorages;
         public List<string> Keys => _mapStorages.Keys.ToList();
         private readonly int _pictureWidth;
         private readonly int _pictureHeight;
+        private readonly char separatorDict = '|';
+        private readonly char separatorData = ';';
         public MapsCollection(int pictureWidth, int pictureHeight)
         {
-            _mapStorages = new Dictionary<string, MapWithSetBoatsGeneric<DrawningObjectBoat, AbstractMap>>();
+            _mapStorages = new Dictionary<string, MapWithSetBoatsGeneric<IDrawningObject, AbstractMap>>();
             _pictureWidth = pictureWidth;
             _pictureHeight = pictureHeight;
         }
@@ -22,14 +25,14 @@ namespace MotorBoat
         {
             if (!_mapStorages.ContainsKey(name))
             {
-                _mapStorages.Add(name, new MapWithSetBoatsGeneric<DrawningObjectBoat, AbstractMap>(_pictureWidth, _pictureHeight, map));
+                _mapStorages.Add(name, new MapWithSetBoatsGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
             }
         }
         public void DelMap(string name)
         {
             if (_mapStorages.ContainsKey(name)) _mapStorages.Remove(name);
         }
-        public MapWithSetBoatsGeneric<DrawningObjectBoat, AbstractMap> this[string ind]
+        public MapWithSetBoatsGeneric<IDrawningObject, AbstractMap> this[string ind]
         {
             get
             {
@@ -40,5 +43,59 @@ namespace MotorBoat
                 return null;
             }
         }
+
+        public void SaveData(string filename)
+        {
+            if (File.Exists(filename))
+            {
+                File.Delete(filename);
+            }
+            using (StreamWriter fs = new StreamWriter(filename))
+            {
+                fs.Write($"MapsCollection{Environment.NewLine}");
+                foreach (var storage in _mapStorages)
+                {
+
+                    fs.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}");
+                }
+            }
+        }
+        public void LoadData(string filename)
+        {
+            if (!File.Exists(filename))
+            {
+                throw new FileNotFoundException("Файл не найден");
+            }
+            string str = "";
+            using (StreamReader fs = new StreamReader(filename))
+            {
+                str = fs.ReadLine();
+                if (!str.Contains("MapsCollection"))
+                {
+                    throw new FileFormatException("Формат данных в файле не правильный");
+                }
+                _mapStorages.Clear();
+                while ((str = fs.ReadLine()) != null)
+                {
+                    var elem = str.Split(separatorDict);
+                    AbstractMap map = null;
+                    switch (elem[1])
+                    {
+                        case "SimpleMap":
+                            map = new SimpleMap();
+                            break;
+                        case "PinkMap":
+                            map = new PinkMap();
+                            break;
+                        case "SeaMap":
+                            map = new SeaMap();
+                            break;
+                    }
+                    _mapStorages.Add(elem[0], new MapWithSetBoatsGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+                    _mapStorages[elem[0]].LoadData(elem[2].Split(separatorData,StringSplitOptions.RemoveEmptyEntries));
+                }
+            }
+        }
+
     }
 }

MotorBoat/MotorBoat/MotorBoat.csproj

@@ -8,6 +8,18 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
+    <PackageReference Include="Serilog.Settings.AppSettings" Version="2.2.2" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageReference Include="Serilog.Sinks.InfluxDBv2" Version="1.0.0" />
+    <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

MotorBoat/MotorBoat/Program.cs

@@ -1,3 +1,8 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Serilog;
+
 namespace MotorBoat
 {
     internal static class Program
@@ -11,7 +16,27 @@ namespace MotorBoat
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormMapWithSetBoats());
+            var services = new ServiceCollection();
+            ConfigureServices(services);
+            using (ServiceProvider serviceProvider = services.BuildServiceProvider())
+            {
+                Application.Run(serviceProvider.GetRequiredService<FormMapWithSetBoats>());
+            }
+        }
+        private static void ConfigureServices(ServiceCollection services)
+        {
+            services.AddSingleton<FormMapWithSetBoats>()
+                .AddLogging(option =>
+                {
+                    var configuration = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory())
+                    .AddJsonFile(path: "appSetting.json", optional: false, reloadOnChange: true)
+                    .Build();
+                    var logger = new LoggerConfiguration().ReadFrom.Configuration(configuration)
+                    .WriteTo.RollingFile("Logs\\log.txt")
+                    .CreateLogger();
+                    option.SetMinimumLevel(LogLevel.Information);
+                    option.AddSerilog(logger);
+                });
         }
     }
 }

MotorBoat/MotorBoat/SetBoatsGeneric.cs

@@ -27,14 +27,15 @@ namespace MotorBoat
 		}
 		public int Insert(T boat, int position)
 		{
-			if (position >= _maxCount || position < 0) return -1;
+			if (Count == _maxCount) { throw new StorageOverflowException(_maxCount); }
+			if (position > _maxCount || position < 0) return -1;
 			_places.Insert(position, boat);
 			return position;
 		}
 		public T Remove(int position)
 		{
 			// TODO проверка позиции
-			if (position >= _maxCount || position < 0) return null;
+			if (position >= Count || position < 0) throw new BoatNotFoundException(position);
 			// TODO удаление объекта из массива, присовив элементу массива значение null
 			T temp = _places[position];
 			_places.RemoveAt(position);

MotorBoat/MotorBoat/StorageOverflowException.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+    [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) { }
+    }
+}

MotorBoat/MotorBoat/appSetting.json

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