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

ProjectExcavator/ProjectExcavator/CollectionGenericObjects/AbstractCompany.cs

@@ -35,7 +35,7 @@ public abstract class AbstractCompany
     /// <summary>
     /// Вычисление максимального количества элементов, который можно разместить в окне
     /// </summary>
-    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+    private int GetMaxCount => (_pictureWidth / _placeSizeWidth)*(_pictureHeight / (_placeSizeHeight + 60));
 
     /// <summary>
     /// Конструктор
@@ -48,7 +48,7 @@ public abstract class AbstractCompany
         _pictureWidth = picWidth;
         _pictureHeight = picHeight;
         _collection = collection;
-        _collection.SetMaxCount = GetMaxCount;
+        _collection.MaxCount = GetMaxCount;
     }
 
     /// <summary>
@@ -70,7 +70,7 @@ public abstract class AbstractCompany
     /// <returns></returns>
     public static DrawningTrackedVehicle operator -(AbstractCompany company, int position)
     {
-        return company._collection.Remove(position);
+        return company._collection?.Remove(position) ?? null;
     }
 
     /// <summary>

ProjectExcavator/ProjectExcavator/CollectionGenericObjects/CollectionType.cs

@@ -0,0 +1,22 @@
+namespace ProjectExcavator.CollectionGenericObjects;
+
+/// <summary>
+/// Тип коллекции
+/// </summary>
+public enum CollectionType
+{
+	/// <summary>
+	/// Неопределено
+	/// </summary>
+	None = 0,
+
+	/// <summary>
+	/// Массив
+	/// </summary>
+	Massive = 1,
+
+	/// <summary>
+	/// Список
+	/// </summary>
+	List = 2
+}

ProjectExcavator/ProjectExcavator/CollectionGenericObjects/GarageService.cs

@@ -1,4 +1,5 @@
 using ProjectExcavator.Drawnings;
+using ProjectExcavator.Exceptions;
 
 namespace ProjectExcavator.CollectionGenericObjects;
 
@@ -8,11 +9,11 @@ namespace ProjectExcavator.CollectionGenericObjects;
 internal class GarageService : AbstractCompany 
 {
     /// <summary>
-	/// Конструктор
-	/// </summary>
-	/// <param name="picWidth"></param>
-	/// <param name="picHeight"></param>
-	/// <param name="collection"></param>
+    /// Конструктор
+    /// </summary>
+    /// <param name="picWidth"></param>
+    /// <param name="picHeight"></param>
+    /// <param name="collection"></param>
 	public GarageService(int picWidth, int picHeight, ICollectionGenericObjects<DrawningTrackedVehicle> collection) : base(picWidth, picHeight, collection)
     {
     }
@@ -35,25 +36,30 @@ internal class GarageService : AbstractCompany
                 g.DrawLine(pen, j * _placeSizeWidth + Indent, i * _placeSizeHeight * 2, j * _placeSizeWidth + Indent, i * _placeSizeHeight * 2 + _placeSizeHeight);
             }
         }
+        
     }
 
     protected override void SetObjectsPosition()
     {
-
-        int col = _collection?.Count ?? 0;
-
         int LevelWidth = 0;
         int LevelHeight = 0;
 
-        for (int i = 0; i < col; i++)
-        {
-            if (LevelHeight + 1 > _pictureHeight/ (_placeSizeHeight + 60))
+        for (int i = 0; i < _collection?.Count ; i++)
+        { 
+            if(_collection?.Get(i)== null )
             {
                 return;
             }
+            try
+            {
+                _collection?.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
+                _collection?.Get(i)?.SetPosition((_pictureWidth - 190) - _placeSizeWidth * LevelWidth, 20 + (_placeSizeHeight + 60) * LevelHeight);
+            }
+            catch (ObjectNotFoundException)
+            {
+                break;
+            }
 
-            _collection?.Get(i)?.SetPosition((_pictureWidth - 190) - _placeSizeWidth * LevelWidth, 20 + (_placeSizeHeight + 60) * LevelHeight );
-          
             if (LevelWidth + 1 < _pictureWidth / _placeSizeWidth)
             {
                 LevelWidth++;
@@ -63,6 +69,11 @@ internal class GarageService : AbstractCompany
                 LevelWidth = 0;
                 LevelHeight++;
             }
+
+            if (LevelHeight >= _pictureHeight / (_placeSizeHeight + 60))
+            {
+                return;
+            }
         }
     }
 }

ProjectExcavator/ProjectExcavator/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -13,9 +13,9 @@ public interface ICollectionGenericObjects<T>
     int Count { get; }
 
     /// <summary>
-    /// Установка максимального количества элементов
-    /// </summary>
-    int SetMaxCount { set; }
+	/// Установка максимального количества элементов
+	/// </summary>
+	int MaxCount { get; set; }
 
     /// <summary>
     /// Добавление объекта в коллекцию
@@ -45,4 +45,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();
 }

ProjectExcavator/ProjectExcavator/CollectionGenericObjects/ListGenericObjects.cs

@@ -0,0 +1,103 @@
+using ProjectExcavator.Exceptions;
+
+namespace ProjectExcavator.CollectionGenericObjects;
+
+/// <summary>
+/// Параметризованный набор объектов
+/// </summary>
+/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+public class ListGenericObjects<T> : ICollectionGenericObjects<T>
+    where T : class
+{
+	/// <summary>
+	/// Список объектов, которые храним
+	/// </summary>
+	private readonly List<T?> _collection;
+
+    /// <summary>
+    /// Максимально допустимое число объектов в списке
+    /// </summary>
+    private int _maxCount;
+
+    public int Count => _collection.Count;
+
+    public int MaxCount
+    {
+        get => _maxCount;
+        set
+        {
+            if (value > 0)
+            {
+                _maxCount = value;
+            }
+        }
+    }
+    public CollectionType GetCollectionType => CollectionType.List;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public ListGenericObjects()
+	{
+		_collection = new();
+	}
+
+	public T? Get(int position)
+	{
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
+        return _collection[position];
+	}
+
+	public int Insert(T obj)
+	{
+        //проверка, что не превышено максимальное количество элементов
+        //вставка в конец набора
+
+        if (Count + 1 > MaxCount)
+        {
+            throw new CollectionOverflowException();
+        }
+        _collection.Add(obj);
+        return 1;
+
+    }
+
+	public int Insert(T obj, int position)
+	{
+        // проверка, что не превышено максимальное количество элементов
+        // проверка позиции
+        // вставка по позиции
+
+        if (_collection.Count + 1 < _maxCount)
+        {
+            throw new CollectionOverflowException();
+        }
+        if (position > _collection.Count || position < 0)
+        {
+            throw new PositionOutOfCollectionException();
+        }
+        _collection.Insert(position, obj);
+		return 1;
+	}
+
+	public T? Remove(int position)
+	{
+        // проверка позиции
+        // удаление объекта из списка
+
+        if(position < 0 || position > Count) throw new PositionOutOfCollectionException(position);
+        T? obj = _collection[position];
+        _collection.RemoveAt(position);
+        return obj;
+
+
+    }
+
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < _collection.Count; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
+}

ProjectExcavator/ProjectExcavator/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,4 +1,5 @@
-namespace ProjectExcavator.CollectionGenericObjects;
+using ProjectExcavator.Exceptions;
+namespace ProjectExcavator.CollectionGenericObjects;
 
 /// <summary>
 /// Параметризованный набор объектов
@@ -14,8 +15,12 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Count => _collection.Length;
 
-    public int SetMaxCount
+    public int MaxCount
     {
+        get
+        {
+            return _collection.Length;
+        }
         set
         {
             if (value > 0)
@@ -32,6 +37,8 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         }
     }
 
+    public CollectionType GetCollectionType => CollectionType.Massive; 
+
     /// <summary>
     /// Конструктор
     /// </summary>
@@ -46,7 +53,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
         if (position < 0 || position > Count-1)
         {
-            return null;
+            throw new PositionOutOfCollectionException(position);
         }
         else 
         {
@@ -58,15 +65,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
     {
         //Вставка в свободное место набора
 
-        for (int i = 0; i < Count -1; i++)
-        {
-            if (_collection[i] == null)
-            {
-                _collection[i] = obj;
-                return i;
-            }
-        }
-        return -1;
+        return Insert(obj, 0);
     }
 
     public int Insert(T obj, int position)
@@ -76,7 +75,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         //Ищется свободное место после этой позиции и идет вставка туда
         //если нет после, ищем до вставка
 
-        if (position >= Count || position < 0) return -1;
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
 
         if (_collection[position] == null)
         {
@@ -107,7 +106,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
                 behind_position --;
             }
 
-            return -1;
+            throw new CollectionOverflowException(Count);
 
         }
     }
@@ -117,17 +116,21 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         // Проверка позиции
         // Удаление объекта из массива, присвоив элементу массива значение null
 
-        T? obj = _collection[position];
-        if (position < 0 || _collection[position] == null || position > Count -1)
+        if (position < 0 || position >= Count)
         {
-            return null;
-        }
-
-        else 
-        {
-            _collection[position] = null;
-            return obj;
+            throw new PositionOutOfCollectionException(position);
         }
