From d95866ee896b210a91be28c3fe0433bf4150a64f Mon Sep 17 00:00:00 2001 From: dex_moth Date: Sun, 10 Dec 2023 12:27:15 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Airbus/FormAirbusCollection.Designer.cs | 6 +++--- Airbus/FormAirbusCollection.cs | 2 +- Airbus/FormAirbusCollection.resx | 2 +- Airbus/Generics/AirbusGenericCollection.cs | 6 +++--- Airbus/Generics/SetGeneric.cs | 3 +-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Airbus/FormAirbusCollection.Designer.cs b/Airbus/FormAirbusCollection.Designer.cs index c9c92ff..fa03c11 100644 --- a/Airbus/FormAirbusCollection.Designer.cs +++ b/Airbus/FormAirbusCollection.Designer.cs @@ -67,7 +67,7 @@ pictureBoxCollection.Location = new Point(0, 28); pictureBoxCollection.Margin = new Padding(3, 4, 3, 4); pictureBoxCollection.Name = "pictureBoxCollection"; - pictureBoxCollection.Size = new Size(631, 553); + pictureBoxCollection.Size = new Size(630, 556); pictureBoxCollection.TabIndex = 1; pictureBoxCollection.TabStop = false; // @@ -184,14 +184,14 @@ // SaveToolStripMenuItem // SaveToolStripMenuItem.Name = "SaveToolStripMenuItem"; - SaveToolStripMenuItem.Size = new Size(224, 26); + SaveToolStripMenuItem.Size = new Size(166, 26); SaveToolStripMenuItem.Text = "Сохранить"; SaveToolStripMenuItem.Click += SaveToolStripMenuItem_Click; // // LoadToolStripMenuItem // LoadToolStripMenuItem.Name = "LoadToolStripMenuItem"; - LoadToolStripMenuItem.Size = new Size(224, 26); + LoadToolStripMenuItem.Size = new Size(166, 26); LoadToolStripMenuItem.Text = "Загрузить"; LoadToolStripMenuItem.Click += LoadToolStripMenuItem_Click; // diff --git a/Airbus/FormAirbusCollection.cs b/Airbus/FormAirbusCollection.cs index 6d63d93..1cd01d6 100644 --- a/Airbus/FormAirbusCollection.cs +++ b/Airbus/FormAirbusCollection.cs @@ -98,7 +98,7 @@ namespace ProjectAirbus } _storage.AddSet(textBoxStorageName.Text); ReloadObjects(); - _logger.LogInformation($"Добавлен набор: { textBoxStorageName.Text}"); + _logger.LogInformation($"Добавлен набор: {textBoxStorageName.Text}"); } // выбрать набор diff --git a/Airbus/FormAirbusCollection.resx b/Airbus/FormAirbusCollection.resx index 711778a..d9a3bc2 100644 --- a/Airbus/FormAirbusCollection.resx +++ b/Airbus/FormAirbusCollection.resx @@ -130,6 +130,6 @@ 462, 17 - 89 + 25 \ No newline at end of file diff --git a/Airbus/Generics/AirbusGenericCollection.cs b/Airbus/Generics/AirbusGenericCollection.cs index f6e41c8..346b222 100644 --- a/Airbus/Generics/AirbusGenericCollection.cs +++ b/Airbus/Generics/AirbusGenericCollection.cs @@ -15,9 +15,9 @@ namespace ProjectAirbus.Generics public int count => _collection.Count; private readonly int _pictureWidth; private readonly int _pictureHeight; - // Размер занимаемого места - private readonly int _placeSizeWidth = 89; - private readonly int _placeSizeHeight = 34; + // Размер занимаемого места 89х34 + private readonly int _placeSizeWidth = 189; + private readonly int _placeSizeHeight = 134; // коллекция private readonly SetGeneric _collection; diff --git a/Airbus/Generics/SetGeneric.cs b/Airbus/Generics/SetGeneric.cs index 653a523..deeacf5 100644 --- a/Airbus/Generics/SetGeneric.cs +++ b/Airbus/Generics/SetGeneric.cs @@ -19,8 +19,7 @@ namespace ProjectAirbus.Generics public SetGeneric(int count) { - //_maxCount = count; - _maxCount = 2; + _maxCount = count; _places = new List(count); }