diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/AbstractCompany.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/AbstractCompany.cs index d4505ce..4e200ca 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/AbstractCompany.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/AbstractCompany.cs @@ -59,7 +59,7 @@ public abstract class AbstractCompany /// public static int operator +(AbstractCompany company, DrawningPropelledArtillery propelledartillery) { - return company._collection.Insert(propelledartillery); + return company._collection.Insert(propelledartillery, new DrawiningPropelledArtilleryEqutables()); } /// @@ -114,4 +114,11 @@ public abstract class AbstractCompany /// Расстановка объектов /// protected abstract void SetObjectsPosition(); + + + /// + /// Сортировка + /// + /// Сравнитель объектов + public void Sort(IComparer comparer) => _collection?.CollectionSort(comparer); } diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/CollectionInfo.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/CollectionInfo.cs new file mode 100644 index 0000000..eb12ef7 --- /dev/null +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/CollectionInfo.cs @@ -0,0 +1,83 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SelfPropelledArtilleryUnit.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/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/ICollectionGenericObjects.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/ICollectionGenericObjects.cs index c09af86..5ef4a22 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/ICollectionGenericObjects.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -1,4 +1,5 @@ -namespace SelfPropelledArtilleryUnit.CollectionGenericObjects; + +namespace SelfPropelledArtilleryUnit.CollectionGenericObjects; /// /// Параметризованный набор объектов @@ -14,20 +15,22 @@ public interface ICollectionGenericObjects /// /// Установка максимального количества элементов /// - int MaxCount { get; set; } + int MaxCount { set; get; } /// /// Добавление объекта в коллекцию /// /// Добавляемый объект + /// /// Cравнение двух объектов /// true - вставка прошла удачно, false - вставка неудалась - int Insert(T obj); + int Insert(T obj, IEqualityComparer? comparer = null); /// /// Добавление объекта в коллекцию на конкретную позицию /// /// Добавляемый объект /// Позиция + /// Cравнение двух объектов /// true - вставка прошла удачно, false - вставка неудалась - int Insert(T obj, int position); + int Insert(T obj, int position, IEqualityComparer? comparer = null); /// /// Удаление объекта из коллекции с конкретной позиции /// @@ -49,4 +52,9 @@ public interface ICollectionGenericObjects /// /// Поэлементый вывод элементов коллекции IEnumerable GetItems(); + /// + /// Сортировка коллекции + /// + /// Сравнитель объектов + void CollectionSort(IComparer comparer); } diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/ListGenericObjects.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/ListGenericObjects.cs index 03c8974..2d02e2c 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/ListGenericObjects.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/ListGenericObjects.cs @@ -1,78 +1,93 @@ -using SelfPropelledArtilleryUnit.Exceptions; +using SelfPropelledArtilleryUnit.Drawnings; +using SelfPropelledArtilleryUnit.Exceptions; +using System.Collections.Generic; +using System.Linq; -namespace SelfPropelledArtilleryUnit.CollectionGenericObjects; - -public class ListGenericObjects : ICollectionGenericObjects - where T : class +namespace SelfPropelledArtilleryUnit.CollectionGenericObjects { - /// - /// Список объектов, которые храним - /// - private readonly List _collection; - /// - /// Максимально допустимое число объектов в списке - /// - private int _maxCount; - - public int Count => _collection.Count; - public int MaxCount + public class ListGenericObjects : ICollectionGenericObjects + where T : class { - get + /// + /// Список объектов, которые храним + /// + private readonly List _collection; + public CollectionType GetCollectionType => CollectionType.List; + /// + /// Максимально допустимое число объектов в списке + /// + private int _maxCount; + public int Count => _collection.Count; + public int MaxCount { - return Count; - } - set - { - if (value > 0) + get { - _maxCount = value; + return Count; + } + set + { + if (value > 0) + { + _maxCount = value; + } } } - } - - public CollectionType GetCollectionType => CollectionType.List; - /// - /// Конструктор - /// - public ListGenericObjects() - { - _collection = new(); - } - public T? Get(int position) - { - //TODO выброс ошибки если выход за границу - if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position); - return _collection[position]; - } - public int Insert(T obj) - { - // TODO выброс ошибки если переполнение - if (Count == _maxCount) throw new CollectionOverflowException(Count); - _collection.Add(obj); - return Count; - } - public int Insert(T obj, int position) - { - // TODO выброс ошибки если переполнение - // TODO выброс ошибки если за границу - if (Count == _maxCount) throw new CollectionOverflowException(Count); - if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position); - _collection.Insert(position, obj); - return position; - } - public T Remove(int position) - { - //TODO если выброс за границу - if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position); - T obj = _collection[position]; - _collection.RemoveAt(position); - return obj; - } - public IEnumerable GetItems() - { - for (int i = 0; i < Count; ++i) + /// + /// Конструктор + /// + public ListGenericObjects() { - yield return _collection[i]; + _collection = new(); + } + public T? Get(int position) + { + if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position); + return _collection[position]; + } + public int Insert(T obj, IEqualityComparer? comparer = null) + { + if (comparer != null) + { + if (_collection.Contains(obj, comparer)) + { + throw new ObjectIsEqualException(); + } + } + if (Count == _maxCount) throw new CollectionOverflowException(Count); + _collection.Add(obj); + return Count; + } + public int Insert(T obj, int position, IEqualityComparer? comparer = null) + { + if (comparer != null) + { + if (_collection.Contains(obj, comparer)) + { + throw new ObjectIsEqualException(); + } + } + if (Count == _maxCount) throw new CollectionOverflowException(Count); + if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position); + _collection.Insert(position, obj); + return position; + } + public T Remove(int position) + { + if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position); + T obj = _collection[position]; + _collection.RemoveAt(position); + return obj; + } + public IEnumerable GetItems() + { + for (int i = 0; i < Count; ++i) + { + yield return _collection[i]; + } + } + void ICollectionGenericObjects.CollectionSort(IComparer comparer) + { + _collection.Sort(comparer); } } } diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/MassiveGenericObjects.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/MassiveGenericObjects.cs index 26bb45f..9425073 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/MassiveGenericObjects.cs @@ -1,4 +1,5 @@ -using SelfPropelledArtilleryUnit.Exceptions; +using SelfPropelledArtilleryUnit.Drawnings; +using SelfPropelledArtilleryUnit.Exceptions; namespace SelfPropelledArtilleryUnit.CollectionGenericObjects; @@ -36,21 +37,29 @@ public class MassiveGenericObjects : ICollectionGenericObjects } } } + /// + /// Конструктор + /// public MassiveGenericObjects() { _collection = Array.Empty(); } public T Get(int position) { - // TODO выброс ошибки если выход за границу - // TODO выброс ошибки если объект пустой if (position >= _collection.Length || position < 0) throw new PositionOutOfCollectionException(position); if (_collection[position] == null) throw new ObjectNotFoundException(position); return _collection[position]; } - public int Insert(T obj) + public int Insert(T obj, IEqualityComparer? comparer = null) { - // TODO выброс ошибки если переполнение + if (comparer != null) + { + foreach (T? item in _collection) + { + if ((comparer as IEqualityComparer).Equals(obj as DrawningPropelledArtillery, item as DrawningPropelledArtillery)) + throw new ObjectIsEqualException(); + } + } int index = 0; while (index < _collection.Length) { @@ -63,10 +72,16 @@ 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) { - // TODO выброс ошибки если переполнение - // TODO выброс ошибки если выход за границу + if (comparer != null) + { + foreach (T? item in _collection) + { + if ((comparer as IEqualityComparer).Equals(obj as DrawningPropelledArtillery, item as DrawningPropelledArtillery)) + throw new ObjectIsEqualException(); + } + } if (position >= _collection.Length || position < 0) throw new PositionOutOfCollectionException(position); if (_collection[position] == null) { @@ -97,8 +112,6 @@ public class MassiveGenericObjects : ICollectionGenericObjects } public T Remove(int position) { - // TODO выброс ошибки если выход за границу - // TODO выброс ошибки если объект пустой if (position >= _collection.Length || position < 0) throw new PositionOutOfCollectionException(position); if (_collection[position] == null) throw new ObjectNotFoundException(position); T obj = _collection[position]; @@ -112,4 +125,8 @@ 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/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/StorageCollection.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/StorageCollection.cs index d20ed71..f42ef53 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/StorageCollection.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/StorageCollection.cs @@ -1,5 +1,6 @@ using SelfPropelledArtilleryUnit.Drawnings; using SelfPropelledArtilleryUnit.Exceptions; +using System.Collections.Generic; using System.Text; namespace SelfPropelledArtilleryUnit.CollectionGenericObjects; @@ -9,18 +10,18 @@ public class StorageCollection /// /// Словарь (хранилище) с коллекциями /// - readonly Dictionary> _storages; + readonly Dictionary> _storages; /// /// Возвращение списка названий коллекций /// - public List Keys => _storages.Keys.ToList(); + public List Keys => _storages.Keys.ToList(); /// /// Конструктор /// public StorageCollection() { - _storages = new Dictionary>(); + _storages = new Dictionary>(); } /// /// Добавление коллекции в хранилище @@ -29,14 +30,13 @@ public class StorageCollection /// тип коллекции public void AddCollection(string name, CollectionType collectionType) { - // TODO проверка, что name не пустой и нет в словаре записи с таким ключом - // TODO Прописать логику для добавления - if (_storages.ContainsKey(name)) return; + CollectionInfo collectionInfo = new CollectionInfo(name, collectionType, string.Empty); + if (_storages.ContainsKey(collectionInfo)) return; if (collectionType == CollectionType.None) return; else if (collectionType == CollectionType.Massive) - _storages[name] = new MassiveGenericObjects(); + _storages[collectionInfo] = new MassiveGenericObjects(); else if (collectionType == CollectionType.List) - _storages[name] = new ListGenericObjects(); + _storages[collectionInfo] = new ListGenericObjects(); } /// /// Удаление коллекции @@ -44,10 +44,9 @@ public class StorageCollection /// Название коллекции public void DelCollection(string name) { - - // TODO Прописать логику для удаления коллекции - if (_storages.ContainsKey(name)) - _storages.Remove(name); + CollectionInfo collectionInfo = new CollectionInfo(name, CollectionType.None, string.Empty); + if (_storages.ContainsKey(collectionInfo)) + _storages.Remove(collectionInfo); } /// /// Доступ к коллекции @@ -58,9 +57,9 @@ public class StorageCollection { get { - // TODO Продумать логику получения объекта - 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; } } @@ -93,7 +92,7 @@ public class StorageCollection using (StreamWriter writer = new StreamWriter(filename)) { writer.Write(_collectionKey); - foreach (KeyValuePair> value in _storages) + foreach (KeyValuePair> value in _storages) { writer.Write(Environment.NewLine); // не сохраняем пустые коллекции @@ -103,8 +102,6 @@ public class StorageCollection } writer.Write(value.Key); writer.Write(_separatorForKeyValue); - writer.Write(value.Value.GetCollectionType); - writer.Write(_separatorForKeyValue); writer.Write(value.Value.MaxCount); writer.Write(_separatorForKeyValue); foreach (T? item in value.Value.GetItems()) @@ -146,27 +143,28 @@ public class StorageCollection string strs = ""; 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("Не удалось создать коллекцию"); if (collection == null) { throw new Exception("Не удалось создать коллекцию"); } - collection.MaxCount = Convert.ToInt32(record[2]); - string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries); + collection.MaxCount = Convert.ToInt32(record[1]); + string[] set = record[2].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries); foreach (string elem in set) { - if (elem?.CreateDrawningPropelledArtillery() is T PropelledArtillery) + if (elem?.CreateDrawningPropelledArtillery() is T ship) { try { - if (collection.Insert(PropelledArtillery) == -1) + if (collection.Insert(ship) == -1) { throw new Exception("Объект не удалось добавить в коллекцию: " + record[3]); } @@ -177,7 +175,7 @@ public class StorageCollection } } } - _storages.Add(record[0], collection); + _storages.Add(collectionInfo, collection); } } diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawiningPropelledArtilleryEqutables.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawiningPropelledArtilleryEqutables.cs new file mode 100644 index 0000000..509f42f --- /dev/null +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawiningPropelledArtilleryEqutables.cs @@ -0,0 +1,62 @@ +using SelfPropelledArtilleryUnit.Entities; +using System; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SelfPropelledArtilleryUnit.Drawnings; + +public class DrawiningPropelledArtilleryEqutables : IEqualityComparer +{ + public bool Equals(DrawningPropelledArtillery? x, DrawningPropelledArtillery? y) + { + if (x == null || x.EntityPropelledArtillery == null) + { + return false; + } + if (y == null || y.EntityPropelledArtillery == null) + { + return false; + } + if (x.GetType().Name != y.GetType().Name) + { + return false; + } + if (x.EntityPropelledArtillery.Speed != y.EntityPropelledArtillery.Speed) + { + return false; + } + if (x.EntityPropelledArtillery.Weight != y.EntityPropelledArtillery.Weight) + { + return false; + } + if (x.EntityPropelledArtillery.BodyColor != y.EntityPropelledArtillery.BodyColor) + { + return false; + } + if (x is DrawningSelfPropelledArtilleryUnit && y is DrawningSelfPropelledArtilleryUnit) + { + EntitySelfPropelledArtilleryUnit _x = (EntitySelfPropelledArtilleryUnit)x.EntityPropelledArtillery; + EntitySelfPropelledArtilleryUnit _y = (EntitySelfPropelledArtilleryUnit)x.EntityPropelledArtillery; + if (_x.AdditionalColor != _y.AdditionalColor) + { + return false; + } + if (_x.TurretCannon != _y.TurretCannon) + { + return false; + } + if (_x.LaunchBattery != _y.LaunchBattery) + { + return false; + } + } + return true; + } + public int GetHashCode([DisallowNull] DrawningPropelledArtillery obj) + { + return obj.GetHashCode(); + } +} diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningPropelledArtillery.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningPropelledArtillery.cs index 72706bd..e3a97f2 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningPropelledArtillery.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningPropelledArtillery.cs @@ -96,8 +96,8 @@ public class DrawningPropelledArtillery protected DrawningPropelledArtillery(int drawningPropelledArtilleryWidth, int drawningPropelledArtilleryHeight):this() { - _drawningPropelledArtilleryWidth = drawningPropelledArtilleryWidth; - _drawningPropelledArtilleryHeight = drawningPropelledArtilleryHeight; + this._drawningPropelledArtilleryWidth = drawningPropelledArtilleryWidth; + this._drawningPropelledArtilleryHeight = drawningPropelledArtilleryHeight; } public DrawningPropelledArtillery(EntityPropelledArtillery propelledArtillery) : this() { @@ -273,8 +273,5 @@ public class DrawningPropelledArtillery g.DrawEllipse(pen, _startPosX.Value + 93, _startPosY.Value + 78, 24, 24); g.FillRectangle(brush, _startPosX.Value + 0, _startPosY.Value + 65, 120, 13);// - - - } } diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningPropelledArtilleryCompareByColor.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningPropelledArtilleryCompareByColor.cs new file mode 100644 index 0000000..096bef6 --- /dev/null +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningPropelledArtilleryCompareByColor.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SelfPropelledArtilleryUnit.Drawnings; +/// +/// Сравнение по цвету, скорости, весу +/// +public class DrawningPropelledArtilleryCompareByColor : IComparer +{ + public int Compare(DrawningPropelledArtillery? x, DrawningPropelledArtillery? y) + { + if (x == null || x.EntityPropelledArtillery == null) + { + return 1; + } + + if (y == null || y.EntityPropelledArtillery == null) + { + return -1; + } + var bodycolorCompare = x.EntityPropelledArtillery.BodyColor.Name.CompareTo(y.EntityPropelledArtillery.BodyColor.Name); + if (bodycolorCompare != 0) + { + return bodycolorCompare; + } + var speedCompare = x.EntityPropelledArtillery.Speed.CompareTo(y.EntityPropelledArtillery.Speed); + if (speedCompare != 0) + { + return speedCompare; + } + return x.EntityPropelledArtillery.Weight.CompareTo(y.EntityPropelledArtillery.Weight); + } +} diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningPropelledArtilleryCompareByType.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningPropelledArtilleryCompareByType.cs new file mode 100644 index 0000000..57bed36 --- /dev/null +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningPropelledArtilleryCompareByType.cs @@ -0,0 +1,38 @@ +using SelfPropelledArtilleryUnit.Drawnings; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SelfPropelledArtilleryUnit.CollectionGenericObjects; +/// +/// Сравнение по типу, скорости, весу +/// +public class DrawningPropelledArtilleryCompareByType : IComparer +{ + public int Compare(DrawningPropelledArtillery? x, DrawningPropelledArtillery? y) + { + if (x == null || x.EntityPropelledArtillery == null) + { + return 1; + } + + if (y == null || y.EntityPropelledArtillery == null) + { + return -1; + } + + if (x.GetType().Name != y.GetType().Name) + { + return x.GetType().Name.CompareTo(y.GetType().Name); + } + + var speedCompare = x.EntityPropelledArtillery.Speed.CompareTo(y.EntityPropelledArtillery.Speed); + if (speedCompare != 0) + { + return speedCompare; + } + return x.EntityPropelledArtillery.Weight.CompareTo(y.EntityPropelledArtillery.Weight); + } +} diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Exceptions/ObjectIsEqualException.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Exceptions/ObjectIsEqualException.cs new file mode 100644 index 0000000..13a06dd --- /dev/null +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Exceptions/ObjectIsEqualException.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace SelfPropelledArtilleryUnit.Exceptions; + +/// +/// Класс, описывающий ошибку переполнения коллекции +/// +[Serializable] +public class ObjectIsEqualException : ApplicationException +{ + public ObjectIsEqualException(int count) : base("В коллекции содержится равный элемент: " + count) { } + public ObjectIsEqualException() : base() { } + public ObjectIsEqualException(string message) : base(message) { } + public ObjectIsEqualException(string message, Exception exception) : base(message, exception) { } + protected ObjectIsEqualException(SerializationInfo info, StreamingContext contex) : base(info, contex) { } +} diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryCollection.Designer.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryCollection.Designer.cs index 2477cc5..7ed2cd2 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryCollection.Designer.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryCollection.Designer.cs @@ -30,6 +30,8 @@ { groupBoxTools = new GroupBox(); panelCompanyTools = new Panel(); + buttonSortByColor = new Button(); + buttonSortByType = new Button(); maskedTextBox = new MaskedTextBox(); buttonAddPropelledArtillery = new Button(); buttonRefresh = new Button(); @@ -75,6 +77,8 @@ // // panelCompanyTools // + panelCompanyTools.Controls.Add(buttonSortByColor); + panelCompanyTools.Controls.Add(buttonSortByType); panelCompanyTools.Controls.Add(maskedTextBox); panelCompanyTools.Controls.Add(buttonAddPropelledArtillery); panelCompanyTools.Controls.Add(buttonRefresh); @@ -83,12 +87,30 @@ panelCompanyTools.Enabled = false; panelCompanyTools.Location = new Point(6, 343); panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(200, 213); + panelCompanyTools.Size = new Size(188, 236); panelCompanyTools.TabIndex = 9; // + // buttonSortByColor + // + buttonSortByColor.Location = new Point(0, 194); + buttonSortByColor.Name = "buttonSortByColor"; + buttonSortByColor.Size = new Size(188, 23); + buttonSortByColor.TabIndex = 0; + buttonSortByColor.Text = "Сортировка по цвету"; + buttonSortByColor.Click += buttonSortByColor_Click; + // + // buttonSortByType + // + buttonSortByType.Location = new Point(0, 168); + buttonSortByType.Name = "buttonSortByType"; + buttonSortByType.Size = new Size(188, 23); + buttonSortByType.TabIndex = 1; + buttonSortByType.Text = "Сортировка по типу"; + buttonSortByType.Click += buttonSortByType_Click; + // // maskedTextBox // - maskedTextBox.Location = new Point(0, 94); + maskedTextBox.Location = new Point(0, 49); maskedTextBox.Name = "maskedTextBox"; maskedTextBox.Size = new Size(188, 23); maskedTextBox.TabIndex = 0; @@ -107,7 +129,7 @@ // buttonRefresh // buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(0, 185); + buttonRefresh.Location = new Point(0, 140); buttonRefresh.Name = "buttonRefresh"; buttonRefresh.Size = new Size(188, 22); buttonRefresh.TabIndex = 6; @@ -118,7 +140,7 @@ // buttonRemovePropelledArtillery // buttonRemovePropelledArtillery.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemovePropelledArtillery.Location = new Point(0, 123); + buttonRemovePropelledArtillery.Location = new Point(0, 78); buttonRemovePropelledArtillery.Name = "buttonRemovePropelledArtillery"; buttonRemovePropelledArtillery.Size = new Size(188, 24); buttonRemovePropelledArtillery.TabIndex = 4; @@ -129,7 +151,7 @@ // buttonGoToCheck // buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonGoToCheck.Location = new Point(0, 153); + buttonGoToCheck.Location = new Point(0, 108); buttonGoToCheck.Name = "buttonGoToCheck"; buttonGoToCheck.Size = new Size(188, 26); buttonGoToCheck.TabIndex = 5; @@ -340,5 +362,7 @@ private ToolStripMenuItem loadToolStripMenuItem; private SaveFileDialog saveFileDialog; private OpenFileDialog openFileDialog; + private Button buttonSortByColor; + private Button buttonSortByType; } } \ No newline at end of file diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryCollection.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryCollection.cs index 803bee1..b6c1740 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryCollection.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryCollection.cs @@ -78,6 +78,11 @@ public partial class FormPropelledArtilleryCollection : Form MessageBox.Show("Не удалось добавить объект"); _logger.LogError("Ошибка: {Message}", ex.Message); } + catch (ObjectIsEqualException ex) + { + MessageBox.Show("Не удалось добавить объект"); + _logger.LogError("Ошибка: {Message}", ex.Message); + } } /// @@ -196,7 +201,7 @@ public partial class FormPropelledArtilleryCollection : 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); @@ -290,6 +295,27 @@ public partial class FormPropelledArtilleryCollection : Form } } } + + private void buttonSortByType_Click(object sender, EventArgs e) + { + ComparePropelledArtillery(new DrawningPropelledArtilleryCompareByType()); + + } + + private void ComparePropelledArtillery(IComparer comparer) + { + if (_company == null) + { + return; + } + _company.Sort(comparer); + pictureBox.Image = _company.Show(); + } + + private void buttonSortByColor_Click(object sender, EventArgs e) + { + ComparePropelledArtillery(new DrawningPropelledArtilleryCompareByColor()); + } }