борьба с конфликтами завершена

HoistingCrane/HoistingCrane/CollectionGenericObjects/AbstractCompany.cs

@@ -1,71 +1,52 @@
 using HoistingCrane.Drawning;
-namespace HoistingCrane.CollectionGenericObjects;
+namespace HoistingCrane.CollectionGenericObjects
-public abstract class AbstractCompany
 {
+    public abstract class AbstractCompany
+    {
         /// <summary>
-    /// Размер места (ширина)
+        /// Ширина ячейки гаража
         /// </summary>
-    protected readonly int _placeSizeWidth = 180;
+        protected readonly int _placeSizeWidth = 150;
-
         /// <summary>
-    /// Размер места (высота)
+        /// Высота ячейки гаража
         /// </summary>
-    protected readonly int _placeSizeHeight = 100;
+        protected readonly int _placeSizeHeight = 90;
-
         /// <summary>
         /// Ширина окна
         /// </summary>
-    protected readonly int _pictureWidth;
+        protected readonly int pictureWidth;
-
         /// <summary>
         /// Высота окна
         /// </summary>
-    protected readonly int _pictureHeight;
+        protected readonly int pictureHeight;
-
         /// <summary>
-    /// Коллекция военных кораблей
+        /// Коллекция автомобилей
         /// </summary>
-    protected ICollectionGenericObjects<DrawningTrackedVehicle>? _collection = null;
+        protected ICollectionGenericObjects<DrawningTrackedVehicle>? arr = null;
-
         /// <summary>
-    /// Вычисление максимального количества элементов, которые можно разместить в окне
+        /// Максимальное количество гаражей
         /// </summary>
-    private int GetMaxCount => (_pictureWidth / _placeSizeWidth) * (_pictureHeight / _placeSizeHeight);
+        private int GetMaxCount
-
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    /// <param name="picWidth">Ширина окна</param>
-    /// <param name="picHeight">Высота окна</param>
-    /// <param name="collection">Коллекция военных кораблей</param>
-    public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningTrackedVehicle> collection)
         {
-        _pictureWidth = picWidth;
+            get
-        _pictureHeight = picHeight;
-        _collection = collection;
-        _collection.MaxCount = GetMaxCount;
-    }
-
-    /// <summary>
-    /// Перегрузка оператора сложения для класса
-    /// </summary>
-    /// <param name="company">Компания</param>
-    /// <param name="warship">Добавляемый объект</param>
-    /// <returns></returns>
-    public static int operator +(AbstractCompany company, DrawningTrackedVehicle warship)
             {
-        return company._collection.Insert(warship);
+                return (pictureWidth / _placeSizeWidth) * (pictureHeight * _placeSizeHeight);
+            }
+        }
+        public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningTrackedVehicle> array)
+        {
+            pictureWidth = picWidth;
+            pictureHeight = picHeight;
+            arr = array;
+            arr.MaxCount = GetMaxCount;
+        }
+        public static int operator +(AbstractCompany company, DrawningTrackedVehicle car)
+        {
+            return company.arr.Insert(car, new DrawningCraneEqutables());
         }
-
-    /// <summary>
-    /// Перегрузка оператора удаления для класса
-    /// </summary>
-    /// <param name="company">Компания</param>
-    /// <param name="position">Номер удаляемого объекта</param>
-    /// <returns></returns>
         public static DrawningTrackedVehicle operator -(AbstractCompany company, int position)
         {
-        return company._collection.Remove(position);
+            return company.arr?.Remove(position);
         }
 
     /// <summary>
@@ -110,5 +91,10 @@ public abstract class AbstractCompany
         /// Расстановка объектов
         /// </summary>
         protected abstract void SetObjectsPosition();
+        /// <summary>
+        /// Сортировка
+        /// </summary>
+        /// <param name="comparer"></param>
+        public void Sort(IComparer<DrawningTrackedVehicle> comparer) => arr?.CollectionSort(comparer);
+    }
 }
-

