Лабораторная работа №8

Excavator/Excavator/CollectionGenericObjects/AbsractCompany.cs

@@ -48,7 +48,7 @@ public abstract class AbstractCompany
         _pictureWidth = picWidth;
         _pictureHeight = picHeight;
         _collection = collection;
-        _collection.SetMaxCount = GetMaxCount;
+        _collection.MaxCount = GetMaxCount;
     }
 
     /// <summary>
@@ -57,9 +57,9 @@ public abstract class AbstractCompany
     /// <param name="company">Компания</param>
     /// <param name="car">Добавляемый объект</param>
     /// <returns></returns>
-    public static int operator +(AbstractCompany company, DrawningSimpleExcavator car)
+    public static int operator +(AbstractCompany company, DrawningSimpleExcavator excavator)
     {
-        return company._collection.Insert(car);
+        return company._collection.Insert(excavator, new DrawningExcavatorEqutables());
     }
 
     /// <summary>
@@ -103,6 +103,12 @@ public abstract class AbstractCompany
         return bitmap;
     }
 
+    /// <summary>
+    /// Сортировка
+    /// </summary>
+    /// <param name="comparer">Сравнитель объектов</param>
+    public void Sort(IComparer<DrawningSimpleExcavator?> comparer) => _collection?.CollectionSort(comparer);
+
     /// <summary>
     /// Вывод заднего фона
     /// </summary>

Excavator/Excavator/CollectionGenericObjects/CollectionInfo.cs

@@ -0,0 +1,76 @@
+namespace Excavator.CollectionGenericObjects;
+
+/// <summary>
+/// Класс, хранящий информацию о коллекции
+/// </summary>
+public class CollectionInfo : IEquatable<CollectionInfo>
+{
+    /// <summary>
+    /// Название
+    /// </summary>
+    public string Name { get; private set; }
+
+    /// <summary>
+	/// Тип
+	/// </summary>
+	public CollectionType CollectionType { get; private set; }
+
+    /// <summary>
+    /// Описание
+    /// </summary>
+    public string Description { get; private set; }
+
+    /// <summary>
+    /// Разделитель для записи информации по объекту в файл
+    /// </summary>
+    private static readonly string _separator = "-";
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="name">Название</param>
+    /// <param name="collectionType">Тип</param>
+    /// <param name="description">Описание</param>
+    public CollectionInfo(string name, CollectionType collectionType, string description)
+    {
+        Name = name;
+        CollectionType = collectionType;
+        Description = description;
+    }
+
+    /// <summary>
+    /// Создание объекта из строки
+    /// </summary>
+    /// <param name="data">Строка</param>
+    /// <returns>Объект или null</returns>
+    public static CollectionInfo? GetCollectionInfo(string data)
+    {
+        string[] strs = data.Split(_separator, StringSplitOptions.RemoveEmptyEntries);
+        if (strs.Length < 1 || strs.Length > 3)
+        {
+            return null;
+        }
+
+        return new CollectionInfo(strs[0], (CollectionType)Enum.Parse(typeof(CollectionType), strs[1]), strs.Length > 2 ? strs[2] : string.Empty);
+    }
+
+    public override string ToString()
+    {
+        return Name + _separator + CollectionType + _separator + Description;
+    }
+
+    public bool Equals(CollectionInfo? other)
+    {
+        return Name == other?.Name;
+    }
+
+    public override bool Equals(object? obj)
+    {
+        return Equals(obj as CollectionInfo);
+    }
+
+    public override int GetHashCode()
+    {
+        return Name.GetHashCode();
+    }
+}

Excavator/Excavator/CollectionGenericObjects/CollectionType.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Excavator.CollectionGenericObjects;
+
+public enum CollectionType
+{
+    /// <summary>
+	/// Неопределено
+	/// </summary>
+	None = 0,
+
+    /// <summary>
+    /// Массив
+    /// </summary>
+    Massive = 1,
+
+    /// <summary>
+    /// Список
+    /// </summary>
+    List = 2
+}

Excavator/Excavator/CollectionGenericObjects/Garage.cs

@@ -7,6 +7,7 @@ namespace Excavator.CollectionGenericObjects;
 /// </summary>
 public class Garage : AbstractCompany
 {
+
     /// <summary>
     /// Конструктор
     /// </summary>

Excavator/Excavator/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -15,14 +15,14 @@ public interface ICollectionGenericObjects<T>
     /// <summary>
     /// Установка максимального количества элементов
     /// </summary>
-    int SetMaxCount { set; }
+    int MaxCount { get; set; }
 
     /// <summary>
     /// Добавление объекта в коллекцию
     /// </summary>
     /// <param name="obj">Добавляемый объект</param>
     /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-    int Insert(T obj);
+    int Insert(T obj, IEqualityComparer<T?>? comparer = null);
 
     /// <summary>
     /// Добавление объекта в коллекцию на конкретную позицию
@@ -30,7 +30,7 @@ public interface ICollectionGenericObjects<T>
     /// <param name="obj">Добавляемый объект</param>
     /// <param name="position">Позиция</param>
     /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-    int Insert(T obj, int position);
+    int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null);
 
     /// <summary>
     /// Удаление объекта из коллекции с конкретной позиции
@@ -45,4 +45,22 @@ 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();
+
+    /// <summary>
+    /// Сортировка коллекции
+    /// </summary>
+    /// <param name="comparer">Сравнитель объектов</param>
+    void CollectionSort(IComparer<T?> comparer);
 }

Excavator/Excavator/CollectionGenericObjects/ListGenericObjects.cs

@@ -0,0 +1,97 @@
+using Excavator.Exceptions;
+
+namespace Excavator.CollectionGenericObjects;
+
+public class ListGenericObjects<T> : ICollectionGenericObjects<T>
+    where T : class
+{
+    /// <summary>
+	/// Список объектов, которые храним
+	/// </summary>
+	private readonly List<T?> _collection;
+
+    /// <summary>
+    /// Максимально допустимое число объектов в списке
+    /// </summary>
+    public 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, IEqualityComparer<T?>? comparer = null)
+    {
+        if (comparer != null)
+        {
+            if (_collection.Contains(obj, comparer))
+            {
+                throw new ObjectNotUniqueException();
+            }
+        }
+        if (Count == _maxCount) throw new CollectionOverflowException(Count);
+        _collection.Add(obj);
+        return Count;
+    }
+    public int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
+    {
+        if (comparer != null)
+        {
+            if (_collection.Contains(obj, comparer))
+            {
+                throw new ObjectNotUniqueException();
+            }
+        }
+        
+        if (Count == _maxCount) throw new CollectionOverflowException(Count); ;
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
+        _collection.Insert(position, obj);
+        return position;
+    }
+
+    public T Remove(int position)
+    {
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
+        T temp = _collection[position];
+        _collection.RemoveAt(position);
+        return temp;
+    }
+
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < Count; i++)
+        {
+            yield return _collection[i];
+        }
+    }
+    void ICollectionGenericObjects<T>.CollectionSort(IComparer<T?> comparer)
+    {
+        _collection.Sort(comparer);
+    }
+
+}

Excavator/Excavator/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,4 +1,8 @@
-namespace Excavator.CollectionGenericObjects;
+using Excavator.Exceptions;
+using Excavator.Drawnings;
+using System.Collections.Immutable;
+
+namespace Excavator.CollectionGenericObjects;
 
 /// <summary>
 /// Параметризованный набор объектов
@@ -14,8 +18,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 +40,8 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         }
     }
 
+    public CollectionType GetCollectionType => CollectionType.Massive;
+
     /// <summary>
     /// Конструктор
     /// </summary>
@@ -45,14 +55,24 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         // TODO проверка позиции
         if (position < 0 || position >= Count)
         {
-            return null;
+            throw new PositionOutOfCollectionException(position);
         }
 
         return _collection[position];
     }
 
-    public int Insert(T obj)
+    public int Insert(T obj, IEqualityComparer<T?>? comparer = null)
     {
+        if (comparer != null)
+        {
+            foreach (T? item in _collection)
+            {
+                if ((comparer as IEqualityComparer<DrawningSimpleExcavator>).Equals(obj as DrawningSimpleExcavator, item as DrawningSimpleExcavator))
+                {
+                    throw new ObjectNotUniqueException();
+                }
+            }
+        }
         for (int i = 0; i < Count; i++)
         {
             if (_collection[i] == null)
@@ -62,20 +82,15 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             }
          }
 
