diff --git a/Excavator/Excavator/CollectionGenericObjects/AbsractCompany.cs b/Excavator/Excavator/CollectionGenericObjects/AbsractCompany.cs index e0f2baa..1e98832 100644 --- a/Excavator/Excavator/CollectionGenericObjects/AbsractCompany.cs +++ b/Excavator/Excavator/CollectionGenericObjects/AbsractCompany.cs @@ -57,9 +57,9 @@ public abstract class AbstractCompany /// Компания /// Добавляемый объект /// - public static int operator +(AbstractCompany company, DrawningSimpleExcavator car) + public static int operator +(AbstractCompany company, DrawningSimpleExcavator excavator) { - return company._collection.Insert(car); + return company._collection.Insert(excavator, new DrawningExcavatorEqutables()); } /// @@ -103,6 +103,12 @@ public abstract class AbstractCompany return bitmap; } + /// + /// Сортировка + /// + /// Сравнитель объектов + public void Sort(IComparer comparer) => _collection?.CollectionSort(comparer); + /// /// Вывод заднего фона /// diff --git a/Excavator/Excavator/CollectionGenericObjects/CollectionInfo.cs b/Excavator/Excavator/CollectionGenericObjects/CollectionInfo.cs new file mode 100644 index 0000000..94e554b --- /dev/null +++ b/Excavator/Excavator/CollectionGenericObjects/CollectionInfo.cs @@ -0,0 +1,76 @@ +namespace Excavator.CollectionGenericObjects; + +/// +/// Класс, хранящий информацию о коллекции +/// +public class CollectionInfo : IEquatable +{ + /// + /// Название + /// + public string Name { get; private set; } + + /// + /// Тип + /// + public CollectionType CollectionType { get; private set; } + + /// + /// Описание + /// + public string Description { get; private set; } + + /// + /// Разделитель для записи информации по объекту в файл + /// + private static readonly string _separator = "-"; + + /// + /// Конструктор + /// + /// Название + /// Тип + /// Описание + public CollectionInfo(string name, CollectionType collectionType, string description) + { + Name = name; + CollectionType = collectionType; + Description = description; + } + + /// + /// Создание объекта из строки + /// + /// Строка + /// Объект или null + 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(); + } +} diff --git a/Excavator/Excavator/CollectionGenericObjects/ICollectionGenericObjects.cs b/Excavator/Excavator/CollectionGenericObjects/ICollectionGenericObjects.cs index a157a28..f97505f 100644 --- a/Excavator/Excavator/CollectionGenericObjects/ICollectionGenericObjects.cs +++ b/Excavator/Excavator/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -22,7 +22,7 @@ public interface ICollectionGenericObjects /// /// Добавляемый объект /// true - вставка прошла удачно, false - вставка не удалась - int Insert(T obj); + int Insert(T obj, IEqualityComparer? comparer = null); /// /// Добавление объекта в коллекцию на конкретную позицию @@ -30,7 +30,7 @@ public interface ICollectionGenericObjects /// Добавляемый объект /// Позиция /// true - вставка прошла удачно, false - вставка не удалась - int Insert(T obj, int position); + int Insert(T obj, int position, IEqualityComparer? comparer = null); /// /// Удаление объекта из коллекции с конкретной позиции @@ -57,4 +57,10 @@ public interface ICollectionGenericObjects /// /// Поэлементный вывод элементов коллекции IEnumerable GetItems(); + + /// + /// Сортировка коллекции + /// + /// Сравнитель объектов + void CollectionSort(IComparer comparer); } diff --git a/Excavator/Excavator/CollectionGenericObjects/ListGenericObjects.cs b/Excavator/Excavator/CollectionGenericObjects/ListGenericObjects.cs index e8ed05e..fb772aa 100644 --- a/Excavator/Excavator/CollectionGenericObjects/ListGenericObjects.cs +++ b/Excavator/Excavator/CollectionGenericObjects/ListGenericObjects.cs @@ -45,14 +45,29 @@ public class ListGenericObjects : ICollectionGenericObjects return _collection[position]; } - public int Insert(T obj) + public int Insert(T obj, IEqualityComparer? comparer = null) { + if (comparer != null) + { + if (_collection.Contains(obj, comparer)) + { + throw new ObjectNotUniqueException(); + } + } if (Count == _maxCount) throw new CollectionOverflowException(Count); _collection.Add(obj); return Count; } - public int Insert(T obj, int position) + public int Insert(T obj, int position, IEqualityComparer? comparer = null) { + if (comparer != null) + { + if (_collection.Contains(obj, comparer)) + { + throw new ObjectNotUniqueException(); + } + } + if (Count == _maxCount) throw new CollectionOverflowException(Count); ; if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position); _collection.Insert(position, obj); @@ -74,5 +89,9 @@ public class ListGenericObjects : ICollectionGenericObjects yield return _collection[i]; } } + void ICollectionGenericObjects.CollectionSort(IComparer comparer) + { + _collection.Sort(comparer); + } } diff --git a/Excavator/Excavator/CollectionGenericObjects/MassiveGenericObjects.cs b/Excavator/Excavator/CollectionGenericObjects/MassiveGenericObjects.cs index 6a040d4..3f87330 100644 --- a/Excavator/Excavator/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/Excavator/Excavator/CollectionGenericObjects/MassiveGenericObjects.cs @@ -1,4 +1,6 @@ using Excavator.Exceptions; +using Excavator.Drawnings; +using System.Collections.Immutable; namespace Excavator.CollectionGenericObjects; @@ -59,9 +61,19 @@ public class MassiveGenericObjects : ICollectionGenericObjects return _collection[position]; } - public int Insert(T obj) + public int Insert(T obj, IEqualityComparer? comparer = null) { - for(int i = 0; i < Count; i++) + if (comparer != null) + { + foreach (T? item in _collection) + { + if ((comparer as IEqualityComparer).Equals(obj as DrawningSimpleExcavator, item as DrawningSimpleExcavator)) + { + throw new ObjectNotUniqueException(); + } + } + } + for (int i = 0; i < Count; i++) { if (_collection[i] == null) { @@ -73,7 +85,7 @@ public class MassiveGenericObjects : ICollectionGenericObjects throw new CollectionOverflowException(Count); } - public int Insert(T obj, int position) + public int Insert(T obj, int position, IEqualityComparer? comparer = null) { if (position < 0 || position >= Count) @@ -130,4 +142,9 @@ public class MassiveGenericObjects : ICollectionGenericObjects yield return _collection[i]; } } + + void ICollectionGenericObjects.CollectionSort(IComparer comparer) + { + Array.Sort(_collection, comparer); + } } \ No newline at end of file diff --git a/Excavator/Excavator/CollectionGenericObjects/StorageCollection.cs b/Excavator/Excavator/CollectionGenericObjects/StorageCollection.cs index addfd0e..7934e15 100644 --- a/Excavator/Excavator/CollectionGenericObjects/StorageCollection.cs +++ b/Excavator/Excavator/CollectionGenericObjects/StorageCollection.cs @@ -9,12 +9,12 @@ public class StorageCollection where T : DrawningSimpleExcavator /// /// Словарь (хранилище) с коллекциями /// - readonly Dictionary> _storages; + readonly Dictionary> _storages; /// /// Возвращение списка названий коллекций /// - public List Keys => _storages.Keys.ToList(); + public List Keys => _storages.Keys.ToList(); /// /// Ключевое слово, с которого должен начинаться файл @@ -36,7 +36,7 @@ public class StorageCollection where T : DrawningSimpleExcavator /// public StorageCollection() { - _storages = new Dictionary>(); + _storages = new Dictionary>(); } /// /// Добавление коллекции в хранилище @@ -45,19 +45,17 @@ public class StorageCollection where T : DrawningSimpleExcavator /// тип коллекции public void AddCollection(string name, CollectionType collectionType) { - if (name == null || _storages.ContainsKey(name)) - return; - switch (collectionType) + CollectionInfo collectionInfo = new CollectionInfo(name, collectionType, string.Empty); + + if (_storages.ContainsKey(collectionInfo) || collectionInfo.CollectionType == CollectionType.None) return; + switch (collectionInfo.CollectionType) { - case CollectionType.None: - return; case CollectionType.Massive: - _storages[name] = new MassiveGenericObjects(); - return; + _storages[collectionInfo] = new MassiveGenericObjects(); + break; case CollectionType.List: - _storages[name] = new ListGenericObjects(); - return; - default: break; + _storages[collectionInfo] = new ListGenericObjects(); + break; } } @@ -67,8 +65,13 @@ public class StorageCollection where T : DrawningSimpleExcavator /// Название коллекции public void DelCollection(string name) { - if (_storages.ContainsKey(name)) - _storages.Remove(name); + { + CollectionInfo collectionInfo = new CollectionInfo(name, CollectionType.None, string.Empty); + if (_storages.ContainsKey(collectionInfo) && collectionInfo != null) + { + _storages.Remove(collectionInfo); + } + } } /// @@ -80,8 +83,11 @@ public class StorageCollection where T : DrawningSimpleExcavator { get { - if (_storages.ContainsKey(name)) - return _storages[name]; + CollectionInfo collectionInfo = new CollectionInfo(name, CollectionType.None, string.Empty); + if (_storages.ContainsKey(collectionInfo)) + { + return _storages[collectionInfo]; + } return null; } } @@ -106,7 +112,7 @@ public class StorageCollection where T : DrawningSimpleExcavator using (StreamWriter writer = new StreamWriter(filename)) { writer.Write(_collectionKey); - foreach (KeyValuePair> value in _storages) + foreach (KeyValuePair> value in _storages) { StringBuilder sb = new(); @@ -119,8 +125,6 @@ public class StorageCollection where T : DrawningSimpleExcavator sb.Append(value.Key); sb.Append(_separatorForKeyValue); - sb.Append(value.Value.GetCollectionType); - sb.Append(_separatorForKeyValue); sb.Append(value.Value.MaxCount); sb.Append(_separatorForKeyValue); @@ -172,18 +176,19 @@ public class StorageCollection where T : DrawningSimpleExcavator while ((strs = fs.ReadLine()) != null) { string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries); - if (record.Length != 4) + if (record.Length != 3) { continue; } - CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]); - ICollectionGenericObjects? collection = StorageCollection.CreateCollection(collectionType) ?? + CollectionInfo? collectionInfo = CollectionInfo.GetCollectionInfo(record[0]) ?? + throw new Exception("Не удалось определить информацию коллекции:" + record[0]); + ICollectionGenericObjects? collection = StorageCollection.CreateCollection(collectionInfo.CollectionType) ?? throw new Exception("Не удалось определить тип коллекции: " + record[1]); - collection.MaxCount = Convert.ToInt32(record[2]); + collection.MaxCount = Convert.ToInt32(record[1]); - string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries); + string[] set = record[2].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries); foreach (string elem in set) { if (elem?.CreateDrawningSimpleExcavator() is T excavator) @@ -201,7 +206,7 @@ public class StorageCollection where T : DrawningSimpleExcavator } } } - _storages.Add(record[0], collection); + _storages.Add(collectionInfo, collection); } } } diff --git a/Excavator/Excavator/Drawnings/DrawningExcavatorCompareByColor.cs b/Excavator/Excavator/Drawnings/DrawningExcavatorCompareByColor.cs new file mode 100644 index 0000000..3e91954 --- /dev/null +++ b/Excavator/Excavator/Drawnings/DrawningExcavatorCompareByColor.cs @@ -0,0 +1,22 @@ +namespace Excavator.Drawnings; + +/// +/// Сравнение по цвету, скорости, весу +/// +public class DrawningExcavatorCompareByColor : IComparer +{ + public int Compare(DrawningSimpleExcavator? x, DrawningSimpleExcavator? y) + { + if (x == null || x.EntitySimpleExcavator == null) return 1; + + if (y == null || y.EntitySimpleExcavator == null) return -1; + + var bodycolorCompare = x.EntitySimpleExcavator.BodyColor.Name.CompareTo(y.EntitySimpleExcavator.BodyColor.Name); + if (bodycolorCompare != 0) return bodycolorCompare; + + var speedCompare = x.EntitySimpleExcavator.Speed.CompareTo(y.EntitySimpleExcavator.Speed); + if (speedCompare != 0) return speedCompare; + + return x.EntitySimpleExcavator.Weight.CompareTo(y.EntitySimpleExcavator.Weight); + } +} diff --git a/Excavator/Excavator/Drawnings/DrawningExcavatorCompareByType.cs b/Excavator/Excavator/Drawnings/DrawningExcavatorCompareByType.cs new file mode 100644 index 0000000..5729868 --- /dev/null +++ b/Excavator/Excavator/Drawnings/DrawningExcavatorCompareByType.cs @@ -0,0 +1,21 @@ +namespace Excavator.Drawnings; + +/// +/// Сравнение по типу, скорости и весу +/// +public class DrawningExcavatorCompareByType : IComparer +{ + public int Compare(DrawningSimpleExcavator? x, DrawningSimpleExcavator? y) + { + if (x == null || x.EntitySimpleExcavator == null) return 1; + + if (y == null || y.EntitySimpleExcavator == null) return -1; + + if (x.GetType().Name != y.GetType().Name) return x.GetType().Name.CompareTo(y.GetType().Name); + + var speedCompare = x.EntitySimpleExcavator.Speed.CompareTo(y.EntitySimpleExcavator.Speed); + if (speedCompare != 0) return speedCompare; + + return x.EntitySimpleExcavator.Weight.CompareTo(y.EntitySimpleExcavator.Weight); + } +} \ No newline at end of file diff --git a/Excavator/Excavator/Drawnings/DrawningExcavatorEqutables.cs b/Excavator/Excavator/Drawnings/DrawningExcavatorEqutables.cs new file mode 100644 index 0000000..2706777 --- /dev/null +++ b/Excavator/Excavator/Drawnings/DrawningExcavatorEqutables.cs @@ -0,0 +1,43 @@ +using Excavator.Entities; +using System.Diagnostics.CodeAnalysis; + +namespace Excavator.Drawnings; + +/// +/// Реализация сравнения двух объектов класса-прорисовки +/// +public class DrawningExcavatorEqutables : IEqualityComparer +{ + public bool Equals(DrawningSimpleExcavator? x, DrawningSimpleExcavator? y) + { + if (x == null || x.EntitySimpleExcavator == null) return false; + + if (y == null || y.EntitySimpleExcavator == null) return false; + + if (x.GetType().Name != y.GetType().Name) return false; + + if (x.EntitySimpleExcavator.Speed != y.EntitySimpleExcavator.Speed) return false; + + if (x.EntitySimpleExcavator.Weight != y.EntitySimpleExcavator.Weight) return false; + + if (x.EntitySimpleExcavator.BodyColor != y.EntitySimpleExcavator.BodyColor) return false; + + if (x is DrawningExcavator bigX && y is DrawningExcavator bigY) + { + // TODO доделать логику сравнения дополнительных параметров + EntityExcavator _x = (EntityExcavator)x.EntitySimpleExcavator; + EntityExcavator _y = (EntityExcavator)y.EntitySimpleExcavator; + + if (_x.Supports != _y.Supports) return false; + if (_x.Bucket != _y.Bucket) return false; + if (_x.AdditionalColor != _y.AdditionalColor) return false; + } + + return true; + } + + public int GetHashCode([DisallowNull] DrawningSimpleExcavator obj) + { + return obj.GetHashCode(); + } +} \ No newline at end of file diff --git a/Excavator/Excavator/Exceptions/ObjectNotUniqueException.cs b/Excavator/Excavator/Exceptions/ObjectNotUniqueException.cs new file mode 100644 index 0000000..7053ed9 --- /dev/null +++ b/Excavator/Excavator/Exceptions/ObjectNotUniqueException.cs @@ -0,0 +1,20 @@ +using System.Runtime.Serialization; + +namespace Excavator.Exceptions; + +/// +/// Класс, описывающий ошибку наличия такого же объекта в коллекции +/// +[Serializable] +internal class ObjectNotUniqueException : ApplicationException +{ + public ObjectNotUniqueException(int i) : base("В коллекции есть такой же элемент на позиции: " + i) { } + + public ObjectNotUniqueException() : base() { } + + public ObjectNotUniqueException(string message) : base(message) { } + + public ObjectNotUniqueException(string message, Exception exception) : base(message, exception) { } + + protected ObjectNotUniqueException(SerializationInfo info, StreamingContext context) : base(info, context) { } +} \ No newline at end of file diff --git a/Excavator/Excavator/FormExcavatorCollection.Designer.cs b/Excavator/Excavator/FormExcavatorCollection.Designer.cs index bab5470..822b51c 100644 --- a/Excavator/Excavator/FormExcavatorCollection.Designer.cs +++ b/Excavator/Excavator/FormExcavatorCollection.Designer.cs @@ -52,6 +52,8 @@ LoadToolStripMenuItem = new ToolStripMenuItem(); openFileDialog = new OpenFileDialog(); saveFileDialog = new SaveFileDialog(); + buttonSortByType = new Button(); + buttonSortByColor = new Button(); groupBoxTools.SuspendLayout(); panelStorage.SuspendLayout(); panelCompanyTools.SuspendLayout(); @@ -62,21 +64,24 @@ // groupBoxTools // groupBoxTools.Anchor = AnchorStyles.Right; + groupBoxTools.Controls.Add(buttonSortByColor); + groupBoxTools.Controls.Add(buttonSortByType); groupBoxTools.Controls.Add(buttonCreateCompany); groupBoxTools.Controls.Add(panelStorage); groupBoxTools.Controls.Add(comboBoxSelectorCompany); groupBoxTools.Controls.Add(panelCompanyTools); groupBoxTools.Font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular, GraphicsUnit.Point); - groupBoxTools.Location = new Point(855, 27); + groupBoxTools.Location = new Point(861, 27); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(212, 608); + groupBoxTools.Size = new Size(212, 647); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; + groupBoxTools.Enter += groupBoxTools_Enter; // // buttonCreateCompany // - buttonCreateCompany.Location = new Point(9, 325); + buttonCreateCompany.Location = new Point(12, 322); buttonCreateCompany.Name = "buttonCreateCompany"; buttonCreateCompany.Size = new Size(191, 34); buttonCreateCompany.TabIndex = 7; @@ -100,7 +105,7 @@ // // buttonCollectionDel // - buttonCollectionDel.Location = new Point(6, 231); + buttonCollectionDel.Location = new Point(6, 228); buttonCollectionDel.Name = "buttonCollectionDel"; buttonCollectionDel.Size = new Size(191, 38); buttonCollectionDel.TabIndex = 6; @@ -111,7 +116,7 @@ // listBoxCollection // listBoxCollection.FormattingEnabled = true; - listBoxCollection.Location = new Point(6, 121); + listBoxCollection.Location = new Point(6, 116); listBoxCollection.Name = "listBoxCollection"; listBoxCollection.Size = new Size(191, 108); listBoxCollection.TabIndex = 5; @@ -172,7 +177,7 @@ comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxSelectorCompany.FormattingEnabled = true; comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" }); - comboBoxSelectorCompany.Location = new Point(9, 298); + comboBoxSelectorCompany.Location = new Point(12, 295); comboBoxSelectorCompany.Name = "comboBoxSelectorCompany"; comboBoxSelectorCompany.Size = new Size(191, 21); comboBoxSelectorCompany.TabIndex = 0; @@ -185,14 +190,14 @@ panelCompanyTools.Controls.Add(maskedTextBoxPosition); panelCompanyTools.Controls.Add(buttonRemoveExcavator); panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Location = new Point(6, 365); + panelCompanyTools.Location = new Point(6, 362); panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(200, 263); + panelCompanyTools.Size = new Size(200, 210); panelCompanyTools.TabIndex = 7; // // buttonGoToCheck // - buttonGoToCheck.Location = new Point(3, 148); + buttonGoToCheck.Location = new Point(6, 114); buttonGoToCheck.Name = "buttonGoToCheck"; buttonGoToCheck.Size = new Size(191, 42); buttonGoToCheck.TabIndex = 5; @@ -202,7 +207,7 @@ // // buttonAddSimpleExcavator // - buttonAddSimpleExcavator.Location = new Point(3, 3); + buttonAddSimpleExcavator.Location = new Point(3, 0); buttonAddSimpleExcavator.Name = "buttonAddSimpleExcavator"; buttonAddSimpleExcavator.Size = new Size(191, 35); buttonAddSimpleExcavator.TabIndex = 1; @@ -212,7 +217,7 @@ // // maskedTextBoxPosition // - maskedTextBoxPosition.Location = new Point(3, 75); + maskedTextBoxPosition.Location = new Point(3, 41); maskedTextBoxPosition.Mask = "00"; maskedTextBoxPosition.Name = "maskedTextBoxPosition"; maskedTextBoxPosition.Size = new Size(191, 20); @@ -220,7 +225,7 @@ // // buttonRemoveExcavator // - buttonRemoveExcavator.Location = new Point(3, 101); + buttonRemoveExcavator.Location = new Point(6, 67); buttonRemoveExcavator.Name = "buttonRemoveExcavator"; buttonRemoveExcavator.Size = new Size(191, 41); buttonRemoveExcavator.TabIndex = 4; @@ -230,7 +235,7 @@ // // buttonRefresh // - buttonRefresh.Location = new Point(3, 196); + buttonRefresh.Location = new Point(6, 162); buttonRefresh.Name = "buttonRefresh"; buttonRefresh.Size = new Size(191, 41); buttonRefresh.TabIndex = 6; @@ -245,7 +250,7 @@ pictureBox.BackgroundImageLayout = ImageLayout.None; pictureBox.Location = new Point(0, 27); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(855, 608); + pictureBox.Size = new Size(855, 647); pictureBox.TabIndex = 1; pictureBox.TabStop = false; pictureBox.Click += pictureBox_Click; @@ -291,11 +296,31 @@ // saveFileDialog.Filter = "txt file | *.txt"; // + // buttonSortByType + // + buttonSortByType.Location = new Point(12, 571); + buttonSortByType.Name = "buttonSortByType"; + buttonSortByType.Size = new Size(191, 31); + buttonSortByType.TabIndex = 9; + buttonSortByType.Text = "Сортировка по типу"; + buttonSortByType.UseVisualStyleBackColor = true; + buttonSortByType.Click += buttonSortByType_Click; + // + // buttonSortByColor + // + buttonSortByColor.Location = new Point(12, 608); + buttonSortByColor.Name = "buttonSortByColor"; + buttonSortByColor.Size = new Size(191, 31); + buttonSortByColor.TabIndex = 10; + buttonSortByColor.Text = "Сортировка по цвету"; + buttonSortByColor.UseVisualStyleBackColor = true; + buttonSortByColor.Click += buttonSortByColor_Click; + // // FormExcavatorCollection // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1067, 635); + ClientSize = new Size(1067, 674); Controls.Add(pictureBox); Controls.Add(groupBoxTools); Controls.Add(menuStrip1); @@ -340,5 +365,7 @@ private ToolStripMenuItem LoadToolStripMenuItem; private OpenFileDialog openFileDialog; private SaveFileDialog saveFileDialog; + private Button buttonSortByColor; + private Button buttonSortByType; } } \ No newline at end of file diff --git a/Excavator/Excavator/FormExcavatorCollection.cs b/Excavator/Excavator/FormExcavatorCollection.cs index ede6845..b75f2c0 100644 --- a/Excavator/Excavator/FormExcavatorCollection.cs +++ b/Excavator/Excavator/FormExcavatorCollection.cs @@ -73,6 +73,11 @@ public partial class FormExcavatorCollection : Form MessageBox.Show(ex.Message); _logger.LogError("Ошибка: {Message}", ex.Message); } + catch (ObjectNotUniqueException ex) + { + MessageBox.Show("Такой объект уже присутствует в коллекции"); + _logger.LogError("Ошибка: {Message}", ex.Message); + } } private void ButtonRemoveExcavator_Click(object sender, EventArgs e) @@ -88,21 +93,21 @@ public partial class FormExcavatorCollection : Form } int pos = Convert.ToInt32(maskedTextBoxPosition.Text); - try - { - if (_company - pos != null) + try { - MessageBox.Show("Объект удален"); - pictureBox.Image = _company.Show(); - _logger.LogInformation("Удален объект по позиции " + pos); + if (_company - pos != null) + { + MessageBox.Show("Объект удален"); + pictureBox.Image = _company.Show(); + _logger.LogInformation("Удален объект по позиции " + pos); + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message); + _logger.LogError("Ошибка: {Message}", ex.Message); } } - catch (Exception ex) - { - MessageBox.Show(ex.Message); - _logger.LogError("Ошибка: {Message}", ex.Message); - } -} /// /// Передача объекта в другую форму /// @@ -119,25 +124,25 @@ public partial class FormExcavatorCollection : Form int counter = 100; try { - while (excavator == null) + while (excavator == null) + { + excavator = _company.GetRandomObject(); + counter--; + if (counter <= 0) { - excavator = _company.GetRandomObject(); - counter--; - if (counter <= 0) - { - break; - } + break; } + } - if (excavator == null) - { - return; - } + if (excavator == null) + { + return; + } FormExcavator form = new() { SetExcavator = excavator }; - form.ShowDialog(); + form.ShowDialog(); } catch (Exception ex) { @@ -178,7 +183,7 @@ public partial class FormExcavatorCollection : 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); @@ -211,9 +216,9 @@ public partial class FormExcavatorCollection : Form _logger.LogInformation("Коллекция добавлена " + textBoxCollectionName.Text); } catch (Exception ex) - { - _logger.LogError("Ошибка: {Message}", ex.Message); - } + { + _logger.LogError("Ошибка: {Message}", ex.Message); + } } /// @@ -289,22 +294,48 @@ public partial class FormExcavatorCollection : Form } } - private void LoadToolStripMenuItem_Click(object sender, EventArgs e) + private void LoadToolStripMenuItem_Click(object sender, EventArgs e) + { + if (openFileDialog.ShowDialog() == DialogResult.OK) { - if (openFileDialog.ShowDialog() == DialogResult.OK) + try { - try - { - _storageCollection.LoadData(openFileDialog.FileName); - MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); - _logger.LogInformation("Загрузка из файла: {filename}", openFileDialog.FileName); - } - catch (Exception ex) - { - MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); - _logger.LogError("Ошибка: {Message}", ex.Message); - } + _storageCollection.LoadData(openFileDialog.FileName); + MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + _logger.LogInformation("Загрузка из файла: {filename}", openFileDialog.FileName); + } + catch (Exception ex) + { + MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + _logger.LogError("Ошибка: {Message}", ex.Message); } } - + + } + + private void groupBoxTools_Enter(object sender, EventArgs e) + { + + } + + private void buttonSortByType_Click(object sender, EventArgs e) + { + CompareCars(new DrawningExcavatorCompareByType()); + } + + private void buttonSortByColor_Click(object sender, EventArgs e) + { + CompareCars(new DrawningExcavatorCompareByColor()); + } + + private void CompareCars(IComparer comparer) + { + if (_company == null) + { + return; + } + + _company.Sort(comparer); + pictureBox.Image = _company.Show(); + } } \ No newline at end of file diff --git a/Excavator/Excavator/FormExcavatorCollection.resx b/Excavator/Excavator/FormExcavatorCollection.resx index caf2bd5..b2e0623 100644 --- a/Excavator/Excavator/FormExcavatorCollection.resx +++ b/Excavator/Excavator/FormExcavatorCollection.resx @@ -126,4 +126,7 @@ 272, 17 + + 25 + \ No newline at end of file