Правки

AirFighter/AirFighter/AbstractMap.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace AirFighter
 {
-    internal abstract class AbstractMap
+    internal abstract class AbstractMap : IEquatable<AbstractMap>
     {
         private IDrawningObject _drawningObject = null;
         protected int[,] _map = null;
@@ -154,5 +154,24 @@ namespace AirFighter
         protected abstract void GenerateMap();
         protected abstract void DrawRoadPart(Graphics g, int i, int j);
         protected abstract void DrawBarrierPart(Graphics g, int i, int j);
+
+        public bool Equals(AbstractMap? other)
+        {
+            if (other == null || _height != other._height || _width != other._width || _size_x != other._size_x || _size_y != other._size_y)
+            {
+                return false;
+            }
+            for(int i = 0; i < _map.GetLength(0); i++)
+            {
+                for(int j = 0; j < _map.GetLength(1); j++)
+                {
+                    if(_map[i, j] != other._map[i, j])
+                    {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
     }
 }

AirFighter/AirFighter/AirFighter.csproj

@@ -8,6 +8,27 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="serilogConfig.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="serilogConfig.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

AirFighter/AirFighter/AirFighterCompareByColor.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirFighter
+{
+    internal class AirFighterCompareByColor : IComparer<IDrawningObject>
+    {
+        public int Compare(IDrawningObject? x, IDrawningObject? y)
+        {
+            if (x == null && y == null)
+            {
+                return 0;
+            }
+            if (x == null && y != null)
+            {
+                return 1;
+            }
+            if (x != null && y == null)
+            {
+                return -1;
+            }
+            var xAirFighter = x as DrawningObjectAirFighter;
+            var yAirFighter = y as DrawningObjectAirFighter;
+            if (xAirFighter == null && yAirFighter == null)
+            {
+                return 0;
+            }
+            if (xAirFighter == null && yAirFighter != null)
+            {
+                return 1;
+            }
+            if (xAirFighter != null && yAirFighter == null)
+            {
+                return -1;
+            }
+
+            var xEntityAirFighter = xAirFighter.GetAirFighter.AirFighter;
+            var yEntityAirFighter = yAirFighter.GetAirFighter.AirFighter;
+            var colorCompare = xEntityAirFighter.BodyColor.ToArgb().CompareTo(yEntityAirFighter.BodyColor.ToArgb());
+
+            if (colorCompare != 0)
+            {
+                return colorCompare;
+            }
+            if(xEntityAirFighter is EntityUpgradeAirFighter xUpgradeAirFighter && yEntityAirFighter is EntityUpgradeAirFighter yUpgradeAirFighter)
+            {
+                var dopColorCompare = xUpgradeAirFighter.DopColor.ToArgb().CompareTo(yUpgradeAirFighter.DopColor.ToArgb());
+                if (dopColorCompare != 0)
+                {
+                    return dopColorCompare;
+                }
+            }
+
+            var speedCompare = xAirFighter.GetAirFighter.AirFighter.Speed.CompareTo(yAirFighter.GetAirFighter.AirFighter.Speed);
+            if (speedCompare != 0)
+            {
+                return speedCompare;
+            }
+            return xAirFighter.GetAirFighter.AirFighter.Weight.CompareTo(yAirFighter.GetAirFighter.AirFighter.Weight);
+        }
+    }
+}

AirFighter/AirFighter/AirFighterCompareByType.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirFighter
+{
+    internal class AirFighterCompareByType : IComparer<IDrawningObject>
+    {
+        public int Compare(IDrawningObject? x, IDrawningObject? y)
+        {
+            if (x == null && y == null)
+            {
+                return 0;
+            }
+            if (x == null && y != null)
+            {
+                return 1;
+            }
+            if (x != null && y == null)
+            {
+                return -1;
+            }
+            var xAirFighter = x as DrawningObjectAirFighter;
+            var yAirFighter = y as DrawningObjectAirFighter;
+            if (xAirFighter == null && yAirFighter == null)
+            {
+                return 0;
+            }
+            if (xAirFighter == null && yAirFighter != null)
+            {
+                return 1;
+            }
+            if (xAirFighter != null && yAirFighter == null)
+            {
+                return -1;
+            }
+            if (xAirFighter.GetAirFighter.GetType().Name != yAirFighter.GetAirFighter.GetType().Name)
+            {
+                if (xAirFighter.GetAirFighter.GetType().Name == "DrawningAirFighter")
+                {
+                    return -1;
+                }
+                return 1;
+            }
+            var speedCompare = xAirFighter.GetAirFighter.AirFighter.Speed.CompareTo(yAirFighter.GetAirFighter.AirFighter.Speed);
+            if (speedCompare != 0)
+            {
+                return speedCompare;
+            }
+            return xAirFighter.GetAirFighter.AirFighter.Weight.CompareTo(yAirFighter.GetAirFighter.AirFighter.Weight);
+        }
+    }
+}

AirFighter/AirFighter/AirFighterNotFoundException.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirFighter
+{
+    internal class AirFighterNotFoundException : ApplicationException
+    {
+        public AirFighterNotFoundException(int i) : base($"Не найден объект по позиции { i}") { }
+ public AirFighterNotFoundException() : base() { }
+        public AirFighterNotFoundException(string message) : base(message) { }
+        public AirFighterNotFoundException(string message, Exception exception) :
+       base(message, exception)
+        { }
+        protected AirFighterNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+    }
+}

AirFighter/AirFighter/DrawningObjectAirFighter.cs

@@ -10,6 +10,7 @@ namespace AirFighter
     {
         private DrawningAirFighter _airFighter = null;
         public float Step => _airFighter?.AirFighter.Step ?? 0;
+        public DrawningAirFighter GetAirFighter => _airFighter;
         public DrawningObjectAirFighter(DrawningAirFighter airFighter)
         {
             _airFighter = airFighter;
@@ -38,5 +39,52 @@ namespace AirFighter
         public string GetInfo() => _airFighter?.GetDataForSave();
 
         public static IDrawningObject Create(string data) => new DrawningObjectAirFighter(data.CreateDrawningCar());
+
+        public bool Equals(IDrawningObject? other)
+        {
+            if (other == null)
+            {
+                return false;
+            }
+            var otherAirFighter = other as DrawningObjectAirFighter;
+            if (otherAirFighter == null)
+            {
+                return false;
+            }
+            var airFighter = _airFighter.AirFighter;
+            var otherAirFighterAirFighter = otherAirFighter._airFighter.AirFighter;
+            if (airFighter.Speed != otherAirFighterAirFighter.Speed)
+            {
+                return false;
+            }
+            if (airFighter.Weight != otherAirFighterAirFighter.Weight)
+            {
+                return false;
+            }
+            if (airFighter.BodyColor != otherAirFighterAirFighter.BodyColor)
+            {
+                return false;
+            }
+            if(airFighter is EntityUpgradeAirFighter upgradeAirFighter && otherAirFighterAirFighter is EntityUpgradeAirFighter upgradeOtherAirFighter)
+            {
+                if(upgradeAirFighter.DopWing != upgradeOtherAirFighter.DopWing)
+                {
+                    return false;
+                }
+                if(upgradeAirFighter.Rocket != upgradeAirFighter.Rocket)
+                {
+                    return false;
+                }
+                if(upgradeAirFighter.DopColor != upgradeOtherAirFighter.DopColor)
+                {
+                    return false;
+                }
+            }else if(airFighter is EntityUpgradeAirFighter || otherAirFighterAirFighter is EntityUpgradeAirFighter)
+            {
+                return false;
+            }
+            return true;
+
+        }
     }
 }

AirFighter/AirFighter/FormMapWithSetAirFighters.Designer.cs

@@ -51,6 +51,8 @@
             this.LoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
             this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
+            this.buttonSortByType = new System.Windows.Forms.Button();
+            this.buttonSortByColor = new System.Windows.Forms.Button();
             this.groupBox.SuspendLayout();
             this.groupBoxMaps.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
@@ -59,6 +61,8 @@
             // 
             // groupBox
             // 
+            this.groupBox.Controls.Add(this.buttonSortByColor);
+            this.groupBox.Controls.Add(this.buttonSortByType);
             this.groupBox.Controls.Add(this.groupBoxMaps);
             this.groupBox.Controls.Add(this.buttonUp);
             this.groupBox.Controls.Add(this.buttonDown);
@@ -72,7 +76,7 @@
             this.groupBox.Dock = System.Windows.Forms.DockStyle.Right;
             this.groupBox.Location = new System.Drawing.Point(732, 28);
             this.groupBox.Name = "groupBox";
-            this.groupBox.Size = new System.Drawing.Size(250, 561);
+            this.groupBox.Size = new System.Drawing.Size(250, 638);
             this.groupBox.TabIndex = 0;
             this.groupBox.TabStop = false;
             this.groupBox.Text = "Инструменты";
@@ -145,7 +149,7 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::AirFighter.Properties.Resources.Up;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(135, 481);
+            this.buttonUp.Location = new System.Drawing.Point(135, 558);
             this.buttonUp.Name = "buttonUp";
             this.buttonUp.Size = new System.Drawing.Size(30, 30);
             this.buttonUp.TabIndex = 2;
@@ -157,7 +161,7 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::AirFighter.Properties.Resources.Down;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(135, 519);
+            this.buttonDown.Location = new System.Drawing.Point(135, 596);
             this.buttonDown.Name = "buttonDown";
             this.buttonDown.Size = new System.Drawing.Size(30, 30);
             this.buttonDown.TabIndex = 3;
@@ -169,7 +173,7 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::AirFighter.Properties.Resources.Left;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(99, 519);
+            this.buttonLeft.Location = new System.Drawing.Point(99, 596);
             this.buttonLeft.Name = "buttonLeft";
             this.buttonLeft.Size = new System.Drawing.Size(30, 30);
             this.buttonLeft.TabIndex = 4;
@@ -181,7 +185,7 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::AirFighter.Properties.Resources.Right;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(171, 519);
+            this.buttonRight.Location = new System.Drawing.Point(171, 596);
             this.buttonRight.Name = "buttonRight";
             this.buttonRight.Size = new System.Drawing.Size(30, 30);
             this.buttonRight.TabIndex = 5;
@@ -190,7 +194,7 @@
             // 
             // buttonShowOnMap
             // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(28, 443);
+            this.buttonShowOnMap.Location = new System.Drawing.Point(17, 522);
             this.buttonShowOnMap.Name = "buttonShowOnMap";
             this.buttonShowOnMap.Size = new System.Drawing.Size(210, 29);
             this.buttonShowOnMap.TabIndex = 5;
@@ -200,7 +204,7 @@
             // 
             // buttonShowStorage
             // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(28, 408);
+            this.buttonShowStorage.Location = new System.Drawing.Point(17, 487);
             this.buttonShowStorage.Name = "buttonShowStorage";
             this.buttonShowStorage.Size = new System.Drawing.Size(210, 29);
             this.buttonShowStorage.TabIndex = 4;
@@ -210,7 +214,7 @@
             // 
             // buttonRemoveAirFighter
             // 
-            this.buttonRemoveAirFighter.Location = new System.Drawing.Point(28, 373);
+            this.buttonRemoveAirFighter.Location = new System.Drawing.Point(17, 452);
             this.buttonRemoveAirFighter.Name = "buttonRemoveAirFighter";
             this.buttonRemoveAirFighter.Size = new System.Drawing.Size(210, 29);
             this.buttonRemoveAirFighter.TabIndex = 3;
@@ -220,7 +224,7 @@
             // 
             // maskedTextBoxPosition
             // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(28, 340);
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(17, 419);
             this.maskedTextBoxPosition.Mask = "00";
             this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
             this.maskedTextBoxPosition.Size = new System.Drawing.Size(210, 27);
@@ -228,7 +232,7 @@
             // 
             // buttonAddAirFighter
             // 
-            this.buttonAddAirFighter.Location = new System.Drawing.Point(28, 296);
+            this.buttonAddAirFighter.Location = new System.Drawing.Point(17, 375);
             this.buttonAddAirFighter.Name = "buttonAddAirFighter";
             this.buttonAddAirFighter.Size = new System.Drawing.Size(210, 29);
             this.buttonAddAirFighter.TabIndex = 1;
@@ -241,7 +245,7 @@
             this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureBox.Location = new System.Drawing.Point(0, 28);
             this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(732, 561);
+            this.pictureBox.Size = new System.Drawing.Size(732, 638);
             this.pictureBox.TabIndex = 1;
             this.pictureBox.TabStop = false;
             // 
@@ -267,14 +271,14 @@
             // SaveToolStripMenuItem
             // 
             this.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
-            this.SaveToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
+            this.SaveToolStripMenuItem.Size = new System.Drawing.Size(177, 26);
             this.SaveToolStripMenuItem.Text = "Сохранение";
             this.SaveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click);
             // 
             // LoadToolStripMenuItem
             // 
             this.LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
-            this.LoadToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
+            this.LoadToolStripMenuItem.Size = new System.Drawing.Size(177, 26);
             this.LoadToolStripMenuItem.Text = "Загрузка";
             this.LoadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click);
             // 
@@ -286,11 +290,31 @@
             // 
             this.saveFileDialog.Filter = "txt file | *.txt";
             // 
+            // buttonSortByType
+            // 
+            this.buttonSortByType.Location = new System.Drawing.Point(17, 296);
+            this.buttonSortByType.Name = "buttonSortByType";
+            this.buttonSortByType.Size = new System.Drawing.Size(210, 29);
+            this.buttonSortByType.TabIndex = 7;
+            this.buttonSortByType.Text = "Сортировать по типу";
+            this.buttonSortByType.UseVisualStyleBackColor = true;
+            this.buttonSortByType.Click += new System.EventHandler(this.ButtonSortByType_Click);
+            // 
+            // buttonSortByColor
+            // 
+            this.buttonSortByColor.Location = new System.Drawing.Point(17, 331);
+            this.buttonSortByColor.Name = "buttonSortByColor";
+            this.buttonSortByColor.Size = new System.Drawing.Size(210, 29);
+            this.buttonSortByColor.TabIndex = 8;
+            this.buttonSortByColor.Text = "Сортировать по цвету";
+            this.buttonSortByColor.UseVisualStyleBackColor = true;
+            this.buttonSortByColor.Click += new System.EventHandler(this.ButtonSortByColor_Click);
+            // 
             // FormMapWithSetAirFighters
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(982, 589);
+            this.ClientSize = new System.Drawing.Size(982, 666);
             this.Controls.Add(this.pictureBox);
             this.Controls.Add(this.groupBox);
             this.Controls.Add(this.menuStrip);
@@ -334,5 +358,7 @@
         private ToolStripMenuItem LoadToolStripMenuItem;
         private OpenFileDialog openFileDialog;
         private SaveFileDialog saveFileDialog;
+        private Button buttonSortByColor;
+        private Button buttonSortByType;
     }
 }

