Evtishina_Elizaveta/ISEbd-11_Evtishina_E.V.
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hu

Browse Source
This commit is contained in:
elizaveta 2024-10-08 14:40:07 +04:00
parent 24afbe9254
commit 1ada437aae
12 changed files with 530 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Tank/Tank/CollectionGenericObjects/AbstractCompany.cs
View File

@ -9,33 +9,27 @@ public abstract class AbstractCompany
/// <summary> /// <summary>
/// Размер места (ширина) /// Размер места (ширина)
/// </summary> /// </summary>
protected readonly int _placeSizeWidth = 295; protected readonly int _placeSizeWidth = 240;
/// <summary> /// <summary>
/// Размер места (высота) /// Размер места (высота)
/// </summary> /// </summary>
protected readonly int _placeSizeHeight = 160; protected readonly int _placeSizeHeight = 50;
/// <summary> /// <summary>
/// Ширина окна /// Ширина окна
/// </summary> /// </summary>
protected readonly int _pictureWidth; protected readonly int _pictureWidth;
/// <summary> /// <summary>
/// Высота окна /// Высота окна
/// </summary> /// </summary>
protected readonly int _pictureHeight; protected readonly int _pictureHeight;
/// <summary> /// <summary>
/// Коллекция автомобилей /// Коллекция автомобилей
/// </summary> /// </summary>
protected ICollectionGenericObjects<DrawningMachine>? _collection = null; protected ICollectionGenericObjects<DrawningMachine>? _collection = null;
/// <summary> /// <summary>
/// Вычисление максимального количества элементов, который можно разместить в окне /// Вычисление максимального количества элементов, который можно разместить в окне
/// </summary> /// </summary>
private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight); private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
/// <summary> /// <summary>
/// Конструктор /// Конструктор
/// </summary> /// </summary>
@ -49,29 +43,31 @@ public abstract class AbstractCompany
_collection = collection; _collection = collection;
_collection.MaxCount = GetMaxCount; _collection.MaxCount = GetMaxCount;
} }
/// <summary> /// <summary>
/// Перегрузка оператора сложения для класса /// Перегрузка оператора сложения для класса
/// </summary> /// </summary>
/// <param name="company">Компания</param> /// <param name="company">Компания</param>
/// <param name="car">Добавляемый объект</param> /// <param name="car">Добавляемый объект</param>
/// <returns></returns> /// <returns></returns>
public static int operator +(AbstractCompany company, DrawningMachine machine) public static bool operator +(AbstractCompany company, DrawningMachine bus)
{ {
return company._collection.Insert(machine); return company._collection?.Insert(bus, new DrawiningMachineEqutables()) != -1 ? true : false;
} }
/// <summary> /// <summary>
/// Перегрузка оператора удаления для класса /// Перегрузка оператора удаления для класса
/// </summary> /// </summary>
/// <param name="company">Компания</param> /// <param name="company">Компания</param>
/// <param name="position">Номер удаляемого объекта</param> /// <param name="position">Номер удаляемого объекта</param>
/// <returns></returns> /// <returns></returns>
public static DrawningMachine? operator -(AbstractCompany company, int position) public static DrawningMachine operator -(AbstractCompany? company, int position)
{ {
return company._collection?.Remove(position) ?? null; return company._collection.Remove(position);
} }
/// <summary>
/// Сортировка
/// </summary>
/// <param name="comparer">Сравнитель объектов</param>
public void Sort(IComparer<DrawningMachine?> comparer) => _collection?.CollectionSort(comparer);
/// <summary> /// <summary>
/// Получение случайного объекта из коллекции /// Получение случайного объекта из коллекции
/// </summary> /// </summary>
@ -81,7 +77,6 @@ public abstract class AbstractCompany
Random rnd = new(); Random rnd = new();
return _collection?.Get(rnd.Next(GetMaxCount)); return _collection?.Get(rnd.Next(GetMaxCount));
} }
/// <summary> /// <summary>
/// Вывод всей коллекции /// Вывод всей коллекции
/// </summary> /// </summary>
@ -91,23 +86,23 @@ public abstract class AbstractCompany
Bitmap bitmap = new(_pictureWidth, _pictureHeight); Bitmap bitmap = new(_pictureWidth, _pictureHeight);
Graphics graphics = Graphics.FromImage(bitmap); Graphics graphics = Graphics.FromImage(bitmap);
DrawBackgound(graphics); DrawBackgound(graphics);
SetObjectsPosition(); SetObjectsPosition();
for (int i = 0; i < (_collection?.Count ?? 0); ++i) for (int i = 0; i < (_collection?.Count ?? 0); ++i)
{ {
DrawningMachine? obj = _collection?.Get(i); try
obj?.DrawTransport(graphics); {
DrawningMachine? obj = _collection?.Get(i);
obj?.DrawTransport(graphics);
}
catch (Exception) { }
} }
return bitmap; return bitmap;
} }
/// <summary> /// <summary>
/// Вывод заднего фона /// Вывод заднего фона
/// </summary> /// </summary>
/// <param name="g"></param> /// <param name="g"></param>
protected abstract void DrawBackgound(Graphics g); protected abstract void DrawBackgound(Graphics g);
/// <summary> /// <summary>
/// Расстановка объектов /// Расстановка объектов
/// </summary> /// </summary>

