Обработка ошибки при добавлении уже существующего объекта

WarmlyLocomotive/WarmlyLocomotive/AbstractMap.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace WarmlyLocomotive
 {
-    internal abstract class AbstractMap
+    internal abstract class AbstractMap : IEquatable<AbstractMap>
     {
         private IDrawningObject _drawningObject = null;
         protected int[,] _map = null;
@@ -136,5 +136,44 @@ namespace WarmlyLocomotive
         protected abstract void GenerateMap();
         protected abstract void DrawRoadPart(Graphics g, int i, int j);
         protected abstract void DrawBarrierPart(Graphics g, int i, int j);
+        public bool Equals(AbstractMap? other)
+        {
+            if (other == null)
+            {
+                return false;
+            }
+            var otherMap = other as AbstractMap;
+            if (otherMap == null)
+            {
+                return false;
+            }
+            if (_width != otherMap._width)
+            {
+                return false;
+            }
+            if (_height != otherMap._height)
+            {
+                return false;
+            }
+            if (_size_x != otherMap._size_x)
+            {
+                return false;
+            }
+            if (_size_y != otherMap._size_y)
+            {
+                return false;
+            }
+            for (int i = 0; i < _map.GetLength(0); i++)
+            {
+                for (int j = 0; j < _map.GetLength(1); j++)
+                {
+                    if (_map[i, j] != otherMap._map[i, j])
+                    {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
     }
 }

WarmlyLocomotive/WarmlyLocomotive/DrawningObjectLocomotive.cs

@@ -10,6 +10,7 @@ namespace WarmlyLocomotive
     {
         private DrawningLocomotive _locomotive = null;
         public float Step => _locomotive?.Locomotive?.Step ?? 0;
+        public DrawningLocomotive GetLocomotive => _locomotive;
         public DrawningObjectLocomotive(DrawningLocomotive locomotive)
         {
             _locomotive = locomotive;
@@ -30,5 +31,57 @@ namespace WarmlyLocomotive
         {
             _locomotive.SetPosition(x, y, width, height);
         }
+        public string GetInfo() => _locomotive?.GetDataForSave();
+        public static IDrawningObject Create(string data) => new DrawningObjectLocomotive(data.CreateDrawningLocomotive());
+        public bool Equals(IDrawningObject? other)
+        {
+            if (other == null)
+            {
+                return false;
+            }
+            var otherLocomotive = other as DrawningObjectLocomotive;
+            if (otherLocomotive == null)
+            {
+                return false;
+            }
+            var locomotive = _locomotive.Locomotive;
+            var otherLocomotiveLocomotive = otherLocomotive._locomotive.Locomotive;
+            if (locomotive.Speed != otherLocomotiveLocomotive.Speed)
+            {
+                return false;
+            }
+            if (locomotive.Weight != otherLocomotiveLocomotive.Weight)
+            {
+                return false;
+            }
+            if (locomotive.BodyColor != otherLocomotiveLocomotive.BodyColor)
+            {
+                return false;
+            }
+            if(locomotive is EntityWarmlyLocomotive warmlyLocomotive && otherLocomotiveLocomotive is EntityWarmlyLocomotive otherWarmlyLocomotive)
+            {
+                if(warmlyLocomotive.Pipe != otherWarmlyLocomotive.Pipe)
+                {
+                    return false;
+                }
+                if (warmlyLocomotive.FuelCompartment != otherWarmlyLocomotive.FuelCompartment)
+                {
+                    return false;
+                }
+                if (warmlyLocomotive.WarmlyLines != otherWarmlyLocomotive.WarmlyLines)
+                {
+                    return false;
+                }
+                if (warmlyLocomotive.DopColor != otherWarmlyLocomotive.DopColor)
+                {
+                    return false;
+                }
+            }
+            else if(locomotive is EntityWarmlyLocomotive || otherLocomotiveLocomotive is EntityWarmlyLocomotive)
+            {
+                return false;
+            }
+            return true;
+        }
     }
 }

WarmlyLocomotive/WarmlyLocomotive/EntityLocomotive.cs

@@ -19,7 +19,7 @@ namespace WarmlyLocomotive
         /// <summary>
         /// Цвет кузова
         /// </summary>
-        public Color BodyColor { get; private set; }
+        public Color BodyColor { get; set; }
         /// <summary>
         /// Шаг перемещения локомотива
         /// </summary>

WarmlyLocomotive/WarmlyLocomotive/EntityWarmlyLocomotive.cs

@@ -12,7 +12,7 @@ namespace WarmlyLocomotive
         /// <summary>
         /// Дополнительный цвет
         /// </summary>
-        public Color DopColor { get; private set; }
+        public Color DopColor { get; set; }
         /// <summary>
         /// Признак наличия трубы
         /// </summary>

WarmlyLocomotive/WarmlyLocomotive/ExtentionLocomotive.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyLocomotive
+{
+    internal static class ExtentionLocomotive
+    {
+        /// <summary>
+        /// Разделитель для записи информации по объекту в файл
+        /// </summary>
+        private static readonly char _separatorForObject = ':';
+        /// <summary>
+        /// Создание объекта из строки
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        public static DrawningLocomotive CreateDrawningLocomotive(this string info)
+        {
+            string[] strs = info.Split(_separatorForObject);
+            if (strs.Length == 3)
+            {
+                return new DrawningLocomotive(Convert.ToInt32(strs[0]),
+                    Convert.ToInt32(strs[1]), Color.FromName(strs[2]));
+            }
+            if (strs.Length == 7)
+            {
+                return new DrawningWarmlyLocomotive(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="drawningLocomotive"></param>
+        /// <returns></returns>
+        public static string GetDataForSave(this DrawningLocomotive drawningLocomotive)
+        {
+            var locomotive = drawningLocomotive.Locomotive;
+            var str = $"{locomotive.Speed}{_separatorForObject}{locomotive.Weight}{_separatorForObject}{locomotive.BodyColor.Name}";
+            if (locomotive is not EntityWarmlyLocomotive warmlyLocomotive)
+            {
+                return str;
+            }
+            return $"{str}{_separatorForObject}{warmlyLocomotive.DopColor.Name}{_separatorForObject}{warmlyLocomotive.Pipe}{_separatorForObject}{warmlyLocomotive.FuelCompartment}{_separatorForObject}{warmlyLocomotive.WarmlyLines}";
+        }
+    }
+}

WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.Designer.cs

@@ -0,0 +1,382 @@
+namespace WarmlyLocomotive
+{
+    partial class FormLocomotiveConfig
+    {
+        /// <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.groupBoxConfig = new System.Windows.Forms.GroupBox();
+            this.labelModifiedObject = new System.Windows.Forms.Label();
+            this.labelSimpleObject = new System.Windows.Forms.Label();
+            this.groupBoxColors = new System.Windows.Forms.GroupBox();
+            this.panelPurple = new System.Windows.Forms.Panel();
+            this.panelBlack = new System.Windows.Forms.Panel();
+            this.panelGray = new System.Windows.Forms.Panel();
+            this.panelWhite = new System.Windows.Forms.Panel();
+            this.panelYellow = new System.Windows.Forms.Panel();
+            this.panelBlue = new System.Windows.Forms.Panel();
+            this.panelGreen = new System.Windows.Forms.Panel();
+            this.panelRed = new System.Windows.Forms.Panel();
+            this.checkBoxWarmlyLines = new System.Windows.Forms.CheckBox();
+            this.checkBoxFuelCompartment = new System.Windows.Forms.CheckBox();
+            this.checkBoxPipe = new System.Windows.Forms.CheckBox();
+            this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown();
+            this.labelWeight = new System.Windows.Forms.Label();
+            this.labelSpeed = 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.groupBoxConfig.SuspendLayout();
+            this.groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
+            this.panelObject.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBoxConfig
+            // 
+            this.groupBoxConfig.Controls.Add(this.labelModifiedObject);
+            this.groupBoxConfig.Controls.Add(this.labelSimpleObject);
+            this.groupBoxConfig.Controls.Add(this.groupBoxColors);
+            this.groupBoxConfig.Controls.Add(this.checkBoxWarmlyLines);
+            this.groupBoxConfig.Controls.Add(this.checkBoxFuelCompartment);
+            this.groupBoxConfig.Controls.Add(this.checkBoxPipe);
+            this.groupBoxConfig.Controls.Add(this.numericUpDownWeight);
+            this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed);
+            this.groupBoxConfig.Controls.Add(this.labelWeight);
+            this.groupBoxConfig.Controls.Add(this.labelSpeed);
+            this.groupBoxConfig.Location = new System.Drawing.Point(12, 12);
+            this.groupBoxConfig.Name = "groupBoxConfig";
+            this.groupBoxConfig.Size = new System.Drawing.Size(493, 214);
+            this.groupBoxConfig.TabIndex = 0;
+            this.groupBoxConfig.TabStop = false;
+            this.groupBoxConfig.Text = "Параметры";
+            // 
+            // labelModifiedObject
+            // 
+            this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelModifiedObject.Location = new System.Drawing.Point(384, 154);
+            this.labelModifiedObject.Name = "labelModifiedObject";
+            this.labelModifiedObject.Size = new System.Drawing.Size(95, 38);
+            this.labelModifiedObject.TabIndex = 9;
+            this.labelModifiedObject.Text = "Продвинутый";
+            this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
+            // 
+            // labelSimpleObject
+            // 
+            this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelSimpleObject.Location = new System.Drawing.Point(281, 154);
+            this.labelSimpleObject.Name = "labelSimpleObject";
+            this.labelSimpleObject.Size = new System.Drawing.Size(95, 38);
+            this.labelSimpleObject.TabIndex = 8;
+            this.labelSimpleObject.Text = "Простой";
+            this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
+            // 
+            // groupBoxColors
+            // 
+            this.groupBoxColors.Controls.Add(this.panelPurple);
+            this.groupBoxColors.Controls.Add(this.panelBlack);
+            this.groupBoxColors.Controls.Add(this.panelGray);
+            this.groupBoxColors.Controls.Add(this.panelWhite);
+            this.groupBoxColors.Controls.Add(this.panelYellow);
+            this.groupBoxColors.Controls.Add(this.panelBlue);
+            this.groupBoxColors.Controls.Add(this.panelGreen);
+            this.groupBoxColors.Controls.Add(this.panelRed);
+            this.groupBoxColors.Location = new System.Drawing.Point(281, 22);
+            this.groupBoxColors.Name = "groupBoxColors";
+            this.groupBoxColors.Size = new System.Drawing.Size(198, 120);
+            this.groupBoxColors.TabIndex = 7;
+            this.groupBoxColors.TabStop = false;
+            this.groupBoxColors.Text = "Цвета";
+            // 
+            // panelPurple
+            // 
+            this.panelPurple.BackColor = System.Drawing.Color.Purple;
+            this.panelPurple.Location = new System.Drawing.Point(157, 68);
+            this.panelPurple.MaximumSize = new System.Drawing.Size(30, 30);
+            this.panelPurple.Name = "panelPurple";
+            this.panelPurple.Size = new System.Drawing.Size(30, 30);
+            this.panelPurple.TabIndex = 7;
+            // 
+            // panelBlack
+            // 
+            this.panelBlack.BackColor = System.Drawing.Color.Black;
+            this.panelBlack.Location = new System.Drawing.Point(111, 68);
+            this.panelBlack.MaximumSize = new System.Drawing.Size(30, 30);
+            this.panelBlack.Name = "panelBlack";
+            this.panelBlack.Size = new System.Drawing.Size(30, 30);
+            this.panelBlack.TabIndex = 6;
+            // 
+            // panelGray
+            // 
+            this.panelGray.BackColor = System.Drawing.Color.Gray;
+            this.panelGray.Location = new System.Drawing.Point(65, 68);
+            this.panelGray.MaximumSize = new System.Drawing.Size(30, 30);
+            this.panelGray.Name = "panelGray";
+            this.panelGray.Size = new System.Drawing.Size(30, 30);
+            this.panelGray.TabIndex = 5;
+            // 
+            // panelWhite
+            // 
+            this.panelWhite.BackColor = System.Drawing.Color.White;
+            this.panelWhite.Location = new System.Drawing.Point(19, 68);
+            this.panelWhite.MaximumSize = new System.Drawing.Size(30, 30);
+            this.panelWhite.Name = "panelWhite";
+            this.panelWhite.Size = new System.Drawing.Size(30, 30);
+            this.panelWhite.TabIndex = 4;
+            // 
+            // panelYellow
+            // 
+            this.panelYellow.BackColor = System.Drawing.Color.Yellow;
+            this.panelYellow.Location = new System.Drawing.Point(157, 22);
+            this.panelYellow.MaximumSize = new System.Drawing.Size(30, 30);
+            this.panelYellow.Name = "panelYellow";
+            this.panelYellow.Size = new System.Drawing.Size(30, 30);
+            this.panelYellow.TabIndex = 3;
+            // 
+            // panelBlue
+            // 
+            this.panelBlue.BackColor = System.Drawing.Color.Blue;
+            this.panelBlue.Location = new System.Drawing.Point(111, 22);
+            this.panelBlue.MaximumSize = new System.Drawing.Size(30, 30);
+            this.panelBlue.Name = "panelBlue";
+            this.panelBlue.Size = new System.Drawing.Size(30, 30);
+            this.panelBlue.TabIndex = 2;
+            // 
+            // panelGreen
+            // 
+            this.panelGreen.BackColor = System.Drawing.Color.Green;
+            this.panelGreen.Location = new System.Drawing.Point(65, 22);
+            this.panelGreen.MaximumSize = new System.Drawing.Size(30, 30);
+            this.panelGreen.Name = "panelGreen";
+            this.panelGreen.Size = new System.Drawing.Size(30, 30);
+            this.panelGreen.TabIndex = 1;
+            // 
+            // panelRed
+            // 
+            this.panelRed.BackColor = System.Drawing.Color.Red;
+            this.panelRed.Location = new System.Drawing.Point(19, 22);
+            this.panelRed.MaximumSize = new System.Drawing.Size(30, 30);
+            this.panelRed.Name = "panelRed";
+            this.panelRed.Size = new System.Drawing.Size(30, 30);
+            this.panelRed.TabIndex = 0;
+            // 
+            // checkBoxWarmlyLines
+            // 
+            this.checkBoxWarmlyLines.AutoSize = true;
+            this.checkBoxWarmlyLines.Location = new System.Drawing.Point(18, 173);
+            this.checkBoxWarmlyLines.Name = "checkBoxWarmlyLines";
+            this.checkBoxWarmlyLines.Size = new System.Drawing.Size(215, 19);
+            this.checkBoxWarmlyLines.TabIndex = 6;
+            this.checkBoxWarmlyLines.Text = "Признак наличия полос на кузове";
+            this.checkBoxWarmlyLines.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxFuelCompartment
+            // 
+            this.checkBoxFuelCompartment.AutoSize = true;
+            this.checkBoxFuelCompartment.Location = new System.Drawing.Point(18, 148);
+            this.checkBoxFuelCompartment.Name = "checkBoxFuelCompartment";
+            this.checkBoxFuelCompartment.Size = new System.Drawing.Size(234, 19);
+            this.checkBoxFuelCompartment.TabIndex = 5;
+            this.checkBoxFuelCompartment.Text = "Признак наличия отсека под топливо";
+            this.checkBoxFuelCompartment.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxPipe
+            // 
+            this.checkBoxPipe.AutoSize = true;
+            this.checkBoxPipe.Location = new System.Drawing.Point(18, 123);
+            this.checkBoxPipe.Name = "checkBoxPipe";
+            this.checkBoxPipe.Size = new System.Drawing.Size(160, 19);
+            this.checkBoxPipe.TabIndex = 4;
+            this.checkBoxPipe.Text = "Признак наличия трубы";
+            this.checkBoxPipe.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            this.numericUpDownWeight.Location = new System.Drawing.Point(86, 69);
+            this.numericUpDownWeight.Name = "numericUpDownWeight";
+            this.numericUpDownWeight.Size = new System.Drawing.Size(89, 23);
+            this.numericUpDownWeight.TabIndex = 3;
+            this.numericUpDownWeight.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // numericUpDownSpeed
+            // 
+            this.numericUpDownSpeed.Location = new System.Drawing.Point(86, 28);
+            this.numericUpDownSpeed.Name = "numericUpDownSpeed";
+            this.numericUpDownSpeed.Size = new System.Drawing.Size(89, 23);
+            this.numericUpDownSpeed.TabIndex = 2;
+            this.numericUpDownSpeed.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // labelWeight
+            // 
+            this.labelWeight.AutoSize = true;
+            this.labelWeight.Location = new System.Drawing.Point(18, 69);
+            this.labelWeight.Name = "labelWeight";
+            this.labelWeight.Size = new System.Drawing.Size(29, 15);
+            this.labelWeight.TabIndex = 1;
+            this.labelWeight.Text = "Вес:";
+            // 
+            // labelSpeed
+            // 
+            this.labelSpeed.AutoSize = true;
+            this.labelSpeed.Location = new System.Drawing.Point(18, 28);
+            this.labelSpeed.Name = "labelSpeed";
+            this.labelSpeed.Size = new System.Drawing.Size(62, 15);
+            this.labelSpeed.TabIndex = 0;
+            this.labelSpeed.Text = "Скорость:";
+            // 
+            // pictureBoxObject
+            // 
+            this.pictureBoxObject.Location = new System.Drawing.Point(21, 34);
+            this.pictureBoxObject.Name = "pictureBoxObject";
+            this.pictureBoxObject.Size = new System.Drawing.Size(230, 130);
+            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(511, 12);
+            this.panelObject.Name = "panelObject";
+            this.panelObject.Size = new System.Drawing.Size(271, 182);
+            this.panelObject.TabIndex = 2;
+            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(166, 6);
+            this.labelDopColor.Name = "labelDopColor";
+            this.labelDopColor.Size = new System.Drawing.Size(85, 25);
+            this.labelDopColor.TabIndex = 10;
+            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(21, 6);
+            this.labelBaseColor.Name = "labelBaseColor";
+            this.labelBaseColor.Size = new System.Drawing.Size(85, 25);
+            this.labelBaseColor.TabIndex = 9;
+            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(542, 200);
+            this.buttonOk.Name = "buttonOk";
+            this.buttonOk.Size = new System.Drawing.Size(89, 30);
+            this.buttonOk.TabIndex = 3;
+            this.buttonOk.Text = "Добавить";
+            this.buttonOk.UseVisualStyleBackColor = true;
+            this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(660, 200);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(89, 30);
+            this.buttonCancel.TabIndex = 4;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // FormLocomotiveConfig
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(792, 238);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonOk);
+            this.Controls.Add(this.panelObject);
+            this.Controls.Add(this.groupBoxConfig);
+            this.Name = "FormLocomotiveConfig";
+            this.Text = "Создание объекта";
+            this.groupBoxConfig.ResumeLayout(false);
+            this.groupBoxConfig.PerformLayout();
+            this.groupBoxColors.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 groupBoxConfig;
+        private NumericUpDown numericUpDownWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private Label labelWeight;
+        private Label labelSpeed;
+        private CheckBox checkBoxWarmlyLines;
+        private CheckBox checkBoxFuelCompartment;
+        private CheckBox checkBoxPipe;
+        private GroupBox groupBoxColors;
+        private Label labelModifiedObject;
+        private Label labelSimpleObject;
+        private Panel panelPurple;
+        private Panel panelBlack;
+        private Panel panelGray;
+        private Panel panelWhite;
+        private Panel panelYellow;
+        private Panel panelBlue;
+        private Panel panelGreen;
+        private Panel panelRed;
+        private PictureBox pictureBoxObject;
+        private Panel panelObject;
+        private Label labelDopColor;
+        private Label labelBaseColor;
+        private Button buttonOk;
+        private Button buttonCancel;
+    }
+}

WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.cs

@@ -0,0 +1,189 @@
+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 WarmlyLocomotive
+{
+    public partial class FormLocomotiveConfig : Form
+    {
+        DrawningLocomotive _locomotive = null;
+        /// <summary>
+        /// Событие
+        /// </summary>
+        private event Action<DrawningLocomotive> EventAddLocomotive;
+        public FormLocomotiveConfig()
+        {
+            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 += (object sender, EventArgs e) => Close();
+        }
+        /// <summary>
+        /// Отрисовать локомотив
+        /// </summary>
+        private void DrawLocomotive()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _locomotive?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height);
+            _locomotive?.DrawTransport(gr);
+            pictureBoxObject.Image = bmp;
+        }
+        /// <summary>
+        /// Добавление события
+        /// </summary>
+        /// <param name="ev"></param>
+        public void AddEvent(Action<DrawningLocomotive> ev)
+        {
+            if (EventAddLocomotive == null)
+            {
+                EventAddLocomotive = new Action<DrawningLocomotive>(ev);
+            }
+            else
+            {
+                EventAddLocomotive += ev;
+            }
+        }
+        /// <summary>
+        /// Передаем информацию при нажатии на Label
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelObject_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelObject_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.Text))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+        /// <summary>
+        /// Действия при приеме перетаскиваемой информации
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelObject_DragDrop(object sender, DragEventArgs e)
+        {
+            switch (e.Data.GetData(DataFormats.Text).ToString())
+            {
+                case "labelSimpleObject":
+                    _locomotive = new DrawningLocomotive((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White);
+                    break;
+                case "labelModifiedObject":
+                    _locomotive = new DrawningWarmlyLocomotive((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black,
+                        checkBoxPipe.Checked, checkBoxFuelCompartment.Checked, checkBoxWarmlyLines.Checked);
+                    break;
+            }
+            DrawLocomotive();
+        }
+        /// <summary>
+        /// Отправляем цвет с панели
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelColor_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelBaseColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+        /// <summary>
+        /// Принимаем основной цвет
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelBaseColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if(_locomotive != null)
+            {
+                if (e.Data.GetDataPresent(typeof(Color))) {
+                    _locomotive.Locomotive.BodyColor = (Color)e.Data.GetData(typeof(Color));
+                }
+                DrawLocomotive();
+            }
+        }
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelDopColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+        /// <summary>
+        /// Принимаем дополнительный цвет
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelDopColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_locomotive != null && _locomotive is DrawningWarmlyLocomotive warmlyLocomotive)
+            {
+                if (e.Data.GetDataPresent(typeof(Color)))
+                {
+                    if(warmlyLocomotive.Locomotive is EntityWarmlyLocomotive entityWarmlyLocomotive)
+                    {
+                        entityWarmlyLocomotive.DopColor = (Color)e.Data.GetData(typeof(Color));
+                    }
+                }
+                DrawLocomotive();
+            }
+        }
+        /// <summary>
+        /// Добавление локомотива
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonOk_Click(object sender, EventArgs e)
+        {
+            EventAddLocomotive?.Invoke(_locomotive);
+            Close();
+        }
+    }
+}

WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.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>

WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.Designer.cs

@@ -29,6 +29,8 @@
         private void InitializeComponent()
         {
             this.groupBox = new System.Windows.Forms.GroupBox();
+            this.buttonSortByColor = new System.Windows.Forms.Button();
+            this.buttonSortByType = new System.Windows.Forms.Button();
             this.groupBoxMaps = new System.Windows.Forms.GroupBox();
             this.buttonDeleteMap = new System.Windows.Forms.Button();
             this.listBoxMaps = new System.Windows.Forms.ListBox();
@@ -45,13 +47,22 @@
             this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
             this.buttonAddLocomotive = new System.Windows.Forms.Button();
             this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.menuStrip = new System.Windows.Forms.MenuStrip();
+            this.FileToolStripMenuItem = 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.groupBox.SuspendLayout();
             this.groupBoxMaps.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.menuStrip.SuspendLayout();
             this.SuspendLayout();
             // 
             // groupBox
             // 
+            this.groupBox.Controls.Add(this.buttonSortByColor);
+            this.groupBox.Controls.Add(this.buttonSortByType);
             this.groupBox.Controls.Add(this.groupBoxMaps);
             this.groupBox.Controls.Add(this.buttonDown);
             this.groupBox.Controls.Add(this.buttonRight);
@@ -63,13 +74,33 @@
             this.groupBox.Controls.Add(this.maskedTextBoxPosition);
             this.groupBox.Controls.Add(this.buttonAddLocomotive);
             this.groupBox.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBox.Location = new System.Drawing.Point(668, 0);
+            this.groupBox.Location = new System.Drawing.Point(668, 24);
             this.groupBox.Name = "groupBox";
-            this.groupBox.Size = new System.Drawing.Size(200, 629);
+            this.groupBox.Size = new System.Drawing.Size(200, 693);
             this.groupBox.TabIndex = 0;
             this.groupBox.TabStop = false;
             this.groupBox.Text = "Инструменты";
             // 
+            // buttonSortByColor
+            // 
+            this.buttonSortByColor.Location = new System.Drawing.Point(19, 340);
+            this.buttonSortByColor.Name = "buttonSortByColor";
+            this.buttonSortByColor.Size = new System.Drawing.Size(169, 30);
+            this.buttonSortByColor.TabIndex = 12;
+            this.buttonSortByColor.Text = "Сортировать по цвету";
+            this.buttonSortByColor.UseVisualStyleBackColor = true;
+            this.buttonSortByColor.Click += new System.EventHandler(this.ButtonSortByColor_Click);
+            // 
+            // buttonSortByType
+            // 
+            this.buttonSortByType.Location = new System.Drawing.Point(19, 304);
+            this.buttonSortByType.Name = "buttonSortByType";
+            this.buttonSortByType.Size = new System.Drawing.Size(169, 30);
+            this.buttonSortByType.TabIndex = 11;
+            this.buttonSortByType.Text = "Сортировать по типу";
+            this.buttonSortByType.UseVisualStyleBackColor = true;
+            this.buttonSortByType.Click += new System.EventHandler(this.ButtonSortByType_Click);
+            // 
             // groupBoxMaps
             // 
             this.groupBoxMaps.Controls.Add(this.buttonDeleteMap);
@@ -140,7 +171,7 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::WarmlyLocomotive.Properties.Resources.arrowDown;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(87, 582);
+            this.buttonDown.Location = new System.Drawing.Point(87, 646);
             this.buttonDown.Name = "buttonDown";
             this.buttonDown.Size = new System.Drawing.Size(30, 30);
             this.buttonDown.TabIndex = 9;
@@ -152,7 +183,7 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::WarmlyLocomotive.Properties.Resources.arrowRight;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(123, 582);
+            this.buttonRight.Location = new System.Drawing.Point(123, 646);
             this.buttonRight.Name = "buttonRight";
             this.buttonRight.Size = new System.Drawing.Size(30, 30);
             this.buttonRight.TabIndex = 8;
@@ -164,7 +195,7 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::WarmlyLocomotive.Properties.Resources.arrowLeft;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(51, 582);
+            this.buttonLeft.Location = new System.Drawing.Point(51, 646);
             this.buttonLeft.Name = "buttonLeft";
             this.buttonLeft.Size = new System.Drawing.Size(30, 30);
             this.buttonLeft.TabIndex = 7;
@@ -176,7 +207,7 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::WarmlyLocomotive.Properties.Resources.arrowUp;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(87, 546);
+            this.buttonUp.Location = new System.Drawing.Point(87, 610);
             this.buttonUp.Name = "buttonUp";
             this.buttonUp.Size = new System.Drawing.Size(30, 30);
             this.buttonUp.TabIndex = 6;
@@ -186,7 +217,7 @@
             // buttonShowOnMap
             // 
             this.buttonShowOnMap.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonShowOnMap.Location = new System.Drawing.Point(19, 491);
+            this.buttonShowOnMap.Location = new System.Drawing.Point(19, 554);
             this.buttonShowOnMap.Name = "buttonShowOnMap";
             this.buttonShowOnMap.Size = new System.Drawing.Size(169, 30);
             this.buttonShowOnMap.TabIndex = 5;
@@ -197,7 +228,7 @@
             // buttonShowStorage
             // 
             this.buttonShowStorage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonShowStorage.Location = new System.Drawing.Point(19, 443);
+            this.buttonShowStorage.Location = new System.Drawing.Point(19, 506);
             this.buttonShowStorage.Name = "buttonShowStorage";
             this.buttonShowStorage.Size = new System.Drawing.Size(169, 30);
             this.buttonShowStorage.TabIndex = 4;
@@ -208,7 +239,7 @@
             // buttonRemoveLocomotive
             // 
             this.buttonRemoveLocomotive.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonRemoveLocomotive.Location = new System.Drawing.Point(19, 397);
+            this.buttonRemoveLocomotive.Location = new System.Drawing.Point(19, 460);
             this.buttonRemoveLocomotive.Name = "buttonRemoveLocomotive";
             this.buttonRemoveLocomotive.Size = new System.Drawing.Size(169, 30);
             this.buttonRemoveLocomotive.TabIndex = 3;
@@ -219,7 +250,7 @@
             // maskedTextBoxPosition
             // 
             this.maskedTextBoxPosition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(19, 368);
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(19, 431);
             this.maskedTextBoxPosition.Mask = "00";
             this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
             this.maskedTextBoxPosition.Size = new System.Drawing.Size(169, 23);
@@ -228,7 +259,7 @@
             // buttonAddLocomotive
             // 
             this.buttonAddLocomotive.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonAddLocomotive.Location = new System.Drawing.Point(19, 332);
+            this.buttonAddLocomotive.Location = new System.Drawing.Point(19, 395);
             this.buttonAddLocomotive.Name = "buttonAddLocomotive";
             this.buttonAddLocomotive.Size = new System.Drawing.Size(169, 30);
             this.buttonAddLocomotive.TabIndex = 1;
@@ -239,20 +270,62 @@
             // 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(668, 629);
+            this.pictureBox.Size = new System.Drawing.Size(668, 693);
             this.pictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
             this.pictureBox.TabIndex = 1;
             this.pictureBox.TabStop = false;
             // 
+            // menuStrip
+            // 
+            this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.FileToolStripMenuItem});
+            this.menuStrip.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip.Name = "menuStrip";
+            this.menuStrip.Size = new System.Drawing.Size(868, 24);
+            this.menuStrip.TabIndex = 2;
+            // 
+            // FileToolStripMenuItem
+            // 
+            this.FileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.SaveToolStripMenuItem,
+            this.LoadToolStripMenuItem});
+            this.FileToolStripMenuItem.Name = "FileToolStripMenuItem";
+            this.FileToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
+            this.FileToolStripMenuItem.Text = "Файл";
+            // 
+            // SaveToolStripMenuItem
+            // 
+            this.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
+            this.SaveToolStripMenuItem.Size = new System.Drawing.Size(141, 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(141, 22);
+            this.LoadToolStripMenuItem.Text = "Загрузка";
+            this.LoadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click);
+            // 
+            // openFileDialog
+            // 
+            this.openFileDialog.Filter = "txt file|*.txt";
+            // 
+            // saveFileDialog
+            // 
+            this.saveFileDialog.Filter = "txt file|*.txt";
+            // 
             // FormMapWithSetLocomotives
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(868, 629);
+            this.ClientSize = new System.Drawing.Size(868, 717);
             this.Controls.Add(this.pictureBox);
             this.Controls.Add(this.groupBox);
