лаба 6

ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/AbstractCompany.cs

@@ -48,7 +48,7 @@ public abstract class AbstractCompany
         _pictureWidth = picWidth;
         _pictureHeight = picHeight;
         _collection = collection;
-        _collection.SetMaxCount = GetMaxCount;
+        _collection.MaxCount = GetMaxCount;
     }
 
     /// <summary>

ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -11,7 +11,7 @@ public interface ICollectionGenericObjects<T>
     /// <summary>
     /// Установка максимального количества элементов
     /// </summary>
-    int SetMaxCount { set; }
+    int MaxCount { get; set; }
 
     /// <summary>
     /// Добавление объекта в коллекцию
@@ -41,4 +41,15 @@ public interface ICollectionGenericObjects<T>
     /// <param name="position">Позиция</param>
     /// <returns>Объект</returns>
     T? Get(int position);
+
+    /// <summary>
+	/// Получение типа коллекции
+	/// </summary>
+	CollectionType GetCollectionType { get; }
+
+    /// <summary>
+    /// Получение объектов коллекции по одному
+    /// </summary>
+    /// <returns>Поэлементый вывод элементов коллекции</returns>
+    IEnumerable<T?> GetItems();
 }

ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ListGenericObjects.cs

@@ -7,7 +7,19 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
     private int _maxCount;
     public int Count => _collection.Count;
 
-    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
+    public int MaxCount
+    {
+        get => _maxCount;
+        set
+        {
+            if (value > 0)
+            {
+                _maxCount = value;
+            }
+        }
+    }
+
+    public CollectionType GetCollectionType => CollectionType.List;
 
     /// <summary>
     /// Конструктор
@@ -55,4 +67,12 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
         _collection.RemoveAt(position);
         return obj;
     }
+
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < _collection.Count; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
 }

ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -8,10 +8,14 @@ where T : class
     /// </summary>
     private T?[] _collection;
 
-    public int Count  => _collection.Length;
+    public int Count => _collection.Length;
 
-    public int SetMaxCount
+    public int MaxCount
     {
+        get
+        {
+            return _collection.Length;
+        }
         set
         {
             if (value > 0)
@@ -28,6 +32,8 @@ where T : class
         }
     }
 
+    public CollectionType GetCollectionType => CollectionType.Massive;
+
     /// <summary>
     /// Конструктор
     /// </summary>
@@ -91,18 +97,22 @@ where T : class
         return -1;
     }
 
-    public T? Remove(int position)
+    public T Remove(int position)
     {
-        //  проверка позиции
         if (position < 0 || position >= Count)
         {
             return null;
         }
-
+        T obj = _collection[position];
-        if (_collection[position] == null) return null;
-
-        T? temp = _collection[position];
         _collection[position] = null;
-        return temp;
+        return obj;
+    }
+
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < _collection.Length; ++i)
+        {
+            yield return _collection[i];
+        }
     }
 }

ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/StorageCollection.cs

@@ -1,7 +1,9 @@
-
+using ProjectGasolineTanker.Drawnings;
+using System.Text;
+
 namespace ProjectGasolineTanker.CollectionGenericObjects;
 public class StorageCollection<T>
- where T : class
+    where T : DrawningTanker
 {
     /// <summary>
 	/// Словарь (хранилище) с коллекциями
@@ -13,6 +15,21 @@ public class StorageCollection<T>
     /// </summary>
     public List<string> Keys => _storages.Keys.ToList();
 
+    /// <summary>
+	/// Ключевое слово, с которого должен начинаться файл
+	/// </summary>
+	private readonly string _collectionKey = "CollectionsStorage";
+
+    /// <summary>
+    /// Разделитель для записи ключа и значения элемента словаря
+    /// </summary>
+    private readonly string _separatorForKeyValue = "|";
+
+    /// <summary>
+    /// Разделитель для записей коллекции данных в файл
+    /// </summary>
+    private readonly string _separatorItems = ";";
+
     /// <summary>
     /// Конструктор
     /// </summary>
@@ -74,4 +91,118 @@ public class StorageCollection<T>
             return null;
         }
     }
