переделал метод прорисовки заднего фона

AirBomber/AirBomber.csproj

@@ -8,6 +8,15 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

AirBomber/ClassDelegate.cs

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

AirBomber/CollectionGenericObjects/AbstractCompany.cs

@@ -40,7 +40,7 @@ public abstract class AbstractCompany
     /// <summary>
     /// Вычисление максимального количества элементов, который можно разместить в окне
     /// </summary>
-    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+    private int GetMaxCount => (_pictureWidth / _placeSizeWidth) * (_pictureHeight / _placeSizeHeight);
 
     /// <summary>
     /// Конструктор
@@ -62,9 +62,9 @@ public abstract class AbstractCompany
     /// <param name="company">Компания</param>
     /// <param name="boat">Добавляемый объект</param>
     /// <returns></returns>
-    public static int operator +(AbstractCompany company, DrawningAirPlane boat)
+    public static int operator +(AbstractCompany company, DrawningAirPlane airPlane)
     {
-        return company._collection?.Insert(boat) ?? -1;
+        return company._collection?.Insert(airPlane) ?? -1;
     }
 
     /// <summary>
@@ -101,8 +101,13 @@ public abstract class AbstractCompany
         SetObjectsPosition();
         for (int i = 0; i < (_collection?.Count ?? 0); ++i)
         {
-            DrawningAirPlane? obj = _collection?.Get(i);
-            obj?.DrawTransport(graphics);
+            try
+            {
+                DrawningAirPlane? obj = _collection?.Get(i);
+                obj?.DrawTransport(graphics);
+            }
+            catch (Exception) { }
+
         }
 
         return bitmap;
@@ -118,4 +123,4 @@ public abstract class AbstractCompany
     /// Расстановка объектов
     /// </summary>
     protected abstract void SetObjectsPosition();
-}
+}

AirBomber/CollectionGenericObjects/AirPlaneSharingService.cs

@@ -32,10 +32,12 @@ public class AirPlaneSharingService : AbstractCompany
         int offsetX = 10, offsetY = -12;
         int x = _pictureWidth - _placeSizeWidth, y = offsetY;
         numRows = 0;
-        while (y + _placeSizeHeight <= _pictureHeight)
+        
+        int adjustedHeight = _pictureHeight - (_placeSizeHeight + 5 + offsetY);
+        while (y + _placeSizeHeight <= adjustedHeight)
         {
             int numCols = 0;
-            int initialX = x; // сохраняем начальное значение x
+            int initialX = x;
             while (x >= 0)
             {
                 numCols++;
@@ -45,12 +47,13 @@ public class AirPlaneSharingService : AbstractCompany
                 x -= _placeSizeWidth + 2;
             }
             numRows++;
-            x = initialX; // возвращаем x к начальному значению после завершения строки
+            x = initialX; 
             y += _placeSizeHeight + 5 + offsetY;
         }
-        numCols = numCols; // сохраняем значение numCols для использования в других методах
+        numCols = numCols; 
     }
 
+
     protected override void SetObjectsPosition()
     {
         if (locCoord == null || _collection == null)
@@ -60,8 +63,12 @@ public class AirPlaneSharingService : AbstractCompany
         int row = numRows - 1, col = numCols;
         for (int i = 0; i < _collection?.Count; i++, col--)
         {
-            _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
-            _collection?.Get(i)?.SetPosition(locCoord[row * numCols - col].Item1 + 5, locCoord[row * numCols - col].Item2 + 9);
+            try
+            {
+                _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
+                _collection?.Get(i)?.SetPosition(locCoord[row * numCols - col].Item1 + 5, locCoord[row * numCols - col].Item2 + 9);
+            }
+            catch (Exception) { }
             if (col == 1)
             {
                 col = numCols + 1;

AirBomber/CollectionGenericObjects/ListGenericObjects.cs

@@ -1,4 +1,5 @@
-using System;
+using AirBomber.Exceptions;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -40,30 +41,24 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T? Get(int position)
     {
-        if (position >= 0 && position < Count)
-        {
-            return _collection[position];
-        }
-        else
-        {
-            return null;
-        }
-
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
+        return _collection[position];
     }
 
     public int Insert(T obj)
     {
-        if (Count == _maxCount) { return -1; }
+        if (Count == _maxCount) throw new CollectionOverflowException(Count);
         _collection.Add(obj);
         return Count;
     }
 
     public int Insert(T obj, int position)
     {
-        if (position < 0 || position >= Count || Count == _maxCount)
-        {
-            return -1;
-        }
+        if (position < 0 || position >= Count)
+            throw new PositionOutOfCollectionException(position);
+
+        if (Count == _maxCount)
+            throw new CollectionOverflowException(Count);
         _collection.Insert(position, obj);
         return position;
 
@@ -71,7 +66,7 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T Remove(int position)
     {
-        if (position >= Count || position < 0) return null;
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
         T obj = _collection[position];
         _collection.RemoveAt(position);
         return obj;
@@ -84,4 +79,4 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
             yield return _collection[i];
         }
     }
-}
+}

AirBomber/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,4 +1,5 @@
-using System;
+using AirBomber.Exceptions;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -49,12 +50,9 @@ where T : class
 
     public T? Get(int position)
     {
-        if (position >= 0 && position < Count)
-        {
-            return _collection[position];
-        }
-
-        return null;
+        if (position >= _collection.Length || position < 0) throw new PositionOutOfCollectionException(position);
+        if (_collection[position] == null) throw new ObjectNotFoundException(position);
+        return _collection[position];
     }
 
     public int Insert(T obj)
@@ -67,14 +65,14 @@ where T : class
                 return i;
             }
         }
