Готовая 8 лабораторная

DumpTruck/FormTruckCollection.Designer.cs

@@ -32,10 +32,6 @@
             this.panelStorages = new System.Windows.Forms.Panel();
             this.labelStorages = new System.Windows.Forms.Label();
             this.textBoxStorageName = new System.Windows.Forms.TextBox();
-            this.menuStripFile = new System.Windows.Forms.MenuStrip();
-            this.toolStripMenuItemFile = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItemSave = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItemLoad = new System.Windows.Forms.ToolStripMenuItem();
             this.buttonDelObject = new System.Windows.Forms.Button();
             this.buttonAddObject = new System.Windows.Forms.Button();
             this.listBoxStorages = new System.Windows.Forms.ListBox();
@@ -44,9 +40,15 @@
             this.labelTools = new System.Windows.Forms.Label();
             this.buttonRemoveTruck = new System.Windows.Forms.Button();
             this.buttonAddTruck = new System.Windows.Forms.Button();
+            this.menuStripFile = new System.Windows.Forms.MenuStrip();
+            this.toolStripMenuItemFile = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItemSave = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItemLoad = new System.Windows.Forms.ToolStripMenuItem();
             this.pictureBoxCollection = new System.Windows.Forms.PictureBox();
             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.panelTools.SuspendLayout();
             this.panelStorages.SuspendLayout();
             this.menuStripFile.SuspendLayout();
@@ -57,6 +59,8 @@
             // 
             this.panelTools.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.panelTools.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panelTools.Controls.Add(this.buttonSortByColor);
+            this.panelTools.Controls.Add(this.buttonSortByType);
             this.panelTools.Controls.Add(this.panelStorages);
             this.panelTools.Controls.Add(this.maskedTextBoxNumber);
             this.panelTools.Controls.Add(this.buttonRefreshCollection);
@@ -72,13 +76,12 @@
             // 
             this.panelStorages.Controls.Add(this.labelStorages);
             this.panelStorages.Controls.Add(this.textBoxStorageName);
-            this.panelStorages.Controls.Add(this.menuStripFile);
             this.panelStorages.Controls.Add(this.buttonDelObject);
             this.panelStorages.Controls.Add(this.buttonAddObject);
             this.panelStorages.Controls.Add(this.listBoxStorages);
             this.panelStorages.Location = new System.Drawing.Point(3, 18);
             this.panelStorages.Name = "panelStorages";
-            this.panelStorages.Size = new System.Drawing.Size(200, 246);
+            this.panelStorages.Size = new System.Drawing.Size(200, 215);
             this.panelStorages.TabIndex = 5;
             // 
             // labelStorages
@@ -97,40 +100,6 @@
             this.textBoxStorageName.Size = new System.Drawing.Size(150, 23);
             this.textBoxStorageName.TabIndex = 3;
             // 
-            // menuStripFile
-            //
-            this.menuStripFile.Dock = System.Windows.Forms.DockStyle.None;
-            this.menuStripFile.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripMenuItemFile});
-            this.menuStripFile.Location = new System.Drawing.Point(25, 222);
-            this.menuStripFile.Name = "menuStripFile";
-            this.menuStripFile.Size = new System.Drawing.Size(176, 24);
-            this.menuStripFile.TabIndex = 2;
-            this.menuStripFile.Text = "menuStripFile";
-            //
-            // toolStripMenuItemFile
-            //
-            this.toolStripMenuItemFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripMenuItemSave,
-            this.toolStripMenuItemLoad});
-            this.toolStripMenuItemFile.Name = "toolStripMenuItemFile";
-            this.toolStripMenuItemFile.Size = new System.Drawing.Size(48, 20);
-            this.toolStripMenuItemFile.Text = "Файл";
-            //
-            // toolStripMenuItemSave
-            //
-            this.toolStripMenuItemSave.Name = "toolStripMenuItemSave";
-            this.toolStripMenuItemSave.Size = new System.Drawing.Size(180, 22);
-            this.toolStripMenuItemSave.Text = "Сохранить";
-            this.toolStripMenuItemSave.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click);
-            //
-            // toolStripMenuItemLoad
-            //
-            this.toolStripMenuItemLoad.Name = "toolStripMenuItemLoad";
-            this.toolStripMenuItemLoad.Size = new System.Drawing.Size(180, 22);
-            this.toolStripMenuItemLoad.Text = "Загрузить";
-            this.toolStripMenuItemLoad.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click);
-            //
             // buttonDelObject
             // 
             this.buttonDelObject.Location = new System.Drawing.Point(25, 185);