+            this.Controls.Add(this.menuStrip);
+            this.MainMenuStrip = this.menuStrip;
             this.Name = "FormMapWithSetLocomotives";
             this.Text = "Карта с набором объектов";
             this.groupBox.ResumeLayout(false);
@@ -260,6 +333,8 @@
             this.groupBoxMaps.ResumeLayout(false);
             this.groupBoxMaps.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.menuStrip.ResumeLayout(false);
+            this.menuStrip.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -284,5 +359,13 @@
         private ListBox listBoxMaps;
         private Button buttonAddMap;
         private TextBox textBoxNewMapName;
+        private MenuStrip menuStrip;
+        private ToolStripMenuItem FileToolStripMenuItem;
+        private ToolStripMenuItem SaveToolStripMenuItem;
+        private ToolStripMenuItem LoadToolStripMenuItem;
+        private OpenFileDialog openFileDialog;
+        private SaveFileDialog saveFileDialog;
+        private Button buttonSortByColor;
+        private Button buttonSortByType;
     }
 }

WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs

@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Extensions.Logging;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -27,11 +28,16 @@ namespace WarmlyLocomotive
         /// </summary>
         private readonly MapsCollection _mapsCollection;
         /// <summary>
+        /// Логер
+        /// </summary>
+        private readonly ILogger _logger;
+        /// <summary>
         /// Конструктор
         /// </summary>