+        if (_collection[position] == null) throw new ObjectNotFoundException(position);
+        T obj = _collection[position];
+        _collection[position] = null;
+        return obj;
     }
 
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < _collection.Length; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
 }

ProjectExcavator/ProjectExcavator/CollectionGenericObjects/StorageCollection.cs

@@ -0,0 +1,221 @@
+using ProjectExcavator.Exceptions;
+using ProjectExcavator.Drawnings;
+using System.Text;
+
+namespace ProjectExcavator.CollectionGenericObjects;
+
+/// <summary>
+/// Класс-хранилище коллекций
+/// </summary>
+/// <typeparam name="T"></typeparam>
+public class StorageCollection<T>
+	where T : DrawningTrackedVehicle
+{
+   /// <summary>
+	/// Словарь (хранилище) с коллекциями
+	/// </summary>
+	readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
+
+
+    /// <summary>
+    /// Возвращение списка названий коллекций
+    /// </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>
+    public StorageCollection()
+	{
+		_storages = new Dictionary<string, ICollectionGenericObjects<T>>();
+	}
+
+	/// <summary>
+	/// Добавление коллекции в хранилище
+	/// </summary>
+	/// <param name="name">Название коллекции</param>
+	/// <param name="collectionType">тип коллекции</param>
+	public void AddCollection(string name, CollectionType collectionType)
+	{
+		if (name == null || _storages.ContainsKey(name)) 
+		{
+			return; 
+		}
+		else
+		{
+			switch (collectionType)
+			{
+				case CollectionType.None:
+					return;
+                case CollectionType.List:
+                    _storages.Add(name, new ListGenericObjects<T> { });
+                    return;
+                case CollectionType.Massive:
+                    _storages.Add(name, new MassiveGenericObjects<T> { });
+                    return;
+            }
+		}
+    }
+
+	/// <summary>
+	/// Удаление коллекции
+	/// </summary>
+	/// <param name="name">Название коллекции</param>
+	public void DelCollection(string name)
+	{
+        if (name == null || !_storages.ContainsKey(name)) { return; }
+        _storages.Remove(name);
+    }
+
+    /// <summary>
+    /// Доступ к коллекции
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    /// <returns></returns>
+
+    public ICollectionGenericObjects<T>? this[string name]
+    {
+        get
+		{
+			if (name == null || !_storages.ContainsKey(name)) { return null; }
+			return _storages[name];
+		}
+    }
+
+
+    /// <summary>
+	/// Сохранение информации по машинам в хранилище в файл
+	/// </summary>
+	/// <param name="filename">Путь и имя файла</param>
+	/// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
+    public void SaveData(string filename)
+    {
+        if (_storages.Count == 0)
+        {
+            throw new ArgumentException("В хранилище отсутствуют коллекции для сохранения");
+        }
+
+        if (File.Exists(filename))
+        {
+            File.Delete(filename);
+        }
+
+        StringBuilder sb = new();
+
+        using (StreamWriter  fs = new StreamWriter(filename))
+        {
+             fs.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);
+                }
+                 fs.WriteLine(sb.ToString());
+                sb.Clear();
+            }
+        }
+    }
+
+    /// <summary>
+	/// Загрузка информации по машинам в хранилище из файла
+	/// </summary>
+	/// <param name="filename">Путь и имя файла</param>
+	/// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
+	public void LoadData(string filename)
+    {
+        if (!File.Exists(filename))
+        {
+            throw new FileNotFoundException("Файл не существует");
+        }
+
+        using (StreamReader sr = new StreamReader(filename))
+        {
+            string? str;
+            str = sr.ReadLine();
+            if (str == null || str.Length == 0)
+                throw new ArgumentException("В файле нет данных");
+            if (str != _collectionKey.ToString())
+                throw new InvalidDataException("В файле неверные данные");
+            _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)
+                {
+                    throw new InvalidOperationException("Не удалось создать коллекцию");
+                }
+
+                collection.MaxCount = Convert.ToInt32(record[2]);
+
+                string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+                foreach (string elem in set)
+                {
+                    if (elem?.CreateDrawningTrackedVehicle() is T trackedVehicle)
+                    {
+                        try
+                        {
+                            if (collection.Insert(trackedVehicle) == -1)
+                                throw new InvalidOperationException("Объект не удалось добавить в коллекцию: " + record[3]);
+                        }
+                        catch (CollectionOverflowException ex)
+                        {
+                            throw new CollectionOverflowException("Коллекция переполнена", ex);
+                        }
+                    }
+                }
+                _storages.Add(record[0], collection);
+            }
+        }
+    }
+
+    /// <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,
+        };
+    }
+}

ProjectExcavator/ProjectExcavator/Drawnings/DrawningExcavator.cs

@@ -16,10 +16,20 @@ public class DrawningExcavator : DrawningTrackedVehicle
 	/// <param name="additionalColor">Дополнительный цвет</param>
 	/// <param name="bucket">Признак наличия ковша</param>
 	/// <param name="supports">Признак наличия поддержки</param>
-	public DrawningExcavator(int speed, double weight, Color bodyColor, Color additionalColor, bool bucket, bool supports) : base(135, 82)
+	public DrawningExcavator(int speed, double weight, Color bodyColor, Color additionalColor, bool bucket, bool supports) : base(125, 60)
     {
         EntityTrackedVehicle = new EntityExcavator(speed, weight, bodyColor, additionalColor, bucket, supports);
     }
