в

ProjectBus/ProjectBus/BoatDelegate.cs

@@ -0,0 +1,10 @@
+using ProjectBoat.Drawnings;
+
+namespace ProjectBoat;
+
+/// <summary>
+/// Делегат передачи объекта класса-прорисвоки
+/// </summary>
+/// <param name="boat"></param>
+public delegate void BoatDelegate(DrawningBoat boat);
+

ProjectBus/ProjectBus/CollectionGenericObjects/AbstractCompany.cs

@@ -1,4 +1,5 @@
 using ProjectBoat.Drawnings;
+using ProjectBoat.Exceptions;
 
 namespace ProjectBoat.CollectionGenericObjects
 {
@@ -28,14 +29,14 @@ namespace ProjectBoat.CollectionGenericObjects
         protected readonly int _pictureHeight;
 
         /// <summary>
-        /// Коллекция автомобилей
+        /// Коллекция лодок
         /// </summary>
         protected ICollectionGenericObjects<DrawningBoat>? _collection = null;
 
         /// <summary>
         /// Вычисление максимального количества элементов, который можно разместить в окне
         /// </summary>
-        private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+        private int GetMaxCount => (_pictureWidth / _placeSizeWidth) * (_pictureHeight / _placeSizeHeight);
 
         /// <summary>
         /// Конструктор
@@ -49,18 +50,18 @@ namespace ProjectBoat.CollectionGenericObjects
             _pictureWidth = picWidth;
             _pictureHeight = picHeight;
             _collection = collection;
-            _collection.SetMaxCount = GetMaxCount;
+            _collection.MaxCount = GetMaxCount;
         }
 
         /// <summary>
         /// Перегрузка оператора сложения для класса
         /// </summary>
         /// <param name="company">Компания</param>
-        /// <param name="сruiser">Добавляемый объект</param>
+        /// <param name="boat">Добавляемый объект</param>
         /// <returns></returns>
-        public static int operator +(AbstractCompany company, DrawningBoat  сruiser)
+        public static int operator +(AbstractCompany company, DrawningBoat  boat)
         {
-            return company._collection.Insert(сruiser);
+            return company._collection.Insert(boat, new DrawiningBoatEqutables());
         }
 
         /// <summary>
@@ -96,11 +97,25 @@ namespace ProjectBoat.CollectionGenericObjects
             SetObjectsPosition();
             for (int i = 0; i < (_collection?.Count ?? 0); ++i)
             {
-                DrawningBoat? obj = _collection?.Get(i);
-                obj?.DrawTransport(graphics);
+                try
+                {
+                    DrawningBoat? obj = _collection?.Get(i);
+                    obj?.DrawTransport(graphics);
+                }
+                catch (ObjectNotFoundException e)
+                { }
+                catch (PositionOutOfCollectionException e)
+                { }
             }
             return bitmap;
         }
+
+        /// <summary>
+        /// Сортировка
+        /// </summary>
+        /// <param name="comparer">Сравнитель объектов</param>
+        public void Sort(IComparer<DrawningBoat?> comparer) => _collection?.CollectionSort(comparer);
+
         /// <summary>
         /// Вывод заднего фона
         /// </summary>

ProjectBus/ProjectBus/CollectionGenericObjects/BoatDockingService.cs

@@ -1,4 +1,5 @@
 using ProjectBoat.Drawnings;
+using ProjectBoat.Exceptions;
 
 namespace ProjectBoat.CollectionGenericObjects
 {
@@ -41,11 +42,14 @@ namespace ProjectBoat.CollectionGenericObjects
 
             for (int i = 0; i < (_collection?.Count ?? 0); i++)
             {
-                if (_collection.Get(i) != null)
+
+                try
                 {
                     _collection.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
                     _collection.Get(i).SetPosition(_placeSizeWidth * curWidth + 10, curHeight * _placeSizeHeight + 10);
                 }
+                catch (ObjectNotFoundException) { }
+                catch (PositionOutOfCollectionException e) { }
 
                 if (curWidth < width - 1)
                     curWidth++;

ProjectBus/ProjectBus/CollectionGenericObjects/CollectionInfo.cs

@@ -0,0 +1,75 @@
+namespace ProjectBoat.CollectionGenericObjects;
+
+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();
+    }
+
+}

ProjectBus/ProjectBus/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -1,4 +1,7 @@
-namespace ProjectBoat.CollectionGenericObjects
+using ProjectBoat.Drawnings;
+using ProjectBoat.CollectionGenericObjects;
+
+namespace ProjectBoat.CollectionGenericObjects
 {
     /// <summary>
     /// Интерфейс описания действий для набора хранимых объектов
@@ -11,35 +14,58 @@
         /// Количество объектов в коллекции
         /// </summary>
         int Count { get; }
+
         /// <summary>
         /// Установка максимального количества элементов
         /// </summary>
-        int SetMaxCount { set; }
+        int MaxCount { get; set; }
+
         /// <summary>
         /// Добавление объекта в коллекцию
         /// </summary>
         /// <param name="obj">Добавляемый объект</param>
+        /// /// <param name="comparer">Cравнение двух объектов</param>
         /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-        int Insert(T obj);
+        int Insert(T obj, IEqualityComparer<DrawningBoat?>? comparer = null);
+
         /// <summary>
         /// Добавление объекта в коллекцию на конкретную позицию
         /// </summary>
         /// <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<DrawningBoat?>? comparer = null);
+
         /// <summary>
         /// Удаление объекта из коллекции с конкретной позиции
         /// </summary>
         /// <param name="position">Позиция</param>
         /// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
         T? Remove(int position);
+
         /// <summary>
         /// Получение объекта по позиции
         /// </summary>
         /// <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);
+
     }
 
 }

ProjectBus/ProjectBus/CollectionGenericObjects/ListGenericObjects.cs

@@ -1,4 +1,9 @@
-namespace ProjectBoat.CollectionGenericObjects
+using ProjectBoat.Drawnings;
+using ProjectBoat.Exceptions;
+using ProjectBoat.CollectionGenericObjects;
+using ProjectBoat.Exceptions;
+
+namespace ProjectBoat.CollectionGenericObjects
 {
     /// <summary>
     /// Параметризованный набор объектов
@@ -16,7 +21,20 @@
         /// </summary>
         private int _maxCount;
         public int Count => _collection.Count;
-        public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
+        public int MaxCount
+        {
+            get => _maxCount;
+            set
+            {
+                if (value > 0)
+                {
+                    _maxCount = value;
+                }
+            }
+        }
+
+        public CollectionType GetCollectionType => CollectionType.List;
+
         /// <summary>
         /// Конструктор
         /// </summary>
@@ -27,26 +45,43 @@
         public T? Get(int position)
         {
             // TODO проверка позиции
-            if (position >= Count || position < 0) return null;
+            // TODO выброc позиций, если выход за границы массива
+            if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
             return _collection[position];
         }
 
-        public int Insert(T obj)
+        public int Insert(T obj, IEqualityComparer<DrawningBoat?>? comparer = null)
         {
             // TODO проверка, что не превышено максимальное количество элементов
+            // TODO выбром позиций, если переполнение
+            // TODO выброc позиций, если такой объект есть в коллекции
             // TODO вставка в конец набора
-            if (Count == _maxCount) return -1;
+            for (int i = 0; i < Count; i++)
+            {
+                if (comparer.Equals((_collection[i] as DrawningBoat), (obj as DrawningBoat))) throw new ObjectAlreadyInCollectionException(i);
+            }
+
+            if (Count == _maxCount) throw new CollectionOverflowException(Count);
+
             _collection.Add(obj);
             return Count;
         }
 
-        public int Insert(T obj, int position)
+        public int Insert(T obj, int position, IEqualityComparer<DrawningBoat?>? comparer = null)
         {
             // TODO проверка, что не превышено максимальное количество элементов
+            // TODO выброc позиций, если такой объект есть в коллекции
             // TODO проверка позиции
             // TODO вставка по позиции
-            if (Count == _maxCount) return -1;
-            if (position >= Count || position < 0) return -1;
+            for (int i = 0; i < Count; i++)
+            {
+                if (comparer.Equals((_collection[i] as DrawningBoat), (obj as DrawningBoat))) throw new ObjectAlreadyInCollectionException(i);
+            }
+
+            if (Count == _maxCount) throw new CollectionOverflowException(Count);
+
+            if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
+
             _collection.Insert(position, obj);
             return position;
 
@@ -55,11 +90,26 @@
         public T Remove(int position)
         {
             // TODO проверка позиции
+            // TODO выбром позиций, если выход за границы массива
             // TODO удаление объекта из списка
-            if (position >= Count || position < 0) return null;
+            if (position >= _collection.Count || position < 0) throw new PositionOutOfCollectionException(position);
+
             T obj = _collection[position];
             _collection.RemoveAt(position);
             return obj;
         }
+
+        public IEnumerable<T?> GetItems()
+        {
+            for (int i = 0; i < _collection.Count; ++i)
+            {
+                yield return _collection[i];
+            }
+        }
+
+        public void CollectionSort(IComparer<T?> comparer)
+        {
+            _collection.Sort(comparer);
+        }
     }
 }

ProjectBus/ProjectBus/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,4 +1,7 @@
 using ProjectBoat.Drawnings;