-        return -1;
+        throw new CollectionOverflowException(Count);
     }
 
-    public int Insert(T obj, int position)
+    public int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
     {
-        // TODO проверка позиции
-        // TODO проверка, что элемент массима по этой позиции пустой,
-        // если элемент массима по этой позиции не пустой,
-        // найти свободное место после этой позиции, если не найдено,
-        // то искать до
-        // TODO вставка
+        
         if (position < 0 || position >= Count)
         {
-            return -1;
+            throw new PositionOutOfCollectionException(position);
         }
 
         if (_collection[position] == null)
@@ -104,15 +119,32 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             }
         }
 
-        return -1;
+        throw new CollectionOverflowException(Count);
     }
 
 
     public T Remove(int position)
     {
-        if (position >= Count || position < 0) return null;
-        T obj = _collection[position];
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position); ;
+        T? obj = _collection[position];
+        if (obj == null)
+        {
+            throw new ObjectNotFoundException(position);
+        }
         _collection[position] = null;
         return obj;
     }
+
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < _collection.Length; i++)
+        {
+            yield return _collection[i];
+        }
+    }
+
+    void ICollectionGenericObjects<T>.CollectionSort(IComparer<T?> comparer)
+    {
+        Array.Sort(_collection, comparer);
+    }
 } 

Excavator/Excavator/CollectionGenericObjects/StorageCollection.cs