-        return -1;
+        throw new CollectionOverflowException(Count);
     }
 
     public int Insert(T obj, int position)
     {
         if (position < 0 || position >= Count)
         {
-            return -1;
+            throw new PositionOutOfCollectionException(position);
         }
         if (_collection[position] == null)
         {
@@ -99,15 +97,16 @@ where T : class
             }
         }
 
-        return -1;
+        throw new CollectionOverflowException(Count);
     }
 
     public T Remove(int position)
     {
         if (position < 0 || position >= Count)
         {
-            return null;
+            throw new PositionOutOfCollectionException(position);
         }
+        if (_collection[position] == null) throw new ObjectNotFoundException(position);
         T obj = _collection[position];
         _collection[position] = null;
         return obj;
@@ -120,4 +119,4 @@ where T : class
             yield return _collection[i];
         }
     }
-}
+}

AirBomber/CollectionGenericObjects/StorageCollection.cs

@@ -1,4 +1,5 @@
 using AirBomber.Drawnings;
+using AirBomber.Exceptions;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -105,11 +106,11 @@ public class StorageCollection<T>
 	/// </summary>
 	/// <param name="filename">Путь и имя файла</param>
 	/// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
-    public bool SaveData(string filename)
+    public void SaveData(string filename)
     {
         if (_storages.Count == 0)
         {
-            return false;
+            throw new Exception("В хранилище отсутствуют коллекции для сохранения");
         }
 
         if (File.Exists(filename))
@@ -145,7 +146,6 @@ public class StorageCollection<T>
                 sb.Clear();
             }
         }
-        return true;
     }
 
     /// <summary>
@@ -153,19 +153,21 @@ public class StorageCollection<T>
 	/// </summary>
 	/// <param name="filename">Путь и имя файла</param>
 	/// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
-	public bool LoadData(string filename)
+	public void LoadData(string filename)
     {
         if (!File.Exists(filename))
         {
-            return false;
+            throw new Exception("Файл не существует");
         }
 
         using (StreamReader sr = new StreamReader(filename))
         {
             string? str;
             str = sr.ReadLine();
+            if (str == null || str.Length == 0)
+                throw new Exception("В файле нет данных");
             if (str != _collectionKey.ToString())
-                return false;
+                throw new Exception("В файле неверные данные");
             _storages.Clear();
             while ((str = sr.ReadLine()) != null)
             {
@@ -178,7 +180,7 @@ public class StorageCollection<T>
                 ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
                 if (collection == null)
                 {
-                    return false;
+                    throw new Exception("Не удалось создать коллекцию");
                 }
 
                 collection.MaxCount = Convert.ToInt32(record[2]);
@@ -186,17 +188,22 @@ public class StorageCollection<T>
                 string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
                 foreach (string elem in set)
                 {
-                    if (elem?.CreateDrawningAirPlane() is T boat)
+                    if (elem?.CreateDrawningAirPlane() is T airplane)
                     {
-                        if (collection.Insert(boat) == -1)
-                            return false;
+                        try
+                        {
+                            if (collection.Insert(airplane) == -1)
+                                throw new Exception("Объект не удалось добавить в коллекцию: " + record[3]);
+                        }
+                        catch (CollectionOverflowException ex)
+                        {
+                            throw new Exception("Коллекция переполнена", ex);
+                        }
                     }
                 }
                 _storages.Add(record[0], collection);
             }
         }
-
-        return true;
     }
 
     /// <summary>

