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

HoistingCrane/HoistingCrane/CollectionGenericObjects/AbstractCompany.cs

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

HoistingCrane/HoistingCrane/CollectionGenericObjects/ListGenericObjects.cs

@@ -41,48 +41,48 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T> where T : clas
 
     public CollectionType GetCollectionType => CollectionType.List;
 
-    public T? Get(int position)
+        public T? Get(int position)
-    {
-        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
-        return list[position];
-    }
-    public int Insert(T obj, IEqualityComparer<T>? comparer = null)
-    {
-        try
         {
-            if (list.Contains(obj, comparer)) throw new ObjectIsPresentInTheCollectionException(Count);
-            if (Count == _maxCount) throw new CollectionOverflowException(Count);
-            list.Add(obj);
-            return Count - 1;
-        }
-        catch (ObjectIsPresentInTheCollectionException ex)
-        {
-            MessageBox.Show(ex.Message);
-            return -1;
-        }
-    }
-    public int Insert(T obj, int position, IEqualityComparer<T>? comparer = null)
-    {
-        try
-        {
-            if (comparer != null && list.Contains(obj, comparer))
-            {
-                throw new ObjectIsPresentInTheCollectionException(Count);
-            }
-
-            if (Count == _maxCount) throw new CollectionOverflowException(Count);
-
             if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
-
+            return list[position];
-            list.Insert(position, obj);
-            return position;
         }
-        catch (ObjectIsPresentInTheCollectionException ex)
+        public int Insert(T obj, IEqualityComparer<T>? comparer = null)
         {
-            Console.WriteLine(ex.Message);
+            try
-            return -1;
+            {
+                if (list.Contains(obj, comparer)) throw new ObjectIsPresentInTheCollectionException(Count);
+                if (Count == _maxCount) throw new CollectionOverflowException(Count);
+                list.Add(obj);
+                return Count - 1;
+            }
+            catch (ObjectIsPresentInTheCollectionException ex)
+            {
+                MessageBox.Show(ex.Message);
+                return -1;
+            }
+        }
+        public int Insert(T obj, int position, IEqualityComparer<T>? comparer = null)
+        {
+            try
+            {
+                if (comparer != null && list.Contains(obj, comparer))
+                {
+                    throw new ObjectIsPresentInTheCollectionException(Count);
+                }
+
+                if (Count == _maxCount) throw new CollectionOverflowException(Count);
+
+                if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
+
+                list.Insert(position, obj);
+                return position;
+            }
+            catch (ObjectIsPresentInTheCollectionException ex)
+            {
+                Console.WriteLine(ex.Message);
+                return -1;
+            }
         }
-    }
 
     public T? Remove(int position)
     {
@@ -92,16 +92,17 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T> where T : clas
         return temp;
     }
 
-    public IEnumerable<T?> GetItems()
+        public IEnumerable<T?> GetItems()
-    {
-        for (int i = 0; i < list.Count; i++)
         {
-            yield return list[i];
+            for(int i = 0; i < list.Count; i++)
+            {
+                yield return list[i];
+            }
+        }
+
+        public void CollectionSort(IComparer<T> comparer)
+        {
+            list.Sort(comparer);
         }
     }
-
-    public void CollectionSort(IComparer<T> comparer)
-    {
-        list.Sort(comparer);
-    }
 }

HoistingCrane/HoistingCrane/CollectionGenericObjects/StorageCollection.cs

@@ -126,74 +126,75 @@ public class StorageCollection<T> where T : DrawningTrackedVehicle
         }
     }
 
