fd

ProjectBus/ProjectBus/BoatDelegate.cs

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

ProjectBus/ProjectBus/CollectionGenericObjects/AbstractCompany.cs

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

ProjectBus/ProjectBus/CollectionGenericObjects/BoatDockingService.cs

@@ -1,5 +1,4 @@
 using ProjectBoat.Drawnings;
-using ProjectBoat.Exceptions;
 
 namespace ProjectBoat.CollectionGenericObjects
 {
@@ -42,14 +41,11 @@ namespace ProjectBoat.CollectionGenericObjects
 
             for (int i = 0; i < (_collection?.Count ?? 0); i++)
             {
-
-                try
+                if (_collection.Get(i) != null)
                 {
                     _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/CollectionType.cs

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

ProjectBus/ProjectBus/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -11,19 +11,16 @@
         /// Количество объектов в коллекции
         /// </summary>
         int Count { get; }
-
         /// <summary>
         /// Установка максимального количества элементов
         /// </summary>
-        int MaxCount { get; set; }
-
+        int SetMaxCount { set; }
         /// <summary>
         /// Добавление объекта в коллекцию
         /// </summary>
         /// <param name="obj">Добавляемый объект</param>
         /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
         int Insert(T obj);
-
         /// <summary>
         /// Добавление объекта в коллекцию на конкретную позицию
         /// </summary>
@@ -31,31 +28,18 @@
         /// <param name="position">Позиция</param>
         /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
         int Insert(T obj, int position);
-
         /// <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();
-
     }
 
 }

ProjectBus/ProjectBus/CollectionGenericObjects/ListGenericObjects.cs

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

ProjectBus/ProjectBus/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,4 +1,4 @@
-using ProjectBoat.Exceptions;
+using ProjectBoat.Drawnings;
 
 namespace ProjectBoat.CollectionGenericObjects
 {
@@ -14,29 +14,7 @@ namespace ProjectBoat.CollectionGenericObjects
         /// </summary>
         private T?[] _collection;
         public int Count => _collection.Length;
-        public int MaxCount
-        {
-            get
-            {
-                return _collection.Length;
-            }
-            set
-            {
-                if (value > 0)
-                {
-                    if (_collection.Length > 0)
-                    {
-                        Array.Resize(ref _collection, value);
-                    }
-                    else
-                    {
-                        _collection = new T?[value];
-                    }
-                }
-            }
-        }
-
-        public CollectionType GetCollectionType => CollectionType.Massive;
+        public int SetMaxCount { set { if (value > 0) { _collection = new T?[value]; } } }
 
         /// <summary>
         /// Конструктор
@@ -48,100 +26,72 @@ namespace ProjectBoat.CollectionGenericObjects
         public T? Get(int position)
         {
             // TODO проверка позиции
-            // TODO выбром позиций, если выход за границы массива
-            // TODO выбром позиций, если объект пустой 
-            if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
-            if (_collection[position] == null) throw new ObjectNotFoundException(position);
+            if (position >= _collection.Length || position < 0)
+            {
+                return null;
+            }
             return _collection[position];
         }
-
         public int Insert(T obj)
         {
             // TODO вставка в свободное место набора
-            // TODO выброc позиций, если переполнение
             int index = 0;
-            while (index < Count && _collection[index] != null)
+            while (index < _collection.Length)
             {
+                if (_collection[index] == null)
+                {
+                    _collection[index] = obj;
+                    return index;
+                }
                 index++;
             }
-
-            if (index < Count)
-            {
-                _collection[index] = obj;
-                return index;
-            }
-
-            throw new CollectionOverflowException(Count);
+            return -1;
         }
-
         public int Insert(T obj, int position)
         {
             // TODO проверка позиции
             // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
-            //		ищется свободное место после этой позиции и идет вставка туда
-            //		если нет после, ищем до
+            // ищется свободное место после этой позиции и идет вставка туда
+            // если нет после, ищем до
             // TODO вставка
-            // TODO выбром позиций, если переполнение
-            // TODO выбром позиций, если выход за границы массива
-            if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
+            if (position >= _collection.Length || position < 0)
+            { return -1; }
 
-            if (_collection[position] != null)
+            if (_collection[position] == null)
             {
-                bool pushed = false;
-                for (int index = position + 1; index < Count; index++)
-                {
-                    if (_collection[index] == null)
-                    {
-                        position = index;
-                        pushed = true;
-                        break;
-                    }
-                }
+                _collection[position] = obj;
+                return position;
+            }
+            int index;
 
-                if (!pushed)
+            for (index = position + 1; index < _collection.Length; ++index)
+            {
+                if (_collection[index] == null)
                 {
-                    for (int index = position - 1; index >= 0; index--)
-                    {
-                        if (_collection[index] == null)
-                        {
-                            position = index;
-                            pushed = true;
-                            break;
-                        }
-                    }
-                }
-
-                if (!pushed)
-                {
-                    throw new CollectionOverflowException(Count);
+                    _collection[position] = obj;
+                    return position;
                 }
             }
 
-            _collection[position] = obj;
-            return position;
+            for (index = position - 1; index >= 0; --index)
+            {
+                if (_collection[index] == null)
+                {
+                    _collection[position] = obj;
+                    return position;
+                }
+            }
+            return -1;
         }
-
         public T Remove(int position)
         {
             // TODO проверка позиции
             // TODO удаление объекта из массива, присвоив элементу массива значение null
-            // TODO выбром позиций, если выход за границы массива
-            // TODO выбром позиций, если объект пустой 
-            if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
-
-            if (_collection[position] == null) throw new ObjectNotFoundException(position);
-
-            T? temp = _collection[position];
+            if (position >= _collection.Length || position < 0)
+            { return null; }
+            T drawningBoat = _collection[position];
             _collection[position] = null;
-            return temp;
-        }
-
-        public IEnumerable<T?> GetItems()
-        {
-            for (int i = 0; i < _collection.Length; ++i)
-            {
-                yield return _collection[i];
-            }
+            return drawningBoat;
         }
     }
 }

