Лабораторная работа №8 (1 часть)

ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/AbstractCompany.cs

@@ -52,7 +52,7 @@ public abstract class AbstractCompany
     /// <returns></returns>
     public static int operator +(AbstractCompany company, DrawningTruck car)
     {
-        return company._collection.Insert(car);
+        return company._collection.Insert(car, new DrawningTruckEqutables());
     }
     /// <summary>
     /// Перегрузка оператора удаления для класса
@@ -105,4 +105,10 @@ public abstract class AbstractCompany
     /// Расстановка объектов
     /// </summary>
     protected abstract void SetObjectsPosition();
+
+    /// <summary>
+    /// Сортировка коллекции
+    /// </summary>
+    /// <param name="comparer">Сравнитель объектов</param>
+    public void Sort(IComparer<DrawningTruck?> comparer) => _collection?.CollectionSort(comparer);
 }

ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/CollectionInfo.cs

@@ -0,0 +1,72 @@
+namespace ProjectCleaningCar.CollectionGenericObjects;
+
+/// <summary>
+/// Класс, хранящиий информацию по коллекции
+/// </summary>
+public class CollectionInfo : IEquatable<CollectionInfo>
+{
+    /// <summary>
+    /// Название
+    /// </summary>
+    public string Name { get; private set; }
+    /// <summary>
+    /// Тип
+    /// </summary>
+    public CollectionType CollectionType { get; private set; }
+    /// <summary>
+    /// Описание
+    /// </summary>
+    public string Description { get; private set; }
+
+    /// <summary>
+    /// Разделитель для записи информации по объекту в файл
+    /// </summary>
+    private static readonly string _separator = "-";
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="name">Название</param>
+    /// <param name="collectionType">Тип</param>
+    /// <param name="description">Описание</param>
+    public CollectionInfo(string name, CollectionType collectionType, string description)
+    {
+        Name = name;
+        CollectionType = collectionType;
+        Description = description;
+    }
+
+    /// <summary>
+    /// Создание объекта из строки
+    /// </summary>
+    /// <param name="data">Строка</param>
+    /// <returns>Объект или null</returns>
+    public static CollectionInfo? GetCollectionInfo(string data)
+    {
+        string[] strs = data.Split(_separator, StringSplitOptions.RemoveEmptyEntries);
+        if (strs.Length < 1 || strs.Length > 3)
+        {
+            return null;
+        }
+        return new CollectionInfo(strs[0],
+        (CollectionType)Enum.Parse(typeof(CollectionType), strs[1]), strs.Length > 2 ? strs[2] : string.Empty);
+    }
+
+    public override string ToString()
+    {
+        return Name + _separator + CollectionType + _separator + Description;
+    }
+
+    public bool Equals(CollectionInfo? other)
+    {
+        return Name == other?.Name;
+    }
+    public override bool Equals(object? obj)
+    {
+        return Equals(obj as CollectionInfo);
+    }
+    public override int GetHashCode()
+    {
+        return Name.GetHashCode();
+    }
+}

ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -1,4 +1,6 @@
-namespace ProjectCleaningCar.CollectionGenericObjects;
+using ProjectCleaningCar.Drawning;
+
+namespace ProjectCleaningCar.CollectionGenericObjects;
 /// <summary>
 /// Интерфейс описания действий для набора хранимых объектов
 /// </summary>
@@ -18,15 +20,17 @@ public interface ICollectionGenericObjects<T>
     /// Добавление объекта в коллекцию
     /// </summary>
     /// <param name="obj">Добавляемый объект</param>
+    /// <param name="comparer">Сравнение двух объектов</param>
     /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-    int Insert(T obj);
+    int Insert(T obj, IEqualityComparer<T?>? comparer = null);
     /// <summary>
     /// Добавление объекта в коллекцию на конкретную позицию
     /// </summary>
     /// <param name="obj">Добавляемый объект</param>
     /// <param name="position">Позиция</param>
+    /// <param name="comparer">Сравнение двух объектов</param>
     /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-    int Insert(T obj, int position);