-        public FormMapWithSetLocomotives()
+        public FormMapWithSetLocomotives(ILogger<FormMapWithSetLocomotives> logger)
         {
             InitializeComponent();
+            _logger = logger;
             _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
             comboBoxSelectorMap.Items.Clear();
             foreach (var elem in _mapsDict)
@@ -65,25 +71,47 @@ namespace WarmlyLocomotive
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void ButtonAddLocomotive_Click(object sender, EventArgs e)
+        {
+            var formLocomotiveConfig = new FormLocomotiveConfig();
+            formLocomotiveConfig.AddEvent(AddLocomotive);
+            formLocomotiveConfig.Show();
+        }
+        private void AddLocomotive(DrawningLocomotive drawningLocomotive)
         {
             if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            FormLocomotive form = new();
-            if (form.ShowDialog() == DialogResult.OK)
+            DrawningObjectLocomotive locomotive = new(drawningLocomotive);
+            try
             {
-                DrawningObjectLocomotive locomotive = new(form.SelectedLocomotive);
                 if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + locomotive != -1)
                 {
+                    _logger.LogInformation($"Добавление объекта {locomotive}");
                     MessageBox.Show("Объект добавлен");
                     pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
                 }
                 else
                 {
+                    _logger.LogInformation("Не удалось добавить объект");
                     MessageBox.Show("Не удалось добавить объект");
                 }
             }
+            catch (StorageOverflowException ex)
+            {
+                _logger.LogWarning($"Ошибка переполнения хранилища: {ex.Message}");
+                MessageBox.Show($"Ошибка переполнения хранилища: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+            catch(ArgumentException ex)
+            {
+                _logger.LogWarning($"Ошибка при добавлении: {ex.Message}");
+                MessageBox.Show($"Ошибка при добавлении: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning($"Неизвестная ошибка: {ex.Message}");
+                MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
+            }
         }
         /// <summary>
         /// Удаление объекта
@@ -105,14 +133,30 @@ namespace WarmlyLocomotive
                 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 deletedLocomotive = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos;
+                if (deletedLocomotive != null)
+                {
+                    _logger.LogInformation($"Объект {deletedLocomotive} удалён");
+                    MessageBox.Show("Объект удален");
+                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                }
+                else
+                {
+                    _logger.LogInformation($"Не удалось удалить объект по позиции {pos}");
+                    MessageBox.Show("Не удалось удалить объект");
+                }
             }
-            else
+            catch (LocomotiveNotFoundException ex)
             {
-                MessageBox.Show("Не удалось удалить объект");
+                _logger.LogWarning($"Ошибка удаления: {ex.Message}");
+                MessageBox.Show($"Ошибка удаления: {ex.Message}");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning($"Неизвестная ошибка: {ex.Message}");
+                MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
             }
         }
         /// <summary>
@@ -181,16 +225,25 @@ namespace WarmlyLocomotive
         {
             if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
             {
+                _logger.LogInformation("Не все данные заполнены при попытке создании карты");
                 MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
             }
             if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text))
             {
+                _logger.LogInformation($"Нет карты с названием {comboBoxSelectorMap.Text}");
                 MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
             }