ProjectBus/ProjectBus/CollectionGenericObjects/StorageCollection.cs

@@ -1,218 +0,0 @@
-using ProjectBoat.Drawnings;
-using ProjectBoat.Exceptions;
-using System.Text;
-
-namespace ProjectBoat.CollectionGenericObjects
-{
-    // Класс-хранилище коллекций
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public class StorageCollection<T>
-        where T : DrawningBoat
-    {
-        /// <summary>
-        /// Словарь (хранилище) с коллекциями
-        /// </summary>
-        readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
-
-        /// <summary>
-        /// Возвращение списка названий коллекций
-        /// </summary>
-        public List<string> Keys => _storages.Keys.ToList();
-
-        /// <summary>
-        /// Ключевое слово, с которого должен начинаться файл
-        /// </summary>
-        private readonly string _collectionKey = "CollectionsStorage";
-
-        /// <summary>
-        /// Разделитель для записи ключа и значения элемента словаря
-        /// </summary>
-        private readonly string _separatorForKeyValue = "|";
-
-        /// <summary>
-        /// Разделитель для записей коллекции данных в файл
-        /// </summary>
-        private readonly string _separatorItems = ";";
-
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        public StorageCollection()
-        {
-            _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
-        }
-
-        /// <summary>
-        /// Добавление коллекции в хранилище
-        /// </summary>
-        /// <param name="name">Название коллекции</param>
-        /// <param name="collectionType">тип коллекции</param>
-        public void AddCollection(string name, CollectionType collectionType)
-        {
-            // TODO проверка, что name не пустой и нет в словаре записи с таким ключом
-            // TODO Прописать логику для добавления
-
-            if (_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>();
-        }
-
-        /// <summary>
-        /// Удаление коллекции
-        /// </summary>
-        /// <param name="name">Название коллекции</param>
-        public void DelCollection(string name)
-        {
-            // TODO Прописать логику для удаления коллекции
-            if (_storages.ContainsKey(name))
-                _storages.Remove(name);
-        }
-
-        /// <summary>
-        /// Доступ к коллекции
-        /// </summary>
-        /// <param name="name">Название коллекции</param>
-        /// <returns></returns>
-        public ICollectionGenericObjects<T>? this[string 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<string, 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.GetCollectionType);
-                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 != 4)
-                    {
-                        continue;
-                    }
-                    CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
-                    ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
-                    if (collection == null)
-                    {
-                        throw new InvalidOperationException("Не удалось определить тип коллекции:" + record[1]);
-                    }
-
-                    collection.MaxCount = Convert.ToInt32(record[2]);
-
-                    string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
-                    foreach (string elem in set)
-                    {
-                        if (elem?.CreateDrawningBoat() is T aircraft)
-                        {
-                            try
-                            {
-                                if (collection.Insert(aircraft) == -1)
-                                {
-                                    throw new InvalidOperationException("Объект не удалось добавить в коллекцию: " + record[3]);
-                                }
-                            }
-                            catch (CollectionOverflowException ex)
-                            {
-                                throw new CollectionOverflowException("Коллекция переполнена", ex);
-                            }
-                        }
-                    }
-                    _storages.Add(record[0], collection);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Создание коллекции по типу
-        /// </summary>
-        /// <param name="collectionType"></param>
-        /// <returns></returns>
-        private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
-        {
-            return collectionType switch
-            {
-                CollectionType.Massive => new MassiveGenericObjects<T>(),
-                CollectionType.List => new ListGenericObjects<T>(),
-                _ => null,
-            };
-        }
-    }
-}

ProjectBus/ProjectBus/Drawnings/DrawningBoat.cs

@@ -1,4 +1,5 @@
 using ProjectBoat.Entities;
+using System.Drawing.Drawing2D;
 
 namespace ProjectBoat.Drawnings;
 /// <summary>
@@ -28,10 +29,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;
@@ -56,7 +58,7 @@ public class DrawningBoat
     /// <summary>
     /// Пустой онструктор
     /// </summary>
-    public DrawningBoat()
+    private DrawningBoat()
     {
         _pictureWidth = null;
         _pictureHeight = null;
@@ -85,14 +87,6 @@ public class DrawningBoat
         _pictureHeight = drawningCarHeight;
     }
 
-    /// <summary>
-    /// конструктор
-    /// </summary>
-    /// <param name="entityBoat"></param>
-    public DrawningBoat(EntityBoat entityBoat)
-    {
-        EntityBoat = entityBoat;
-    }
     /// <summary>
     /// Установка границ поля
     /// </summary>
@@ -209,8 +203,8 @@ 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) };
+        //границы круисера
+        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);
 
@@ -222,10 +216,10 @@ 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/DrawningMBoat.cs

