final

ProjectCatamaran/ProjectCatamaran/CollectionGenericObjects/AbstractCompany.cs

@@ -13,7 +13,7 @@ public abstract class AbstractCompany
     /// <summary>
     /// Размер места (высота)
     /// </summary>
-    protected readonly int _placeSizeHeight = 80;
+    protected readonly int _placeSizeHeight = 97;
 
     /// <summary>
     /// Ширина окна
@@ -33,7 +33,7 @@ public abstract class AbstractCompany
     /// <summary>
     /// Вычисление максимального количества элементов, который можно разместить в окне
     /// </summary>
-    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+    private int GetMaxCount => (_pictureWidth / _placeSizeWidth) * (_pictureHeight / _placeSizeHeight);
 
     /// <summary>
     /// Конструктор
@@ -94,8 +94,13 @@ public abstract class AbstractCompany
         SetObjectsPosition();
         for (int i = 0; i < (_collection?.Count ?? 0); ++i)
         {
-            DrawningBoat? obj = _collection?.Get(i);
-            obj?.DrawTransport(graphics);
+            try
+            {
+                DrawningBoat? obj = _collection?.Get(i);
+                obj?.DrawTransport(graphics);
+            }
+            catch(Exception) { }
+            
         }
 
         return bitmap;

ProjectCatamaran/ProjectCatamaran/CollectionGenericObjects/BoatSharingService.cs

@@ -51,8 +51,12 @@ public class BoatSharingService : 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;

ProjectCatamaran/ProjectCatamaran/CollectionGenericObjects/ListGenericObjects.cs

@@ -1,4 +1,6 @@
-namespace ProjectCatamaran.CollectionGenericObjects;
+using ProjectCatamaran.Exceptions;
+
+namespace ProjectCatamaran.CollectionGenericObjects;
 
 public class ListGenericObjects<T> : ICollectionGenericObjects<T>
     where T : class
@@ -31,30 +33,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;
         
@@ -62,7 +58,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;

ProjectCatamaran/ProjectCatamaran/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,4 +1,6 @@
-namespace ProjectCatamaran.CollectionGenericObjects;
+using ProjectCatamaran.Exceptions;
+
+namespace ProjectCatamaran.CollectionGenericObjects;
 
 public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 where T : class
@@ -44,12 +46,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)
@@ -62,14 +61,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)
         {
@@ -94,15 +93,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;

ProjectCatamaran/ProjectCatamaran/CollectionGenericObjects/StorageCollection.cs

@@ -1,4 +1,5 @@
 using ProjectCatamaran.Drawnings;
+using ProjectCatamaran.Exceptions;
 using System.Text;
 
 namespace ProjectCatamaran.CollectionGenericObjects;
@@ -98,11 +99,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))
@@ -138,7 +139,6 @@ public class StorageCollection<T>
                 sb.Clear();
             }
         }
-        return true;
     }
 
     /// <summary>
@@ -146,19 +146,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)
             {
@@ -171,7 +173,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]);
@@ -181,15 +183,20 @@ public class StorageCollection<T>
                 {
                     if (elem?.CreateDrawningBoat() is T boat)
                     {
-                        if (collection.Insert(boat) == -1)
-                            return false;
+                        try
+                        {
+                            if (collection.Insert(boat) == -1)
+                                throw new Exception("Объект не удалось добавить в коллекцию: " + record[3]);
+                        }
+                        catch (CollectionOverflowException ex)
+                        {
+                            throw new Exception("Коллекция переполнена", ex);
+                        }
                     }
                 }
                 _storages.Add(record[0], collection);
             }
         }
-
-        return true;
     }
 
     /// <summary>

ProjectCatamaran/ProjectCatamaran/Exceptions/CollectionOverflowException.cs

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

ProjectCatamaran/ProjectCatamaran/Exceptions/ObjectNotFoundException.cs

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

ProjectCatamaran/ProjectCatamaran/Exceptions/PositionOutOfCollectionException.cs

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

