Merge pull request 'Malin D.V. Lab work 5' (#5 ) from LabWork_05 into LabWork_04

Reviewed-on: http://student.git.athene.tech/Danil_Malin/PIbd-21_Malin_D.V._WarmlyLocomotive_Base/pulls/5
2022-10-28 08:58:52 +04:00
13 changed files with 35 additions and 418 deletions
--- a/WarmlyLocomotive/WarmlyLocomotive/DrawningObjectLocomotive.cs
+++ b/WarmlyLocomotive/WarmlyLocomotive/DrawningObjectLocomotive.cs
@@ -30,7 +30,5 @@ namespace WarmlyLocomotive
        {
            _locomotive.SetPosition(x, y, width, height);
        }
-        public string GetInfo() => _locomotive?.GetDataForSave();
-        public static IDrawningObject Create(string data) => new DrawningObjectLocomotive(data.CreateDrawningLocomotive());
    }
 }
--- a/WarmlyLocomotive/WarmlyLocomotive/ExtentionLocomotive.cs
+++ b/WarmlyLocomotive/WarmlyLocomotive/ExtentionLocomotive.cs
@@ -1,53 +0,0 @@
-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}";
-        }
-    }
-}
--- a/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.Designer.cs
+++ b/WarmlyLocomotive/WarmlyLocomotive/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.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
@@ -70,9 +63,9 @@
            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, 24);
+            this.groupBox.Location = new System.Drawing.Point(668, 0);
            this.groupBox.Name = "groupBox";
-            this.groupBox.Size = new System.Drawing.Size(200, 638);
+            this.groupBox.Size = new System.Drawing.Size(200, 629);
            this.groupBox.TabIndex = 0;
            this.groupBox.TabStop = false;
            this.groupBox.Text = "Инструменты";
@@ -147,7 +140,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, 591);
+            this.buttonDown.Location = new System.Drawing.Point(87, 582);
            this.buttonDown.Name = "buttonDown";
            this.buttonDown.Size = new System.Drawing.Size(30, 30);
            this.buttonDown.TabIndex = 9;
@@ -159,7 +152,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, 591);
+            this.buttonRight.Location = new System.Drawing.Point(123, 582);
            this.buttonRight.Name = "buttonRight";
            this.buttonRight.Size = new System.Drawing.Size(30, 30);
            this.buttonRight.TabIndex = 8;
@@ -171,7 +164,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, 591);
+            this.buttonLeft.Location = new System.Drawing.Point(51, 582);
            this.buttonLeft.Name = "buttonLeft";
            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
            this.buttonLeft.TabIndex = 7;
@@ -183,7 +176,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, 555);
+            this.buttonUp.Location = new System.Drawing.Point(87, 546);
            this.buttonUp.Name = "buttonUp";
            this.buttonUp.Size = new System.Drawing.Size(30, 30);
            this.buttonUp.TabIndex = 6;
@@ -193,7 +186,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, 500);
+            this.buttonShowOnMap.Location = new System.Drawing.Point(19, 491);
            this.buttonShowOnMap.Name = "buttonShowOnMap";
            this.buttonShowOnMap.Size = new System.Drawing.Size(169, 30);
            this.buttonShowOnMap.TabIndex = 5;
@@ -204,7 +197,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, 452);
+            this.buttonShowStorage.Location = new System.Drawing.Point(19, 443);
            this.buttonShowStorage.Name = "buttonShowStorage";
            this.buttonShowStorage.Size = new System.Drawing.Size(169, 30);
            this.buttonShowStorage.TabIndex = 4;
@@ -215,7 +208,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, 406);
+            this.buttonRemoveLocomotive.Location = new System.Drawing.Point(19, 397);
            this.buttonRemoveLocomotive.Name = "buttonRemoveLocomotive";
            this.buttonRemoveLocomotive.Size = new System.Drawing.Size(169, 30);
            this.buttonRemoveLocomotive.TabIndex = 3;
@@ -226,7 +219,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, 377);
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(19, 368);
            this.maskedTextBoxPosition.Mask = "00";
            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
            this.maskedTextBoxPosition.Size = new System.Drawing.Size(169, 23);