@@ -163,14 +132,14 @@
             // 
             // maskedTextBoxNumber
             // 
-            this.maskedTextBoxNumber.Location = new System.Drawing.Point(28, 306);
+            this.maskedTextBoxNumber.Location = new System.Drawing.Point(28, 339);
             this.maskedTextBoxNumber.Name = "maskedTextBoxNumber";
             this.maskedTextBoxNumber.Size = new System.Drawing.Size(150, 23);
             this.maskedTextBoxNumber.TabIndex = 4;
             // 
             // buttonRefreshCollection
             // 
-            this.buttonRefreshCollection.Location = new System.Drawing.Point(28, 395);
+            this.buttonRefreshCollection.Location = new System.Drawing.Point(28, 404);
             this.buttonRefreshCollection.Name = "buttonRefreshCollection";
             this.buttonRefreshCollection.Size = new System.Drawing.Size(150, 30);
             this.buttonRefreshCollection.TabIndex = 3;
@@ -190,7 +159,7 @@
             // 
             // buttonRemoveTruck
             // 
-            this.buttonRemoveTruck.Location = new System.Drawing.Point(28, 335);
+            this.buttonRemoveTruck.Location = new System.Drawing.Point(28, 368);
             this.buttonRemoveTruck.Name = "buttonRemoveTruck";
             this.buttonRemoveTruck.Size = new System.Drawing.Size(150, 30);
             this.buttonRemoveTruck.TabIndex = 2;
@@ -200,7 +169,7 @@
             // 
             // buttonAddTruck
             // 
-            this.buttonAddTruck.Location = new System.Drawing.Point(28, 270);
+            this.buttonAddTruck.Location = new System.Drawing.Point(28, 303);
             this.buttonAddTruck.Name = "buttonAddTruck";
             this.buttonAddTruck.Size = new System.Drawing.Size(150, 30);
             this.buttonAddTruck.TabIndex = 1;
@@ -208,11 +177,45 @@
             this.buttonAddTruck.UseVisualStyleBackColor = true;
             this.buttonAddTruck.Click += new System.EventHandler(this.buttonAddTruck_Click);
             // 
+            // menuStripFile
+            // 
+            this.menuStripFile.Dock = System.Windows.Forms.DockStyle.None;
+            this.menuStripFile.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripMenuItemFile});
+            this.menuStripFile.Location = new System.Drawing.Point(9, 4);
+            this.menuStripFile.Name = "menuStripFile";
+            this.menuStripFile.Size = new System.Drawing.Size(56, 24);
+            this.menuStripFile.TabIndex = 2;
+            this.menuStripFile.Text = "menuStripFile";
+            // 
+            // toolStripMenuItemFile
+            // 
+            this.toolStripMenuItemFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripMenuItemSave,
+            this.toolStripMenuItemLoad});
+            this.toolStripMenuItemFile.Name = "toolStripMenuItemFile";
+            this.toolStripMenuItemFile.Size = new System.Drawing.Size(48, 20);
+            this.toolStripMenuItemFile.Text = "Файл";
+            // 
+            // toolStripMenuItemSave
+            // 
+            this.toolStripMenuItemSave.Name = "toolStripMenuItemSave";
+            this.toolStripMenuItemSave.Size = new System.Drawing.Size(133, 22);
+            this.toolStripMenuItemSave.Text = "Сохранить";
+            this.toolStripMenuItemSave.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click);
+            // 
+            // toolStripMenuItemLoad
+            // 
+            this.toolStripMenuItemLoad.Name = "toolStripMenuItemLoad";
+            this.toolStripMenuItemLoad.Size = new System.Drawing.Size(133, 22);
+            this.toolStripMenuItemLoad.Text = "Загрузить";
+            this.toolStripMenuItemLoad.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click);
+            // 
             // pictureBoxCollection
             // 