AirFighter/AirFighter/FormMapWithSetAirFighters.cs

@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Extensions.Logging;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -26,10 +27,15 @@ namespace AirFighter
         /// </summary>
         private readonly MapsCollection _mapsCollection;
         /// <summary>
+        /// Логер
+        /// </summary>
+        private readonly ILogger _logger;
+        /// <summary>
         /// Конструктор
-        public FormMapWithSetAirFighters()
+        public FormMapWithSetAirFighters(ILogger<FormMapWithSetAirFighters> logger)
         {
             InitializeComponent();
+            _logger = logger;
             _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
             comboBoxSelectorMap.Items.Clear();
             foreach (var elem in _mapsDict)
@@ -68,14 +74,29 @@ namespace AirFighter
             if (_airFighter != null)
             {
                 DrawningObjectAirFighter airFighter = new(_airFighter);
-                if ((_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + airFighter) == 0)
+                try
                 {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                    if ((_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + airFighter) == 0)
+                    {
+                        MessageBox.Show("Объект добавлен");
+                        pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                        _logger.LogInformation($"Добавлен объект {airFighter}");
+                    }
+                    else
+                    {
+                        MessageBox.Show("Не удалось добавить объект");
+                        _logger.LogInformation($"Не удалось добавить объект {airFighter}");
+                    }
                 }
-                else
+                catch (StorageOverflowException ex)
                 {
-                    MessageBox.Show("Не удалось добавить объект");
+                    MessageBox.Show($"Ошибка добавления: {ex.Message}");
+                    _logger.LogWarning($"Ошибка переполнения хранилища: {ex.Message}");
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
+                    _logger.LogWarning($"Неизвестная ошибка: {ex.Message}");
                 }
             }
         }