HoistingCrane/HoistingCrane/CollectionGenericObjects/ListGenericObjects.cs

@@ -94,7 +94,7 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T> where T : clas
 
         public IEnumerable<T?> GetItems()
         {
-        for (int i = 0; i < list.Count; i++)
+            for(int i = 0; i < list.Count; i++)
             {
                 yield return list[i];
             }
@@ -104,4 +104,5 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T> where T : clas
         {
             list.Sort(comparer);
         }
+    }
 }

HoistingCrane/HoistingCrane/CollectionGenericObjects/StorageCollection.cs

@@ -172,9 +172,9 @@ public class StorageCollection<T> where T : DrawningTrackedVehicle
                                     throw new InvalidOperationException("Объект не удалось добавить в коллекцию: " + record[2]);
                                 }
                             }
-                        catch (CollectionOverflowException ex)
+                            catch(CollectionOverflowException ex)
                             {
-                            throw new CollectionOverflowException("Коллекция переполнена");
+                                throw new CollectionOverflowException("Коллекция переполнена", ex);
                             }
                         }
                     }
@@ -196,4 +196,5 @@ public class StorageCollection<T> where T : DrawningTrackedVehicle
                 _ => null,
             };
         }
+    }
 }

HoistingCrane/HoistingCrane/Drawning/DrawningCraneCompareByColor.cs

@@ -0,0 +1,18 @@
+namespace HoistingCrane.Drawning
+{
+    public class DrawningCraneCompareByColor : IComparer<DrawningTrackedVehicle?>
+    {
+        public int Compare(DrawningTrackedVehicle? x, DrawningTrackedVehicle? y)
+        {
+            if (x == null || x.EntityTrackedVehicle == null) return -1;
+            if (y == null || y.EntityTrackedVehicle == null) return 1;
+            if (x.EntityTrackedVehicle.BodyColor.Name != y.EntityTrackedVehicle.BodyColor.Name)
+                return x.EntityTrackedVehicle.BodyColor.Name.CompareTo(y.EntityTrackedVehicle.BodyColor.Name);
+            var speedCompare = x.EntityTrackedVehicle.Speed.CompareTo(y.EntityTrackedVehicle.Speed);
+            if (speedCompare != 0) return speedCompare;
+            return x.EntityTrackedVehicle.Weight.CompareTo(y.EntityTrackedVehicle.Weight);
+        }
+    }
+}
+
+

HoistingCrane/HoistingCrane/Drawning/DrawningCraneCompareByType.cs

@@ -0,0 +1,21 @@
+namespace HoistingCrane.Drawning
+{
+    public class DrawningCraneCompareByType : IComparer<DrawningTrackedVehicle?>
+    {
+        /// <summary>
+        /// Сравнение по типу, скорости и весу
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns></returns>
+        public int Compare(DrawningTrackedVehicle? x, DrawningTrackedVehicle? y)
+        {
+            if (x == null || x.EntityTrackedVehicle == null) return -1;
+            if (y == null || y.EntityTrackedVehicle == null) return 1;
+            if (x.GetType().Name != y.GetType().Name) return x.GetType().Name.CompareTo(y.GetType().Name);
+            var speedCompare = x.EntityTrackedVehicle.Speed.CompareTo(y.EntityTrackedVehicle.Speed);
+            if(speedCompare != 0) return speedCompare;
+            return x.EntityTrackedVehicle.Weight.CompareTo(y.EntityTrackedVehicle.Weight);
+        }
+    }
+}

HoistingCrane/HoistingCrane/Drawning/DrawningCraneEqutables.cs

