Yunusov_Niyaz/PIbd-23_Yunusov.N.N_Trolleybus_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lab8 pull

Browse Source
This commit is contained in:
Yunusov_Niyaz 2023-12-22 18:35:02 +04:00
parent f629e43cea
commit 405afb65a9
4 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Trolleybus/Trolleybus/BusesCollectionInfo.cs
View File

@ -17,10 +17,9 @@ namespace ProjectTrolleybus.Generics
} }
public bool Equals(BusesCollectionInfo? other) public bool Equals(BusesCollectionInfo? other)
{ {
if (other == null) if (Name == other?.Name)
return false; return true;
return Name == other.Name; return false;
throw new NotImplementedException();
} }
public override int GetHashCode() public override int GetHashCode()
{ {

2
Trolleybus/Trolleybus/BusesGenericCollection.cs
View File

@ -55,7 +55,7 @@ namespace ProjectTrolleybus.Generics
{ {
if (obj == null || collect == null) if (obj == null || collect == null)
return false; return false;
collect?._collection.Insert(obj, new DrawingBusEquality()); collect?._collection.Insert(obj, new DrawingBusEqutables());
return true; return true;
} }
/// <summary> /// <summary>

3
Trolleybus/Trolleybus/DrawingBusEquality.cs → Trolleybus/Trolleybus/DrawingBusEqutables.cs
View File

@ -7,10 +7,9 @@ using ProjectTrolleybus.DrawingObjects;
using ProjectTrolleybus.Entities; using ProjectTrolleybus.Entities;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
namespace ProjectTrolleybus namespace ProjectTrolleybus
{ {
internal class DrawingBusEquality : IEqualityComparer<DrawingBus?> internal class DrawingBusEqutables : IEqualityComparer<DrawingBus?>
{ {
public bool Equals(DrawingBus? x, DrawingBus? y) public bool Equals(DrawingBus? x, DrawingBus? y)
{ {

44
Trolleybus/Trolleybus/FormBusCollection.Designer.cs generated
View File

@ -29,8 +29,8 @@
private void InitializeComponent() private void InitializeComponent()
{ {
groupBoxTrolleybus = new GroupBox(); groupBoxTrolleybus = new GroupBox();
ButtonSortByColor = new Button(); buttonSortByColor = new Button();
ButtonSortByType = new Button(); buttonSortByType = new Button();
groupBoxSets = new GroupBox(); groupBoxSets = new GroupBox();
textBoxStorageName = new TextBox(); textBoxStorageName = new TextBox();
buttonDelObject = new Button(); buttonDelObject = new Button();
@ -55,8 +55,8 @@
// //
// groupBoxTrolleybus // groupBoxTrolleybus
// //
groupBoxTrolleybus.Controls.Add(ButtonSortByColor); groupBoxTrolleybus.Controls.Add(buttonSortByColor);
groupBoxTrolleybus.Controls.Add(ButtonSortByType); groupBoxTrolleybus.Controls.Add(buttonSortByType);
groupBoxTrolleybus.Controls.Add(groupBoxSets); groupBoxTrolleybus.Controls.Add(groupBoxSets);
groupBoxTrolleybus.Controls.Add(buttonUpdateCollection); groupBoxTrolleybus.Controls.Add(buttonUpdateCollection);
groupBoxTrolleybus.Controls.Add(buttonDeleteBus); groupBoxTrolleybus.Controls.Add(buttonDeleteBus);
@ -71,25 +71,25 @@
groupBoxTrolleybus.TabStop = false; groupBoxTrolleybus.TabStop = false;
groupBoxTrolleybus.Text = "Инструменты"; groupBoxTrolleybus.Text = "Инструменты";
// //
// ButtonSortByColor // buttonSortByColor
// //
ButtonSortByColor.Location = new Point(11, 361); buttonSortByColor.Location = new Point(11, 361);
ButtonSortByColor.Name = "ButtonSortByColor"; buttonSortByColor.Name = "buttonSortByColor";
ButtonSortByColor.Size = new Size(273, 33); buttonSortByColor.Size = new Size(273, 33);
ButtonSortByColor.TabIndex = 6; buttonSortByColor.TabIndex = 6;
ButtonSortByColor.Text = "Сортировка по цвету"; buttonSortByColor.Text = "Сортировка по цвету";
ButtonSortByColor.UseVisualStyleBackColor = true; buttonSortByColor.UseVisualStyleBackColor = true;
ButtonSortByColor.Click += ButtonSortByColor_Click; buttonSortByColor.Click += ButtonSortByColor_Click;
// //
// ButtonSortByType // buttonSortByType
// //
ButtonSortByType.Location = new Point(11, 320); buttonSortByType.Location = new Point(11, 320);
ButtonSortByType.Name = "ButtonSortByType"; buttonSortByType.Name = "buttonSortByType";
ButtonSortByType.Size = new Size(275, 35); buttonSortByType.Size = new Size(275, 35);
ButtonSortByType.TabIndex = 5; buttonSortByType.TabIndex = 5;
ButtonSortByType.Text = "Сортировка по типу"; buttonSortByType.Text = "Сортировка по типу";
ButtonSortByType.UseVisualStyleBackColor = true; buttonSortByType.UseVisualStyleBackColor = true;
ButtonSortByType.Click += ButtonSortByType_Click; buttonSortByType.Click += ButtonSortByType_Click;
// //
// groupBoxSets // groupBoxSets
// //
@ -285,7 +285,7 @@
private ToolStripMenuItem LoadToolStripMenuItem; private ToolStripMenuItem LoadToolStripMenuItem;
private OpenFileDialog openFileDialog; private OpenFileDialog openFileDialog;
private SaveFileDialog saveFileDialog; private SaveFileDialog saveFileDialog;
private Button ButtonSortByColor; private Button buttonSortByColor;
private Button ButtonSortByType; private Button buttonSortByType;
} }
} }