AirBomber/Exceptions/CollectionOverflowException.cs

@@ -0,0 +1,17 @@
+using System.Runtime.Serialization;
+
+namespace AirBomber.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) { }
+}
+

AirBomber/Exceptions/ObjectNotFoundException.cs

@@ -0,0 +1,16 @@
+using System.Runtime.Serialization;
+
+namespace AirBomber.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) { }
+}

AirBomber/Exceptions/PositionOutOfCollectionException.cs

@@ -0,0 +1,16 @@
+using System.Runtime.Serialization;
+
+namespace AirBomber.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) { }
+}

AirBomber/FormAirPlaneCollection.Designer.cs

@@ -275,7 +275,6 @@
             файлToolStripMenuItem.Name = "файлToolStripMenuItem";
             файлToolStripMenuItem.Size = new Size(59, 24);
             файлToolStripMenuItem.Text = "Файл";
-            файлToolStripMenuItem.Click += saveToolStripMenuItem_Click;
             // 
             // saveToolStripMenuItem
             // 

AirBomber/FormAirPlaneCollection.cs

@@ -9,64 +9,72 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Microsoft.Extensions.Logging;
+using AirBomber.Exceptions;
 
-namespace AirBomber
+namespace AirBomber;
+
+public partial class FormAirPlaneCollection : Form
 {
-    public partial class FormAirPlaneCollection : Form
+    /// <summary>
+    /// Хранилище коллекций
+    /// </summary>
+    private readonly StorageCollection<DrawningAirPlane> _storageCollection;
+
+    /// <summary>
+    /// Компания
+    /// </summary>
+    private AbstractCompany? _company = null;
+
+    private readonly ILogger _logger;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormAirPlaneCollection(ILogger<FormAirPlaneCollection> logger)
     {
-        /// <summary>
-        /// Хранилище коллекций
-        /// </summary>
-        private readonly StorageCollection<DrawningAirPlane> _storageCollection;
+        InitializeComponent();
+        _storageCollection = new();
+        _logger = logger;
+        _logger.LogInformation("Форма загрузилась");
+    }
 
-        /// <summary>
-        /// Компания
-        /// </summary>
-        private AbstractCompany? _company;
+    /// <summary>
+    /// Выбор компании
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void comboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        panelCompanyTools.Enabled = false;
+    }
 
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        public FormAirPlaneCollection()
-        {
-            InitializeComponent();
-            _storageCollection = new();
-        }
-
-        /// <summary>
-        /// Выбор компании
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void comboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            panelCompanyTools.Enabled = false;
-        }
-
-        /// <summary>
-        /// Создание объекта класса-перемещения
-        /// </summary>
-        /// <param name="type">Тип создаваемого объекта</param>
+    /// <summary>
+    /// Создание объекта класса-перемещения
+    /// </summary>
+    /// <param name="type">Тип создаваемого объекта</param>
 
 
-        /// <summary>
-        /// Добавление самолета
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonAddAirPlane_Click(object sender, EventArgs e)
-        {
-            FormAirPlaneConfig form = new();
-            //TODO передать метод
-            form.Show();
-            form.AddEvent(SetAirPlane);
-        }
+    /// <summary>
+    /// Добавление самолета
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonAddAirPlane_Click(object sender, EventArgs e)
+    {
+        FormAirPlaneConfig form = new();
+        //TODO передать метод
+        form.Show();
+        form.AddEvent(SetAirPlane);
+    }
 