@@ -5,6 +5,7 @@ namespace ProjectBoat.Drawnings
 {
     public class DrawningMBoat : DrawningBoat
     {
+
         /// <summary>
         /// Конструктор
         /// </summary>
@@ -22,13 +23,6 @@ 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 ||
@@ -44,21 +38,20 @@ 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);
@@ -70,9 +63,6 @@ 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

@@ -1,50 +0,0 @@
-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,16 +18,13 @@ 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>
@@ -38,27 +35,4 @@ 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,10 +18,7 @@
         /// Дополнительный цвет (для опциональных элементов)
         /// </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;
@@ -29,30 +26,5 @@
             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

@@ -1,25 +0,0 @@
-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/ObjectNotFoundException.cs

@@ -1,27 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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/FormBoat.cs

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

ProjectBus/ProjectBus/FormBoatConfing.Designer.cs

@@ -1,392 +0,0 @@
-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();
-            checkBoxWeapon = new CheckBox();
-            checkBoxBoat = new CheckBox();
-            checkBoxHelicopterArea = 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(checkBoxWeapon);
-            groupBoxConfing.Controls.Add(checkBoxBoat);
-            groupBoxConfing.Controls.Add(checkBoxHelicopterArea);
-            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.Margin = new Padding(3, 2, 3, 2);
-            groupBoxConfing.Name = "groupBoxConfing";
-            groupBoxConfing.Padding = new Padding(3, 2, 3, 2);
-            groupBoxConfing.Size = new Size(548, 196);
-            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(286, 20);
-            groupBoxColors.Margin = new Padding(3, 2, 3, 2);
-            groupBoxColors.Name = "groupBoxColors";
-            groupBoxColors.Padding = new Padding(3, 2, 3, 2);
-            groupBoxColors.Size = new Size(245, 116);
-            groupBoxColors.TabIndex = 9;
-            groupBoxColors.TabStop = false;
-            groupBoxColors.Text = "Цвета";
-            // 
-            // panelPurple
-            // 
-            panelPurple.BackColor = Color.Purple;
-            panelPurple.Location = new Point(190, 72);
-            panelPurple.Margin = new Padding(3, 2, 3, 2);
-            panelPurple.Name = "panelPurple";
-            panelPurple.Size = new Size(42, 35);
-            panelPurple.TabIndex = 1;
-            // 
-            // panelBlack
-            // 
-            panelBlack.BackColor = Color.Black;
-            panelBlack.Location = new Point(130, 72);
-            panelBlack.Margin = new Padding(3, 2, 3, 2);
-            panelBlack.Name = "panelBlack";
-            panelBlack.Size = new Size(42, 35);
-            panelBlack.TabIndex = 1;
-            // 
-            // panelGray
-            // 
-            panelGray.BackColor = Color.Gray;
-            panelGray.Location = new Point(72, 72);
-            panelGray.Margin = new Padding(3, 2, 3, 2);
-            panelGray.Name = "panelGray";
-            panelGray.Size = new Size(42, 35);
-            panelGray.TabIndex = 1;
-            // 
-            // panelWhite
-            // 
-            panelWhite.BackColor = Color.White;
-            panelWhite.Location = new Point(15, 72);
-            panelWhite.Margin = new Padding(3, 2, 3, 2);
-            panelWhite.Name = "panelWhite";
-            panelWhite.Size = new Size(42, 35);
-            panelWhite.TabIndex = 1;
-            // 
-            // panelYellow
-            // 
-            panelYellow.BackColor = Color.Yellow;
-            panelYellow.Location = new Point(190, 23);
-            panelYellow.Margin = new Padding(3, 2, 3, 2);
-            panelYellow.Name = "panelYellow";
-            panelYellow.Size = new Size(42, 35);
-            panelYellow.TabIndex = 1;
-            // 
-            // panelBlue
-            // 
-            panelBlue.BackColor = Color.Blue;
-            panelBlue.Location = new Point(130, 23);
-            panelBlue.Margin = new Padding(3, 2, 3, 2);
-            panelBlue.Name = "panelBlue";
-            panelBlue.Size = new Size(42, 35);
-            panelBlue.TabIndex = 1;
-            // 
-            // panelGreen
-            // 
-            panelGreen.BackColor = Color.Green;
-            panelGreen.Location = new Point(72, 23);
-            panelGreen.Margin = new Padding(3, 2, 3, 2);
-            panelGreen.Name = "panelGreen";
-            panelGreen.Size = new Size(42, 35);
-            panelGreen.TabIndex = 1;
-            // 
-            // panelRed
-            // 
-            panelRed.BackColor = Color.Red;
-            panelRed.Location = new Point(15, 23);
-            panelRed.Margin = new Padding(3, 2, 3, 2);
-            panelRed.Name = "panelRed";
-            panelRed.Size = new Size(42, 35);
-            panelRed.TabIndex = 0;
-            // 
-            // checkBoxWeapon
-            // 
-            checkBoxWeapon.AutoSize = true;
-            checkBoxWeapon.Location = new Point(5, 163);
-            checkBoxWeapon.Margin = new Padding(3, 2, 3, 2);
-            checkBoxWeapon.Name = "checkBoxWeapon";
-            checkBoxWeapon.Size = new Size(162, 19);
-            checkBoxWeapon.TabIndex = 8;
-            checkBoxWeapon.Text = "Признак наличие стекла";
-            checkBoxWeapon.UseVisualStyleBackColor = true;
-            // 
-            // checkBoxBoat
-            // 
-            checkBoxBoat.AutoSize = true;
-            checkBoxBoat.Location = new Point(5, 127);
-            checkBoxBoat.Margin = new Padding(3, 2, 3, 2);
-            checkBoxBoat.Name = "checkBoxBoat";
-            checkBoxBoat.Size = new Size(157, 19);
-            checkBoxBoat.TabIndex = 7;
-            checkBoxBoat.Text = "Признак наличие весел";
-            checkBoxBoat.UseVisualStyleBackColor = true;
-            // 
-            // checkBoxHelicopterArea
-            // 
-            checkBoxHelicopterArea.AutoSize = true;
-            checkBoxHelicopterArea.Location = new Point(5, 92);
-            checkBoxHelicopterArea.Margin = new Padding(3, 2, 3, 2);
-            checkBoxHelicopterArea.Name = "checkBoxHelicopterArea";
-            checkBoxHelicopterArea.Size = new Size(167, 19);
-            checkBoxHelicopterArea.TabIndex = 6;
-            checkBoxHelicopterArea.Text = "Признак наличие мотора";
-            checkBoxHelicopterArea.UseVisualStyleBackColor = true;
-            // 
-            // numericUpDownWeight
-            // 
-            numericUpDownWeight.Location = new Point(82, 51);
-            numericUpDownWeight.Margin = new Padding(3, 2, 3, 2);
-            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(100, 23);
-            numericUpDownWeight.TabIndex = 5;
-            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
-            // 
-            // labelWeight
-            // 
-            labelWeight.AutoSize = true;
-            labelWeight.Location = new Point(24, 52);
-            labelWeight.Name = "labelWeight";
-            labelWeight.Size = new Size(29, 15);
-            labelWeight.TabIndex = 4;
-            labelWeight.Text = "Вес:";
-            // 
-            // numericUpDownSpeed
-            // 
-            numericUpDownSpeed.Location = new Point(82, 24);
-            numericUpDownSpeed.Margin = new Padding(3, 2, 3, 2);
-            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(100, 23);
-            numericUpDownSpeed.TabIndex = 3;
-            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
-            // 
-            // labelSpeed
-            // 
-            labelSpeed.AutoSize = true;
-            labelSpeed.Location = new Point(10, 24);
-            labelSpeed.Name = "labelSpeed";
-            labelSpeed.Size = new Size(62, 15);
-            labelSpeed.TabIndex = 2;
-            labelSpeed.Text = "Скорость:";
-            // 
-            // labelModifiedObject
-            // 
-            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
-            labelModifiedObject.Location = new Point(416, 152);
-            labelModifiedObject.Name = "labelModifiedObject";
-            labelModifiedObject.Size = new Size(115, 34);
-            labelModifiedObject.TabIndex = 1;
-            labelModifiedObject.Text = "Продвинутый";
-            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
-            labelModifiedObject.MouseDown += labelObject_MouseDown;
-            // 
-            // labelSimpleObject
-            // 
-            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
-            labelSimpleObject.Location = new Point(286, 152);
-            labelSimpleObject.Name = "labelSimpleObject";
-            labelSimpleObject.Size = new Size(114, 34);
-            labelSimpleObject.TabIndex = 0;
-            labelSimpleObject.Text = "Простой";
-            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
-            labelSimpleObject.MouseDown += labelObject_MouseDown;
-            // 
-            // pictureBoxObject
-            // 
-            pictureBoxObject.Location = new Point(10, 42);
-            pictureBoxObject.Margin = new Padding(3, 2, 3, 2);
-            pictureBoxObject.Name = "pictureBoxObject";
-            pictureBoxObject.Size = new Size(160, 94);
-            pictureBoxObject.TabIndex = 1;
-            pictureBoxObject.TabStop = false;
-            // 
-            // buttonAdd
-            // 
-            buttonAdd.Location = new Point(553, 159);
-            buttonAdd.Margin = new Padding(3, 2, 3, 2);
-            buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(82, 22);
-            buttonAdd.TabIndex = 2;
-            buttonAdd.Text = "Добавить";
-            buttonAdd.UseVisualStyleBackColor = true;
-            buttonAdd.Click += buttonAdd_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(648, 159);
-            buttonCancel.Margin = new Padding(3, 2, 3, 2);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(82, 22);
-            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(553, 9);
-            panelObject.Margin = new Padding(3, 2, 3, 2);
-            panelObject.Name = "panelObject";
-            panelObject.Size = new Size(179, 146);
-            panelObject.TabIndex = 4;
-            panelObject.DragDrop += PanelObject_DragDrop;
-            panelObject.DragEnter += PanelObject_DragEnter;
-            // 
-            // labelAdditionalColor
-            // 
-            labelAdditionalColor.AllowDrop = true;
-            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
-            labelAdditionalColor.Location = new Point(94, 8);
-            labelAdditionalColor.Name = "labelAdditionalColor";
-            labelAdditionalColor.Size = new Size(73, 28);
-            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(10, 8);
-            labelBodyColor.Name = "labelBodyColor";
-            labelBodyColor.Size = new Size(73, 28);
-            labelBodyColor.TabIndex = 2;
-            labelBodyColor.Text = "Цвет";
-            labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
-            labelBodyColor.DragDrop += labelBodyColor_DragDrop;
-            labelBodyColor.DragEnter += labelBodyColor_DragEnter;
-            // 
-            // FormBoatConfing
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(733, 196);
-            Controls.Add(panelObject);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonAdd);
-            Controls.Add(groupBoxConfing);
-            Margin = new Padding(3, 2, 3, 2);
-            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 checkBoxHelicopterArea;
-        private CheckBox checkBoxBoat;
-        private CheckBox checkBoxWeapon;
-        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/FormBoatConfing.cs