+using ProjectBoat.Exceptions;
+using ProjectBoat.CollectionGenericObjects;
+using ProjectBoat.Exceptions;
 
 namespace ProjectBoat.CollectionGenericObjects
 {
@@ -14,8 +17,12 @@ namespace ProjectBoat.CollectionGenericObjects
         /// </summary>
         private T?[] _collection;
         public int Count => _collection.Length;
-        public int SetMaxCount
+        public int MaxCount
         {
+            get
+            {
+                return _collection.Length;
+            }
             set
             {
                 if (value > 0)
@@ -32,6 +39,8 @@ namespace ProjectBoat.CollectionGenericObjects
             }
         }
 
+        public CollectionType GetCollectionType => CollectionType.Massive;
+
         /// <summary>
         /// Конструктор
         /// </summary>
@@ -42,74 +51,115 @@ namespace ProjectBoat.CollectionGenericObjects
         public T? Get(int position)
         {
             // TODO проверка позиции
-            if (position >= _collection.Length || position < 0)
-            { return null; }
+            // TODO выбром позиций, если выход за границы массива
+            // TODO выбром позиций, если объект пустой 
+            if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
+            if (_collection[position] == null) throw new ObjectNotFoundException(position);
             return _collection[position];
         }
 
-        public int Insert(T obj)
+        public int Insert(T obj, IEqualityComparer<DrawningBoat?>? comparer = null)
         {
             // TODO вставка в свободное место набора
-            int index = 0;
-            while (index < _collection.Length)
+            // TODO выброc позиций, если переполнение
+            // TODO выброc позиций, если такой объект есть в коллекции
+            for (int i = 0; i < Count; i++)
             {
-                if (_collection[index] == null)
-                {
-                    _collection[index] = obj;
-                    return index;
-                }
-
-                index++;
+                if (comparer.Equals((_collection[i] as DrawningBoat), (obj as DrawningBoat))) throw new ObjectAlreadyInCollectionException(i);
             }
-            return -1;
+
+            for (int i = 0; i < Count; i++)
+            {
+                if (_collection[i] == null)
+                {
+                    _collection[i] = obj;
+                    return i;
+                }
+            }
+
+            throw new CollectionOverflowException(Count);
         }
 
-        public int Insert(T obj, int position)
+        public int Insert(T obj, int position, IEqualityComparer<DrawningBoat?>? comparer = null)
         {
+            // TODO выброc позиций, если такой объект есть в коллекции
             // TODO проверка позиции
+            // TODO выбром позиций, если выход за границы массива
             // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
             //		ищется свободное место после этой позиции и идет вставка туда
             //		если нет после, ищем до
+            // TODO выбром позиций, если переполнение
             // TODO вставка
-            if (position >= _collection.Length || position < 0)
-            { return -1; }
-
-            if (_collection[position] == null)
+            for (int i = 0; i < Count; i++)
             {
-                _collection[position] = obj;
-                return position;
+                if (comparer.Equals((_collection[i] as DrawningBoat), (obj as DrawningBoat))) throw new ObjectAlreadyInCollectionException(i);
+
             }
-            int index;
 
-            for (index = position + 1; index < _collection.Length; ++index)
+            if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
+
+            if (_collection[position] != null)
             {
-                if (_collection[index] == null)
+                bool pushed = false;
+                for (int index = position + 1; index < Count; index++)
                 {
-                    _collection[position] = obj;
-                    return position;
+                    if (_collection[index] == null)
+                    {
+                        position = index;
+                        pushed = true;
+                        break;
+                    }
+                }
+
+                if (!pushed)
+                {
+                    for (int index = position - 1; index >= 0; index--)
+                    {
+                        if (_collection[index] == null)
+                        {
+                            position = index;
+                            pushed = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (!pushed)
+                {
+                    throw new CollectionOverflowException(Count);
                 }
             }
 
-            for (index = position - 1; index >= 0; --index)
-            {
-                if (_collection[index] == null)
-                {
-                    _collection[position] = obj;
-                    return position;
-                }
-            }
-            return -1;
+            _collection[position] = obj;
+            return position;
         }
 
         public T Remove(int position)
         {
             // TODO проверка позиции
             // TODO удаление объекта из массива, присвоив элементу массива значение null
-            if (position >= _collection.Length || position < 0)
-            { return null; }
-            T obj = _collection[position];
+            // TODO выбром позиций, если выход за границы массива
+            // TODO выбром позиций, если объект пустой 
+            if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
+
+            if (_collection[position] == null) throw new ObjectNotFoundException(position);
+
+            T? temp = _collection[position];
             _collection[position] = null;
-            return obj;
+            return temp;
+        }
+
+        public IEnumerable<T?> GetItems()
+        {
+            for (int i = 0; i < _collection.Length; ++i)
+            {
+                yield return _collection[i];
+            }
+        }
+
+        public void CollectionSort(IComparer<T?> comparer)
+        {
+            Array.Sort(_collection, comparer);
         }
     }
 }

ProjectBus/ProjectBus/CollectionGenericObjects/StorageCollection.cs

@@ -1,27 +1,48 @@
-namespace ProjectBoat.CollectionGenericObjects
+using ProjectBoat.Drawnings;
+using ProjectBoat.Exceptions;
+using ProjectBoat.CollectionGenericObjects;
+using ProjectBoat.Exceptions;
+using System.Text;
+
+namespace ProjectBoat.CollectionGenericObjects
 {
     // Класс-хранилище коллекций
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public class StorageCollection<T>
-        where T : class
+        where T : DrawningBoat
     {
         /// <summary>
         /// Словарь (хранилище) с коллекциями
         /// </summary>
-        readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
+        readonly Dictionary<CollectionInfo, ICollectionGenericObjects<T>> _storages;
 
         /// <summary>
         /// Возвращение списка названий коллекций
         /// </summary>
-        public List<string> Keys => _storages.Keys.ToList();
+        public List<CollectionInfo> Keys => _storages.Keys.ToList();
+
+        /// <summary>
+        /// Ключевое слово, с которого должен начинаться файл
+        /// </summary>
+        private readonly string _collectionKey = "CollectionsStorage";
+
+        /// <summary>
+        /// Разделитель для записи ключа и значения элемента словаря
+        /// </summary>
+        private readonly string _separatorForKeyValue = "|";
+
+        /// <summary>
+        /// Разделитель для записей коллекции данных в файл
+        /// </summary>
+        private readonly string _separatorItems = ";";
 
         /// <summary>
         /// Конструктор
         /// </summary>
         public StorageCollection()
         {
-            _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
+            _storages = new Dictionary<CollectionInfo, ICollectionGenericObjects<T>>();
         }
 
         /// <summary>
@@ -29,29 +50,40 @@
         /// </summary>
         /// <param name="name">Название коллекции</param>
         /// <param name="collectionType">тип коллекции</param>
-        public void AddCollection(string name, CollectionType collectionType)
+        public void AddCollection(CollectionInfo name)
         {
             // TODO проверка, что name не пустой и нет в словаре записи с таким ключом
             // TODO Прописать логику для добавления
 
-            if (_storages.ContainsKey(name)) return;
+            if (name == null || _storages.ContainsKey(name))
+            {
+                return;
+            }
 
-            if (collectionType == CollectionType.None) return;
-            else if (collectionType == CollectionType.Massive)
-                _storages[name] = new MassiveGenericObjects<T>();
-            else if (collectionType == CollectionType.List)
-                _storages[name] = new ListGenericObjects<T>();
+            if (name.CollectionType == CollectionType.Massive)
+            {
+                _storages.Add(name, new MassiveGenericObjects<T>());
+            }
+
+            if (name.CollectionType == CollectionType.List)
+            {
+                _storages.Add(name, new ListGenericObjects<T>());
+            }
         }
 
         /// <summary>
         /// Удаление коллекции
         /// </summary>
         /// <param name="name">Название коллекции</param>
-        public void DelCollection(string name)
+        public void DelCollection(CollectionInfo name)
         {
             // TODO Прописать логику для удаления коллекции
-            if (_storages.ContainsKey(name))
-                _storages.Remove(name);
+            if (name == null || !_storages.ContainsKey(name))
+            {
+                return;
+            }
+
+            _storages.Remove(name);
         }
 
         /// <summary>
@@ -59,15 +91,144 @@
         /// </summary>
         /// <param name="name">Название коллекции</param>
         /// <returns></returns>
-        public ICollectionGenericObjects<T>? this[string name]
+        public ICollectionGenericObjects<T>? this[CollectionInfo name]
         {
             get
             {
                 // TODO Продумать логику получения объекта
                 if (_storages.ContainsKey(name))
+                {
                     return _storages[name];
+                }
+
                 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 FileStream fs = new(filename, FileMode.Create);
+            using StreamWriter streamWriter = new StreamWriter(fs);
+            streamWriter.Write(_collectionKey);
+
+            foreach (KeyValuePair<CollectionInfo, ICollectionGenericObjects<T>> value in _storages)
+            {
+                streamWriter.Write(Environment.NewLine);
+
+                if (value.Value.Count == 0)
+                {
+                    continue;
+                }
+
+                streamWriter.Write(value.Key);
+                streamWriter.Write(_separatorForKeyValue);
+                streamWriter.Write(value.Value.MaxCount);
+                streamWriter.Write(_separatorForKeyValue);
+
+
+                foreach (T? item in value.Value.GetItems())
+                {
+                    string data = item?.GetDataForSave() ?? string.Empty;
+                    if (string.IsNullOrEmpty(data))
+                    {
+                        continue;
+                    }
+
+
+                    streamWriter.Write(data);
+                    streamWriter.Write(_separatorItems);
+
+                }
+            }
+        }
+        /// <summary>
+        /// Загрузка информации по кораблям в хранилище из файла
+        /// </summary>
+        /// <param name="filename"></param>
+        public void LoadData(string filename)
+        {
+            if (!File.Exists(filename))
+            {
+                throw new FileNotFoundException("Файл не существует");
+            }
+
+            using (StreamReader sr = new StreamReader(filename))
+            {
+                string? str;
+                str = sr.ReadLine();
+                if (str != _collectionKey.ToString())
+                    throw new FormatException("В файле неверные данные");
+                _storages.Clear();
+                while ((str = sr.ReadLine()) != null)
+                {
+                    string[] record = str.Split(_separatorForKeyValue);
+                    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("Не удалось создать коллекцию");
+                    collection.MaxCount = Convert.ToInt32(record[1]);
+
+                    string[] set = record[2].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+                    foreach (string elem in set)
+                    {
+                        if (elem?.CreateDrawningBoat() is T boat)
+                        {
+                            try
+                            {
+                                if (collection.Insert(boat, new DrawiningBoatEqutables()) == -1)
+                                {
+                                    throw new InvalidOperationException("Объект не удалось добавить в коллекцию: " + record[3]);
+                                }
+                            }
+                            catch (CollectionOverflowException ex)
+                            {
+                                throw new CollectionOverflowException("Коллекция переполнена", ex);
+                            }
+                            catch (ObjectAlreadyInCollectionException ex)
+                            {
+                                throw new InvalidOperationException("Объект уже присутствует в коллекции", 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,
+            };
+        }
     }
 }

ProjectBus/ProjectBus/Drawnings/DrawiningBoatEqutables.cs

@@ -0,0 +1,54 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace ProjectBoat.Drawnings;
+
+/// <summary>
+/// Реализация сравнения двух объектов класса-прорисовки
+/// </summary>
+public class DrawiningBoatEqutables : IEqualityComparer<DrawningBoat?>
+{
+    public bool Equals(DrawningBoat? x, DrawningBoat? y)
+    {
+        if (x == null || x.EntityBoat == null)
+        {
+            return false;
+        }
+
+        if (y == null || y.EntityBoat == null)
+        {
+            return false;
+        }
+
+        if (x.GetType().Name != y.GetType().Name)
+        {
+            return false;
+        }
+
+        if (x.EntityBoat.Speed != y.EntityBoat.Speed)
+        {
+            return false;
+        }
+
+        if (x.EntityBoat.Weight != y.EntityBoat.Weight)
+        {
+            return false;
+        }
+
+        if (x.EntityBoat.BodyColor != y.EntityBoat.BodyColor)
+        {
+            return false;
+        }
+
+        if (x is DrawningMBoat && y is DrawningMBoat)
+        {
+            // TODO доделать логику сравнения дополнительных параметров
+        }
+
+        return true;
+    }
+
+    public int GetHashCode([DisallowNull] DrawningBoat obj)
+    {
+        return obj.GetHashCode();
+    }
+}

ProjectBus/ProjectBus/Drawnings/DrawningBoat.cs

@@ -1,5 +1,4 @@
 using ProjectBoat.Entities;
-using System.Drawing.Drawing2D;
 
 namespace ProjectBoat.Drawnings;
 /// <summary>
@@ -29,11 +28,11 @@ public class DrawningBoat
     protected int? _startPosY;
 
     /// <summary>
-    /// Ширина прорисовки крейсера
+    /// Ширина прорисовки лодки
     /// </summary>
     private readonly int _drawningBoatWidth = 150;
     /// <summary>
-    /// Высота прорисовки крейсера 
+    /// Высота прорисовки лодки 
     /// </summary>
     private readonly int _drawningBoatHeight = 50;
     private readonly int _drawningEnginesWidth = 3;
@@ -58,7 +57,7 @@ public class DrawningBoat
     /// <summary>
     /// Пустой онструктор
     /// </summary>
-    private DrawningBoat()
+    public DrawningBoat()
     {
         _pictureWidth = null;
         _pictureHeight = null;
@@ -87,6 +86,14 @@ public class DrawningBoat
         _pictureHeight = drawningCarHeight;
     }
 
+    /// <summary>
+    /// конструктор
+    /// </summary>
+    /// <param name="entityBoat"></param>
+    public DrawningBoat(EntityBoat entityBoat)
+    {
+        EntityBoat = entityBoat;
+    }
     /// <summary>
     /// Установка границ поля
     /// </summary>
@@ -203,7 +210,7 @@ public class DrawningBoat
 
 
 
-        //границы круисера
+        //границы лодки
         Point[] points = { new Point(_startPosX.Value, _startPosY.Value), new Point(_startPosX.Value + 105, _startPosY.Value), new Point(_startPosX.Value + 147, _startPosY.Value + 24), new Point(_startPosX.Value + 105, _startPosY.Value + 49), new Point(_startPosX.Value, _startPosY.Value + 49), new Point(_startPosX.Value, _startPosY.Value) };
         g.FillPolygon(Brush, points);
         g.DrawPolygon(pen2, points);
@@ -216,7 +223,7 @@ public class DrawningBoat
 
         //g.DrawLine(pen, _startPosX.Value, _startPosY.Value, _startPosX.Value, _startPosY.Value + 49);
 
-        //внутренности круисера
+        //внутренности лодки
 
         g.DrawRectangle(pen2, _startPosX.Value + 25, _startPosY.Value + 10, 80, 30);
 

ProjectBus/ProjectBus/Drawnings/DrawningBoatCompareByColor.cs

@@ -0,0 +1,34 @@
+using ProjectBoat.Entities;
+
+namespace ProjectBoat.Drawnings;
+
+/// <summary>
+/// Сравнение по цвету, скорости, весу
+/// </summary>
+public class DrawningBoatCompareByColor : IComparer<DrawningBoat?>
+{
+    public int Compare(DrawningBoat? x, DrawningBoat? y)
+    {
+        // TODO прописать логику сравения по цветам, скорости, весу
+        if (x == null || x.EntityBoat == null)
+        {
+            return 1;
+        }
+
+        if (y == null || y.EntityBoat == null)
+        {
+            return -1;
+        }
+        var bodycolorCompare = x.EntityBoat.BodyColor.Name.CompareTo(y.EntityBoat.BodyColor.Name);
+        if (bodycolorCompare != 0)
+        {
+            return bodycolorCompare;
+        }
+        var speedCompare = x.EntityBoat.Speed.CompareTo(y.EntityBoat.Speed);
+        if (speedCompare != 0)
+        {
+            return speedCompare;
+        }
+        return x.EntityBoat.Weight.CompareTo(y.EntityBoat.Weight);
+    }
+}

ProjectBus/ProjectBus/Drawnings/DrawningBoatCompareByType.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectBoat.Drawnings;
+
+/// <summary>
+/// Сравнение по типу, скорости, весу
+/// </summary>
+public class DrawningBoatCompareByType : IComparer<DrawningBoat?>
+{
+    public int Compare(DrawningBoat? x, DrawningBoat? y)
+    {
+        if (x == null || x.EntityBoat == null)
+        {
+            return 1;
+        }
+        if (y == null || y.EntityBoat == null)
+        {
+            return -1;
+        }
+        if (x.GetType().Name != y.GetType().Name)
+        {
+            return x.GetType().Name.CompareTo(y.GetType().Name);
+        }
+        var speedCompare = x.EntityBoat.Speed.CompareTo(y.EntityBoat.Speed);
+        if (speedCompare != 0)
+        {
+            return speedCompare;
+        }
+        return x.EntityBoat.Weight.CompareTo(y.EntityBoat.Weight);
+    }
+}

ProjectBus/ProjectBus/Drawnings/DrawningMBoat.cs

@@ -5,7 +5,6 @@ namespace ProjectBoat.Drawnings
 {
     public class DrawningMBoat : DrawningBoat
     {
-
         /// <summary>
         /// Конструктор
         /// </summary>
@@ -23,6 +22,13 @@ namespace ProjectBoat.Drawnings
             EntityBoat = new EntityMBoat(speed, weight, bodyColor, additionalColor, motor, oars, glass);
         }
 
+        public DrawningMBoat(EntityBoat entityBoat)
+        {
+            if (entityBoat != null)
+            {
+                EntityBoat = entityBoat;
+            }
+        }
         public override void DrawTransport(Graphics g)
         {
             if (EntityBoat == null || EntityBoat is not EntityMBoat entityMBoat || !_startPosX.HasValue ||
@@ -38,19 +44,21 @@ namespace ProjectBoat.Drawnings
             Pen pen2 = new(Color.Black, 2);
             Brush Brush = new SolidBrush(entityMBoat.AdditionalColor);
 
-            g.FillRectangle(Brush, _startPosX.Value + 25, _startPosY.Value + 10, 80, 30);
-
-            g.DrawRectangle(pen2, _startPosX.Value + 25, _startPosY.Value + 10, 80, 30);
-
             base.DrawTransport(g);
 
 
-
-            g.FillRectangle(motorBrush, _startPosX.Value - 3, _startPosY.Value + 15, 20, 17);
-
+            if (entityMBoat.Motor)
+            {
+                g.DrawRectangle(pen2, _startPosX.Value + 25, _startPosY.Value + 10, 80, 30);
+                g.FillRectangle(Brush, _startPosX.Value + 25, _startPosY.Value + 10, 80, 30);
+                g.FillRectangle(motorBrush, _startPosX.Value - 3, _startPosY.Value + 15, 20, 17);
+            }
 
             if (entityMBoat.Oars)
             {
+                g.DrawRectangle(pen2, _startPosX.Value + 25, _startPosY.Value + 10, 80, 30);
+                g.FillRectangle(Brush, _startPosX.Value + 25, _startPosY.Value + 10, 80, 30);
+
                 g.DrawEllipse(pen, _startPosX.Value + 45, _startPosY.Value - 15, 10, 13);
                 g.FillEllipse(oarsBrush, _startPosX.Value + 45, _startPosY.Value - 15, 10, 13);
                 g.FillRectangle(motorBrush, _startPosX.Value + 49, _startPosY.Value - 1, 2, 20);
@@ -62,6 +70,9 @@ namespace ProjectBoat.Drawnings
 
             if (entityMBoat.Glass)
             {
+                g.DrawRectangle(pen2, _startPosX.Value + 25, _startPosY.Value + 10, 80, 30);
+                g.FillRectangle(Brush, _startPosX.Value + 25, _startPosY.Value + 10, 80, 30);
+
                 g.FillRectangle(glassBrush, _startPosX.Value + 100, _startPosY.Value + 7, 10, 36);
 
 

ProjectBus/ProjectBus/Drawnings/ExtentionDrawningBoat.cs

@@ -0,0 +1,50 @@
+using ProjectBoat.Entities;
+
+namespace ProjectBoat.Drawnings
+{
+    public static class ExtentionDrawningBoat
+    {
+        /// <summary>
+        /// Разделитель для записи информации по объекту в файл
+        /// </summary>
+        private static readonly string _separatorForObject = ":";
+
+        /// <summary>
+        /// Создание объекта из строки
+        /// </summary>
+        /// <param name="info">Строка с данными для создания объекта</param>
+        /// <returns>Объект</returns>
+        public static DrawningBoat? CreateDrawningBoat(this string info)
+        {
+            string[] strs = info.Split(_separatorForObject);
+            EntityBoat? boat = EntityMBoat.CreateEntityMBoat(strs);
+            if (boat != null)
+            {
+                return new DrawningMBoat(boat);
+            }
+
+            boat = EntityBoat.CreateEntityBoat(strs);
+            if (boat != null)
+            {
+                return new DrawningBoat(boat);
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Получение данных для сохранения в файл
+        /// </summary>
+        /// <param name="drawningBoat">Сохраняемый объект</param>
+        /// <returns>Строка с данными по объекту</returns>
+        public static string GetDataForSave(this DrawningBoat drawningBoat)
+        {
+            string[]? array = drawningBoat?.EntityBoat?.GetStringRepresentation();
+            if (array == null)
+            {
+                return string.Empty;
+            }
+            return string.Join(_separatorForObject, array);
+        }
+
+    }
+}

ProjectBus/ProjectBus/Entities/EntityBoat.cs

@@ -1,7 +1,7 @@
 namespace ProjectBoat.Entities;
 
 /// <summary>
-/// Класс-сущность "крейсер"
+/// Класс-сущность "лодка"
 /// </summary>
 public class EntityBoat
 {
@@ -18,13 +18,16 @@ public class EntityBoat
     /// Основной цвет
     /// </summary>
     public Color BodyColor { get; private set; }
-
+    public void setBodyColor(Color color)
+    {
+        BodyColor = color;
+    }
     /// <summary>
     /// Шаг перемещения автомобиля
     /// </summary>
     public double Step => Speed * 100 / Weight;
     /// <summary>
-    /// Инициализация полей объекта-класса крейсера
+    /// Инициализация полей объекта-класса лодки
     /// </summary>
     /// <param name="speed">скорость</param>
     /// <param name="weight">вес</param>
@@ -35,4 +38,27 @@ public class EntityBoat
         Weight = weight;
         BodyColor = bodyColor;
     }
-}
+    /// <summary>
+    /// Получение строк со значениями свойств объекта класса-сущности
+    /// </summary>
+    /// <returns></returns>
+    public virtual string[] GetStringRepresentation()
+    {
+        return new[] { nameof(EntityBoat), Speed.ToString(), Weight.ToString(), BodyColor.Name };
+    }
+
+    /// <summary>
+    /// Создание объекта из массива строк
+    /// </summary>
+    /// <param name="strs"></param>
+    /// <returns></returns>
+    public static EntityBoat? CreateEntityBoat(string[] strs)
+    {
+        if (strs.Length != 4 || strs[0] != nameof(EntityBoat))
+        {
+            return null;
+        }
+
+        return new EntityBoat(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]));
+    }
+}

ProjectBus/ProjectBus/Entities/EntityMBoat.cs

@@ -18,7 +18,10 @@
         /// Дополнительный цвет (для опциональных элементов)
         /// </summary>
         public Color AdditionalColor { get; private set; }
-
+        public void setAdditionalColor(Color color)
+        {
+            AdditionalColor = color;
+        }
         public EntityMBoat(int speed, double weight, Color bodyColor, Color additionalColor, bool motor, bool oars, bool glass) : base(speed, weight, bodyColor)
         {
             AdditionalColor = additionalColor;
@@ -26,5 +29,30 @@
             Oars = oars;
             Glass = glass;
         }
+        /// <summary>
+        /// Получение строк со значениями свойств объекта класса-сущности
+        /// </summary>
+        /// <returns></returns>
+        public override string[] GetStringRepresentation()
+        {
+            return new[] { nameof(EntityBoat), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name,
+            Motor.ToString(), Oars.ToString(), Glass.ToString() };
+        }
+
+        /// <summary>
+        /// Создание объекта из массива строк
+        /// </summary>
+        /// <param name="strs"></param>
+        /// <returns></returns>
+        public static EntityBoat? CreateEntityMBoat(string[] strs)
+        {
+            if (strs.Length != 8 || strs[0] != nameof(EntityBoat))
+            {
+                return null;
+            }
+            return new EntityMBoat(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]), Color.FromName(strs[4]),
+                Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]), Convert.ToBoolean(strs[7]));
+        }
     }
 }
+ 

ProjectBus/ProjectBus/Exceptions/CollectionOverflowException.cs

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

ProjectBus/ProjectBus/Exceptions/ObjectAlreadyInCollectionException.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectBoat.Exceptions;
+
+[Serializable]
+internal class ObjectAlreadyInCollectionException : ApplicationException
+{
+    public ObjectAlreadyInCollectionException(int index) : base("Такой объект уже присутствует в коллекции. Позиция " + index) { }
+
+    public ObjectAlreadyInCollectionException() : base() { }
+
+    public ObjectAlreadyInCollectionException(string message) : base(message) { }
+
+    public ObjectAlreadyInCollectionException(string message, Exception exception) : base(message, exception) { }
+
+    protected ObjectAlreadyInCollectionException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+}

ProjectBus/ProjectBus/Exceptions/ObjectNotFoundException.cs

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

ProjectBus/ProjectBus/Exceptions/PositionOutOfCollectionException.cs

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

ProjectBus/ProjectBus/FormArtilleryUnitConfing.Designer.cs

@@ -0,0 +1,370 @@
+namespace ProjectBoat
+{
+    partial class FormBoatConfing
+    {
+        /// <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()
+        {
+            groupBoxConfing = 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();
+            checkBoxGlass = new CheckBox();
+            checkBoxOars = new CheckBox();
+            checkBoxMotor = new CheckBox();
+            numericUpDownWeight = new NumericUpDown();
+            labelWeight = new Label();
+            numericUpDownSpeed = new NumericUpDown();
+            labelSpeed = new Label();
+            labelModifiedObject = new Label();
+            labelSimpleObject = new Label();
+            pictureBoxObject = new PictureBox();
+            buttonAdd = new Button();
+            buttonCancel = new Button();
+            panelObject = new Panel();
+            labelAdditionalColor = new Label();
+            labelBodyColor = new Label();
+            groupBoxConfing.SuspendLayout();
+            groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
+            panelObject.SuspendLayout();
+            SuspendLayout();
+            // 
+            // groupBoxConfing
+            // 
+            groupBoxConfing.Controls.Add(groupBoxColors);
+            groupBoxConfing.Controls.Add(checkBoxGlass);
+            groupBoxConfing.Controls.Add(checkBoxOars);
+            groupBoxConfing.Controls.Add(checkBoxMotor);
+            groupBoxConfing.Controls.Add(numericUpDownWeight);
+            groupBoxConfing.Controls.Add(labelWeight);
+            groupBoxConfing.Controls.Add(numericUpDownSpeed);
+            groupBoxConfing.Controls.Add(labelSpeed);
+            groupBoxConfing.Controls.Add(labelModifiedObject);
+            groupBoxConfing.Controls.Add(labelSimpleObject);
+            groupBoxConfing.Dock = DockStyle.Left;
+            groupBoxConfing.Location = new Point(0, 0);
+            groupBoxConfing.Name = "groupBoxConfing";
+            groupBoxConfing.Size = new Size(626, 262);
+            groupBoxConfing.TabIndex = 0;
+            groupBoxConfing.TabStop = false;
+            groupBoxConfing.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(327, 26);
+            groupBoxColors.Name = "groupBoxColors";
+            groupBoxColors.Size = new Size(280, 154);
+            groupBoxColors.TabIndex = 9;
+            groupBoxColors.TabStop = false;
+            groupBoxColors.Text = "Цвета";
+            // 
+            // panelPurple
+            // 
+            panelPurple.BackColor = Color.Purple;
+            panelPurple.Location = new Point(217, 96);
+            panelPurple.Name = "panelPurple";
+            panelPurple.Size = new Size(48, 47);
+            panelPurple.TabIndex = 1;
+            // 
+            // panelBlack
+            // 
+            panelBlack.BackColor = Color.Black;
+            panelBlack.Location = new Point(149, 96);
+            panelBlack.Name = "panelBlack";
+            panelBlack.Size = new Size(48, 47);
+            panelBlack.TabIndex = 1;
+            // 
+            // panelGray
+            // 
+            panelGray.BackColor = Color.Gray;
+            panelGray.Location = new Point(82, 96);
+            panelGray.Name = "panelGray";
+            panelGray.Size = new Size(48, 47);
+            panelGray.TabIndex = 1;
+            // 
+            // panelWhite
+            // 
+            panelWhite.BackColor = Color.White;
+            panelWhite.Location = new Point(17, 96);
+            panelWhite.Name = "panelWhite";
+            panelWhite.Size = new Size(48, 47);
+            panelWhite.TabIndex = 1;
+            // 
+            // panelYellow
+            // 
+            panelYellow.BackColor = Color.Yellow;
+            panelYellow.Location = new Point(217, 31);
+            panelYellow.Name = "panelYellow";
+            panelYellow.Size = new Size(48, 47);
+            panelYellow.TabIndex = 1;
+            // 
+            // panelBlue
+            // 
+            panelBlue.BackColor = Color.Blue;
+            panelBlue.Location = new Point(149, 31);
+            panelBlue.Name = "panelBlue";
+            panelBlue.Size = new Size(48, 47);
+            panelBlue.TabIndex = 1;
+            // 
+            // panelGreen
+            // 
+            panelGreen.BackColor = Color.Green;
+            panelGreen.Location = new Point(82, 31);
+            panelGreen.Name = "panelGreen";
+            panelGreen.Size = new Size(48, 47);
+            panelGreen.TabIndex = 1;
+            // 
+            // panelRed
+            // 
+            panelRed.BackColor = Color.Red;
+            panelRed.Location = new Point(17, 31);
+            panelRed.Name = "panelRed";
+            panelRed.Size = new Size(48, 47);
+            panelRed.TabIndex = 0;
+            // 
+            // checkBoxGlass
+            // 
+            checkBoxGlass.AutoSize = true;
+            checkBoxGlass.Location = new Point(6, 217);
+            checkBoxGlass.Name = "checkBoxGlass";
+            checkBoxGlass.Size = new Size(202, 24);
+            checkBoxGlass.TabIndex = 8;
+            checkBoxGlass.Text = "Признак наличие стекла";
+            checkBoxGlass.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxOars
+            // 
+            checkBoxOars.AutoSize = true;
+            checkBoxOars.Location = new Point(6, 169);
+            checkBoxOars.Name = "checkBoxOars";
+            checkBoxOars.Size = new Size(197, 24);
+            checkBoxOars.TabIndex = 7;
+            checkBoxOars.Text = "Признак наличие весел";
+            checkBoxOars.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxMotor
+            // 
+            checkBoxMotor.AutoSize = true;
+            checkBoxMotor.Location = new Point(6, 123);
+            checkBoxMotor.Name = "checkBoxMotor";
+            checkBoxMotor.Size = new Size(210, 24);
+            checkBoxMotor.TabIndex = 6;
+            checkBoxMotor.Text = "Признак наличие мотора";
+            checkBoxMotor.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            numericUpDownWeight.Location = new Point(94, 68);
+            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(114, 27);
+            numericUpDownWeight.TabIndex = 5;
+            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelWeight
+            // 
+            labelWeight.AutoSize = true;
+            labelWeight.Location = new Point(27, 70);
+            labelWeight.Name = "labelWeight";
+            labelWeight.Size = new Size(36, 20);
+            labelWeight.TabIndex = 4;
+            labelWeight.Text = "Вес:";
+            // 
+            // numericUpDownSpeed
+            // 
+            numericUpDownSpeed.Location = new Point(94, 32);
+            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(114, 27);
+            numericUpDownSpeed.TabIndex = 3;
+            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelSpeed
+            // 
+            labelSpeed.AutoSize = true;
+            labelSpeed.Location = new Point(12, 32);
+            labelSpeed.Name = "labelSpeed";
+            labelSpeed.Size = new Size(76, 20);
+            labelSpeed.TabIndex = 2;
+            labelSpeed.Text = "Скорость:";
+            // 
+            // labelModifiedObject
+            // 
+            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+            labelModifiedObject.Location = new Point(476, 203);
+            labelModifiedObject.Name = "labelModifiedObject";
+            labelModifiedObject.Size = new Size(131, 44);
+            labelModifiedObject.TabIndex = 1;
+            labelModifiedObject.Text = "Продвинутый";
+            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelModifiedObject.MouseDown += labelObject_MouseDown;
+            // 
+            // labelSimpleObject
+            // 
+            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+            labelSimpleObject.Location = new Point(327, 203);
+            labelSimpleObject.Name = "labelSimpleObject";
+            labelSimpleObject.Size = new Size(130, 44);
+            labelSimpleObject.TabIndex = 0;
+            labelSimpleObject.Text = "Простой";
+            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelSimpleObject.MouseDown += labelObject_MouseDown;
+            // 
+            // pictureBoxObject
+            // 
+            pictureBoxObject.Location = new Point(11, 56);
+            pictureBoxObject.Name = "pictureBoxObject";
+            pictureBoxObject.Size = new Size(183, 125);
+            pictureBoxObject.TabIndex = 1;
+            pictureBoxObject.TabStop = false;
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(632, 212);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(94, 29);
+            buttonAdd.TabIndex = 2;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += buttonAdd_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(740, 212);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(94, 29);
+            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(632, 12);
+            panelObject.Name = "panelObject";
+            panelObject.Size = new Size(205, 194);
+            panelObject.TabIndex = 4;
+            panelObject.DragDrop += PanelObject_DragDrop;
+            panelObject.DragEnter += PanelObject_DragEnter;
+            // 
+            // labelAdditionalColor
+            // 
+            labelAdditionalColor.AllowDrop = true;
+            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+            labelAdditionalColor.Location = new Point(108, 11);
+            labelAdditionalColor.Name = "labelAdditionalColor";
+            labelAdditionalColor.Size = new Size(83, 36);
+            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(11, 11);
+            labelBodyColor.Name = "labelBodyColor";
+            labelBodyColor.Size = new Size(83, 36);
+            labelBodyColor.TabIndex = 2;
+            labelBodyColor.Text = "Цвет";
+            labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelBodyColor.DragDrop += labelBodyColor_DragDrop;
+            labelBodyColor.DragEnter += labelBodyColor_DragEnter;
+            // 
+            // FormBoatConfing
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(838, 262);
+            Controls.Add(panelObject);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonAdd);
+            Controls.Add(groupBoxConfing);
+            Name = "FormBoatConfing";
+            Text = "Создание объекта";
+            groupBoxConfing.ResumeLayout(false);
+            groupBoxConfing.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 groupBoxConfing;
+        private Label labelSimpleObject;
+        private Label labelModifiedObject;
+        private Label labelWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private Label labelSpeed;
+        private NumericUpDown numericUpDownWeight;
+        private CheckBox checkBoxMotor;
+        private CheckBox checkBoxOars;
+        private CheckBox checkBoxGlass;
+        private GroupBox groupBoxColors;
+        private Panel panelPurple;
+        private Panel panelBlack;
+        private Panel panelGray;
+        private Panel panelWhite;
+        private Panel panelYellow;
+        private Panel panelBlue;
+        private Panel panelGreen;
+        private Panel panelRed;
+        private PictureBox pictureBoxObject;
+        private Button buttonAdd;
+        private Button buttonCancel;
+        private Panel panelObject;
+        private Label labelBodyColor;
+        private Label labelAdditionalColor;
+    }
+}

ProjectBus/ProjectBus/FormArtilleryUnitConfing.cs

@@ -0,0 +1,176 @@
+using ProjectBoat.Drawnings;
+using ProjectBoat.Entities;
+
+namespace ProjectBoat
+{
+    /// <summary>
+    /// Форма конфигурации объекта
+    /// </summary>
+    public partial class FormBoatConfing : Form
+    {
+        /// <summary>
+        /// Объект - прорисовка артиллерийской установки
+        /// </summary>
+        private DrawningBoat _boat;
+
+        /// <summary>
+        /// Событие для передачи объекта
+        /// </summary>
+        private event Action<DrawningBoat>? BoatDelegate;
+
+        /// <summary>
+        /// Привязка внешнего метода к событию
+        /// </summary>
+        /// <param name="carDelegate"></param>
+        public void AddEvent(Action<DrawningBoat> boatDelegate)
+        {
+            BoatDelegate += boatDelegate;
+        }
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormBoatConfing()
+        {
+            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;
+            //TODO  buttonCancel.Click with lambda с закрытием формы
+            buttonCancel.Click += (sender, e) => Close();
+        }
+
+        /// <summary>
+        /// Прорисовка объекта
+        /// </summary>
+        private void DrawObject()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _boat?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
+            _boat?.SetPosition(15, 15);
+            _boat?.DrawTransport(gr);
+            pictureBoxObject.Image = bmp;
+        }
+
+        /// <summary>
+        /// Передаем информацию при нажатии на Label
+        /// </summary>
+        /// <param name="sender"></param>labelSimpleObject
+        /// <param name="e"></param>labelSimpleObject
+        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":
+                    _boat = new DrawningBoat((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White);
+                    break;
+                case "labelModifiedObject":
+                    _boat = new
+                    DrawningMBoat((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White,
+                        Color.Black, checkBoxMotor.Checked, checkBoxOars.Checked, checkBoxGlass.Checked);
+                    break;
+            }
+            DrawObject();
+        }
+
+        /// <summary>
+        /// Передаем информацию при нажатии на Panel
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Panel_MouseDown(object sender, MouseEventArgs e)
+        {
+            //TODO отправка цвета в Drag&Drop
+            (sender as Control)?.DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        // TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта)
+
+        private void labelBodyColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        private void labelBodyColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_boat != null)
+            {
+                _boat.EntityBoat.setBodyColor((Color)e.Data.GetData(typeof(Color)));
+                DrawObject();
+            }
+        }
+
+        private void labelAdditionalColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (_boat is DrawningBoat)
+            {
+                if (e.Data.GetDataPresent(typeof(Color)))
+                {
+                    e.Effect = DragDropEffects.Copy;
+                }
+                else
+                {
+                    e.Effect = DragDropEffects.None;
+                }
+            }
+        }
+
+        private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_boat.EntityBoat is EntityMBoat mBoat)
+            {
+                mBoat.setAdditionalColor((Color)e.Data.GetData(typeof(Color)));
+            }
+            DrawObject();
+        }
+
+        /// <summary>
+        /// Передача объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonAdd_Click(object sender, EventArgs e)
+        {
+            if (_boat != null)
+            {
+                BoatDelegate?.Invoke(_boat);
+                Close();
+            }
+        }
+    }
+}