-        /// <summary>
-        /// Добавление самолета в коллекцию
-        /// </summary>
-        /// <param name="airplane"></param>
-        private void SetAirPlane(DrawningAirPlane airplane)
+    /// <summary>
+    /// Добавление самолета в коллекцию
+    /// </summary>
+    /// <param name="airplane"></param>
+    private void SetAirPlane(DrawningAirPlane airplane)
+    {
+        try
         {
             if (_company == null || airplane == null)
             {
@@ -77,41 +85,48 @@ namespace AirBomber
             {
                 MessageBox.Show("Объект добавлен");
                 pictureBox.Image = _company.Show();
+                _logger.LogInformation("Добавлен объект: " + airplane.GetDataForSave());
             }
-            else
-            {
-                MessageBox.Show("Не удалось добавить объект");
-            }
-
         }
-
-        /// <summary>
-        /// Получение цвета
-        /// </summary>
-        /// <param name="random">Генератор случайных чисел</param>
-        /// <returns></returns>
-        private static Color GetColor(Random random)
+        catch (ObjectNotFoundException) { }
+        catch (CollectionOverflowException ex)
         {
-            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;
+            MessageBox.Show("В коллекции превышено допустимое количество элементов");
+            _logger.LogError("Ошибка: {Message}", ex.Message);
         }
 
-        /// <summary>
-        /// Удаление объекта
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonRemoveAirPlane_Click(object sender, EventArgs e)
+    }
+
+    /// <summary>
+    /// Получение цвета
+    /// </summary>
+    /// <param name="random">Генератор случайных чисел</param>
+    /// <returns></returns>
+    private static Color GetColor(Random random)
+    {
+        Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+        ColorDialog dialog = new();
+        if (dialog.ShowDialog() == DialogResult.OK)
+        {
+            color = dialog.Color;
+        }
+
+        return color;
+    }
+
+    /// <summary>
+    /// Удаление объекта
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonRemoveAirPlane_Click(object sender, EventArgs e)
+    {
+        int pos = Convert.ToInt32(maskedTextBox.Text);
+        try
         {
             if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null)
             {
-                return;
+                throw new Exception("Входные данные отсутствуют");
             }
 
             if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
@@ -119,35 +134,40 @@ namespace AirBomber
                 return;
             }
 
-            int pos = Convert.ToInt32(maskedTextBox.Text);
+
             if (_company - pos != null)
             {
                 MessageBox.Show("Объект удален");
                 pictureBox.Image = _company.Show();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
+                _logger.LogInformation("Объект удален");
             }
         }
-
-        /// <summary>
-        /// Передача объекта в другую форму
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonGoToCheck_Click(object sender, EventArgs e)
+        catch (Exception ex)
         {
-            if (_company == null)
-            {
-                return;
-            }
+            MessageBox.Show("Не найден объект по позиции " + pos);
+            _logger.LogError("Ошибка: {Message}", ex.Message);
+        }
+    }
 
-            DrawningAirPlane? airplane = null;
-            int counter = 100;
-            while (airplane == null)
+    /// <summary>
+    /// Передача объекта в другую форму
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonGoToCheck_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        DrawningAirPlane? airPlane = null;
+        int counter = 100;
+        try
+        {
+            while (airPlane == null)
             {
-                airplane = _company.GetRandomObject();
+                airPlane = _company.GetRandomObject();
                 counter--;
                 if (counter <= 0)
                 {
@@ -155,43 +175,51 @@ namespace AirBomber
                 }
             }
 
-            if (airplane == null)
+            if (airPlane == null)
             {
                 return;
             }
 
             FormAirBomber form = new FormAirBomber();
-            form.SetAirPlane = airplane;
+            form.SetAirPlane = airPlane;
             form.ShowDialog();
         }
-
-        /// <summary>
-        /// Перерисовка коллекции
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonRefresh_Click(object sender, EventArgs e)
+        catch (Exception ex)
         {
-            if (_company == null)
-            {
-                return;
-            }
+            MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
 
-            pictureBox.Image = _company.Show();
+    /// <summary>
+    /// Перерисовка коллекции
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonRefresh_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
         }
 
-        private void FormAirPlaneCollection_Load(object sender, EventArgs e)
-        {
+        pictureBox.Image = _company.Show();
+    }
 
