SAliulovq/Pibd-14_Aliulov_S.R._Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Лабораторная работа 8

Browse Source
This commit is contained in:
SAliulov 2024-06-17 08:09:00 +03:00
parent 3a7858e07a
commit 88cbd86feb
15 changed files with 475 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/AbstractCompany.cs
View File

@ -60,7 +60,7 @@ public abstract class AbstractCompany
/// <returns></returns>
public static int operator +(AbstractCompany company, DrawningBomber bomber)
{
return company._collection.Insert(bomber);
return company._collection.Insert(bomber, new DrawningAirCraftEqutables());
}
/// <summary>
@ -110,6 +110,12 @@ public abstract class AbstractCompany
return bitmap;
}
/// <summary>
/// Сортировка
/// </summary>
/// <param name="comparer">Сравнитель объектов</param>
public void Sort(IComparer<DrawningBomber?> comparer) => _collection?.CollectionSort(comparer);
/// <summary>
/// Вывод заднего фона
/// </summary>

76
ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/CollectionInfo.cs Normal file
View File

@ -0,0 +1,76 @@
namespace ProjectAirBomber.CollectionGenericObjects;
/// <summary>
/// Класс, хранящиий информацию по коллекции
/// </summary>
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
ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/ICollectionGenericObjects.cs
View File

@ -1,7 +1,9 @@
using ProjectAirBomber.Drawnings;
namespace ProjectAirBomber.CollectionGenericObjects;
using ProjectAirBomber.CollectionGenericObjects;
/// <summary>
/// Интерфейс описания действий для набора хранимых объектов
/// </summary>
/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
/// <summary>
/// Интерфейс описания действий для набора хранимых объектов
/// </summary>
@ -23,16 +25,18 @@ public interface ICollectionGenericObjects<T>
/// Добавление объекта в коллекцию
/// </summary>
/// <param name="obj">Добавляемый объект</param>
/// <param name="comparer">Cравнение двух объектов</param>
/// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
int Insert(T obj);
int Insert(T obj, IEqualityComparer<T?>? comparer = null);
/// <summary>
/// Добавление объекта в коллекцию на конкретную позицию
/// </summary>
/// <param name="obj">Добавляемый объект</param>
/// <param name="position">Позиция</param>
/// <param name="comparer">Cравнение двух объектов</param>
/// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
int Insert(T obj, int position);
int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null);
/// <summary>
/// Удаление объекта из коллекции с конкретной позиции
@ -58,4 +62,10 @@ public interface ICollectionGenericObjects<T>
/// </summary>
/// <returns>Поэлементый вывод элементов коллекции</returns>
IEnumerable<T?> GetItems();
/// <summary>
/// Сортировка коллекции
/// </summary>
/// <param name="comparer">Сравнитель объектов</param>
void CollectionSort(IComparer<T?> comparer);
}

32
ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/ListGenericObjects.cs
View File

@ -1,9 +1,4 @@
using ProjectAirBomber.Exceptions;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ProjectAirBomber.CollectionGenericObjects;
@ -24,9 +19,6 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
/// </summary>
private int _maxCount;
public int Count => _collection.Count;
public CollectionType GetCollectionType => CollectionType.List;
public int MaxCount
{
get
@ -42,6 +34,8 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
}
}
public CollectionType GetCollectionType => CollectionType.List;
/// <summary>
/// Конструктор
/// </summary>
@ -55,16 +49,30 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
if (_collection[position] == null) throw new ObjectNotFoundException();
return _collection[position];
}
public int Insert(T obj)
public int Insert(T obj, IEqualityComparer<T?>? comparer = null)
{
if (Count + 1 > _maxCount) throw new CollectionOverflowException(Count);
if (comparer != null)
{
if (_collection.Contains(obj, comparer))
{
throw new ObjectAlreadyExistsException();
}
}
_collection.Add(obj);
return Count;
}
public int Insert(T obj, int position)
public int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
{
if (Count + 1 > _maxCount) throw new CollectionOverflowException(Count);
if (position < 0 || position > Count) throw new PositionOutOfCollectionException(position);
if (comparer != null)
{
if (_collection.Contains(obj, comparer))
{
throw new ObjectAlreadyExistsException(position);
}
}
_collection.Insert(position, obj);
return position;
}
@ -83,4 +91,8 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
yield return _collection[i];
}
}
public void CollectionSort(IComparer<T?> comparer)
{
_collection.Sort(comparer);
}
}