ProjectBus/ProjectBus/FormArtilleryUnitsCollection.Designer.cs

@@ -40,17 +40,25 @@
             labelCollectionName = new Label();
             comboBoxSelectorCompany = new ComboBox();
             panelCompanyTools = new Panel();
+            buttonSortByColor = new Button();
+            buttonSortByType = new Button();
             ButtonAddBoat = new Button();
-            ButtonAddMBoat = new Button();
             buttonRefresh = new Button();
             ButtonRemoveBoat = new Button();
             maskedTextBoxPosision = new MaskedTextBox();
             buttonGetToTest = new Button();
             pictureBoxBoat = new PictureBox();
+            menuStrip = new MenuStrip();
+            файлToolStripMenuItem = new ToolStripMenuItem();
+            saveToolStripMenuItem = new ToolStripMenuItem();
+            loadToolStripMenuItem = new ToolStripMenuItem();
+            saveFileDialog = new SaveFileDialog();
+            openFileDialog = new OpenFileDialog();
             groupBoxTools.SuspendLayout();
             panelStorage.SuspendLayout();
             panelCompanyTools.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBoxBoat).BeginInit();
+            menuStrip.SuspendLayout();
             SuspendLayout();
             // 
             // groupBoxTools
@@ -60,21 +68,18 @@
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Controls.Add(panelCompanyTools);
             groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(510, 0);