+    int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null);
     /// <summary>
     /// Удаление объекта из коллекции с конкретной позиции
     /// </summary>
@@ -50,4 +54,10 @@ public interface ICollectionGenericObjects<T>
     /// </summary>
     /// <returns>Поэлементый вывод элементов коллекции</returns>
     IEnumerable<T?> GetItems();
+
+    /// <summary>
+    /// Сортировка коллекции
+    /// </summary>
+    /// <param name="comparer"></param>
+    void CollectionSort(IComparer<T?> comparer);
 }

ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/ListGenericObjects.cs

@@ -1,5 +1,6 @@
 namespace ProjectCleaningCar.CollectionGenericObjects;
 using Exceptions;
+using ProjectCleaningCar.Drawning;
 
 public class ListGenericObjects<T> : ICollectionGenericObjects<T>
     where T : class
@@ -45,16 +46,30 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
         return _collection[position];
     }
 
-    public int Insert(T obj)
+    public int Insert(T obj, IEqualityComparer<T?>? comparer = null)
     {
         if (Count == _maxCount) throw new CollectionOverflowException();
+        if (comparer != null)
+        {
+            if (_collection.Contains(obj, comparer))
+            {
+                throw new ObjectAlreadyExistsException(obj);
+            }
+        }
         _collection.Add(obj);
         return Count;
     }
-    public int Insert(T obj, int position)
+    public int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
     { 
         if (Count == _maxCount) throw new CollectionOverflowException();
         if (position >= Count || position < 0) throw new PositionOutOfCollectionException();
+        if (comparer != null)
+        {
+            if (_collection.Contains(obj, comparer))
+            {
+                throw new ObjectAlreadyExistsException(obj);
+            }
+        }
         _collection.Insert(position, obj);
         return position;
     }
@@ -74,4 +89,9 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
             yield return _collection[i];
         }
     }
+
+    public void CollectionSort(IComparer<T?> comparer)
+    {
+        _collection.Sort(comparer);
+    }
 }

ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,5 +1,7 @@
 namespace ProjectCleaningCar.CollectionGenericObjects;
 using Exceptions;
+using ProjectCleaningCar.Drawning;
+
 /// <summary>
 /// Параметризованный набор объектов
 /// </summary>
@@ -48,8 +50,18 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         if (_collection[position] == null) throw new ObjectNotFoundException();
         return _collection[position];
     }
-    public int Insert(T obj)
+    public int Insert(T obj, IEqualityComparer<T?>? comparer = null)
     {
+        if (comparer != null)
+        {
+            foreach (T? i in _collection)
+            {
+                if (comparer.Equals(i, obj))
+                {
+                    throw new ObjectAlreadyExistsException(i);
+                }
+            }
+        }
         for (int i = 0; i < Count; i++)
         {
             if (_collection[i] == null)
@@ -60,9 +72,21 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         }
         throw new CollectionOverflowException();
     }
-    public int Insert(T obj, int position)
+    public int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
     {
         if (position >= Count || position < 0) throw new PositionOutOfCollectionException();
+        
+        if (comparer != null)
+        {
+            foreach(T? i in _collection)
+            {
+                if (comparer.Equals(i, obj))
+                {
+                    throw new ObjectAlreadyExistsException(i);
+                }
+            }
+        }
+        
         if (_collection[position] == null)
         {
             _collection[position] = obj;
@@ -106,4 +130,9 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             yield return _collection[i];
         }
     }
+
+    public void CollectionSort(IComparer<T?> comparer)
+    {
+        Array.Sort(_collection, comparer);
+    }
 }

ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/StorageCollection.cs

@@ -3,6 +3,7 @@ using ProjectCleaningCar.Entities;
 using ProjectCleaningCar.Exceptions;
 using System.Data;
 using System.Text;
+using System.Xml.Linq;
 
 namespace ProjectCleaningCar.CollectionGenericObjects;
 
@@ -16,7 +17,7 @@ public class StorageCollection<T>
     /// <summary>
     /// Словарь (хранилище) с коллекциями
     /// </summary>
