xysiboi/PIBD-13_Baryshev_D.A._Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

done

Browse Source
This commit is contained in:
Baryshev Dmitry 2024-06-09 15:48:33 +04:00
parent 13547998c5
commit d7a9531c96
13 changed files with 389 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ProjectDumpTruck/ProjectDumpTruck/CollectionGenericObject/AbstractCompany.cs
View File

@ -62,7 +62,18 @@ public abstract class AbstractCompany
/// <returns></returns>
public static int operator +(AbstractCompany company, DrawningTruck truck)
{
return company._collection.Insert(truck,0);
try
{
return company._collection.Insert(truck, 0, new DrawningTruckEqutables());
}
catch (ObjectAlreadyInCollectionException)
{
return -1;
}
catch (CollectionOverflowException)
{
return -1;
}
}
/// <summary>
@ -130,4 +141,11 @@ public abstract class AbstractCompany
/// </summary>
protected abstract void SetObjectsPosition();
/// <summary>
/// Сортировка
/// </summary>
/// <param name="comparer">Сравнитель объектов</param>
public void Sort(IComparer<DrawningTruck?> comparer) => _collection?.CollectionSort(comparer);
}

52
ProjectDumpTruck/ProjectDumpTruck/CollectionGenericObject/CollectionInfo.cs Normal file
View File

@ -0,0 +1,52 @@

namespace ProjectDumpTruck.CollectionGenericObject;
public class CollectionInfo : IEquatable<CollectionInfo>
{
public string Name { get; set; }
public CollectionType CollectionType { get; set; }
public string Description { get; set; }
private static readonly string _separator = "-";
public CollectionInfo(string name, CollectionType collectionType, string description)
{
Name = name;
CollectionType = collectionType;
Description = description;
}
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();
}
}

13
ProjectDumpTruck/ProjectDumpTruck/CollectionGenericObject/ICollectionGenericObject.cs
View File

@ -1,4 +1,5 @@
using System;
using ProjectDumpTruck.Drawnings;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@ -25,7 +26,7 @@ public interface ICollectionGenericObject<T>
/// </summary>
/// <param name="obj">Добавляемый объект</param>
/// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
int Insert(T obj);
int Insert(T obj, IEqualityComparer<DrawningTruck?>? comparer = null);
/// <summary>
/// Добавление объекта на конкретную позиуцию
@ -33,7 +34,7 @@ public interface ICollectionGenericObject<T>
/// <param name="obj">Добавляемый объект</param
/// <param name="position">Позиция</param>
/// <returns>true - вставка прошла успешна, false - вставка не удалась</returns>
int Insert(T obj, int position);
int Insert(T obj, int position, IEqualityComparer<DrawningTruck?>? comparer = null);
/// <summary>
/// Удаление объекта из коллекции с конкретной позиции
@ -59,4 +60,10 @@ public interface ICollectionGenericObject<T>
/// </summary>
/// <returns></returns>
IEnumerable<T> GetItems();
/// <summary>
/// Сортировка коллекции
/// </summary>
/// <param name="comparer">Сравнитель объектов</param>
void CollectionSort(IComparer<T?> comparer);
}