-            groupBoxTools.Margin = new Padding(3, 2, 3, 2);
+            groupBoxTools.Location = new Point(631, 30);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Padding = new Padding(3, 2, 3, 2);
-            groupBoxTools.Size = new Size(194, 490);
+            groupBoxTools.Size = new Size(222, 658);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "инструменты";
             // 
             // buttonCreateCompany
             // 
-            buttonCreateCompany.Location = new Point(18, 259);
-            buttonCreateCompany.Margin = new Padding(3, 2, 3, 2);
+            buttonCreateCompany.Location = new Point(21, 345);
             buttonCreateCompany.Name = "buttonCreateCompany";
-            buttonCreateCompany.Size = new Size(163, 20);
+            buttonCreateCompany.Size = new Size(186, 27);
             buttonCreateCompany.TabIndex = 7;
             buttonCreateCompany.Text = "Создать компанию";
             buttonCreateCompany.UseVisualStyleBackColor = true;
@@ -90,18 +95,16 @@
             panelStorage.Controls.Add(textBoxCollectionName);
             panelStorage.Controls.Add(labelCollectionName);
             panelStorage.Dock = DockStyle.Top;
-            panelStorage.Location = new Point(3, 18);
-            panelStorage.Margin = new Padding(3, 2, 3, 2);
+            panelStorage.Location = new Point(3, 23);
             panelStorage.Name = "panelStorage";