-    readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
+    readonly Dictionary<CollectionInfo, ICollectionGenericObjects<T>> _storages;
 
     /// <summary>
     /// Ключевое слово, с которого должен начинаться файл
@@ -36,14 +37,14 @@ public class StorageCollection<T>
     /// <summary>
     /// Возвращение списка названий коллекций
     /// </summary>
-    public List<string> Keys => _storages.Keys.ToList();
+    public List<CollectionInfo> Keys => _storages.Keys.ToList();
 
     /// <summary>
     /// Конструктор
     /// </summary>
     public StorageCollection()
     {
-        _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
+        _storages = new Dictionary<CollectionInfo, ICollectionGenericObjects<T>>();
     }
     /// <summary>
     /// Добавление коллекции в хранилище
@@ -52,17 +53,18 @@ public class StorageCollection<T>
     /// <param name="collectionType">тип коллекции</param>
     public void AddCollection(string name, CollectionType collectionType)
     {
-        if (name == null || _storages.ContainsKey(name))
+        CollectionInfo collectionInfo = new(name, collectionType, string.Empty);
+        if (name == null || _storages.ContainsKey(collectionInfo))
             return;
         switch (collectionType)
         {
             case CollectionType.None:
                 return;
             case CollectionType.Massive:
-                _storages[name] = new MassiveGenericObjects<T>();
+                _storages[collectionInfo] = new MassiveGenericObjects<T>();
                 return;
             case CollectionType.List:
-                _storages[name] = new ListGenericObjects<T>();
+                _storages[collectionInfo] = new ListGenericObjects<T>();
                 return;
             default: break;
         }
@@ -74,8 +76,9 @@ public class StorageCollection<T>
     /// <param name="name">Название коллекции</param>
     public void DelCollection(string name)
     {
-        if (_storages.ContainsKey(name))
+        CollectionInfo collectionInfo = new(name, CollectionType.None, string.Empty);
-            _storages.Remove(name);
+        if (_storages.ContainsKey(collectionInfo))
+            _storages.Remove(collectionInfo);
     }
 
     /// <summary>
@@ -87,8 +90,9 @@ public class StorageCollection<T>
     {
         get
         {
-            if (_storages.ContainsKey(name))
+            CollectionInfo collectionInfo = new(name, CollectionType.None, string.Empty);
-                return _storages[name];
+            if (_storages.ContainsKey(collectionInfo))
+                return _storages[collectionInfo];
             return null;
         }
     }
@@ -112,7 +116,7 @@ public class StorageCollection<T>
         using (StreamWriter writer = new(filename))
         {
             writer.Write(_collectionKey);
-            foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
+            foreach (KeyValuePair<CollectionInfo, ICollectionGenericObjects<T>> value in _storages)
             {
                 writer.Write(Environment.NewLine);
                 // не сохраняем пустые коллекции
@@ -122,8 +126,6 @@ public class StorageCollection<T>
                 }
                 writer.Write(value.Key);
                 writer.Write(_separatorForKeyValue);
-                writer.Write(value.Value.GetCollectionType);
-                writer.Write(_separatorForKeyValue);
                 writer.Write(value.Value.MaxCount);
                 writer.Write(_separatorForKeyValue);
 
@@ -167,21 +169,20 @@ public class StorageCollection<T>
             _storages.Clear();
             while ((line = reader.ReadLine()) != null)
             {
-                string[] record = line.Split(_separatorForKeyValue,
+                string[] record = line.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
-                StringSplitOptions.RemoveEmptyEntries);
+                if (record.Length != 3)
-                if (record.Length != 4)
                 {
                     continue;
                 }
-                CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
+                CollectionInfo? collectionInfo = CollectionInfo.GetCollectionInfo(record[0]) ?? throw new Exception("Не удалось определить информацию коллекции" + record[0]);
-                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
+                //CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
+                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionInfo.CollectionType);
                 if (collection == null)
                 {
                     throw new InvalidOperationException("Не удалось создать коллекцию");
                 }
-                collection.MaxCount = Convert.ToInt32(record[2]);
+                collection.MaxCount = Convert.ToInt32(record[1]);
-                string[] set = record[3].Split(_separatorItems,
+                string[] set = record[2].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
-                StringSplitOptions.RemoveEmptyEntries);
                 foreach (string elem in set)
                 {
                     if (elem?.CreateDrawningCar() is T truck)
@@ -199,7 +200,7 @@ public class StorageCollection<T>
                         }
                     }
                 }