ProjectCatamaran/ProjectCatamaran/FormBoatCollection.cs

@@ -1,6 +1,8 @@
 using ProjectCatamaran.CollectionGenericObjects;
 using ProjectCatamaran.Drawnings;
 using System.Windows.Forms;
+using Microsoft.Extensions.Logging;
+using ProjectCatamaran.Exceptions;
 
 namespace ProjectCatamaran;
 
@@ -18,13 +20,17 @@ public partial class FormBoatCollection : Form
     /// </summary>
     private AbstractCompany? _company = null;
 
+    private readonly ILogger _logger;
+
     /// <summary>
 	/// Конструктор
 	/// </summary>
-    public FormBoatCollection()
+    public FormBoatCollection(ILogger<FormBoatCollection> logger)
     {
         InitializeComponent();
         _storageCollection = new();
+        _logger = logger;
+        _logger.LogInformation("Форма загрузилась");
     }
 
     /// <summary>
@@ -56,19 +62,25 @@ public partial class FormBoatCollection : Form
 	/// <param name="boat"></param>
 	private void SetBoat(DrawningBoat? boat)
     {
-        if (_company == null || boat == null)
+        try
         {
-            return;
-        }
+            if (_company == null || boat == null)
+            {
+                return;
+            }
 
-        if (_company + boat != -1)
-        {
-            MessageBox.Show("Объект добавлен");
-            pictureBox.Image = _company.Show();
+            if (_company + boat != -1)
+            {
+                MessageBox.Show("Объект добавлен");
+                pictureBox.Image = _company.Show();
+                _logger.LogInformation("Добавлен объект: " + boat.GetDataForSave());
+            }
         }
-        else
+        catch (ObjectNotFoundException) { }
+        catch (CollectionOverflowException ex)
         {
-            MessageBox.Show("Не удалось добавить объект");
+            MessageBox.Show("В коллекции превышено допустимое количество элементов");
+            _logger.LogError("Ошибка: {Message}", ex.Message);
         }
     }
 
@@ -79,25 +91,31 @@ public partial class FormBoatCollection : Form
 	/// <param name="e"></param>
 	private void ButtonRemoveBoat_Click(object sender, EventArgs e)
     {
-        if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
-        {
-            return;
-        }
-
-        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
-        {
-            return;
-        }
-
         int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-        if (_company - pos != null)
+        try
         {
-            MessageBox.Show("Объект удален");
-            pictureBox.Image = _company.Show();
+            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
+            {
+                throw new Exception("Входные данные отсутствуют");
+            }
+
+            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+            {
+                return;
+            }
+
+            
+            if (_company - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _company.Show();
+                _logger.LogInformation("Объект удален");
+            }
         }
-        else
+        catch (Exception ex)
         {
-            MessageBox.Show("Не удалось удалить объект");
+            MessageBox.Show("Не найден объект по позиции " + pos);
+            _logger.LogError("Ошибка: {Message}", ex.Message);
         }
     }
 
@@ -115,24 +133,32 @@ public partial class FormBoatCollection : Form
 
         DrawningBoat? boat = null;
         int counter = 100;
-        while (boat == null)
+        try
         {
-            boat = _company.GetRandomObject();
-            counter--;
-            if (counter <= 0)
+            while (boat == null)
             {
-                break;
+                boat = _company.GetRandomObject();
+                counter--;
+                if (counter <= 0)
+                {
+                    break;
+                }
             }
-        }
 
-        if (boat == null)
+            if (boat == null)
+            {
+                return;
+            }
+
+            FormCatamaran form = new FormCatamaran();
+            form.SetBoat = boat;
+            form.ShowDialog();
+        }
+        catch (Exception ex)
         {
-            return;
+            MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
         }
 
-        FormCatamaran form = new FormCatamaran();
-        form.SetBoat = boat;
-        form.ShowDialog();
     }
 
     /// <summary>
@@ -157,18 +183,28 @@ public partial class FormBoatCollection : Form
             MessageBox.Show("Не все данный заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
             return;
         }