73
Tank/Tank/CollectionGenericObjects/CollectionInfo.cs Normal file
View File

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

20
Tank/Tank/CollectionGenericObjects/ICollectionGenericObjects.cs
View File

@ -53,4 +53,24 @@ where T : class
/// </summary> /// </summary>
/// <returns>Поэлементый вывод элементов коллекции</returns> /// <returns>Поэлементый вывод элементов коллекции</returns>
IEnumerable<T?> GetItems(); IEnumerable<T?> GetItems();
/// <summary>
/// Добавление объекта в коллекцию
/// </summary>
/// <param name="obj">Добавляемый объект</param>
/// <param name="comparer">Cравнение двух объектов</param>
/// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
int Insert(T obj, IEqualityComparer<DrawningMachine?>? comparer = null);
/// Добавление объекта в коллекцию на конкретную позицию
/// </summary>
/// <param name="obj">Добавляемый объект</param>
/// <param name="position">Позиция</param>
/// <param name="comparer">Cравнение двух объектов</param>
/// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
int Insert(T obj, int position, IEqualityComparer<DrawningMachine?>? comparer = null);
/// <summary>
/// Сортировка коллекции
/// </summary>
/// <param name="comparer">Сравнитель объектов</param>
void CollectionSort(IComparer<T?> comparer);
} }

24
Tank/Tank/CollectionGenericObjects/ListGenericObjects.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Tank.Drowings;
using Tank.Exceptions; using Tank.Exceptions;
namespace Tank.CollectionGenericObjects; namespace Tank.CollectionGenericObjects;
@ -108,4 +109,27 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
yield return _collection[i]; yield return _collection[i];
} }
} }
public int Insert(T obj, IEqualityComparer<DrawningMachine?>? comparer = null)
{
if (Count == _maxCount) throw new CollectionOverflowException(Count);
_collection.Add(obj);
return Count;
}
public int Insert(T obj, int position, IEqualityComparer<DrawningMachine?>? comparer = null)
{
if (position < 0 || position >= Count)
throw new PositionOutOfCollectionException(position);
if (Count == _maxCount)
throw new CollectionOverflowException(Count);
_collection.Insert(position, obj);
return position;
}
public void CollectionSort(IComparer<T?> comparer)
{
_collection.Sort(comparer);
}
} }

52
Tank/Tank/CollectionGenericObjects/MassiveGenericObjects.cs
View File

@ -1,4 +1,5 @@
using Tank.CollectionGenericObjects; using Tank.CollectionGenericObjects;
using Tank.Drowings;
using Tank.Exceptions; using Tank.Exceptions;
namespace Tank.CollectionGenericObjects; namespace Tank.CollectionGenericObjects;
@ -125,4 +126,55 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
yield return _collection[i]; yield return _collection[i];
} }
} }
public int Insert(T obj, IEqualityComparer<DrawningMachine?>? comparer = null)
{
for (int i = 0; i < _collection.Length; i++)
{
if (_collection[i] == null)
{
_collection[i] = obj;
return i;
}
}
throw new CollectionOverflowException(Count);
}
public int Insert(T obj, int position, IEqualityComparer<DrawningMachine?>? comparer = null)
{
if (position < 0 || position >= _collection.Length)
{
throw new PositionOutOfCollectionException(position);
}
if (_collection[position] == null)
{
_collection[position] = obj;
return position;
}
else
{
for (int i = position; i < _collection.Length; ++i) //ищем свободное место справа
{
if (_collection[i] == null)
{
_collection[i] = obj;
return i;
}
}
for (int i = 0; i < position; ++i) // иначе слева
{
if (_collection[i] == null)
{
_collection[i] = obj;
return i;
}
}
}
throw new CollectionOverflowException(Count);
}
public void CollectionSort(IComparer<T?> comparer)
{
Array.Sort(_collection, comparer);
}
} }