@@ -0,0 +1,228 @@
+using Excavator.Drawnings;
+using System.Text;
+using Excavator.Exceptions;
+
+namespace Excavator.CollectionGenericObjects;
+
+public class StorageCollection<T> where T : DrawningSimpleExcavator
+{
+    /// <summary>
+    /// Словарь (хранилище) с коллекциями
+    /// </summary>
+    readonly Dictionary<CollectionInfo, ICollectionGenericObjects<T>> _storages;
+
+    /// <summary>
+    /// Возвращение списка названий коллекций
+    /// </summary>
+    public List<CollectionInfo> Keys => _storages.Keys.ToList();
+
+    /// <summary>
+    /// Ключевое слово, с которого должен начинаться файл
+    /// </summary>
+    private readonly string _collectionKey = "CollectionStorage";
+
+    /// <summary>
+    /// Разделитель для записи ключа и значения элемента словаря
+    /// </summary>
+    private readonly string _separatorForKeyValue = "|";
+
+    /// <summary>
+    /// Разделитель для записей коллекции данных в файл
+    /// </summary>
+    private readonly string _separatorItems = ";";
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public StorageCollection()
+    {
+        _storages = new Dictionary<CollectionInfo, ICollectionGenericObjects<T>>();
+    }
+    /// <summary>
+    /// Добавление коллекции в хранилище
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    /// <param name="collectionType">тип коллекции</param>
+    public void AddCollection(string name, CollectionType collectionType)
+    {
+        CollectionInfo collectionInfo = new CollectionInfo(name, collectionType, string.Empty);
+
+        if (_storages.ContainsKey(collectionInfo) || collectionInfo.CollectionType == CollectionType.None) return;
+        switch (collectionInfo.CollectionType)
+        {
+            case CollectionType.Massive:
+                _storages[collectionInfo] = new MassiveGenericObjects<T>();
+                break;
+            case CollectionType.List:
+                _storages[collectionInfo] = new ListGenericObjects<T>();
+                break;
+        }
+    }
+
+    /// <summary>
+    /// Удаление коллекции
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    public void DelCollection(string name)
+    {
+        {
+            CollectionInfo collectionInfo = new CollectionInfo(name, CollectionType.None, string.Empty);
+            if (_storages.ContainsKey(collectionInfo) && collectionInfo != null)
+            {
+                _storages.Remove(collectionInfo);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Доступ к коллекции
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    /// <returns></returns>
+    public ICollectionGenericObjects<T>? this[string name]
+    {
+        get
+        {
+            CollectionInfo collectionInfo = new CollectionInfo(name, CollectionType.None, string.Empty);
+            if (_storages.ContainsKey(collectionInfo))
+            {
+                return _storages[collectionInfo];
+            }
+            return null;
+        }
+    }
+
+    /// <summary>
+    /// Сохранение информации по автомобилям в хранилище в файл
+    /// </summary>
+    /// <param name="filename">Путь и имя файла</param>
+    /// <returns>true - сохранение прошло успешно, false - ошибка при сохранение данных</returns>
+    public void SaveData(string filename)
+    {
+        if (_storages.Count == 0)
+        {
+            throw new Exception("В хранилище отсутствуют коллекции для сохранения");
+        }
+
+        if (File.Exists(filename))
+        {
+            File.Delete(filename);
+        }
+
+        using (StreamWriter writer = new StreamWriter(filename))
+        {
+            writer.Write(_collectionKey);
+            foreach (KeyValuePair<CollectionInfo, ICollectionGenericObjects<T>> value in _storages)
+            {
+                StringBuilder sb = new();
+
+                sb.Append(Environment.NewLine);
+                // не сохраняем пустые коллекции
+                if (value.Value.Count == 0)
+                {
+                    continue;
+                }
+
+                sb.Append(value.Key);
+                sb.Append(_separatorForKeyValue);
+                sb.Append(value.Value.MaxCount);
+                sb.Append(_separatorForKeyValue);
+
+                foreach (T? item in value.Value.GetItems())
+                {
+                    string data = item?.GetDataForSave() ?? string.Empty;
+                    if (string.IsNullOrEmpty(data))
+                    {
+                        continue;
+                    }
+
+                    sb.Append(data);
+                    sb.Append(_separatorItems);
+                }
+
+                writer.Write(sb);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Загрузка информации по автомобилям в хранилище из файла
+    /// </summary>
+    /// <param name="filename">Путь и имя файла</param>
+    /// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
+    public void LoadData(string filename)
+    {
+        if (!File.Exists(filename))
+        {
+            throw new FileNotFoundException("Файл не существует");
+        }
+
+        using (StreamReader fs = File.OpenText(filename))
+        {
+            string str = fs.ReadLine();
+
+            if (str == null || str.Length == 0)
+            {
+                throw new IOException("В файле нет данных");
+            }
+
+            if (!str.StartsWith(_collectionKey))
+            {
+                throw new IOException("В файле неверные данные");
+            }
+
+            _storages.Clear();
+            string strs = "";
+            while ((strs = fs.ReadLine()) != null)
+            {
+                string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
+                if (record.Length != 3)
+                {
+                    continue;
+                }
+
+                CollectionInfo? collectionInfo = CollectionInfo.GetCollectionInfo(record[0]) ??
+                    throw new Exception("Не удалось определить информацию коллекции:" + record[0]);
+                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionInfo.CollectionType) ??
+                    throw new Exception("Не удалось определить тип коллекции: " + record[1]);
+
+                collection.MaxCount = Convert.ToInt32(record[1]);
+
+                string[] set = record[2].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+                foreach (string elem in set)
+                {
+                    if (elem?.CreateDrawningSimpleExcavator() is T excavator)
+                    {
+                        try
+                        {
+                            if (collection.Insert(excavator) == -1)
+                            {
+                                throw new Exception("Объект не удалось добавить в коллекцию: " + record[3]);
+                            }
+                        }
+                        catch (CollectionOverflowException ex)
+                        {
+                            throw new Exception("Коллекция переполнена", ex);
+                        }
+                    }
+                }
+                _storages.Add(collectionInfo, 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
+        };
+    }
+}

Excavator/Excavator/Drawnings/DrawningExcavator.cs

@@ -25,6 +25,14 @@ public class DrawningExcavator : DrawningSimpleExcavator
         EntitySimpleExcavator = new EntityExcavator(speed, weight, bodyColor, additionalColor, supports, bucket);
         
     }
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="airbus">Класс-сущность</param>
+    public DrawningExcavator(EntityExcavator excavator) : base(70, 80)
+    {
+        EntitySimpleExcavator = new EntityExcavator(excavator.Speed, excavator.Weight, excavator.BodyColor, excavator.AdditionalColor, excavator.Supports, excavator.Bucket);
+    }
 
     public override void DrawTransport(Graphics g)
     {

Excavator/Excavator/Drawnings/DrawningExcavatorCompareByColor.cs

@@ -0,0 +1,22 @@
+namespace Excavator.Drawnings;
+
+/// <summary>
+/// Сравнение по цвету, скорости, весу
+/// </summary>
+public class DrawningExcavatorCompareByColor : IComparer<DrawningSimpleExcavator?>
+{
+    public int Compare(DrawningSimpleExcavator? x, DrawningSimpleExcavator? y)
+    {
+        if (x == null || x.EntitySimpleExcavator == null) return 1;
+
+        if (y == null || y.EntitySimpleExcavator == null) return -1;
+
+        var bodycolorCompare = x.EntitySimpleExcavator.BodyColor.Name.CompareTo(y.EntitySimpleExcavator.BodyColor.Name);
+        if (bodycolorCompare != 0) return bodycolorCompare;
+
+        var speedCompare = x.EntitySimpleExcavator.Speed.CompareTo(y.EntitySimpleExcavator.Speed);
+        if (speedCompare != 0) return speedCompare;
+
+        return x.EntitySimpleExcavator.Weight.CompareTo(y.EntitySimpleExcavator.Weight);
+    }
+}

Excavator/Excavator/Drawnings/DrawningExcavatorCompareByType.cs

@@ -0,0 +1,21 @@
+namespace Excavator.Drawnings;
+
+/// <summary>
+/// Сравнение по типу, скорости и весу
+/// </summary>
+public class DrawningExcavatorCompareByType : IComparer<DrawningSimpleExcavator?>
+{
+    public int Compare(DrawningSimpleExcavator? x, DrawningSimpleExcavator? y)
+    {
+        if (x == null || x.EntitySimpleExcavator == null) return 1;
+
+        if (y == null || y.EntitySimpleExcavator == null) return -1;
+
+        if (x.GetType().Name != y.GetType().Name) return x.GetType().Name.CompareTo(y.GetType().Name);
+
+        var speedCompare = x.EntitySimpleExcavator.Speed.CompareTo(y.EntitySimpleExcavator.Speed);
+        if (speedCompare != 0) return speedCompare;
+
+        return x.EntitySimpleExcavator.Weight.CompareTo(y.EntitySimpleExcavator.Weight);
+    }
+}

Excavator/Excavator/Drawnings/DrawningExcavatorEqutables.cs

@@ -0,0 +1,43 @@
+using Excavator.Entities;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Excavator.Drawnings;
+
+/// <summary>
+/// Реализация сравнения двух объектов класса-прорисовки
+/// </summary>
+public class DrawningExcavatorEqutables : IEqualityComparer<DrawningSimpleExcavator?>
+{
+    public bool Equals(DrawningSimpleExcavator? x, DrawningSimpleExcavator? y)
+    {
+        if (x == null || x.EntitySimpleExcavator == null) return false;
+
+        if (y == null || y.EntitySimpleExcavator == null) return false;
+
+        if (x.GetType().Name != y.GetType().Name) return false;
+
+        if (x.EntitySimpleExcavator.Speed != y.EntitySimpleExcavator.Speed) return false;
+
+        if (x.EntitySimpleExcavator.Weight != y.EntitySimpleExcavator.Weight) return false;
+
+        if (x.EntitySimpleExcavator.BodyColor != y.EntitySimpleExcavator.BodyColor) return false;
+
+        if (x is DrawningExcavator bigX && y is DrawningExcavator bigY)
+        {
+            // TODO доделать логику сравнения дополнительных параметров
+            EntityExcavator _x = (EntityExcavator)x.EntitySimpleExcavator;
+            EntityExcavator _y = (EntityExcavator)y.EntitySimpleExcavator;
+
+            if (_x.Supports != _y.Supports) return false;
+            if (_x.Bucket != _y.Bucket) return false;
+            if (_x.AdditionalColor != _y.AdditionalColor) return false;
+        }
+
+        return true;
+    }
+
+    public int GetHashCode([DisallowNull] DrawningSimpleExcavator obj)
+    {
+        return obj.GetHashCode();
+    }
+}

Excavator/Excavator/Drawnings/DrawningSimpleExcavator.cs

@@ -88,6 +88,16 @@ public class DrawningSimpleExcavator
         
     }
 
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="airbus">Класс-сущность</param>
+    public DrawningSimpleExcavator(EntitySimpleExcavator simpleExcavator) : this()
+    {
+        EntitySimpleExcavator = new EntitySimpleExcavator(simpleExcavator.Speed, simpleExcavator.Weight, simpleExcavator.BodyColor);
+    }
+
+
     /// <summary>
     /// Конструктор для наследников
     /// </summary>

Excavator/Excavator/Drawnings/ExtensionDrawningSimpleExcavator.cs

@@ -0,0 +1,55 @@
+using Excavator.Entities;
+
+namespace Excavator.Drawnings;
+
+/// <summary>
+/// Расширение для класса EntityCar
+/// </summary>
+public static class ExtensionDrawningAirbus
+{
+    /// <summary>
+    /// Разделитель для записи информации по объекту в файл
+    /// </summary>
+    private static readonly string _separatorForObject = ":";
+
+    /// <summary>
+    /// Создание объекта из строки
+    /// </summary>
+    /// <param name="info">Строка с данными для создания объекта</param>
+    /// <returns>Объект</returns>
+    public static DrawningSimpleExcavator? CreateDrawningSimpleExcavator(this string info)
+    {
+        string[] strs = info.Split(_separatorForObject);
+
+        EntitySimpleExcavator? excavator = EntityExcavator.CreateEntityExcavator(strs);
+        if (excavator != null)
+        {
+            return new DrawningExcavator((EntityExcavator)excavator);
+        }
+
+        excavator = EntitySimpleExcavator.CreateEntitySimpleExcavator(strs);
+        if (excavator != null)
+        {
+            return new DrawningSimpleExcavator(excavator);
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Получение данных для сохранения в файл
+    /// </summary>
+    /// <param name="drawningAirbus">Сохраняемый объект</param>
+    /// <returns>Строка с данными по объекту</returns>
+    public static string GetDataForSave(this DrawningSimpleExcavator drawningSimpleExcavator)
+    {
+        string[]? array = drawningSimpleExcavator?.EntitySimpleExcavator?.GetStringRepresentation();
+
+        if (array == null)
+        {
+            return string.Empty;
+        }
+
+        return string.Join(_separatorForObject, array);
+    }
+}

Excavator/Excavator/Entities/EntityExcavator.cs

@@ -10,6 +10,10 @@ public class EntityExcavator : EntitySimpleExcavator
     /// Дополнительный цвет (для опциональных элементов)
     /// </summary>
     public Color AdditionalColor { get; private set; }
+    public void SetAdditionalColor(Color additionalColor)
+    {
+        AdditionalColor = additionalColor;
+    }
 
     /// <summary>
     /// Признак (опция) наличия опор
@@ -37,4 +41,30 @@ public class EntityExcavator : EntitySimpleExcavator
         Supports = supports;
         Bucket = bucket;
     }
+
+    /// <summary>
+    /// Получение строк со значениями свойств объекта продвинутого класса-сущности
+    /// </summary>
+    /// <returns></returns>
+    public override string[] GetStringRepresentation()
+    {
+        return new[] { nameof(EntityExcavator), Speed.ToString(), Weight.ToString(), BodyColor.Name,
+            AdditionalColor.Name, Supports.ToString(), Bucket.ToString() };
+    }
+
+    /// <summary>
+    /// Создание продвинутого объекта из массива строк
+    /// </summary>
+    /// <param name="strs"></param>
+    /// <returns></returns>
+    public static EntitySimpleExcavator? 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]));
+    }
 }

Excavator/Excavator/Entities/EntitySimpleExcavator.cs

@@ -26,6 +26,10 @@ public class EntitySimpleExcavator
     /// Основной цвет
     /// </summary>
     public Color BodyColor { get; private set; }
+    public void SetBodyColor(Color bodyColor)
+    {
+        BodyColor = bodyColor;
+    }
 
     /// <summary>
     /// Шаг перемещения экскаватора
@@ -44,4 +48,27 @@ public class EntitySimpleExcavator
         Weight = weight;
         BodyColor = bodyColor;
     }
+    /// <summary>
+    /// Получение строк со значениями свойств объекта класса-сущности
+    /// </summary>
+    /// <returns></returns>
+    public virtual string[] GetStringRepresentation()
+    {
+        return new[] { nameof(EntitySimpleExcavator), Speed.ToString(), Weight.ToString(), BodyColor.Name };
+    }
+
+    /// <summary>
+    /// Создание объекта из массива строк
+    /// </summary>
+    /// <param name="strs"></param>
+    /// <returns></returns>
+    public static EntitySimpleExcavator? CreateEntitySimpleExcavator(string[] strs)
+    {
+        if (strs.Length != 4 || strs[0] != nameof(EntitySimpleExcavator))
+        {
+            return null;
+        }
+
+        return new EntitySimpleExcavator(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]));
+    }
 }