+    private void FormAirPlaneCollection_Load(object sender, EventArgs e)
+    {
+
+    }
+
+    private void buttonCollectionAdd_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+        {
+            MessageBox.Show("Не все данный заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            return;
         }
 
-        private void buttonCollectionAdd_Click(object sender, EventArgs e)
+        try
         {
-            if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
-            {
-                MessageBox.Show("Не все данный заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
             CollectionType collectionType = CollectionType.None;
             if (radioButtonMassive.Checked)
             {
@@ -204,104 +232,117 @@ namespace AirBomber
 
             _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
             RefreshListBoxItems();
+            _logger.LogInformation("Добавлена коллекция:", textBoxCollectionName.Text);
         }
-
-        private void RefreshListBoxItems()
+        catch (Exception ex)
         {
-            listBoxCollection.Items.Clear();
-            for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
+            _logger.LogError("Ошибка: {Message}", ex.Message);
+        }
+    }
+
+    private void RefreshListBoxItems()
+    {
+        listBoxCollection.Items.Clear();
+        for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
+        {
+            string? colName = _storageCollection.Keys?[i];
+            if (!string.IsNullOrEmpty(colName))
             {
-                string? colName = _storageCollection.Keys?[i];
-                if (!string.IsNullOrEmpty(colName))
-                {
-                    listBoxCollection.Items.Add(colName);
-                }
+                listBoxCollection.Items.Add(colName);
             }
         }
+    }
 
-        private void buttonCollectionDel_Click(object sender, EventArgs e)
+    private void buttonCollectionDel_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItems == null)
         {
-            if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItems == null)
-            {
-                MessageBox.Show("Коллекция не выбрана");
-                return;
-            }
-            if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
-            RefreshListBoxItems();
+            MessageBox.Show("Коллекция не выбрана");
+            return;
         }
-        /// <summary>
-        /// Создание компании
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonCreateCompany_Click(object sender, EventArgs e)
+        if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
         {
-            if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
-            {
-                MessageBox.Show("Коллекция не выбрана");
-                return;
-            }
-
-            ICollectionGenericObjects<DrawningAirPlane>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
-            if (collection == null)
-            {
-                MessageBox.Show("Коллекция не проинициализирована");
-                return;
-            }
-
-            switch (comboBoxSelectorCompany.Text)
-            {
-                case "Хранилище":
-                    _company = new AirPlaneSharingService(pictureBox.Width, pictureBox.Height, collection);
-                    break;
-            }
-
-            panelCompanyTools.Enabled = true;
-            RefreshListBoxItems();
+            return;
+        }
+        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+        RefreshListBoxItems();
+    }
+    /// <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;
         }
 
