From 895f7fd63ae62d4b8df950e3302e34a89c1555dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=BE=D1=84=D1=8C=D1=8F=20=D0=AF=D0=BA=D0=BE=D0=B1?= =?UTF-8?q?=D1=87=D1=83=D0=BA?= Date: Tue, 28 Nov 2023 07:04:12 +0400 Subject: [PATCH] =?UTF-8?q?=D0=AD=D1=81=D1=82=D0=B5=D1=82=D0=B8=D1=87?= =?UTF-8?q?=D0=B5=D1=81=D0=BA=D0=B8=D0=B5=20=D1=80=D0=BF=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=B2=D0=BE=20=D0=B2=D1=82=D0=BE=D1=80=D0=BE=D0=B9=20?= =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sailboat/Sailboat/BoatsGenericCollection.cs | 4 +-- .../Sailboat/FormBoatCollection.Designer.cs | 21 +++++------ Sailboat/Sailboat/SetGeneric.cs | 35 ------------------- 3 files changed, 13 insertions(+), 47 deletions(-) diff --git a/Sailboat/Sailboat/BoatsGenericCollection.cs b/Sailboat/Sailboat/BoatsGenericCollection.cs index 2228a36..000eefd 100644 --- a/Sailboat/Sailboat/BoatsGenericCollection.cs +++ b/Sailboat/Sailboat/BoatsGenericCollection.cs @@ -31,11 +31,11 @@ namespace Sailboat.Generics /// /// Размер занимаемого объектом места (ширина) /// - private readonly int _placeSizeWidth = 160; + private readonly int _placeSizeWidth = 200; /// /// Размер занимаемого объектом места (высота) /// - private readonly int _placeSizeHeight = 160; + private readonly int _placeSizeHeight = 170; /// /// Набор объектов /// diff --git a/Sailboat/Sailboat/FormBoatCollection.Designer.cs b/Sailboat/Sailboat/FormBoatCollection.Designer.cs index ce5a7c0..76a90ca 100644 --- a/Sailboat/Sailboat/FormBoatCollection.Designer.cs +++ b/Sailboat/Sailboat/FormBoatCollection.Designer.cs @@ -40,10 +40,10 @@ // // pictureBoxCollection // - pictureBoxCollection.Dock = DockStyle.Fill; pictureBoxCollection.Location = new Point(0, 0); pictureBoxCollection.Name = "pictureBoxCollection"; - pictureBoxCollection.Size = new Size(800, 450); + pictureBoxCollection.Size = new Size(750, 450); + pictureBoxCollection.SizeMode = PictureBoxSizeMode.AutoSize; pictureBoxCollection.TabIndex = 0; pictureBoxCollection.TabStop = false; // @@ -51,7 +51,7 @@ // buttonAddBoat.Location = new Point(6, 26); buttonAddBoat.Name = "buttonAddBoat"; - buttonAddBoat.Size = new Size(238, 45); + buttonAddBoat.Size = new Size(197, 45); buttonAddBoat.TabIndex = 1; buttonAddBoat.Text = "Добавить лодку"; buttonAddBoat.UseVisualStyleBackColor = true; @@ -61,7 +61,7 @@ // buttonRemoveBoat.Location = new Point(6, 145); buttonRemoveBoat.Name = "buttonRemoveBoat"; - buttonRemoveBoat.Size = new Size(238, 45); + buttonRemoveBoat.Size = new Size(197, 45); buttonRemoveBoat.TabIndex = 2; buttonRemoveBoat.Text = "Удалить лодку"; buttonRemoveBoat.UseVisualStyleBackColor = true; @@ -71,7 +71,7 @@ // buttonRefreshCollection.Location = new Point(6, 227); buttonRefreshCollection.Name = "buttonRefreshCollection"; - buttonRefreshCollection.Size = new Size(238, 45); + buttonRefreshCollection.Size = new Size(197, 45); buttonRefreshCollection.TabIndex = 3; buttonRefreshCollection.Text = "Обновить коллекцию"; buttonRefreshCollection.UseVisualStyleBackColor = true; @@ -79,9 +79,9 @@ // // maskedTextBoxNumber // - maskedTextBoxNumber.Location = new Point(69, 112); + maskedTextBoxNumber.Location = new Point(34, 112); maskedTextBoxNumber.Name = "maskedTextBoxNumber"; - maskedTextBoxNumber.Size = new Size(125, 27); + maskedTextBoxNumber.Size = new Size(138, 27); maskedTextBoxNumber.TabIndex = 4; // // groupBoxTools @@ -90,9 +90,9 @@ groupBoxTools.Controls.Add(buttonRefreshCollection); groupBoxTools.Controls.Add(maskedTextBoxNumber); groupBoxTools.Controls.Add(buttonRemoveBoat); - groupBoxTools.Location = new Point(538, 12); + groupBoxTools.Location = new Point(756, 12); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(250, 426); + groupBoxTools.Size = new Size(209, 387); groupBoxTools.TabIndex = 2; groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; @@ -101,7 +101,7 @@ // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); + ClientSize = new Size(973, 403); Controls.Add(groupBoxTools); Controls.Add(pictureBoxCollection); Name = "FormBoatCollection"; @@ -110,6 +110,7 @@ groupBoxTools.ResumeLayout(false); groupBoxTools.PerformLayout(); ResumeLayout(false); + PerformLayout(); } #endregion diff --git a/Sailboat/Sailboat/SetGeneric.cs b/Sailboat/Sailboat/SetGeneric.cs index b1db75c..5ce6cba 100644 --- a/Sailboat/Sailboat/SetGeneric.cs +++ b/Sailboat/Sailboat/SetGeneric.cs @@ -6,43 +6,18 @@ using System.Threading.Tasks; namespace Sailboat.Generics { - /// - /// Параметризованный набор объектов - /// - /// internal class SetGeneric where T : class { - /// - /// Массив объектов, которые храним - /// private readonly T?[] _places; - /// - /// Количество объектов в массиве - /// public int Count => _places.Length; - /// - /// Конструктор - /// - /// public SetGeneric(int count) { _places = new T?[count]; } - /// - /// Добавление объекта в набор - /// - /// Добавляемая лодка - /// public int Insert(T boat) { return Insert(boat, 0); } - /// - /// Добавление объекта в набор на конкретную позицию - /// - /// Добавляемая лодка - /// Позиция - /// public int Insert(T boat, int position) { int nullIndex = -1, i; @@ -74,11 +49,6 @@ namespace Sailboat.Generics _places[position] = boat; return position; } - /// - /// Удаление объекта из набора с конкретной позиции - /// - /// - /// public bool Remove(int position) { if (position < 0 || position >= Count) @@ -89,11 +59,6 @@ namespace Sailboat.Generics _places[position] = null; return true; } - /// - /// Получение объекта из набора по позиции - /// - /// - /// public T? Get(int position) { if (position < 0 || position >= Count)