+
+    /// <summary>
+	/// Сохранение информации по автомобилям в хранилище в файл
+	/// </summary>
+	/// <param name="filename">Путь и имя файла</param>
+	/// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
+    public bool SaveData(string filename)
+    {
+        if (_storages.Count == 0)
+        {
+            return false;
+        }
+
+        if (File.Exists(filename))
+        {
+            File.Delete(filename);
+        }
+
+        StringBuilder sb = new();
+
+        using (StreamWriter sw = new StreamWriter(filename))
+        {
+            sw.WriteLine(_collectionKey.ToString());
+            foreach (KeyValuePair<string, ICollectionGenericObjects<T>> kvpair in _storages)
+            {
+                // не сохраняем пустые коллекции
+                if (kvpair.Value.Count == 0)
+                    continue;
+                sb.Append(kvpair.Key);
+                sb.Append(_separatorForKeyValue);
+                sb.Append(kvpair.Value.GetCollectionType);
+                sb.Append(_separatorForKeyValue);
+                sb.Append(kvpair.Value.MaxCount);
+                sb.Append(_separatorForKeyValue);
+                foreach (T? item in kvpair.Value.GetItems())
+                {
+                    string data = item?.GetDataForSave() ?? string.Empty;
+                    if (string.IsNullOrEmpty(data))
+                        continue;
+                    sb.Append(data);
+                    sb.Append(_separatorItems);
+                }
+                sw.WriteLine(sb.ToString());
+                sb.Clear();
+            }
+        }
+        return true;
+    }
+
+    /// <summary>
+	/// Загрузка информации по автомобилям в хранилище из файла
+	/// </summary>
+	/// <param name="filename">Путь и имя файла</param>
+	/// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
+	public bool LoadData(string filename)
+    {
+        if (!File.Exists(filename))
+        {
+            return false;
+        }
+
+        using (StreamReader sr = new StreamReader(filename))
+        {
+            string? str;
+            str = sr.ReadLine();
+            if (str != _collectionKey.ToString())
+                return false;
+            _storages.Clear();
+            while ((str = sr.ReadLine()) != null)
+            {
+                string[] record = str.Split(_separatorForKeyValue);
+                if (record.Length != 4)
+                {
+                    continue;
+                }
+                CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
+                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
+                if (collection == null)
+                {
+                    return false;
+                }
+
+                collection.MaxCount = Convert.ToInt32(record[2]);
+
+                string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+                foreach (string elem in set)
+                {
+                    if (elem?.CreateDrawningTanker() is T tanker)
+                    {
+                        if (collection.Insert(tanker) == -1)
+                            return false;
+                    }
+                }
+                _storages.Add(record[0], collection);
+            }
+        }
+
+        return true;
+    }
+
+    /// <summary>
+	/// Создание коллекции по типу
+	/// </summary>
+	/// <param name="collectionType"></param>
+	/// <returns></returns>
+	private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
+    {
+        return collectionType switch
+        {
+            CollectionType.Massive => new MassiveGenericObjects<T>(),
+            CollectionType.List => new ListGenericObjects<T>(),
+            _ => null,
+        };
+    }
 }

ProjectGasolineTanker/ProjectGasolineTanker/Drawnings/DrawningGasolineTanker.cs

@@ -17,6 +17,14 @@ public class DrawningGasolineTanker : DrawningTanker
     {
         EntityTanker = new EntityGasolineTanker(speed, weight, bodyColor, additionalColor, tank, signalbeacon);
     }