@@ -0,0 +1,32 @@
+using HoistingCrane.Entities;
+using System.Diagnostics.CodeAnalysis;
+
+namespace HoistingCrane.Drawning
+{
+    public class DrawningCraneEqutables : IEqualityComparer<DrawningTrackedVehicle>
+    {
+        public bool Equals(DrawningTrackedVehicle? x, DrawningTrackedVehicle? y)
+        {
+            if (x == null || x.EntityTrackedVehicle == null) return false;
+            if (y == null || y.EntityTrackedVehicle == null) return false;
+            if (x.GetType().Name != y.GetType().Name) return false;
+            if (x.EntityTrackedVehicle.Speed != y.EntityTrackedVehicle.Speed) return false;
+            if (x.EntityTrackedVehicle.Weight != y.EntityTrackedVehicle.Weight) return false;
+            if (x.EntityTrackedVehicle.BodyColor != y.EntityTrackedVehicle.BodyColor) return false;
+            if ((x.EntityTrackedVehicle as EntityHoistingCrane)!= null && (y.EntityTrackedVehicle as EntityHoistingCrane)!=null)
+            {
+                var newX = x.EntityTrackedVehicle as EntityHoistingCrane;
+                var newY = y.EntityTrackedVehicle as EntityHoistingCrane;
+                if (newX?.AdditionalColor != newY?.AdditionalColor) return false;
+                if (newX?.Platform != newY?.Platform) return false;
+                if (newX?.Counterweight != newY?.Counterweight) return false;
+            }
+            return true;
+        }
+
+        public int GetHashCode([DisallowNull] DrawningTrackedVehicle obj)
+        {
+            return obj.GetHashCode();
+        }
+    }
+}

HoistingCrane/HoistingCrane/Drawning/StorageEqutables.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HoistingCrane.Drawning
+{
+    internal class StorageEqutables
+    {
+    }
+}

HoistingCrane/HoistingCrane/Exception/ObjectIsPresentInTheCollectionException.cs

@@ -6,6 +6,7 @@ namespace HoistingCrane.Exceptions
     {
         public ObjectIsPresentInTheCollectionException(int objName) : base("В коллекции уже присустствует объект " + objName) { }
         public ObjectIsPresentInTheCollectionException() : base() { }
+        public ObjectIsPresentInTheCollectionException(string message, Exception exception) : base(message, exception) { }
         protected ObjectIsPresentInTheCollectionException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }

HoistingCrane/HoistingCrane/FormCarCollection.Designer.cs

@@ -52,6 +52,8 @@
             loadToolStripMenuItem = new ToolStripMenuItem();
             saveFileDialog = new SaveFileDialog();
             openFileDialog = new OpenFileDialog();
+            buttonSortByType = new Button();
+            buttonSortByColor = new Button();
             groupBoxTools.SuspendLayout();
             panelCompanyTool.SuspendLayout();
             panelStorage.SuspendLayout();
@@ -68,7 +70,7 @@
             groupBoxTools.Dock = DockStyle.Right;
             groupBoxTools.Location = new Point(763, 24);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(210, 499);
+            groupBoxTools.Size = new Size(210, 524);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
@@ -76,20 +78,22 @@
             // panelCompanyTool
             // 
             panelCompanyTool.Anchor = AnchorStyles.None;
+            panelCompanyTool.Controls.Add(buttonSortByColor);
+            panelCompanyTool.Controls.Add(buttonSortByType);
             panelCompanyTool.Controls.Add(buttonCreateHoistingCrane);
             panelCompanyTool.Controls.Add(maskedTextBox);
             panelCompanyTool.Controls.Add(buttonRefresh);
             panelCompanyTool.Controls.Add(buttonGoToChek);
             panelCompanyTool.Controls.Add(buttonDeleteCar);
-            panelCompanyTool.Location = new Point(6, 319);
+            panelCompanyTool.Location = new Point(6, 296);
             panelCompanyTool.Name = "panelCompanyTool";
-            panelCompanyTool.Size = new Size(204, 185);
+            panelCompanyTool.Size = new Size(204, 221);
             panelCompanyTool.TabIndex = 8;
             // 
             // buttonCreateHoistingCrane
             // 
             buttonCreateHoistingCrane.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonCreateHoistingCrane.Location = new Point(9, 13);