+    /// <returns>true - объект создан, false - проверка не пройдена, нельзя создать объект в этих размерах</returns>
+
+    /// <summary>
+    /// Конструктор через сущность
+    /// </summary>
+    /// <param name="trackedVehicle">Объект класса-сущность</param>
+    public DrawningExcavator(EntityTrackedVehicle trackedVehicle) : base(125,60)
+    {
+        EntityTrackedVehicle = trackedVehicle;
+    }
 
     public override void DrawTransport(Graphics g)
     {

ProjectExcavator/ProjectExcavator/Drawnings/DrawningTrackedVehicle.cs

@@ -10,7 +10,7 @@ public class DrawningTrackedVehicle
     /// <summary>
     /// Класс-сущность
     /// </summary>
-    public TrackedVehicle? EntityTrackedVehicle { get; protected set; }
+    public EntityTrackedVehicle? EntityTrackedVehicle { get; protected set; }
 
     /// <summary>
     /// Ширина окна
@@ -35,12 +35,12 @@ public class DrawningTrackedVehicle
     /// <summary>
     /// Ширина прорисовки гусеничной машины
     /// </summary>
-    private readonly int _drawningExcavatorWidth = 78;
+    private readonly int _drawningTrackedVehicleWidth = 78;
 
     /// <summary>
     /// Высота прорисовки гусеничной машины
     /// </summary>
-    private readonly int _drawningExcavatorHeight = 63;
+    private readonly int _drawningTrackedVehicleHeight = 63;
 
     /// <summary>
 	/// Координата X объекта
@@ -55,17 +55,17 @@ public class DrawningTrackedVehicle
     /// <summary>
     /// Ширина объекта
     /// </summary>
-    public int GetWidth => _drawningExcavatorWidth;
+    public int GetWidth => _drawningTrackedVehicleWidth;
 
     /// <summary>
     /// Высота объекта
     /// </summary>
-    public int GetHeight => _drawningExcavatorHeight;
+    public int GetHeight => _drawningTrackedVehicleHeight;
 
     /// <summary>
     /// Пустой конструктор
     /// </summary>
-    private DrawningTrackedVehicle() 
+    protected DrawningTrackedVehicle() 
     {
         _pictureWidth = null;
         _pictureHeight = null;
@@ -81,7 +81,16 @@ public class DrawningTrackedVehicle
     /// <param name="bodyColor">Основной цвет</param>
     public DrawningTrackedVehicle(int speed, double weight, Color bodyColor) : this()
     {
-        EntityTrackedVehicle = new TrackedVehicle(speed, weight, bodyColor);
+        EntityTrackedVehicle = new EntityTrackedVehicle(speed, weight, bodyColor);
+    }
+
+    /// <summary>
+	/// Конструктор
+	/// </summary>
+	/// <param name="trackedVehicle">Класс-сущность</param>
+	public DrawningTrackedVehicle(EntityTrackedVehicle trackedVehicle) : base()
+    {
+        EntityTrackedVehicle = trackedVehicle;
     }
 
     /// <summary>
@@ -91,8 +100,8 @@ public class DrawningTrackedVehicle
     /// <param name="drawningExcavatorHeight">Высота прорисовки гусеничной машины</param>
     protected DrawningTrackedVehicle(int drawningExcavatorWidth, int drawningExcavatorHeight) : this()
     {
-        _drawningExcavatorWidth = drawningExcavatorWidth;
-        _drawningExcavatorHeight = drawningExcavatorHeight;
+        _drawningTrackedVehicleWidth = drawningExcavatorWidth;
+        _drawningTrackedVehicleHeight = drawningExcavatorHeight;
     }
 
     /// <summary>
@@ -104,7 +113,7 @@ public class DrawningTrackedVehicle
     public bool SetPictureSize(int width, int height)
     {
         //проверка, что объект "влезает" в размеры поля
-        if (_drawningExcavatorWidth > width || _drawningExcavatorHeight > height)
+        if (_drawningTrackedVehicleWidth > width || _drawningTrackedVehicleHeight > height)
         {
             EntityTrackedVehicle = null;
             return false;
@@ -116,14 +125,14 @@ public class DrawningTrackedVehicle
             _pictureWidth = width;
             _pictureHeight = height;
 
-            if (_startPosX.HasValue && (_startPosX.Value + _drawningExcavatorWidth > _pictureWidth))
+            if (_startPosX.HasValue && (_startPosX.Value + _drawningTrackedVehicleWidth > _pictureWidth))
             {
-                _startPosX = _pictureWidth - _drawningExcavatorWidth;
+                _startPosX = _pictureWidth - _drawningTrackedVehicleWidth;
             }
 
-            if (_startPosY.HasValue && (_startPosY + _drawningExcavatorHeight > _pictureHeight))
+            if (_startPosY.HasValue && (_startPosY + _drawningTrackedVehicleHeight > _pictureHeight))
             {
-                _startPosY = _pictureHeight - _drawningExcavatorHeight;
+                _startPosY = _pictureHeight - _drawningTrackedVehicleHeight;
             }
 
             return true;
@@ -141,9 +150,9 @@ public class DrawningTrackedVehicle
         // то надо изменить координаты, чтобы он оставался в этих границах
         _startPosX = x;
         _startPosY = y;
-        if (_startPosX + _drawningExcavatorWidth > _pictureWidth)
+        if (_startPosX + _drawningTrackedVehicleWidth > _pictureWidth)
         {
-            _startPosX = _pictureWidth - _drawningExcavatorWidth;
+            _startPosX = _pictureWidth - _drawningTrackedVehicleWidth;
         }
 
         if (_startPosX < 0)
@@ -151,9 +160,9 @@ public class DrawningTrackedVehicle
             _startPosX = 0;
         }
 
-        if (_startPosY + _drawningExcavatorHeight > _pictureHeight)
+        if (_startPosY + _drawningTrackedVehicleHeight > _pictureHeight)
         {
-            _startPosY = _pictureHeight - _drawningExcavatorHeight;
+            _startPosY = _pictureHeight - _drawningTrackedVehicleHeight;
         }
 
         if (_startPosY < 0)
@@ -192,14 +201,14 @@ public class DrawningTrackedVehicle
                 return true;
             // вправо
             case DirectionType.Right:
-                if (_startPosX.Value + EntityTrackedVehicle.Step < _pictureWidth - _drawningExcavatorWidth)
+                if (_startPosX.Value + EntityTrackedVehicle.Step < _pictureWidth - _drawningTrackedVehicleWidth)
                 {
                     _startPosX += (int)EntityTrackedVehicle.Step;
                 }
                 return true;
             //вниз
             case DirectionType.Down:
-                if (_startPosY.Value + EntityTrackedVehicle.Step < _pictureHeight - _drawningExcavatorHeight)
+                if (_startPosY.Value + EntityTrackedVehicle.Step < _pictureHeight - _drawningTrackedVehicleHeight)
                 {
                     _startPosY += (int)EntityTrackedVehicle.Step;
                 }

ProjectExcavator/ProjectExcavator/Drawnings/ExtentionDrawningTrackedVehicle.cs

@@ -0,0 +1,53 @@
+using ProjectExcavator.Drawnings;
+using ProjectExcavator.Entities;
+
+/// <summary>
+/// Расширение для класса TrackedVehicle
+/// </summary>
+public static class ExtentionDrawningTrackedVehicle
+{
+    /// <summary>
+    /// Разделитель для записи информации по объекту в файл
+    /// </summary>
+    private static readonly string _separatorForObject = ":";
+
+    /// <summary>
+    /// Создание объекта из строки
+    /// </summary>
+    /// <param name="info">Строка с данными для создания объекта</param>
+    /// <returns>Объект</returns>
+    public static DrawningTrackedVehicle? CreateDrawningTrackedVehicle(this string info)
+    {
+        string[] strs = info.Split(_separatorForObject);
+        EntityTrackedVehicle? trackedVehicle = EntityExcavator.CreateEntityExcavator(strs);
+        if (trackedVehicle != null)
+        {
+            return new DrawningExcavator(trackedVehicle);
+        }
+
+        trackedVehicle = EntityTrackedVehicle.CreateEntityTrackedVehicle(strs);
+        if (trackedVehicle != null)
+        {
+            return new DrawningTrackedVehicle(trackedVehicle);
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Получение данных для сохранения в файл
+    /// </summary>
+    /// <param name="drawningTrackedVehicle">Сохраняемый объект</param>
+    /// <returns>Строка с данными по объекту</returns>
+    public static string GetDataForSave(this DrawningTrackedVehicle drawningTrackedVehicle)
+	{
+		string[]? array = drawningTrackedVehicle?.EntityTrackedVehicle?.GetStringRepresentation();
+
+		if (array == null)
+		{
+			return string.Empty;
+		}
+
+		return string.Join(_separatorForObject, array);
+	}
+}

ProjectExcavator/ProjectExcavator/Entities/EntityExcavator.cs

@@ -1,15 +1,23 @@
-namespace ProjectExcavator.Entities;
+using System.ComponentModel;
+using System.Net.Sockets;
+
+namespace ProjectExcavator.Entities;
 
 /// <summary>
 /// Класс-сущность "Экскаватор"
 /// </summary>
-public class EntityExcavator : TrackedVehicle
+public class EntityExcavator : EntityTrackedVehicle
 {
     /// <summary>
     /// Дополнительный цвет (для опциональных элементов)
     /// </summary>
     public Color AdditionalColor { get; private set; }
 
+    public void SetAdditionalColor(Color additionalColor)
+    {
+        AdditionalColor = additionalColor;
+    }
+
     /// <summary>
     /// Признак (опция) наличия ковша
     /// </summary>
@@ -37,4 +45,28 @@ public class EntityExcavator : TrackedVehicle
         Bucket = bucket;
         Supports = supports;
     }
+
+    /// <summary>
+    /// Получение строк со значениями свойств объекта класса-сущности
+    /// </summary>
+    /// <returns></returns>
+    public override string[] GetStringRepresentation()
+    {
+        return new[] { nameof(EntityExcavator), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name, Bucket.ToString(), Supports.ToString()};
+    }
+
+    /// <summary>
+    /// Создание объекта из массива строк
+    /// </summary>
+    /// <param name="strs"></param>
+    /// <returns></returns>
+    public static EntityExcavator? CreateEntityExcavator(string[] strs)
+    {
+        if (strs.Length != 7 || strs[0] != nameof(EntityExcavator))
+        {
+            return null;
+        }
+        return new EntityExcavator(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]), Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]));
+    }
+
 }

ProjectExcavator/ProjectExcavator/Entities/EntityTrackedVehicle.cs

@@ -0,0 +1,69 @@
+namespace ProjectExcavator.Entities;
+
+/// <summary>
+/// Класс-сущность "Гусеничная Машина"
+/// </summary>
+public class EntityTrackedVehicle
+{
+    /// <summary>
+	/// Скорость
+	/// </summary>
+	public int Speed { get; private set; }
+
+    /// <summary>
+    /// Вес
+    /// </summary>
+    public double Weight { get; private set; }
+
+    /// <summary>
+    /// Основной цвет
+    /// </summary>
+    public Color BodyColor { get; private set; }
+
+    public void SetBodyColor(Color bodyColor)
+    {
+        BodyColor = bodyColor;
+    }
+
+    /// <summary>
+    /// Шаг перемещения Экскаватора/Гусеничной машины
+    /// </summary>
+    public double Step => Speed * 100 / Weight;
+
+    /// <summary>
+    /// Конструктор сущности
+	/// </summary>
+	/// <param name="speed">Скорость</param>
+	/// <param name="weight">Вес</param>
+	/// <param name="bodyColor">Основной цвет</param>
+
+    public EntityTrackedVehicle(int speed, double weight, Color bodyColor)
+    {
+        Speed = speed;
+        Weight = weight;
+        BodyColor = bodyColor;
+    }
+
+    /// <summary>
+    /// Получение строк со значениями свойств объекта класса-сущности
+    /// </summary>
+    /// <returns></returns>
+    public virtual string[] GetStringRepresentation()
+    {
+        return new[] { nameof(EntityTrackedVehicle), Speed.ToString(), Weight.ToString(), BodyColor.Name };
+    }
+
+    /// <summary>
+    /// Создание объекта из массива строк
+    /// </summary>
+    /// <param name="strs"></param>
+    /// <returns></returns>
+    public static EntityTrackedVehicle? CreateEntityTrackedVehicle(string[] strs)
+    {
+        if (strs.Length != 4 || strs[0] != nameof(EntityTrackedVehicle))
+        {
+            return null;
+        }
+        return new EntityTrackedVehicle(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]));
+    }
+}

ProjectExcavator/ProjectExcavator/Entities/TrackedVehicle.cs