@@ -1,177 +0,0 @@
-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>
-        /// <param name="e"></param>
-        private void labelObject_MouseDown(object sender, MouseEventArgs e)
-        {
-            (sender as Label)?.DoDragDrop((sender as Label)?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy);
-        }
-
-        /// <summary>
-        /// Проверка получаемой информации (ее типа на соответствие требуемому)
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void PanelObject_DragEnter(object sender, DragEventArgs e)
-        {
-            e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
-
-        }
-
-        /// <summary>
-        /// Действия при приеме перетаскиваемой информации
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void PanelObject_DragDrop(object sender, DragEventArgs e)
-        {
-            switch (e.Data?.GetData(DataFormats.Text)?.ToString())
-            {
-                case "labelSimpleObject":
-                    _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, checkBoxHelicopterArea.Checked, checkBoxBoat.Checked, checkBoxWeapon.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/FormBoatConfing.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ProjectBus/ProjectBus/FormBoatsCollection.Designer.cs

@@ -29,213 +29,59 @@
         private void InitializeComponent()
         {
             groupBoxTools = new GroupBox();
-            buttonCreateCompany = new Button();
-            panelStorage = new Panel();
-            buttonCollectionDel = new Button();
-            listBoxCollection = new ListBox();
-            buttonCollecctionAdd = new Button();
-            radioButtonList = new RadioButton();
-            radioButtonMassive = new RadioButton();
-            textBoxCollectionName = new TextBox();
-            labelCollectionName = new Label();
-            comboBoxSelectorCompany = new ComboBox();
-            panelCompanyTools = new Panel();
-            ButtonAddBoat = new Button();
-            buttonRefresh = new Button();
-            ButtonRemoveBoat = new Button();
             maskedTextBoxPosision = new MaskedTextBox();
+            buttonRefresh = new Button();
             buttonGetToTest = new Button();
+            ButtonRemoveBoat = new Button();
+            ButtonAddMBoat = new Button();
+            ButtonAddBoat = new Button();
+            comboBoxSelectorCompany = new ComboBox();
             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
             // 
-            groupBoxTools.Controls.Add(buttonCreateCompany);
-            groupBoxTools.Controls.Add(panelStorage);
+            groupBoxTools.Controls.Add(maskedTextBoxPosision);
+            groupBoxTools.Controls.Add(buttonRefresh);
+            groupBoxTools.Controls.Add(buttonGetToTest);
+            groupBoxTools.Controls.Add(ButtonRemoveBoat);
+            groupBoxTools.Controls.Add(ButtonAddMBoat);
+            groupBoxTools.Controls.Add(ButtonAddBoat);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
-            groupBoxTools.Controls.Add(panelCompanyTools);
             groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(631, 28);
+            groupBoxTools.Location = new Point(596, 0);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(222, 651);
+            groupBoxTools.Size = new Size(222, 574);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "инструменты";
             // 
-            // buttonCreateCompany
+            // maskedTextBoxPosision
             // 
-            buttonCreateCompany.Location = new Point(21, 345);
-            buttonCreateCompany.Name = "buttonCreateCompany";
-            buttonCreateCompany.Size = new Size(186, 27);
-            buttonCreateCompany.TabIndex = 7;
-            buttonCreateCompany.Text = "Создать компанию";
-            buttonCreateCompany.UseVisualStyleBackColor = true;
-            buttonCreateCompany.Click += ButtonCreateCompany_Click;
-            // 
-            // panelStorage
-            // 
-            panelStorage.Controls.Add(buttonCollectionDel);
-            panelStorage.Controls.Add(listBoxCollection);
-            panelStorage.Controls.Add(buttonCollecctionAdd);
-            panelStorage.Controls.Add(radioButtonList);
-            panelStorage.Controls.Add(radioButtonMassive);
-            panelStorage.Controls.Add(textBoxCollectionName);
-            panelStorage.Controls.Add(labelCollectionName);
-            panelStorage.Dock = DockStyle.Top;
-            panelStorage.Location = new Point(3, 23);
-            panelStorage.Name = "panelStorage";
-            panelStorage.Size = new Size(216, 283);
-            panelStorage.TabIndex = 6;
-            // 
-            // buttonCollectionDel
-            // 
-            buttonCollectionDel.Location = new Point(17, 247);
-            buttonCollectionDel.Name = "buttonCollectionDel";
-            buttonCollectionDel.Size = new Size(186, 27);
-            buttonCollectionDel.TabIndex = 6;
-            buttonCollectionDel.Text = "Удалить коллекцию";
-            buttonCollectionDel.UseVisualStyleBackColor = true;
-            buttonCollectionDel.Click += ButtonCollectionDel_Click;
-            // 
-            // listBoxCollection
-            // 
-            listBoxCollection.FormattingEnabled = true;
-            listBoxCollection.ItemHeight = 20;
-            listBoxCollection.Location = new Point(17, 137);
-            listBoxCollection.Name = "listBoxCollection";
-            listBoxCollection.Size = new Size(186, 104);
-            listBoxCollection.TabIndex = 5;
-            // 
-            // buttonCollecctionAdd
-            // 
-            buttonCollecctionAdd.Location = new Point(17, 104);
-            buttonCollecctionAdd.Name = "buttonCollecctionAdd";
-            buttonCollecctionAdd.Size = new Size(186, 27);
-            buttonCollecctionAdd.TabIndex = 4;
-            buttonCollecctionAdd.Text = "Добавить коллекцию";
-            buttonCollecctionAdd.UseVisualStyleBackColor = true;
-            buttonCollecctionAdd.Click += ButtonCollecctionAdd_Click;
-            // 
-            // radioButtonList
-            // 
-            radioButtonList.AutoSize = true;
-            radioButtonList.Location = new Point(123, 75);
-            radioButtonList.Name = "radioButtonList";
-            radioButtonList.Size = new Size(80, 24);
-            radioButtonList.TabIndex = 3;
-            radioButtonList.TabStop = true;
-            radioButtonList.Text = "Список";
-            radioButtonList.UseVisualStyleBackColor = true;
-            // 
-            // radioButtonMassive
-            // 
-            radioButtonMassive.AutoSize = true;
-            radioButtonMassive.Location = new Point(17, 75);
-            radioButtonMassive.Name = "radioButtonMassive";
-            radioButtonMassive.Size = new Size(82, 24);
-            radioButtonMassive.TabIndex = 2;
-            radioButtonMassive.TabStop = true;
-            radioButtonMassive.Text = "Массив";
-            radioButtonMassive.UseVisualStyleBackColor = true;
-            // 
-            // textBoxCollectionName
-            // 
-            textBoxCollectionName.Location = new Point(17, 32);
-            textBoxCollectionName.Name = "textBoxCollectionName";
-            textBoxCollectionName.Size = new Size(186, 27);
-            textBoxCollectionName.TabIndex = 1;
-            // 
-            // labelCollectionName
-            // 
-            labelCollectionName.AutoSize = true;
-            labelCollectionName.Location = new Point(26, 9);
-            labelCollectionName.Name = "labelCollectionName";
-            labelCollectionName.Size = new Size(155, 20);
-            labelCollectionName.TabIndex = 0;
-            labelCollectionName.Text = "Название коллекции";
-            // 
-            // comboBoxSelectorCompany
-            // 
-            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
-            comboBoxSelectorCompany.FormattingEnabled = true;
-            comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(21, 311);
-            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
-            comboBoxSelectorCompany.Size = new Size(186, 28);
-            comboBoxSelectorCompany.TabIndex = 0;
-            comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged_1;
-            // 
-            // panelCompanyTools
-            // 
-            panelCompanyTools.Controls.Add(ButtonAddBoat);
-            panelCompanyTools.Controls.Add(buttonRefresh);
-            panelCompanyTools.Controls.Add(ButtonRemoveBoat);
-            panelCompanyTools.Controls.Add(maskedTextBoxPosision);
-            panelCompanyTools.Controls.Add(buttonGetToTest);
-            panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(3, 379);
-            panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(216, 274);
-            panelCompanyTools.TabIndex = 8;
-            // 
-            // ButtonAddBoat
-            // 
-            ButtonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            ButtonAddBoat.BackgroundImageLayout = ImageLayout.Center;
-            ButtonAddBoat.Location = new Point(18, 3);
-            ButtonAddBoat.Name = "ButtonAddBoat";
-            ButtonAddBoat.Size = new Size(186, 40);
-            ButtonAddBoat.TabIndex = 1;
-            ButtonAddBoat.Text = "добваление лодки";
-            ButtonAddBoat.UseVisualStyleBackColor = true;
-            ButtonAddBoat.Click += ButtonAddBoat_Click;
+            maskedTextBoxPosision.Location = new Point(20, 229);
+            maskedTextBoxPosision.Mask = "00";
+            maskedTextBoxPosision.Name = "maskedTextBoxPosision";
+            maskedTextBoxPosision.Size = new Size(186, 27);
+            maskedTextBoxPosision.TabIndex = 2;
+            maskedTextBoxPosision.ValidatingType = typeof(int);
             // 
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(18, 227);
+            buttonRefresh.Location = new Point(20, 479);
             buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(186, 41);
+            buttonRefresh.Size = new Size(186, 40);
             buttonRefresh.TabIndex = 5;
             buttonRefresh.Text = "обновить";
             buttonRefresh.UseVisualStyleBackColor = true;
             buttonRefresh.Click += ButtonRefresh_Click;
             // 
-            // ButtonRemoveBoat
-            // 
-            ButtonRemoveBoat.Anchor = AnchorStyles.Right;
-            ButtonRemoveBoat.Location = new Point(18, 138);
-            ButtonRemoveBoat.Name = "ButtonRemoveBoat";
-            ButtonRemoveBoat.Size = new Size(186, 40);
-            ButtonRemoveBoat.TabIndex = 3;
-            ButtonRemoveBoat.Text = "удалить лодку";
-            ButtonRemoveBoat.UseVisualStyleBackColor = true;
-            ButtonRemoveBoat.Click += ButtonRemoveBoat_Click;
-            // 
-            // maskedTextBoxPosision
-            // 
-            maskedTextBoxPosision.Location = new Point(17, 105);
-            maskedTextBoxPosision.Mask = "00";
-            maskedTextBoxPosision.Name = "maskedTextBoxPosision";
-            maskedTextBoxPosision.Size = new Size(187, 27);
-            maskedTextBoxPosision.TabIndex = 2;
-            maskedTextBoxPosision.ValidatingType = typeof(int);
-            // 
             // buttonGetToTest
             // 
             buttonGetToTest.Anchor = AnchorStyles.Right;
-            buttonGetToTest.Location = new Point(18, 184);
+            buttonGetToTest.Location = new Point(20, 366);
             buttonGetToTest.Name = "buttonGetToTest";
             buttonGetToTest.Size = new Size(186, 40);
             buttonGetToTest.TabIndex = 4;
@@ -243,104 +89,85 @@
             buttonGetToTest.UseVisualStyleBackColor = true;
             buttonGetToTest.Click += ButtonGetToTest_Click;
             // 
+            // ButtonRemoveBoat
+            // 
+            ButtonRemoveBoat.Anchor = AnchorStyles.Right;
+            ButtonRemoveBoat.Location = new Point(20, 271);
+            ButtonRemoveBoat.Name = "ButtonRemoveBoat";
+            ButtonRemoveBoat.Size = new Size(186, 40);
+            ButtonRemoveBoat.TabIndex = 3;
+            ButtonRemoveBoat.Text = "удалить крейсер";
+            ButtonRemoveBoat.UseVisualStyleBackColor = true;
+            ButtonRemoveBoat.Click += ButtonRemoveBoat_Click;
+            // 
+            // ButtonAddMBoat
+            // 
+            ButtonAddMBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            ButtonAddMBoat.Location = new Point(20, 152);
+            ButtonAddMBoat.Name = "ButtonAddMBoat";
+            ButtonAddMBoat.Size = new Size(186, 50);
+            ButtonAddMBoat.TabIndex = 2;
+            ButtonAddMBoat.Text = "добваление военного крейсера";
+            ButtonAddMBoat.UseVisualStyleBackColor = true;
+            ButtonAddMBoat.Click += ButtonAddMBoat_Click;
+            // 
+            // ButtonAddBoat
+            // 
+            ButtonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            ButtonAddBoat.BackgroundImageLayout = ImageLayout.Center;
+            ButtonAddBoat.Location = new Point(20, 106);
+            ButtonAddBoat.Name = "ButtonAddBoat";
+            ButtonAddBoat.Size = new Size(186, 40);
+            ButtonAddBoat.TabIndex = 1;
+            ButtonAddBoat.Text = "добваление крейсера";
+            ButtonAddBoat.UseVisualStyleBackColor = true;
+            ButtonAddBoat.Click += ButtonAddBoat_Click;
+            // 
+            // comboBoxSelectorCompany
+            // 
+            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxSelectorCompany.FormattingEnabled = true;
+            comboBoxSelectorCompany.Items.AddRange(new object[] { "хранилище" });
+            comboBoxSelectorCompany.Location = new Point(20, 26);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(186, 28);
+            comboBoxSelectorCompany.TabIndex = 0;
+            comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged_1;
+            // 
             // pictureBoxBoat
             // 
             pictureBoxBoat.Dock = DockStyle.Fill;
-            pictureBoxBoat.Location = new Point(0, 28);
+            pictureBoxBoat.Location = new Point(0, 0);
             pictureBoxBoat.Name = "pictureBoxBoat";
-            pictureBoxBoat.Size = new Size(631, 651);
+            pictureBoxBoat.Size = new Size(596, 574);
             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.Size = new Size(853, 28);
-            menuStrip.TabIndex = 2;
-            menuStrip.Text = "menuStrip1";
-            // 
-            // файлToolStripMenuItem
-            // 
-            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
-            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
-            файлToolStripMenuItem.Size = new Size(59, 24);
-            файлToolStripMenuItem.Text = "Файл";
-            // 
-            // saveToolStripMenuItem
-            // 
-            saveToolStripMenuItem.Name = "saveToolStripMenuItem";
-            saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
-            saveToolStripMenuItem.Size = new Size(227, 26);
-            saveToolStripMenuItem.Text = "Сохранение";
-            saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
-            // 
-            // loadToolStripMenuItem
-            // 
-            loadToolStripMenuItem.Name = "loadToolStripMenuItem";
-            loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
-            loadToolStripMenuItem.Size = new Size(227, 26);
-            loadToolStripMenuItem.Text = "Загрузка";
-            loadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
-            // 
-            // saveFileDialog
-            // 
-            saveFileDialog.Filter = "txt file|*.txt";
-            // 
-            // openFileDialog
-            // 
-            openFileDialog.Filter = "txt file|*.txt";
-            // 
             // FormBoatsCollection
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(853, 679);
+            ClientSize = new Size(818, 574);
             Controls.Add(pictureBoxBoat);
             Controls.Add(groupBoxTools);
-            Controls.Add(menuStrip);
-            MainMenuStrip = menuStrip;
             Name = "FormBoatsCollection";
             Text = "FormBoatsCollection";
             groupBoxTools.ResumeLayout(false);
-            panelStorage.ResumeLayout(false);
-            panelStorage.PerformLayout();
-            panelCompanyTools.ResumeLayout(false);
-            panelCompanyTools.PerformLayout();
+            groupBoxTools.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;
         private Button buttonGetToTest;
         private PictureBox pictureBoxBoat;
         private MaskedTextBox maskedTextBoxPosision;
-        private Panel panelStorage;
-        private TextBox textBoxCollectionName;
-        private Label labelCollectionName;
-        private ListBox listBoxCollection;
-        private Button buttonCollecctionAdd;
-        private RadioButton radioButtonList;
-        private RadioButton radioButtonMassive;
-        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;
     }
 }

ProjectBus/ProjectBus/FormBoatsCollection.cs

@@ -1,34 +1,20 @@
-using Microsoft.Extensions.Logging;
-using ProjectBoat.CollectionGenericObjects;
+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>
-        private readonly ILogger _logger;
-
         /// <summary>
         /// Конструктор
         /// </summary>
-        public FormBoatsCollection(ILogger<FormBoatsCollection> logger)
+        public FormBoatsCollection()
         {
             InitializeComponent();
-            _storageCollection = new();
-            _logger = logger;
         }
 
         /// <summary>
@@ -38,53 +24,83 @@ namespace ProjectBoat
         /// <param name="e"></param>
         private void comboBoxSelectorCompany_SelectedIndexChanged_1(object sender, EventArgs e)
         {
-            panelCompanyTools.Enabled = false;
+            switch (comboBoxSelectorCompany.Text)
+            {
+                case "хранилище":
+                    _company = new BoatDockingService(pictureBoxBoat.Width,
+                    pictureBoxBoat.Height, new MassiveGenericObjects<DrawningBoat>());
+                    break;
+            }
         }
 
         /// <summary>
-        /// добавление лодки
+        /// Создание объекта класса-перемещения
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonAddBoat_Click(object sender, EventArgs e)
+        /// <param name="type">Тип создаваемого объекта</param>
+        private void CreateObject(string type)
         {
-            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)
+            if (_company == null)
             {
                 return;
             }
-            try
+            Random random = new();
+            DrawningBoat drawningBoat;
+            switch (type)
             {
-                var res = _company + boat;
-                MessageBox.Show("Объект добавлен");
-                _logger.LogInformation($"Объект добавлен под индексом {res}");
+                case nameof(DrawningBoat):
+                    drawningBoat = new DrawningBoat(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
+                    break;
+                case nameof(DrawningMBoat):
+                    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();
             }
-            catch (Exception ex)
+            else
             {
-                MessageBox.Show($"Объект не добавлен: {ex.Message}", "Результат", MessageBoxButtons.OK,
-                    MessageBoxIcon.Error);
-                _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
+                MessageBox.Show("не удалось добавить объект");
             }
         }
 
         /// <summary>
-        /// Удаление объекта
+        /// Получение цвета
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <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)
@@ -97,18 +113,14 @@ namespace ProjectBoat
                 return;
             }
             int pos = Convert.ToInt32(maskedTextBoxPosision.Text);