@@ -113,14 +134,29 @@ namespace AirFighter
                 return;
             }
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if ((_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos) != null)
+            try
             {
-                MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                var deletedObject = (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos);
+                if (deletedObject != null)
+                {
+                    MessageBox.Show("Объект удален");
+                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                    _logger.LogInformation($"Удаление объекта {deletedObject}");
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось удалить объект");
+                    _logger.LogInformation($"Не удалось удалить объект {deletedObject}");
+                }
+            }catch(AirFighterNotFoundException ex)
+            {
+                MessageBox.Show($"Ошибка удаления: {ex.Message}");
+                _logger.LogWarning($"Ошибка, объект не найден: {ex.Message}");
             }
-            else
+            catch(Exception ex)
             {
-                MessageBox.Show("Не удалось удалить объект");
+                MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
+                _logger.LogWarning($"Неизвестная ошибка: {ex.Message}");
             }
         }
         /// <summary>
@@ -201,6 +237,7 @@ namespace AirFighter
             }
             _mapsCollection.AddMap(textBoxNewMapName.Text,
            _mapsDict[comboBoxSelectorMap.Text]);
+            _logger.LogInformation($"Добавлена карта: {textBoxNewMapName.Text}");
             ReloadMaps();
         }
         /// <summary>
@@ -211,6 +248,7 @@ namespace AirFighter
         private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
         {
             pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            _logger.LogInformation($"Осуществлен переход на карту {listBoxMaps.SelectedItem?.ToString() ?? string.Empty}");
         }
         /// <summary>
         /// Удаление карты