+            buttonCreateHoistingCrane.Location = new Point(6, 3);
             buttonCreateHoistingCrane.Name = "buttonCreateHoistingCrane";
             buttonCreateHoistingCrane.Size = new Size(192, 22);
             buttonCreateHoistingCrane.TabIndex = 0;
@@ -100,7 +104,7 @@
             // maskedTextBox
             // 
             maskedTextBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            maskedTextBox.Location = new Point(9, 41);
+            maskedTextBox.Location = new Point(6, 31);
             maskedTextBox.Mask = "00";
             maskedTextBox.Name = "maskedTextBox";
             maskedTextBox.Size = new Size(192, 23);
@@ -109,7 +113,7 @@
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(9, 129);
+            buttonRefresh.Location = new Point(6, 119);
             buttonRefresh.Name = "buttonRefresh";
             buttonRefresh.Size = new Size(192, 27);
             buttonRefresh.TabIndex = 5;
@@ -120,7 +124,7 @@
             // buttonGoToChek
             // 
             buttonGoToChek.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToChek.Location = new Point(9, 99);
+            buttonGoToChek.Location = new Point(6, 89);
             buttonGoToChek.Name = "buttonGoToChek";
             buttonGoToChek.Size = new Size(192, 24);
             buttonGoToChek.TabIndex = 6;
@@ -131,7 +135,7 @@
             // buttonDeleteCar
             // 
             buttonDeleteCar.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonDeleteCar.Location = new Point(9, 70);
+            buttonDeleteCar.Location = new Point(6, 60);
             buttonDeleteCar.Name = "buttonDeleteCar";
             buttonDeleteCar.Size = new Size(192, 23);
             buttonDeleteCar.TabIndex = 4;
@@ -141,7 +145,7 @@
             // 
             // buttonCreateCompany
             // 
-            buttonCreateCompany.Location = new Point(12, 295);
+            buttonCreateCompany.Location = new Point(12, 267);
             buttonCreateCompany.Name = "buttonCreateCompany";
             buttonCreateCompany.Size = new Size(192, 23);
             buttonCreateCompany.TabIndex = 7;
@@ -161,12 +165,12 @@
             panelStorage.Dock = DockStyle.Top;
             panelStorage.Location = new Point(3, 19);
             panelStorage.Name = "panelStorage";
-            panelStorage.Size = new Size(204, 229);
+            panelStorage.Size = new Size(204, 216);
             panelStorage.TabIndex = 7;
             // 
             // buttonDeleteCollection
             // 
-            buttonDeleteCollection.Location = new Point(9, 199);
+            buttonDeleteCollection.Location = new Point(9, 186);
             buttonDeleteCollection.Name = "buttonDeleteCollection";
             buttonDeleteCollection.Size = new Size(192, 27);
             buttonDeleteCollection.TabIndex = 6;
@@ -178,14 +182,14 @@
             // 
             listBoxCollection.FormattingEnabled = true;
             listBoxCollection.ItemHeight = 15;
-            listBoxCollection.Location = new Point(9, 118);
+            listBoxCollection.Location = new Point(9, 101);
             listBoxCollection.Name = "listBoxCollection";
             listBoxCollection.Size = new Size(192, 79);
             listBoxCollection.TabIndex = 5;
             // 
             // buttonCollectionAdd
             // 
-            buttonCollectionAdd.Location = new Point(9, 81);
+            buttonCollectionAdd.Location = new Point(9, 72);
             buttonCollectionAdd.Name = "buttonCollectionAdd";
             buttonCollectionAdd.Size = new Size(192, 23);
             buttonCollectionAdd.TabIndex = 4;
@@ -196,7 +200,7 @@
             // radioButtonList
             // 
             radioButtonList.AutoSize = true;
-            radioButtonList.Location = new Point(128, 56);
+            radioButtonList.Location = new Point(128, 47);
             radioButtonList.Name = "radioButtonList";
             radioButtonList.Size = new Size(66, 19);
             radioButtonList.TabIndex = 3;