67
ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/MassiveGenericObjects.cs
View File

@ -1,6 +1,7 @@
using System.Runtime.Remoting;
using ProjectAirBomber.Drawnings;

using ProjectAirBomber.CollectionGenericObjects;
using ProjectAirBomber.Exceptions;
namespace ProjectAirBomber.CollectionGenericObjects;
/// <summary>
@ -9,7 +10,6 @@ namespace ProjectAirBomber.CollectionGenericObjects;
/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
where T : class
{
/// <summary>
/// Массив объектов, которые храним
@ -45,6 +45,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
/// <summary>
/// Конструктор
/// </summary>
public MassiveGenericObjects()
{
_collection = Array.Empty<T?>();
@ -57,29 +58,40 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
return _collection[position];
}
public int Insert(T obj)
public int Insert(T obj, IEqualityComparer<T?>? comparer = null)
{
// вставка в свободное место набора
for (int i = 0; i < Count; i++)
if (comparer != null)
{
if (_collection[i] == null)
foreach (T? i in _collection)
{
_collection[i] = obj;
return i;
if (comparer.Equals(i, obj))
{
throw new ObjectAlreadyExistsException(i);
}
}
}
return Insert(obj, 0);
}
public int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
{
if (position < 0 || position >= Count)
{
throw new PositionOutOfCollectionException();
}
if (comparer != null)
{
foreach (T? i in _collection)
{
if (comparer.Equals(i, obj))
{
throw new ObjectAlreadyExistsException(i);
}
}
}
throw new CollectionOverflowException(Count);
}
public int Insert(T obj, int position)
{
// проверка позиции
if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
// проверка, что элемент массива по этой позиции пустой, если нет, то
// ищется свободное место после этой позиции и идет вставка туда
// если нет после, ищем до
if (_collection[position] != null)
{
bool pushed = false;
@ -112,23 +124,19 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
}
}
// вставка
_collection[position] = obj;
return position;
}
public T? Remove(int position)
{
// проверка позиции
if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
if (_collection[position] == null) throw new ObjectNotFoundException(position);
T? temp = _collection[position];
_collection[position] = null;
return temp;
}
public IEnumerable<T?> GetItems()
{
for (int i = 0; i < _collection.Length; ++i)
@ -136,4 +144,13 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
yield return _collection[i];
}
}
public void CollectionSort(IComparer<T?> comparer)
{
List<T?> lst = [.. _collection];
lst.Sort(comparer.Compare);
for (int i = 0; i < _collection.Length; ++i)
{
_collection[i] = lst[i];
}
}
}

52
ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/StorageCollection.cs
View File