@@ -1,41 +0,0 @@
-namespace ProjectExcavator.Entities;
-
-/// <summary>
-/// Класс-сущность "Гусеничная Машина"
-/// </summary>
-public class TrackedVehicle
-{
-    /// <summary>
-	/// Скорость
-	/// </summary>
-	public int Speed { get; private set; }
-
-    /// <summary>
-    /// Вес
-    /// </summary>
-    public double Weight { get; private set; }
-
-    /// <summary>
-    /// Основной цвет
-    /// </summary>
-    public Color BodyColor { get; private set; }
-
-    /// <summary>
-    /// Шаг перемещения Экскаватора/Гусеничной машины
-    /// </summary>
-    public double Step => Speed * 100 / Weight;
-
-    /// <summary>
-    /// Конструктор сущности
-	/// </summary>
-	/// <param name="speed">Скорость</param>
-	/// <param name="weight">Вес</param>
-	/// <param name="bodyColor">Основной цвет</param>
-
-    public TrackedVehicle(int speed, double weight, Color bodyColor)
-    {
-        Speed = speed;
-        Weight = weight;
-        BodyColor = bodyColor;
-    }
-}

ProjectExcavator/ProjectExcavator/Exceptions/CollectionOverflowException.cs

@@ -0,0 +1,16 @@
+using System.Runtime.Serialization;
+
+namespace ProjectExcavator.Exceptions;
+
+/// <summary>
+/// Класс, описывающий ошибку переполнения коллекции
+/// </summary>
+[Serializable]
+internal class CollectionOverflowException : ApplicationException
+{
+    public CollectionOverflowException(int count) : base("В коллекции превышено допустимое количество: " + count) { }
+    public CollectionOverflowException() : base() { }
+    public CollectionOverflowException(string message) : base(message) { }
+    public CollectionOverflowException(string message, Exception exception) : base(message, exception) { }
+    protected CollectionOverflowException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+}

ProjectExcavator/ProjectExcavator/Exceptions/ObjectNotFoundException.cs

@@ -0,0 +1,16 @@
+using System.Runtime.Serialization;
+
+namespace ProjectExcavator.Exceptions;
+
+/// <summary>
+/// Класс, описывающий ошибку, что по указанной позиции нет элемента
+/// </summary>
+[Serializable]
+internal class ObjectNotFoundException : ApplicationException
+{
+    public ObjectNotFoundException(int i) : base("Не найден объект по позиции " + i) { }
+    public ObjectNotFoundException() : base() { }
+    public ObjectNotFoundException(string message) : base(message) { }
+    public ObjectNotFoundException(string message, Exception exception) : base(message, exception) { }
+    protected ObjectNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+}

ProjectExcavator/ProjectExcavator/Exceptions/PositionOutOfCollectionException.cs

@@ -0,0 +1,16 @@
+using System.Runtime.Serialization;
+
+namespace ProjectExcavator.Exceptions;
+
+/// <summary>
+/// Класс, описывающий ошибку выхода за границы коллекции
+/// </summary>
+[Serializable]
+internal class PositionOutOfCollectionException : ApplicationException
+{
+    public PositionOutOfCollectionException(int i) : base("Выход за границы коллекции.Позиция " + i) { }
+    public PositionOutOfCollectionException() : base() { }
+    public PositionOutOfCollectionException(string message) : base(message) { }
+    public PositionOutOfCollectionException(string message, Exception exception) : base(message, exception) { }
+    protected PositionOutOfCollectionException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+}

ProjectExcavator/ProjectExcavator/FormExcavatorCollection.Designer.cs