-                _storages.Add(record[0], collection);
+                _storages.Add(collectionInfo, collection);
             }
         }
     }

ProjectCleaningCar/ProjectCleaningCar/Drawning/DrawningTruckCompareByColor.cs

@@ -0,0 +1,31 @@
+namespace ProjectCleaningCar.Drawning;
+
+/// <summary>
+/// Сравнение по цвету, скорости, весу
+/// </summary>
+public class DrawningTruckCompareByColor : IComparer<DrawningTruck?>
+{
+    public int Compare(DrawningTruck? x, DrawningTruck? y)
+    {
+        if (x == null || x.EntityTruck == null)
+        {
+            return 1;
+        }
+
+        if (y == null || y.EntityTruck == null)
+        {
+            return -1;
+        }
+        var bodycolorCompare = x.EntityTruck.BodyColor.Name.CompareTo(y.EntityTruck.BodyColor.Name);
+        if (bodycolorCompare != 0)
+        {
+            return bodycolorCompare;
+        }
+        var speedCompare = x.EntityTruck.Speed.CompareTo(y.EntityTruck.Speed);
+        if (speedCompare != 0)
+        {
+            return speedCompare;
+        }
+        return x.EntityTruck.Weight.CompareTo(y.EntityTruck.Weight);
+    }
+}

ProjectCleaningCar/ProjectCleaningCar/Drawning/DrawningTruckCompareByType.cs

@@ -0,0 +1,29 @@
+namespace ProjectCleaningCar.Drawning;
+
+/// <summary>
+/// Сравнение по типу, скорости, весу
+/// </summary>
+public class DrawningTruckCompareByType : IComparer<DrawningTruck?>
+{
+    public int Compare(DrawningTruck? x, DrawningTruck? y)
+    {
+        if (x == null || x.EntityTruck == null)
+        {
+            return -1;
+        }
+        if (y == null || y.EntityTruck == null)
+        {
+            return 1;
+        }
+        if (x.GetType().Name != y.GetType().Name)
+        {
+            return x.GetType().Name.CompareTo(y.GetType().Name);
+        }
+        var speedCompare = x.EntityTruck.Speed.CompareTo(y.EntityTruck.Speed);
+        if (speedCompare != 0)
+        {
+            return speedCompare;
+        }
+        return x.EntityTruck.Weight.CompareTo(y.EntityTruck.Weight);
+    }
+}

ProjectCleaningCar/ProjectCleaningCar/Drawning/DrawningTruckEqutables.cs

@@ -0,0 +1,47 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace ProjectCleaningCar.Drawning;
+
+/// <summary>
+/// Реализация сравнения двух объектов класса-прорисовки
+/// </summary>
+public class DrawningTruckEqutables : IEqualityComparer<DrawningTruck?>
+{
+    public bool Equals(DrawningTruck? x, DrawningTruck? y)
+    {
+        if (x == null || x.EntityTruck == null)
+        {
+            return false;
+        }
+        if (y == null || y.EntityTruck == null)
+        {
+            return false;
+        }
+        if (x.GetType().Name != y.GetType().Name)
+        {
+            return false;
+        }
+        if (x.EntityTruck.Speed != y.EntityTruck.Speed)
+        {
+            return false;
+        }
+        if (x.EntityTruck.Weight != y.EntityTruck.Weight)
+        {
+            return false;
+        }
+        if (x.EntityTruck.BodyColor != y.EntityTruck.BodyColor)
+        {
+            return false;
+        }
+        if (x is DrawningCleaningCar && y is DrawningCleaningCar)
+        {
+            // TODO доделать логику сравнения дополнительных параметров
+        }
+        return true;
+    }
+
+    public int GetHashCode([DisallowNull] DrawningTruck obj)
+    {
+        return obj.GetHashCode();
+    }
+}