@ -1,5 +1,5 @@
using ProjectAirBomber.Drawnings;
using ProjectAirBomber.Exceptions;
using ProjectAirBomber.Exceptions;
using ProjectAirBomber.Drawnings;
using System.Data;
using System.Text;
@ -10,17 +10,17 @@ namespace ProjectAirBomber.CollectionGenericObjects;
/// </summary>
/// <typeparam name="T"></typeparam>
public class StorageCollection<T>
where T : DrawningBomber
where T : DrawningAirBomber
{
/// <summary>
/// Словарь (хранилище) с коллекциями
/// </summary>
readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
readonly Dictionary<CollectionInfo, ICollectionGenericObjects<T>> _storages;
/// <summary>
/// Возвращение списка названий коллекций
/// </summary>
public List<string> Keys => _storages.Keys.ToList();
public List<CollectionInfo> Keys => _storages.Keys.ToList();
/// <summary>
/// Ключевое слово, с которого должен начинаться файл
@ -42,7 +42,7 @@ public class StorageCollection<T>
/// </summary>
public StorageCollection()
{
_storages = new Dictionary<string, ICollectionGenericObjects<T>>();
_storages = new Dictionary<CollectionInfo, ICollectionGenericObjects<T>>();
}
/// <summary>
@ -52,13 +52,13 @@ public class StorageCollection<T>
/// <param name="collectionType">тип коллекции</param>
public void AddCollection(string name, CollectionType collectionType)
{
if (_storages.ContainsKey(name)) return;
CollectionInfo collectionInfo = new(name, collectionType, string.Empty);
if (_storages.ContainsKey(collectionInfo)) return;
if (collectionType == CollectionType.None) return;
else if (collectionType == CollectionType.Massive)
_storages[name] = new MassiveGenericObjects<T>();
_storages[collectionInfo] = new MassiveGenericObjects<T>();
else if (collectionType == CollectionType.List)
_storages[name] = new ListGenericObjects<T>();
_storages[collectionInfo] = new ListGenericObjects<T>();
}
/// <summary>
@ -67,8 +67,9 @@ public class StorageCollection<T>
/// <param name="name">Название коллекции</param>
public void DelCollection(string name)
{
if (_storages.ContainsKey(name))
_storages.Remove(name);
CollectionInfo collectionInfo = new(name, CollectionType.None, string.Empty);
if (_storages.ContainsKey(collectionInfo))
_storages.Remove(collectionInfo);
}
/// <summary>
@ -80,8 +81,9 @@ public class StorageCollection<T>
{
get
{
if (_storages.ContainsKey(name))
return _storages[name];
CollectionInfo collectionInfo = new(name, CollectionType.None, string.Empty);
if (_storages.ContainsKey(collectionInfo))
return _storages[collectionInfo];
return null;
}
}
@ -105,7 +107,7 @@ public class StorageCollection<T>
using (StreamWriter writer = new StreamWriter(filename))
{
writer.Write(_collectionKey);
foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
foreach (KeyValuePair<CollectionInfo, ICollectionGenericObjects<T>> value in _storages)
{
StringBuilder sb = new();
sb.Append(Environment.NewLine);
@ -118,10 +120,9 @@ public class StorageCollection<T>
sb.Append(value.Key);
sb.Append(_separatorForKeyValue);
sb.Append(value.Value.GetCollectionType);
sb.Append(_separatorForKeyValue);
sb.Append(value.Value.MaxCount);
sb.Append(_separatorForKeyValue);
foreach (T? item in value.Value.GetItems())
{
string data = item?.GetDataForSave() ?? string.Empty;
@ -134,6 +135,7 @@ public class StorageCollection<T>
}
writer.Write(sb);
}
}
}
@ -164,18 +166,20 @@ public class StorageCollection<T>
while ((strs = fs.ReadLine()) != null)
{
string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
if (record.Length != 4)
if (record.Length != 3)
{
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(collectionType);
ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionInfo.CollectionType);
if (collection == null)
{
throw new InvalidCastException("Не удалось определить тип коллекции:" + record[1]);
throw new InvalidOperationException("Не удалось создать коллекцию");
}
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?.CreateDrawningBomber() is T bomber)
@ -184,7 +188,7 @@ public class StorageCollection<T>
{
if (collection.Insert(bomber) == -1)
{
throw new InvalidOperationException("Объект не удалось добавить в коллекцию: " + record[3]);
throw new ConstraintException("Объект не удалось добавить в коллекцию: " + record[3]);
}
}
catch (CollectionOverflowException ex)
@ -193,7 +197,7 @@ public class StorageCollection<T>
}
}
}
_storages.Add(record[0], collection);
_storages.Add(collectionInfo, collection);
}
}
}

5
ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningBomber.cs
View File

@ -1,9 +1,4 @@
using ProjectAirBomber.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ProjectAirBomber.Drawnings;

27
ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningBomberCompareByColor.cs Normal file
View File