-            panelStorage.Size = new Size(188, 212);
+            panelStorage.Size = new Size(216, 283);
             panelStorage.TabIndex = 6;
             // 
             // buttonCollectionDel
             // 
-            buttonCollectionDel.Location = new Point(15, 185);
-            buttonCollectionDel.Margin = new Padding(3, 2, 3, 2);
+            buttonCollectionDel.Location = new Point(17, 247);
             buttonCollectionDel.Name = "buttonCollectionDel";
-            buttonCollectionDel.Size = new Size(163, 20);
+            buttonCollectionDel.Size = new Size(186, 27);
             buttonCollectionDel.TabIndex = 6;
             buttonCollectionDel.Text = "Удалить коллекцию";
             buttonCollectionDel.UseVisualStyleBackColor = true;
@@ -110,19 +113,16 @@
             // listBoxCollection
             // 
             listBoxCollection.FormattingEnabled = true;
-            listBoxCollection.ItemHeight = 15;
-            listBoxCollection.Location = new Point(15, 103);
-            listBoxCollection.Margin = new Padding(3, 2, 3, 2);
+            listBoxCollection.Location = new Point(17, 137);
             listBoxCollection.Name = "listBoxCollection";
-            listBoxCollection.Size = new Size(163, 79);
+            listBoxCollection.Size = new Size(186, 104);
             listBoxCollection.TabIndex = 5;
             // 
             // buttonCollecctionAdd
             // 
