tellsense/ISEbd-22_Baygulov_A.A._ElectricLocomotive_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ISEbd-22. Baygulov A.A. Lab work 08 #9

Closed
tellsense wants to merge 4 commits from lab8 into lab7
pull from: lab8
merge into: tellsense:lab7
Conversation 0 Commits 4 Files Changed 9 +119 -15
6 changed files with 119 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eb6c80a47f - Show all commits

46
ElectricLocomotive/ElectricLocomotive/FormLocomotiveCollection.Designer.cs generated
View File

@ -46,6 +46,8 @@
saveFileDialog = new SaveFileDialog();
openFileDialog = new OpenFileDialog();
groupBoxMenu = new GroupBox();
ButtonSortByColor = new Button();
ButtonSortByType = new Button();
groupBoxSets.SuspendLayout();
((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit();
menuStrip.SuspendLayout();
@ -54,10 +56,10 @@
//
// groupBoxSets
//
groupBoxSets.Controls.Add(ButtonSortByType);
groupBoxSets.Controls.Add(textBoxSetName);
groupBoxSets.Controls.Add(buttonDeleteSet);
groupBoxSets.Controls.Add(listBoxStorages);
groupBoxSets.Controls.Add(ButtonAddLocomotive);
groupBoxSets.Controls.Add(buttonAddSet);
groupBoxSets.Location = new Point(0, 22);
groupBoxSets.Name = "groupBoxSets";
@ -70,14 +72,14 @@
//
textBoxSetName.Location = new Point(6, 38);
textBoxSetName.Name = "textBoxSetName";
textBoxSetName.Size = new Size(226, 23);
textBoxSetName.Size = new Size(230, 23);
textBoxSetName.TabIndex = 3;
//
// buttonDeleteSet
//
buttonDeleteSet.Location = new Point(6, 216);
buttonDeleteSet.Name = "buttonDeleteSet";
buttonDeleteSet.Size = new Size(226, 45);
buttonDeleteSet.Size = new Size(230, 45);
buttonDeleteSet.TabIndex = 2;
buttonDeleteSet.Text = "Удалить набор";
buttonDeleteSet.UseVisualStyleBackColor = true;
@ -89,15 +91,15 @@
listBoxStorages.ItemHeight = 15;
listBoxStorages.Location = new Point(6, 116);
listBoxStorages.Name = "listBoxStorages";
listBoxStorages.Size = new Size(226, 94);
listBoxStorages.Size = new Size(230, 94);
listBoxStorages.TabIndex = 1;
listBoxStorages.SelectedIndexChanged += listBoxStorages_SelectedIndexChanged;
//
// ButtonAddLocomotive
//
ButtonAddLocomotive.Location = new Point(6, 269);
ButtonAddLocomotive.Location = new Point(6, 395);
ButtonAddLocomotive.Name = "ButtonAddLocomotive";
ButtonAddLocomotive.Size = new Size(226, 39);
ButtonAddLocomotive.Size = new Size(230, 39);
ButtonAddLocomotive.TabIndex = 0;
ButtonAddLocomotive.Text = "Добавить локомотив";
ButtonAddLocomotive.UseVisualStyleBackColor = true;
@ -107,7 +109,7 @@
//
buttonAddSet.Location = new Point(6, 67);
buttonAddSet.Name = "buttonAddSet";
buttonAddSet.Size = new Size(226, 34);
buttonAddSet.Size = new Size(230, 34);
buttonAddSet.TabIndex = 0;
buttonAddSet.Text = "Добавить набор";
buttonAddSet.UseVisualStyleBackColor = true;
@ -115,14 +117,14 @@
//
// maskedTextBoxNumber
//
maskedTextBoxNumber.Location = new Point(6, 342);
maskedTextBoxNumber.Location = new Point(6, 440);
maskedTextBoxNumber.Name = "maskedTextBoxNumber";
maskedTextBoxNumber.Size = new Size(226, 23);
maskedTextBoxNumber.Size = new Size(230, 23);
maskedTextBoxNumber.TabIndex = 3;
//
// ButtonRefreshCollection
//
ButtonRefreshCollection.Location = new Point(6, 440);
ButtonRefreshCollection.Location = new Point(6, 514);
ButtonRefreshCollection.Name = "ButtonRefreshCollection";
ButtonRefreshCollection.Size = new Size(230, 43);
ButtonRefreshCollection.TabIndex = 2;
@ -132,7 +134,7 @@
//
// ButtonRemoveLocomotive
//
ButtonRemoveLocomotive.Location = new Point(6, 388);
ButtonRemoveLocomotive.Location = new Point(6, 469);
ButtonRemoveLocomotive.Name = "ButtonRemoveLocomotive";
ButtonRemoveLocomotive.Size = new Size(230, 39);
ButtonRemoveLocomotive.TabIndex = 1;
@ -195,10 +197,12 @@
// groupBoxMenu
//
groupBoxMenu.AutoSize = true;
groupBoxMenu.Controls.Add(ButtonSortByColor);
groupBoxMenu.Controls.Add(maskedTextBoxNumber);
groupBoxMenu.Controls.Add(groupBoxSets);
groupBoxMenu.Controls.Add(ButtonRemoveLocomotive);
groupBoxMenu.Controls.Add(ButtonRefreshCollection);
groupBoxMenu.Controls.Add(ButtonAddLocomotive);
groupBoxMenu.Dock = DockStyle.Right;
groupBoxMenu.Location = new Point(661, 24);
groupBoxMenu.Name = "groupBoxMenu";
@ -207,6 +211,24 @@
groupBoxMenu.TabStop = false;
groupBoxMenu.Text = "Инструменты";
//
// ButtonSortByColor
//
ButtonSortByColor.Location = new Point(6, 342);
ButtonSortByColor.Name = "ButtonSortByColor";
ButtonSortByColor.Size = new Size(230, 38);
ButtonSortByColor.TabIndex = 4;
ButtonSortByColor.Text = "Сортировка по цвету";
ButtonSortByColor.UseVisualStyleBackColor = true;
//
// ButtonSortByType
//
ButtonSortByType.Location = new Point(6, 273);
ButtonSortByType.Name = "ButtonSortByType";
ButtonSortByType.Size = new Size(230, 41);
ButtonSortByType.TabIndex = 4;
ButtonSortByType.Text = "Сортировка по типу";
ButtonSortByType.UseVisualStyleBackColor = true;
//
// FormLocomotiveCollection
//
AutoScaleDimensions = new SizeF(7F, 15F);
@ -247,5 +269,7 @@
private ToolStripMenuItem LoadToolStripMenuItem;
private ToolStripMenuItem SaveToolStripMenuItem;
private GroupBox groupBoxMenu;
private Button ButtonSortByType;
private Button ButtonSortByColor;
}
}