@ -0,0 +1,27 @@
namespace ProjectAirBomber.Drawnings;
public class DrawningBomberCompareByColor : IComparer<DrawningBomber?>
{
public int Compare(DrawningBomber? x, DrawningBomber? y)
{
if (x == null || x.EntityBomber == null)
{
return 1;
}
if (y == null || y.EntityBomber == null)
{
return -1;
}
var bodycolorCompare = x.EntityBomber.BodyColor.Name.CompareTo(y.EntityBomber.BodyColor.Name);
if (bodycolorCompare != 0)
{
return bodycolorCompare;
}
var speedCompare = x.EntityBomber.Speed.CompareTo(y.EntityBomber.Speed);
if (speedCompare != 0)
{
return speedCompare;
}
return x.EntityBomber.Weight.CompareTo(y.EntityBomber.Weight);
}
}

31
ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningBomberCompareByType.cs Normal file
View File

@ -0,0 +1,31 @@
using ProjectAirBomber.Drawnings;
public class DrawingBomberCompareByType : IComparer<DrawningBomber?>
{
public int Compare(DrawningBomber? x, DrawningBomber? y)
{
if (x == null && y == null) return 0;
if (x == null || x.EntityBomber == null)
{
return 1;
}
if (y == null || y.EntityBomber == null)
{
return -1;
}
if (x.GetType().Name != y.GetType().Name)
{
return x.GetType().Name.CompareTo(y.GetType().Name);
}
var speedCompare = x.EntityBomber.Speed.CompareTo(y.EntityBomber.Speed);
if (speedCompare != 0)
{
return speedCompare;
}
return x.EntityBomber.Weight.CompareTo(y.EntityBomber.Weight);
}
}

68
ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningBomberEqutables.cs Normal file
View File

@ -0,0 +1,68 @@
using ProjectAirBomber.Entities;
using System.Diagnostics.CodeAnalysis;
namespace ProjectAirBomber.Drawnings;
/// <summary>
/// Реализация сравнения двух объектов класса-прорисовки
/// </summary>
public class DrawningAirCraftEqutables : IEqualityComparer<DrawningBomber?>
{
public bool Equals(DrawningBomber? x, DrawningBomber? y)
{
if (x == null || x.EntityBomber == null)
{
return false;
}
if (y == null || y.EntityBomber == null)
{
return false;
}
if (x.GetType().Name != y.GetType().Name)
{
return false;
}
if (x.EntityBomber.Speed != y.EntityBomber.Speed)
{
return false;
}
if (x.EntityBomber.Weight != y.EntityBomber.Weight)
{
return false;
}
if (x.EntityBomber.BodyColor != y.EntityBomber.BodyColor)
{
return false;
}
if (x is DrawningAirBomber && y is DrawningAirBomber)
{
EntityAirBomber entityX = (EntityAirBomber)x.EntityBomber;
EntityAirBomber entityY = (EntityAirBomber)y.EntityBomber;
if (entityX.FuelTanks != entityY.FuelTanks)
{
return false;
}
if (entityX.Bombs != entityY.Bombs)
{
return false;
}
if (entityX.AdditionalColor != entityY.AdditionalColor)
{
return false;
}
}
return true;
}
public int GetHashCode([DisallowNull] DrawningBomber obj)
{
return obj.GetHashCode();
}
}

16
ProjectAirBomber/ProjectAirBomber/Exceptions/ObjectAlreadyExistsException.cs Normal file
View File

@ -0,0 +1,16 @@
using System.Runtime.Serialization;
namespace ProjectAirBomber.Exceptions;
/// <summary>
/// Класс, описывающий ошибку, что в коллекции уже есть такой элемент
/// </summary>
[Serializable]
public class ObjectAlreadyExistsException : ApplicationException
{
public ObjectAlreadyExistsException(object i) : base("В коллекции уже есть такой элемент " + i) { }
public ObjectAlreadyExistsException() : base() { }
public ObjectAlreadyExistsException(string message) : base(message) { }
public ObjectAlreadyExistsException(string message, Exception exception) : base(message, exception)
{ }
protected ObjectAlreadyExistsException(SerializationInfo info, StreamingContext context) : base(info, context) { }
}

3
ProjectAirBomber/ProjectAirBomber/Exceptions/PositionOutOfCollectionException.cs
View File