@@ -235,7 +228,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, 341);
+            this.buttonAddLocomotive.Location = new System.Drawing.Point(19, 332);
            this.buttonAddLocomotive.Name = "buttonAddLocomotive";
            this.buttonAddLocomotive.Size = new System.Drawing.Size(169, 30);
            this.buttonAddLocomotive.TabIndex = 1;
@@ -246,62 +239,20 @@
            // pictureBox
            // 
            this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox.Location = new System.Drawing.Point(0, 24);
+            this.pictureBox.Location = new System.Drawing.Point(0, 0);
            this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(668, 638);
+            this.pictureBox.Size = new System.Drawing.Size(668, 629);
            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, 662);
+            this.ClientSize = new System.Drawing.Size(868, 629);
            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);
@@ -309,8 +260,6 @@
            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();

@@ -335,11 +284,5 @@
        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;
    }
 }
--- a/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs
+++ b/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs
@@ -1,5 +1,4 @@
-using Microsoft.Extensions.Logging;
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -28,16 +27,11 @@ namespace WarmlyLocomotive
        /// </summary>
        private readonly MapsCollection _mapsCollection;
        /// <summary>
-        /// Логер
-        /// </summary>
-        private readonly ILogger _logger;
-        /// <summary>
        /// Конструктор
        /// </summary>
-        public FormMapWithSetLocomotives(ILogger<FormMapWithSetLocomotives> logger)
+        public FormMapWithSetLocomotives()
        {
            InitializeComponent();
-            _logger = logger;
            _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
            comboBoxSelectorMap.Items.Clear();
            foreach (var elem in _mapsDict)
@@ -83,29 +77,14 @@ namespace WarmlyLocomotive
                return;
            }
            DrawningObjectLocomotive locomotive = new(drawningLocomotive);
-            try
+            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + locomotive != -1)
            {
-                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("Не удалось добавить объект");
-                }
+                MessageBox.Show("Объект добавлен");
+                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
            }
-            catch (StorageOverflowException ex)
+            else
            {
-                _logger.LogWarning($"Ошибка переполнения хранилища: {ex.Message}");
-                MessageBox.Show($"Ошибка переполнения хранилища: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning($"Неизвестная ошибка: {ex.Message}");
-                MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
+                MessageBox.Show("Не удалось добавить объект");
            }
        }
        /// <summary>
@@ -128,30 +107,14 @@ namespace WarmlyLocomotive
                return;
            }
            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            try
+            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
            {
-                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("Не удалось удалить объект");
-                }
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
            }
-            catch (LocomotiveNotFoundException ex)
+            else
            {
-                _logger.LogWarning($"Ошибка удаления: {ex.Message}");
-                MessageBox.Show($"Ошибка удаления: {ex.Message}");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning($"Неизвестная ошибка: {ex.Message}");
-                MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
+                MessageBox.Show("Не удалось удалить объект");
            }
        }
        /// <summary>
@@ -220,25 +183,16 @@ 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>
        /// Выбор карты
@@ -248,7 +202,6 @@ 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>
        /// Удаление карты
@@ -266,52 +219,6 @@ 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);
-                }
            }
        }
    }
--- a/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.resx
+++ b/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.resx
@@ -57,13 +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="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>
--- a/WarmlyLocomotive/WarmlyLocomotive/IDrawningObject.cs
+++ b/WarmlyLocomotive/WarmlyLocomotive/IDrawningObject.cs
@@ -36,10 +36,5 @@ namespace WarmlyLocomotive
        /// </summary>
        /// <returns></returns>
        (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
-        /// <summary>
-		/// Получение информации по объекту
-		/// </summary>
-		/// <returns></returns>
-		string GetInfo();
    }
 }