4
ElectricLocomotive/ElectricLocomotive/FormLocomotiveCollection.cs
View File

@ -53,7 +53,7 @@ namespace ProjectElectricLocomotive
_logger.LogWarning("Неудачная попытка. Коллекция не добавлена, не все данные заполнены");
return;
}
_storage.AddSet(textBoxSetName.Text);
_storage.AddSet(textBoxSetName.Text);
ReloadObjects();
_logger.LogInformation($"Добавлен набор: {textBoxSetName.Text}");
@ -109,7 +109,7 @@ namespace ProjectElectricLocomotive
ReloadObjects();
_logger.LogInformation($"Набор '{name}' удален");
}
_logger.LogWarning("Отмена удаления набора");
_logger.LogWarning("Отмена удаления набора");
}
private void buttonRemoveLocomotive_Click(object sender, EventArgs e)
{

19
ElectricLocomotive/ElectricLocomotive/LocomotiveCompareByColor.cs Normal file
View File

@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ProjectElectricLocomotive.DrawingObjects;
namespace ProjectElectricLocomotive.Generics
{
internal interface LocomotiveCompareByColor
{
public int Compare(DrawingLocomotive? x, DrawingLocomotive? y)
{
eegov commented 2023-12-29 21:07:18 +04:00
Review
Copy Link

Требовалось сортировать по критериям: цвет, скорость, вес

Требовалось сортировать по критериям: цвет, скорость, вес
// TODO реализовать логику сравнения
throw new NotImplementedException();
}
}
}

34
ElectricLocomotive/ElectricLocomotive/LocomotiveCompareByType.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;
using ProjectElectricLocomotive.DrawingObjects;
namespace ProjectElectricLocomotive.Generics
{
internal interface LocomotiveCompareByType : IComparer<DrawingLocomotive?>
{
public int Compare(DrawingLocomotive? x, DrawingLocomotive? y)
{
if (x == null || x.EntityLocomotive == null)
{
throw new ArgumentNullException(nameof(x));
}
if (y == null || y.EntityLocomotive == null)
{
throw new ArgumentNullException(nameof(y));
}
if (x.GetType().Name != y.GetType().Name)
{
return x.GetType().Name.CompareTo(y.GetType().Name);
}
var speedCompare = x.EntityLocomotive.Speed.CompareTo(y.EntityLocomotive.Speed);
if (speedCompare != 0)
{
return speedCompare;
}
return x.EntityLocomotive.Weight.CompareTo(y.EntityLocomotive.Weight);
}
}
}

3
ElectricLocomotive/ElectricLocomotive/LocomotivesGenericCollection.cs
View File

@ -17,6 +17,9 @@ namespace ProjectElectricLocomotive.Generics
private readonly int _placeSizeWidth = 200;
private readonly int _placeSizeHeight = 130;
private readonly SetGeneric<T> _collection;
public void Sort(IComparer<T?> comparer) => _collection.SortSet(comparer);
public LocomotivesGenericCollection(int picWidth, int picHeight)
{
int width = picWidth / _placeSizeWidth;

28
ElectricLocomotive/ElectricLocomotive/SetGeneric.cs
View File

@ -16,6 +16,8 @@ namespace ProjectElectricLocomotive.Generics
/// Максимальное количество объектов в списке
private readonly int _maxCount;
public void SortSet(IComparer<T?> comparer) => _places.Sort(comparer);
public SetGeneric(int count)
{
_maxCount = count;
@ -23,12 +25,22 @@ namespace ProjectElectricLocomotive.Generics
}
/// Добавление объекта в набор
public int Insert(T loco)
public int Insert(T loco, IEqualityComparer<T?>? equal = null)
{
if (equal != null)
{
foreach (var secondLoco in _places)
{
if (equal.Equals(loco, secondLoco))
{
throw new Exception("Такой объект уже есть в коллекции");
}
}
}
return Insert(loco, 0);
}
public int Insert(T loco, int position)
public int Insert(T loco, int position, IEqualityComparer<T?>? equal = null)
{
if (_places.Count >= _maxCount)
throw new StorageOverflowException(_maxCount);
@ -37,6 +49,18 @@ namespace ProjectElectricLocomotive.Generics
{
return -1;
}
if (equal != null)
{
foreach (var secondLoco in _places)
{
if (equal.Equals(loco, secondLoco))
{
throw new ApplicationException("Такой объект уже есть в коллекции");
}
}
}
_places.Insert(position, loco);
return position;
}