@ -1,5 +1,4 @@

using System.Runtime.Serialization;
using System.Runtime.Serialization;
namespace ProjectAirBomber.Exceptions;

59
ProjectAirBomber/ProjectAirBomber/FormBomberCollection.Designer.cs generated
View File

@ -30,6 +30,7 @@
{
groupBoxTools = new GroupBox();
panelCompanyTools = new Panel();
buttonSortByType = new Button();
buttonAddBomber = new Button();
maskedTextBoxPosition = new MaskedTextBox();
buttonRefresh = new Button();
@ -52,6 +53,8 @@
loadToolStripMenuItem = new ToolStripMenuItem();
saveFileDialog = new SaveFileDialog();
openFileDialog = new OpenFileDialog();
button2 = new Button();
buttonSortByColor = new Button();
groupBoxTools.SuspendLayout();
panelCompanyTools.SuspendLayout();
panelStorage.SuspendLayout();
@ -75,6 +78,8 @@
//
// panelCompanyTools
//
panelCompanyTools.Controls.Add(buttonSortByColor);
panelCompanyTools.Controls.Add(buttonSortByType);
panelCompanyTools.Controls.Add(buttonAddBomber);
panelCompanyTools.Controls.Add(maskedTextBoxPosition);
panelCompanyTools.Controls.Add(buttonRefresh);
@ -82,15 +87,26 @@
panelCompanyTools.Controls.Add(buttonGoToCheck);
panelCompanyTools.Dock = DockStyle.Bottom;
panelCompanyTools.Enabled = false;
panelCompanyTools.Location = new Point(3, 521);
panelCompanyTools.Location = new Point(3, 491);
panelCompanyTools.Name = "panelCompanyTools";
panelCompanyTools.Size = new Size(262, 285);
panelCompanyTools.Size = new Size(262, 315);
panelCompanyTools.TabIndex = 9;
//
// buttonSortByType
//
buttonSortByType.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonSortByType.Location = new Point(3, 225);
buttonSortByType.Name = "buttonSortByType";
buttonSortByType.Size = new Size(253, 42);
buttonSortByType.TabIndex = 8;
buttonSortByType.Text = "Сортировка по типу";
buttonSortByType.UseVisualStyleBackColor = true;
buttonSortByType.Click += buttonSortByType_Click;
//
// buttonAddBomber
//
buttonAddBomber.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonAddBomber.Location = new Point(3, 3);
buttonAddBomber.Location = new Point(3, 0);
buttonAddBomber.Name = "buttonAddBomber";
buttonAddBomber.Size = new Size(253, 42);
buttonAddBomber.TabIndex = 1;
@ -100,7 +116,7 @@
//
// maskedTextBoxPosition
//
maskedTextBoxPosition.Location = new Point(3, 99);
maskedTextBoxPosition.Location = new Point(3, 48);
maskedTextBoxPosition.Mask = "00";
maskedTextBoxPosition.Name = "maskedTextBoxPosition";
maskedTextBoxPosition.Size = new Size(253, 23);
@ -110,7 +126,7 @@
// buttonRefresh
//
buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonRefresh.Location = new Point(3, 228);
buttonRefresh.Location = new Point(3, 177);
buttonRefresh.Name = "buttonRefresh";
buttonRefresh.Size = new Size(253, 42);
buttonRefresh.TabIndex = 6;
@ -121,7 +137,7 @@
// buttonRemoveBomber
//
buttonRemoveBomber.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonRemoveBomber.Location = new Point(3, 128);
buttonRemoveBomber.Location = new Point(3, 77);
buttonRemoveBomber.Name = "buttonRemoveBomber";
buttonRemoveBomber.Size = new Size(253, 42);
buttonRemoveBomber.TabIndex = 4;
@ -132,7 +148,7 @@
// buttonGoToCheck
//
buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonGoToCheck.Location = new Point(3, 176);
buttonGoToCheck.Location = new Point(3, 125);
buttonGoToCheck.Name = "buttonGoToCheck";
buttonGoToCheck.Size = new Size(253, 46);
buttonGoToCheck.TabIndex = 5;
@ -142,7 +158,7 @@
//
// buttonCreateCompany
//
buttonCreateCompany.Location = new Point(3, 481);
buttonCreateCompany.Location = new Point(3, 448);
buttonCreateCompany.Name = "buttonCreateCompany";
buttonCreateCompany.Size = new Size(262, 44);
buttonCreateCompany.TabIndex = 8;
@ -238,7 +254,7 @@
comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxSelectorCompany.FormattingEnabled = true;
comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
comboBoxSelectorCompany.Location = new Point(3, 438);
comboBoxSelectorCompany.Location = new Point(3, 419);
comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
comboBoxSelectorCompany.Size = new Size(262, 23);
comboBoxSelectorCompany.TabIndex = 0;
@ -294,6 +310,27 @@
openFileDialog.FileName = "openFileDialog1";
openFileDialog.Filter = "txt file|*.txt";
//
// button2
//
button2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
button2.Location = new Point(3, 225);
button2.Name = "button2";
button2.Size = new Size(253, 46);
button2.TabIndex = 7;
button2.Text = "Передать на тесты";
button2.UseVisualStyleBackColor = true;
//
// buttonSortByColor
//
buttonSortByColor.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonSortByColor.Location = new Point(3, 270);
buttonSortByColor.Name = "buttonSortByColor";
buttonSortByColor.Size = new Size(253, 42);
buttonSortByColor.TabIndex = 9;
buttonSortByColor.Text = "Сортировка по цвету";
buttonSortByColor.UseVisualStyleBackColor = true;
buttonSortByColor.Click += buttonSortByColor_Click;
//
// FormBomberCollection
//
AutoScaleDimensions = new SizeF(7F, 15F);
@ -305,6 +342,7 @@
MainMenuStrip = menuStrip;
Name = "FormBomberCollection";
Text = "Коллекция самолетов";
Load += FormBomberCollection_Load;
groupBoxTools.ResumeLayout(false);
panelCompanyTools.ResumeLayout(false);
panelCompanyTools.PerformLayout();
@ -345,5 +383,8 @@
private ToolStripMenuItem loadToolStripMenuItem;
private SaveFileDialog saveFileDialog;
private OpenFileDialog openFileDialog;
private Button buttonSortByType;
private Button button2;
private Button buttonSortByColor;
}
}