@@ -207,7 +211,7 @@
             // radioButtonMassive
             // 
             radioButtonMassive.AutoSize = true;
-            radioButtonMassive.Location = new Point(18, 56);
+            radioButtonMassive.Location = new Point(12, 47);
             radioButtonMassive.Name = "radioButtonMassive";
             radioButtonMassive.Size = new Size(67, 19);
             radioButtonMassive.TabIndex = 2;
@@ -237,7 +241,7 @@
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(12, 266);
+            comboBoxSelectorCompany.Location = new Point(12, 238);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
             comboBoxSelectorCompany.Size = new Size(192, 23);
             comboBoxSelectorCompany.TabIndex = 2;
@@ -248,7 +252,7 @@
             pictureBox.Dock = DockStyle.Fill;
             pictureBox.Location = new Point(0, 24);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(763, 499);
+            pictureBox.Size = new Size(763, 524);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             // 
@@ -292,11 +296,33 @@
             // 
             openFileDialog.Filter = "txt file | *.txt";
             // 
+            // buttonSortByType
+            // 
+            buttonSortByType.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonSortByType.Location = new Point(6, 152);
+            buttonSortByType.Name = "buttonSortByType";
+            buttonSortByType.Size = new Size(192, 27);
+            buttonSortByType.TabIndex = 7;
+            buttonSortByType.Text = "Сортировка по типу";
+            buttonSortByType.UseVisualStyleBackColor = true;
+            buttonSortByType.Click += buttonSortByType_Click;
+            // 
+            // buttonSortByColor
+            // 
+            buttonSortByColor.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonSortByColor.Location = new Point(6, 185);
+            buttonSortByColor.Name = "buttonSortByColor";
+            buttonSortByColor.Size = new Size(192, 27);
+            buttonSortByColor.TabIndex = 8;
+            buttonSortByColor.Text = "Сортировка по цвету";
+            buttonSortByColor.UseVisualStyleBackColor = true;
+            buttonSortByColor.Click += buttonSortByColor_Click;
+            // 
             // FormCarCollection
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(973, 523);
+            ClientSize = new Size(973, 548);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
             Controls.Add(menuStrip);
@@ -341,5 +367,7 @@
         private ToolStripMenuItem loadToolStripMenuItem;
         private SaveFileDialog saveFileDialog;
         private OpenFileDialog openFileDialog;
+        private Button buttonSortByColor;
+        private Button buttonSortByType;
     }
 }

HoistingCrane/HoistingCrane/FormCarCollection.cs

@@ -230,7 +230,7 @@ public partial class FormCarCollection : Form
                     _storageCollection.LoadData(openFileDialog.FileName);
                     RerfreshListBoxItems();
                     MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                logger.LogInformation("Загрузка из файла: {filename}", saveFileDialog.FileName.ToString());
+                    logger.LogInformation("Загрузка в файл: {filename}", saveFileDialog.FileName);
                 }
                 catch (Exception ex)
                 {
@@ -240,4 +240,22 @@ public partial class FormCarCollection : Form
             }
         }
 
+        private void buttonSortByType_Click(object sender, EventArgs e)
+        {
+            compareCars(new DrawningCraneCompareByType());
+        }
+
+        private void buttonSortByColor_Click(object sender, EventArgs e)
+        {
+            compareCars(new DrawningCraneCompareByColor());
+        }
+        
+        private void compareCars(IComparer<DrawningTrackedVehicle?> comparer)
+        {
+            if (_company == null) return;
+            _company.Sort(comparer);
+            pictureBox.Image = _company.Show();
+        }
+    }
+
 }

HoistingCrane/HoistingCrane/Program.cs

@@ -2,10 +2,10 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Serilog;
-namespace HoistingCrane;
+namespace HoistingCrane
-
-internal static class Program
 {
+    internal static class Program
+    {
         [STAThread]
         static void Main()
         {
@@ -37,4 +37,5 @@ internal static class Program
                     .CreateLogger());
             });
         }
+    }
 }