-            buttonCollecctionAdd.Location = new Point(15, 78);
-            buttonCollecctionAdd.Margin = new Padding(3, 2, 3, 2);
+            buttonCollecctionAdd.Location = new Point(17, 104);
             buttonCollecctionAdd.Name = "buttonCollecctionAdd";
-            buttonCollecctionAdd.Size = new Size(163, 20);
+            buttonCollecctionAdd.Size = new Size(186, 27);
             buttonCollecctionAdd.TabIndex = 4;
             buttonCollecctionAdd.Text = "Добавить коллекцию";
             buttonCollecctionAdd.UseVisualStyleBackColor = true;
@@ -131,10 +131,9 @@
             // radioButtonList
             // 
             radioButtonList.AutoSize = true;
-            radioButtonList.Location = new Point(108, 56);
-            radioButtonList.Margin = new Padding(3, 2, 3, 2);
+            radioButtonList.Location = new Point(123, 75);
             radioButtonList.Name = "radioButtonList";
-            radioButtonList.Size = new Size(66, 19);
+            radioButtonList.Size = new Size(80, 24);
             radioButtonList.TabIndex = 3;
             radioButtonList.TabStop = true;
             radioButtonList.Text = "Список";
@@ -143,10 +142,9 @@
             // radioButtonMassive
             // 
             radioButtonMassive.AutoSize = true;
-            radioButtonMassive.Location = new Point(15, 56);
-            radioButtonMassive.Margin = new Padding(3, 2, 3, 2);
+            radioButtonMassive.Location = new Point(17, 75);
             radioButtonMassive.Name = "radioButtonMassive";
-            radioButtonMassive.Size = new Size(67, 19);
+            radioButtonMassive.Size = new Size(82, 24);
             radioButtonMassive.TabIndex = 2;
             radioButtonMassive.TabStop = true;
             radioButtonMassive.Text = "Массив";
@@ -154,18 +152,17 @@
             // 
             // textBoxCollectionName
             // 
-            textBoxCollectionName.Location = new Point(15, 24);
-            textBoxCollectionName.Margin = new Padding(3, 2, 3, 2);
+            textBoxCollectionName.Location = new Point(17, 32);
             textBoxCollectionName.Name = "textBoxCollectionName";
-            textBoxCollectionName.Size = new Size(163, 23);
+            textBoxCollectionName.Size = new Size(186, 27);
             textBoxCollectionName.TabIndex = 1;
             // 
             // labelCollectionName
             // 
             labelCollectionName.AutoSize = true;
-            labelCollectionName.Location = new Point(23, 7);
+            labelCollectionName.Location = new Point(26, 9);
             labelCollectionName.Name = "labelCollectionName";
-            labelCollectionName.Size = new Size(122, 15);
+            labelCollectionName.Size = new Size(155, 20);
             labelCollectionName.TabIndex = 0;
             labelCollectionName.Text = "Название коллекции";
             // 
@@ -174,60 +171,67 @@
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(18, 233);
-            comboBoxSelectorCompany.Margin = new Padding(3, 2, 3, 2);
+            comboBoxSelectorCompany.Location = new Point(21, 311);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
-            comboBoxSelectorCompany.Size = new Size(163, 23);
+            comboBoxSelectorCompany.Size = new Size(186, 28);
             comboBoxSelectorCompany.TabIndex = 0;
             comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged_1;
             // 
             // panelCompanyTools
             // 
+            panelCompanyTools.Controls.Add(buttonSortByColor);
+            panelCompanyTools.Controls.Add(buttonSortByType);
             panelCompanyTools.Controls.Add(ButtonAddBoat);
-            panelCompanyTools.Controls.Add(ButtonAddMBoat);
             panelCompanyTools.Controls.Add(buttonRefresh);
             panelCompanyTools.Controls.Add(ButtonRemoveBoat);
             panelCompanyTools.Controls.Add(maskedTextBoxPosision);
             panelCompanyTools.Controls.Add(buttonGetToTest);
             panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(3, 284);
-            panelCompanyTools.Margin = new Padding(3, 2, 3, 2);
+            panelCompanyTools.Location = new Point(3, 379);
             panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(189, 206);
+            panelCompanyTools.Size = new Size(216, 275);
             panelCompanyTools.TabIndex = 8;
             // 
+            // buttonSortByColor
+            // 
+            buttonSortByColor.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonSortByColor.Location = new Point(19, 241);
+            buttonSortByColor.Name = "buttonSortByColor";
+            buttonSortByColor.Size = new Size(186, 31);
+            buttonSortByColor.TabIndex = 7;
+            buttonSortByColor.Text = "Сортировка по цвету";
+            buttonSortByColor.UseVisualStyleBackColor = true;
+            buttonSortByColor.Click += ButtonSortByColor_Click;
+            // 
+            // buttonSortByType
+            // 
+            buttonSortByType.Anchor = AnchorStyles.Right;
+            buttonSortByType.Location = new Point(19, 199);
+            buttonSortByType.Name = "buttonSortByType";
+            buttonSortByType.Size = new Size(186, 37);
+            buttonSortByType.TabIndex = 6;
+            buttonSortByType.Text = "Сортировка по типу";
+            buttonSortByType.UseVisualStyleBackColor = true;
+            buttonSortByType.Click += ButtonSortByType_Click;
+            // 
             // ButtonAddBoat
             // 
             ButtonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
             ButtonAddBoat.BackgroundImageLayout = ImageLayout.Center;
-            ButtonAddBoat.Location = new Point(16, 2);
-            ButtonAddBoat.Margin = new Padding(3, 2, 3, 2);
+            ButtonAddBoat.Location = new Point(18, 3);
             ButtonAddBoat.Name = "ButtonAddBoat";
-            ButtonAddBoat.Size = new Size(163, 30);
+            ButtonAddBoat.Size = new Size(186, 52);
             ButtonAddBoat.TabIndex = 1;
-            ButtonAddBoat.Text = "добваление лодки";
+            ButtonAddBoat.Text = "добавление лодки";
             ButtonAddBoat.UseVisualStyleBackColor = true;
             ButtonAddBoat.Click += ButtonAddBoat_Click;
             // 
-            // ButtonAddMBoat
-            // 
-            ButtonAddMBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            ButtonAddMBoat.Location = new Point(16, 37);
-            ButtonAddMBoat.Margin = new Padding(3, 2, 3, 2);
-            ButtonAddMBoat.Name = "ButtonAddMBoat";
-            ButtonAddMBoat.Size = new Size(163, 38);
-            ButtonAddMBoat.TabIndex = 2;
-            ButtonAddMBoat.Text = "добваление моторной лодки";
-            ButtonAddMBoat.UseVisualStyleBackColor = true;
-            ButtonAddMBoat.Click += ButtonAddMBoat_Click;
-            // 
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(16, 170);
-            buttonRefresh.Margin = new Padding(3, 2, 3, 2);
+            buttonRefresh.Location = new Point(19, 164);
             buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(163, 31);
+            buttonRefresh.Size = new Size(186, 29);
             buttonRefresh.TabIndex = 5;
             buttonRefresh.Text = "обновить";
             buttonRefresh.UseVisualStyleBackColor = true;
@@ -236,10 +240,9 @@
             // ButtonRemoveBoat
             // 
             ButtonRemoveBoat.Anchor = AnchorStyles.Right;
-            ButtonRemoveBoat.Location = new Point(16, 104);
-            ButtonRemoveBoat.Margin = new Padding(3, 2, 3, 2);
+            ButtonRemoveBoat.Location = new Point(19, 99);
             ButtonRemoveBoat.Name = "ButtonRemoveBoat";
-            ButtonRemoveBoat.Size = new Size(163, 30);
+            ButtonRemoveBoat.Size = new Size(186, 28);
             ButtonRemoveBoat.TabIndex = 3;
             ButtonRemoveBoat.Text = "удалить лодку";
             ButtonRemoveBoat.UseVisualStyleBackColor = true;
@@ -247,21 +250,19 @@
             // 
             // maskedTextBoxPosision
             // 
