AntiAircraftGun/AntiAircraftGun/AbstractMap.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace AntiAircraftGun
 {
-    internal abstract class AbstractMap : IEquatable<AbstractMap>
+    internal abstract class AbstractMap
     {
         private IDrawingObject _drawingObject = null;
         protected int[,] _map = null;
@@ -153,10 +153,5 @@ namespace AntiAircraftGun
         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)
-        {
-            return this == other && this._width == other._width && this._height == other._height && this._map == other._map && this._drawingObject == other._drawingObject;
-        }
     }
 }

AntiAircraftGun/AntiAircraftGun/AntiAircraftGunCompareByColor.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AntiAircraftGun
-{
-    internal class AntiAircraftGunCompareByColor : IComparer<IDrawingObject>
-    {
-        public int Compare(IDrawingObject? x, IDrawingObject? y)
-        {
-            if (x == null && y == null)
-            {
-                return 0;
-            }
-            if (x == null && y != null)
-            {
-                return 1;
-            }
-            if (x != null && y == null)
-            {
-                return -1;
-            }
-            var xAntiAircraftGun = x as DrawingObjectAntiAircraftGun;
-            var yAntiAircraftGun = y as DrawingObjectAntiAircraftGun;
-            if (xAntiAircraftGun == null && yAntiAircraftGun == null)
-            {
-                return 0;
-            }
-            if (xAntiAircraftGun == null && yAntiAircraftGun != null)
-            {
-                return 1;
-            }
-            if (xAntiAircraftGun != null && yAntiAircraftGun == null)
-            {
-                return -1;
-            }
-            if (xAntiAircraftGun.GetAntiAircraftGun.AntiAircraftGun.BodyColor == yAntiAircraftGun.GetAntiAircraftGun.AntiAircraftGun.BodyColor)
-            {
-                return 0;
-            }
-            if (xAntiAircraftGun.GetAntiAircraftGun.AntiAircraftGun.BodyColor.R.CompareTo(yAntiAircraftGun.GetAntiAircraftGun.AntiAircraftGun.BodyColor.R) == 0)
-            {
-                if (xAntiAircraftGun.GetAntiAircraftGun.AntiAircraftGun.BodyColor.G.CompareTo(yAntiAircraftGun.GetAntiAircraftGun.AntiAircraftGun.BodyColor.G) == 0)
-                {
-                    return xAntiAircraftGun.GetAntiAircraftGun.AntiAircraftGun.BodyColor.B.CompareTo(yAntiAircraftGun.GetAntiAircraftGun.AntiAircraftGun.BodyColor.B);
-                }
-                else return xAntiAircraftGun.GetAntiAircraftGun.AntiAircraftGun.BodyColor.G.CompareTo(yAntiAircraftGun.GetAntiAircraftGun.AntiAircraftGun.BodyColor.G);
-            }
-            else return xAntiAircraftGun.GetAntiAircraftGun.AntiAircraftGun.BodyColor.R.CompareTo(yAntiAircraftGun.GetAntiAircraftGun.AntiAircraftGun.BodyColor.R);
-        }
-    }
-}

AntiAircraftGun/AntiAircraftGun/AntiAircraftGunCompareByType.cs

@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AntiAircraftGun
-{
-    internal class AntiAircraftGunCompareByType : IComparer<IDrawingObject>
-    {
-        public int Compare(IDrawingObject? x, IDrawingObject? y)
-        {
-            if (x == null && y == null)
-            {
-                return 0;
-            }
-            if (x == null && y != null)
-            {
-                return 1;
-            }
-            if (x != null && y == null)
-            {
-                return -1;
-            }
-            var xAntiAircraftGun = x as DrawingObjectAntiAircraftGun;
-            var yAntiAircraftGun = y as DrawingObjectAntiAircraftGun;
-            if (xAntiAircraftGun == null && yAntiAircraftGun == null)
-            {
-                return 0;
-            }
-            if (xAntiAircraftGun == null && yAntiAircraftGun != null)
-            {
-                return 1;
-            }
-            if (xAntiAircraftGun != null && yAntiAircraftGun == null)
-            {
-                return -1;
-            }
-            if (xAntiAircraftGun.GetAntiAircraftGun.GetType().Name != yAntiAircraftGun.GetAntiAircraftGun.GetType().Name)
-            {
-                if (xAntiAircraftGun.GetAntiAircraftGun.GetType().Name == "DrawingAntiAircraftGun")
-                {
-                    return -1;
-                }
-                return 1;
-            }
-            var speedCompare = xAntiAircraftGun.GetAntiAircraftGun.AntiAircraftGun.Speed.CompareTo(yAntiAircraftGun.GetAntiAircraftGun.AntiAircraftGun.Speed);
-            if (speedCompare != 0)
-            {
-                return speedCompare;
-            }
-            return xAntiAircraftGun.GetAntiAircraftGun.AntiAircraftGun.Weight.CompareTo(yAntiAircraftGun.GetAntiAircraftGun.AntiAircraftGun.Weight);
-        }
-    }
-}