Excavator/Excavator/Excavator.csproj

@@ -8,4 +8,23 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.11" />
+    <PackageReference Include="Serilog" Version="4.0.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="Serilog.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

Excavator/Excavator/Exceptions/CollectionOverflowException.cs

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

Excavator/Excavator/Exceptions/ObjectNotFoundException.cs

@@ -0,0 +1,23 @@
+using System.Runtime.Serialization;
+
+namespace Excavator.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 context) : base(info, context) { }
+}
+
+
+

Excavator/Excavator/Exceptions/ObjectNotUniqueException.cs

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

Excavator/Excavator/Exceptions/PositionOutOfCollectionException.cs

@@ -0,0 +1,20 @@
+using System.Runtime.Serialization;
+
+namespace Excavator.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 context) : base(info, context) { }
+}

Excavator/Excavator/FormExcavatorCollection.Designer.cs

@@ -29,94 +29,147 @@
         private void InitializeComponent()
         {
             groupBoxTools = new GroupBox();
-            buttonRefresh = new Button();
-            buttonGoToCheck = new Button();
-            buttonRemoveExcavator = new Button();
-            maskedTextBoxPosition = new MaskedTextBox();
-            buttonAddExcavator = new Button();
-            buttonAddSimpleExcavator = new Button();
+            buttonCreateCompany = new Button();
+            panelStorage = new Panel();
+            buttonCollectionDel = new Button();
+            listBoxCollection = new ListBox();
+            buttonCollectionAdd = new Button();
+            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            labelCollectionName = new Label();
+            textBoxCollectionName = new TextBox();
             comboBoxSelectorCompany = new ComboBox();
+            panelCompanyTools = new Panel();
+            buttonGoToCheck = new Button();
+            buttonAddSimpleExcavator = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
+            buttonRemoveExcavator = new Button();
+            buttonRefresh = new Button();
             pictureBox = new PictureBox();
+            menuStrip1 = new MenuStrip();
+            файлToolStripMenuItem = new ToolStripMenuItem();
+            SaveToolStripMenuItem = new ToolStripMenuItem();
+            LoadToolStripMenuItem = new ToolStripMenuItem();
+            openFileDialog = new OpenFileDialog();
+            saveFileDialog = new SaveFileDialog();
+            buttonSortByType = new Button();
+            buttonSortByColor = new Button();
             groupBoxTools.SuspendLayout();
+            panelStorage.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            menuStrip1.SuspendLayout();
             SuspendLayout();
             // 
             // groupBoxTools
             // 
             groupBoxTools.Anchor = AnchorStyles.Right;
-            groupBoxTools.Controls.Add(buttonRefresh);
-            groupBoxTools.Controls.Add(buttonGoToCheck);
-            groupBoxTools.Controls.Add(buttonRemoveExcavator);
-            groupBoxTools.Controls.Add(maskedTextBoxPosition);
-            groupBoxTools.Controls.Add(buttonAddExcavator);
-            groupBoxTools.Controls.Add(buttonAddSimpleExcavator);
+            groupBoxTools.Controls.Add(buttonSortByColor);
+            groupBoxTools.Controls.Add(buttonSortByType);
+            groupBoxTools.Controls.Add(buttonCreateCompany);
+            groupBoxTools.Controls.Add(panelStorage);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Controls.Add(panelCompanyTools);
             groupBoxTools.Font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular, GraphicsUnit.Point);
-            groupBoxTools.Location = new Point(855, 1);
+            groupBoxTools.Location = new Point(861, 27);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(212, 634);
+            groupBoxTools.Size = new Size(212, 647);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
+            groupBoxTools.Enter += groupBoxTools_Enter;
             // 
-            // buttonRefresh
+            // buttonCreateCompany
             // 
-            buttonRefresh.Location = new Point(6, 473);
-            buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(200, 49);
-            buttonRefresh.TabIndex = 6;
-            buttonRefresh.Text = "Обновить";
-            buttonRefresh.UseVisualStyleBackColor = true;
-            buttonRefresh.Click += ButtonRefresh_Click;
+            buttonCreateCompany.Location = new Point(12, 322);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(191, 34);
+            buttonCreateCompany.TabIndex = 7;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += buttonCreateCompany_Click;
             // 
-            // buttonGoToCheck
+            // panelStorage
             // 
-            buttonGoToCheck.Location = new Point(6, 379);
-            buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(200, 49);
-            buttonGoToCheck.TabIndex = 5;
-            buttonGoToCheck.Text = "Передать на тесты";
-            buttonGoToCheck.UseVisualStyleBackColor = true;
-            buttonGoToCheck.Click += ButtonGoToCheck_Click;
+            panelStorage.Controls.Add(buttonCollectionDel);
+            panelStorage.Controls.Add(listBoxCollection);
+            panelStorage.Controls.Add(buttonCollectionAdd);
+            panelStorage.Controls.Add(radioButtonList);
+            panelStorage.Controls.Add(radioButtonMassive);
+            panelStorage.Controls.Add(labelCollectionName);
+            panelStorage.Controls.Add(textBoxCollectionName);
+            panelStorage.Location = new Point(6, 23);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(200, 269);
+            panelStorage.TabIndex = 8;
             // 
-            // buttonRemoveExcavator
+            // buttonCollectionDel
             // 
-            buttonRemoveExcavator.Location = new Point(6, 273);
-            buttonRemoveExcavator.Name = "buttonRemoveExcavator";
-            buttonRemoveExcavator.Size = new Size(200, 49);
-            buttonRemoveExcavator.TabIndex = 4;
-            buttonRemoveExcavator.Text = "Удалить экскаватор";
-            buttonRemoveExcavator.UseVisualStyleBackColor = true;
-            buttonRemoveExcavator.Click += ButtonRemoveExcavator_Click;
+            buttonCollectionDel.Location = new Point(6, 228);
+            buttonCollectionDel.Name = "buttonCollectionDel";
+            buttonCollectionDel.Size = new Size(191, 38);
+            buttonCollectionDel.TabIndex = 6;
+            buttonCollectionDel.Text = "Удалить коллекцию";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += buttonCollectionDel_Click;
             // 
-            // maskedTextBoxPosition
+            // listBoxCollection
             // 
-            maskedTextBoxPosition.Location = new Point(12, 244);
-            maskedTextBoxPosition.Mask = "00";
-            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            maskedTextBoxPosition.Size = new Size(194, 20);
-            maskedTextBoxPosition.TabIndex = 3;
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.Location = new Point(6, 116);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(191, 108);
+            listBoxCollection.TabIndex = 5;
             // 
-            // buttonAddExcavator
+            // buttonCollectionAdd
             // 
-            buttonAddExcavator.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddExcavator.Location = new Point(6, 145);
-            buttonAddExcavator.Name = "buttonAddExcavator";
-            buttonAddExcavator.Size = new Size(200, 52);
-            buttonAddExcavator.TabIndex = 2;
-            buttonAddExcavator.Text = "Добавить экскаватор с обвесами";
-            buttonAddExcavator.UseVisualStyleBackColor = true;
-            buttonAddExcavator.Click += ButtonAddExcavator_Click;
+            buttonCollectionAdd.Location = new Point(6, 72);
+            buttonCollectionAdd.Name = "buttonCollectionAdd";
+            buttonCollectionAdd.Size = new Size(191, 38);
+            buttonCollectionAdd.TabIndex = 4;
+            buttonCollectionAdd.Text = "Добавить коллекцию";
+            buttonCollectionAdd.UseVisualStyleBackColor = true;
+            buttonCollectionAdd.Click += buttonCollectionAdd_Click;
             // 