-            try
+            if (_company - pos != null)
             {
-                var res = _company - pos;
-                MessageBox.Show("Объект удален");
-                _logger.LogInformation($"Объект удален под индексом {pos}");
+                MessageBox.Show("объект удален");
                 pictureBoxBoat.Image = _company.Show();
             }
-            catch (Exception ex)
+            else
             {
-                MessageBox.Show(ex.Message, "Не удалось удалить объект",
-                    MessageBoxButtons.OK, MessageBoxIcon.Error);
-                _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
+                MessageBox.Show("не удалось удалить объект");
             }
         }
 
@@ -119,24 +131,24 @@ namespace ProjectBoat
                 return;
             }
 
-            DrawningBoat? boat = null;
+            DrawningBoat? cruiser = null;
             int counter = 100;
-            while (boat == null)
+            while (cruiser == null)
             {
-                boat = _company.GetRandomObject();
+                cruiser = _company.GetRandomObject();
                 counter--;
                 if (counter <= 0)
                 {
                     break;
                 }
             }
-            if (boat == null)
+            if (cruiser == null)
             {
                 return;
             }
             FormBoat form = new()
             {
-                SetBoat = boat
+                SetBoat = cruiser
             };
             form.ShowDialog();
 
@@ -152,155 +164,6 @@ namespace ProjectBoat
             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;