AntiAircraftGun/AntiAircraftGun/DrawingObjectAntiAircraftGun.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection.PortableExecutable;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -15,7 +14,6 @@ namespace AntiAircraftGun
             _antiAircraftGun = antiAircraftGun;
         }
         public float Step => _antiAircraftGun?.AntiAircraftGun?.Step ?? 0;
-        public DrawingAntiAircraftGun GetAntiAircraftGun => _antiAircraftGun;
         public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
         {
             return _antiAircraftGun?.GetCurrentPosition() ?? default;
@@ -37,49 +35,5 @@ namespace AntiAircraftGun
 
         public string GetInfo() => _antiAircraftGun?.GetDataForSave();
         public static IDrawingObject Create(string data) => new DrawingObjectAntiAircraftGun(data.CreateDrawingAntiAircraftGun());
-
-        public bool Equals(IDrawingObject? other)
-        {
-            if (other == null)
-            {
-                return false;
-            }
-            var otherAntiAircraftGun = other as DrawingObjectAntiAircraftGun;
-            if (otherAntiAircraftGun == null)
-            {
-                return false;
-            }
-            var antiAircraftGun = _antiAircraftGun.AntiAircraftGun;
-            var otherAntiAircraftGunAntiAircraftGun = otherAntiAircraftGun._antiAircraftGun.AntiAircraftGun;
-            if (antiAircraftGun.Speed != otherAntiAircraftGunAntiAircraftGun.Speed)
-            {
-                return false;
-            }
-            if (antiAircraftGun.Weight != otherAntiAircraftGunAntiAircraftGun.Weight)
-            {
-                return false;
-            }
-            if (antiAircraftGun.BodyColor != otherAntiAircraftGunAntiAircraftGun.BodyColor)
-            {
-                return false;
-            }
-
-            if (antiAircraftGun is EntityUpdateAntiAircraftGun && otherAntiAircraftGunAntiAircraftGun is EntityUpdateAntiAircraftGun)
-            {
-                var updateAntiAircraftGun = antiAircraftGun as EntityUpdateAntiAircraftGun;
-                var otherUpdateAntiAircraftGun = otherAntiAircraftGunAntiAircraftGun as EntityUpdateAntiAircraftGun;
-                if (updateAntiAircraftGun.DopColor != otherUpdateAntiAircraftGun.DopColor || updateAntiAircraftGun.Gun != otherUpdateAntiAircraftGun.Gun ||
-                    updateAntiAircraftGun.Radar != otherUpdateAntiAircraftGun.Radar)
-                {
-                    return false;
-                }
-            }
-            else if (antiAircraftGun is EntityUpdateAntiAircraftGun || otherAntiAircraftGunAntiAircraftGun is EntityUpdateAntiAircraftGun)
-            {
-                return false;
-            }
-
-            return true;
-        }
     }
 }

AntiAircraftGun/AntiAircraftGun/FormMapWithSetAntiAircraftGuns.Designer.cs

@@ -51,8 +51,6 @@
             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();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
             this.groupBoxMaps.SuspendLayout();
@@ -61,8 +59,6 @@
             // 
             // groupBox
             // 
-            this.groupBox.Controls.Add(this.ButtonSortByColor);
-            this.groupBox.Controls.Add(this.ButtonSortByType);
             this.groupBox.Controls.Add(this.buttonShowOnMap);
             this.groupBox.Controls.Add(this.buttonShowStorage);
             this.groupBox.Controls.Add(this.buttonRemoveAntiAircraftGun);