--- a/WarmlyLocomotive/WarmlyLocomotive/LocomotiveNotFoundException.cs
+++ b/WarmlyLocomotive/WarmlyLocomotive/LocomotiveNotFoundException.cs
@@ -1,19 +0,0 @@
-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) { }
-    }
-}
--- a/WarmlyLocomotive/WarmlyLocomotive/MapWithSetLocomotivesGeneric.cs
+++ b/WarmlyLocomotive/WarmlyLocomotive/MapWithSetLocomotivesGeneric.cs
@@ -108,31 +108,6 @@ 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>
        private void Shaking()
--- a/WarmlyLocomotive/WarmlyLocomotive/MapsCollection.cs
+++ b/WarmlyLocomotive/WarmlyLocomotive/MapsCollection.cs
@@ -14,7 +14,7 @@ namespace WarmlyLocomotive
        /// <summary>
        /// Словарь (хранилище) с картами
        /// </summary>
-        readonly Dictionary<string, MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap>> _mapStorages;
+        readonly Dictionary<string, MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>> _mapStorages;
        /// <summary>
        /// Возвращение списка названий карт
        /// </summary>
@@ -28,21 +28,13 @@ 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<IDrawningObject, AbstractMap>>();
+            _mapStorages = new Dictionary<string, MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>>();
            _pictureWidth = pictureWidth;
            _pictureHeight = pictureHeight;
        }
@@ -55,7 +47,7 @@ namespace WarmlyLocomotive
        {
            if (!_mapStorages.ContainsKey(name))
            {
-                _mapStorages.Add(name, new MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+                _mapStorages.Add(name, new MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>(_pictureWidth, _pictureHeight, map));
            }
        }
        /// <summary>
@@ -70,17 +62,17 @@ namespace WarmlyLocomotive
            }
        }
        /// <summary>
-        /// Доступ к депо
+        /// Доступ к парковке
        /// </summary>
        /// <param name="ind"></param>
        /// <returns></returns>
-        public MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap> this[string ind]
+        public MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap> this[string ind]
        {
            get
            {
                if (ind != String.Empty)
                {
-                    MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap> value;
+                    MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap> value;
                    if (_mapStorages.TryGetValue(ind, out value))
                    {
                        return value;
@@ -89,66 +81,5 @@ 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));
-                }
-            }
-        }
    }
 }
--- a/WarmlyLocomotive/WarmlyLocomotive/Program.cs
+++ b/WarmlyLocomotive/WarmlyLocomotive/Program.cs
@@ -1,8 +1,3 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using NLog.Extensions.Logging;
-using Serilog;
 namespace WarmlyLocomotive
 {
    internal static class Program
@@ -16,25 +11,7 @@ namespace WarmlyLocomotive
            // To customize application configuration such as set high DPI settings or default font,
            // see https://aka.ms/applicationconfiguration.
            ApplicationConfiguration.Initialize();
-            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);
-            });
+            Application.Run(new FormMapWithSetLocomotives());
        }
    }
 }
--- a/WarmlyLocomotive/WarmlyLocomotive/SetLocomotivesGeneric.cs
+++ b/WarmlyLocomotive/WarmlyLocomotive/SetLocomotivesGeneric.cs
@@ -46,7 +46,7 @@ namespace WarmlyLocomotive
        {
            if (position < 0 || position > Count || _maxCount == Count)
            {
-                throw new StorageOverflowException(_maxCount);
+                return -1;
            }
            _places.Insert(position, locomotive);
            return position;
@@ -60,7 +60,7 @@ namespace WarmlyLocomotive
        {
            if (position < 0 || position >= Count)
            {
-                throw new LocomotiveNotFoundException(position);
+                return null;
            }
            T memoryObj = _places[position];
            _places.RemoveAt(position);
--- a/WarmlyLocomotive/WarmlyLocomotive/StorageOverflowException.cs
+++ b/WarmlyLocomotive/WarmlyLocomotive/StorageOverflowException.cs
@@ -1,19 +0,0 @@
-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) { }
-    }
-}
--- a/WarmlyLocomotive/WarmlyLocomotive/WarmlyLocomotive.csproj
+++ b/WarmlyLocomotive/WarmlyLocomotive/WarmlyLocomotive.csproj
@@ -8,15 +8,6 @@
    <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>