@@ -227,6 +265,7 @@ namespace AirFighter
             {
                 _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
                 ReloadMaps();
+                _logger.LogInformation($"Удалена карта {listBoxMaps.SelectedItem}");
             }
         }
         /// <summary>
@@ -237,15 +276,18 @@ namespace AirFighter
         {
             if (saveFileDialog.ShowDialog() == DialogResult.OK)
             {
-                if (_mapsCollection.SaveData(saveFileDialog.FileName))
+                try
                 {
+                    _mapsCollection.SaveData(saveFileDialog.FileName);
                     MessageBox.Show("Сохранение прошло успешно", "Результат",
-                   MessageBoxButtons.OK, MessageBoxIcon.Information);
+                  MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogInformation($"Сохранение в файл {saveFileDialog.FileName} прошло успешно");
                 }
-                else
+                catch(Exception ex)
                 {
-                    MessageBox.Show("Не сохранилось", "Результат",
+                    MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат",
                    MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    _logger.LogWarning($"Не удалось сохранить в файл. Ошибка: {ex.Message}");
                 }
             }
         }
@@ -258,18 +300,53 @@ namespace AirFighter
         {
             if (openFileDialog.ShowDialog() == DialogResult.OK)
             {
-                if (_mapsCollection.LoadData(openFileDialog.FileName))
+                try
                 {
+                    _mapsCollection.LoadData(openFileDialog.FileName);
                     MessageBox.Show("Загрузка прошла успешно", "Результат",
-                   MessageBoxButtons.OK, MessageBoxIcon.Information);
+                  MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogInformation($"Загрузка из файла {openFileDialog.FileName} прошла успешна");
                     ReloadMaps();
                 }
-                else
+                catch(Exception ex)
                 {
-                    MessageBox.Show("Загрузка не удалась", "Результат",
+                    MessageBox.Show($"Загрузка не удалась: {ex.Message}", "Результат",
                    MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    _logger.LogWarning($"Не удалось загрузить из файла. Ошибка: {ex.Message}");
                 }
             }
         }
+        /// <summary>
+        /// Сортировка по типу
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonSortByType_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            _mapsCollection[listBoxMaps.SelectedItem?.ToString() ??
+           string.Empty].Sort(new AirFighterCompareByType());
+            pictureBox.Image =
+           _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+        /// <summary>
+        /// Сортировка по цвету
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonSortByColor_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            _mapsCollection[listBoxMaps.SelectedItem?.ToString() ??
+           string.Empty].Sort(new AirFighterCompareByColor());
+            pictureBox.Image =
+           _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
     }
 }

AirFighter/AirFighter/FormMapWithSetAirFighters.resx

@@ -66,4 +66,7 @@
   <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>311, 17</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>25</value>
+  </metadata>
 </root>

AirFighter/AirFighter/IDrawningObject.cs

@@ -9,7 +9,7 @@ namespace AirFighter
     /// <summary>
     /// Интерфейс для работы с объектом, прорисовываемым на форме
     /// </summary>
-    internal interface IDrawningObject
+    internal interface IDrawningObject : IEquatable<IDrawningObject>
     {
         /// <summary>
         /// Шаг перемещения объекта

AirFighter/AirFighter/MapWithSetAirFightersGeneric.cs

@@ -12,7 +12,7 @@ namespace AirFighter
     /// <typeparam name="T"></typeparam>
     /// <typeparam name="U"></typeparam>
     internal class MapWithSetAirFightersGeneric<T, U>
-        where T : class, IDrawningObject
+        where T : class, IDrawningObject, IEquatable<T>
         where U : AbstractMap
     {
         /// <summary>
@@ -139,6 +139,14 @@ namespace AirFighter
             }
         }
         /// <summary>
+        /// Сортировка
+        /// </summary>
+        /// <param name="comparer"></param>
+        public void Sort(IComparer<T> comparer)
+        {
+            _setAirFighters.SortSet(comparer);
+        }
+        /// <summary>
         /// "Взбалтываем" набор, чтобы все элементы оказались в начале
         /// </summary>
         private void Shaking()

AirFighter/AirFighter/MapsCollection.cs

@@ -114,11 +114,11 @@ namespace AirFighter
         /// </summary>
         /// <param name = "filename" ></ param >
         /// < returns ></ returns >
-        public bool LoadData(string filename)
+        public void LoadData(string filename)
         {
             if (!File.Exists(filename))
             {
-                return false;
+                throw new FileNotFoundException("Файл не найден");
             }
             string bufferTextFromFile = "";
             using (StreamReader sr = new(filename))
@@ -126,7 +126,7 @@ namespace AirFighter
                 string checkMap = sr.ReadLine();
                 if (!checkMap.Contains("MapsCollection"))
                 {
-                    return false;
+                    throw new FileFormatException("Формат данных в файле не правильный");
                 }
                 bufferTextFromFile = sr.ReadLine();
                 _mapStorages.Clear();
@@ -148,7 +148,6 @@ namespace AirFighter
                     bufferTextFromFile = sr.ReadLine();
                 }
             }