@@ -75,14 +71,14 @@
             this.groupBox.Dock = System.Windows.Forms.DockStyle.Right;
             this.groupBox.Location = new System.Drawing.Point(574, 28);
             this.groupBox.Name = "groupBox";
-            this.groupBox.Size = new System.Drawing.Size(238, 658);
+            this.groupBox.Size = new System.Drawing.Size(238, 579);
             this.groupBox.TabIndex = 0;
             this.groupBox.TabStop = false;
             this.groupBox.Text = "Инструменты";
             // 
             // buttonShowOnMap
             // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(20, 540);
+            this.buttonShowOnMap.Location = new System.Drawing.Point(20, 465);
             this.buttonShowOnMap.Name = "buttonShowOnMap";
             this.buttonShowOnMap.Size = new System.Drawing.Size(194, 29);
             this.buttonShowOnMap.TabIndex = 16;
@@ -92,7 +88,7 @@
             // 
             // buttonShowStorage
             // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(20, 505);
+            this.buttonShowStorage.Location = new System.Drawing.Point(20, 430);
             this.buttonShowStorage.Name = "buttonShowStorage";
             this.buttonShowStorage.Size = new System.Drawing.Size(194, 29);
             this.buttonShowStorage.TabIndex = 15;
@@ -102,7 +98,7 @@
             // 
             // buttonRemoveAntiAircraftGun
             // 
-            this.buttonRemoveAntiAircraftGun.Location = new System.Drawing.Point(20, 470);
+            this.buttonRemoveAntiAircraftGun.Location = new System.Drawing.Point(20, 395);
             this.buttonRemoveAntiAircraftGun.Name = "buttonRemoveAntiAircraftGun";
             this.buttonRemoveAntiAircraftGun.Size = new System.Drawing.Size(194, 29);
             this.buttonRemoveAntiAircraftGun.TabIndex = 14;
@@ -112,7 +108,7 @@
             // 
             // maskedTextBoxPosition
             // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(22, 437);
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(22, 362);
             this.maskedTextBoxPosition.Mask = "00";
             this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
             this.maskedTextBoxPosition.Size = new System.Drawing.Size(194, 27);
@@ -120,7 +116,7 @@
             // 
             // buttonAddAntiAircraftGun
             // 
-            this.buttonAddAntiAircraftGun.Location = new System.Drawing.Point(20, 402);
+            this.buttonAddAntiAircraftGun.Location = new System.Drawing.Point(20, 327);
             this.buttonAddAntiAircraftGun.Name = "buttonAddAntiAircraftGun";
             this.buttonAddAntiAircraftGun.Size = new System.Drawing.Size(194, 29);
             this.buttonAddAntiAircraftGun.TabIndex = 12;
@@ -133,7 +129,7 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowDown;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(103, 613);
+            this.buttonDown.Location = new System.Drawing.Point(108, 537);
             this.buttonDown.Name = "buttonDown";
             this.buttonDown.Size = new System.Drawing.Size(30, 29);
             this.buttonDown.TabIndex = 10;
@@ -145,7 +141,7 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowRight;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(138, 613);
+            this.buttonRight.Location = new System.Drawing.Point(143, 537);
             this.buttonRight.Name = "buttonRight";
             this.buttonRight.Size = new System.Drawing.Size(30, 29);
             this.buttonRight.TabIndex = 9;
@@ -157,7 +153,7 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowLeft;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(66, 613);
+            this.buttonLeft.Location = new System.Drawing.Point(71, 537);
             this.buttonLeft.Name = "buttonLeft";
             this.buttonLeft.Size = new System.Drawing.Size(30, 29);
             this.buttonLeft.TabIndex = 8;
@@ -169,7 +165,7 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowUp;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(103, 575);
+            this.buttonUp.Location = new System.Drawing.Point(108, 499);
             this.buttonUp.Name = "buttonUp";
             this.buttonUp.Size = new System.Drawing.Size(30, 29);
             this.buttonUp.TabIndex = 7;
@@ -193,7 +189,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(574, 658);
+            this.pictureBox.Size = new System.Drawing.Size(574, 579);
             this.pictureBox.TabIndex = 1;
             this.pictureBox.TabStop = false;
             // 
@@ -271,14 +267,14 @@
             // SaveToolStripMenuItem
             // 
             this.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