@@ -29,50 +29,101 @@
         private void InitializeComponent()
         {
             groupBoxTools = new GroupBox();
+            panelCompanyTools = new Panel();
+            buttonAddTrackedVehicle = new Button();
             buttonRefresh = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
             buttonGoToCheck = new Button();
             ButtonRemoveExcavator = new Button();
-            maskedTextBoxPosition = new MaskedTextBox();
-            buttonAddExcavator = new Button();
-            buttonAddTrackedVehicle = new Button();
+            buttonCreateCompany = new Button();
+            panelStorage = new Panel();
+            buttonCollectionDel = new Button();
+            listBoxCollection = new ListBox();
+            buttonCollectionAdd = new Button();
+            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            textBoxCollectionName = new TextBox();
+            labelCollectionName = new Label();
             comboBoxSelectorCompany = new ComboBox();
             pictureBox = new PictureBox();
+            menuStrip = new MenuStrip();
+            файлToolStripMenuItem = new ToolStripMenuItem();
+            saveToolStripMenuItem = new ToolStripMenuItem();
+            loadToolStripMenuItem = new ToolStripMenuItem();
+            saveFileDialog = new SaveFileDialog();
+            openFileDialog = new OpenFileDialog();
             groupBoxTools.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
+            panelStorage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            menuStrip.SuspendLayout();
             SuspendLayout();
             // 
             // groupBoxTools
             // 
-            groupBoxTools.Controls.Add(buttonRefresh);
-            groupBoxTools.Controls.Add(buttonGoToCheck);
-            groupBoxTools.Controls.Add(ButtonRemoveExcavator);
-            groupBoxTools.Controls.Add(maskedTextBoxPosition);
-            groupBoxTools.Controls.Add(buttonAddExcavator);
-            groupBoxTools.Controls.Add(buttonAddTrackedVehicle);
+            groupBoxTools.Controls.Add(panelCompanyTools);
+            groupBoxTools.Controls.Add(buttonCreateCompany);
+            groupBoxTools.Controls.Add(panelStorage);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(777, 0);
+            groupBoxTools.Location = new Point(777, 28);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(225, 639);
+            groupBoxTools.Size = new Size(225, 646);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
             // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(buttonAddTrackedVehicle);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Controls.Add(ButtonRemoveExcavator);
+            panelCompanyTools.Enabled = false;
+            panelCompanyTools.Location = new Point(2, 350);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(220, 289);
+            panelCompanyTools.TabIndex = 2;
+            // 
+            // buttonAddTrackedVehicle
+            // 
+            buttonAddTrackedVehicle.Anchor = AnchorStyles.Top;
+            buttonAddTrackedVehicle.Location = new Point(3, 3);
+            buttonAddTrackedVehicle.Name = "buttonAddTrackedVehicle";
+            buttonAddTrackedVehicle.Size = new Size(215, 50);
+            buttonAddTrackedVehicle.TabIndex = 1;
+            buttonAddTrackedVehicle.Text = "Добавление гусеничной машины";
+            buttonAddTrackedVehicle.UseVisualStyleBackColor = true;
+            buttonAddTrackedVehicle.Click += ButtonAddTrackedVehicle_Click;
+            // 
             // buttonRefresh
             // 
-            buttonRefresh.Location = new Point(13, 554);
+            buttonRefresh.Anchor = AnchorStyles.Top;
+            buttonRefresh.Location = new Point(3, 240);
             buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(200, 60);
+            buttonRefresh.Size = new Size(215, 40);
             buttonRefresh.TabIndex = 6;
             buttonRefresh.Text = "Обновить";
             buttonRefresh.UseVisualStyleBackColor = true;
             buttonRefresh.Click += ButtonRefresh_Click;
             // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Anchor = AnchorStyles.Top;
+            maskedTextBoxPosition.Location = new Point(3, 115);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(215, 27);
+            maskedTextBoxPosition.TabIndex = 3;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
             // buttonGoToCheck
             // 
-            buttonGoToCheck.Location = new Point(13, 469);
+            buttonGoToCheck.Anchor = AnchorStyles.Top;
+            buttonGoToCheck.Location = new Point(3, 194);
             buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(200, 60);
+            buttonGoToCheck.Size = new Size(215, 40);
             buttonGoToCheck.TabIndex = 5;
             buttonGoToCheck.Text = "Передать на тесты";
             buttonGoToCheck.UseVisualStyleBackColor = true;
@@ -80,42 +131,117 @@
             // 
             // ButtonRemoveExcavator
             // 
-            ButtonRemoveExcavator.Location = new Point(10, 386);
+            ButtonRemoveExcavator.Anchor = AnchorStyles.Top;
+            ButtonRemoveExcavator.Location = new Point(3, 148);
             ButtonRemoveExcavator.Name = "ButtonRemoveExcavator";
-            ButtonRemoveExcavator.Size = new Size(200, 60);
+            ButtonRemoveExcavator.Size = new Size(215, 40);
             ButtonRemoveExcavator.TabIndex = 4;
             ButtonRemoveExcavator.Text = "Удаление транспорта";
             ButtonRemoveExcavator.UseVisualStyleBackColor = true;
             ButtonRemoveExcavator.Click += ButtonRemoveExcavator_Click;
             // 
-            // maskedTextBoxPosition
+            // buttonCreateCompany
             // 
-            maskedTextBoxPosition.Location = new Point(13, 281);
-            maskedTextBoxPosition.Mask = "00";
-            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            maskedTextBoxPosition.Size = new Size(200, 27);
-            maskedTextBoxPosition.TabIndex = 3;
-            maskedTextBoxPosition.ValidatingType = typeof(int);
+            buttonCreateCompany.Location = new Point(13, 317);
+            buttonCreateCompany.Margin = new Padding(3, 4, 3, 4);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(200, 30);
+            buttonCreateCompany.TabIndex = 9;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += ButtonCreateCompany_Click;
             // 
-            // buttonAddExcavator
+            // panelStorage
             // 
-            buttonAddExcavator.Location = new Point(13, 164);
-            buttonAddExcavator.Name = "buttonAddExcavator";
-            buttonAddExcavator.Size = new Size(200, 65);
-            buttonAddExcavator.TabIndex = 2;
-            buttonAddExcavator.Text = "Добавление экскаватора";
-            buttonAddExcavator.UseVisualStyleBackColor = true;
-            buttonAddExcavator.Click += ButtonAddExcavator_Click;
+            panelStorage.Controls.Add(buttonCollectionDel);
+            panelStorage.Controls.Add(listBoxCollection);
+            panelStorage.Controls.Add(buttonCollectionAdd);
+            panelStorage.Controls.Add(radioButtonList);
+            panelStorage.Controls.Add(radioButtonMassive);
+            panelStorage.Controls.Add(textBoxCollectionName);
+            panelStorage.Controls.Add(labelCollectionName);
+            panelStorage.Dock = DockStyle.Top;
+            panelStorage.Location = new Point(3, 23);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(219, 253);
+            panelStorage.TabIndex = 7;
             // 
-            // buttonAddTrackedVehicle
+            // buttonCollectionDel
             // 
-            buttonAddTrackedVehicle.Location = new Point(10, 93);
-            buttonAddTrackedVehicle.Name = "buttonAddTrackedVehicle";
-            buttonAddTrackedVehicle.Size = new Size(200, 65);
-            buttonAddTrackedVehicle.TabIndex = 1;
-            buttonAddTrackedVehicle.Text = "Добавление гусеничной машины";
-            buttonAddTrackedVehicle.UseVisualStyleBackColor = true;
-            buttonAddTrackedVehicle.Click += ButtonAddTrackedVehicle_Click;
+            buttonCollectionDel.Anchor = AnchorStyles.Top;
+            buttonCollectionDel.Location = new Point(3, 222);
+            buttonCollectionDel.Margin = new Padding(3, 4, 3, 4);
+            buttonCollectionDel.Name = "buttonCollectionDel";
+            buttonCollectionDel.Size = new Size(215, 27);
+            buttonCollectionDel.TabIndex = 7;
+            buttonCollectionDel.Text = "Удалить коллекцию";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += ButtonCollectionDel_Click;
+            // 
+            // listBoxCollection
+            // 
+            listBoxCollection.Anchor = AnchorStyles.Top;
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.ItemHeight = 20;
+            listBoxCollection.Location = new Point(3, 135);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(215, 84);
+            listBoxCollection.TabIndex = 6;
+            // 
+            // buttonCollectionAdd
+            // 
+            buttonCollectionAdd.Anchor = AnchorStyles.Top;
+            buttonCollectionAdd.Location = new Point(3, 100);
+            buttonCollectionAdd.Margin = new Padding(3, 4, 3, 4);
+            buttonCollectionAdd.Name = "buttonCollectionAdd";
+            buttonCollectionAdd.Size = new Size(215, 27);
+            buttonCollectionAdd.TabIndex = 5;
+            buttonCollectionAdd.Text = "Добавить коллекцию";
+            buttonCollectionAdd.UseVisualStyleBackColor = true;
+            buttonCollectionAdd.Click += ButtonCollectionAdd_Click;
+            // 
+            // radioButtonList
+            // 
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(130, 70);
+            radioButtonList.Margin = new Padding(3, 4, 3, 4);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(80, 24);
+            radioButtonList.TabIndex = 4;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonMassive
+            // 
+            radioButtonMassive.AutoSize = true;
+            radioButtonMassive.Location = new Point(10, 70);
+            radioButtonMassive.Margin = new Padding(3, 4, 3, 4);
+            radioButtonMassive.Name = "radioButtonMassive";
+            radioButtonMassive.Size = new Size(82, 24);
+            radioButtonMassive.TabIndex = 3;
+            radioButtonMassive.TabStop = true;
+            radioButtonMassive.Text = "Массив";
+            radioButtonMassive.UseVisualStyleBackColor = true;
+            // 
+            // textBoxCollectionName
+            // 
+            textBoxCollectionName.Anchor = AnchorStyles.Top;
+            textBoxCollectionName.Location = new Point(3, 34);
+            textBoxCollectionName.Margin = new Padding(3, 4, 3, 4);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(215, 27);
+            textBoxCollectionName.TabIndex = 2;
+            // 
+            // labelCollectionName
+            // 
+            labelCollectionName.Anchor = AnchorStyles.Top;
+            labelCollectionName.AutoSize = true;
+            labelCollectionName.Location = new Point(31, 11);
+            labelCollectionName.Name = "labelCollectionName";
+            labelCollectionName.Size = new Size(158, 20);
+            labelCollectionName.TabIndex = 0;
+            labelCollectionName.Text = "Название коллекции:";
             // 
             // comboBoxSelectorCompany
             // 
@@ -123,7 +249,7 @@
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(10, 26);
+            comboBoxSelectorCompany.Location = new Point(13, 282);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
             comboBoxSelectorCompany.Size = new Size(200, 28);
             comboBoxSelectorCompany.TabIndex = 0;
@@ -132,37 +258,102 @@
             // pictureBox
             // 
             pictureBox.Dock = DockStyle.Fill;
-            pictureBox.Location = new Point(0, 0);
+            pictureBox.Location = new Point(0, 28);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(777, 639);
+            pictureBox.Size = new Size(777, 646);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             // 
+            // menuStrip
+            // 
+            menuStrip.ImageScalingSize = new Size(20, 20);
+            menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
+            menuStrip.Location = new Point(0, 0);
+            menuStrip.Name = "menuStrip";
+            menuStrip.Size = new Size(1002, 28);
+            menuStrip.TabIndex = 2;
+            menuStrip.Text = "menuStrip1";
+            // 
+            // файлToolStripMenuItem
+            // 
+            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
+            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
+            файлToolStripMenuItem.Size = new Size(59, 24);
+            файлToolStripMenuItem.Text = "Файл";
+            // 
+            // saveToolStripMenuItem
+            // 
+            saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+            saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
+            saveToolStripMenuItem.Size = new Size(227, 26);
+            saveToolStripMenuItem.Text = "Сохранение";
+            saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
+            // 
+            // loadToolStripMenuItem
+            // 
+            loadToolStripMenuItem.Name = "loadToolStripMenuItem";
+            loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
+            loadToolStripMenuItem.Size = new Size(227, 26);
+            loadToolStripMenuItem.Text = "Загрузка";
+            loadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
+            // 
+            // saveFileDialog
+            // 
+            saveFileDialog.Filter = "txt file | *.txt";
+            // 
+            // openFileDialog
+            // 
+            openFileDialog.FileName = "openFileDialog1";
+            openFileDialog.Filter = "txt file | *.txt";
+            // 
             // FormExcavatorCollection
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1002, 639);
+            ClientSize = new Size(1002, 674);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
+            Controls.Add(menuStrip);
+            MainMenuStrip = menuStrip;
             Name = "FormExcavatorCollection";
             Text = "Коллекция экскаваторов";
             groupBoxTools.ResumeLayout(false);
-            groupBoxTools.PerformLayout();
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            menuStrip.ResumeLayout(false);
+            menuStrip.PerformLayout();
             ResumeLayout(false);
+            PerformLayout();
         }
 
         #endregion
 
         private GroupBox groupBoxTools;
         private ComboBox comboBoxSelectorCompany;
-        private Button buttonAddExcavator;
         private Button buttonAddTrackedVehicle;
         private PictureBox pictureBox;
         private Button ButtonRemoveExcavator;
         private MaskedTextBox maskedTextBoxPosition;
         private Button buttonGoToCheck;
         private Button buttonRefresh;
+        private Panel panelStorage;
+        private Label labelCollectionName;
+        private RadioButton radioButtonList;
+        private RadioButton radioButtonMassive;
+        private TextBox textBoxCollectionName;
+        private ListBox listBoxCollection;
+        private Button buttonCollectionAdd;
+        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;
     }
 }

ProjectExcavator/ProjectExcavator/FormExcavatorCollection.cs

@@ -1,5 +1,7 @@
-using ProjectExcavator.CollectionGenericObjects;
+using Microsoft.Extensions.Logging;
+using ProjectExcavator.CollectionGenericObjects;
 using ProjectExcavator.Drawnings;
+using ProjectExcavator.Exceptions;
 
 namespace ProjectExcavator;
 /// <summary>