-            maskedTextBoxPosision.Location = new Point(15, 79);
-            maskedTextBoxPosision.Margin = new Padding(3, 2, 3, 2);
+            maskedTextBoxPosision.Location = new Point(18, 60);
             maskedTextBoxPosision.Mask = "00";
             maskedTextBoxPosision.Name = "maskedTextBoxPosision";
-            maskedTextBoxPosision.Size = new Size(164, 23);
+            maskedTextBoxPosision.Size = new Size(187, 27);
             maskedTextBoxPosision.TabIndex = 2;
             maskedTextBoxPosision.ValidatingType = typeof(int);
             // 
             // buttonGetToTest
             // 
             buttonGetToTest.Anchor = AnchorStyles.Right;
-            buttonGetToTest.Location = new Point(16, 138);
-            buttonGetToTest.Margin = new Padding(3, 2, 3, 2);
+            buttonGetToTest.Location = new Point(18, 132);
             buttonGetToTest.Name = "buttonGetToTest";
-            buttonGetToTest.Size = new Size(163, 30);
+            buttonGetToTest.Size = new Size(186, 27);
             buttonGetToTest.TabIndex = 4;
             buttonGetToTest.Text = "передать на тесты";
             buttonGetToTest.UseVisualStyleBackColor = true;
@@ -270,37 +271,82 @@
             // pictureBoxBoat
             // 
             pictureBoxBoat.Dock = DockStyle.Fill;
-            pictureBoxBoat.Location = new Point(0, 0);
-            pictureBoxBoat.Margin = new Padding(3, 2, 3, 2);
+            pictureBoxBoat.Location = new Point(0, 30);
             pictureBoxBoat.Name = "pictureBoxBoat";
-            pictureBoxBoat.Size = new Size(510, 490);
+            pictureBoxBoat.Size = new Size(631, 658);
             pictureBoxBoat.TabIndex = 1;
             pictureBoxBoat.TabStop = false;
             // 
+            // menuStrip
+            // 
+            menuStrip.ImageScalingSize = new Size(20, 20);
+            menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
+            menuStrip.Location = new Point(0, 0);
+            menuStrip.Name = "menuStrip";
+            menuStrip.Padding = new Padding(6, 3, 0, 3);
+            menuStrip.Size = new Size(853, 30);
+            menuStrip.TabIndex = 2;
+            menuStrip.Text = "menuStrip1";
+            // 
+            // файлToolStripMenuItem
+            // 
+            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
+            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
+            файлToolStripMenuItem.Size = new Size(59, 24);
+            файлToolStripMenuItem.Text = "Файл";
+            // 
+            // saveToolStripMenuItem
+            // 
+            saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+            saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
+            saveToolStripMenuItem.Size = new Size(227, 26);
+            saveToolStripMenuItem.Text = "Сохранение";
+            saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
+            // 
+            // loadToolStripMenuItem
+            // 
+            loadToolStripMenuItem.Name = "loadToolStripMenuItem";
+            loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
+            loadToolStripMenuItem.Size = new Size(227, 26);
+            loadToolStripMenuItem.Text = "Загрузка";
+            loadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
+            // 
+            // saveFileDialog
+            // 
+            saveFileDialog.Filter = "txt file|*.txt";
+            // 
+            // openFileDialog
+            // 
+            openFileDialog.Filter = "txt file|*.txt";
+            // 
             // FormBoatsCollection
             // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(704, 490);
+            ClientSize = new Size(853, 688);
             Controls.Add(pictureBoxBoat);
             Controls.Add(groupBoxTools);
-            Margin = new Padding(3, 2, 3, 2);
+            Controls.Add(menuStrip);
+            MainMenuStrip = menuStrip;
             Name = "FormBoatsCollection";
             Text = "FormBoatsCollection";
+            Load += FormBoatsCollection_Load;
             groupBoxTools.ResumeLayout(false);
             panelStorage.ResumeLayout(false);
             panelStorage.PerformLayout();
             panelCompanyTools.ResumeLayout(false);
             panelCompanyTools.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBoxBoat).EndInit();
+            menuStrip.ResumeLayout(false);
+            menuStrip.PerformLayout();
             ResumeLayout(false);
+            PerformLayout();
         }
 
         #endregion
 
         private GroupBox groupBoxTools;
         private ComboBox comboBoxSelectorCompany;
-        private Button ButtonAddMBoat;
         private Button ButtonAddBoat;
         private Button ButtonRemoveBoat;
         private Button buttonRefresh;
@@ -317,5 +363,13 @@
         private Button buttonCreateCompany;
         private Button buttonCollectionDel;
         private Panel panelCompanyTools;
+        private MenuStrip menuStrip;
+        private ToolStripMenuItem файлToolStripMenuItem;
+        private ToolStripMenuItem saveToolStripMenuItem;
+        private ToolStripMenuItem loadToolStripMenuItem;
+        private SaveFileDialog saveFileDialog;
+        private OpenFileDialog openFileDialog;
+        private Button buttonSortByColor;
+        private Button buttonSortByType;
     }
 }

ProjectBus/ProjectBus/FormArtilleryUnitsCollection.cs

@@ -0,0 +1,345 @@
+using Microsoft.Extensions.Logging;
+using ProjectBoat.CollectionGenericObjects;
+using ProjectBoat.Drawnings;
+using System.Windows.Forms;
+
+namespace ProjectBoat
+{
+
+    public partial class FormBoatsCollection : Form
+    {
+        /// <summary>
+        /// Хранилише коллекций
+        /// </summary>
+        private readonly StorageCollection<DrawningBoat> _storageCollection;
+
+        /// <summary>
+        /// Компания
+        /// </summary>
+        private AbstractCompany? _company = null;
+
+        /// <summary>
+        /// Логер
+        /// </summary>
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormBoatsCollection(ILogger<FormBoatsCollection> logger)
+        {
+            InitializeComponent();
+            _storageCollection = new();
+            _logger = logger;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void comboBoxSelectorCompany_SelectedIndexChanged_1(object sender, EventArgs e)
+        {
+            panelCompanyTools.Enabled = false;
+        }
+
+        /// <summary>
+        /// добавление артиллерийской установки
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddBoat_Click(object sender, EventArgs e)
+        {
+            FormBoatConfing form = new();
+            // TODO передать метод
+
+            form.Show();
+            form.AddEvent(SetBoat);
+        }
+
+        /// <summary>
+        /// Добавление артиллерийской установки в коллекцию
+        /// </summary>
+        /// <param name="boat"></param>
+        private void SetBoat(DrawningBoat? boat)
+        {
+            if (_company == null || boat == null)
+            {
+                return;
+            }
+            try
+            {
+                var res = _company + boat;
+                MessageBox.Show("Объект добавлен");
+                _logger.LogInformation($"Объект добавлен под индексом {res}");
+                pictureBoxBoat.Image = _company.Show();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"Объект не добавлен: {ex.Message}", "Результат", MessageBoxButtons.OK,
+                    MessageBoxIcon.Error);
+                _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// Удаление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRemoveBoat_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(maskedTextBoxPosision.Text) || _company == null)
+            {
+                return;
+            }
+            if (MessageBox.Show("удалить объект?", "удаление",
+            MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+            {
+                return;
+            }
+            int pos = Convert.ToInt32(maskedTextBoxPosision.Text);
+            try
+            {
+                var res = _company - pos;
+                MessageBox.Show("Объект удален");
+                _logger.LogInformation($"Объект удален под индексом {pos}");
+                pictureBoxBoat.Image = _company.Show();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Не удалось удалить объект",
+                    MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
+            }
+        }
+
+        private void ButtonGetToTest_Click(object sender, EventArgs e)
+        {
+            if (_company == null)
+            {
+                return;
+            }
+
+            DrawningBoat? boat = null;
+            int counter = 100;
+            while (boat == null)
+            {
+                boat = _company.GetRandomObject();
+                counter--;
+                if (counter <= 0)
+                {
+                    break;
+                }
+            }
+            if (boat == null)
+            {
+                return;
+            }
+            FormBoat form = new()
+            {
+                SetBoat = boat
+            };
+            form.ShowDialog();
+
+        }
+
+        private void ButtonRefresh_Click(object sender, EventArgs e)
+        {
+            if (_company == null)
+            {
+                return;
+            }
+
+            pictureBoxBoat.Image = _company.Show();
+        }
+
+        /// <summary>
+        /// Добавление коллекции
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCollecctionAdd_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            CollectionType collectionType = CollectionType.None;
+            if (radioButtonMassive.Checked)
+            {
+                collectionType = CollectionType.Massive;
+            }
+            else if (radioButtonList.Checked)
+            {
+                collectionType = CollectionType.List;
+            }
+
+            CollectionInfo collectionInfo = new CollectionInfo(textBoxCollectionName.Text, collectionType, string.Empty);
+
+            _storageCollection.AddCollection(collectionInfo);
+            _logger.LogInformation("Добавление коллекции");
+            RerfreshListBoxItems();
+        }
+
+        /// <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;
+            }
+            if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+
+            CollectionInfo collectionInfo = new CollectionInfo(listBoxCollection.SelectedItem.ToString(), CollectionType.None, string.Empty);
+
+            _storageCollection.DelCollection(collectionInfo);
+            _logger.LogInformation("Коллекция удалена");
+            RerfreshListBoxItems();
+        }
+
+        /// <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);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Создание компании
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreateCompany_Click(object sender, EventArgs e)
+        {
+            if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+            {
+                MessageBox.Show("Коллекция не выбрана");
+                return;
+            }
+
+            CollectionInfo collectionInfo = new CollectionInfo(listBoxCollection.SelectedItem.ToString(), CollectionType.None, string.Empty);
+            ICollectionGenericObjects<DrawningBoat>? collection = _storageCollection[collectionInfo];
+            if (collection == null)
+            {
+                MessageBox.Show("Коллекция не проинициализирована");
+                return;
+            }
+
+            switch (comboBoxSelectorCompany.Text)
+            {
+                case "Хранилище":
+                    _company = new BoatDockingService(pictureBoxBoat.Width, pictureBoxBoat.Height, collection);
+                    _logger.LogInformation("Компания создана");
+                    break;
+            }
+            panelCompanyTools.Enabled = true;
+            RerfreshListBoxItems();
+
+        }
+
+        /// <summary>
+        /// Обработка нажатия "Сохранение"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _storageCollection.SaveData(saveFileDialog.FileName);
+                    MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogInformation("Сохранение в файл: {filename}", saveFileDialog.FileName);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    _logger.LogError("Ошибка: {Message}", ex.Message);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Обработка нажатия "Загрузка"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _storageCollection.LoadData(openFileDialog.FileName);
+                    RerfreshListBoxItems();
+                    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);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Сортировка по типу
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonSortByType_Click(object sender, EventArgs e)
+        {
+            CompareBoats(new DrawningBoatCompareByType());
+        }
+
+        /// <summary>
+        /// Сортировка по цвету
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonSortByColor_Click(object sender, EventArgs e)
+        {
+            CompareBoats(new DrawningBoatCompareByColor());
+        }
+
+        /// <summary>
+        /// Сортировка по сравнителю
+        /// </summary>
+        /// <param name="comparer">Сравнитель объектов</param>
+        private void CompareBoats(IComparer<DrawningBoat?> comparer)
+        {
+            if (_company == null)
+            {
+                return;
+            }
+            _company.Sort(comparer);
+            pictureBoxBoat.Image = _company.Show();
+        }
+
+        private void FormBoatsCollection_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

ProjectBus/ProjectBus/FormArtilleryUnitsCollection.resx

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

ProjectBus/ProjectBus/FormBoat.cs

@@ -41,7 +41,7 @@ namespace ProjectBoat
         }
 
         /// <summary>