-            this.SaveToolStripMenuItem.Size = new System.Drawing.Size(177, 26);
+            this.SaveToolStripMenuItem.Size = new System.Drawing.Size(224, 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(177, 26);
+            this.LoadToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
             this.LoadToolStripMenuItem.Text = "Загрузка";
             this.LoadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click);
             // 
@@ -290,31 +286,11 @@
             // 
             this.saveFileDialog.Filter = "txt file | *.txt";
             // 
-            // ButtonSortByType
-            // 
-            this.ButtonSortByType.Location = new System.Drawing.Point(22, 297);
-            this.ButtonSortByType.Name = "ButtonSortByType";
-            this.ButtonSortByType.Size = new System.Drawing.Size(192, 29);
-            this.ButtonSortByType.TabIndex = 17;
-            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, 346);
-            this.ButtonSortByColor.Name = "ButtonSortByColor";
-            this.ButtonSortByColor.Size = new System.Drawing.Size(194, 29);
-            this.ButtonSortByColor.TabIndex = 18;
-            this.ButtonSortByColor.Text = "Сортировать по цвету";
-            this.ButtonSortByColor.UseVisualStyleBackColor = true;
-            this.ButtonSortByColor.Click += new System.EventHandler(this.ButtonSortByColor_Click);
-            // 
             // FormMapWithSetAntiAircraftGuns
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(812, 686);
+            this.ClientSize = new System.Drawing.Size(812, 607);
             this.Controls.Add(this.groupBoxMaps);
             this.Controls.Add(this.pictureBox);
             this.Controls.Add(this.groupBox);
@@ -359,7 +335,5 @@
         private ToolStripMenuItem LoadToolStripMenuItem;
         private OpenFileDialog openFileDialog;
         private SaveFileDialog saveFileDialog;
-        private Button ButtonSortByColor;
-        private Button ButtonSortByType;
     }
 }

AntiAircraftGun/AntiAircraftGun/FormMapWithSetAntiAircraftGuns.cs

@@ -145,8 +145,8 @@ namespace AntiAircraftGun
                 DrawingObjectAntiAircraftGun antiAircraftGun = new DrawingObjectAntiAircraftGun(drawingAntiAircraftGuns);
                 if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + antiAircraftGun != -1)
                 {
-                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
                     MessageBox.Show("Объект добавлен");
+                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
                     _logger.LogInformation($"Добавлен объект {drawingAntiAircraftGuns} на карту ");
                 }
                 else
@@ -308,33 +308,5 @@ namespace AntiAircraftGun
                 }
             }
         }
-        /// <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 AntiAircraftGunCompareByType());
-            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 AntiAircraftGunCompareByColor());
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-        }
     }
 }

AntiAircraftGun/AntiAircraftGun/IDrawingObject.cs

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

AntiAircraftGun/AntiAircraftGun/MapWithSetAntiAircraftGunsGeneric.cs

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

AntiAircraftGun/AntiAircraftGun/SetAntiAircraftGunsGeneric.cs

@@ -13,7 +13,7 @@ namespace AntiAircraftGun
     /// </summary>
     /// <typeparam name="T"></typeparam>
     internal class SetAntiAircraftGunsGeneric<T>
-        where T : class, IEquatable<T>
+        where T : class
     {
         /// <summary>
         /// Список объектов, которые храним
@@ -51,13 +51,9 @@ namespace AntiAircraftGun
         /// <returns></returns>
         public int Insert(T antiAircraftGun, int position)
         {
-            if (_places.All(p => p.Equals(antiAircraftGun) == false))
+            if (position >= _maxCount) throw new StorageOverflowException(_maxCount);
-            {
+            _places.Insert(position, antiAircraftGun);
-                if (position >= _maxCount) throw new StorageOverflowException(_maxCount);
+            return position;
-                _places.Insert(position, antiAircraftGun);
-                return position;
-            }
-            return - 1;
         }
         /// <summary>
         /// Удаление объекта из набора с конкретной позиции
@@ -108,17 +104,5 @@ namespace AntiAircraftGun
                 }
             }
         }
-        /// <summary>
-        /// Сортировка набора объектов
-        /// </summary>
-        /// <param name="comparer"></param>
-        public void SortSet(IComparer<T> comparer)
-        {
-            if (comparer == null)
-            {
-                return;
-            }
-            _places.Sort(comparer);
-        }
     }
 }