-        /// <summary>
-        /// Обработка нажатия "Сохранение"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void saveToolStripMenuItem_Click(object sender, EventArgs e)
+        ICollectionGenericObjects<DrawningAirPlane>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+        if (collection == null)
         {
-            if (saveFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                if (_storageCollection.SaveData(saveFileDialog.FileName))
-                {
-                    MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                else
-                {
-                    MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
+            MessageBox.Show("Коллекция не проинициализирована");
+            return;
         }
 
-        /// <summary>
-        /// Обработка кнопки загрузки
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void loadToolStripMenuItem_Click(object sender, EventArgs e)
+        switch (comboBoxSelectorCompany.Text)
         {
-            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            case "Хранилище":
+                _company = new AirPlaneSharingService(pictureBox.Width, pictureBox.Height, collection);
+                break;
+        }
+
+        panelCompanyTools.Enabled = true;
+        RefreshListBoxItems();
+    }
+
+    /// <summary>
+    /// Обработка нажатия "Сохранение"
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void saveToolStripMenuItem_Click(object sender, EventArgs e)
+    {
+        if (saveFileDialog.ShowDialog() == DialogResult.OK)
+        {
+            try
             {
-                if (_storageCollection.LoadData(openFileDialog.FileName))
-                {
-                    RefreshListBoxItems();
-                    MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                else
-                {
-                    MessageBox.Show("Загрузка не выполнена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
+                _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);
+                MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                RefreshListBoxItems();
+                _logger.LogInformation("Загрузка из файла: {filename}", openFileDialog.FileName);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogError("Ошибка: {Message}", ex.Message);
             }
         }
     }

AirBomber/FormAirPlaneConfig.Designer.cs

@@ -73,8 +73,10 @@
             groupBoxConfig.Controls.Add(labelSimpleObject);
             groupBoxConfig.Dock = DockStyle.Left;
             groupBoxConfig.Location = new Point(0, 0);
+            groupBoxConfig.Margin = new Padding(3, 4, 3, 4);
             groupBoxConfig.Name = "groupBoxConfig";
-            groupBoxConfig.Size = new Size(550, 260);
+            groupBoxConfig.Padding = new Padding(3, 4, 3, 4);
+            groupBoxConfig.Size = new Size(629, 346);
             groupBoxConfig.TabIndex = 0;
             groupBoxConfig.TabStop = false;
             groupBoxConfig.Text = "Параметры";
@@ -89,9 +91,11 @@
             groupBoxColors.Controls.Add(panelWhite);
             groupBoxColors.Controls.Add(panelGreen);
             groupBoxColors.Controls.Add(panelRed);
-            groupBoxColors.Location = new Point(315, 12);
+            groupBoxColors.Location = new Point(360, 16);
+            groupBoxColors.Margin = new Padding(3, 4, 3, 4);
             groupBoxColors.Name = "groupBoxColors";
-            groupBoxColors.Size = new Size(227, 112);
+            groupBoxColors.Padding = new Padding(3, 4, 3, 4);
+            groupBoxColors.Size = new Size(259, 149);
             groupBoxColors.TabIndex = 11;
             groupBoxColors.TabStop = false;
             groupBoxColors.Text = "Цвета";
@@ -99,74 +103,83 @@
             // panelPurple
             // 
             panelPurple.BackColor = Color.Purple;
-            panelPurple.Location = new Point(176, 66);
+            panelPurple.Location = new Point(201, 88);
+            panelPurple.Margin = new Padding(3, 4, 3, 4);
             panelPurple.Name = "panelPurple";
-            panelPurple.Size = new Size(34, 34);
+            panelPurple.Size = new Size(39, 45);
             panelPurple.TabIndex = 3;
             // 
             // panelYellow
             // 
             panelYellow.BackColor = Color.Yellow;
-            panelYellow.Location = new Point(176, 22);
+            panelYellow.Location = new Point(201, 29);
+            panelYellow.Margin = new Padding(3, 4, 3, 4);
             panelYellow.Name = "panelYellow";
-            panelYellow.Size = new Size(34, 34);
+            panelYellow.Size = new Size(39, 45);
             panelYellow.TabIndex = 1;
             // 
             // panelBlack
             // 
             panelBlack.BackColor = Color.Black;
-            panelBlack.Location = new Point(120, 66);
+            panelBlack.Location = new Point(137, 88);
+            panelBlack.Margin = new Padding(3, 4, 3, 4);
             panelBlack.Name = "panelBlack";
-            panelBlack.Size = new Size(34, 34);
+            panelBlack.Size = new Size(39, 45);
             panelBlack.TabIndex = 4;
             // 
             // panelGray
             // 
             panelGray.BackColor = Color.Gray;
-            panelGray.Location = new Point(67, 66);
+            panelGray.Location = new Point(77, 88);
+            panelGray.Margin = new Padding(3, 4, 3, 4);
             panelGray.Name = "panelGray";
-            panelGray.Size = new Size(34, 34);
+            panelGray.Size = new Size(39, 45);
             panelGray.TabIndex = 5;
             // 
             // panelBlue
             // 
             panelBlue.BackColor = Color.Blue;
-            panelBlue.Location = new Point(120, 22);
+            panelBlue.Location = new Point(137, 29);
+            panelBlue.Margin = new Padding(3, 4, 3, 4);
             panelBlue.Name = "panelBlue";
-            panelBlue.Size = new Size(34, 34);
+            panelBlue.Size = new Size(39, 45);
             panelBlue.TabIndex = 1;
             // 
             // panelWhite
             // 
             panelWhite.BackColor = Color.White;
-            panelWhite.Location = new Point(15, 66);
+            panelWhite.Location = new Point(17, 88);
+            panelWhite.Margin = new Padding(3, 4, 3, 4);
             panelWhite.Name = "panelWhite";
-            panelWhite.Size = new Size(34, 34);
+            panelWhite.Size = new Size(39, 45);
             panelWhite.TabIndex = 2;
             // 
             // panelGreen
             // 
             panelGreen.BackColor = Color.Green;
-            panelGreen.Location = new Point(67, 22);
+            panelGreen.Location = new Point(77, 29);
+            panelGreen.Margin = new Padding(3, 4, 3, 4);
             panelGreen.Name = "panelGreen";
-            panelGreen.Size = new Size(34, 34);
+            panelGreen.Size = new Size(39, 45);
             panelGreen.TabIndex = 1;
             // 
             // panelRed
             // 
             panelRed.BackColor = Color.Red;
-            panelRed.Location = new Point(15, 22);
+            panelRed.Location = new Point(17, 29);
+            panelRed.Margin = new Padding(3, 4, 3, 4);
             panelRed.Name = "panelRed";
-            panelRed.Size = new Size(34, 34);
+            panelRed.Size = new Size(39, 45);
             panelRed.TabIndex = 0;
             panelRed.MouseDown += Panel_MouseDown;
             // 
             // checkBoxFuelTanks
             // 
             checkBoxFuelTanks.AutoSize = true;
-            checkBoxFuelTanks.Location = new Point(12, 178);
+            checkBoxFuelTanks.Location = new Point(14, 237);
+            checkBoxFuelTanks.Margin = new Padding(3, 4, 3, 4);
             checkBoxFuelTanks.Name = "checkBoxFuelTanks";
-            checkBoxFuelTanks.Size = new Size(248, 19);
+            checkBoxFuelTanks.Size = new Size(312, 24);
             checkBoxFuelTanks.TabIndex = 7;
             checkBoxFuelTanks.Text = "Признак наличия доп. топливных баков";
             checkBoxFuelTanks.UseVisualStyleBackColor = true;
@@ -174,57 +187,60 @@
             // checkBoxBombs
             // 
             checkBoxBombs.AutoSize = true;
-            checkBoxBombs.Location = new Point(12, 132);
+            checkBoxBombs.Location = new Point(14, 176);
+            checkBoxBombs.Margin = new Padding(3, 4, 3, 4);
             checkBoxBombs.Name = "checkBoxBombs";
-            checkBoxBombs.Size = new Size(156, 19);
+            checkBoxBombs.Size = new Size(196, 24);
             checkBoxBombs.TabIndex = 6;
             checkBoxBombs.Text = "Признак наличия бомб";
             checkBoxBombs.UseVisualStyleBackColor = true;
             // 
             // numericUpDownWeight
             // 
-            numericUpDownWeight.Location = new Point(80, 82);
+            numericUpDownWeight.Location = new Point(91, 109);
+            numericUpDownWeight.Margin = new Padding(3, 4, 3, 4);
             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(88, 23);
+            numericUpDownWeight.Size = new Size(101, 27);
             numericUpDownWeight.TabIndex = 5;
             numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
             // 
             // labelWeight
             // 
             labelWeight.AutoSize = true;
-            labelWeight.Location = new Point(12, 84);
+            labelWeight.Location = new Point(14, 112);
             labelWeight.Name = "labelWeight";
-            labelWeight.Size = new Size(29, 15);
+            labelWeight.Size = new Size(36, 20);
             labelWeight.TabIndex = 4;
             labelWeight.Text = "Вес:";
             // 
             // numericUpDownSpeed
             // 
-            numericUpDownSpeed.Location = new Point(80, 38);
+            numericUpDownSpeed.Location = new Point(91, 51);
+            numericUpDownSpeed.Margin = new Padding(3, 4, 3, 4);
             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(88, 23);
+            numericUpDownSpeed.Size = new Size(101, 27);
             numericUpDownSpeed.TabIndex = 3;
             numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
             // 
             // labelSpeed
             // 
             labelSpeed.AutoSize = true;
-            labelSpeed.Location = new Point(12, 40);
+            labelSpeed.Location = new Point(14, 53);
             labelSpeed.Name = "labelSpeed";
-            labelSpeed.Size = new Size(62, 15);
+            labelSpeed.Size = new Size(76, 20);
             labelSpeed.TabIndex = 2;
             labelSpeed.Text = "Скорость:";
             // 
             // labelModifiedObject
             // 
             labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
-            labelModifiedObject.Location = new Point(408, 166);
+            labelModifiedObject.Location = new Point(466, 222);
             labelModifiedObject.Name = "labelModifiedObject";
-            labelModifiedObject.Size = new Size(103, 40);
+            labelModifiedObject.Size = new Size(117, 53);
             labelModifiedObject.TabIndex = 1;
             labelModifiedObject.Text = "Продвинутый";
             labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
@@ -233,9 +249,9 @@
             // labelSimpleObject
             // 
             labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
-            labelSimpleObject.Location = new Point(289, 166);
+            labelSimpleObject.Location = new Point(330, 222);
             labelSimpleObject.Name = "labelSimpleObject";
-            labelSimpleObject.Size = new Size(103, 40);
+            labelSimpleObject.Size = new Size(117, 53);
             labelSimpleObject.TabIndex = 0;
             labelSimpleObject.Text = "Простой";
             labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
@@ -243,17 +259,19 @@
             // 
             // pictureBoxObject
             // 
-            pictureBoxObject.Location = new Point(13, 45);
+            pictureBoxObject.Location = new Point(15, 69);
+            pictureBoxObject.Margin = new Padding(3, 4, 3, 4);
             pictureBoxObject.Name = "pictureBoxObject";
-            pictureBoxObject.Size = new Size(170, 136);
+            pictureBoxObject.Size = new Size(194, 161);
             pictureBoxObject.TabIndex = 1;
             pictureBoxObject.TabStop = false;
             // 
             // buttonAdd
             // 
-            buttonAdd.Location = new Point(588, 190);
+            buttonAdd.Location = new Point(672, 254);
+            buttonAdd.Margin = new Padding(3, 4, 3, 4);
             buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(88, 40);
+            buttonAdd.Size = new Size(101, 53);
             buttonAdd.TabIndex = 2;
             buttonAdd.Text = "Добавить";
             buttonAdd.UseVisualStyleBackColor = true;
@@ -261,9 +279,10 @@
             // 
             // buttonCancel
             // 
-            buttonCancel.Location = new Point(688, 190);
+            buttonCancel.Location = new Point(786, 254);
+            buttonCancel.Margin = new Padding(3, 4, 3, 4);
             buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(89, 40);
+            buttonCancel.Size = new Size(102, 53);
             buttonCancel.TabIndex = 3;
             buttonCancel.Text = "Отмена";
             buttonCancel.UseVisualStyleBackColor = true;
@@ -274,9 +293,10 @@
             panelObject.Controls.Add(labelBodyColor);
             panelObject.Controls.Add(labelAdditionalColor);
             panelObject.Controls.Add(pictureBoxObject);
-            panelObject.Location = new Point(594, 0);
+            panelObject.Location = new Point(679, 0);
+            panelObject.Margin = new Padding(3, 4, 3, 4);
             panelObject.Name = "panelObject";
-            panelObject.Size = new Size(194, 184);
+            panelObject.Size = new Size(222, 246);
             panelObject.TabIndex = 4;
             panelObject.DragDrop += PanelObject_DragDrop;
             panelObject.DragEnter += PanelObject_DragEnter;
@@ -285,9 +305,9 @@
             // 
             labelBodyColor.AllowDrop = true;
             labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
-            labelBodyColor.Location = new Point(13, 9);
+            labelBodyColor.Location = new Point(15, 12);
             labelBodyColor.Name = "labelBodyColor";
-            labelBodyColor.Size = new Size(75, 33);
+            labelBodyColor.Size = new Size(85, 43);
             labelBodyColor.TabIndex = 2;
             labelBodyColor.Text = "Цвет";
             labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
@@ -298,9 +318,9 @@
             // 
             labelAdditionalColor.AllowDrop = true;
             labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
-            labelAdditionalColor.Location = new Point(108, 9);
+            labelAdditionalColor.Location = new Point(123, 12);
             labelAdditionalColor.Name = "labelAdditionalColor";
-            labelAdditionalColor.Size = new Size(75, 33);
+            labelAdditionalColor.Size = new Size(85, 43);
             labelAdditionalColor.TabIndex = 3;
             labelAdditionalColor.Text = "Доп. Цвет";
             labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
@@ -309,13 +329,14 @@
             // 
             // FormAirPlaneConfig
             // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(795, 260);
+            ClientSize = new Size(909, 346);
             Controls.Add(panelObject);
             Controls.Add(buttonCancel);
             Controls.Add(buttonAdd);
             Controls.Add(groupBoxConfig);
+            Margin = new Padding(3, 4, 3, 4);
             Name = "FormAirPlaneConfig";
             Text = "Создание объекта";
             groupBoxConfig.ResumeLayout(false);

AirBomber/FormAirPlaneConfig.resx

@@ -18,7 +18,7 @@
     <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="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>

AirBomber/Program.cs

@@ -1,17 +1,45 @@
-namespace AirBomber
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Serilog;
+
+
+namespace AirBomber;
+
+internal static class Program
 {
-    internal static class Program
+    /// <summary>
+    ///  The main entry point for the application.
+    /// </summary>
+    [STAThread]
+    static void Main()
     {
-        /// <summary>
-        ///  The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main()
-        {
-            // To customize application configuration such as set high DPI settings or default font,
-            // see https://aka.ms/applicationconfiguration.
-            ApplicationConfiguration.Initialize();
-            Application.Run(new FormAirPlaneCollection());
-        }
+        // 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<FormAirPlaneCollection>());
     }
-}
+
+    private static void ConfigureServices(ServiceCollection services)
+    {
+        string[] path = Directory.GetCurrentDirectory().Split('\\');
+        string pathNeed = "";
+        for (int i = 0; i < path.Length - 3; i++)
+        {
+            pathNeed += path[i] + "\\";
+        }
+
+        services.AddSingleton<FormAirPlaneCollection>()
+        .AddLogging(option =>
+        {
+            option.SetMinimumLevel(LogLevel.Information);
+            option.AddSerilog(new LoggerConfiguration().ReadFrom.Configuration(new ConfigurationBuilder().
+                AddJsonFile($"{pathNeed}serilog.json").Build()).CreateLogger());
+        });
+    }
+}
+
+

AirBomber/serilog.json

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