+            if(textBoxNewMapName.Text.Contains('|') || textBoxNewMapName.Text.Contains(':') || textBoxNewMapName.Text.Contains(';'))
+            {
+                _logger.LogInformation("Присутствуют символы, недопустимые для имени карты");
+                MessageBox.Show("Присутствуют символы, недопустимые для имени карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
             _mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]);
             ReloadMaps();
+            _logger.LogInformation($"Добавлена карта {textBoxNewMapName.Text}");
         }
         /// <summary>
         /// Выбор карты
@@ -200,6 +253,7 @@ namespace WarmlyLocomotive
         private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
         {
             pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            _logger.LogInformation($"Текущая карта сменена на {listBoxMaps.SelectedItem?.ToString() ?? string.Empty}");
         }
         /// <summary>
         /// Удаление карты
@@ -217,7 +271,81 @@ namespace WarmlyLocomotive
             {
                 _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
                 ReloadMaps();
+                _logger.LogInformation($"Удалена карта {listBoxMaps.SelectedItem?.ToString() ?? string.Empty}");
             }
         }
+        /// <summary>
+        /// Обработка нажатия "Сохранение"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _mapsCollection.SaveData(saveFileDialog.FileName);
+                    _logger.LogInformation($"Успешное сохранение по пути {saveFileDialog.FileName}");
+                    MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogWarning($"Не удалось сохранить данные. Ошибка - {ex.Message}");
+                    MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+        /// <summary>
+        /// Обработка нажатия "Загрузка"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if(openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _mapsCollection.LoadData(openFileDialog.FileName);
+                    ReloadMaps();
+                    _logger.LogInformation($"Успешная загрузка по пути {openFileDialog.FileName}");
+                    MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogWarning($"Не удалось загрузить данные. Ошибка - {ex.Message}");
+                    MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+        /// <summary>
+        /// Сортировка по типу
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonSortByType_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].Sort(new LocomotiveCompareByType());
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+        /// <summary>
+        /// Сортировка по цвету
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonSortByColor_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].Sort(new LocomotiveCompareByColor());
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
     }
 }

WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.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="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>125, 17</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>265, 17</value>
+  </metadata>
 </root>

WarmlyLocomotive/WarmlyLocomotive/IDrawningObject.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace WarmlyLocomotive
 {
-    internal interface IDrawningObject
+    internal interface IDrawningObject  : IEquatable<IDrawningObject>
     {
         /// <summary>
 		/// Шаг перемещения объекта
@@ -36,5 +36,10 @@ namespace WarmlyLocomotive
         /// </summary>
         /// <returns></returns>
         (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
+        /// <summary>
+		/// Получение информации по объекту
+		/// </summary>
+		/// <returns></returns>
+		string GetInfo();
     }
 }

WarmlyLocomotive/WarmlyLocomotive/LocomotiveCompareByColor.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+
+namespace WarmlyLocomotive
+{
+    internal class LocomotiveCompareByColor : IComparer<IDrawningObject>
+    {
+        public int Compare(IDrawningObject? x, IDrawningObject? y)
+        {
+            if (x == null && y == null)
+            {
+                return 0;
+            }
+            if (x == null && y != null)
+            {
+                return 1;
+            }
+            if (x != null && y == null)
+            {
+                return -1;
+            }
+            var xLocomotive = x as DrawningObjectLocomotive;
+            var yLocomotive = y as DrawningObjectLocomotive;
+            if (xLocomotive == null && yLocomotive == null)
+            {
+                return 0;
+            }
+            if (xLocomotive == null && yLocomotive != null)
+            {
+                return 1;
+            }
+            if (xLocomotive != null && yLocomotive == null)
+            {
+                return -1;
+            }
+            var xEntityLocomotive = xLocomotive.GetLocomotive.Locomotive;
+            var yEntityLocomotive = yLocomotive.GetLocomotive.Locomotive;
+            var baseColorCompare = xEntityLocomotive.BodyColor.ToArgb().CompareTo(yEntityLocomotive.BodyColor.ToArgb());
+            if(baseColorCompare != 0)
+            {
+                return baseColorCompare;
+            }
+            if(xEntityLocomotive is EntityWarmlyLocomotive xWarmlyLocomotive && yEntityLocomotive is EntityWarmlyLocomotive yWarmlyLocomotive)
+            {
+                var dopColorCompare = xWarmlyLocomotive.DopColor.ToArgb().CompareTo(yWarmlyLocomotive.DopColor.ToArgb());
+                if (dopColorCompare != 0)
+                {
+                    return dopColorCompare;
+                }
+            }
+            var speedCompare = xLocomotive.GetLocomotive.Locomotive.Speed.CompareTo(yLocomotive.GetLocomotive.Locomotive.Speed);
+            if (speedCompare != 0)
+            {
+                return speedCompare;
+            }
+            return xLocomotive.GetLocomotive.Locomotive.Weight.CompareTo(yLocomotive.GetLocomotive.Locomotive.Weight);
+        }
+    }
+}

WarmlyLocomotive/WarmlyLocomotive/LocomotiveCompareByType.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyLocomotive
+{
+    internal class LocomotiveCompareByType : IComparer<IDrawningObject>
+    {
+        public int Compare(IDrawningObject? x, IDrawningObject? y)
+        {
+            if (x == null && y == null)
+            {
+                return 0;
+            }
+            if (x == null && y != null)
+            {
+                return 1;
+            }
+            if (x != null && y == null)
+            {
+                return -1;
+            }
+            var xLocomotive = x as DrawningObjectLocomotive;
+            var yLocomotive = y as DrawningObjectLocomotive;
+            if (xLocomotive == null && yLocomotive == null)
+            {
+                return 0;
+            }
+            if (xLocomotive == null && yLocomotive != null)
+            {
+                return 1;
+            }
+            if (xLocomotive != null && yLocomotive == null)
+            {
+                return -1;
+            }
+            if (xLocomotive.GetLocomotive.GetType().Name != yLocomotive.GetLocomotive.GetType().Name)
+            {
+                if (xLocomotive.GetLocomotive.GetType().Name == "DrawningLocomotive")
+                {
+                    return -1;
+                }
+                return 1;
+            }
+            var speedCompare = xLocomotive.GetLocomotive.Locomotive.Speed.CompareTo(yLocomotive.GetLocomotive.Locomotive.Speed);
+            if (speedCompare != 0)
+            {
+                return speedCompare;
+            }
+            return xLocomotive.GetLocomotive.Locomotive.Weight.CompareTo(yLocomotive.GetLocomotive.Locomotive.Weight);
+        }
+    }
+}

WarmlyLocomotive/WarmlyLocomotive/LocomotiveNotFoundException.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 WarmlyLocomotive
+{
+    [Serializable]
+    internal class LocomotiveNotFoundException : ApplicationException
+    {
+        public LocomotiveNotFoundException(int i) : base($"Не найден объект по позиции {i}") { }
+        public LocomotiveNotFoundException() : base() { }
+        public LocomotiveNotFoundException(string message) : base(message) { }
+        public LocomotiveNotFoundException(string message, Exception exception) : base(message, exception) { }
+        protected LocomotiveNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+    }
+}

WarmlyLocomotive/WarmlyLocomotive/MapWithSetLocomotivesGeneric.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 namespace WarmlyLocomotive
 {
     internal class MapWithSetLocomotivesGeneric<T, U>
-        where T : class, IDrawningObject
+        where T : class, IDrawningObject, IEquatable<T>
         where U : AbstractMap
     {
         /// <summary>
@@ -108,6 +108,39 @@ namespace WarmlyLocomotive
             return new(_pictureWidth, _pictureHeight);
         }
         /// <summary>
+        /// Получение данных в виде строки
+        /// </summary>
+        /// <param name="sep"></param>
+        /// <returns></returns>
+        public string GetData(char separatorType, char separatorData)
+        {
+            string data = $"{_map.GetType().Name}{separatorType}";
+            foreach (var locomotive in _setLocomotives.GetLocomotives())
+            {
+                data += $"{locomotive.GetInfo()}{separatorData}";
+            }
+            return data;
+        }
+        /// <summary>
+        /// Загрузка списка из массива строк
+        /// </summary>
+        /// <param name="records"></param>
+        public void LoadData(string[] records)
+        {
+            foreach (var rec in records)
+            {
+                _setLocomotives.Insert(DrawningObjectLocomotive.Create(rec) as T);
+            }
+        }
+        /// <summary>
+        /// Сортировка
+        /// </summary>
+        /// <param name="comparer"></param>
+        public void Sort(IComparer<T> comparer)
+        {
+            _setLocomotives.SortSet(comparer);
+        }
+        /// <summary>
         /// "Взбалтываем" набор, чтобы все элементы оказались в начале
         /// </summary>
         private void Shaking()

WarmlyLocomotive/WarmlyLocomotive/MapsCollection.cs

@@ -14,7 +14,7 @@ namespace WarmlyLocomotive
         /// <summary>
         /// Словарь (хранилище) с картами
         /// </summary>
-        readonly Dictionary<string, MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>> _mapStorages;
+        readonly Dictionary<string, MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap>> _mapStorages;
         /// <summary>
         /// Возвращение списка названий карт
         /// </summary>
@@ -28,13 +28,21 @@ namespace WarmlyLocomotive
         /// </summary>
         private readonly int _pictureHeight;
         /// <summary>
+        /// Разделитель для записи информации по элементу словаря в файл
+        /// </summary>
+        private readonly char separatorDict = '|';
+        /// <summary>
+        /// Разделитель для записей коллекции данных в файл
+        /// </summary>
+        private readonly char separatorData = ';';
+        /// <summary>
         /// Конструктор
         /// </summary>
         /// <param name="pictureWidth"></param>
         /// <param name="pictureHeight"></param>
         public MapsCollection(int pictureWidth, int pictureHeight)
         {
-            _mapStorages = new Dictionary<string, MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>>();
+            _mapStorages = new Dictionary<string, MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap>>();
             _pictureWidth = pictureWidth;
             _pictureHeight = pictureHeight;
         }
@@ -47,7 +55,7 @@ namespace WarmlyLocomotive
         {
             if (!_mapStorages.ContainsKey(name))
             {
-                _mapStorages.Add(name, new MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>(_pictureWidth, _pictureHeight, map));
+                _mapStorages.Add(name, new MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
             }
         }
         /// <summary>
@@ -62,17 +70,17 @@ namespace WarmlyLocomotive
             }
         }
         /// <summary>
-        /// Доступ к парковке
+        /// Доступ к депо
         /// </summary>
         /// <param name="ind"></param>
         /// <returns></returns>
-        public MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap> this[string ind]
+        public MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap> this[string ind]
         {
             get
             {
                 if (ind != String.Empty)
                 {
-                    MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap> value;
+                    MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap> value;
                     if (_mapStorages.TryGetValue(ind, out value))
                     {
                         return value;
@@ -81,5 +89,66 @@ namespace WarmlyLocomotive
                 return null;
             }
         }
+        /// <summary>
+        /// Сохранение информации по локомотивам в хранилище в файл
+        /// </summary>
+        /// <param name="filename">Путь и имя файла</param>
+        /// <returns></returns>
+        public void SaveData(string filename)
+        {
+            if (File.Exists(filename))
+            {
+                File.Delete(filename);
+            }
+            using (StreamWriter sw = new(filename))
+            {
+                sw.Write($"MapsCollection{Environment.NewLine}");
+                foreach (var storage in _mapStorages)
+                {
+                    sw.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}");
+                }
+            }
+        }
+        /// <summary>
+        /// Загрузка информации по локомотивам в депо из файла
+        /// </summary>
+        /// <param name="filename"></param>
+        /// <returns></returns>
+        public void LoadData(string filename)
+        {
+            if (!File.Exists(filename))
+            {
+                throw new FileNotFoundException("Файл не найден");
+            }
+            using (StreamReader sr = new(filename))
+            {
+                string str = sr.ReadLine();
+                if (!str.Contains("MapsCollection"))
+                {
+                    //если нет такой записи, то это не те данные
+                    throw new FileFormatException("Формат данных в файле не правильный");
+                }
+                _mapStorages.Clear();
+                while ((str = sr.ReadLine()) != null)
+                {
+                    var elem = str.Split(separatorDict);
+                    AbstractMap map = null;
+                    switch (elem[1])
+                    {
+                        case "SimpleMap":
+                            map = new SimpleMap();
+                            break;
+                        case "BigBarriersMap":
+                            map = new BigBarriersMap();
+                            break;
+                        case "CirclesMap":
+                            map = new CirclesMap();
+                            break;
+                    }
+                    _mapStorages.Add(elem[0], new MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+                    _mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
+                }
+            }
+        }
     }
 }

WarmlyLocomotive/WarmlyLocomotive/Program.cs

@@ -1,3 +1,8 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using NLog.Extensions.Logging;
+using Serilog;
 namespace WarmlyLocomotive
 {
     internal static class Program
@@ -11,7 +16,25 @@ namespace WarmlyLocomotive
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormMapWithSetLocomotives());
+            var services = new ServiceCollection();
+            ConfigureServices(services);
+            using (ServiceProvider serviceProvider = services.BuildServiceProvider())
+            {
+                Application.Run(serviceProvider.GetRequiredService<FormMapWithSetLocomotives>());
+            }
+        }
+
+        private static void ConfigureServices(ServiceCollection services)
+        {
+            services.AddSingleton<FormMapWithSetLocomotives>()
+            .AddLogging(option =>
+            {
+                var serilogLogger = new LoggerConfiguration()
+                   .WriteTo.File("LogOfProgram.txt")
+                   .CreateLogger();
+                option.SetMinimumLevel(LogLevel.Information);
+                option.AddSerilog(serilogLogger, true);
+            });
         }
     }
 }