@@ -7,6 +9,16 @@ namespace ProjectExcavator;
 /// </summary>
 public partial class FormExcavatorCollection : Form
 {
+    /// <summary>
+	/// Хранилише коллекций
+	/// </summary>
+	private readonly StorageCollection<DrawningTrackedVehicle> _storageCollection;
+
+    /// <summary>
+    /// Логер
+    /// </summary>
+    private readonly ILogger _logger;
+
     /// <summary>
     /// Компания
     /// </summary>
@@ -15,9 +27,12 @@ public partial class FormExcavatorCollection : Form
     /// <summary>
 	/// Конструктор
 	/// </summary>
-    public FormExcavatorCollection()
+    public FormExcavatorCollection(ILogger<FormExcavatorCollection> logger)
     {
         InitializeComponent();
+        _storageCollection = new();
+        _logger = logger;
+        _logger.LogInformation("Форма загрузилась");
     }
 
     /// <summary>
@@ -36,71 +51,43 @@ public partial class FormExcavatorCollection : Form
     }
 
     /// <summary>
-    /// Добавление гусеничной машины
+    /// Добавление гусеничной машины/ экскаватора
 	/// </summary>
 	/// <param name="sender"></param>
 	/// <param name="e"></param>
-    private void ButtonAddTrackedVehicle_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTrackedVehicle));
-
-
-    /// <summary>
-	/// Добавление экскаватора
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonAddExcavator_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningExcavator));
-
-    /// <summary>
-	/// Создание объекта класса-перемещения
-	/// </summary>
-	/// <param name="type">Тип создаваемого объекта</param>
-	private void CreateObject(string type)
+    private void ButtonAddTrackedVehicle_Click(object sender, EventArgs e)
     {
-        if (_company == null)
-        {
-            return;
-        }
-
-        Random random = new();
-        DrawningTrackedVehicle drawningTrackedVehicle;
-        switch (type)
-        {
-            case nameof(DrawningTrackedVehicle):
-                drawningTrackedVehicle = new DrawningTrackedVehicle(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
-                break;
-            case nameof(DrawningExcavator):
-                drawningTrackedVehicle = new DrawningExcavator(random.Next(100, 300), random.Next(1000, 3000), GetColor(random), GetColor(random), true, true);
-                break;
-            default:
-                return;
-        }
-
-        if (_company + drawningTrackedVehicle != -1)
-        {
-            MessageBox.Show("Объект добавлен");
-            pictureBox.Image = _company.Show();
-        }
-        else
-        {
-            MessageBox.Show("Не удалось добавить объект");
-        }
+        FormExcavatorConfig form = new();
+        form.Show();
+        form.AddEvent(SetTrackedVehicle);
     }
 
     /// <summary>
-	/// Получение цвета
-	/// </summary>
-	/// <param name="random">Генератор случайных чисел</param>
-	/// <returns></returns>
-	private static Color GetColor(Random random)
+    /// Добавление экскаватора/гусинечной машины в коллекцию
+    /// </summary>
+    /// <param name="trackedVehicle"></param>
+    private void SetTrackedVehicle(DrawningTrackedVehicle? trackedVehicle)
     {
-        Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-        ColorDialog dialog = new();
-        if (dialog.ShowDialog() == DialogResult.OK)
+        try
         {
-            color = dialog.Color;
-        }
+            if (_company == null || trackedVehicle == null)
+            {
+                return;
+            }
 
-        return color;
+            if (_company + trackedVehicle != -1)
+            {
+                MessageBox.Show("Объект добавлен");
+                pictureBox.Image = _company.Show();
+                _logger.LogInformation("Добавлен объект: " + trackedVehicle.GetDataForSave());
+            }
+        }
+        //catch (ObjectNotFoundException) { }
+        catch (CollectionOverflowException ex)
+        {
+            MessageBox.Show("В коллекции превышено допустимое количество элементов:" );
+            _logger.LogWarning($"Не удалось добавить объект: {ex.Message}");
+        }
     }
 
     /// <summary>
@@ -112,21 +99,41 @@ public partial class FormExcavatorCollection : Form
     {
         if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
         {
+            _logger.LogWarning("Удаление объекта из несуществующей коллекции");
             return;
         }
-        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-        {
-            return;
-        }
+
         int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-        if ((_company - pos) != null)
+
+        try
         {
-            MessageBox.Show("Объект удален!");
-            pictureBox.Image = _company.Show();
+            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
+            {
+                throw new Exception("Входные данные отсутствуют");
+            }
+
+            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+            {
+                return;
+            }
+
+
+            if (_company - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _company.Show();
+                _logger.LogInformation("Объект удален");
+            }
         }
-        else
+        catch (PositionOutOfCollectionException ex)
         {
-            MessageBox.Show("Не удалось удалить объект");
+            MessageBox.Show("Удаление вне рамках коллекции");
+            _logger.LogWarning($"Удаление объекта за пределами коллекции {pos} ");
+        }
+        catch (ObjectNotFoundException ex)
+        {
+            MessageBox.Show("Объект по позиции " + pos + " не существует ");
+            _logger.LogError("Ошибка: {Message}", ex.Message);
         }
 
     }
@@ -181,4 +188,158 @@ public partial class FormExcavatorCollection : Form
 
         pictureBox.Image = _company.Show();
     }