ProjectCleaningCar/ProjectCleaningCar/Exceptions/ObjectAlreadyExistsException.cs

@@ -0,0 +1,16 @@
+using System.Runtime.Serialization;
+namespace ProjectCleaningCar.Exceptions;
+
+/// <summary>
+/// Класс, описывающий ошибку, что в коллекции уже есть такой элемент
+/// </summary>
+[Serializable]
+public class ObjectAlreadyExistsException : ApplicationException
+{
+    public ObjectAlreadyExistsException(object i) : base("В коллекции уже есть такой элемент " + i) { }
+    public ObjectAlreadyExistsException() : base() { }
+    public ObjectAlreadyExistsException(string message) : base(message) { }
+    public ObjectAlreadyExistsException(string message, Exception exception) : base(message, exception)
+    { }
+    protected ObjectAlreadyExistsException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+}

ProjectCleaningCar/ProjectCleaningCar/FormCleaningCarCollection.Designer.cs

@@ -52,6 +52,8 @@
             loadToolStripMenuItem = new ToolStripMenuItem();
             saveFileDialog = new SaveFileDialog();
             openFileDialog = new OpenFileDialog();
+            buttonSortByType = new Button();
+            buttonSortByColor = new Button();
             tools.SuspendLayout();
             panelCompanyTools.SuspendLayout();
             panelStorage.SuspendLayout();
@@ -68,13 +70,15 @@
             tools.Dock = DockStyle.Right;
             tools.Location = new Point(783, 24);
             tools.Name = "tools";
-            tools.Size = new Size(208, 582);
+            tools.Size = new Size(208, 658);
             tools.TabIndex = 0;
             tools.TabStop = false;
             tools.Text = "Инструменты";
             // 
             // panelCompanyTools
             // 
+            panelCompanyTools.Controls.Add(buttonSortByType);
+            panelCompanyTools.Controls.Add(buttonSortByColor);
             panelCompanyTools.Controls.Add(buttonRefresh);
             panelCompanyTools.Controls.Add(buttonGoToCheck);
             panelCompanyTools.Controls.Add(buttonAddTruck);
@@ -82,9 +86,9 @@
             panelCompanyTools.Controls.Add(buttonDelCar);
             panelCompanyTools.Dock = DockStyle.Bottom;
             panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(3, 354);
+            panelCompanyTools.Location = new Point(3, 351);
             panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(202, 225);
+            panelCompanyTools.Size = new Size(202, 304);
             panelCompanyTools.TabIndex = 7;
             // 
             // buttonRefresh
@@ -246,7 +250,7 @@
             pictureBox.Dock = DockStyle.Fill;
             pictureBox.Location = new Point(0, 24);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(783, 582);
+            pictureBox.Size = new Size(783, 658);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             // 
@@ -290,11 +294,31 @@
             // 
             openFileDialog.Filter = "txt file | *.txt";
             // 
+            // buttonSortByType
+            // 
+            buttonSortByType.Location = new Point(3, 219);
+            buttonSortByType.Name = "buttonSortByType";
+            buttonSortByType.Size = new Size(196, 38);
+            buttonSortByType.TabIndex = 8;
+            buttonSortByType.Text = "Сортировка по типу";
+            buttonSortByType.UseVisualStyleBackColor = true;
+            buttonSortByType.Click += ButtonSortByType_Click;
+            // 
+            // buttonSortByColor
+            // 
+            buttonSortByColor.Location = new Point(3, 263);
+            buttonSortByColor.Name = "buttonSortByColor";
+            buttonSortByColor.Size = new Size(196, 38);
+            buttonSortByColor.TabIndex = 7;
+            buttonSortByColor.Text = "Сортировка по цвету";
+            buttonSortByColor.UseVisualStyleBackColor = true;
+            buttonSortByColor.Click += ButtonSortByColor_Click;
+            // 
             // FormCleaningCarCollection
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(991, 606);
+            ClientSize = new Size(991, 682);
             Controls.Add(pictureBox);
             Controls.Add(tools);
             Controls.Add(menuStrip);