-            // buttonAddSimpleExcavator
+            // radioButtonList
             // 
-            buttonAddSimpleExcavator.Location = new Point(6, 87);
-            buttonAddSimpleExcavator.Name = "buttonAddSimpleExcavator";
-            buttonAddSimpleExcavator.Size = new Size(200, 52);
-            buttonAddSimpleExcavator.TabIndex = 1;
-            buttonAddSimpleExcavator.Text = "Добавить экскаватор";
-            buttonAddSimpleExcavator.UseVisualStyleBackColor = true;
-            buttonAddSimpleExcavator.Click += ButtonAddSimleExcavator_Click;
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(117, 49);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(62, 17);
+            radioButtonList.TabIndex = 3;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonMassive
+            // 
+            radioButtonMassive.AutoSize = true;
+            radioButtonMassive.Location = new Point(19, 49);
+            radioButtonMassive.Name = "radioButtonMassive";
+            radioButtonMassive.Size = new Size(64, 17);
+            radioButtonMassive.TabIndex = 2;
+            radioButtonMassive.TabStop = true;
+            radioButtonMassive.Text = "Массив";
+            radioButtonMassive.UseVisualStyleBackColor = true;
+            // 
+            // labelCollectionName
+            // 
+            labelCollectionName.AutoSize = true;
+            labelCollectionName.Location = new Point(46, 7);
+            labelCollectionName.Name = "labelCollectionName";
+            labelCollectionName.Size = new Size(117, 13);
+            labelCollectionName.TabIndex = 1;
+            labelCollectionName.Text = "Название коллекции:";
+            labelCollectionName.Click += labelCollectionName_Click;
+            // 
+            // textBoxCollectionName
+            // 
+            textBoxCollectionName.Location = new Point(6, 23);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(191, 20);
+            textBoxCollectionName.TabIndex = 0;
+            textBoxCollectionName.TextChanged += textBoxCollectionName_TextChanged;
             // 
             // comboBoxSelectorCompany
             // 
@@ -124,43 +177,171 @@
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(12, 22);
+            comboBoxSelectorCompany.Location = new Point(12, 295);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
-            comboBoxSelectorCompany.Size = new Size(194, 21);
+            comboBoxSelectorCompany.Size = new Size(191, 21);
             comboBoxSelectorCompany.TabIndex = 0;
             comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
             // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Controls.Add(buttonAddSimpleExcavator);
+            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
+            panelCompanyTools.Controls.Add(buttonRemoveExcavator);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Location = new Point(6, 362);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(200, 210);
+            panelCompanyTools.TabIndex = 7;
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Location = new Point(6, 114);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(191, 42);
+            buttonGoToCheck.TabIndex = 5;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_Click;
+            // 
+            // buttonAddSimpleExcavator
+            // 
+            buttonAddSimpleExcavator.Location = new Point(3, 0);
+            buttonAddSimpleExcavator.Name = "buttonAddSimpleExcavator";
+            buttonAddSimpleExcavator.Size = new Size(191, 35);
+            buttonAddSimpleExcavator.TabIndex = 1;
+            buttonAddSimpleExcavator.Text = "Добавить экскаватор";
+            buttonAddSimpleExcavator.UseVisualStyleBackColor = true;
+            buttonAddSimpleExcavator.Click += ButtonAddSimleExcavator_Click;
+            // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Location = new Point(3, 41);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(191, 20);
+            maskedTextBoxPosition.TabIndex = 3;
+            // 
+            // buttonRemoveExcavator
+            // 
+            buttonRemoveExcavator.Location = new Point(6, 67);
+            buttonRemoveExcavator.Name = "buttonRemoveExcavator";
+            buttonRemoveExcavator.Size = new Size(191, 41);
+            buttonRemoveExcavator.TabIndex = 4;
+            buttonRemoveExcavator.Text = "Удалить экскаватор";
+            buttonRemoveExcavator.UseVisualStyleBackColor = true;
+            buttonRemoveExcavator.Click += ButtonRemoveExcavator_Click;
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Location = new Point(6, 162);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(191, 41);
+            buttonRefresh.TabIndex = 6;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += ButtonRefresh_Click;
+            // 
             // pictureBox
             // 
             pictureBox.AccessibleRole = AccessibleRole.None;
             pictureBox.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
             pictureBox.BackgroundImageLayout = ImageLayout.None;
-            pictureBox.Location = new Point(0, 1);
+            pictureBox.Location = new Point(0, 27);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(855, 634);
+            pictureBox.Size = new Size(855, 647);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             pictureBox.Click += pictureBox_Click;
             // 
+            // menuStrip1
+            // 
+            menuStrip1.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
+            menuStrip1.Location = new Point(0, 0);
+            menuStrip1.Name = "menuStrip1";
+            menuStrip1.Size = new Size(1067, 24);
+            menuStrip1.TabIndex = 2;
+            menuStrip1.Text = "menuStrip1";
+            // 
+            // файлToolStripMenuItem
+            // 
+            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { SaveToolStripMenuItem, LoadToolStripMenuItem });
+            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
+            файлToolStripMenuItem.Size = new Size(48, 20);
+            файлToolStripMenuItem.Text = "Файл";
+            // 
+            // SaveToolStripMenuItem
+            // 
+            SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
+            SaveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
+            SaveToolStripMenuItem.Size = new Size(181, 22);
+            SaveToolStripMenuItem.Text = "Сохранение";
+            SaveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
+            // 
+            // LoadToolStripMenuItem
+            // 
+            LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
+            LoadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
+            LoadToolStripMenuItem.Size = new Size(181, 22);
+            LoadToolStripMenuItem.Text = "Загрузка";
+            LoadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
+            // 
+            // openFileDialog
+            // 
+            openFileDialog.FileName = "openFileDialog1";
+            openFileDialog.Filter = "txt file | *.txt";
+            // 
+            // saveFileDialog
+            // 
+            saveFileDialog.Filter = "txt file | *.txt";
+            // 
+            // buttonSortByType
+            // 
+            buttonSortByType.Location = new Point(12, 571);
+            buttonSortByType.Name = "buttonSortByType";
+            buttonSortByType.Size = new Size(191, 31);
+            buttonSortByType.TabIndex = 9;
+            buttonSortByType.Text = "Сортировка по типу";
+            buttonSortByType.UseVisualStyleBackColor = true;
+            buttonSortByType.Click += buttonSortByType_Click;
+            // 
+            // buttonSortByColor
+            // 
+            buttonSortByColor.Location = new Point(12, 608);
+            buttonSortByColor.Name = "buttonSortByColor";
+            buttonSortByColor.Size = new Size(191, 31);
+            buttonSortByColor.TabIndex = 10;
+            buttonSortByColor.Text = "Сортировка по цвету";
+            buttonSortByColor.UseVisualStyleBackColor = true;
+            buttonSortByColor.Click += buttonSortByColor_Click;
+            // 
             // FormExcavatorCollection
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1067, 635);
+            ClientSize = new Size(1067, 674);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
+            Controls.Add(menuStrip1);
+            MainMenuStrip = menuStrip1;
             Name = "FormExcavatorCollection";
             Text = "Коллекция экскаваторов";
             groupBoxTools.ResumeLayout(false);
-            groupBoxTools.PerformLayout();
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            menuStrip1.ResumeLayout(false);
+            menuStrip1.PerformLayout();
             ResumeLayout(false);
+            PerformLayout();
         }
 
         #endregion
 
         private GroupBox groupBoxTools;
-        private Button buttonAddExcavator;
         private Button buttonAddSimpleExcavator;
         private ComboBox comboBoxSelectorCompany;
         private PictureBox pictureBox;
@@ -168,5 +349,23 @@
         private Button buttonRemoveExcavator;
         private MaskedTextBox maskedTextBoxPosition;
         private Button buttonRefresh;
