From 100266bb2620bc33ad0964003497a280cc020f20 Mon Sep 17 00:00:00 2001 From: ILYAkuznetsov73 <148066069+ILYAkuznetsov73@users.noreply.github.com> Date: Tue, 21 May 2024 20:44:31 +0400 Subject: [PATCH] =?UTF-8?q?8=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbstractCompany.cs | 10 +- .../CollectionInfo.cs | 76 +++++++++++ .../ICollectionGenericObjects.cs | 6 +- .../ListGenericObjects.cs | 93 +++++++------ .../MassiveGenericObjects.cs | 85 ++++++------ .../StorageCollection.cs | 127 ++++++++++-------- .../TankerCompareByColor.cs | 36 +++++ .../TankerCompareByType.cs | 39 ++++++ .../Drawings/DrawingTankerEqutables.cs | 68 ++++++++++ .../Exceptions/ObjectExistException.cs | 18 +++ .../FormTankerCollection.Designer.cs | 62 ++++++--- .../FormTankerCollection.cs | 31 ++++- .../FormTankerCollection.resx | 2 +- 13 files changed, 493 insertions(+), 160 deletions(-) create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/CollectionInfo.cs create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/TankerCompareByColor.cs create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/TankerCompareByType.cs create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/Drawings/DrawingTankerEqutables.cs create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/Exceptions/ObjectExistException.cs diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/AbstractCompany.cs b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/AbstractCompany.cs index dbb2052..8660dde 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/AbstractCompany.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/AbstractCompany.cs @@ -53,7 +53,7 @@ public abstract class AbstractCompany _collection = collection; _collection.MaxCount = GetMaxCount; } - + /// /// Перегрузка оператора сложения для класса /// @@ -62,7 +62,11 @@ public abstract class AbstractCompany /// public static int operator +(AbstractCompany company, DrawingTanker tanker) { - return company._collection.Insert(tanker); + if (company._collection.Insert(tanker, new DrawingTankerEqutables())) + { + return 1; + } + return 0; } /// @@ -106,6 +110,8 @@ public abstract class AbstractCompany return bitmap; } + public void Sort(IComparer comparer) => _collection?.CollectionSort(comparer); + /// /// Вывод заднего фона /// diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/CollectionInfo.cs b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/CollectionInfo.cs new file mode 100644 index 0000000..1dfb482 --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/CollectionInfo.cs @@ -0,0 +1,76 @@ +using ProjectGasolineTanker.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(); + } +} \ No newline at end of file diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ICollectionGenericObjects.cs index 56dd8b0..a3aed4d 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ICollectionGenericObjects.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -28,7 +28,7 @@ public interface ICollectionGenericObjects /// /// Добавляемый объект /// true - вставка прошла удачно, false - вставка не удалась - int Insert(T obj); + bool Insert(T obj, IEqualityComparer? comparer = null); /// /// Добавление объекта в коллекцию на конкретную позицию @@ -36,7 +36,7 @@ public interface ICollectionGenericObjects /// Добавляемый объект /// Позиция /// 1 - вставка прошла удачно, -1 - вставка не удалась - int Insert(T obj, int position); + bool Insert(T obj, int position, IEqualityComparer? comparer = null); /// /// Удаление объекта из коллекции с конкретной позиции @@ -62,4 +62,6 @@ public interface ICollectionGenericObjects /// /// Поэлементый вывод элементов коллекции IEnumerable GetItems(); + + void CollectionSort(IComparer comparer); } diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ListGenericObjects.cs b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ListGenericObjects.cs index 8de8d91..e5df9d6 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ListGenericObjects.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ListGenericObjects.cs @@ -1,12 +1,11 @@ -using ProjectGasolineTanker.Exceptions; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectGasolineTanker.CollectionGenericObjects; +using NLog.LayoutRenderers; +using ProjectGasolineTanker.CollectionGenericObjects; +using ProjectGasolineTanker.Exceptions; +/// +/// Параметризованный набор объектов +/// +/// Параметр: ограничение - ссылочный тип public class ListGenericObjects : ICollectionGenericObjects where T : class { @@ -20,15 +19,9 @@ public class ListGenericObjects : ICollectionGenericObjects /// private int _maxCount; - public int Count => _collection.Count; - public int MaxCount { - get - { - return _maxCount; - } - + get => _maxCount; set { if (value > 0) @@ -37,9 +30,10 @@ public class ListGenericObjects : ICollectionGenericObjects } } } - public CollectionType GetCollectionType => CollectionType.List; + public int Count => _collection.Count; + /// /// Конструктор /// @@ -50,39 +44,57 @@ public class ListGenericObjects : ICollectionGenericObjects public T? Get(int position) { - if (position >= Count || position < 0) - throw new PositionOutOfCollectionException(position); - + if (position > _collection.Count || position < 0) + { + throw new PositionOutOfCollectionException(); + } + if (_collection[position] == null) + { + throw new ObjectNotFoundException(); + } return _collection[position]; } - public int Insert(T obj) + public bool Insert(T obj, IEqualityComparer? comparer = null) { - if (Count + 1 > _maxCount) - throw new CollectionOverflowException(Count); - + if (Count + 1 > MaxCount) + { + throw new CollectionOverflowException(); + } + if (_collection.Contains(obj, comparer)) + { + throw new ObjectExistException(); + } _collection.Add(obj); - return Count; + + return true; } - public int Insert(T obj, int position) + public bool Insert(T obj, int position, IEqualityComparer? comparer = null) { - if (Count + 1 > _maxCount) - throw new CollectionOverflowException(Count); - - if (position < 0 || position > Count) - throw new PositionOutOfCollectionException(position); - + if (_collection.Count + 1 < _maxCount) + { + throw new CollectionOverflowException(); + } + if (position > _collection.Count || position < 0) + { + throw new PositionOutOfCollectionException(); + } + if (_collection.Contains(obj, comparer)) + { + throw new ObjectExistException(position); + } _collection.Insert(position, obj); - return 1; + return true; } - public T? Remove(int position) + public T Remove(int position) { - if (position < 0 || position > Count) - throw new PositionOutOfCollectionException(position); - - T? temp = _collection[position]; + if (position > _collection.Count || position < 0) + { + throw new PositionOutOfCollectionException(); + } + T temp = _collection[position]; _collection.RemoveAt(position); return temp; } @@ -94,4 +106,9 @@ public class ListGenericObjects : ICollectionGenericObjects yield return _collection[i]; } } -} + + public void CollectionSort(IComparer comparer) + { + _collection.Sort(comparer); + } +} \ No newline at end of file diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/MassiveGenericObjects.cs index aebffc2..c79f469 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/MassiveGenericObjects.cs @@ -1,9 +1,4 @@ using ProjectGasolineTanker.Exceptions; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace ProjectGasolineTanker.CollectionGenericObjects; @@ -52,7 +47,7 @@ public class MassiveGenericObjects : ICollectionGenericObjects public T? Get(int position) { - if (position < 0 || position >= Count) + if (position < 0 || position > _collection.Length - 1) throw new PositionOutOfCollectionException(position); if (position >= _collection.Length && _collection[position] == null) @@ -61,52 +56,48 @@ public class MassiveGenericObjects : ICollectionGenericObjects return _collection[position]; } - public int Insert(T obj) - { - for (int i = 0; i < Count; i++) + public bool Insert(T obj, IEqualityComparer? comparer = null) + { + int index = Array.IndexOf(_collection, null); + if (_collection.Contains(obj, comparer)) + { + throw new ObjectExistException(index); + } + if (index >= 0) + { + _collection[index] = obj; + return true; + } + throw new CollectionOverflowException(); + } + + public bool Insert(T obj, int position, IEqualityComparer? comparer = null) + { + if (position < 0 || position > _collection.Length - 1) + { + throw new PositionOutOfCollectionException(); + } + if (_collection.Contains(obj, comparer)) + { + throw new ObjectExistException(position); + } + for (int i = position; i < _collection.Length; i++) { if (_collection[i] == null) { _collection[i] = obj; - return i; + return true; } } - throw new CollectionOverflowException(Count); - } - - public int Insert(T obj, int position) - { - if (position < 0 || position >= Count) - throw new PositionOutOfCollectionException(position); - - if (_collection[position] == null) + for (int i = position; i >= 0; i--) { - _collection[position] = obj; - return position; - } - - int temp = position + 1; - while (temp < Count) - { - if (_collection[temp] == null) + if (_collection[i] == null) { - _collection[temp] = obj; - return temp; + _collection[i] = obj; + return true; } - temp++; } - - temp = position - 1; - while (temp > 0) - { - if (_collection[temp] == null) - { - _collection[temp] = obj; - return temp; - } - temp--; - } - throw new CollectionOverflowException(Count); + return false; } public T? Remove(int position) @@ -129,5 +120,15 @@ public class MassiveGenericObjects : ICollectionGenericObjects yield return _collection[i]; } } + + public void CollectionSort(IComparer comparer) + { + if (_collection?.Length > 0) + { + Array.Sort(_collection, comparer); + Array.Reverse(_collection); + } + + } } diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/StorageCollection.cs b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/StorageCollection.cs index 1c90976..ae802ee 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/StorageCollection.cs @@ -1,4 +1,5 @@ -using ProjectGasolineTanker.Drawings; +using ProjectGasolineTanker.CollectionGenericObjects; +using ProjectGasolineTanker.Drawings; using ProjectGasolineTanker.Exceptions; using System; using System.Collections.Generic; @@ -14,13 +15,12 @@ public class StorageCollection /// /// Словарь (хранилище) с коллекциями /// - readonly Dictionary> _storages; + readonly Dictionary> _storages; /// /// Возвращение списка названий коллекций /// - public List Keys => _storages.Keys.ToList(); - + public List Keys => _storages.Keys.ToList(); /// /// Ключевое слово, с которого должен начинаться файл /// @@ -36,12 +36,13 @@ public class StorageCollection /// private readonly string _separatorItems = ";"; + /// /// Конструктор /// public StorageCollection() { - _storages = new Dictionary>(); + _storages = new Dictionary>(); } /// @@ -51,20 +52,21 @@ public class StorageCollection /// тип коллекции public void AddCollection(string name, CollectionType collectionType) { - if (name == null || _storages.ContainsKey(name)) - return; + CollectionInfo collectionInfo = new CollectionInfo(name, collectionType, string.Empty); + if (collectionInfo.Name == null || _storages.ContainsKey(collectionInfo)) { return; } + switch (collectionInfo.CollectionType) - switch (collectionType) { case CollectionType.None: return; case CollectionType.Massive: - _storages[name] = new MassiveGenericObjects(); + _storages.Add(collectionInfo, new MassiveGenericObjects { }); return; case CollectionType.List: - _storages[name] = new ListGenericObjects(); + _storages.Add(collectionInfo, new ListGenericObjects { }); return; } + } /// @@ -73,8 +75,9 @@ public class StorageCollection /// Название коллекции public void DelCollection(string name) { - if (_storages.ContainsKey(name)) - _storages.Remove(name); + CollectionInfo collectionInfo = new CollectionInfo(name, CollectionType.None, string.Empty); + if (collectionInfo.Name == null || !_storages.ContainsKey(collectionInfo)) { return; } + _storages.Remove(collectionInfo); } /// @@ -82,42 +85,50 @@ public class StorageCollection /// /// Название коллекции /// - public ICollectionGenericObjects? this[string name] + public ICollectionGenericObjects? this[string collectionName] { get { - if (name == null || !_storages.ContainsKey(name)) - return null; - - return _storages[name]; + CollectionInfo collectionInfo = new CollectionInfo(collectionName, CollectionType.None, ""); + if (collectionInfo == null || !_storages.ContainsKey(collectionInfo)) { return null; } + return _storages[collectionInfo]; } } - + /// + /// Сохранение информации по автомобилям в хранилище в файл + /// + /// Путь и имя файла + /// true - сохранение прошло успешно, false - ошибка при сохранении данных public void SaveData(string filename) { if (_storages.Count == 0) - throw new InvalidDataException("В хранилище отсутсвуют коллекции для сохранения"); + { + throw new ArgumentException("В хранилище отсутствуют коллекции для сохранения"); + + } if (File.Exists(filename)) + { File.Delete(filename); + } + using FileStream fs = new(filename, FileMode.Create); - using StreamWriter sw = new StreamWriter(fs); - sw.Write(_collectionKey); - foreach (KeyValuePair> value in _storages) + using StreamWriter streamWriter = new StreamWriter(fs); + streamWriter.Write(_collectionKey); + foreach (KeyValuePair> value in _storages) { - sw.Write(Environment.NewLine); + streamWriter.Write(Environment.NewLine); + // не сохраняем пустые коллекции if (value.Value.Count == 0) { continue; } - sw.Write(value.Key); - sw.Write(_separatorForKeyValue); - sw.Write(value.Value.GetCollectionType); - sw.Write(_separatorForKeyValue); - sw.Write(value.Value.MaxCount); - sw.Write(_separatorForKeyValue); + streamWriter.Write(value.Key); + streamWriter.Write(_separatorForKeyValue); + streamWriter.Write(value.Value.MaxCount); + streamWriter.Write(_separatorForKeyValue); foreach (T? item in value.Value.GetItems()) { @@ -127,8 +138,8 @@ public class StorageCollection continue; } - sw.Write(data); - sw.Write(_separatorItems); + streamWriter.Write(data); + streamWriter.Write(_separatorItems); } } } @@ -142,60 +153,62 @@ public class StorageCollection using (FileStream fs = new(filename, FileMode.Open)) { - using StreamReader sr = new StreamReader(fs); - - string str = sr.ReadLine(); - if (str == null || str.Length == 0) + using StreamReader streamReader = new StreamReader(fs); + string firstString = streamReader.ReadLine(); + if (firstString == null || firstString.Length == 0) { - throw new InvalidDataException("В файле нет данных"); + throw new ArgumentException("В файле нет данных"); + } + if (!firstString.Equals(_collectionKey)) + { + //если нет такой записи, то это не те данные + throw new InvalidDataException("В файле неверные данные"); } - if (!str.Equals(_collectionKey)) - { - throw new InvalidOperationException("В файле неверные данные"); - } _storages.Clear(); - - while (!sr.EndOfStream) + while (!streamReader.EndOfStream) { - string[] record = sr.ReadLine().Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries); - if (record.Length != 4) + string[] record = streamReader.ReadLine().Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries); + if (record.Length != 3) { continue; } + 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[1]); - CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]); - ICollectionGenericObjects? collection = StorageCollection.CreateCollection(collectionType); - if (collection == null) - { - throw new InvalidOperationException("Не удалось создать коллекцию"); - } - - collection.MaxCount = Convert.ToInt32(record[2]); - - string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries); + string[] set = record[2].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries); foreach (string elem in set) { if (elem?.CreateDrawingTanker() is T tanker) { try { - if (collection.Insert(tanker) == -1) + if (!collection.Insert(tanker)) { throw new InvalidOperationException("Объект не удалось добавить в коллекцию: " + record[3]); } } catch (CollectionOverflowException ex) { - throw new ArgumentOutOfRangeException("Коллекция переполнена", ex); + throw new CollectionOverflowException("Коллекция переполнена", ex); } } } - _storages.Add(record[0], collection); + + _storages.Add(collectionInfo, collection); } } + } + /// + /// Создание коллекции по типу + /// + /// + /// private static ICollectionGenericObjects? CreateCollection(CollectionType collectionType) { return collectionType switch diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/TankerCompareByColor.cs b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/TankerCompareByColor.cs new file mode 100644 index 0000000..08bffc0 --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/TankerCompareByColor.cs @@ -0,0 +1,36 @@ +using ProjectGasolineTanker.Drawings; + +namespace ProjectGasolineTanker.Drawnings; + +/// +/// Сравнение по цвету, скорости, весу +/// +public class TankerCompareByColor : IComparer +{ + public int Compare(DrawingTanker? x, DrawingTanker? y) + { + if (x == null && y == null) + { + return 0; + } + if (x == null || x.EntityTanker == null) + { + return -1; + } + + if (y == null || y.EntityTanker == null) + { + return 1; + } + if (x.EntityTanker.BodyColor.Name != y.EntityTanker.BodyColor.Name) + { + return x.EntityTanker.BodyColor.Name.CompareTo(y.EntityTanker.BodyColor.Name); + } + var speedCompare = x.EntityTanker.Speed.CompareTo(y.EntityTanker.Speed); + if (speedCompare != 0) + { + return speedCompare; + } + return x.EntityTanker.Weight.CompareTo(y.EntityTanker.Weight); + } +} \ No newline at end of file diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/TankerCompareByType.cs b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/TankerCompareByType.cs new file mode 100644 index 0000000..ec0909a --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/TankerCompareByType.cs @@ -0,0 +1,39 @@ +using ProjectGasolineTanker.Drawings; + +namespace ProjectGasolineTanker.Drawnings; +/// +/// Сравнение по типу, скорости, весу +/// +public class TankerCompareByType : IComparer +{ + public int Compare(DrawingTanker? x, DrawingTanker? y) + { + if (x == null && y == null) + { + return 0; + } + if (x == null || x.EntityTanker == null) + { + return -1; + } + + if (y == null || y.EntityTanker == null) + { + return 1; + } + + if (!x.GetType().Name.Equals(y.GetType().Name)) + { + return x.GetType().Name.CompareTo(y.GetType().Name); + } + + var speedCompare = x.EntityTanker.Speed.CompareTo(y.EntityTanker.Speed); + if (speedCompare != 0) + { + return speedCompare; + } + + + return x.EntityTanker.Weight.CompareTo(y.EntityTanker.Weight); + } +} \ No newline at end of file diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/Drawings/DrawingTankerEqutables.cs b/ProjectGasolineTanker/ProjectGasolineTanker/Drawings/DrawingTankerEqutables.cs new file mode 100644 index 0000000..a212dad --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/Drawings/DrawingTankerEqutables.cs @@ -0,0 +1,68 @@ +using ProjectGasolineTanker.Entities; +using System.Diagnostics.CodeAnalysis; + +namespace ProjectGasolineTanker.Drawings; + +public class DrawingTankerEqutables : IEqualityComparer +{ + public bool Equals(DrawingTanker? x, DrawingTanker? y) + { + if (x == null || x.EntityTanker == null) + { + return false; + } + + if (y == null || y.EntityTanker == null) + { + return false; + } + + if (x.GetType().Name != y.GetType().Name) + { + return false; + } + + if (x.EntityTanker.Speed != y.EntityTanker.Speed) + { + return false; + } + + if (x.EntityTanker.Weight != y.EntityTanker.Weight) + { + return false; + } + + if (x.EntityTanker.BodyColor != y.EntityTanker.BodyColor) + { + return false; + } + if (x.EntityTanker.BodyColor != y.EntityTanker.BodyColor) + { + return false; + } + if (x is DrawingGasolineTanker && y is DrawingGasolineTanker) + { + EntityGasolineTanker entityX = (EntityGasolineTanker)x.EntityTanker; + EntityGasolineTanker entityY = (EntityGasolineTanker)y.EntityTanker; + if (entityX.OrnamentWheels != entityY.OrnamentWheels) + { + return false; + } + if (entityX.Tank != entityY.Tank) + { + return false; + } + if (entityX.AdditionalColor != entityY.AdditionalColor) + { + return false; + } + } + + return true; + } + + public int GetHashCode([DisallowNull] DrawingTanker obj) + { + return obj.GetHashCode(); + } +} \ No newline at end of file diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/Exceptions/ObjectExistException.cs b/ProjectGasolineTanker/ProjectGasolineTanker/Exceptions/ObjectExistException.cs new file mode 100644 index 0000000..508fbea --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/Exceptions/ObjectExistException.cs @@ -0,0 +1,18 @@ +using System.Runtime.Serialization; + +namespace ProjectGasolineTanker.Exceptions; + +[Serializable] +internal class ObjectExistException : ApplicationException +{ + public ObjectExistException(int count) : base("Вставка уже существующего объекта") { } + + public ObjectExistException() : base() { } + + public ObjectExistException(string message) : base(message) { } + + public ObjectExistException(string message, Exception exception) : base(message, exception) { } + + protected ObjectExistException(SerializationInfo info, StreamingContext contex) : base(info, contex) { } +} + diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.Designer.cs b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.Designer.cs index 8fc59f6..45e208d 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.Designer.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.Designer.cs @@ -30,6 +30,8 @@ { groupBoxTools = new GroupBox(); panelCompanyTools = new Panel(); + buttonSortByColor = new Button(); + buttonSortByType = new Button(); buttonAddTanker = new Button(); buttonRefresh = new Button(); maskedTextBox1 = new MaskedTextBox(); @@ -66,15 +68,17 @@ groupBoxTools.Controls.Add(panelStorage); groupBoxTools.Controls.Add(comboBoxSelectorCompany); groupBoxTools.Dock = DockStyle.Right; - groupBoxTools.Location = new Point(1222, 33); + groupBoxTools.Location = new Point(1063, 33); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(258, 784); + groupBoxTools.Size = new Size(258, 791); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; // // panelCompanyTools // + panelCompanyTools.Controls.Add(buttonSortByColor); + panelCompanyTools.Controls.Add(buttonSortByType); panelCompanyTools.Controls.Add(buttonAddTanker); panelCompanyTools.Controls.Add(buttonRefresh); panelCompanyTools.Controls.Add(maskedTextBox1); @@ -82,11 +86,33 @@ panelCompanyTools.Controls.Add(buttonDelTanker); panelCompanyTools.Dock = DockStyle.Bottom; panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 463); + panelCompanyTools.Location = new Point(3, 438); panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(252, 318); + panelCompanyTools.Size = new Size(252, 350); panelCompanyTools.TabIndex = 2; // + // buttonSortByColor + // + buttonSortByColor.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonSortByColor.Location = new Point(13, 294); + buttonSortByColor.Name = "buttonSortByColor"; + buttonSortByColor.Size = new Size(230, 43); + buttonSortByColor.TabIndex = 8; + buttonSortByColor.Text = "Сортировка по цвету"; + buttonSortByColor.UseVisualStyleBackColor = true; + buttonSortByColor.Click += buttonSortByColor_Click; + // + // buttonSortByType + // + buttonSortByType.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonSortByType.Location = new Point(13, 245); + buttonSortByType.Name = "buttonSortByType"; + buttonSortByType.Size = new Size(230, 43); + buttonSortByType.TabIndex = 7; + buttonSortByType.Text = "Сортировка по типу"; + buttonSortByType.UseVisualStyleBackColor = true; + buttonSortByType.Click += buttonSortByType_Click; + // // buttonAddTanker // buttonAddTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -101,9 +127,9 @@ // buttonRefresh // buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(13, 237); + buttonRefresh.Location = new Point(13, 196); buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(226, 55); + buttonRefresh.Size = new Size(230, 43); buttonRefresh.TabIndex = 6; buttonRefresh.Text = "Обновить"; buttonRefresh.UseVisualStyleBackColor = true; @@ -111,7 +137,7 @@ // // maskedTextBox1 // - maskedTextBox1.Location = new Point(13, 78); + maskedTextBox1.Location = new Point(13, 63); maskedTextBox1.Mask = "00"; maskedTextBox1.Name = "maskedTextBox1"; maskedTextBox1.Size = new Size(230, 31); @@ -121,9 +147,9 @@ // buttonGoToCheck // buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonGoToCheck.Location = new Point(13, 176); + buttonGoToCheck.Location = new Point(13, 149); buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(230, 55); + buttonGoToCheck.Size = new Size(230, 41); buttonGoToCheck.TabIndex = 5; buttonGoToCheck.Text = "Передать на тесты"; buttonGoToCheck.UseVisualStyleBackColor = true; @@ -132,9 +158,9 @@ // buttonDelTanker // buttonDelTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonDelTanker.Location = new Point(13, 115); + buttonDelTanker.Location = new Point(13, 100); buttonDelTanker.Name = "buttonDelTanker"; - buttonDelTanker.Size = new Size(230, 55); + buttonDelTanker.Size = new Size(230, 43); buttonDelTanker.TabIndex = 4; buttonDelTanker.Text = "Удаление грузовика"; buttonDelTanker.UseVisualStyleBackColor = true; @@ -142,7 +168,7 @@ // // buttonCreateCompany // - buttonCreateCompany.Location = new Point(16, 374); + buttonCreateCompany.Location = new Point(16, 359); buttonCreateCompany.Name = "buttonCreateCompany"; buttonCreateCompany.Size = new Size(226, 34); buttonCreateCompany.TabIndex = 8; @@ -162,7 +188,7 @@ panelStorage.Dock = DockStyle.Top; panelStorage.Location = new Point(3, 27); panelStorage.Name = "panelStorage"; - panelStorage.Size = new Size(252, 328); + panelStorage.Size = new Size(252, 326); panelStorage.TabIndex = 7; // // buttonCollectionDel @@ -238,7 +264,7 @@ comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxSelectorCompany.FormattingEnabled = true; comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" }); - comboBoxSelectorCompany.Location = new Point(16, 417); + comboBoxSelectorCompany.Location = new Point(16, 399); comboBoxSelectorCompany.Name = "comboBoxSelectorCompany"; comboBoxSelectorCompany.Size = new Size(230, 33); comboBoxSelectorCompany.TabIndex = 0; @@ -249,7 +275,7 @@ pictureBox.Dock = DockStyle.Fill; pictureBox.Location = new Point(0, 33); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(1222, 784); + pictureBox.Size = new Size(1063, 791); pictureBox.TabIndex = 1; pictureBox.TabStop = false; // @@ -259,7 +285,7 @@ menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; - menuStrip.Size = new Size(1480, 33); + menuStrip.Size = new Size(1321, 33); menuStrip.TabIndex = 2; menuStrip.Text = "menuStrip"; // @@ -298,7 +324,7 @@ // AutoScaleDimensions = new SizeF(10F, 25F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1480, 817); + ClientSize = new Size(1321, 824); Controls.Add(pictureBox); Controls.Add(groupBoxTools); Controls.Add(menuStrip); @@ -343,5 +369,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/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.cs b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.cs index 4652365..7be1c2d 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.cs @@ -11,6 +11,7 @@ using System.Windows.Forms; using ProjectGasolineTanker.Drawings; using Microsoft.Extensions.Logging; using ProjectGasolineTanker.Exceptions; +using ProjectGasolineTanker.Drawnings; namespace ProjectGasolineTanker; @@ -76,6 +77,11 @@ public partial class FormTankerCollection : Form MessageBox.Show(ex.Message); _logger.LogError("Ошибка: {Message}", ex.Message); } + catch (ObjectExistException ex) + { + MessageBox.Show("Такой объект есть в коллекции"); + _logger.LogWarning($"Добавление существующего объекта: {ex.Message}"); + } } /// @@ -223,9 +229,11 @@ public partial class FormTankerCollection : 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); + } } } @@ -307,4 +315,25 @@ public partial class FormTankerCollection : Form } } } + + private void buttonSortByType_Click(object sender, EventArgs e) + { + CompareTankers(new TankerCompareByType()); + } + + private void buttonSortByColor_Click(object sender, EventArgs e) + { + CompareTankers(new TankerCompareByColor()); + } + + private void CompareTankers(IComparer comparer) + { + if (_company == null) + { + return; + } + + _company.Sort(comparer); + pictureBox.Image = _company.Show(); + } } diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.resx b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.resx index 37c7fa4..005058f 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.resx +++ b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.resx @@ -127,6 +127,6 @@ 355, 17 - 57 + 25 \ No newline at end of file