-            this.pictureBoxCollection.Location = new System.Drawing.Point(2, 3);
+            this.pictureBoxCollection.Location = new System.Drawing.Point(2, 31);
             this.pictureBoxCollection.Name = "pictureBoxCollection";
-            this.pictureBoxCollection.Size = new System.Drawing.Size(588, 445);
+            this.pictureBoxCollection.Size = new System.Drawing.Size(588, 417);
             this.pictureBoxCollection.TabIndex = 1;
             this.pictureBoxCollection.TabStop = false;
             // 
@@ -225,6 +228,26 @@
             // 
             this.saveFileDialog.Filter = "txt file | *.txt";
             // 
+            // buttonSortByType
+            // 
+            this.buttonSortByType.Location = new System.Drawing.Point(28, 238);
+            this.buttonSortByType.Name = "buttonSortByType";
+            this.buttonSortByType.Size = new System.Drawing.Size(150, 25);
+            this.buttonSortByType.TabIndex = 6;
+            this.buttonSortByType.Text = "Сортировка по типу";
+            this.buttonSortByType.UseVisualStyleBackColor = true;
+            this.buttonSortByType.Click += new System.EventHandler(this.ButtonSortByType_Click);
+            // 
+            // buttonSortByColor
+            // 
+            this.buttonSortByColor.Location = new System.Drawing.Point(28, 269);
+            this.buttonSortByColor.Name = "buttonSortByColor";
+            this.buttonSortByColor.Size = new System.Drawing.Size(150, 25);
+            this.buttonSortByColor.TabIndex = 7;
+            this.buttonSortByColor.Text = "Сортировка по цвету";
+            this.buttonSortByColor.UseVisualStyleBackColor = true;
+            this.buttonSortByColor.Click += new System.EventHandler(this.ButtonSortByColor_Click);
+            // 
             // FormTruckCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
@@ -232,6 +255,7 @@
             this.ClientSize = new System.Drawing.Size(800, 450);
             this.Controls.Add(this.pictureBoxCollection);
             this.Controls.Add(this.panelTools);
+            this.Controls.Add(this.menuStripFile);
             this.MainMenuStrip = this.menuStripFile;
             this.Name = "FormTruckCollection";
             this.Text = "FormTruckCollection";
@@ -243,6 +267,7 @@
             this.menuStripFile.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).EndInit();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
 		}
 
@@ -267,5 +292,7 @@
         private ToolStripMenuItem toolStripMenuItemLoad;
         private OpenFileDialog openFileDialog;
         private SaveFileDialog saveFileDialog;
+        private Button buttonSortByColor;
+        private Button buttonSortByType;
     }
 }

DumpTruck/FormTruckCollection.cs

@@ -46,7 +46,7 @@ namespace DumpTruck
             listBoxStorages.Items.Clear();
             for (int i = 0; i < _storage.Keys.Count; i++)
             {
-                listBoxStorages.Items.Add(_storage.Keys[i]);
+                listBoxStorages.Items.Add(_storage.Keys[i].Name);
             }
             if (listBoxStorages.Items.Count > 0 && (index == -1 || index
             >= listBoxStorages.Items.Count))
@@ -138,6 +138,11 @@ namespace DumpTruck
                 MessageBox.Show(ex.Message);
                 _logger.LogWarning($"Не удалось добавить объект: {ex.Message}");
             }
+            catch (ArgumentException ex)
+            {
+                MessageBox.Show(ex.Message);
+                _logger.LogWarning($"Не удалось добавить объект: {ex.Message}");
+            }
         }
 
         private void buttonAddTruck_Click(object sender, EventArgs e)
@@ -252,5 +257,36 @@ namespace DumpTruck
                 }
             }
         }