+
+    /// <summary>
+	/// Добавление коллекции
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+    private void ButtonCollectionAdd_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+        {
+            MessageBox.Show("Не все данный заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            _logger.LogInformation("Не удалось добавить коллекцию: не все данные заполнены");
+            return;
+        }
+        CollectionType collectionType = CollectionType.None;
+        if (radioButtonMassive.Checked)
+        {
+            collectionType = CollectionType.Massive;
+        }
+        else if (radioButtonList.Checked)
+        {
+            collectionType = CollectionType.List;
+        }
+
+        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+        _logger.LogInformation("Добавлена коллекция типа {type} с названием {name}", collectionType, textBoxCollectionName.Text);
+        RefreshListBoxItems();
+    }
+
+    /// <summary>
+	/// Удаление коллекции
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+    private void ButtonCollectionDel_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItems == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+
+        try
+        {
+            if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+            RefreshListBoxItems();
+            _logger.LogInformation("Удалена коллекция: ", listBoxCollection.SelectedItem.ToString());
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError("Ошибка: {Message}", ex.Message);
+        }
+
+    }
+
+    /// <summary>
+	/// Обновление списка в listBoxCollection
+	/// </summary>
+	private void RefreshListBoxItems()
+    {
+        listBoxCollection.Items.Clear();
+
+        for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
+        {
+            string? colName = _storageCollection.Keys?[i];
+            if (!string.IsNullOrEmpty(colName))
+            {
+                listBoxCollection.Items.Add(colName);
+            }
+        }
+
+    }
+
+    /// <summary>
+	/// Создание компании
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+    private void ButtonCreateCompany_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+
+        ICollectionGenericObjects<DrawningTrackedVehicle>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+        if (collection == null)
+        {
+            MessageBox.Show("Коллекция не проинициализирована");
+            return;
+        }
+
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new GarageService(pictureBox.Width, pictureBox.Height, collection);
+                break;
+        }
+
+        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)
+        {
+            try
+            {
+                _storageCollection.SaveData(saveFileDialog.FileName);
+                MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                _logger.LogInformation("Сохранение в файл: {filename}", saveFileDialog.FileName);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogError("Ошибка: {Message}", ex.Message);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Обработка нажатия "Загрузка"
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
+    {
+        if (openFileDialog.ShowDialog() == DialogResult.OK)
+        {
+            try
+            {
+                _storageCollection.LoadData(openFileDialog.FileName);
+                RefreshListBoxItems();
+                MessageBox.Show("Загрузка прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                _logger.LogInformation("Загрузка из файла: {filename}", openFileDialog.FileName);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("Загрузка не выполнена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogError("Ошибка: {Message}", ex.Message);
+            }
+        }
+    }
 }

ProjectExcavator/ProjectExcavator/FormExcavatorCollection.resx

@@ -117,4 +117,16 @@
   <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>145, 17</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>310, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>62</value>
+  </metadata>
 </root>

ProjectExcavator/ProjectExcavator/FormExcavatorConfig.Designer.cs

@@ -0,0 +1,373 @@
+namespace ProjectExcavator
+{
+    partial class FormExcavatorConfig
+    {
+        /// <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()
+        {
+            groupBoxConfig = new GroupBox();
+            labelWeight = new Label();
+            groupBoxColors = new GroupBox();
+            panelPurple = new Panel();
+            panelYellow = new Panel();
+            panelBlack = new Panel();
+            panelGray = new Panel();
+            panelBlue = new Panel();
+            panelWhite = new Panel();
+            panelGreen = new Panel();
+            panelRed = new Panel();
+            checkBoxSupports = new CheckBox();
+            checkBoxBucket = new CheckBox();
+            numericUpDownWeight = new NumericUpDown();
+            numericUpDownSpeed = new NumericUpDown();
+            labelSpeed = new Label();
+            labelModifiedObject = new Label();
+            labelSimpleObject = new Label();
+            buttonAdd = new Button();
+            buttonCancel = new Button();
+            panelObject = new Panel();
+            pictureBoxObject = new PictureBox();
+            labelBodyColor = new Label();
+            labelAdditionalColor = new Label();
+            groupBoxConfig.SuspendLayout();
+            groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+            panelObject.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
+            SuspendLayout();
+            // 
+            // groupBoxConfig
+            // 
+            groupBoxConfig.Controls.Add(labelWeight);
+            groupBoxConfig.Controls.Add(groupBoxColors);
+            groupBoxConfig.Controls.Add(checkBoxSupports);
+            groupBoxConfig.Controls.Add(checkBoxBucket);
+            groupBoxConfig.Controls.Add(numericUpDownWeight);
+            groupBoxConfig.Controls.Add(numericUpDownSpeed);
+            groupBoxConfig.Controls.Add(labelSpeed);
+            groupBoxConfig.Controls.Add(labelModifiedObject);
+            groupBoxConfig.Controls.Add(labelSimpleObject);
+            groupBoxConfig.Dock = DockStyle.Left;
+            groupBoxConfig.Location = new Point(0, 0);
+            groupBoxConfig.Name = "groupBoxConfig";
+            groupBoxConfig.Size = new Size(548, 285);
+            groupBoxConfig.TabIndex = 0;
+            groupBoxConfig.TabStop = false;
+            groupBoxConfig.Text = "Параметры";
+            // 
+            // labelWeight
+            // 
+            labelWeight.AutoSize = true;
+            labelWeight.Location = new Point(12, 90);
+            labelWeight.Name = "labelWeight";
+            labelWeight.Size = new Size(36, 20);
+            labelWeight.TabIndex = 12;
+            labelWeight.Text = "Вес:";
+            // 
+            // groupBoxColors
+            // 
+            groupBoxColors.Controls.Add(panelPurple);
+            groupBoxColors.Controls.Add(panelYellow);
+            groupBoxColors.Controls.Add(panelBlack);
+            groupBoxColors.Controls.Add(panelGray);
+            groupBoxColors.Controls.Add(panelBlue);
+            groupBoxColors.Controls.Add(panelWhite);
+            groupBoxColors.Controls.Add(panelGreen);
+            groupBoxColors.Controls.Add(panelRed);
+            groupBoxColors.Location = new Point(260, 27);
+            groupBoxColors.Margin = new Padding(3, 4, 3, 4);
+            groupBoxColors.Name = "groupBoxColors";
+            groupBoxColors.Padding = new Padding(3, 4, 3, 4);
+            groupBoxColors.Size = new Size(259, 149);
+            groupBoxColors.TabIndex = 10;
+            groupBoxColors.TabStop = false;
+            groupBoxColors.Text = "Цвета";
+            // 
+            // panelPurple
+            // 
+            panelPurple.BackColor = Color.MediumPurple;
+            panelPurple.Location = new Point(201, 88);
+            panelPurple.Margin = new Padding(3, 4, 3, 4);
+            panelPurple.Name = "panelPurple";
+            panelPurple.Size = new Size(39, 45);
+            panelPurple.TabIndex = 3;
+            // 
+            // panelYellow
+            // 
+            panelYellow.BackColor = Color.Gold;
+            panelYellow.Location = new Point(201, 29);
+            panelYellow.Margin = new Padding(3, 4, 3, 4);
+            panelYellow.Name = "panelYellow";
+            panelYellow.Size = new Size(39, 45);
+            panelYellow.TabIndex = 1;
+            // 
+            // panelBlack
+            // 
+            panelBlack.BackColor = Color.Black;
+            panelBlack.Location = new Point(137, 88);
+            panelBlack.Margin = new Padding(3, 4, 3, 4);
+            panelBlack.Name = "panelBlack";
+            panelBlack.Size = new Size(39, 45);
+            panelBlack.TabIndex = 4;
+            // 
+            // panelGray
+            // 
+            panelGray.BackColor = Color.DarkGray;
+            panelGray.Location = new Point(77, 88);
+            panelGray.Margin = new Padding(3, 4, 3, 4);
+            panelGray.Name = "panelGray";
+            panelGray.Size = new Size(39, 45);
+            panelGray.TabIndex = 5;
+            // 
+            // panelBlue
+            // 
+            panelBlue.BackColor = Color.LightSteelBlue;
+            panelBlue.Location = new Point(137, 29);
+            panelBlue.Margin = new Padding(3, 4, 3, 4);
+            panelBlue.Name = "panelBlue";
+            panelBlue.Size = new Size(39, 45);
+            panelBlue.TabIndex = 1;
+            // 
+            // panelWhite
+            // 
+            panelWhite.BackColor = Color.Transparent;
+            panelWhite.Location = new Point(17, 88);
+            panelWhite.Margin = new Padding(3, 4, 3, 4);
+            panelWhite.Name = "panelWhite";
+            panelWhite.Size = new Size(39, 45);
+            panelWhite.TabIndex = 2;
+            // 
+            // panelGreen
+            // 
+            panelGreen.BackColor = Color.Olive;
+            panelGreen.Location = new Point(77, 29);
+            panelGreen.Margin = new Padding(3, 4, 3, 4);
+            panelGreen.Name = "panelGreen";
+            panelGreen.Size = new Size(39, 45);
+            panelGreen.TabIndex = 1;
+            // 
+            // panelRed
+            // 
+            panelRed.BackColor = Color.DarkRed;
+            panelRed.Location = new Point(17, 29);
+            panelRed.Margin = new Padding(3, 4, 3, 4);
+            panelRed.Name = "panelRed";
+            panelRed.Size = new Size(39, 45);
+            panelRed.TabIndex = 0;
+            // 
+            // checkBoxSupports
+            // 
+            checkBoxSupports.AutoSize = true;
+            checkBoxSupports.Location = new Point(12, 248);
+            checkBoxSupports.Margin = new Padding(3, 4, 3, 4);
+            checkBoxSupports.Name = "checkBoxSupports";
+            checkBoxSupports.Size = new Size(305, 24);
+            checkBoxSupports.TabIndex = 8;
+            checkBoxSupports.Text = "Признак наличия опоры для фиксации";
+            checkBoxSupports.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxBucket
+            // 
+            checkBoxBucket.AutoSize = true;
+            checkBoxBucket.Location = new Point(12, 208);
+            checkBoxBucket.Margin = new Padding(3, 4, 3, 4);
+            checkBoxBucket.Name = "checkBoxBucket";
+            checkBoxBucket.Size = new Size(202, 24);
+            checkBoxBucket.TabIndex = 7;
+            checkBoxBucket.Text = "Признак наличия ковша";
+            checkBoxBucket.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            numericUpDownWeight.Location = new Point(109, 88);
+            numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownWeight.Name = "numericUpDownWeight";
+            numericUpDownWeight.Size = new Size(105, 27);
+            numericUpDownWeight.TabIndex = 6;
+            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // numericUpDownSpeed
+            // 
+            numericUpDownSpeed.Location = new Point(109, 45);
+            numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownSpeed.Name = "numericUpDownSpeed";
+            numericUpDownSpeed.Size = new Size(105, 27);
+            numericUpDownSpeed.TabIndex = 5;
+            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelSpeed
+            // 
+            labelSpeed.AutoSize = true;
+            labelSpeed.Location = new Point(12, 47);
+            labelSpeed.Name = "labelSpeed";
+            labelSpeed.Size = new Size(76, 20);
+            labelSpeed.TabIndex = 3;
+            labelSpeed.Text = "Скорость:";
+            // 
+            // labelModifiedObject
+            // 
+            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+            labelModifiedObject.Location = new Point(404, 187);
+            labelModifiedObject.Name = "labelModifiedObject";
+            labelModifiedObject.Size = new Size(115, 45);
+            labelModifiedObject.TabIndex = 2;
+            labelModifiedObject.Text = "Продвинутый";
+            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelModifiedObject.MouseDown += LabelObject_MouseDown;
+            // 
+            // labelSimpleObject
+            // 
+            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+            labelSimpleObject.Location = new Point(261, 187);
+            labelSimpleObject.Name = "labelSimpleObject";
+            labelSimpleObject.Size = new Size(115, 45);
+            labelSimpleObject.TabIndex = 1;
+            labelSimpleObject.Text = "Простой";
+            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelSimpleObject.MouseDown += LabelObject_MouseDown;
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(575, 241);
+            buttonAdd.Margin = new Padding(3, 4, 3, 4);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(86, 31);
+            buttonAdd.TabIndex = 3;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += ButtonAdd_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(740, 240);
+            buttonCancel.Margin = new Padding(3, 4, 3, 4);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(86, 31);
+            buttonCancel.TabIndex = 4;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // panelObject
+            // 
+            panelObject.AllowDrop = true;
+            panelObject.Controls.Add(labelAdditionalColor);
+            panelObject.Controls.Add(labelBodyColor);
+            panelObject.Controls.Add(pictureBoxObject);
+            panelObject.Location = new Point(575, 13);
+            panelObject.Margin = new Padding(3, 4, 3, 4);
+            panelObject.Name = "panelObject";
+            panelObject.Size = new Size(251, 219);
+            panelObject.TabIndex = 5;
+            panelObject.DragDrop += PanelObject_DragDrop;
+            panelObject.DragEnter += PanelObject_DragEnter;
+            // 
+            // pictureBoxObject
+            // 
+            pictureBoxObject.Location = new Point(13, 75);
+            pictureBoxObject.Margin = new Padding(3, 4, 3, 4);
+            pictureBoxObject.Name = "pictureBoxObject";
+            pictureBoxObject.Size = new Size(226, 132);
+            pictureBoxObject.TabIndex = 1;
+            pictureBoxObject.TabStop = false;
+            // 
+            // labelBodyColor
+            // 
+            labelBodyColor.AllowDrop = true;
+            labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
+            labelBodyColor.Location = new Point(16, 17);
+            labelBodyColor.Name = "labelBodyColor";
+            labelBodyColor.Size = new Size(100, 40);
+            labelBodyColor.TabIndex = 2;
+            labelBodyColor.Text = "Цвет";
+            labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelBodyColor.DragDrop += labelBodyColor_DragDrop;
+            labelBodyColor.DragEnter += labelBodyColor_DragEnter;
+            // 
+            // labelAdditionalColor
+            // 
+            labelAdditionalColor.AllowDrop = true;
+            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+            labelAdditionalColor.Location = new Point(139, 17);
+            labelAdditionalColor.Name = "labelAdditionalColor";
+            labelAdditionalColor.Size = new Size(100, 40);
+            labelAdditionalColor.TabIndex = 4;
+            labelAdditionalColor.Text = "Доп. цвет";
+            labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelAdditionalColor.DragDrop += labelAdditionalColor_DragDrop;
+            labelAdditionalColor.DragEnter += labelAdditionalColor_DragEnter;
+            // 
+            // FormExcavatorConfig
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(838, 285);
+            Controls.Add(panelObject);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonAdd);
+            Controls.Add(groupBoxConfig);
+            Name = "FormExcavatorConfig";
+            Text = "Создание объекта";
+            groupBoxConfig.ResumeLayout(false);
+            groupBoxConfig.PerformLayout();
+            groupBoxColors.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
+            panelObject.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxConfig;
+        private Label labelSpeed;
+        private Label labelModifiedObject;
+        private Label labelSimpleObject;
+        private NumericUpDown numericUpDownWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private CheckBox checkBoxBucket;
+        private CheckBox checkBoxSupports;
+        private GroupBox groupBoxColors;
+        private Panel panelPurple;
+        private Panel panelYellow;
+        private Panel panelBlack;
+        private Panel panelGray;
+        private Panel panelBlue;
+        private Panel panelWhite;
+        private Panel panelGreen;
+        private Panel panelRed;
+        private Button buttonAdd;
+        private Button buttonCancel;
+        private Panel panelObject;
+        private PictureBox pictureBoxObject;
+        private Label labelWeight;
+        private Label labelAdditionalColor;
+        private Label labelBodyColor;
+    }
+}

ProjectExcavator/ProjectExcavator/FormExcavatorConfig.cs

@@ -0,0 +1,173 @@
+using ProjectExcavator.Drawnings;
+using ProjectExcavator.Entities;
+
+namespace ProjectExcavator;
+
+/// <summary>
+/// Форма конфигурации объекта
+/// </summary>
+public partial class FormExcavatorConfig : Form
+{
+    /// <summary>
+	/// Объект - прорисовка гусеничной машины/экскаватора
+	/// </summary>
+    private DrawningTrackedVehicle? _trackedVehicle;
+
+    /// <summary>
+	/// Событие для передачи объекта
+	/// </summary>
+	private event Action<DrawningTrackedVehicle>? _trackedVehicleDelegate;
+
+    /// <summary>
+	/// Конструктор
+	/// </summary>
+    public FormExcavatorConfig()
+    {
+
+        InitializeComponent();
+
+        panelRed.MouseDown += Panel_MouseDown;
+        panelGreen.MouseDown += Panel_MouseDown;
+        panelBlue.MouseDown += Panel_MouseDown;
+        panelYellow.MouseDown += Panel_MouseDown;
+        panelWhite.MouseDown += Panel_MouseDown;
+        panelGray.MouseDown += Panel_MouseDown;
+        panelBlack.MouseDown += Panel_MouseDown;
+        panelPurple.MouseDown += Panel_MouseDown;
+
+        // buttonCancel.Click привязать анонимный метод через lambda с закрытием формы(c)
+        buttonCancel.Click += (sender, e) => Close();
+
+    }
+
+    /// <summary>
+	/// Привязка внешнего метода к событию
+	/// </summary>
+	/// <param name="excavatorDelegate"></param>
+	public void AddEvent(Action<DrawningTrackedVehicle> excavatorDelegate)
+    {
+        _trackedVehicleDelegate += excavatorDelegate;
+    }
+
+    /// <summary>
+	/// Прорисовка объекта
+	/// </summary>
+	private void DrawObject()
+    {
+        Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+        Graphics gr = Graphics.FromImage(bmp);
+        _trackedVehicle?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
+        _trackedVehicle?.SetPosition(30, 20);
+        _trackedVehicle?.DrawTransport(gr);
+        pictureBoxObject.Image = bmp;
+    }
+
+    /// <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 ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy);
+    }
+
+    /// <summary>
+	/// Проверка получаемой информации (ее типа на соответствие требуемому)
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+    private void PanelObject_DragEnter(object sender, DragEventArgs e)
+    {
+        e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
+    }
+
+    private void PanelObject_DragDrop(object sender, DragEventArgs e)
+    {
+        switch (e.Data?.GetData(DataFormats.Text)?.ToString())
+        {
+            case "labelSimpleObject":
+                _trackedVehicle = new DrawningTrackedVehicle((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White);
+                break;
+            case "labelModifiedObject":
+                _trackedVehicle = new DrawningExcavator((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White,
+                    Color.Black, checkBoxBucket.Checked, checkBoxSupports.Checked);
+                break;
+        }
+        DrawObject();
+    }
+
+    // <summary>
+    /// Передаем информацию при нажатии на Panel
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void Panel_MouseDown(object? sender, MouseEventArgs e)
+    {
+        //Отправка цвета в Drag&Drop
+        (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+    }
+
+    //Логика смены цветов: основного и дополнительного (для продвинутого объекта)
+    private void labelBodyColor_DragEnter(object sender, DragEventArgs e)
+    {
+        if (e.Data.GetDataPresent(typeof(Color)))
+        {
+            e.Effect = DragDropEffects.Copy;
+        }
+        else
+        {
+            e.Effect = DragDropEffects.None;
+        }
+    }
+
+    private void labelBodyColor_DragDrop(object sender, DragEventArgs e)
+    {
+        if (_trackedVehicle != null)
+        {
+            _trackedVehicle.EntityTrackedVehicle.SetBodyColor((Color)e.Data.GetData(typeof(Color)));
+            DrawObject();
+        }
+    }
+
+    private void labelAdditionalColor_DragEnter(object sender, DragEventArgs e)
+    {
+        if (_trackedVehicle is DrawningExcavator)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+    }
+
+    private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e)
+    {
+        if (_trackedVehicle?.EntityTrackedVehicle is EntityExcavator _catamaran)
+        {
+            _catamaran.SetAdditionalColor((Color)e.Data.GetData(typeof(Color)));
+        }
+        DrawObject();
+
+    }
+
+
+    /// <summary>
+    /// Передача объекта
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAdd_Click(object sender, EventArgs e)
+    {
+        if (_trackedVehicle != null)
+        {
+            _trackedVehicleDelegate?.Invoke(_trackedVehicle);
+            Close();
+        }
+    }
+}
+

ProjectExcavator/ProjectExcavator/FormExcavatorConfig.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <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>

ProjectExcavator/ProjectExcavator/Program.cs

@@ -1,3 +1,8 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Configuration;
+using Serilog;
+
 namespace ProjectExcavator
 {
     internal static class Program
@@ -11,7 +16,28 @@ namespace ProjectExcavator
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormExcavatorCollection());
+            var services = new ServiceCollection();
+            ConfigureServices(services);
+            using ServiceProvider serviceProvider = services.BuildServiceProvider();
+            Application.Run(serviceProvider.GetRequiredService<FormExcavatorCollection>());
+        }
+
+        private static void ConfigureServices(ServiceCollection services)
+        {
+            string[] path = Directory.GetCurrentDirectory().Split('\\');
+            string pathNeed = "";
+            for (int i = 0; i < path.Length - 3; i++)
+            {
+                pathNeed += path[i] + "\\";
+            }
+
+            services.AddSingleton<FormExcavatorCollection>()
+            .AddLogging(option =>
+            {
+                option.SetMinimumLevel(LogLevel.Information);
+                option.AddSerilog(new LoggerConfiguration().ReadFrom.Configuration(new ConfigurationBuilder().
+                    AddJsonFile($"{pathNeed}appSetting.json").Build()).CreateLogger());
+            });
         }
     }
 }

ProjectExcavator/ProjectExcavator/ProjectExcavator.csproj

@@ -8,6 +8,14 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Serilog" Version="4.0.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -23,4 +31,10 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="appSetting.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

ProjectExcavator/ProjectExcavator/appSetting.json

@@ -0,0 +1,15 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File" ],
+    "MinimumLevel": "Debug",
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": { "path": "log.log" }
+      }
+    ],
+    "Properties": {
+      "Applicatoin": "Sample"
+    }
+  }
+}