295
Tank/Tank/CollectionGenericObjects/StorageCollection.cs
View File

@ -13,122 +13,108 @@ namespace Tank.CollectionGenericObjects;
public class StorageCollection<T> public class StorageCollection<T>
where T : DrawningMachine where T : DrawningMachine
{ {
/// <summary> /// <summary>
/// Словарь (хранилище) с коллекциями /// Словарь (хранилище) с коллекциями
/// </summary> /// </summary>
readonly Dictionary<string, ICollectionGenericObjects<T>> _storages; readonly Dictionary<CollectionInfo, ICollectionGenericObjects<T>> _storages;
/// <summary>
/// <summary> /// Возвращение списка названий коллекций
/// Возвращение списка названий коллекций /// </summary>
/// </summary> public List<CollectionInfo> Keys => _storages.Keys.ToList();
public List<string> Keys => _storages.Keys.ToList(); /// <summary>
/// Конструктор
/// <summary> /// </summary>
/// Ключевое слово, с которого должен начинаться файл public StorageCollection()
/// </summary> {
private readonly string _collectionKey = "CollectionStorage"; _storages = new Dictionary<CollectionInfo, ICollectionGenericObjects<T>>();
}
/// <summary> /// <summary>
/// Разделитель для записи ключа и значения элемента словаря /// Добавление коллекции в хранилище
/// </summary> /// </summary>
private readonly string _separatorForKeyValue = "|"; /// <param name="name">Название коллекции</param>
/// <param name="collectionType">тип коллекции</param>
/// <summary> public void AddCollection(string name, CollectionType collectionType)
/// Разделитель для записей коллекции данных в файл {
/// </summary> CollectionInfo collectionInfo = new CollectionInfo(name, collectionType, string.Empty);
private readonly string _separatorItems = ";"; if (_storages.ContainsKey(collectionInfo)) return;
if (collectionType == CollectionType.None) return;
/// <summary> else if (collectionType == CollectionType.Massive)
/// Конструктор _storages[collectionInfo] = new MassiveGenericObjects<T>();
/// </summary> else if (collectionType == CollectionType.List)
public StorageCollection() _storages[collectionInfo] = new ListGenericObjects<T>();
{ }
_storages = new Dictionary<string, ICollectionGenericObjects<T>>(); /// <summary>
} /// Удаление коллекции
/// <summary> /// </summary>
/// Добавление коллекции в хранилище /// <param name="name">Название коллекции</param>
/// </summary> public void DelCollection(string name)
/// <param name="name">Название коллекции</param> {
/// <param name="collectionType">тип коллекции</param> CollectionInfo collectionInfo = new CollectionInfo(name, CollectionType.None, string.Empty);
public void AddCollection(string name, CollectionType collectionType) if (_storages.ContainsKey(collectionInfo))
{ _storages.Remove(collectionInfo);
// TODO проверка, что name не пустой и нет в словаре записи с таким ключом
// TODO Прописать логику для добавления
if (name == null || _storages.ContainsKey(name))
return;
switch (collectionType)
{
case CollectionType.None:
return;
case CollectionType.Massive:
_storages[name] = new MassiveGenericObjects<T>();
return;
case CollectionType.List:
_storages[name] = new ListGenericObjects<T>();
return;
}
} }
/// <summary> /// <summary>
/// Удаление коллекции /// Доступ к коллекции
/// </summary> /// </summary>
/// <param name="name">Название коллекции</param> /// <param name="name">Название коллекции</param>
public void DelCollection(string name) /// <returns></returns>
public ICollectionGenericObjects<T> this[string name]
{
get
{ {
// TODO Прописать логику для удаления коллекции CollectionInfo collectionInfo = new CollectionInfo(name, CollectionType.None, string.Empty);
if (_storages.ContainsKey(name))
_storages.Remove(name);
}
/// <summary> if (_storages.ContainsKey(collectionInfo))
/// Доступ к коллекции return _storages[collectionInfo];
/// </summary>
/// <param name="name">Название коллекции</param>
/// <returns></returns>
public ICollectionGenericObjects<T>? this[string name]
{
get
{
// TODO Продумать логику получения объекта
if (name == null || !_storages.ContainsKey(name))
return null;
return _storages[name];
}
}
/// <summary> return null;
/// Сохранение информации по самолетам в хранилище в файл
/// </summary> }
/// <param name="filename">Путь и имя файла</param> }
/// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns> /// <summary>
public void SaveData(string filename) /// Ключевое слово, с которого должен начинаться файл
/// </summary>
private readonly string _collectionKey = "CollectionsStorage";
/// <summary>
/// Разделитель для записи ключа и значения элемента словаря
/// </summary>
private readonly string _separatorForKeyValue = "|";
/// <summary>
/// Разделитель для записей коллекции данных в файл
/// </summary>
private readonly string _separatorItems = ";";
/// <summary>
/// Сохранение информации по автомобилям в хранилище в файл
/// </summary>
/// <param name="filename">Путь и имя файла</param>
/// <returns>true - сохранение прошло успешно, false - ошибка при
///сохранении данных</returns>
public void SaveData(string filename)
{
if (_storages.Count == 0)
{ {
if (_storages.Count == 0) throw new Exception("В хранилище отсутствуют коллекции для сохранения");
}
if (File.Exists(filename))
{
File.Delete(filename);
}
using (StreamWriter writer = new StreamWriter(filename))
{
writer.Write(_collectionKey);
foreach (KeyValuePair<CollectionInfo, ICollectionGenericObjects<T>> value in _storages)
{ {
throw new InvalidDataException("В хранилище отсутствуют коллекции для сохранения"); StringBuilder sb = new();
} sb.Append(Environment.NewLine);
if (File.Exists(filename))
{
File.Delete(filename);
}
using FileStream fs = new(filename, FileMode.Create);
using StreamWriter sw = new StreamWriter(fs);
sw.WriteLine(_collectionKey);
foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
{
sw.Write(Environment.NewLine);
// не сохраняем пустые коллекции
if (value.Value.Count == 0) if (value.Value.Count == 0)
{ {
continue; continue;
} }
sw.Write(value.Key); sb.Append(value.Key);
sw.Write(_separatorForKeyValue); sb.Append(_separatorForKeyValue);
sw.Write(value.Value.GetCollectionType); sb.Append(value.Value.MaxCount);
sw.Write(_separatorForKeyValue); sb.Append(_separatorForKeyValue);
sw.Write(value.Value.MaxCount);
sw.Write(_separatorForKeyValue);
foreach (T? item in value.Value.GetItems()) foreach (T? item in value.Value.GetItems())
{ {
string data = item?.GetDataForSave() ?? string.Empty; string data = item?.GetDataForSave() ?? string.Empty;
@ -136,90 +122,87 @@ public class StorageCollection<T>
{ {
continue; continue;
} }
sb.Append(data);
sw.Write(data); sb.Append(_separatorItems);
sw.Write(_separatorItems);
} }
writer.Write(sb);
} }
} }
}
/// <summary> /// <summary>
/// Загрузка информации по самолетам в хранилище из файла /// Загрузка информации по автомобилям в хранилище из файла
/// </summary> /// </summary>
/// <param name="filename">Путь и имя файла</param> /// <param name="filename">Путь и имя файла</param>/// <returns>true - загрузка прошла успешно, false - ошибка при загрузке
/// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns> ///данных</returns>
public void LoadData(string filename) public void LoadData(string filename)
{
if (!File.Exists(filename))
{ {
if (!File.Exists(filename)) throw new Exception("Файл не существует");
{ }
throw new FileNotFoundException("Файл не существует"); using (StreamReader fs = File.OpenText(filename))
}
using (StreamReader reader = new(filename))
{ {
string line = reader.ReadLine(); string str = fs.ReadLine();
if (line == null || line.Length == 0) if (str == null || str.Length == 0)
{ {
throw new InvalidDataException("В файле нет данных"); throw new Exception("В файле нет данных");
} }
if (!line.Equals(_collectionKey)) if (!str.StartsWith(_collectionKey))
{ {
throw new InvalidOperationException("В файле неверные данные"); throw new Exception("В файле неверные данные");
} }
_storages.Clear(); _storages.Clear();
while ((line = reader.ReadLine()) != null) string strs = "";
while ((strs = fs.ReadLine()) != null)
{ {
string[] record = line.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries); string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
if (record.Length != 4) if (record.Length != 3)
{ {
continue; continue;
} }
CollectionInfo? collectionInfo = CollectionInfo.GetCollectionInfo(record[0]) ?? throw new Exception("Не удалось определить информацию коллекции: " + record[0]);
CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]); ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionInfo.CollectionType);
ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
if (collection == null) if (collection == null)
{ {
throw new InvalidOperationException("Не удалось создать коллекцию"); throw new Exception("Не удалось создать коллекцию");
} }
collection.MaxCount = Convert.ToInt32(record[1]);
collection.MaxCount = Convert.ToInt32(record[2]); string[] set = record[2].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
foreach (string elem in set) foreach (string elem in set)
{ {
if (elem?.CreateDrawningMachine() is T locomotive) if (elem?.CreateDrawningMachine() is T machine)
{ {
try try
{ {
if (collection.Insert(locomotive) == -1) if (collection.Insert(machine) == -1)
{ {
throw new InvalidOperationException("Объект не удалось добавить в коллекцию: " + record[3]); throw new Exception("Объект не удалось добавить в коллекцию: " + record[3]);
} }
} }
catch (CollectionOverflowException ex) catch (CollectionOverflowException ex)
{ {
throw new ArgumentOutOfRangeException("Коллекция переполнена", ex); throw new Exception("Коллекция переполнена", ex);
} }
} }
} }
_storages.Add(record[0], collection); _storages.Add(collectionInfo, collection);
} }
} }
} }
/// <summary>
/// <summary> /// Создание коллекции по типу
/// Создание коллекции по типу /// </summary>
/// </summary> /// <param name="collectionType"></param>
/// <param name="collectionType"></param> /// <returns></returns>
/// <returns></returns> private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType) {
return collectionType switch
{ {
return collectionType switch CollectionType.Massive => new MassiveGenericObjects<T>(),
{ CollectionType.List => new ListGenericObjects<T>(),
CollectionType.Massive => new MassiveGenericObjects<T>(), _ => null,
CollectionType.List => new ListGenericObjects<T>(), };
_ => null
};
}
} }
}