+
+        /// <summary>
+        /// Сортировка по типу
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonSortByType_Click(object sender, EventArgs e) => CompareTrucks(new TruckCompareByType());
+        /// <summary>
+        /// Сортировка по цвету
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonSortByColor_Click(object sender, EventArgs e) => CompareTrucks(new TruckCompareByColor());
+        /// <summary>
+        /// Сортировка по сравнителю
+        /// </summary>
+        /// <param name="comparer"></param>
+        private void CompareTrucks(IComparer<DrawingTruck?> comparer)
+        {
+            if (listBoxStorages.SelectedIndex == -1)
+            {
+                return;
+            }
+            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
+            if (obj == null)
+            {
+                return;
+            }
+            obj.Sort(comparer);
+            pictureBoxCollection.Image = obj.ShowTrucks();
+        }
     }
 }

DumpTruck/Generics/DrawingTruckEqutables.cs

@@ -0,0 +1,65 @@
+using DumpTruck.DrawingObjects;
+using DumpTruck.Entities;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DumpTruck.Generics
+{
+    internal class DrawiningCarEqutables : IEqualityComparer<DrawingTruck?>
+    {
+        public bool Equals(DrawingTruck? x, DrawingTruck? y)
+        {
+            if (x == null || x.EntityTruck == null)
+            {
+                throw new ArgumentNullException(nameof(x));
+            }
+            if (y == null || y.EntityTruck == null)
+            {
+                throw new ArgumentNullException(nameof(y));
+            }
+            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 DrawingDumpTruck && y is DrawingDumpTruck)
+            {
+                EntityDumpTruck xDumpTruck = (EntityDumpTruck)x.EntityTruck;
+                EntityDumpTruck yDumpTruck = (EntityDumpTruck)y.EntityTruck;
+
+                if (xDumpTruck.DumpBoxColor != yDumpTruck.DumpBoxColor)
+                    return false;
+
+                if (xDumpTruck.TentColor != yDumpTruck.TentColor)
+                    return false;
+
+                if (xDumpTruck.Tent != yDumpTruck.Tent)
+                    return false;
+
+                if (xDumpTruck.DumpBox != yDumpTruck.DumpBox)
+                    return false;
+            }
+            return true;
+        }
+        public int GetHashCode([DisallowNull] DrawingTruck obj)
+        {
+            return obj.GetHashCode();
+        }
+    }
+
+}

DumpTruck/Generics/SetGeneric.cs

@@ -26,6 +26,12 @@ namespace DumpTruck.Generics
 		/// Максимальное количество объектов в списке
 		/// </summary>
 		private readonly int _maxCount;
+        /// <summary>
+        /// Сортировка набора объектов
+        /// </summary>
+        /// <param name="comparer"></param>
+        public void SortSet(IComparer<T?> comparer) => _places.Sort(comparer);
+
         /// <summary>
         /// Конструктор
         /// </summary>
@@ -40,9 +46,9 @@ namespace DumpTruck.Generics
 		/// </summary>
 		/// <param name="truck">Добавляемый грузовик</param>
 		/// <returns></returns>
-		public int Insert(T truck)
+		public int Insert(T truck, IEqualityComparer<T?>? equal = null)
         {
-            return Insert(truck, 0);
+            return Insert(truck, 0, equal);
         }
         /// <summary>
         /// Добавление объекта в набор на конкретную позицию
@@ -50,12 +56,14 @@ namespace DumpTruck.Generics
         /// <param name="truck">Добавляемый грузовик</param>
         /// <param name="position">Позиция</param>
         /// <returns></returns>
-        public int Insert(T truck, int position)
+        public int Insert(T truck, int position, IEqualityComparer<T?>? equal = null)
         {
             if (position < 0 || position > Count)
                 throw new TruckNotFoundException(position);
             if (Count >= _maxCount)
                 throw new StorageOverflowException(_maxCount);
+            if (equal != null && _places.Contains(truck, equal))
+                throw new ArgumentException("Данный объект уже есть в коллекции");
             _places.Insert(position, truck);
             return position;
         }

DumpTruck/Generics/TruckCompareByColor.cs