+        private Panel panelStorage;
+        private Panel panelCompanyTools;
+        private TextBox textBoxCollectionName;
+        private Label labelCollectionName;
+        private Button buttonCollectionAdd;
+        private RadioButton radioButtonList;
+        private RadioButton radioButtonMassive;
+        private ListBox listBoxCollection;
+        private Button buttonCollectionDel;
+        private Button buttonCreateCompany;
+        private MenuStrip menuStrip1;
+        private ToolStripMenuItem файлToolStripMenuItem;
+        private ToolStripMenuItem SaveToolStripMenuItem;
+        private ToolStripMenuItem LoadToolStripMenuItem;
+        private OpenFileDialog openFileDialog;
+        private SaveFileDialog saveFileDialog;
+        private Button buttonSortByColor;
+        private Button buttonSortByType;
     }
 }

Excavator/Excavator/FormExcavatorCollection.cs

@@ -1,25 +1,31 @@
-using Excavator.CollectionGenericObjects;
+using Microsoft.Extensions.Logging;
+using Excavator.CollectionGenericObjects;
 using Excavator.Drawnings;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+using Excavator.Exceptions;
 
 namespace Excavator;
 
 public partial class FormExcavatorCollection : Form
 {
 
+    /// <summary>
+	/// Хранилище коллекций
+	/// </summary>
+	private readonly StorageCollection<DrawningSimpleExcavator> _storageCollection;
+
     private AbstractCompany? _company = null;
 
-    public FormExcavatorCollection()
+    /// <summary>
+    /// Логер
+    /// </summary>
+    private readonly ILogger _logger;
+
+    public FormExcavatorCollection(ILogger<FormExcavatorCollection> logger)
     {
         InitializeComponent();
+        _storageCollection = new();
+        _logger = logger;
+        _logger.LogInformation("Форма создалась");
     }
 
     private void pictureBox_Click(object sender, EventArgs e)
@@ -28,60 +34,52 @@ public partial class FormExcavatorCollection : Form
     }
     private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
     {
-        switch (comboBoxSelectorCompany.Text)
-        {
-            case "Хранилище":
-                _company = new Garage(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningSimpleExcavator>());
-                break;
+        panelCompanyTools.Enabled = false;
     }
-    }
-    private void CreateObject(string type)
+
+    private void ButtonAddSimleExcavator_Click(object sender, EventArgs e)
     {
         if (_company == null)
         {
             return;
         }
-        DrawningSimpleExcavator drawningSimpleExcavator;
-        Random random = new();
-        switch (type)
-        {
-            case nameof(DrawningSimpleExcavator):
-                drawningSimpleExcavator = new DrawningSimpleExcavator(random.Next(100, 300), random.Next(1000, 3000),
-                    GetColor(random));
-                break;
-            case nameof(DrawningExcavator):
-                drawningSimpleExcavator = new DrawningExcavator(random.Next(100, 300), random.Next(1000, 3000),
-                    GetColor(random), GetColor(random),
-                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-                break;
-            default:
-                return;
+        FormExcavatorConfig form = new();
+        form._excavatorDelegate += SetExcavator;
+        form.Show();
     }
 
-        if (_company + drawningSimpleExcavator != -1)
+    /// <summary>
+    /// Добавление экскаватора в коллекцию
+    /// </summary>
+    /// <param name="truck"></param>
+    private void SetExcavator(DrawningSimpleExcavator excavator)
+    {
+        try
+        {
+            if (_company == null || excavator == null)
+            {
+                return;
+            }
+            if (_company + excavator != -1)
             {
                 MessageBox.Show("Объект добавлен");
                 pictureBox.Image = _company.Show();
+                _logger.LogInformation("Добавлен объект: " + excavator.GetDataForSave());
             }
-        else
+        }
+        catch (ObjectNotFoundException ex) { }
+        catch (CollectionOverflowException ex)
         {
-            MessageBox.Show("Не удалось добавить объект");
+            MessageBox.Show(ex.Message);
+            _logger.LogError("Ошибка: {Message}", ex.Message);
+        }
+        catch (ObjectNotUniqueException ex)
+        {
+            MessageBox.Show("Такой объект уже присутствует в коллекции");
+            _logger.LogError("Ошибка: {Message}", ex.Message);
+        }
     }
 
-    }
-    private static Color GetColor(Random random)
-    {
-        Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-        ColorDialog dialog = new();
-        if (dialog.ShowDialog() == DialogResult.OK)
-        {
-            color = dialog.Color;
-        }
-
-        return color;
-    }
-    private void ButtonAddSimleExcavator_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningSimpleExcavator));
-    private void ButtonAddExcavator_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningExcavator));
     private void ButtonRemoveExcavator_Click(object sender, EventArgs e)
     {
         if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
@@ -95,14 +93,19 @@ public partial class FormExcavatorCollection : Form
         }
 
         int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+        try
+        {
             if (_company - pos != null)
             {
                 MessageBox.Show("Объект удален");
                 pictureBox.Image = _company.Show();
+                _logger.LogInformation("Удален объект по позиции " + pos);
             }
-        else
+        }
+        catch (Exception ex)
         {
-            MessageBox.Show("Не удалось удалить объект");
+            MessageBox.Show(ex.Message);
+            _logger.LogError("Ошибка: {Message}", ex.Message);
         }
     }
     /// <summary>
@@ -119,6 +122,8 @@ public partial class FormExcavatorCollection : Form
 
         DrawningSimpleExcavator? excavator = null;
         int counter = 100;
+        try
+        {
             while (excavator == null)
             {
                 excavator = _company.GetRandomObject();
@@ -133,13 +138,17 @@ public partial class FormExcavatorCollection : Form
             {
                 return;
             }
-
             FormExcavator form = new()
             {
                 SetExcavator = excavator
             };
             form.ShowDialog();
         }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
 
     /// <summary>
     /// Перерисовка коллекции
@@ -155,4 +164,178 @@ public partial class FormExcavatorCollection : Form
 
         pictureBox.Image = _company.Show();
     }
+
+    private void textBoxCollectionName_TextChanged(object sender, EventArgs e)
+    {
+
+    }
+
+    private void labelCollectionName_Click(object sender, EventArgs e)
+    {
+
+    }
+
+    /// <summary>
+    /// Обновление списка в listBoxCollection
+    /// </summary>
+    private void RerfreshListBoxItems()
+    {
+        listBoxCollection.Items.Clear();
+        for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
+        {
+            string? colName = _storageCollection.Keys?[i].Name;
+            if (!string.IsNullOrEmpty(colName))
+            {
+                listBoxCollection.Items.Add(colName);
+            }
+        }
+    }
+
+    private void buttonCollectionAdd_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+        {
+            MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            return;
+        }
+
+        try
+        {
+            CollectionType collectionType = CollectionType.None;
+            if (radioButtonMassive.Checked)
+            {
+                collectionType = CollectionType.Massive;
+            }
+            else if (radioButtonList.Checked)
+            {
+                collectionType = CollectionType.List;
+            }
+
+            _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+            RerfreshListBoxItems();
+            _logger.LogInformation("Коллекция добавлена " + textBoxCollectionName.Text);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError("Ошибка: {Message}", ex.Message);
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonCollectionDel_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+
+        try
+        {
+            if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+            _logger.LogInformation("Коллекция " + listBoxCollection.SelectedItem.ToString() + " удалена");
+            RerfreshListBoxItems();
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError("Ошибка: {Message}", ex.Message);
+        }
+    }
+
+    private void buttonCreateCompany_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+
+        ICollectionGenericObjects<DrawningSimpleExcavator>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+        if (collection == null)
+        {
+            MessageBox.Show("Коллекция не проинициализирована");
+            return;
+        }
+
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new Garage(pictureBox.Width, pictureBox.Height, collection);
+                break;
+        }
+
+        panelCompanyTools.Enabled = true;
+        RerfreshListBoxItems();
+    }
+
+    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);
+            }
+        }
+    }
+
+    private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
+    {
+        if (openFileDialog.ShowDialog() == DialogResult.OK)
+        {
+            try
+            {
+                _storageCollection.LoadData(openFileDialog.FileName);
+                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);
+            }
+        }
+
+    }
+
+    private void groupBoxTools_Enter(object sender, EventArgs e)
+    {
+
+    }
+
+    private void buttonSortByType_Click(object sender, EventArgs e)
+    {
+        CompareCars(new DrawningExcavatorCompareByType());
+    }
+
+    private void buttonSortByColor_Click(object sender, EventArgs e)
+    {
+        CompareCars(new DrawningExcavatorCompareByColor());
+    }
+
+    private void CompareCars(IComparer<DrawningSimpleExcavator?> comparer)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        _company.Sort(comparer);
+        pictureBox.Image = _company.Show();
+    }
 }

