Locomotive/Locomotive/DrawningObjectLocomotive.cs

@@ -26,6 +26,7 @@ namespace Locomotive
         {
             return _locomotive?.GetCurrentPosition() ?? default;
         }
+
         public void MoveObject(Direction direction)
         {
             _locomotive?.MoveTransport(direction);
@@ -36,8 +37,5 @@ namespace Locomotive
             _locomotive?.SetPosition(x, y, width, height);   
         }
 
-        public string getInfo() => _locomotive?.getDataForSave();
-
-        public static IDrawningObject Create(string data) => new DrawningObjectLocomotive(data.createDrawningLocomotive());
     }
 }

Locomotive/Locomotive/FormMapWithSetLocomotives.Designer.cs

@@ -45,16 +45,9 @@
             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.loadFileDialog = new System.Windows.Forms.OpenFileDialog();
-            this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
             this.groupBoxTools.SuspendLayout();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
-            this.menuStrip.SuspendLayout();
             this.SuspendLayout();
             // 
             // groupBoxTools
@@ -70,9 +63,9 @@
             this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
             this.groupBoxTools.Controls.Add(this.buttonAddLocomotive);
             this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(580, 28);
+            this.groupBoxTools.Location = new System.Drawing.Point(580, 0);
             this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Size = new System.Drawing.Size(220, 540);
+            this.groupBoxTools.Size = new System.Drawing.Size(220, 546);
             this.groupBoxTools.TabIndex = 0;
             this.groupBoxTools.TabStop = false;
             this.groupBoxTools.Text = "Tools";
@@ -235,62 +228,19 @@
             // pictureBox
             // 
             this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox.Location = new System.Drawing.Point(0, 28);
+            this.pictureBox.Location = new System.Drawing.Point(0, 0);
             this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(580, 540);
+            this.pictureBox.Size = new System.Drawing.Size(580, 546);
             this.pictureBox.TabIndex = 1;
             this.pictureBox.TabStop = false;
             // 
-            // menuStrip
-            // 
-            this.menuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
-            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(800, 28);
-            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(46, 24);
-            this.fileToolStripMenuItem.Text = "File";
-            // 
-            // saveToolStripMenuItem
-            // 
-            this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
-            this.saveToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
-            this.saveToolStripMenuItem.Text = "Save";
-            this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
-            // 
-            // loadToolStripMenuItem
-            // 
-            this.loadToolStripMenuItem.Name = "loadToolStripMenuItem";
-            this.loadToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
-            this.loadToolStripMenuItem.Text = "Load";
-            this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click);
-            // 
-            // loadFileDialog
-            // 
-            this.loadFileDialog.Filter = "txt file | *.txt";
-            // 
-            // saveFileDialog
-            // 
-            this.saveFileDialog.Filter = "txt file | *.txt";
-            // 
             // FormMapWithSetLocomotives
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 568);
+            this.ClientSize = new System.Drawing.Size(800, 546);
             this.Controls.Add(this.pictureBox);
             this.Controls.Add(this.groupBoxTools);
-            this.Controls.Add(this.menuStrip);
-            this.MainMenuStrip = this.menuStrip;
             this.Name = "FormMapWithSetLocomotives";
             this.Text = "FormMapWithSetLocomotives";
             this.groupBoxTools.ResumeLayout(false);
@@ -298,10 +248,7 @@
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-            this.menuStrip.ResumeLayout(false);
-            this.menuStrip.PerformLayout();
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
@@ -324,11 +271,5 @@
         private Button buttonAddMap;
         private Button buttonDeleteMap;
         private ListBox listBoxMaps;
-        private MenuStrip menuStrip;
-        private ToolStripMenuItem fileToolStripMenuItem;
-        private ToolStripMenuItem saveToolStripMenuItem;
-        private ToolStripMenuItem loadToolStripMenuItem;
-        private OpenFileDialog loadFileDialog;
-        private SaveFileDialog saveFileDialog;
     }
 }

Locomotive/Locomotive/FormMapWithSetLocomotives.cs

@@ -186,36 +186,5 @@ namespace Locomotive
             pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
         }
 