@@ -0,0 +1,49 @@
+using DumpTruck.DrawingObjects;
+using DumpTruck.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DumpTruck.Generics
+{
+    internal class TruckCompareByColor : IComparer<DrawingTruck?>
+    {
+        public int Compare(DrawingTruck? x, DrawingTruck? y)
+        {
+            if (x == null || x.EntityTruck == null)
+            {
+                throw new ArgumentNullException(nameof(x));
+            }
+            if (y == null || y.EntityTruck == null)
+            {
+                throw new ArgumentNullException(nameof(y));
+            }
+            var bodyColorCompare = x.EntityTruck.BodyColor.Name.CompareTo(y.EntityTruck.BodyColor.Name);
+            if (bodyColorCompare != 0)
+            {
+                return bodyColorCompare;
+            }
+            if (x.EntityTruck is EntityDumpTruck xEntityDumpTruck && y.EntityTruck is EntityDumpTruck yEntityDumpTruck)
+            {
+                var dumpBoxColorCompare = xEntityDumpTruck.DumpBoxColor.Name.CompareTo(yEntityDumpTruck.DumpBoxColor.Name);
+                if (dumpBoxColorCompare != 0)
+                {
+                    return dumpBoxColorCompare;
+                }
+                var tentColorCompare = xEntityDumpTruck.TentColor.Name.CompareTo(yEntityDumpTruck.TentColor.Name);
+                if (tentColorCompare != 0)
+                {
+                    return tentColorCompare;
+                }
+            }
+            var speedCompare = x.EntityTruck.Speed.CompareTo(y.EntityTruck.Speed);
+            if (speedCompare != 0)
+            {
+                return speedCompare;
+            }
+            return x.EntityTruck.Weight.CompareTo(y.EntityTruck.Weight);
+        }
+    }
+}

DumpTruck/Generics/TruckCompareByType.cs

@@ -0,0 +1,35 @@
+using DumpTruck.DrawingObjects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DumpTruck.Generics
+{
+    internal class TruckCompareByType : IComparer<DrawingTruck?>
+    {
+        public int Compare(DrawingTruck? x, DrawingTruck? y)
+        {
+            if (x == null || x.EntityTruck == null)
+            {
+                throw new ArgumentNullException(nameof(x));
+            }
+            if (y == null || y.EntityTruck == null)
+            {
+                throw new ArgumentNullException(nameof(y));
+            }
+            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);
+        }
+    }
+
+}

DumpTruck/Generics/TrucksCollectionInfo.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DumpTruck.Generics
+{
+    internal class TrucksCollectionInfo : IEquatable<TrucksCollectionInfo>
+    {
+        public string Name { get; private set; }
+        public string Description { get; private set; }
+        public TrucksCollectionInfo(string name, string description)
+        {
+            Name = name;
+            Description = description;
+        }
+        public bool Equals(TrucksCollectionInfo? other)
+        {
+            if (Name == other?.Name)
+                return true;
+
+            return false;
+        }
+        public override int GetHashCode()
+        {
+            return Name.GetHashCode();
+        }
+    }
+
+}

DumpTruck/Generics/TrucksGenericCollection.cs

@@ -41,6 +41,12 @@ namespace DumpTruck.Generics
         /// Получение объектов коллекции
         /// </summary>
         public IEnumerable<T?> GetTrucks => _collection.GetTrucks();
+        /// <summary>
+        /// Сортировка
+        /// </summary>
+        /// <param name="comparer"></param>
+        public void Sort(IComparer<T?> comparer) => _collection.SortSet(comparer);
+
         /// <summary>
         /// Конструктор
         /// </summary>
@@ -66,7 +72,7 @@ namespace DumpTruck.Generics
             {
                 return -1;
             }
-            return collect._collection.Insert(obj);
+            return collect._collection.Insert(obj, new DrawiningCarEqutables());
         }
 		/// <summary>
 		/// Перегрузка оператора вычитания

DumpTruck/Generics/TrucksGenericStorage.cs

@@ -28,11 +28,11 @@ namespace DumpTruck.Generics
         /// <summary>
         /// Словарь (хранилище)
         /// </summary>