25
ProjectDumpTruck/ProjectDumpTruck/CollectionGenericObject/ListGenericObjects.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ProjectDumpTruck.Drawnings;
using ProjectDumpTruck.Exceptions;
@ -58,18 +59,26 @@ public class ListGenericObjects<T> : ICollectionGenericObject<T>
return _collection[position];
}
public int Insert(T obj)
public int Insert(T obj, IEqualityComparer<DrawningTruck?>? comparer = null)
{
if (Count == _maxCount)
{
throw new CollectionOverflowException(Count);
}
for (int i = 0; i < Count; i++)
{
if (comparer.Equals((_collection[i] as DrawningTruck), (obj as DrawningTruck)))
{
throw new ObjectAlreadyInCollectionException(i);
}
}
_collection.Add(obj);
return _collection.Count;
}
public int Insert(T obj, int position)
public int Insert(T obj, int position, IEqualityComparer<DrawningTruck?>? comparer = null)
{
if (position < 0 || position > Count)
{
@ -79,6 +88,13 @@ public class ListGenericObjects<T> : ICollectionGenericObject<T>
{
throw new CollectionOverflowException(Count);
}
for (int i = 0; i < Count; i++)
{
if (comparer.Equals((_collection[i] as DrawningTruck), (obj as DrawningTruck)))
{
throw new ObjectAlreadyInCollectionException(i);
}
}
_collection.Insert(position, obj);
return position;
@ -101,4 +117,9 @@ public class ListGenericObjects<T> : ICollectionGenericObject<T>
{
for (int i = 0; i < Count; i++) yield return _collection[i];
}
public void CollectionSort(IComparer<T?> comparer)
{
_collection.Sort(comparer);
}
}

28
ProjectDumpTruck/ProjectDumpTruck/CollectionGenericObject/MassiveGenericObjects.cs
View File

@ -1,9 +1,11 @@
 using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Reflection.Metadata.Ecma335;
using System.Text;
using System.Threading.Tasks;
using ProjectDumpTruck.Drawnings;
using ProjectDumpTruck.Exceptions;
namespace ProjectDumpTruck.CollectionGenericObject;
@ -69,9 +71,16 @@ public class MassiveGenericObjects<T> : ICollectionGenericObject<T>
return _collection[position];
}
public int Insert(T obj)
public int Insert(T obj, IEqualityComparer<DrawningTruck?>? comparer = null)
{
// TODO вставка в свободное место набора
for (int i = 0; i < Count; i++)
{
if (comparer.Equals((_collection[i] as DrawningTruck), (obj as DrawningTruck)))
{
throw new ObjectAlreadyInCollectionException(i);
}
}
for (int i = 0; i < Count; i++)
{
if (_collection[i] == null)
@ -84,8 +93,16 @@ public class MassiveGenericObjects<T> : ICollectionGenericObject<T>
throw new CollectionOverflowException(Count);
}
public int Insert(T obj, int position)
public int Insert(T obj, int position, IEqualityComparer<DrawningTruck?>? comparer = null)
{
for (int i = 0; i < Count; i++)
{
if (comparer.Equals((_collection[i] as DrawningTruck), (obj as DrawningTruck)))
{
throw new ObjectAlreadyInCollectionException(i);
}
}
if (position < 0 || position >= Count)
{
throw new PositionOutOfCollectionException(position);
@ -139,4 +156,9 @@ public class MassiveGenericObjects<T> : ICollectionGenericObject<T>
{
for (int i = 0; i < _collection.Length; i++) yield return _collection[i];
}
public void CollectionSort(IComparer<T?> comparer)
{
Array.Sort(_collection, comparer);
}
}

78
ProjectDumpTruck/ProjectDumpTruck/CollectionGenericObject/StorageCollection.cs
View File

@ -15,12 +15,12 @@ public class StorageCollection<T>
/// <summary>
/// Словарь (хранилище) с коллекциями
/// </summary>
readonly Dictionary<string, ICollectionGenericObject<T>> _storages;
readonly Dictionary<CollectionInfo, ICollectionGenericObject<T>> _storages;
/// <summary>
/// Возвращение списка названий коллекций
/// </summary>
public List<string> Keys => _storages.Keys.ToList();
public List<CollectionInfo> Keys => _storages.Keys.ToList();
/// <summary>
/// Ключевое слово, с которого должен начинаться файл
@ -41,7 +41,7 @@ public class StorageCollection<T>
/// </summary>
public StorageCollection()
{
_storages = new Dictionary<string, ICollectionGenericObject<T>>();
_storages = new Dictionary<CollectionInfo, ICollectionGenericObject<T>>();
}
/// <summary>
@ -49,21 +49,21 @@ public class StorageCollection<T>
/// </summary>
/// <param name="name">Название коллекции</param>
/// <param name="collectionType">Тип коллекции</param>
public void AddCollection(string name, CollectionType collectionType)
public void AddCollection(CollectionInfo info)
{
if (name == null || _storages.ContainsKey(name))
if (info == null || _storages.ContainsKey(info))
{
return;
}
if (collectionType == CollectionType.Massive)
if (info.CollectionType == CollectionType.Massive)
{
_storages.Add(name, new MassiveGenericObjects<T>());
_storages.Add(info, new MassiveGenericObjects<T>());
}
if (collectionType == CollectionType.List)
if (info.CollectionType == CollectionType.List)
{
_storages.Add(name, new ListGenericObjects<T>());
_storages.Add(info, new ListGenericObjects<T>());
}
}
@ -71,14 +71,14 @@ public class StorageCollection<T>
/// Удаление коллекции
/// </summary>
/// <param name="name">Название коллекции</param>
public void DelCollection(string name)
public void DelCollection(CollectionInfo info)
{
if (name == null || !_storages.ContainsKey(name))
if (info == null || !_storages.ContainsKey(info))
{
return;
}
_storages.Remove(name);
_storages.Remove(info);
}
/// <summary>
@ -86,13 +86,13 @@ public class StorageCollection<T>
/// </summary>
/// <param name="name">Название коллекции</param>
/// <returns></returns>
public ICollectionGenericObject<T>? this[string name]
public ICollectionGenericObject<T>? this[CollectionInfo info]
{
get
{
if (_storages.ContainsKey(name))
if (_storages.ContainsKey(info))
{
return _storages[name];
return _storages[info];
}
return null;
@ -109,7 +109,7 @@ public class StorageCollection<T>
{
sw.Write(_collectionKey);
foreach (KeyValuePair<string, ICollectionGenericObject<T>> value in _storages)
foreach (KeyValuePair<CollectionInfo, ICollectionGenericObject<T>> value in _storages)
{
sw.Write(Environment.NewLine);
// не сохраняем пустые коллекции
@ -117,8 +117,6 @@ public class StorageCollection<T>
sw.Write(value.Key);
sw.Write(_separatorForKeyValue);
sw.Write(value.Value.GetCollectionType);
sw.Write(_separatorForKeyValue);
sw.Write(value.Value.MaxCount);
sw.Write(_separatorForKeyValue);
@ -142,42 +140,49 @@ public class StorageCollection<T>
/// </summary>
/// <param name="filename">Путь и имя файла</param>
/// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
public bool LoadData(string filename)
public void LoadData(string filename)
{
if (!File.Exists(filename)) throw new FileNotFoundException("Файл не существует");
if (!File.Exists(filename))
{
throw new FileNotFoundException("Файл не существует");
}
using (StreamReader sr = new(filename))
{
string line = sr.ReadLine();
if (line == null || line.Length == 0) throw new FileFormatException("В файле нет данных"); ;
if (!line.Equals(_collectionKey)) throw new FileFormatException("В файле неверные данные");
if (line == null || line.Length == 0)
{
throw new FileFormatException("В файле нет данных");
}
if (!line.Equals(_collectionKey))
{
throw new FileFormatException("В файле неверные данные");
}
_storages.Clear();
while ((line = sr.ReadLine()) != null)
{
string[] record = line.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
if (record.Length != 4)
if (record.Length != 3)
{
continue;
}
CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
ICollectionGenericObject<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
CollectionInfo? collectionInfo = CollectionInfo.GetCollectionInfo(record[0]) ??
throw new Exception("Не удалось определить информацию коллекции: " + record[0]);
ICollectionGenericObject<T>? collection = StorageCollection<T>.CreateCollection(collectionInfo.CollectionType) ??
throw new Exception("Не удалось создать коллекцию");
collection.MaxCount = Convert.ToInt32(record[1]);
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?.CreateDrawningTruck() is T truck)
{
try
{
if (collection.Insert(truck) == -1)
if (collection.Insert(truck, new DrawningTruckEqutables()) == -1)
{
throw new InvalidOperationException("Объект не удалось добавить в коллекцию: " + record[3]);
}
@ -186,15 +191,18 @@ public class StorageCollection<T>
{
throw new OverflowException("Коллекция переполнена", ex);
}
catch (ObjectAlreadyInCollectionException ex)
{
throw new InvalidOperationException("Объект уже присутствует в коллекции", ex);
}
}
}
_storages.Add(record[0], collection);
_storages.Add(collectionInfo, collection);
}
}
return true;
}
/// <summary>
/// Создание коллекции по типу
/// </summary>

43
ProjectDumpTruck/ProjectDumpTruck/Drawnings/DrawningTruckCompareByColor.cs Normal file
View File

@ -0,0 +1,43 @@

using ProjectDumpTruck.Entities;
namespace ProjectDumpTruck.Drawnings;
/// <summary>
/// Сравнение по цвету, скорости и весу
/// </summary>
public class DrawningTruckCompareByColor : IComparer<DrawningTruck?>
{
public int Compare(DrawningTruck? x, DrawningTruck? y)
{
if (x == null || x.EntityTruck == null)
{
return 1;
}
if (y == null || y.EntityTruck == null)
{
return -1;
}
var bodyColorCompare = y.EntityTruck.BodyColor.Name.CompareTo(x.EntityTruck.BodyColor.Name);
if (bodyColorCompare != 0)
{
return bodyColorCompare;
}
if (x is DrawningDumpTruck && y is DrawningDumpTruck)
{
var additionalColorCompare = (y.EntityTruck as EntityDumpTruck).AdditionalColor.Name.CompareTo(
(x.EntityTruck as EntityDumpTruck).AdditionalColor.Name);
if (additionalColorCompare != 0)
{
return additionalColorCompare;
}
}
var speedCompare = y.EntityTruck.Speed.CompareTo(x.EntityTruck.Speed);
if (speedCompare != 0)
{
return speedCompare;
}
return y.EntityTruck.Weight.CompareTo(x.EntityTruck.Weight);
}
}

30
ProjectDumpTruck/ProjectDumpTruck/Drawnings/DrawningTruckCompareByType.cs Normal file
View File

@ -0,0 +1,30 @@
namespace ProjectDumpTruck.Drawnings;
/// <summary>
/// Сравнене по типу, скорости, весу
/// </summary>
public class DrawningTruckCompareByType : IComparer<DrawningTruck?>
{
public int Compare(DrawningTruck? x, DrawningTruck? y)
{
if (x == null || x.EntityTruck == null)
{
return 1;
}
if (y == null || y.EntityTruck == null)
{
return -1;
}
if (x.GetType().Name != y.GetType().Name)
{
return y.GetType().Name.CompareTo(x.GetType().Name);
}
var speedCompare = y.EntityTruck.Speed.CompareTo(x.EntityTruck.Speed);
if (speedCompare != 0)
{
return speedCompare;
}
return y.EntityTruck.Weight.CompareTo(x.EntityTruck.Weight);
}
}

60
ProjectDumpTruck/ProjectDumpTruck/Drawnings/DrawningTruckEqutables.cs Normal file
View File

@ -0,0 +1,60 @@
using ProjectDumpTruck.Entities;
using System.Diagnostics.CodeAnalysis;
namespace ProjectDumpTruck.Drawnings;
public class DrawningTruckEqutables : IEqualityComparer<DrawningTruck?>
{
public bool Equals(DrawningTruck? x, DrawningTruck? y)
{
if (x == null || x.EntityTruck == null)
{
return false;
}
if (y == null || y.EntityTruck == null)
{
return false;
}
if (x.GetType().Name != y.GetType().Name)
{
return false;
}
if (x.EntityTruck.Speed != y.EntityTruck.Speed)
{
return false;
}
if (x.EntityTruck.Weight != y.EntityTruck.Weight)
{
return false;
}
if (x.EntityTruck.BodyColor != y.EntityTruck.BodyColor)
{
return false;
}
if (x is DrawningDumpTruck && y is DrawningDumpTruck)
{
// TODO доделать логику сравнения дополнительных параметров
if ((x.EntityTruck as EntityDumpTruck)?.AdditionalColor !=
(y.EntityTruck as EntityDumpTruck)?.AdditionalColor)
{
return false;
}
if ((x.EntityTruck as EntityDumpTruck)?.Awning !=
(y.EntityTruck as EntityDumpTruck)?.Awning)
{
return false;
}
if ((x.EntityTruck as EntityDumpTruck)?.Tent !=
(y.EntityTruck as EntityDumpTruck)?.Tent)
{
return false;
}
}
return true;
}
public int GetHashCode([DisallowNull] DrawningTruck? obj)
{
return obj.GetHashCode();
}
}

18
ProjectDumpTruck/ProjectDumpTruck/Exceptions/ObjectAlreadyInCollectionException.cs Normal file
View File

@ -0,0 +1,18 @@

using System.Runtime.Serialization;
namespace ProjectDumpTruck.Exceptions;
public class ObjectAlreadyInCollectionException : ApplicationException
{
public ObjectAlreadyInCollectionException(int i) : base("Такой объект уже есть в коллекции. Позиция " + i) { }
public ObjectAlreadyInCollectionException() : base() { }
public ObjectAlreadyInCollectionException(string message) : base(message) { }
public ObjectAlreadyInCollectionException(string message, Exception exception) : base(message, exception) { }
protected ObjectAlreadyInCollectionException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
}

46
ProjectDumpTruck/ProjectDumpTruck/FormTruckCollection.Designer.cs generated
View File

@ -52,6 +52,8 @@
loadToolStripMenuItem = new ToolStripMenuItem();
saveFileDialog = new SaveFileDialog();
openFileDialog = new OpenFileDialog();
buttonSortByColor = new Button();
buttonSortByType = new Button();
groupBoxTools.SuspendLayout();
panelStorage.SuspendLayout();
panelCompanyTools.SuspendLayout();
@ -68,7 +70,7 @@
groupBoxTools.Dock = DockStyle.Right;
groupBoxTools.Location = new Point(888, 28);
groupBoxTools.Name = "groupBoxTools";
groupBoxTools.Size = new Size(238, 660);
groupBoxTools.Size = new Size(238, 741);
groupBoxTools.TabIndex = 0;
groupBoxTools.TabStop = false;
groupBoxTools.Text = "Инструменты";
@ -164,6 +166,8 @@
//
// panelCompanyTools
//
panelCompanyTools.Controls.Add(buttonSortByColor);
panelCompanyTools.Controls.Add(buttonSortByType);
panelCompanyTools.Controls.Add(buttonAddTruck);
panelCompanyTools.Controls.Add(buttonRemoveTruck);
panelCompanyTools.Controls.Add(buttonRefresh);
@ -171,14 +175,14 @@
panelCompanyTools.Controls.Add(maskedTextBoxPosition);
panelCompanyTools.Dock = DockStyle.Bottom;
panelCompanyTools.Enabled = false;
panelCompanyTools.Location = new Point(3, 357);
panelCompanyTools.Location = new Point(3, 385);
panelCompanyTools.Name = "panelCompanyTools";
panelCompanyTools.Size = new Size(232, 300);
panelCompanyTools.Size = new Size(232, 353);
panelCompanyTools.TabIndex = 10;
//
// buttonAddTruck
//
buttonAddTruck.Location = new Point(3, 35);
buttonAddTruck.Location = new Point(0, 3);
buttonAddTruck.Name = "buttonAddTruck";
buttonAddTruck.Size = new Size(226, 42);
buttonAddTruck.TabIndex = 0;
@ -187,7 +191,7 @@
//
// buttonRemoveTruck
//
buttonRemoveTruck.Location = new Point(3, 138);
buttonRemoveTruck.Location = new Point(3, 84);
buttonRemoveTruck.Name = "buttonRemoveTruck";
buttonRemoveTruck.Size = new Size(226, 48);
buttonRemoveTruck.TabIndex = 4;
@ -197,7 +201,7 @@
//
// buttonRefresh
//
buttonRefresh.Location = new Point(3, 246);
buttonRefresh.Location = new Point(0, 192);
buttonRefresh.Name = "buttonRefresh";
buttonRefresh.Size = new Size(226, 48);
buttonRefresh.TabIndex = 6;
@ -207,7 +211,7 @@
//
// buttonGoToCheck
//
buttonGoToCheck.Location = new Point(3, 192);
buttonGoToCheck.Location = new Point(3, 138);
buttonGoToCheck.Name = "buttonGoToCheck";
buttonGoToCheck.Size = new Size(226, 48);
buttonGoToCheck.TabIndex = 5;
@ -217,7 +221,7 @@
//
// maskedTextBoxPosition
//
maskedTextBoxPosition.Location = new Point(3, 105);
maskedTextBoxPosition.Location = new Point(3, 51);
maskedTextBoxPosition.Mask = "00";
maskedTextBoxPosition.Name = "maskedTextBoxPosition";
maskedTextBoxPosition.Size = new Size(226, 27);
@ -241,7 +245,7 @@
pictureBox.Dock = DockStyle.Fill;
pictureBox.Location = new Point(0, 28);
pictureBox.Name = "pictureBox";
pictureBox.Size = new Size(888, 660);
pictureBox.Size = new Size(888, 741);
pictureBox.TabIndex = 1;
pictureBox.TabStop = false;
//
@ -286,11 +290,31 @@
//
openFileDialog.Filter = "txt file | *.txt";
//
// buttonSortByColor
//
buttonSortByColor.Location = new Point(0, 300);
buttonSortByColor.Name = "buttonSortByColor";
buttonSortByColor.Size = new Size(226, 48);
buttonSortByColor.TabIndex = 8;
buttonSortByColor.Text = "Сортировка по цвету";
buttonSortByColor.UseVisualStyleBackColor = true;
buttonSortByColor.Click += ButtonSortByColor_Click;
//
// buttonSortByType
//
buttonSortByType.Location = new Point(3, 246);
buttonSortByType.Name = "buttonSortByType";
buttonSortByType.Size = new Size(226, 48);
buttonSortByType.TabIndex = 7;
buttonSortByType.Text = "Сортировка по типу";
buttonSortByType.UseVisualStyleBackColor = true;
buttonSortByType.Click += ButtonSortByType_Click;
//
// FormTruckCollection
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(1126, 688);
ClientSize = new Size(1126, 769);
Controls.Add(pictureBox);
Controls.Add(groupBoxTools);
Controls.Add(menuStrip);
@ -335,5 +359,7 @@
private ToolStripMenuItem loadToolStripMenuItem;
private SaveFileDialog saveFileDialog;
private OpenFileDialog openFileDialog;
private Button buttonSortByColor;
private Button buttonSortByType;
}
}

32
ProjectDumpTruck/ProjectDumpTruck/FormTruckCollection.cs
View File

@ -37,7 +37,7 @@ public partial class FormTruckCollection : Form
/// <summary>
/// Конструктор
/// </summary>
public FormTruckCollection(ILogger <FormTruckCollection> logger)
public FormTruckCollection(ILogger<FormTruckCollection> logger)
{
InitializeComponent();
_storageCollection = new();
@ -202,7 +202,9 @@ public partial class FormTruckCollection : Form
collectionType = CollectionType.List;
}
_storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
CollectionInfo collectionInfo = new CollectionInfo(textBoxCollectionName.Text, collectionType, string.Empty);
_storageCollection.AddCollection(collectionInfo);
_logger.LogInformation($"Добавлена коллекция: {textBoxCollectionName.Text} типа: {collectionType}");
RefreshListBoxItems();
}
@ -212,7 +214,7 @@ public partial class FormTruckCollection : 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);
@ -232,7 +234,8 @@ public partial class FormTruckCollection : Form
{
return;
}
_storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
CollectionInfo collectionInfo = new CollectionInfo(listBoxCollection.SelectedItem.ToString(), CollectionType.None, string.Empty);
_storageCollection.DelCollection(collectionInfo);
_logger.LogInformation($"Удалена коллекция: {listBoxCollection.SelectedItem.ToString()}");
RefreshListBoxItems();
}
@ -245,7 +248,8 @@ public partial class FormTruckCollection : Form
return;
}
ICollectionGenericObject<DrawningTruck>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
CollectionInfo collectionInfo = new CollectionInfo(listBoxCollection.SelectedItem.ToString(), CollectionType.None, string.Empty);
ICollectionGenericObject<DrawningTruck>? collection = _storageCollection[collectionInfo];
if (collection == null)
{
MessageBox.Show("Коллекция не проинициализирована");
@ -308,6 +312,24 @@ public partial class FormTruckCollection : Form
}
}
}
private void ButtonSortByType_Click(object sender, EventArgs e)
{
CompareTrucks(new DrawningTruckCompareByType());
}
private void ButtonSortByColor_Click(object sender, EventArgs e)
{
CompareTrucks(new DrawningTruckCompareByColor());
}
private void CompareTrucks(IComparer<DrawningTruck?> comparer)
{
if (_company == null) return;
_company.Sort(comparer);
pictureBox.Image = _company.Show();
}
}

3
ProjectDumpTruck/ProjectDumpTruck/FormTruckCollection.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>310, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>55</value>
</metadata>
</root>