+    /// <summary>
+    /// Конструктор через сущность
+    /// </summary>
+    /// <param name="car">Объект класса-сущность</param>
+    public DrawningGasolineTanker(EntityTanker entityTanker) : base()
+    {
+        EntityTanker = entityTanker;
+    }
 
     public override void DrawTransport(Graphics g)
     {

ProjectGasolineTanker/ProjectGasolineTanker/Drawnings/DrawningTanker.cs

@@ -1,5 +1,5 @@
 using ProjectGasolineTanker.Entities;
-using System;
+using ProjectGasolineTanker.Drawnings;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -67,7 +67,7 @@ public class DrawningTanker
     /// <summary>
     /// Пустой конструктор
     /// </summary>
-    private DrawningTanker()
+    protected DrawningTanker()
     {
         _pictureWidth = null;
         _pictureHeight = null;
@@ -90,17 +90,27 @@ public class DrawningTanker
     /// <summary>
     /// <param name="drawingBusWidth">Ширина прорисовки танка</param>
     /// <param name="drawingBusHeight">Высота прорисовки танка</param>
-    protected DrawningTanker(int drawningCarWidth, int drawningCarHeight) : this()
+    public DrawningTanker(int drawningCarWidth, int drawningCarHeight) : this()
     {
         _drawningCarWidth = drawningCarWidth;
         _drawningCarHeight = drawningCarHeight;
     }
     /// <summary>
+    /// Конструктор через сущность
+    /// </summary>
+    /// <param name="car">Объект класса-сущность</param>
+    public DrawningTanker(EntityTanker entityTanker) : base()
+    {
+        EntityTanker = entityTanker;
+    }
+    /// <summary>
     /// Установка границ поля
     /// </summary>
     /// <param name="width">Ширина поля</param>
     /// <param name="height">Высота поля</param>
     /// <returns>true - границы заданы, false - проверка не пройдена , нельзя разместить объект в этих размерах</returns>
+
+
     public bool SetPictureSize(int width, int height)
     {
 

ProjectGasolineTanker/ProjectGasolineTanker/Drawnings/ExtentionDrawningTanker.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ProjectGasolineTanker.Entities;
+
+namespace ProjectGasolineTanker.Drawnings;
+public static class ExtentionDrawningTanker
+{
+    /// <summary>
+	/// Разделитель для записи информации по объекту в файл
+	/// </summary>
+	private static readonly string _separatorForObject = ":";
+
+    /// <summary>
+    /// Создание объекта из строки
+    /// </summary>
+    /// <param name="info">Строка с данными для создания объекта</param>
+    /// <returns>Объект</returns>
+    public static DrawningTanker? CreateDrawningTanker(this string info)
+    {
+        string[] strs = info.Split(_separatorForObject);
+        EntityTanker? tanker = EntityGasolineTanker.CreateEntityGasolineTanker(strs);
+        if (tanker != null) 
+        {
+            return new DrawningGasolineTanker(tanker);
+        }
+
+        tanker = EntityTanker.CreateEntityCar(strs);
+        if (tanker != null)
+        {
+            return new DrawningTanker(tanker);
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Получение данных для сохранения в файл
+    /// </summary>
+    /// <param name="drawningCar">Сохраняемый объект</param>
+    /// <returns>Строка с данными по объекту</returns>
+    public static string GetDataForSave(this DrawningTanker drawningTanker)
+    {
+        string[]? array = drawningTanker?.EntityTanker?.GetStringRepresentation();
+
+        if (array == null)
+        {
+            return string.Empty;
+        }
+
+        return string.Join(_separatorForObject, array);
+    }
+}

ProjectGasolineTanker/ProjectGasolineTanker/Entities/EntityGasolineTanker.cs

@@ -36,4 +36,27 @@ public class EntityGasolineTanker : EntityTanker
         Tank = tank;
         AdditionalColor = additionalColor;
     }
+    /// <summary>
+    /// Получение строк со значениями свойств объекта класса-сущности
+    /// </summary>
+    /// <returns></returns>
+    public override string[] GetStringRepresentation()
+    {
+        return new[] { nameof(EntityGasolineTanker), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name, Signalbeacon.ToString(), Tank.ToString() };
+    }
+
+    /// <summary>
+    /// Создание объекта из массива строк
+    /// </summary>
+    /// <param name="strs"></param>
+    /// <returns></returns>
+    public static EntityGasolineTanker? CreateEntityGasolineTanker(string[] strs)
+    {
+        if (strs.Length != 7 || strs[0] != nameof(EntityGasolineTanker))
+        {
+            return null;
+        }
+        return new EntityGasolineTanker(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]),
+            Color.FromName(strs[3]), Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]));
+    }
 }

ProjectGasolineTanker/ProjectGasolineTanker/Entities/EntityTanker.cs

@@ -35,4 +35,27 @@ public class EntityTanker
         Weight = weight;
         BodyColor = bodyColor;
     }
+    /// <summary>
+    /// Получение строк со значениями свойств объекта класса-сущности
+    /// </summary>
+    /// <returns></returns>
+    public virtual string[] GetStringRepresentation()
+    {
+        return new[] { nameof(EntityTanker), Speed.ToString(), Weight.ToString(), BodyColor.Name };
+    }
+
+    /// <summary>
+    /// Создание объекта из массива строк
+    /// </summary>
+    /// <param name="strs"></param>
+    /// <returns></returns>
+    public static EntityTanker? CreateEntityCar(string[] strs)
+    {
+        if (strs.Length != 4 || strs[0] != nameof(EntityTanker))
+        {
+            return null;
+        }
+
+        return new EntityTanker(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]));
+    }
 }

ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.Designer.cs