-        /// Метод прорисовки круисера
+        /// Метод прорисовки лодки
         /// </summary>
         private void Draw()
         {

ProjectBus/ProjectBus/FormBoatsCollection.cs

@@ -1,260 +0,0 @@
-using ProjectBoat.CollectionGenericObjects;
-using ProjectBoat.Drawnings;
-
-namespace ProjectBoat
-{
-    public partial class FormBoatsCollection : Form
-    {
-        /// <summary>
-        /// Хранилише коллекций
-        /// </summary>
-        private readonly StorageCollection<DrawningBoat> _storageCollection;
-
-        /// <summary>
-        /// Компания
-        /// </summary>
-        private AbstractCompany? _company = null;
-
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        public FormBoatsCollection()
-        {
-            InitializeComponent();
-            _storageCollection = new();
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void comboBoxSelectorCompany_SelectedIndexChanged_1(object sender, EventArgs e)
-        {
-            panelCompanyTools.Enabled = false;
-        }
-
-        /// <summary>
-        /// Создание объекта класса-перемещения
-        /// </summary>
-        /// <param name="type">Тип создаваемого объекта</param>
-        private void CreateObject(string type)
-        {
-            if (_company == null)
-            {
-                return;
-            }
-            Random random = new();
-            DrawningBoat drawningBoat;
-            switch (type)
-            {
-                case nameof(DrawningBoat):
-                    drawningBoat = new DrawningBoat(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
-                    break;
-                case nameof(DrawningMBoat):
-                    // TODO вызов диалогового окна для выбора цвета
-                    drawningBoat = new DrawningMBoat(random.Next(100, 300), random.Next(1000, 3000),
-                    GetColor(random), GetColor(random),
-                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-                    break;
-                default:
-                    return;
-            }
-            if (_company + drawningBoat != -1)
-            {
-                MessageBox.Show("Объект добавлен");
-                pictureBoxBoat.Image = _company.Show();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось добавить объект");
-            }
-        }
-
-        /// <summary>
-        /// Получение цвета
-        /// </summary>
-        /// <param name="random">Генератор случайных чисел</param>
-        /// <returns></returns>
-        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 ButtonAddBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBoat));
-
-        //private void ButtonAddMBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMBoat));
-        private void ButtonAddBoat_Click(object sender, EventArgs e)
-        {
-            CreateObject(nameof(DrawningBoat));
-        }
-
-        private void ButtonAddMBoat_Click(object sender, EventArgs e)
-        {
-            CreateObject(nameof(DrawningMBoat));
-        }
-
-        private void ButtonRemoveBoat_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(maskedTextBoxPosision.Text) || _company == null)
-            {
-                return;
-            }
-            if (MessageBox.Show("удалить объект?", "удаление",
-            MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
-            {
-                return;
-            }
-            int pos = Convert.ToInt32(maskedTextBoxPosision.Text);
-            if (_company - pos != null)
-            {
-                MessageBox.Show("объект удален");
-                pictureBoxBoat.Image = _company.Show();
-            }
-            else
-            {
-                MessageBox.Show("не удалось удалить объект");
-            }
-        }
-
-        private void ButtonGetToTest_Click(object sender, EventArgs e)
-        {
-            if (_company == null)
-            {
-                return;
-            }
-
-            DrawningBoat? cruiser = null;
-            int counter = 100;
-            while (cruiser == null)
-            {
-                cruiser = _company.GetRandomObject();
-                counter--;
-                if (counter <= 0)
-                {
-                    break;
-                }
-            }
-            if (cruiser == null)
-            {
-                return;
-            }
-            FormBoat form = new()
-            {
-                SetBoat = cruiser
-            };
-            form.ShowDialog();
-
-        }
-
-        private void ButtonRefresh_Click(object sender, EventArgs e)
-        {
-            if (_company == null)
-            {
-                return;
-            }
-
-            pictureBoxBoat.Image = _company.Show();
-        }
-
-        /// <summary>
-        /// Добавление коллекции
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCollecctionAdd_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
-            {
-                MessageBox.Show("Не все данные заполнены", "Ошибка",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            CollectionType collectionType = CollectionType.None;
-            if (radioButtonMassive.Checked)
-            {
-                collectionType = CollectionType.Massive;
-            }
-            else if (radioButtonList.Checked)
-            {
-                collectionType = CollectionType.List;
-            }
-            _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
-            RerfreshListBoxItems();
-        }
-
-        /// <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;
-            }
-            if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
-            RerfreshListBoxItems();
-        }
-
-        /// <summary>
-        /// Обновление списка в listBoxCollection
-        /// </summary>
-        private void RerfreshListBoxItems()
-        {
-            listBoxCollection.Items.Clear();
-            for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
-            {
-                string? colName = _storageCollection.Keys?[i];
-                if (!string.IsNullOrEmpty(colName))
-                {
-                    listBoxCollection.Items.Add(colName);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreateCompany_Click(object sender, EventArgs e)
-        {
-            if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
-            {
-                MessageBox.Show("Коллекция не выбрана");
-                return;
-            }
-            ICollectionGenericObjects<DrawningBoat>? collection =
-                _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
-            if (collection == null)
-            {
-                MessageBox.Show("Коллекция не проинициализирована");
-                return;
-            }
-            switch (comboBoxSelectorCompany.Text)
-            {
-                case "Хранилище":
-                    _company = new BoatDockingService(pictureBoxBoat.Width, pictureBoxBoat.Height, collection);
-                    break;
-            }
-            panelCompanyTools.Enabled = true;
-
-        }
-
-
-    }
-}

ProjectBus/ProjectBus/MovementStrategy/MoveableBoat.cs

@@ -10,36 +10,36 @@ namespace ProjectBoat.MovementStrategy
         /// <summary>
         /// Поле-объект класса DrawningBoat или его наследника
         /// </summary>
-        private readonly DrawningBoat? _cruiser = null;
+        private readonly DrawningBoat? _boat = null;
         /// <summary>
         /// Конструктор
         /// </summary>
-        /// <param name="cruiser">Объект класса DrawningBoat</param>
-        public MoveableBoat(DrawningBoat cruiser)
+        /// <param name="boat">Объект класса DrawningBoat</param>
+        public MoveableBoat(DrawningBoat boat)
         {
-            _cruiser = cruiser;
+            _boat = boat;
         }
         public ObjectParameters? GetObjectPosition
         {
             get
             {
-                if (_cruiser == null || _cruiser.EntityBoat == null ||
-                !_cruiser.GetPosX.HasValue || !_cruiser.GetPosY.HasValue)
+                if (_boat == null || _boat.EntityBoat == null ||
+                !_boat.GetPosX.HasValue || !_boat.GetPosY.HasValue)
                 {
                     return null;
                 }
-                return new ObjectParameters(_cruiser.GetPosX.Value,
-                _cruiser.GetPosY.Value, _cruiser.GetWidth, _cruiser.GetHeight);
+                return new ObjectParameters(_boat.GetPosX.Value,
+                _boat.GetPosY.Value, _boat.GetWidth, _boat.GetHeight);
             }
         }
-        public int GetStep => (int)(_cruiser?.EntityBoat?.Step ?? 0);
+        public int GetStep => (int)(_boat?.EntityBoat?.Step ?? 0);
         public bool TryMoveObject(MovementDirection direction)
         {
-            if (_cruiser == null || _cruiser.EntityBoat == null)
+            if (_boat == null || _boat.EntityBoat == null)
             {
                 return false;
             }
-            return _cruiser.MoveTransport(GetDirectionType(direction));
+            return _boat.MoveTransport(GetDirectionType(direction));
         }
         /// <summary>
         /// Конвертация из MovementDirection в DirectionType

ProjectBus/ProjectBus/Program.cs

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

ProjectBus/ProjectBus/ProjectBoat.csproj

@@ -2,10 +2,21 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <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.Abstractions" Version="8.0.1" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.11" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
 </Project>

ProjectBus/ProjectBus/ProjectBus.csproj

@@ -8,4 +8,15 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.12" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.2" />
+    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
+  </ItemGroup>
+
 </Project>

ProjectBus/ProjectBus/nlog.config

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
+	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	 autoReload="true" internalLogLevel="Info">
+		<targets>
+			<target xsi:type="File" name="tofile" fileName="boatlog-
+${shortdate}.log" />
+		</targets>
+		<rules>
+			<logger name="*" minlevel="Debug" writeTo="tofile" />
+		</rules>
+	</nlog>
+</configuration>

ProjectBus/ProjectBus/serilogConfig.json

@@ -0,0 +1,20 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File" ],
+    "MinimumLevel": "Information",
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "Logs/log_.log",
+          "rollingInterval": "Day",
+          "outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ],
+    "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ],
+    "Properties": {
+      "Application": "boat"
+    }
+  }
+}