-        readonly Dictionary<string, TrucksGenericCollection<DrawingTruck, DrawningObjectTruck>> _truckStorages;
+        readonly Dictionary<TrucksCollectionInfo, TrucksGenericCollection<DrawingTruck, DrawningObjectTruck>> _truckStorages;
 		/// <summary>
 		/// Возвращение списка названий наборов
 		/// </summary>
-		public List<string> Keys => _truckStorages.Keys.ToList();
+		public List<TrucksCollectionInfo> Keys => _truckStorages.Keys.ToList();
 		/// <summary>
 		/// Ширина окна отрисовки
 		/// </summary>
@@ -48,7 +48,7 @@ namespace DumpTruck.Generics
 		/// <param name="pictureHeight"></param>
 		public TrucksGenericStorage(int pictureWidth, int pictureHeight)
 		{
-			_truckStorages = new Dictionary<string, TrucksGenericCollection<DrawingTruck, DrawningObjectTruck>>();
+			_truckStorages = new Dictionary<TrucksCollectionInfo, TrucksGenericCollection<DrawingTruck, DrawningObjectTruck>>();
 			_pictureWidth = pictureWidth;
 			_pictureHeight = pictureHeight;
 		}
@@ -58,7 +58,7 @@ namespace DumpTruck.Generics
 		/// <param name="name">Название набора</param>
 		public void AddSet(string name)
 		{
-            if (!_truckStorages.ContainsKey(name)) _truckStorages.Add(name, new TrucksGenericCollection<DrawingTruck, DrawningObjectTruck>(_pictureWidth, _pictureHeight));
+            if (!_truckStorages.ContainsKey(new TrucksCollectionInfo(name, string.Empty))) _truckStorages.Add(new TrucksCollectionInfo(name, string.Empty), new TrucksGenericCollection<DrawingTruck, DrawningObjectTruck>(_pictureWidth, _pictureHeight));
         }
 		/// <summary>
 		/// Удаление набора
@@ -66,7 +66,7 @@ namespace DumpTruck.Generics
 		/// <param name="name">Название набора</param>
 		public void DelSet(string name)
 		{
-            if (_truckStorages.ContainsKey(name)) _truckStorages.Remove(name);
+            if (_truckStorages.ContainsKey(new TrucksCollectionInfo(name, string.Empty))) _truckStorages.Remove(new TrucksCollectionInfo(name, string.Empty));
         }
 		/// <summary>
 		/// Доступ к набору
@@ -78,7 +78,8 @@ namespace DumpTruck.Generics
         {
             get
 			{
-                if (_truckStorages.ContainsKey(ind)) return _truckStorages[ind];
+                if (_truckStorages.ContainsKey(new TrucksCollectionInfo(ind, string.Empty))) 
+                    return _truckStorages[new TrucksCollectionInfo(ind, string.Empty)];
                 return null;
 			}
 		}
@@ -94,14 +95,14 @@ namespace DumpTruck.Generics
                 File.Delete(filename);
             }
             StringBuilder data = new();
-            foreach (KeyValuePair<string, TrucksGenericCollection<DrawingTruck, DrawningObjectTruck>> record in _truckStorages)
+            foreach (KeyValuePair<TrucksCollectionInfo, TrucksGenericCollection<DrawingTruck, DrawningObjectTruck>> record in _truckStorages)
             {
                 StringBuilder records = new();
                 foreach (DrawingTruck? elem in record.Value.GetTrucks)
                 {
                     records.Append($"{elem?.GetDataForSave(_separatorForObject)}{_separatorRecords}");
                 }
-                data.AppendLine($"{record.Key}{_separatorForKeyValue}{records}");
+                data.AppendLine($"{record.Key.Name}{_separatorForKeyValue}{records}");
             }
             if (data.Length == 0)
             {
@@ -153,7 +154,7 @@ namespace DumpTruck.Generics
                         }
                         }
                     }
-                    _truckStorages.Add(record[0], collection);
+                    _truckStorages.Add(new TrucksCollectionInfo(record[0], string.Empty), collection);
                 }
             }
         }