61
Tank/Tank/Drowings/DrawiningMachineEqutables.cs Normal file
View File

@ -0,0 +1,61 @@
using System.Diagnostics.CodeAnalysis;
using Tank.Entities;
namespace Tank.Drowings;
public class DrawiningMachineEqutables : IEqualityComparer<DrawningMachine?>
{
public bool Equals(DrawningMachine? x, DrawningMachine? y)
{
if (x == null || x.EntityMachine == null)
{
return false;
}
if (y == null || y.EntityMachine == null)
{
return false;
}
if (x.GetType().Name != y.GetType().Name)
{
return false;
}
if (x.EntityMachine.Speed != y.EntityMachine.Speed)
{
return false;
}
if (x.EntityMachine.Weight != y.EntityMachine.Weight)
{
return false;
}
if (x.EntityMachine.BodyColor != y.EntityMachine.BodyColor)
{
return false;
}
if (x is DrawningTank && y is DrawningTank)
{
EntityTank _x = (EntityTank)x.EntityMachine;
EntityTank _y = (EntityTank)x.EntityMachine;
if (_x.AdditionalColor != _y.AdditionalColor)
{
return false;
}
if (_x.Pulemet != _y.Pulemet)
{
return false;
}
if (_x.Gusenica != _y.Gusenica)
{
return false;
}
if (_x.Pushka != _y.Pushka)
{
return false;
}
}
return true;
}
public int GetHashCode([DisallowNull] DrawningMachine obj)
{
return obj.GetHashCode();
}
}