-    /// <summary>
+        /// <summary>
-    /// Загрузка информации по грузовикам в хранилище из файла
+        /// Загрузка информации по грузовикам в хранилище из файла
-    /// </summary>
+        /// </summary>
-    /// <param name="filename"></param>
+        /// <param name="filename"></param>
-    /// <exception cref="Exception"></exception>
+        /// <exception cref="Exception"></exception>
-    public void LoadData(string filename)
+        public void LoadData(string filename)
-    {
-        if (!File.Exists(filename))
         {
-            throw new FileNotFoundException("Файл не существует");
+            if (!File.Exists(filename))
-        }
-        using (StreamReader fs = File.OpenText(filename))
-        {
-            string str = fs.ReadLine();
-            if (str == null || str.Length == 0)
             {
-                throw new InvalidOperationException("В файле не присутствуют данные");
+                throw new FileNotFoundException("Файл не существует");
             }
-            if (!str.StartsWith(_collectionKey))
+            using (StreamReader fs = File.OpenText(filename))
             {
-                throw new FormatException("В файле неверные данные");
+                string str = fs.ReadLine();
-            }
+                if (str == null || str.Length == 0)
-            dict.Clear();
-            string strs = "";
-            while ((strs = fs.ReadLine()) != null)
-            {
-                string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
-                if (record.Length != 3)
                 {
-                    continue;
+                    throw new InvalidOperationException("В файле не присутствуют данные");
                 }
-                CollectionInfo? collectionInfo = CollectionInfo.GetCollectionInfo(record[0]) ?? throw new InvalidOperationException("Не удалось определить информацию о коллекции: " + record[0]);
+                if (!str.StartsWith(_collectionKey))
-                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionInfo.collectionType) ?? throw new InvalidOperationException("Не удалось определить тип коллекции:" + record[1]);
-                collection.MaxCount = Convert.ToInt32(record[1]);
-                string[] set = record[2].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
-                foreach (string elem in set)
                 {
-                    if (elem?.CreateDrawningTrackedVehicle() is T crane)
+                    throw new FormatException("В файле неверные данные");
+                }
+                dict.Clear();
+                string strs = "";
+                while ((strs = fs.ReadLine()) != null)
+                {
+                    string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
+                    if (record.Length != 3)
                     {
-                        try
+                        continue;
+                    }
+                    CollectionInfo? collectionInfo = CollectionInfo.GetCollectionInfo(record[0]) ?? throw new InvalidOperationException("Не удалось определить информацию о коллекции: " + record[0]);
+                    ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionInfo.collectionType) ?? throw new InvalidOperationException("Не удалось определить тип коллекции:" + record[1]);
+                    collection.MaxCount = Convert.ToInt32(record[1]);
+                    string[] set = record[2].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+                    foreach (string elem in set)
+                    {
+                        if (elem?.CreateDrawningTrackedVehicle() is T crane)
                         {
-                            if (collection.Insert(crane) == -1)
+                            try
                             {
-                                throw new InvalidOperationException("Объект не удалось добавить в коллекцию: " + record[2]);
+                                if (collection.Insert(crane) == -1)
+                                {
+                                    throw new InvalidOperationException("Объект не удалось добавить в коллекцию: " + record[2]);
+                                }
+                            }
+                            catch(CollectionOverflowException ex)
+                            {
+                                throw new CollectionOverflowException("Коллекция переполнена", ex);
                             }
                         }
-                        catch (CollectionOverflowException ex)
-                        {
-                            throw new CollectionOverflowException("Коллекция переполнена");
-                        }
                     }
+                    dict.Add(collectionInfo, collection);
                 }
-                dict.Add(collectionInfo, collection);
             }
         }
-    }
+        /// <summary>
-    /// <summary>
+        /// Создание коллекции по типу
-    /// Создание коллекции по типу
+        /// </summary>
-    /// </summary>
+        /// <param name="collectionType"></param>
-    /// <param name="collectionType"></param>
+        /// <returns></returns>
-    /// <returns></returns>
+        private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
-    private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
-    {
-        return collectionType switch
         {
-            CollectionType.Massive => new MassivGenericObjects<T>(),
+            return collectionType switch
-            CollectionType.List => new ListGenericObjects<T>(),
+            {
-            _ => null,
+                CollectionType.Massive => new MassivGenericObjects<T>(),
-        };
+                CollectionType.List => new ListGenericObjects<T>(),
+                _ => 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

@@ -216,28 +216,46 @@ public partial class FormCarCollection : Form
         }
     }
 
