Лабораторная работа №8
This commit is contained in:
parent
eeb94aad76
commit
e1dcd3e315
@ -1,12 +1,76 @@
|
|||||||
using System;
|
namespace Excavator.CollectionGenericObjects;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace Excavator.CollectionGenericObjects
|
/// <summary>
|
||||||
|
/// Класс, хранящий информацию о коллекции
|
||||||
|
/// </summary>
|
||||||
|
public class CollectionInfo : IEquatable<CollectionInfo>
|
||||||
{
|
{
|
||||||
internal class 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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,22 @@
|
|||||||
using System;
|
namespace Excavator.Drawnings;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace Excavator.Drawnings
|
/// <summary>
|
||||||
|
/// Сравнение по цвету, скорости, весу
|
||||||
|
/// </summary>
|
||||||
|
public class DrawningExcavatorCompareByColor : IComparer<DrawningSimpleExcavator?>
|
||||||
{
|
{
|
||||||
internal class DrawningAirbusCompareByColor
|
public int Compare(DrawningSimpleExcavator? x, DrawningSimpleExcavator? y)
|
||||||
{
|
{
|
||||||
|
if (x == null || x.EntitySimpleExcavator == null) return 1;
|
||||||
|
|
||||||
|
if (y == null || y.EntitySimpleExcavator == null) return -1;
|
||||||
|
|
||||||
|
var bodycolorCompare = x.EntitySimpleExcavator.BodyColor.Name.CompareTo(y.EntitySimpleExcavator.BodyColor.Name);
|
||||||
|
if (bodycolorCompare != 0) return bodycolorCompare;
|
||||||
|
|
||||||
|
var speedCompare = x.EntitySimpleExcavator.Speed.CompareTo(y.EntitySimpleExcavator.Speed);
|
||||||
|
if (speedCompare != 0) return speedCompare;
|
||||||
|
|
||||||
|
return x.EntitySimpleExcavator.Weight.CompareTo(y.EntitySimpleExcavator.Weight);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,21 @@
|
|||||||
using System;
|
namespace Excavator.Drawnings;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace Excavator.Drawnings
|
/// <summary>
|
||||||
|
/// Сравнение по типу, скорости и весу
|
||||||
|
/// </summary>
|
||||||
|
public class DrawningExcavatorCompareByType : IComparer<DrawningSimpleExcavator?>
|
||||||
{
|
{
|
||||||
internal class DrawningAirbusCompareByType
|
public int Compare(DrawningSimpleExcavator? x, DrawningSimpleExcavator? y)
|
||||||
{
|
{
|
||||||
|
if (x == null || x.EntitySimpleExcavator == null) return 1;
|
||||||
|
|
||||||
|
if (y == null || y.EntitySimpleExcavator == null) return -1;
|
||||||
|
|
||||||
|
if (x.GetType().Name != y.GetType().Name) return x.GetType().Name.CompareTo(y.GetType().Name);
|
||||||
|
|
||||||
|
var speedCompare = x.EntitySimpleExcavator.Speed.CompareTo(y.EntitySimpleExcavator.Speed);
|
||||||
|
if (speedCompare != 0) return speedCompare;
|
||||||
|
|
||||||
|
return x.EntitySimpleExcavator.Weight.CompareTo(y.EntitySimpleExcavator.Weight);
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,12 +1,43 @@
|
|||||||
using System;
|
using Excavator.Entities;
|
||||||
using System.Collections.Generic;
|
using System.Diagnostics.CodeAnalysis;
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace Excavator.Drawnings
|
namespace Excavator.Drawnings;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Реализация сравнения двух объектов класса-прорисовки
|
||||||
|
/// </summary>
|
||||||
|
public class DrawningExcavatorEqutables : IEqualityComparer<DrawningSimpleExcavator?>
|
||||||
{
|
{
|
||||||
internal class DrawningAirbusEqutables
|
public bool Equals(DrawningSimpleExcavator? x, DrawningSimpleExcavator? y)
|
||||||
{
|
{
|
||||||
|
if (x == null || x.EntitySimpleExcavator == null) return false;
|
||||||
|
|
||||||
|
if (y == null || y.EntitySimpleExcavator == null) return false;
|
||||||
|
|
||||||
|
if (x.GetType().Name != y.GetType().Name) return false;
|
||||||
|
|
||||||
|
if (x.EntitySimpleExcavator.Speed != y.EntitySimpleExcavator.Speed) return false;
|
||||||
|
|
||||||
|
if (x.EntitySimpleExcavator.Weight != y.EntitySimpleExcavator.Weight) return false;
|
||||||
|
|
||||||
|
if (x.EntitySimpleExcavator.BodyColor != y.EntitySimpleExcavator.BodyColor) return false;
|
||||||
|
|
||||||
|
if (x is DrawningExcavator bigX && y is DrawningExcavator bigY)
|
||||||
|
{
|
||||||
|
// TODO доделать логику сравнения дополнительных параметров
|
||||||
|
EntityExcavator _x = (EntityExcavator)x.EntitySimpleExcavator;
|
||||||
|
EntityExcavator _y = (EntityExcavator)y.EntitySimpleExcavator;
|
||||||
|
|
||||||
|
if (_x.Supports != _y.Supports) return false;
|
||||||
|
if (_x.Bucket != _y.Bucket) return false;
|
||||||
|
if (_x.AdditionalColor != _y.AdditionalColor) return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int GetHashCode([DisallowNull] DrawningSimpleExcavator obj)
|
||||||
|
{
|
||||||
|
return obj.GetHashCode();
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,12 +1,20 @@
|
|||||||
using System;
|
using System.Runtime.Serialization;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace Excavator.Exceptions
|
namespace Excavator.Exceptions;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Класс, описывающий ошибку наличия такого же объекта в коллекции
|
||||||
|
/// </summary>
|
||||||
|
[Serializable]
|
||||||
|
internal class ObjectNotUniqueException : ApplicationException
|
||||||
{
|
{
|
||||||
internal class ObjectNotUniqueException
|
public ObjectNotUniqueException(int i) : base("В коллекции есть такой же элемент на позиции: " + i) { }
|
||||||
{
|
|
||||||
}
|
public ObjectNotUniqueException() : base() { }
|
||||||
|
|
||||||
|
public ObjectNotUniqueException(string message) : base(message) { }
|
||||||
|
|
||||||
|
public ObjectNotUniqueException(string message, Exception exception) : base(message, exception) { }
|
||||||
|
|
||||||
|
protected ObjectNotUniqueException(SerializationInfo info, StreamingContext context) : base(info, context) { }
|
||||||
}
|
}
|
@ -52,6 +52,8 @@
|
|||||||
LoadToolStripMenuItem = new ToolStripMenuItem();
|
LoadToolStripMenuItem = new ToolStripMenuItem();
|
||||||
openFileDialog = new OpenFileDialog();
|
openFileDialog = new OpenFileDialog();
|
||||||
saveFileDialog = new SaveFileDialog();
|
saveFileDialog = new SaveFileDialog();
|
||||||
|
buttonSortByType = new Button();
|
||||||
|
buttonSortByColor = new Button();
|
||||||
groupBoxTools.SuspendLayout();
|
groupBoxTools.SuspendLayout();
|
||||||
panelStorage.SuspendLayout();
|
panelStorage.SuspendLayout();
|
||||||
panelCompanyTools.SuspendLayout();
|
panelCompanyTools.SuspendLayout();
|
||||||
@ -62,21 +64,24 @@
|
|||||||
// groupBoxTools
|
// groupBoxTools
|
||||||
//
|
//
|
||||||
groupBoxTools.Anchor = AnchorStyles.Right;
|
groupBoxTools.Anchor = AnchorStyles.Right;
|
||||||
|
groupBoxTools.Controls.Add(buttonSortByColor);
|
||||||
|
groupBoxTools.Controls.Add(buttonSortByType);
|
||||||
groupBoxTools.Controls.Add(buttonCreateCompany);
|
groupBoxTools.Controls.Add(buttonCreateCompany);
|
||||||
groupBoxTools.Controls.Add(panelStorage);
|
groupBoxTools.Controls.Add(panelStorage);
|
||||||
groupBoxTools.Controls.Add(comboBoxSelectorCompany);
|
groupBoxTools.Controls.Add(comboBoxSelectorCompany);
|
||||||
groupBoxTools.Controls.Add(panelCompanyTools);
|
groupBoxTools.Controls.Add(panelCompanyTools);
|
||||||
groupBoxTools.Font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular, GraphicsUnit.Point);
|
groupBoxTools.Font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular, GraphicsUnit.Point);
|
||||||
groupBoxTools.Location = new Point(855, 27);
|
groupBoxTools.Location = new Point(861, 27);
|
||||||
groupBoxTools.Name = "groupBoxTools";
|
groupBoxTools.Name = "groupBoxTools";
|
||||||
groupBoxTools.Size = new Size(212, 608);
|
groupBoxTools.Size = new Size(212, 647);
|
||||||
groupBoxTools.TabIndex = 0;
|
groupBoxTools.TabIndex = 0;
|
||||||
groupBoxTools.TabStop = false;
|
groupBoxTools.TabStop = false;
|
||||||
groupBoxTools.Text = "Инструменты";
|
groupBoxTools.Text = "Инструменты";
|
||||||
|
groupBoxTools.Enter += groupBoxTools_Enter;
|
||||||
//
|
//
|
||||||
// buttonCreateCompany
|
// buttonCreateCompany
|
||||||
//
|
//
|
||||||
buttonCreateCompany.Location = new Point(9, 325);
|
buttonCreateCompany.Location = new Point(12, 322);
|
||||||
buttonCreateCompany.Name = "buttonCreateCompany";
|
buttonCreateCompany.Name = "buttonCreateCompany";
|
||||||
buttonCreateCompany.Size = new Size(191, 34);
|
buttonCreateCompany.Size = new Size(191, 34);
|
||||||
buttonCreateCompany.TabIndex = 7;
|
buttonCreateCompany.TabIndex = 7;
|
||||||
@ -100,7 +105,7 @@
|
|||||||
//
|
//
|
||||||
// buttonCollectionDel
|
// buttonCollectionDel
|
||||||
//
|
//
|
||||||
buttonCollectionDel.Location = new Point(6, 231);
|
buttonCollectionDel.Location = new Point(6, 228);
|
||||||
buttonCollectionDel.Name = "buttonCollectionDel";
|
buttonCollectionDel.Name = "buttonCollectionDel";
|
||||||
buttonCollectionDel.Size = new Size(191, 38);
|
buttonCollectionDel.Size = new Size(191, 38);
|
||||||
buttonCollectionDel.TabIndex = 6;
|
buttonCollectionDel.TabIndex = 6;
|
||||||
@ -111,7 +116,7 @@
|
|||||||
// listBoxCollection
|
// listBoxCollection
|
||||||
//
|
//
|
||||||
listBoxCollection.FormattingEnabled = true;
|
listBoxCollection.FormattingEnabled = true;
|
||||||
listBoxCollection.Location = new Point(6, 121);
|
listBoxCollection.Location = new Point(6, 116);
|
||||||
listBoxCollection.Name = "listBoxCollection";
|
listBoxCollection.Name = "listBoxCollection";
|
||||||
listBoxCollection.Size = new Size(191, 108);
|
listBoxCollection.Size = new Size(191, 108);
|
||||||
listBoxCollection.TabIndex = 5;
|
listBoxCollection.TabIndex = 5;
|
||||||
@ -172,7 +177,7 @@
|
|||||||
comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
|
comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
|
||||||
comboBoxSelectorCompany.FormattingEnabled = true;
|
comboBoxSelectorCompany.FormattingEnabled = true;
|
||||||
comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
|
comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
|
||||||
comboBoxSelectorCompany.Location = new Point(9, 298);
|
comboBoxSelectorCompany.Location = new Point(12, 295);
|
||||||
comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
|
comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
|
||||||
comboBoxSelectorCompany.Size = new Size(191, 21);
|
comboBoxSelectorCompany.Size = new Size(191, 21);
|
||||||
comboBoxSelectorCompany.TabIndex = 0;
|
comboBoxSelectorCompany.TabIndex = 0;
|
||||||
@ -185,14 +190,14 @@
|
|||||||
panelCompanyTools.Controls.Add(maskedTextBoxPosition);
|
panelCompanyTools.Controls.Add(maskedTextBoxPosition);
|
||||||
panelCompanyTools.Controls.Add(buttonRemoveExcavator);
|
panelCompanyTools.Controls.Add(buttonRemoveExcavator);
|
||||||
panelCompanyTools.Controls.Add(buttonRefresh);
|
panelCompanyTools.Controls.Add(buttonRefresh);
|
||||||
panelCompanyTools.Location = new Point(6, 365);
|
panelCompanyTools.Location = new Point(6, 362);
|
||||||
panelCompanyTools.Name = "panelCompanyTools";
|
panelCompanyTools.Name = "panelCompanyTools";
|
||||||
panelCompanyTools.Size = new Size(200, 263);
|
panelCompanyTools.Size = new Size(200, 210);
|
||||||
panelCompanyTools.TabIndex = 7;
|
panelCompanyTools.TabIndex = 7;
|
||||||
//
|
//
|
||||||
// buttonGoToCheck
|
// buttonGoToCheck
|
||||||
//
|
//
|
||||||
buttonGoToCheck.Location = new Point(3, 148);
|
buttonGoToCheck.Location = new Point(6, 114);
|
||||||
buttonGoToCheck.Name = "buttonGoToCheck";
|
buttonGoToCheck.Name = "buttonGoToCheck";
|
||||||
buttonGoToCheck.Size = new Size(191, 42);
|
buttonGoToCheck.Size = new Size(191, 42);
|
||||||
buttonGoToCheck.TabIndex = 5;
|
buttonGoToCheck.TabIndex = 5;
|
||||||
@ -202,7 +207,7 @@
|
|||||||
//
|
//
|
||||||
// buttonAddSimpleExcavator
|
// buttonAddSimpleExcavator
|
||||||
//
|
//
|
||||||
buttonAddSimpleExcavator.Location = new Point(3, 3);
|
buttonAddSimpleExcavator.Location = new Point(3, 0);
|
||||||
buttonAddSimpleExcavator.Name = "buttonAddSimpleExcavator";
|
buttonAddSimpleExcavator.Name = "buttonAddSimpleExcavator";
|
||||||
buttonAddSimpleExcavator.Size = new Size(191, 35);
|
buttonAddSimpleExcavator.Size = new Size(191, 35);
|
||||||
buttonAddSimpleExcavator.TabIndex = 1;
|
buttonAddSimpleExcavator.TabIndex = 1;
|
||||||
@ -212,7 +217,7 @@
|
|||||||
//
|
//
|
||||||
// maskedTextBoxPosition
|
// maskedTextBoxPosition
|
||||||
//
|
//
|
||||||
maskedTextBoxPosition.Location = new Point(3, 75);
|
maskedTextBoxPosition.Location = new Point(3, 41);
|
||||||
maskedTextBoxPosition.Mask = "00";
|
maskedTextBoxPosition.Mask = "00";
|
||||||
maskedTextBoxPosition.Name = "maskedTextBoxPosition";
|
maskedTextBoxPosition.Name = "maskedTextBoxPosition";
|
||||||
maskedTextBoxPosition.Size = new Size(191, 20);
|
maskedTextBoxPosition.Size = new Size(191, 20);
|
||||||
@ -220,7 +225,7 @@
|
|||||||
//
|
//
|
||||||
// buttonRemoveExcavator
|
// buttonRemoveExcavator
|
||||||
//
|
//
|
||||||
buttonRemoveExcavator.Location = new Point(3, 101);
|
buttonRemoveExcavator.Location = new Point(6, 67);
|
||||||
buttonRemoveExcavator.Name = "buttonRemoveExcavator";
|
buttonRemoveExcavator.Name = "buttonRemoveExcavator";
|
||||||
buttonRemoveExcavator.Size = new Size(191, 41);
|
buttonRemoveExcavator.Size = new Size(191, 41);
|
||||||
buttonRemoveExcavator.TabIndex = 4;
|
buttonRemoveExcavator.TabIndex = 4;
|
||||||
@ -230,7 +235,7 @@
|
|||||||
//
|
//
|
||||||
// buttonRefresh
|
// buttonRefresh
|
||||||
//
|
//
|
||||||
buttonRefresh.Location = new Point(3, 196);
|
buttonRefresh.Location = new Point(6, 162);
|
||||||
buttonRefresh.Name = "buttonRefresh";
|
buttonRefresh.Name = "buttonRefresh";
|
||||||
buttonRefresh.Size = new Size(191, 41);
|
buttonRefresh.Size = new Size(191, 41);
|
||||||
buttonRefresh.TabIndex = 6;
|
buttonRefresh.TabIndex = 6;
|
||||||
@ -245,7 +250,7 @@
|
|||||||
pictureBox.BackgroundImageLayout = ImageLayout.None;
|
pictureBox.BackgroundImageLayout = ImageLayout.None;
|
||||||
pictureBox.Location = new Point(0, 27);
|
pictureBox.Location = new Point(0, 27);
|
||||||
pictureBox.Name = "pictureBox";
|
pictureBox.Name = "pictureBox";
|
||||||
pictureBox.Size = new Size(855, 608);
|
pictureBox.Size = new Size(855, 647);
|
||||||
pictureBox.TabIndex = 1;
|
pictureBox.TabIndex = 1;
|
||||||
pictureBox.TabStop = false;
|
pictureBox.TabStop = false;
|
||||||
pictureBox.Click += pictureBox_Click;
|
pictureBox.Click += pictureBox_Click;
|
||||||
@ -291,11 +296,31 @@
|
|||||||
//
|
//
|
||||||
saveFileDialog.Filter = "txt file | *.txt";
|
saveFileDialog.Filter = "txt file | *.txt";
|
||||||
//
|
//
|
||||||
|
// buttonSortByType
|
||||||
|
//
|
||||||
|
buttonSortByType.Location = new Point(12, 571);
|
||||||
|
buttonSortByType.Name = "buttonSortByType";
|
||||||
|
buttonSortByType.Size = new Size(191, 31);
|
||||||
|
buttonSortByType.TabIndex = 9;
|
||||||
|
buttonSortByType.Text = "Сортировка по типу";
|
||||||
|
buttonSortByType.UseVisualStyleBackColor = true;
|
||||||
|
buttonSortByType.Click += buttonSortByType_Click;
|
||||||
|
//
|
||||||
|
// buttonSortByColor
|
||||||
|
//
|
||||||
|
buttonSortByColor.Location = new Point(12, 608);
|
||||||
|
buttonSortByColor.Name = "buttonSortByColor";
|
||||||
|
buttonSortByColor.Size = new Size(191, 31);
|
||||||
|
buttonSortByColor.TabIndex = 10;
|
||||||
|
buttonSortByColor.Text = "Сортировка по цвету";
|
||||||
|
buttonSortByColor.UseVisualStyleBackColor = true;
|
||||||
|
buttonSortByColor.Click += buttonSortByColor_Click;
|
||||||
|
//
|
||||||
// FormExcavatorCollection
|
// FormExcavatorCollection
|
||||||
//
|
//
|
||||||
AutoScaleDimensions = new SizeF(7F, 15F);
|
AutoScaleDimensions = new SizeF(7F, 15F);
|
||||||
AutoScaleMode = AutoScaleMode.Font;
|
AutoScaleMode = AutoScaleMode.Font;
|
||||||
ClientSize = new Size(1067, 635);
|
ClientSize = new Size(1067, 674);
|
||||||
Controls.Add(pictureBox);
|
Controls.Add(pictureBox);
|
||||||
Controls.Add(groupBoxTools);
|
Controls.Add(groupBoxTools);
|
||||||
Controls.Add(menuStrip1);
|
Controls.Add(menuStrip1);
|
||||||
@ -340,5 +365,7 @@
|
|||||||
private ToolStripMenuItem LoadToolStripMenuItem;
|
private ToolStripMenuItem LoadToolStripMenuItem;
|
||||||
private OpenFileDialog openFileDialog;
|
private OpenFileDialog openFileDialog;
|
||||||
private SaveFileDialog saveFileDialog;
|
private SaveFileDialog saveFileDialog;
|
||||||
|
private Button buttonSortByColor;
|
||||||
|
private Button buttonSortByType;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -107,7 +107,7 @@ public partial class FormExcavatorCollection : Form
|
|||||||
MessageBox.Show(ex.Message);
|
MessageBox.Show(ex.Message);
|
||||||
_logger.LogError("Ошибка: {Message}", ex.Message);
|
_logger.LogError("Ошибка: {Message}", ex.Message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Передача объекта в другую форму
|
/// Передача объекта в другую форму
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -313,5 +313,29 @@ public partial class FormExcavatorCollection : Form
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void groupBoxTools_Enter(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void buttonSortByType_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
CompareCars(new DrawningExcavatorCompareByType());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void buttonSortByColor_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
CompareCars(new DrawningExcavatorCompareByColor());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void CompareCars(IComparer<DrawningSimpleExcavator?> comparer)
|
||||||
|
{
|
||||||
|
if (_company == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_company.Sort(comparer);
|
||||||
|
pictureBox.Image = _company.Show();
|
||||||
|
}
|
||||||
}
|
}
|
@ -126,4 +126,7 @@
|
|||||||
<metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
<metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
<value>272, 17</value>
|
<value>272, 17</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>25</value>
|
||||||
|
</metadata>
|
||||||
</root>
|
</root>
|
Loading…
Reference in New Issue
Block a user