-        private void saveToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (saveFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                if (_mapsCollection.SaveData(saveFileDialog.FileName))
-                {
-                    MessageBox.Show("Saved successfully", "Result", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                else
-                {
-                    MessageBox.Show("Saving failed", "Result", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-
-        private void loadToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (loadFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                if (_mapsCollection.LoadData(loadFileDialog.FileName))
-                {
-                    MessageBox.Show("Loaded successfully", "Result", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                else
-                {
-                    MessageBox.Show("Loading failed", "Result", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-                ReloadMaps();
-                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-            }
-        }
     }
 }

Locomotive/Locomotive/FormMapWithSetLocomotives.resx

@@ -57,16 +57,4 @@
   <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="loadFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>144, 17</value>
-  </metadata>
-  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>311, 17</value>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>33</value>
-  </metadata>
 </root>

Locomotive/Locomotive/IDrawningObject.cs

@@ -19,7 +19,5 @@ namespace Locomotive
         /// Получение текущей позиции объекта
         (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
 
-        // Получение информации по объекту
-        string getInfo();
     }
 }

Locomotive/Locomotive/MapWithSetLocomotivesGeneric.cs

@@ -158,26 +158,5 @@ namespace Locomotive
             }
         }
 
-        /// Получение данных в виде строки
-        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;
-        }
-
-        /// Загрузка списка из массива строк
-        public void LoadData(string[] records)
-        {
-            foreach (var rec in records)
-            {
-                _setLocomotives.Insert(DrawningObjectLocomotive.Create(rec) as T);
-            }
-        }
-
-
     }
 }

Locomotive/Locomotive/MapsCollection.cs

@@ -9,7 +9,7 @@ namespace Locomotive
     internal class MapsCollection
     {
         /// Словарь (хранилище) с картами
-        readonly Dictionary<string, MapWithSetLocomotivesGeneric<IDrawningObject,
+        readonly Dictionary<string, MapWithSetLocomotivesGeneric<DrawningObjectLocomotive,
        AbstractMap>> _mapStorages;
         /// Возвращение списка названий карт
         public List<string> Keys => _mapStorages.Keys.ToList();
@@ -17,16 +17,11 @@ namespace Locomotive
         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,
-            MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap>>();
+            MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>>();
             _pictureWidth = pictureWidth;
             _pictureHeight = pictureHeight;
         }
@@ -34,7 +29,7 @@ namespace Locomotive
         public void AddMap(string name, AbstractMap map)
         {
             // Логика для добавления
-            if (!_mapStorages.ContainsKey(name)) _mapStorages.Add(name, new MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+            if (!_mapStorages.ContainsKey(name)) _mapStorages.Add(name, new MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>(_pictureWidth, _pictureHeight, map));
         }
         /// Удаление карты
         public void DelMap(string name)
@@ -43,7 +38,7 @@ namespace Locomotive
             if (_mapStorages.ContainsKey(name)) _mapStorages.Remove(name);
         }
         /// Доступ к парковке
-        public MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap> this[string ind]
+        public MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap> this[string ind]
         {
             get
             {
@@ -53,71 +48,5 @@ namespace Locomotive
             }
         }
 
-        /// Сохранение информации по локомотивам в хранилище в файл
-        public bool SaveData(string filename)
-        {
-            if (File.Exists(filename))
-            {
-                File.Delete(filename);
-            }
-            using (FileStream fs = new(filename, FileMode.Create))
-            using (StreamWriter sw = new StreamWriter(fs, Encoding.UTF8))
-            {
-                sw.WriteLine("MapsCollection");
-                foreach (var storage in _mapStorages)
-                {
-
-                    sw.WriteLine(
-                        $"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}"
-                    );
-                }
-            }
-            return true;
-        }
-        /// Загрузка нформации по локомотивам в депо из файла
-        public bool LoadData(string filename)
-        {
-            if (!File.Exists(filename))
-            {
-                return false;
-            }
-            using (FileStream fs = new(filename, FileMode.Open))
-            using (StreamReader sr = new StreamReader(fs, Encoding.UTF8))
-            {
-                string curLine = sr.ReadLine();
-
-                if (!curLine.Contains("MapsCollection"))
-                {
-                    return false;
-                }
-
-                _mapStorages.Clear();
-                while ((curLine = sr.ReadLine()) != null)
-                {
-                    var elems = curLine.Split(separatorDict);
-                    AbstractMap map = null;
-
-                    switch (elems[1])
-                    {
-                        case "Simple Map":
-                            map = new SimpleMap();
-                            break;
-                        case "Spike Map":
-                            map = new SpikeMap();
-                            break;
-                        case "Rail Map":
-                            map = new RailroadMap();
-                            break;
-                    }
-
-                    _mapStorages.Add(elems[0], new MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
-                    _mapStorages[elems[0]].LoadData(elems[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
-                }
-
-                return true;
-            }
-
-
-        }
     }
 }