@@ -339,5 +363,7 @@
         private ToolStripMenuItem loadToolStripMenuItem;
         private SaveFileDialog saveFileDialog;
         private OpenFileDialog openFileDialog;
+        private Button buttonSortByType;
+        private Button buttonSortByColor;
     }
 }

ProjectCleaningCar/ProjectCleaningCar/FormCleaningCarCollection.cs

@@ -73,13 +73,18 @@ public partial class FormCleaningCarCollection : Form
                 pictureBox.Image = _company.Show();
                 _logger.LogInformation("Добавлен объект: {0}", truck.GetDataForSave());
             }
-        
+
         }
         catch (CollectionOverflowException)
         {
             MessageBox.Show("Не удалось добавить объект");
             _logger.LogError("Ошибка: В коллекции превышено допустимое количество");
         }
+        catch (ObjectAlreadyExistsException)
+        {
+            MessageBox.Show("Такой объект уже существует");
+            _logger.LogError("Ошибка: такой объект уже существует {0}", truck);
+        }
     }
 
     /// <summary>
@@ -105,12 +110,13 @@ public partial class FormCleaningCarCollection : Form
                 MessageBox.Show("Объект удален");
                 pictureBox.Image = _company.Show();
                 _logger.LogInformation("Удалён объект по позиции {0}", pos);
-            } else
+            }
+            else
             {
                 MessageBox.Show("Не удалось удалить объект");
             }
         }
-        catch (PositionOutOfCollectionException) 
+        catch (PositionOutOfCollectionException)
         {
             MessageBox.Show($"Ошибка при удалении по позиции {pos}");
             _logger.LogError("Ошибка при удалении по позиции {0}", pos);
@@ -150,10 +156,11 @@ public partial class FormCleaningCarCollection : Form
             FormCleaningCar form = new FormCleaningCar();
             form.SetCar = truck;
             form.ShowDialog();
-        } catch(ObjectNotFoundException)
+        }
+        catch (ObjectNotFoundException)
         {
             _logger.LogError("Ошибка при передаче объекта на FormCleaningCar");
-        } 
+        }
     }
     /// <summary>
     /// Перерисовка коллекции
@@ -203,7 +210,7 @@ public partial class FormCleaningCarCollection : Form
         listBoxCollection.Items.Clear();
         for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
         {
-            string? colName = _storageCollection.Keys?[i];
+            string? colName = _storageCollection.Keys?[i].Name;
             if (!string.IsNullOrEmpty(colName))
             {
                 listBoxCollection.Items.Add(colName);
@@ -278,7 +285,8 @@ public partial class FormCleaningCarCollection : Form
                 _storageCollection.SaveData(saveFileDialog.FileName);
                 MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 _logger.LogInformation("Сохранение в файл: {filename}", saveFileDialog.FileName);
-            } catch (Exception ex)
+            }
+            catch (Exception ex)
             {
                 MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 _logger.LogError("Ошибка: {Message}", ex.Message);
@@ -295,7 +303,7 @@ public partial class FormCleaningCarCollection : Form
     {
         if (openFileDialog.ShowDialog() == DialogResult.OK)
         {
-            
+
             try
             {
                 _storageCollection.LoadData(openFileDialog.FileName);
@@ -314,4 +322,31 @@ public partial class FormCleaningCarCollection : Form
             }
         }
     }
+
+    /// <summary>
+    /// Сортировка по типу
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonSortByType_Click(object sender, EventArgs e) => CompareTrucks(new DrawningTruckCompareByType());
+
+    /// <summary>
+    /// Сортировка по цвету
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonSortByColor_Click(object sender, EventArgs e) => CompareTrucks(new DrawningTruckCompareByColor());
+
+    /// <summary>
+    /// Сортировка по сравнителю
+    /// </summary>
+    private void CompareTrucks(IComparer<DrawningTruck?> comparer)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+        _company.Sort(comparer);
+        pictureBox.Image = _company.Show();
+    }
 }