@@ -30,7 +30,13 @@ namespace ProjectGasolineTanker
         /// </summary>
         private void InitializeComponent()
         {
-            groupBoxTools = new GroupBox();
+            Инструменты = new GroupBox();
+            panelCompanyTools = new Panel();
+            buttonAddTanker = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
+            buttonGoToCheck = new Button();
+            buttonRemoveTanker = new Button();
+            buttonRefresh = new Button();
             buttonCreateCompany = new Button();
             panelStorage = new Panel();
             buttonCollectionDel = new Button();
@@ -40,40 +46,107 @@ namespace ProjectGasolineTanker
             radioButtonMassive = new RadioButton();
             textBoxCollectionName = new TextBox();
             labelCollectionName = new Label();
-            buttonRefresh = new Button();
-            buttonGoToCheck = new Button();
-            buttonRemoveTanker = new Button();
-            maskedTextBoxPosition = new MaskedTextBox();
-            buttonAddTanker = new Button();
             comboBoxSelectorCompany = new ComboBox();
             pictureBox = new PictureBox();
-            panelCompanyTools = new Panel();
+            menuStrip = new MenuStrip();
-            groupBoxTools.SuspendLayout();
+            файлToolStripMenuItem = new ToolStripMenuItem();
+            saveToolStripMenuItem = new ToolStripMenuItem();
+            loadToolStripMenuItem = new ToolStripMenuItem();
+            saveFileDialog = new SaveFileDialog();
+            openFileDialog = new OpenFileDialog();
+            Инструменты.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
             panelStorage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
-            panelCompanyTools.SuspendLayout();
+            menuStrip.SuspendLayout();
             SuspendLayout();
             // 
-            // groupBoxTools
+            // Инструменты
             // 
-            groupBoxTools.Controls.Add(panelCompanyTools);
+            Инструменты.Controls.Add(panelCompanyTools);
-            groupBoxTools.Controls.Add(buttonCreateCompany);
+            Инструменты.Controls.Add(buttonCreateCompany);
-            groupBoxTools.Controls.Add(panelStorage);
+            Инструменты.Controls.Add(panelStorage);
-            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            Инструменты.Controls.Add(comboBoxSelectorCompany);
-            groupBoxTools.Dock = DockStyle.Right;
+            Инструменты.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(783, 0);
+            Инструменты.Location = new Point(861, 24);
-            groupBoxTools.Name = "groupBoxTools";
+            Инструменты.Name = "Инструменты";
-            groupBoxTools.Size = new Size(179, 616);
+            Инструменты.Size = new Size(225, 627);
-            groupBoxTools.TabIndex = 0;
+            Инструменты.TabIndex = 0;
-            groupBoxTools.TabStop = false;
+            Инструменты.TabStop = false;
-            groupBoxTools.Text = "Инструменты";
+            Инструменты.Text = "Инструменты";
+            // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(buttonAddTanker);
+            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Controls.Add(buttonRemoveTanker);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Dock = DockStyle.Bottom;
+            panelCompanyTools.Location = new Point(3, 380);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(219, 244);
+            panelCompanyTools.TabIndex = 8;
+            // 
+            // buttonAddTanker
+            // 
+            buttonAddTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddTanker.Location = new Point(3, 21);
+            buttonAddTanker.Name = "buttonAddTanker";
+            buttonAddTanker.Size = new Size(213, 37);
+            buttonAddTanker.TabIndex = 1;
+            buttonAddTanker.Text = "Добавление грузовика";
+            buttonAddTanker.UseVisualStyleBackColor = true;
+            buttonAddTanker.Click += ButtonAddTanker_Click;
+            // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Location = new Point(3, 86);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(213, 23);
+            maskedTextBoxPosition.TabIndex = 3;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(3, 161);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(213, 40);
+            buttonGoToCheck.TabIndex = 6;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_Click;
+            // 
+            // buttonRemoveTanker
+            // 
+            buttonRemoveTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemoveTanker.Location = new Point(3, 115);
+            buttonRemoveTanker.Name = "buttonRemoveTanker";
+            buttonRemoveTanker.Size = new Size(213, 40);
+            buttonRemoveTanker.TabIndex = 4;
+            buttonRemoveTanker.Text = "Удаление автомобиль";
+            buttonRemoveTanker.UseVisualStyleBackColor = true;
+            buttonRemoveTanker.Click += ButtonRemoveTanker_Click;
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(3, 207);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(213, 40);
+            buttonRefresh.TabIndex = 5;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += ButtonRefresh_Click;
             // 
             // buttonCreateCompany
             // 
-            buttonCreateCompany.Location = new Point(6, 320);
+            buttonCreateCompany.Location = new Point(6, 350);
             buttonCreateCompany.Name = "buttonCreateCompany";
-            buttonCreateCompany.Size = new Size(167, 23);
+            buttonCreateCompany.Size = new Size(213, 24);
-            buttonCreateCompany.TabIndex = 8;
+            buttonCreateCompany.TabIndex = 7;
             buttonCreateCompany.Text = "Создать компанию";
             buttonCreateCompany.UseVisualStyleBackColor = true;
             buttonCreateCompany.Click += ButtonCreateCompany_Click;
@@ -90,14 +163,14 @@ namespace ProjectGasolineTanker
             panelStorage.Dock = DockStyle.Top;
             panelStorage.Location = new Point(3, 19);
             panelStorage.Name = "panelStorage";
-            panelStorage.Size = new Size(173, 266);
+            panelStorage.Size = new Size(219, 296);
             panelStorage.TabIndex = 7;
             // 
             // buttonCollectionDel
             // 
-            buttonCollectionDel.Location = new Point(3, 227);
+            buttonCollectionDel.Location = new Point(3, 267);
             buttonCollectionDel.Name = "buttonCollectionDel";
-            buttonCollectionDel.Size = new Size(167, 23);
+            buttonCollectionDel.Size = new Size(213, 24);
             buttonCollectionDel.TabIndex = 6;
             buttonCollectionDel.Text = "Удалить коллекцию";
             buttonCollectionDel.UseVisualStyleBackColor = true;
@@ -107,16 +180,16 @@ namespace ProjectGasolineTanker
             // 
             listBoxCollection.FormattingEnabled = true;
             listBoxCollection.ItemHeight = 15;
-            listBoxCollection.Location = new Point(3, 112);
+            listBoxCollection.Location = new Point(3, 122);
             listBoxCollection.Name = "listBoxCollection";
-            listBoxCollection.Size = new Size(167, 109);
+            listBoxCollection.Size = new Size(213, 139);
             listBoxCollection.TabIndex = 5;
             // 
             // buttonCollectionAdd
             // 
-            buttonCollectionAdd.Location = new Point(3, 83);
+            buttonCollectionAdd.Location = new Point(3, 85);
             buttonCollectionAdd.Name = "buttonCollectionAdd";
-            buttonCollectionAdd.Size = new Size(167, 23);
+            buttonCollectionAdd.Size = new Size(213, 24);
             buttonCollectionAdd.TabIndex = 4;
             buttonCollectionAdd.Text = "Добавить коллекцию";
             buttonCollectionAdd.UseVisualStyleBackColor = true;
@@ -125,7 +198,7 @@ namespace ProjectGasolineTanker
             // radioButtonList
             // 
             radioButtonList.AutoSize = true;
-            radioButtonList.Location = new Point(98, 58);
+            radioButtonList.Location = new Point(139, 60);
             radioButtonList.Name = "radioButtonList";
             radioButtonList.Size = new Size(66, 19);
             radioButtonList.TabIndex = 3;
@@ -136,7 +209,7 @@ namespace ProjectGasolineTanker
             // radioButtonMassive
             // 
             radioButtonMassive.AutoSize = true;
-            radioButtonMassive.Location = new Point(16, 58);
+            radioButtonMassive.Location = new Point(19, 60);
             radioButtonMassive.Name = "radioButtonMassive";
             radioButtonMassive.Size = new Size(67, 19);
             radioButtonMassive.TabIndex = 2;
@@ -146,130 +219,108 @@ namespace ProjectGasolineTanker
             // 
             // textBoxCollectionName
             // 
-            textBoxCollectionName.Location = new Point(3, 29);
+            textBoxCollectionName.Location = new Point(3, 31);
             textBoxCollectionName.Name = "textBoxCollectionName";
-            textBoxCollectionName.Size = new Size(167, 23);
+            textBoxCollectionName.Size = new Size(213, 23);
             textBoxCollectionName.TabIndex = 1;
             // 
             // labelCollectionName
             // 
             labelCollectionName.AutoSize = true;
-            labelCollectionName.Location = new Point(26, 11);
+            labelCollectionName.Location = new Point(47, 13);
             labelCollectionName.Name = "labelCollectionName";
             labelCollectionName.Size = new Size(125, 15);
             labelCollectionName.TabIndex = 0;
             labelCollectionName.Text = "Название коллекции:";
             // 
-            // buttonRefresh
-            // 
-            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(3, 210);
-            buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(167, 40);
-            buttonRefresh.TabIndex = 6;
-            buttonRefresh.Text = "Обновить";
-            buttonRefresh.UseVisualStyleBackColor = true;
-            buttonRefresh.Click += ButtonRefresh_Click;
-            // 
-            // buttonGoToCheck
-            // 
-            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(3, 170);
-            buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(167, 40);
-            buttonGoToCheck.TabIndex = 5;
-            buttonGoToCheck.Text = "Передать на тесты";
-            buttonGoToCheck.UseVisualStyleBackColor = true;
-            buttonGoToCheck.Click += ButtonGoToCheck_Click;
-            // 
-            // buttonRemoveTanker
-            // 
-            buttonRemoveTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRemoveTanker.Location = new Point(3, 124);
-            buttonRemoveTanker.Name = "buttonRemoveTanker";
-            buttonRemoveTanker.Size = new Size(167, 40);
-            buttonRemoveTanker.TabIndex = 4;
-            buttonRemoveTanker.Text = "Удалить автомобиль";
-            buttonRemoveTanker.UseVisualStyleBackColor = true;
-            buttonRemoveTanker.Click += ButtonRemoveTanker_Click;
-
-            // 
-            // maskedTextBoxPosition
-            // 
-            maskedTextBoxPosition.Location = new Point(3, 95);
-            maskedTextBoxPosition.Mask = "00";
-            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            maskedTextBoxPosition.Size = new Size(167, 23);
-            maskedTextBoxPosition.TabIndex = 3;
-            maskedTextBoxPosition.ValidatingType = typeof(int);
-            // 
-            // buttonAddTanker
-            // 
-            buttonAddTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddTanker.Location = new Point(3, 3);
-            buttonAddTanker.Name = "buttonAddTanker";
-            buttonAddTanker.Size = new Size(167, 40);
-            buttonAddTanker.TabIndex = 1;
-            buttonAddTanker.Text = "Добавление грузовика";
-            buttonAddTanker.UseVisualStyleBackColor = true;
-            buttonAddTanker.Click += ButtonAddTanker_Click;
-            // 
             // comboBoxSelectorCompany
             // 
             comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(6, 291);
+            comboBoxSelectorCompany.Location = new Point(6, 321);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
-            comboBoxSelectorCompany.Size = new Size(167, 23);
+            comboBoxSelectorCompany.Size = new Size(213, 23);
             comboBoxSelectorCompany.TabIndex = 0;
             comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
             // 
             // pictureBox
             // 
             pictureBox.Dock = DockStyle.Fill;
-            pictureBox.Location = new Point(0, 0);
+            pictureBox.Location = new Point(0, 24);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(783, 616);
+            pictureBox.Size = new Size(861, 627);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             // 
-            // panelCompanyTools
+            // menuStrip
             // 
-            panelCompanyTools.Controls.Add(buttonAddTanker);
+            menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
-            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
+            menuStrip.Location = new Point(0, 0);
-            panelCompanyTools.Controls.Add(buttonRefresh);
+            menuStrip.Name = "menuStrip";
-            panelCompanyTools.Controls.Add(buttonRemoveTanker);
+            menuStrip.Size = new Size(1086, 24);
-            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            menuStrip.TabIndex = 2;
-            panelCompanyTools.Dock = DockStyle.Bottom;
+            menuStrip.Text = "menuStrip1";
-            panelCompanyTools.Enabled = false;
+            // 
-            panelCompanyTools.Location = new Point(3, 360);
+            // файлToolStripMenuItem
-            panelCompanyTools.Name = "panelCompanyTools";
+            // 
-            panelCompanyTools.Size = new Size(173, 253);
+            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
-            panelCompanyTools.TabIndex = 9;
+            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
+            файлToolStripMenuItem.Size = new Size(48, 20);
+            файлToolStripMenuItem.Text = "Файл";
+            // 
+            // saveToolStripMenuItem
+            // 
+            saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+            saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
+            saveToolStripMenuItem.Size = new Size(181, 22);
+            saveToolStripMenuItem.Text = "Сохранение";
+            saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
+            // 
+            // loadToolStripMenuItem
+            // 
+            loadToolStripMenuItem.Name = "loadToolStripMenuItem";
+            loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
+            loadToolStripMenuItem.Size = new Size(181, 22);
+            loadToolStripMenuItem.Text = "Загрузка";
+            loadToolStripMenuItem.Click += loadToolStripMenuItem_Click;
+            // 
+            // saveFileDialog
+            // 
+            saveFileDialog.Filter = "txt file | *.txt";
+            // 
+            // openFileDialog
+            // 
+            openFileDialog.Filter = "txt file | *.txt";
             // 
             // FormTankerCollection
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(962, 616);
+            AutoScroll = true;
+            ClientSize = new Size(1086, 651);
             Controls.Add(pictureBox);
-            Controls.Add(groupBoxTools);
+            Controls.Add(Инструменты);
+            Controls.Add(menuStrip);
+            MainMenuStrip = menuStrip;
             Name = "FormTankerCollection";
-            Text = "Коллекция автомобилей";
+            Text = "Коллекция Грузовиков";
-            groupBoxTools.ResumeLayout(false);
+            Инструменты.ResumeLayout(false);
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
             panelStorage.ResumeLayout(false);
             panelStorage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
-            panelCompanyTools.ResumeLayout(false);
+            menuStrip.ResumeLayout(false);
-            panelCompanyTools.PerformLayout();
+            menuStrip.PerformLayout();
             ResumeLayout(false);
+            PerformLayout();
         }
 
         #endregion
 