53
ProjectAirBomber/ProjectAirBomber/FormBomberCollection.cs
View File

@ -2,15 +2,6 @@
using ProjectAirBomber.CollectionGenericObjects;
using ProjectAirBomber.Drawnings;
using ProjectAirBomber.Exceptions;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace ProjectAirBomber;
@ -72,7 +63,7 @@ public partial class FormBomberCollection : Form
/// <summary>
/// Добавление военного самолёта в коллекцию
/// </summary>
/// <param name="aircraft"></param>
/// <param name="bomber"></param>
private void SetBomber(DrawningBomber? bomber)
{
if (_company == null || bomber == null)
@ -245,7 +236,7 @@ public partial class FormBomberCollection : 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);
@ -329,4 +320,44 @@ public partial class FormBomberCollection : Form
}
}
}
private void FormBomberCollection_Load(object sender, EventArgs e)
{
}
/// <summary>
/// Сортировка по типу
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void buttonSortByType_Click(object sender, EventArgs e)
{
CompareBomber(new DrawingBomberCompareByType());
}
/// <summary>
/// Сортировка по цвету
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void buttonSortByColor_Click(object sender, EventArgs e)
{
CompareBomber(new DrawningBomberCompareByColor());
}
/// <summary>
/// Сортировка по сравнителю
/// </summary>
/// <param name="comparer">Сравнитель объектов</param>
private void CompareBomber(IComparer<DrawningBomber?> comparer)
{
if (_company == null)
{
return;
}
_company.Sort(comparer);
pictureBox.Image = _company.Show();
}
}

3
ProjectAirBomber/ProjectAirBomber/FormBomberCollection.resx
View File

@ -126,4 +126,7 @@
<metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>261, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value>
</metadata>
</root>