34
Tank/Tank/Drowings/DrawningMachineCompareByColor.cs Normal file
View File

@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tank.Drowings;
public class DrawningMachineCompareByColor : IComparer<DrawningMachine?>
{
public int Compare(DrawningMachine? x, DrawningMachine? y)
{
if (x == null || x.EntityMachine == null)
{
return 1;
}
if (y == null || y.EntityMachine == null)
{
return -1;
}
var bodycolorCompare = x.EntityMachine.BodyColor.Name.CompareTo(y.EntityMachine.BodyColor.Name);
if (bodycolorCompare != 0)
{
return bodycolorCompare;
}
var speedCompare = x.EntityMachine.Speed.CompareTo(y.EntityMachine.Speed);
if (speedCompare != 0)
{
return speedCompare;
}
return x.EntityMachine.Weight.CompareTo(y.EntityMachine.Weight);
}
}

33
Tank/Tank/Drowings/DrawningMachineCompareByType .cs Normal file
View File

@ -0,0 +1,33 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tank.Drowings;
public class DrawningMachineCompareByType : IComparer<DrawningMachine?>
{
public int Compare(DrawningMachine? x, DrawningMachine? y)
{
if (x == null || x.EntityMachine == null)
{
return -1;
}
if (y == null || y.EntityMachine == null)
{
return 1;
}
if (x.GetType().Name != y.GetType().Name)
{
return x.GetType().Name.CompareTo(y.GetType().Name);
}
var speedCompare = x.EntityMachine.Speed.CompareTo(y.EntityMachine.Speed);
if (speedCompare != 0)
{
return speedCompare;
}
return x.EntityMachine.Weight.CompareTo(y.EntityMachine.Weight);
}
}