-        CollectionType collectionType = CollectionType.None;
-        if (radioButtonMassive.Checked)
+
+        try
         {
-            collectionType = CollectionType.Massive;
+            CollectionType collectionType = CollectionType.None;
+            if (radioButtonMassive.Checked)
+            {
+                collectionType = CollectionType.Massive;
+            }
+            else if (radioButtonList.Checked)
+            {
+                collectionType = CollectionType.List;
+            }
+
+            _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+            RefreshListBoxItems();
+            _logger.LogInformation("Добавлена коллекция:", textBoxCollectionName.Text);
         }
-        else if (radioButtonList.Checked)
+        catch (Exception ex)
         {
-            collectionType = CollectionType.List;
+            _logger.LogError("Ошибка: {Message}", ex.Message);
         }
 
-        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
-        RefreshListBoxItems();
     }
     /// <summary>
 	/// Обновление списка в listBoxCollection
@@ -194,12 +230,22 @@ public partial class FormBoatCollection : Form
             MessageBox.Show("Коллекция не выбрана");
             return;
         }
-        if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+
+        try
         {
-            return;
+            if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+            RefreshListBoxItems();
+            _logger.LogInformation("Удалена коллекция: ", listBoxCollection.SelectedItem.ToString());
         }
-        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
-        RefreshListBoxItems();
+        catch (Exception ex)
+        {
+            _logger.LogError("Ошибка: {Message}", ex.Message);
+        }
+
     }
 
     private void buttonCreateCompany_Click(object sender, EventArgs e)
@@ -237,14 +283,19 @@ public partial class FormBoatCollection : Form
     {
         if (saveFileDialog.ShowDialog() == DialogResult.OK)
         {
-            if (_storageCollection.SaveData(saveFileDialog.FileName))
+            try
             {
+                _storageCollection.SaveData(saveFileDialog.FileName);
                 MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                _logger.LogInformation("Сохранение в файл: {filename}", saveFileDialog.FileName);
             }
-            else
+            catch (Exception ex)
             {
-                MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogError("Ошибка: {Message}", ex.Message);
             }
+
+
         }
     }
 
@@ -257,14 +308,17 @@ public partial class FormBoatCollection : Form
     {
         if (openFileDialog.ShowDialog() == DialogResult.OK)
         {
-            if (_storageCollection.LoadData(openFileDialog.FileName))
+            try
             {
-                RefreshListBoxItems();
+                _storageCollection.LoadData(openFileDialog.FileName);
                 MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                RefreshListBoxItems();
+                _logger.LogInformation("Загрузка из файла: {filename}", openFileDialog.FileName);
             }
-            else
+            catch (Exception ex)
             {
-                MessageBox.Show("Загрузка не выполнена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogError("Ошибка: {Message}", ex.Message);
             }
         }
     }

ProjectCatamaran/ProjectCatamaran/Program.cs

@@ -1,3 +1,8 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Serilog;
+
 namespace ProjectCatamaran
 {
     internal static class Program
@@ -11,8 +16,32 @@ namespace ProjectCatamaran
             // 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<FormBoatCollection>());
+        }
 
-            Application.Run(new FormBoatCollection());
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DI
+        /// </summary>
+        /// <param name="services"></param>
+        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<FormBoatCollection>()
+            .AddLogging(option =>
+            {
+                option.SetMinimumLevel(LogLevel.Information);
+                option.AddSerilog(new LoggerConfiguration().ReadFrom.Configuration(new ConfigurationBuilder().
+                    AddJsonFile($"{pathNeed}serilog.json").Build()).CreateLogger());
+            });
         }
     }
 }

ProjectCatamaran/ProjectCatamaran/ProjectCatamaran.csproj

@@ -8,6 +8,16 @@
     <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="NLog.Extensions.Logging" Version="5.3.10" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -23,4 +33,10 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="serilog.json">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

ProjectCatamaran/ProjectCatamaran/serilog.json

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