-        private GroupBox groupBoxTools;
+        private GroupBox Инструменты;
         private ComboBox comboBoxSelectorCompany;
         private Button buttonAddTanker;
         private Button buttonRemoveTanker;
@@ -287,5 +338,11 @@ namespace ProjectGasolineTanker
         private Button buttonCollectionDel;
         private Button buttonCreateCompany;
         private Panel panelCompanyTools;
+        private MenuStrip menuStrip;
+        private ToolStripMenuItem файлToolStripMenuItem;
+        private ToolStripMenuItem saveToolStripMenuItem;
+        private ToolStripMenuItem loadToolStripMenuItem;
+        private SaveFileDialog saveFileDialog;
+        private OpenFileDialog openFileDialog;
     }
 }

ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.cs

@@ -35,12 +35,7 @@ public partial class FormTankerCollection : Form
     /// <param name="e"></param>
     private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
     {
-        switch (comboBoxSelectorCompany.Text)
+        panelCompanyTools.Enabled = false;
-        {
-            case "Хранилище":
-                _company = new CarPark(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningTanker>());
-                break;
-        }
     }
 
     /// <summary>
@@ -134,10 +129,8 @@ public partial class FormTankerCollection : Form
             return;
         }
 
-        FormGasolineTanker form = new()
+        FormGasolineTanker form = new FormGasolineTanker();
-        {
+        form.SetTanker = car;
-            SetTanker = car
-        };
         form.ShowDialog();
     }
 
@@ -207,6 +200,7 @@ public partial class FormTankerCollection : Form
         RefreshListBoxItems();
     }
 
+
     private void ButtonCreateCompany_Click(object sender, EventArgs e)
     {
         if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
@@ -232,4 +226,46 @@ public partial class FormTankerCollection : Form
         panelCompanyTools.Enabled = true;
         RefreshListBoxItems();
     }
+    /// <summary>
+    /// Обработка нажатия "Сохранение"
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+    {
+        if (saveFileDialog.ShowDialog() == DialogResult.OK)
+        {
+            if (_storageCollection.SaveData(saveFileDialog.FileName))
+            {
+                MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+            else
+            {
+                MessageBox.Show("Не сохранилось", "Результат", 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)
+        {
+            if (_storageCollection.LoadData(openFileDialog.FileName))
+            {
+                RefreshListBoxItems();
+                MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+            else
+            {
+                MessageBox.Show("Загрузка не выполнена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+    }
+
+
 }

ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.resx

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