56
Tank/Tank/FormTankCollection.Designer.cs generated
View File

@ -30,6 +30,8 @@
{ {
groupBoxTools = new GroupBox(); groupBoxTools = new GroupBox();
panelCompanyTools = new Panel(); panelCompanyTools = new Panel();
buttonSortByType = new Button();
buttonSortByColor = new Button();
buttonAddTank = new Button(); buttonAddTank = new Button();
maskedTextBoxPosition = new MaskedTextBox(); maskedTextBoxPosition = new MaskedTextBox();
buttonRefresh = new Button(); buttonRefresh = new Button();
@ -66,15 +68,17 @@
groupBoxTools.Controls.Add(panelStorage); groupBoxTools.Controls.Add(panelStorage);
groupBoxTools.Controls.Add(comboBoxSelectorCompany); groupBoxTools.Controls.Add(comboBoxSelectorCompany);
groupBoxTools.Dock = DockStyle.Right; groupBoxTools.Dock = DockStyle.Right;
groupBoxTools.Location = new Point(1182, 40); groupBoxTools.Location = new Point(1182, 42);
groupBoxTools.Name = "groupBoxTools"; groupBoxTools.Name = "groupBoxTools";
groupBoxTools.Size = new Size(371, 990); groupBoxTools.Size = new Size(371, 988);
groupBoxTools.TabIndex = 0; groupBoxTools.TabIndex = 0;
groupBoxTools.TabStop = false; groupBoxTools.TabStop = false;
groupBoxTools.Text = "Инструменты"; groupBoxTools.Text = "Инструменты";
// //
// panelCompanyTools // panelCompanyTools
// //
panelCompanyTools.Controls.Add(buttonSortByType);
panelCompanyTools.Controls.Add(buttonSortByColor);
panelCompanyTools.Controls.Add(buttonAddTank); panelCompanyTools.Controls.Add(buttonAddTank);
panelCompanyTools.Controls.Add(maskedTextBoxPosition); panelCompanyTools.Controls.Add(maskedTextBoxPosition);
panelCompanyTools.Controls.Add(buttonRefresh); panelCompanyTools.Controls.Add(buttonRefresh);
@ -82,17 +86,39 @@
panelCompanyTools.Controls.Add(buttonGoToCheck); panelCompanyTools.Controls.Add(buttonGoToCheck);
panelCompanyTools.Dock = DockStyle.Bottom; panelCompanyTools.Dock = DockStyle.Bottom;
panelCompanyTools.Enabled = false; panelCompanyTools.Enabled = false;
panelCompanyTools.Location = new Point(3, 677); panelCompanyTools.Location = new Point(3, 639);
panelCompanyTools.Name = "panelCompanyTools"; panelCompanyTools.Name = "panelCompanyTools";
panelCompanyTools.Size = new Size(365, 310); panelCompanyTools.Size = new Size(365, 346);
panelCompanyTools.TabIndex = 9; panelCompanyTools.TabIndex = 9;
// //
// buttonSortByType
//
buttonSortByType.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonSortByType.Location = new Point(33, 115);
buttonSortByType.Name = "buttonSortByType";
buttonSortByType.Size = new Size(307, 38);
buttonSortByType.TabIndex = 8;
buttonSortByType.Text = "Сортировка по типу";
buttonSortByType.UseVisualStyleBackColor = true;
buttonSortByType.Click += ButtonSortByType_Click;
//
// buttonSortByColor
//
buttonSortByColor.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonSortByColor.Location = new Point(33, 70);
buttonSortByColor.Name = "buttonSortByColor";
buttonSortByColor.Size = new Size(307, 39);
buttonSortByColor.TabIndex = 7;
buttonSortByColor.Text = "Сортировка по цвету";
buttonSortByColor.UseVisualStyleBackColor = true;
buttonSortByColor.Click += ButtonSortByColor_Click;
//
// buttonAddTank // buttonAddTank
// //
buttonAddTank.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; buttonAddTank.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonAddTank.Location = new Point(33, 3); buttonAddTank.Location = new Point(33, 3);
buttonAddTank.Name = "buttonAddTank"; buttonAddTank.Name = "buttonAddTank";
buttonAddTank.Size = new Size(307, 50); buttonAddTank.Size = new Size(307, 41);
buttonAddTank.TabIndex = 1; buttonAddTank.TabIndex = 1;
buttonAddTank.Text = "Добавление танка"; buttonAddTank.Text = "Добавление танка";
buttonAddTank.UseVisualStyleBackColor = true; buttonAddTank.UseVisualStyleBackColor = true;
@ -100,17 +126,17 @@
// //
// maskedTextBoxPosition // maskedTextBoxPosition
// //
maskedTextBoxPosition.Location = new Point(33, 126); maskedTextBoxPosition.Location = new Point(33, 159);
maskedTextBoxPosition.Mask = "00"; maskedTextBoxPosition.Mask = "00";
maskedTextBoxPosition.Name = "maskedTextBoxPosition"; maskedTextBoxPosition.Name = "maskedTextBoxPosition";
maskedTextBoxPosition.Size = new Size(1116, 39); maskedTextBoxPosition.Size = new Size(307, 39);
maskedTextBoxPosition.TabIndex = 3; maskedTextBoxPosition.TabIndex = 3;
maskedTextBoxPosition.ValidatingType = typeof(int); maskedTextBoxPosition.ValidatingType = typeof(int);
// //
// buttonRefresh // buttonRefresh
// //
buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonRefresh.Location = new Point(33, 263); buttonRefresh.Location = new Point(33, 299);
buttonRefresh.Name = "buttonRefresh"; buttonRefresh.Name = "buttonRefresh";
buttonRefresh.Size = new Size(307, 38); buttonRefresh.Size = new Size(307, 38);
buttonRefresh.TabIndex = 6; buttonRefresh.TabIndex = 6;
@ -121,7 +147,7 @@
// buttonDelTank // buttonDelTank
// //
buttonDelTank.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; buttonDelTank.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonDelTank.Location = new Point(33, 171); buttonDelTank.Location = new Point(33, 204);
buttonDelTank.Name = "buttonDelTank"; buttonDelTank.Name = "buttonDelTank";
buttonDelTank.Size = new Size(307, 39); buttonDelTank.Size = new Size(307, 39);
buttonDelTank.TabIndex = 4; buttonDelTank.TabIndex = 4;
@ -132,7 +158,7 @@
// buttonGoToCheck // buttonGoToCheck
// //
buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonGoToCheck.Location = new Point(33, 216); buttonGoToCheck.Location = new Point(33, 249);
buttonGoToCheck.Name = "buttonGoToCheck"; buttonGoToCheck.Name = "buttonGoToCheck";
buttonGoToCheck.Size = new Size(307, 44); buttonGoToCheck.Size = new Size(307, 44);
buttonGoToCheck.TabIndex = 5; buttonGoToCheck.TabIndex = 5;
@ -247,9 +273,9 @@
// pictureBox // pictureBox
// //
pictureBox.Dock = DockStyle.Fill; pictureBox.Dock = DockStyle.Fill;
pictureBox.Location = new Point(0, 40); pictureBox.Location = new Point(0, 42);
pictureBox.Name = "pictureBox"; pictureBox.Name = "pictureBox";
pictureBox.Size = new Size(1182, 990); pictureBox.Size = new Size(1182, 988);
pictureBox.TabIndex = 1; pictureBox.TabIndex = 1;
pictureBox.TabStop = false; pictureBox.TabStop = false;
// //
@ -259,7 +285,7 @@
menuStrip1.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem }); menuStrip1.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
menuStrip1.Location = new Point(0, 0); menuStrip1.Location = new Point(0, 0);
menuStrip1.Name = "menuStrip1"; menuStrip1.Name = "menuStrip1";
menuStrip1.Size = new Size(1553, 40); menuStrip1.Size = new Size(1553, 42);
menuStrip1.TabIndex = 2; menuStrip1.TabIndex = 2;
menuStrip1.Text = "menuStrip1"; menuStrip1.Text = "menuStrip1";
// //
@ -267,7 +293,7 @@
// //
файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem }); файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
файлToolStripMenuItem.Name = "файлToolStripMenuItem"; файлToolStripMenuItem.Name = "файлToolStripMenuItem";
файлToolStripMenuItem.Size = new Size(90, 36); файлToolStripMenuItem.Size = new Size(90, 38);
файлToolStripMenuItem.Text = "Файл"; файлToolStripMenuItem.Text = "Файл";
// //
// saveToolStripMenuItem // saveToolStripMenuItem
@ -343,5 +369,7 @@
private ToolStripMenuItem loadToolStripMenuItem; private ToolStripMenuItem loadToolStripMenuItem;
private SaveFileDialog saveFileDialog; private SaveFileDialog saveFileDialog;
private OpenFileDialog openFileDialog; private OpenFileDialog openFileDialog;
private Button buttonSortByType;
private Button buttonSortByColor;
} }
} }