Excavator/Excavator/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="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>132, 17</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>272, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>25</value>
+  </metadata>
 </root>

Excavator/Excavator/FormExcavatorConfig.Designer.cs

@@ -0,0 +1,357 @@
+namespace Excavator
+{
+    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();
+            groupBoxColors = new GroupBox();
+            panelPurple = new Panel();
+            panelBlack = new Panel();
+            panelGray = new Panel();
+            panelWhite = new Panel();
+            panelYellow = new Panel();
+            panelBlue = new Panel();
+            panelGreen = new Panel();
+            panelRed = new Panel();
+            checkBoxSupports = new CheckBox();
+            checkBoxBucket = new CheckBox();
+            numericUpDownWeight = new NumericUpDown();
+            numericUpDownSpeed = new NumericUpDown();
+            labelWeight = new Label();
+            labelSpeed = new Label();
+            labelAdvancedObject = new Label();
+            labelSimpleObject = new Label();
+            pictureBoxObject = new PictureBox();
+            buttonAdd = new Button();
+            buttonCancel = new Button();
+            panelObject = new Panel();
+            labelAdditionalColor = new Label();
+            labelBodyColor = new Label();
+            groupBoxConfig.SuspendLayout();
+            groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
+            panelObject.SuspendLayout();
+            SuspendLayout();
+            // 
+            // groupBoxConfig
+            // 
+            groupBoxConfig.Controls.Add(groupBoxColors);
+            groupBoxConfig.Controls.Add(checkBoxSupports);
+            groupBoxConfig.Controls.Add(checkBoxBucket);
+            groupBoxConfig.Controls.Add(numericUpDownWeight);
+            groupBoxConfig.Controls.Add(numericUpDownSpeed);
+            groupBoxConfig.Controls.Add(labelWeight);
+            groupBoxConfig.Controls.Add(labelSpeed);
+            groupBoxConfig.Controls.Add(labelAdvancedObject);
+            groupBoxConfig.Controls.Add(labelSimpleObject);
+            groupBoxConfig.Dock = DockStyle.Left;
+            groupBoxConfig.Location = new Point(0, 0);
+            groupBoxConfig.Name = "groupBoxConfig";
+            groupBoxConfig.Size = new Size(471, 232);
+            groupBoxConfig.TabIndex = 0;
+            groupBoxConfig.TabStop = false;
+            groupBoxConfig.Text = "Параметры";
+            // 
+            // groupBoxColors
+            // 
+            groupBoxColors.Controls.Add(panelPurple);
+            groupBoxColors.Controls.Add(panelBlack);
+            groupBoxColors.Controls.Add(panelGray);
+            groupBoxColors.Controls.Add(panelWhite);
+            groupBoxColors.Controls.Add(panelYellow);
+            groupBoxColors.Controls.Add(panelBlue);
+            groupBoxColors.Controls.Add(panelGreen);
+            groupBoxColors.Controls.Add(panelRed);
+            groupBoxColors.Location = new Point(202, 22);
+            groupBoxColors.Name = "groupBoxColors";
+            groupBoxColors.Size = new Size(237, 140);
+            groupBoxColors.TabIndex = 8;
+            groupBoxColors.TabStop = false;
+            groupBoxColors.Text = "Цвета";
+            // 
+            // panelPurple
+            // 
+            panelPurple.BackColor = Color.Purple;
+            panelPurple.Location = new Point(186, 86);
+            panelPurple.Name = "panelPurple";
+            panelPurple.Size = new Size(45, 45);
+            panelPurple.TabIndex = 7;
+            // 
+            // panelBlack
+            // 
+            panelBlack.BackColor = Color.Black;
+            panelBlack.Location = new Point(126, 86);
+            panelBlack.Name = "panelBlack";
+            panelBlack.Size = new Size(45, 45);
+            panelBlack.TabIndex = 6;
+            // 
+            // panelGray
+            // 
+            panelGray.BackColor = Color.Gray;
+            panelGray.Location = new Point(66, 86);
+            panelGray.Name = "panelGray";
+            panelGray.Size = new Size(45, 45);
+            panelGray.TabIndex = 5;
+            // 
+            // panelWhite
+            // 
+            panelWhite.BackColor = Color.White;
+            panelWhite.Location = new Point(6, 86);
+            panelWhite.Name = "panelWhite";
+            panelWhite.Size = new Size(45, 45);
+            panelWhite.TabIndex = 4;
+            // 
+            // panelYellow
+            // 
+            panelYellow.BackColor = Color.Yellow;
+            panelYellow.Location = new Point(186, 22);
+            panelYellow.Name = "panelYellow";
+            panelYellow.Size = new Size(45, 45);
+            panelYellow.TabIndex = 3;
+            // 
+            // panelBlue
+            // 
+            panelBlue.BackColor = Color.Blue;
+            panelBlue.Location = new Point(126, 22);
+            panelBlue.Name = "panelBlue";
+            panelBlue.Size = new Size(45, 45);
+            panelBlue.TabIndex = 2;
+            // 
+            // panelGreen
+            // 
+            panelGreen.BackColor = Color.Green;
+            panelGreen.Location = new Point(66, 22);
+            panelGreen.Name = "panelGreen";
+            panelGreen.Size = new Size(45, 45);
+            panelGreen.TabIndex = 1;
+            // 
+            // panelRed
+            // 
+            panelRed.BackColor = Color.Red;
+            panelRed.Location = new Point(6, 22);
+            panelRed.Name = "panelRed";
+            panelRed.Size = new Size(45, 45);
+            panelRed.TabIndex = 0;
+            // 
+            // checkBoxSupports
+            // 
+            checkBoxSupports.AutoSize = true;
+            checkBoxSupports.Location = new Point(12, 134);
+            checkBoxSupports.Name = "checkBoxSupports";
+            checkBoxSupports.Size = new Size(114, 19);
+            checkBoxSupports.TabIndex = 7;
+            checkBoxSupports.Text = "Наличие ковша";
+            checkBoxSupports.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxBucket
+            // 
+            checkBoxBucket.AutoSize = true;
+            checkBoxBucket.Location = new Point(12, 109);
+            checkBoxBucket.Name = "checkBoxBucket";
+            checkBoxBucket.Size = new Size(106, 19);
+            checkBoxBucket.TabIndex = 6;
+            checkBoxBucket.Text = "Наличие опор";
+            checkBoxBucket.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            numericUpDownWeight.Location = new Point(80, 66);
+            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(86, 23);
+            numericUpDownWeight.TabIndex = 5;
+            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // numericUpDownSpeed
+            // 
+            numericUpDownSpeed.Location = new Point(80, 35);
+            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(86, 23);
+            numericUpDownSpeed.TabIndex = 4;
+            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelWeight
+            // 
+            labelWeight.AutoSize = true;
+            labelWeight.Location = new Point(12, 68);
+            labelWeight.Name = "labelWeight";
+            labelWeight.Size = new Size(29, 15);
+            labelWeight.TabIndex = 3;
+            labelWeight.Text = "Вес:";
+            // 
+            // labelSpeed
+            // 
+            labelSpeed.AutoSize = true;
+            labelSpeed.Location = new Point(12, 37);
+            labelSpeed.Name = "labelSpeed";
+            labelSpeed.Size = new Size(62, 15);
+            labelSpeed.TabIndex = 2;
+            labelSpeed.Text = "Скорость:";
+            // 
+            // labelAdvancedObject
+            // 
+            labelAdvancedObject.BorderStyle = BorderStyle.FixedSingle;
+            labelAdvancedObject.Location = new Point(328, 174);
+            labelAdvancedObject.Name = "labelAdvancedObject";
+            labelAdvancedObject.Size = new Size(111, 35);
+            labelAdvancedObject.TabIndex = 1;
+            labelAdvancedObject.Text = "Продвинутый";
+            labelAdvancedObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelAdvancedObject.MouseDown += labelObject_MouseDown;
+            // 
+            // labelSimpleObject
+            // 
+            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+            labelSimpleObject.Location = new Point(202, 174);
+            labelSimpleObject.Name = "labelSimpleObject";
+            labelSimpleObject.Size = new Size(111, 35);
+            labelSimpleObject.TabIndex = 0;
+            labelSimpleObject.Text = "Простой";
+            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelSimpleObject.MouseDown += labelObject_MouseDown;
+            // 
+            // pictureBoxObject
+            // 
+            pictureBoxObject.Location = new Point(29, 47);
+            pictureBoxObject.Name = "pictureBoxObject";
+            pictureBoxObject.Size = new Size(177, 118);
+            pictureBoxObject.TabIndex = 1;
+            pictureBoxObject.TabStop = false;
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(477, 186);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(115, 35);
+            buttonAdd.TabIndex = 2;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += buttonAdd_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(604, 186);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(115, 35);
+            buttonCancel.TabIndex = 3;
+            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(477, 12);
+            panelObject.Name = "panelObject";
+            panelObject.Size = new Size(242, 168);
+            panelObject.TabIndex = 4;
+            panelObject.DragDrop += PanelObject_DragDrop;
+            panelObject.DragEnter += PanelObject_DragEnter;
+            // 
+            // labelAdditionalColor
+            // 
+            labelAdditionalColor.AllowDrop = true;
+            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+            labelAdditionalColor.Location = new Point(127, 10);
+            labelAdditionalColor.Name = "labelAdditionalColor";
+            labelAdditionalColor.Size = new Size(100, 35);
+            labelAdditionalColor.TabIndex = 3;
+            labelAdditionalColor.Text = "Доп. цвет";
+            labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelAdditionalColor.DragDrop += labelAdditionalColor_DragDrop;
+            labelAdditionalColor.DragEnter += labelAdditionalColor_DragEnter;
+            // 
+            // labelBodyColor
+            // 
+            labelBodyColor.AllowDrop = true;
+            labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
+            labelBodyColor.Location = new Point(15, 10);
+            labelBodyColor.Name = "labelBodyColor";
+            labelBodyColor.Size = new Size(100, 35);
+            labelBodyColor.TabIndex = 2;
+            labelBodyColor.Text = "Цвет";
+            labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelBodyColor.DragDrop += labelBodyColor_DragDrop;
+            labelBodyColor.DragEnter += labelBodyColor_DragEnter;
+            // 
+            // FormExcavatorConfig
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(731, 232);
+            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();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
+            panelObject.ResumeLayout(false);
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxConfig;
+        private Label labelSpeed;
+        private Label labelAdvancedObject;
+        private Label labelSimpleObject;
+        private CheckBox checkBoxSupports;
+        private CheckBox checkBoxBucket;
+        private NumericUpDown numericUpDownWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private Label labelWeight;
+        private GroupBox groupBoxColors;
+        private Panel panelRed;
+        private Panel panelGreen;
+        private Panel panelYellow;
+        private Panel panelBlue;
+        private Panel panelPurple;
+        private Panel panelBlack;
+        private Panel panelGray;
+        private Panel panelWhite;
+        private PictureBox pictureBoxObject;
+        private Button buttonAdd;
+        private Button buttonCancel;
+        private Panel panelObject;
+        private Label labelAdditionalColor;
+        private Label labelBodyColor;
+    }
+}