-            }
 
-            try
-            {
-                _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
-                _logger.LogInformation("Добавление коллекции");
-                RerfreshListBoxItems();
-            }
-            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 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());
-            _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];
-                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);
-                    _logger.LogInformation("Компания создана");
-                    break;
-            }
-            panelCompanyTools.Enabled = true;
-
-        }
-
-        /// <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);
-                }
-            }
-        }
     }
 }

ProjectBus/ProjectBus/FormBoatsCollection.resx

@@ -117,16 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 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/MovementStrategy/MoveableBoat.cs

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

ProjectBus/ProjectBus/Program.cs

@@ -1,8 +1,3 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Serilog;
-
 namespace ProjectBoat
 {
     internal static class Program
@@ -15,31 +10,7 @@ namespace ProjectBoat
         {
             // To customize application configuration such as set high DPI settings or default font, see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            ServiceCollection services = new();
-            ConfigureServices(services);
-            using ServiceProvider serviceProvider = services.BuildServiceProvider();
-            Application.Run(serviceProvider.GetRequiredService<FormBoatsCollection>());
+            Application.Run(new 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,21 +2,10 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.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,15 +8,4 @@
     <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

@@ -1,14 +0,0 @@
-<?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

@@ -1,20 +0,0 @@
-{
-  "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"
-    }
-  }
-}