42
Tank/Tank/FormTankCollection.cs
View File

@ -76,7 +76,7 @@ public partial class FormTankCollection : Form
{ {
return; return;
} }
if (_company + machine != -1) if (_company + machine)
{ {
MessageBox.Show("Объект добавлен"); MessageBox.Show("Объект добавлен");
pictureBox.Image = _company.Show(); pictureBox.Image = _company.Show();
@ -128,7 +128,7 @@ public partial class FormTankCollection : Form
listBoxCollection.Items.Clear(); listBoxCollection.Items.Clear();
for (int i = 0; i < _storageCollection.Keys?.Count; ++i) for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
{ {
string? colName = _storageCollection.Keys?[i]; string? colName = _storageCollection.Keys?[i].Name;
if (!string.IsNullOrEmpty(colName)) if (!string.IsNullOrEmpty(colName))
{ {
listBoxCollection.Items.Add(colName); listBoxCollection.Items.Add(colName);
@ -175,12 +175,12 @@ public partial class FormTankCollection : Form
} }
} }
/// <summary> /// <summary>
/// Перерисовка коллекции /// Перерисовка коллекции
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
private void ButtonRefresh_Click(object sender, EventArgs e) private void ButtonRefresh_Click(object sender, EventArgs e)
{ {
if (_company == null) if (_company == null)
{ {
@ -332,4 +332,30 @@ private void ButtonRefresh_Click(object sender, EventArgs e)
} }
} }
} }
private void ButtonSortByType_Click(object sender, EventArgs e)
{
CompareMachines(new DrawningMachineCompareByType());
}
/// <summary>
/// Сортировка по цвету
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ButtonSortByColor_Click(object sender, EventArgs e)
{
CompareMachines(new DrawningMachineCompareByColor());
}
/// <summary>
/// Сортировка по сравнителю
/// </summary>
/// <param name="comparer">Сравнитель объектов</param>
private void CompareMachines(IComparer<DrawningMachine?> comparer)
{
if (_company == null)
{
return;
}
_company.Sort(comparer);
pictureBox.Image = _company.Show();
}
} }