-            return true;
         }
     }
 }

AirFighter/AirFighter/Program.cs

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

AirFighter/AirFighter/SetAirFightersGeneric.cs

@@ -12,7 +12,7 @@ namespace AirFighter
     /// </summary>
     /// <typeparam name="T"></typeparam>
     internal class SetAirFightersGeneric<T>
-        where T: class
+        where T: class, IEquatable<T>
     {
         /// <summary>
         /// Список объектов, которые храним
@@ -52,6 +52,14 @@ namespace AirFighter
         /// <returns></returns>
         public int Insert(T airFighter, int position)
         {
+            if (_places.Contains(airFighter))
+            {
+                throw new ArgumentException("Элемент с такими характеристиками существует в хранилище");
+            }
+            if (Count >= _maxCount)
+            {
+                throw new StorageOverflowException();
+            }
             if (position < 0 && position > _maxCount)
             {
                 return -1;
@@ -69,14 +77,16 @@ namespace AirFighter
     /// <returns></returns>
     public T Remove(int position)
     {
-            if (position >= 0 && position < _maxCount && _places[position] != null)
+            if (position >= 0 && position < Count)
             {
                 T temp = _places[position];
                 _places.RemoveAt(position);
                 return temp;
             }
             else
-                return null;
+            {
+                throw new AirFighterNotFoundException(position);
+            }
         }
         /// <summary>
         /// Получение объекта из набора по позиции
@@ -120,5 +130,17 @@ namespace AirFighter
                 }
             }
         }
+        /// <summary>
+        /// Сортировка набора объектов
+        /// </summary>
+        /// <param name="comparer"></param>
+        public void SortSet(IComparer<T> comparer)
+        {
+            if (comparer == null)
+            {
+                return;
+            }
+            _places.Sort(comparer);
+        }
     }
 }

AirFighter/AirFighter/StorageOverflowException.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirFighter
+{
+    [Serializable]
+    internal class StorageOverflowException : ApplicationException
+    {
+        public StorageOverflowException(int count) : base($"В наборе превышено допустимое количество: { count}") { }
+        public StorageOverflowException() : base() { }
+        public StorageOverflowException(string message) : base(message) { }
+        public StorageOverflowException(string message, Exception exception) :
+            base(message, exception)
+        { }
+        protected StorageOverflowException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+    }
+}

AirFighter/AirFighter/serilogconfig.json

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