Excavator/Excavator/FormExcavatorConfig.cs

@@ -0,0 +1,179 @@
+using Excavator.Drawnings;
+using Excavator.Entities;
+
+namespace Excavator;
+/// <summary>
+/// Форма конфигурации объекта
+/// </summary>
+public partial class FormExcavatorConfig : Form
+{
+    private DrawningSimpleExcavator _excavator;
+
+    /// <summary>
+    /// Событие для передачи объекта
+    /// </summary>
+    public event Action<DrawningSimpleExcavator>? _excavatorDelegate;
+
+    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 += (sender, e) => Close();
+    }
+
+    /// <summary>
+    /// Привязка внешнего метода к событию
+    /// </summary>
+    /// <param name="truckDelegate"></param>
+    public void AddEvent(Action<DrawningSimpleExcavator>? excavatorDelegate)
+    {
+        _excavatorDelegate += excavatorDelegate;
+    }
+
+    /// <summary>
+    /// Прорисовка объекта
+    /// </summary>
+    private void DrawObject()
+    {
+        Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+        Graphics gr = Graphics.FromImage(bmp);
+        _excavator?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
+        _excavator?.SetPosition(2, 2);
+        _excavator?.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;
+    }
+
+    /// <summary>
+    /// Действия при приеме перетаскиваемой информации
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void PanelObject_DragDrop(object sender, DragEventArgs e)
+    {
+        switch (e.Data?.GetData(DataFormats.Text)?.ToString())
+        {
+            case "labelSimpleObject":
+                _excavator = new DrawningSimpleExcavator((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White);
+                break;
+            case "labelAdvancedObject":
+                _excavator = 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)
+    {
+        (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor ?? Color.White, DragDropEffects.Move | DragDropEffects.Copy);
+    }
+
+    private void buttonAdd_Click(object sender, EventArgs e)
+    {
+        if (_excavator != null)
+        {
+            _excavatorDelegate?.Invoke(_excavator);
+            Close();
+        }
+    }
+
+    /// <summary>
+    /// Передача основного цвета
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void labelBodyColor_DragEnter(object sender, DragEventArgs e)
+    {
+        if (e.Data.GetDataPresent(typeof(Color)))
+        {
+            e.Effect = DragDropEffects.Copy;
+        }
+        else
+        {
+            e.Effect = DragDropEffects.None;
+        }
+    }
+
+    /// <summary>
+    /// Прорисовка основным цветом
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void labelBodyColor_DragDrop(object sender, DragEventArgs e)
+    {
+        if (_excavator != null)
+        {
+            _excavator.EntitySimpleExcavator?.SetBodyColor((Color)e.Data.GetData(typeof(Color)));
+            DrawObject();
+        }
+    }
+
+    /// <summary>
+    /// Прорисовка дополнительным цветом
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e)
+    {
+        if (_excavator?.EntitySimpleExcavator is EntityExcavator _modExcavator)
+        {
+            _modExcavator.SetAdditionalColor((Color)e.Data.GetData(typeof(Color)));
+        }
+        DrawObject();
+    }
+
+    /// <summary>
+    /// Передача дополнительного цвета
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void labelAdditionalColor_DragEnter(object sender, DragEventArgs e)
+    {
+        if (_excavator is DrawningExcavator)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+    }
+}

Excavator/Excavator/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>

Excavator/Excavator/Program.cs

@@ -1,3 +1,8 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Serilog;
+
 namespace Excavator
 {
     internal static class Program
@@ -11,7 +16,29 @@ namespace Excavator
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormExcavatorCollection());
+            ServiceCollection services = new();
+            ConfigureServices(services);
+            using ServiceProvider serviceProvider = services.BuildServiceProvider();
+            Application.Run(serviceProvider.GetRequiredService<FormExcavatorCollection>());
+        }
+
+        /// <summary>
+        /// Êîíôèãóðàöèÿ ñåðâèñà DI
+        /// </summary>
+        /// <param name="services"></param>
+        private static void ConfigureServices(ServiceCollection services)
+        {
+            
+            services.AddSingleton<FormExcavatorCollection>()
+                .AddLogging(option =>
+                {
+                    option.SetMinimumLevel(LogLevel.Information);
+                    option.AddSerilog(new LoggerConfiguration()
+                        .ReadFrom.Configuration(new ConfigurationBuilder()
+                        .AddJsonFile("serilog.json")
+                        .Build())
+                        .CreateLogger());
+                });
         }
     }
 }

Excavator/Excavator/Serilog.json

@@ -0,0 +1,18 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File" ],
+    "MinimumLevel": "Information",
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "log.log",
+          "outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ],
+    "Properties": {
+      "Application": "Excavator"
+    }
+  }
+}