WarmlyLocomotive/WarmlyLocomotive/SetLocomotivesGeneric.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 namespace WarmlyLocomotive
 {
     internal class SetLocomotivesGeneric<T>
-        where T : class
+        where T : class, IEquatable<T>
     {
         /// <summary>
 		/// Список объектов, которые храним
@@ -44,9 +44,13 @@ namespace WarmlyLocomotive
         /// <returns></returns>
         public int Insert(T locomotive, int position)
         {
+            if (_places.Contains(locomotive))
+            {
+                throw new ArgumentException($"Объект {locomotive} уже присутствует в наборе");
+            }
             if (position < 0 || position > Count || _maxCount == Count)
             {
-                return -1;
+                throw new StorageOverflowException(_maxCount);
             }
             _places.Insert(position, locomotive);
             return position;
@@ -60,7 +64,7 @@ namespace WarmlyLocomotive
         {
             if (position < 0 || position >= Count)
             {
-                return null;
+                throw new LocomotiveNotFoundException(position);
             }
             T memoryObj = _places[position];
             _places.RemoveAt(position);
@@ -107,5 +111,17 @@ namespace WarmlyLocomotive
                 }
             }
         }
+        /// <summary>
+		/// Сортировка набора объектов
+		/// </summary>
+		/// <param name="comparer"></param>
+		public void SortSet(IComparer<T> comparer)
+        {
+            if (comparer == null)
+            {
+                return;
+            }
+            _places.Sort(comparer);
+        }
     }
 }

WarmlyLocomotive/WarmlyLocomotive/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 WarmlyLocomotive
+{
+    [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 contex) : base(info, contex) { }
+    }
+}

WarmlyLocomotive/WarmlyLocomotive/WarmlyLocomotive.csproj

@@ -8,6 +8,15 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.1.0" />
+    <PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>