-    /// <summary>
+        /// <summary>
-    /// Обработка нажатия "Загразка"
+        /// Обработка нажатия "Загразка"
-    /// </summary>
+        /// </summary>
-    /// <param name="sender"></param>
+        /// <param name="sender"></param>
-    /// <param name="e"></param>
+        /// <param name="e"></param>
-    private void loadToolStripMenuItem_Click(object sender, EventArgs e)
+        private void loadToolStripMenuItem_Click(object sender, EventArgs e)
-    {
-        if (openFileDialog.ShowDialog() == DialogResult.OK)
         {
-            try
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
             {
-                _storageCollection.LoadData(openFileDialog.FileName);
+                try
-                RerfreshListBoxItems();
+                {
-                MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _storageCollection.LoadData(openFileDialog.FileName);
-                logger.LogInformation("Загрузка из файла: {filename}", saveFileDialog.FileName.ToString());
+                    RerfreshListBoxItems();
-            }
+                    MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            catch (Exception ex)
+                    logger.LogInformation("Загрузка в файл: {filename}", saveFileDialog.FileName);
-            {
+                }
-                MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                catch (Exception ex)
-                logger.LogError("Ошибка: {Message}", ex.Message);
+                {
+                    MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    logger.LogError("Ошибка: {Message}", ex.Message);
+                }
             }
         }
+
+        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,39 +2,40 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Serilog;
-namespace HoistingCrane;
+namespace HoistingCrane
-
-internal static class Program
 {
-    [STAThread]
+    internal static class Program
-    static void Main()
     {
-        ApplicationConfiguration.Initialize();
+        [STAThread]
-        ServiceCollection services = new();
+        static void Main()
-        ConfigureServices(services);
-        using ServiceProvider serviceProvider = services.BuildServiceProvider();
-        Application.Run(serviceProvider.GetRequiredService<FormCarCollection>());
-    }
-    private static void ConfigureServices(ServiceCollection services)
-    {
-
-        string[] path = Directory.GetCurrentDirectory().Split('\\');
-        string pathNeed = "";
-        for (int i = 0; i < path.Length - 3; i++)
         {
-            pathNeed += path[i] + "\\";
+            ApplicationConfiguration.Initialize();
+            ServiceCollection services = new();
+            ConfigureServices(services);
+            using ServiceProvider serviceProvider = services.BuildServiceProvider();
+            Application.Run(serviceProvider.GetRequiredService<FormCarCollection>());
         }
-
+        private static void ConfigureServices(ServiceCollection services)
-
-        services.AddSingleton<FormCarCollection>()
-        .AddLogging(option =>
         {
-            option.SetMinimumLevel(LogLevel.Information);
+
-            option.AddSerilog(new LoggerConfiguration()
+            string[] path = Directory.GetCurrentDirectory().Split('\\');
-                .ReadFrom.Configuration(new ConfigurationBuilder()
+            string pathNeed = "";
-                    .AddJsonFile($"{pathNeed}serilog.json")
+            for (int i = 0; i < path.Length - 3; i++)
-                    .Build())
+            {
-                .CreateLogger());
+                pathNeed += path[i] + "\\";
-        });
+            }
+
+
+            services.AddSingleton<FormCarCollection>()
+            .AddLogging(option =>
+            {
+                option.SetMinimumLevel(LogLevel.Information);
+                option.AddSerilog(new LoggerConfiguration()
+                    .ReadFrom.Configuration(new ConfigurationBuilder()
+                        .AddJsonFile($"{pathNeed}serilog.json")
+                        .Build())
+                    .CreateLogger());
+            });
+        }
     }
 }