Сортировка

AirBomber/AirBomber/AirBomberCompareByColor.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirBomber
+{
+    internal class AirBomberCompareByColor : IComparer<IDrawningObject>
+    {
+        public int Compare(IDrawningObject? x, IDrawningObject? y)
+        {
+            // TODO реализовать логику сравнения
+            throw new NotImplementedException();
+        }
+    }
+}

AirBomber/AirBomber/AirBomberCompareByType.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirBomber
+{
+    internal class AirBomberCompareByType : 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 xAirBomber = x as DrawningObjectBomber;
+            var yAirBomber = y as DrawningObjectBomber;
+            if (xAirBomber == null && yAirBomber == null)
+            {
+                return 0;
+            }
+            if (xAirBomber == null && yAirBomber != null)
+            {
+                return 1;
+            }
+            if (xAirBomber != null && yAirBomber == null)
+            {
+                return -1;
+            }
+            if (xAirBomber.GetBomber.GetType().Name != yAirBomber.GetBomber.GetType().Name)
+            {
+                if (xAirBomber.GetBomber.GetType().Name == "DrawningBomber")
+                {
+                    return -1;
+                }
+            }
+            var speedCompare = xAirBomber.GetBomber.AirBomber.Speed.CompareTo(yAirBomber.GetBomber.AirBomber.Speed);
+            if (speedCompare != 0)
+            {
+                return speedCompare;
+            }
+            return xAirBomber.GetBomber.AirBomber.Weight.CompareTo(yAirBomber.GetBomber.AirBomber.Weight);
+        }
+    }
+}

AirBomber/AirBomber/DrawningObjectBomber.cs

@@ -17,6 +17,8 @@ namespace AirBomber
 
         public float Step => _airBomber?.AirBomber?.Step ?? 0;
 
+        public DrawningBomber GetBomber => _airBomber;
+
         public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
         {
             return _airBomber?.GetCurrentPosition() ?? default;

AirBomber/AirBomber/FormMapWithSetAirBomber.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.groupBox1.SuspendLayout();
             this.groupBoxMaps.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
@@ -59,6 +61,8 @@
             // 
             // groupBox1
             // 
+            this.groupBox1.Controls.Add(this.ButtonSortByColor);
+            this.groupBox1.Controls.Add(this.ButtonSortByType);
             this.groupBox1.Controls.Add(this.groupBoxMaps);
             this.groupBox1.Controls.Add(this.buttonRight);
             this.groupBox1.Controls.Add(this.buttonDown);
@@ -86,7 +90,7 @@
             this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap);
             this.groupBoxMaps.Location = new System.Drawing.Point(22, 32);
             this.groupBoxMaps.Name = "groupBoxMaps";
-            this.groupBoxMaps.Size = new System.Drawing.Size(150, 326);
+            this.groupBoxMaps.Size = new System.Drawing.Size(150, 297);
             this.groupBoxMaps.TabIndex = 11;
             this.groupBoxMaps.TabStop = false;
             this.groupBoxMaps.Text = "Карты";
@@ -103,7 +107,7 @@
             // 
             // buttonDeleteMap
             // 
-            this.buttonDeleteMap.Location = new System.Drawing.Point(0, 273);
+            this.buttonDeleteMap.Location = new System.Drawing.Point(0, 255);
             this.buttonDeleteMap.Name = "buttonDeleteMap";
             this.buttonDeleteMap.Size = new System.Drawing.Size(150, 34);
             this.buttonDeleteMap.TabIndex = 4;
@@ -267,14 +271,14 @@
             // SaveToolStripMenuItem
             // 
             this.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
-            this.SaveToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.SaveToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
             this.SaveToolStripMenuItem.Text = "Сохранение";
             this.SaveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click);
             // 
             // LoadToolStripMenuItem
             // 
             this.LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
-            this.LoadToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.LoadToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
             this.LoadToolStripMenuItem.Text = "Загрузка";
             this.LoadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click);
             // 
@@ -287,6 +291,26 @@
             // 
             this.saveFileDialog.Filter = "txt file | *.txt";
             // 
+            // ButtonSortByType
+            // 
+            this.ButtonSortByType.Location = new System.Drawing.Point(22, 344);
+            this.ButtonSortByType.Name = "ButtonSortByType";
+            this.ButtonSortByType.Size = new System.Drawing.Size(150, 29);
+            this.ButtonSortByType.TabIndex = 12;
+            this.ButtonSortByType.Text = "Сортировать по типу";
+            this.ButtonSortByType.UseVisualStyleBackColor = true;
+            this.ButtonSortByType.Click += new System.EventHandler(this.ButtonSortByType_Click);
+            // 
+            // ButtonSortByColor
+            // 
+            this.ButtonSortByColor.Location = new System.Drawing.Point(22, 379);
+            this.ButtonSortByColor.Name = "ButtonSortByColor";
+            this.ButtonSortByColor.Size = new System.Drawing.Size(150, 28);
+            this.ButtonSortByColor.TabIndex = 13;
+            this.ButtonSortByColor.Text = "Сортировать по цвету";
+            this.ButtonSortByColor.UseVisualStyleBackColor = true;
+            this.ButtonSortByColor.Click += new System.EventHandler(this.ButtonSortByColor_Click);
+            // 
             // FormMapWithSetAirBomber
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
@@ -335,5 +359,7 @@
         private ToolStripMenuItem LoadToolStripMenuItem;
         private OpenFileDialog openFileDialog;
         private SaveFileDialog saveFileDialog;
+        private Button ButtonSortByColor;
+        private Button ButtonSortByType;
     }
 }

AirBomber/AirBomber/FormMapWithSetAirBomber.cs

@@ -261,5 +261,20 @@ namespace AirBomber
                 }
             }
         }
+
+        private void ButtonSortByType_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].Sort(new AirBomberCompareByType());
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+
+        private void ButtonSortByColor_Click(object sender, EventArgs e)
+        {
+            // TODO прописать логику
+        }
     }
 }

AirBomber/AirBomber/MapWithSetAirBomberGeneric.cs

@@ -83,6 +83,11 @@ namespace AirBomber
             }
         } 
 
+        public void Sort(IComparer<T> comparer)
+        {
+            _setAirBomber.SortSet(comparer);
+        }
+
         private void Shaking()
         {
             int j = _setAirBomber.Count - 1;

AirBomber/AirBomber/SetAirBomberGeneric.cs

@@ -88,5 +88,14 @@ namespace AirBomber
                 }
             }
         }
+
+        public void SortSet(IComparer<T> comparer)
+        {
+            if (comparer == null)
+            {
+                return;
+            }
+            _places.Sort(comparer);
+        }
     }
 }