diff --git a/ProjectDumpTruck/ProjectDumpTruck/CollectionGenericObject/Autopark.cs b/ProjectDumpTruck/ProjectDumpTruck/CollectionGenericObject/Autopark.cs index 5f237b6..96903c9 100644 --- a/ProjectDumpTruck/ProjectDumpTruck/CollectionGenericObject/Autopark.cs +++ b/ProjectDumpTruck/ProjectDumpTruck/CollectionGenericObject/Autopark.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using ProjectDumpTruck.Exceptions; namespace ProjectDumpTruck.CollectionGenericObject; @@ -42,25 +43,29 @@ public class Autopark : AbstractCompany for (int i = 0; i < (_collection?.Count ?? 0); i++) { - if (_collection?.Get(i) != null) + try { - int x = 20 + _placeSizeWidth * n; - int y = 10 + _placeSizeHeight * m; + if (_collection?.Get(i) != null) + { + int x = 20 + _placeSizeWidth * n; + int y = 10 + _placeSizeHeight * m; - _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight); - _collection?.Get(i)?.SetPosition(x, y); + _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight); + _collection?.Get(i)?.SetPosition(x, y); + } + + if (n < _pictureWidth / _placeSizeWidth) n++; + + else + { + n = 0; + m++; + } } - - if (n < _pictureWidth / _placeSizeWidth) - n++; - else + catch (ObjectNotFoundException) { - n = 0; - m++; + break; } } } - - - } diff --git a/ProjectDumpTruck/ProjectDumpTruck/CollectionGenericObject/StorageCollection.cs b/ProjectDumpTruck/ProjectDumpTruck/CollectionGenericObject/StorageCollection.cs index 7953ca9..b9ced44 100644 --- a/ProjectDumpTruck/ProjectDumpTruck/CollectionGenericObject/StorageCollection.cs +++ b/ProjectDumpTruck/ProjectDumpTruck/CollectionGenericObject/StorageCollection.cs @@ -144,7 +144,7 @@ public class StorageCollection /// true - загрузка прошла успешно, false - ошибка при загрузке данных public bool LoadData(string filename) { - if (!File.Exists(filename)) throw new FileNotFoundException("Файл не существует"); ; + if (!File.Exists(filename)) throw new FileNotFoundException("Файл не существует"); using (StreamReader sr = new(filename)) { diff --git a/ProjectDumpTruck/ProjectDumpTruck/FormTruckCollection.cs b/ProjectDumpTruck/ProjectDumpTruck/FormTruckCollection.cs index a35e3e0..82bfa83 100644 --- a/ProjectDumpTruck/ProjectDumpTruck/FormTruckCollection.cs +++ b/ProjectDumpTruck/ProjectDumpTruck/FormTruckCollection.cs @@ -1,5 +1,7 @@ -using ProjectDumpTruck.CollectionGenericObject; +using Microsoft.Extensions.Logging; +using ProjectDumpTruck.CollectionGenericObject; using ProjectDumpTruck.Drawnings; +using ProjectDumpTruck.Exceptions; using System; using System.Collections.Generic; using System.ComponentModel; @@ -30,13 +32,16 @@ public partial class FormTruckCollection : Form /// private AbstractCompany? _company = null; + private readonly ILogger _logger; + /// /// Конструктор /// - public FormTruckCollection() + public FormTruckCollection(ILogger logger) { InitializeComponent(); _storageCollection = new(); + _logger = logger; } /// @@ -67,19 +72,24 @@ public partial class FormTruckCollection : Form /// private void SetTruck(DrawningTruck truck) { - if (_company == null || truck == null) + try { - return; - } + if (_company == null || truck == null) + { + return; + } - if (_company + truck != -1) - { - MessageBox.Show("Объект добавлен"); - pictureBox.Image = _company.Show(); + if (_company + truck != -1) + { + MessageBox.Show("Объект добавлен"); + _logger.LogInformation($"Добавлен объект {truck.GetDataForSave()}"); + pictureBox.Image = _company.Show(); + } } - else + catch (CollectionOverflowException ex) { - MessageBox.Show("Не удалось добавить объект"); + MessageBox.Show(ex.Message); + _logger.LogWarning($"Ошибка: {ex.Message}"); } } @@ -100,15 +110,25 @@ public partial class FormTruckCollection : Form return; } - int pos = Convert.ToInt32(maskedTextBoxPosition.Text); - if (_company - pos != null) + try { - MessageBox.Show("Объект удален"); - pictureBox.Image = _company.Show(); + int pos = Convert.ToInt32(maskedTextBoxPosition.Text); + if (_company - pos != null) + { + MessageBox.Show("Объект удален"); + _logger.LogInformation($"Удален объект по позиции {pos}"); + pictureBox.Image = _company.Show(); + } } - else + catch (ObjectNotFoundException ex) { - MessageBox.Show("Не удалось удалить объект"); + MessageBox.Show(ex.Message); + _logger.LogError($"Ошибка: {ex.Message}"); + } + catch (PositionOutOfCollectionException ex) + { + MessageBox.Show(ex.Message); + _logger.LogError($"Ошибка: {ex.Message}"); } } @@ -168,6 +188,7 @@ public partial class FormTruckCollection : Form if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked)) { MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + _logger.LogError("Ошибка: Заполнены не все данные для добавления коллекции"); return; } @@ -182,6 +203,7 @@ public partial class FormTruckCollection : Form } _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType); + _logger.LogInformation($"Добавлена коллекция: {textBoxCollectionName.Text} типа: {collectionType}"); RefreshListBoxItems(); } @@ -211,6 +233,7 @@ public partial class FormTruckCollection : Form return; } _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString()); + _logger.LogInformation($"Удалена коллекция: {listBoxCollection.SelectedItem.ToString()}"); RefreshListBoxItems(); } @@ -248,13 +271,16 @@ public partial class FormTruckCollection : 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); } } } @@ -268,14 +294,17 @@ public partial class FormTruckCollection : Form { if (openFileDialog.ShowDialog() == DialogResult.OK) { - if (_storageCollection.LoadData(openFileDialog.FileName)) + try { + _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); + _logger.LogError("Ошибка: {Message}", ex.Message); } } } diff --git a/ProjectDumpTruck/ProjectDumpTruck/Program.cs b/ProjectDumpTruck/ProjectDumpTruck/Program.cs index 589f4a5..79c5baa 100644 --- a/ProjectDumpTruck/ProjectDumpTruck/Program.cs +++ b/ProjectDumpTruck/ProjectDumpTruck/Program.cs @@ -1,3 +1,10 @@ +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.DependencyInjection; +using Serilog; +using System; + + namespace ProjectDumpTruck { internal static class Program @@ -11,7 +18,30 @@ namespace ProjectDumpTruck // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormTruckCollection()); + ServiceCollection services = new(); + ConfigureServices(services); + using ServiceProvider serviceProvider = services.BuildServiceProvider(); + Application.Run(serviceProvider.GetRequiredService()); + } + + /// + /// DI + /// + /// + private static void ConfigureServices(ServiceCollection services) + { + services + .AddSingleton() + .AddLogging(option => + { + option.SetMinimumLevel(LogLevel.Information); + var config = new ConfigurationBuilder() + .AddJsonFile("serilogConfig.json", optional: false, reloadOnChange: true) + .Build(); + option.AddSerilog(Log.Logger = new LoggerConfiguration() + .ReadFrom.Configuration(config) + .CreateLogger()); + }); } } } \ No newline at end of file diff --git a/ProjectDumpTruck/ProjectDumpTruck/ProjectDumpTruck.csproj b/ProjectDumpTruck/ProjectDumpTruck/ProjectDumpTruck.csproj index 244387d..a359d20 100644 --- a/ProjectDumpTruck/ProjectDumpTruck/ProjectDumpTruck.csproj +++ b/ProjectDumpTruck/ProjectDumpTruck/ProjectDumpTruck.csproj @@ -8,6 +8,14 @@ enable + + + + + + + + True diff --git a/ProjectDumpTruck/ProjectDumpTruck/serilogConfig.config b/ProjectDumpTruck/ProjectDumpTruck/serilogConfig.config new file mode 100644 index 0000000..49cc43e --- /dev/null +++ b/ProjectDumpTruck/ProjectDumpTruck/serilogConfig.config @@ -0,0 +1,3 @@ + + + \ No newline at end of file