From 86f599931fdfb8ab8057590a9df53cc49c76d531 Mon Sep 17 00:00:00 2001 From: vettaql Date: Mon, 17 Jun 2024 13:59:27 +0400 Subject: [PATCH 1/2] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormTankCollection.Designer.cs | 107 +++++++----------- ProjectTank/ProjectTank/FormTankCollection.cs | 12 +- 2 files changed, 50 insertions(+), 69 deletions(-) diff --git a/ProjectTank/ProjectTank/FormTankCollection.Designer.cs b/ProjectTank/ProjectTank/FormTankCollection.Designer.cs index e93bbf9..30cc63e 100644 --- a/ProjectTank/ProjectTank/FormTankCollection.Designer.cs +++ b/ProjectTank/ProjectTank/FormTankCollection.Designer.cs @@ -68,11 +68,9 @@ namespace ProjectTank groupBoxTools.Controls.Add(panelStorage); groupBoxTools.Controls.Add(comboBoxSelectorCompany); groupBoxTools.Dock = DockStyle.Right; - groupBoxTools.Location = new Point(856, 24); - groupBoxTools.Margin = new Padding(3, 2, 3, 2); + groupBoxTools.Location = new Point(979, 30); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Padding = new Padding(3, 2, 3, 2); - groupBoxTools.Size = new Size(191, 543); + groupBoxTools.Size = new Size(218, 769); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; @@ -86,19 +84,17 @@ namespace ProjectTank panelCompanyTools.Controls.Add(buttonGoToCheck); panelCompanyTools.Dock = DockStyle.Bottom; panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 333); - panelCompanyTools.Margin = new Padding(3, 2, 3, 2); + panelCompanyTools.Location = new Point(3, 489); panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(185, 208); + panelCompanyTools.Size = new Size(212, 277); panelCompanyTools.TabIndex = 9; // // buttonDelTank // buttonDelTank.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonDelTank.Location = new Point(3, 90); - buttonDelTank.Margin = new Padding(3, 2, 3, 2); + buttonDelTank.Location = new Point(3, 120); buttonDelTank.Name = "buttonDelTank"; - buttonDelTank.Size = new Size(177, 37); + buttonDelTank.Size = new Size(203, 49); buttonDelTank.TabIndex = 4; buttonDelTank.Text = "Удалить танка "; buttonDelTank.UseVisualStyleBackColor = true; @@ -107,10 +103,9 @@ namespace ProjectTank // buttonRefresh // buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(4, 169); - buttonRefresh.Margin = new Padding(3, 2, 3, 2); + buttonRefresh.Location = new Point(5, 225); buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(176, 37); + buttonRefresh.Size = new Size(202, 49); buttonRefresh.TabIndex = 6; buttonRefresh.Text = "Обновить"; buttonRefresh.UseVisualStyleBackColor = true; @@ -119,21 +114,19 @@ namespace ProjectTank // maskedTextBox // maskedTextBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - maskedTextBox.Location = new Point(4, 65); - maskedTextBox.Margin = new Padding(3, 2, 3, 2); + maskedTextBox.Location = new Point(5, 87); maskedTextBox.Mask = "00"; maskedTextBox.Name = "maskedTextBox"; - maskedTextBox.Size = new Size(176, 23); + maskedTextBox.Size = new Size(202, 27); maskedTextBox.TabIndex = 3; maskedTextBox.ValidatingType = typeof(int); // // buttonAddTank // buttonAddTank.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddTank.Location = new Point(3, 2); - buttonAddTank.Margin = new Padding(3, 2, 3, 2); + buttonAddTank.Location = new Point(3, 3); buttonAddTank.Name = "buttonAddTank"; - buttonAddTank.Size = new Size(178, 37); + buttonAddTank.Size = new Size(204, 49); buttonAddTank.TabIndex = 1; buttonAddTank.Text = "Добавление бронированной машины"; buttonAddTank.UseVisualStyleBackColor = true; @@ -142,10 +135,9 @@ namespace ProjectTank // buttonGoToCheck // buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonGoToCheck.Location = new Point(3, 130); - buttonGoToCheck.Margin = new Padding(3, 2, 3, 2); + buttonGoToCheck.Location = new Point(3, 173); buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(177, 37); + buttonGoToCheck.Size = new Size(203, 49); buttonGoToCheck.TabIndex = 5; buttonGoToCheck.Text = "Передать на тесты"; buttonGoToCheck.UseVisualStyleBackColor = true; @@ -153,10 +145,9 @@ namespace ProjectTank // // buttonCreateCompany // - buttonCreateCompany.Location = new Point(5, 254); - buttonCreateCompany.Margin = new Padding(3, 2, 3, 2); + buttonCreateCompany.Location = new Point(6, 339); buttonCreateCompany.Name = "buttonCreateCompany"; - buttonCreateCompany.Size = new Size(180, 26); + buttonCreateCompany.Size = new Size(206, 35); buttonCreateCompany.TabIndex = 8; buttonCreateCompany.Text = "Создать компанию"; buttonCreateCompany.UseVisualStyleBackColor = true; @@ -172,18 +163,16 @@ namespace ProjectTank panelStorage.Controls.Add(textBoxCollectionName); panelStorage.Controls.Add(labelCollectionName); panelStorage.Dock = DockStyle.Top; - panelStorage.Location = new Point(3, 18); - panelStorage.Margin = new Padding(3, 2, 3, 2); + panelStorage.Location = new Point(3, 23); panelStorage.Name = "panelStorage"; - panelStorage.Size = new Size(185, 207); + panelStorage.Size = new Size(212, 276); panelStorage.TabIndex = 7; // // buttonCollectinDel // - buttonCollectinDel.Location = new Point(3, 181); - buttonCollectinDel.Margin = new Padding(3, 2, 3, 2); + buttonCollectinDel.Location = new Point(3, 241); buttonCollectinDel.Name = "buttonCollectinDel"; - buttonCollectinDel.Size = new Size(180, 22); + buttonCollectinDel.Size = new Size(206, 29); buttonCollectinDel.TabIndex = 6; buttonCollectinDel.Text = "Удалить коллекцию"; buttonCollectinDel.UseVisualStyleBackColor = true; @@ -192,19 +181,17 @@ namespace ProjectTank // listBoxCollection // listBoxCollection.FormattingEnabled = true; - listBoxCollection.ItemHeight = 15; - listBoxCollection.Location = new Point(3, 98); - listBoxCollection.Margin = new Padding(3, 2, 3, 2); + listBoxCollection.ItemHeight = 20; + listBoxCollection.Location = new Point(3, 131); listBoxCollection.Name = "listBoxCollection"; - listBoxCollection.Size = new Size(181, 79); + listBoxCollection.Size = new Size(206, 104); listBoxCollection.TabIndex = 5; // // buttonCollectionAdd // - buttonCollectionAdd.Location = new Point(3, 72); - buttonCollectionAdd.Margin = new Padding(3, 2, 3, 2); + buttonCollectionAdd.Location = new Point(3, 96); buttonCollectionAdd.Name = "buttonCollectionAdd"; - buttonCollectionAdd.Size = new Size(180, 22); + buttonCollectionAdd.Size = new Size(206, 29); buttonCollectionAdd.TabIndex = 4; buttonCollectionAdd.Text = "Добавить коллекцию"; buttonCollectionAdd.UseVisualStyleBackColor = true; @@ -213,10 +200,9 @@ namespace ProjectTank // radioButtonList // radioButtonList.AutoSize = true; - radioButtonList.Location = new Point(93, 50); - radioButtonList.Margin = new Padding(3, 2, 3, 2); + radioButtonList.Location = new Point(106, 67); radioButtonList.Name = "radioButtonList"; - radioButtonList.Size = new Size(66, 19); + radioButtonList.Size = new Size(80, 24); radioButtonList.TabIndex = 3; radioButtonList.TabStop = true; radioButtonList.Text = "Список"; @@ -225,10 +211,9 @@ namespace ProjectTank // radioButtonMassive // radioButtonMassive.AutoSize = true; - radioButtonMassive.Location = new Point(16, 50); - radioButtonMassive.Margin = new Padding(3, 2, 3, 2); + radioButtonMassive.Location = new Point(18, 67); radioButtonMassive.Name = "radioButtonMassive"; - radioButtonMassive.Size = new Size(67, 19); + radioButtonMassive.Size = new Size(82, 24); radioButtonMassive.TabIndex = 2; radioButtonMassive.TabStop = true; radioButtonMassive.Text = "Массив"; @@ -236,18 +221,17 @@ namespace ProjectTank // // textBoxCollectionName // - textBoxCollectionName.Location = new Point(3, 25); - textBoxCollectionName.Margin = new Padding(3, 2, 3, 2); + textBoxCollectionName.Location = new Point(3, 33); textBoxCollectionName.Name = "textBoxCollectionName"; - textBoxCollectionName.Size = new Size(181, 23); + textBoxCollectionName.Size = new Size(206, 27); textBoxCollectionName.TabIndex = 1; // // labelCollectionName // labelCollectionName.AutoSize = true; - labelCollectionName.Location = new Point(24, 8); + labelCollectionName.Location = new Point(27, 11); labelCollectionName.Name = "labelCollectionName"; - labelCollectionName.Size = new Size(125, 15); + labelCollectionName.Size = new Size(158, 20); labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции:"; // @@ -257,20 +241,18 @@ namespace ProjectTank comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxSelectorCompany.FormattingEnabled = true; comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" }); - comboBoxSelectorCompany.Location = new Point(5, 229); - comboBoxSelectorCompany.Margin = new Padding(3, 2, 3, 2); + comboBoxSelectorCompany.Location = new Point(6, 305); comboBoxSelectorCompany.Name = "comboBoxSelectorCompany"; - comboBoxSelectorCompany.Size = new Size(181, 23); + comboBoxSelectorCompany.Size = new Size(206, 28); comboBoxSelectorCompany.TabIndex = 0; comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged; // // pictureBox // pictureBox.Dock = DockStyle.Fill; - pictureBox.Location = new Point(0, 24); - pictureBox.Margin = new Padding(3, 2, 3, 2); + pictureBox.Location = new Point(0, 30); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(856, 543); + pictureBox.Size = new Size(979, 769); pictureBox.TabIndex = 1; pictureBox.TabStop = false; // @@ -280,8 +262,8 @@ namespace ProjectTank menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; - menuStrip.Padding = new Padding(5, 2, 0, 2); - menuStrip.Size = new Size(1047, 24); + menuStrip.Padding = new Padding(6, 3, 0, 3); + menuStrip.Size = new Size(1197, 30); menuStrip.TabIndex = 6; menuStrip.Text = "menuStrip1"; // @@ -289,14 +271,14 @@ namespace ProjectTank // файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem }); файлToolStripMenuItem.Name = "файлToolStripMenuItem"; - файлToolStripMenuItem.Size = new Size(48, 20); + файлToolStripMenuItem.Size = new Size(59, 24); файлToolStripMenuItem.Text = "Файл"; // // saveToolStripMenuItem // saveToolStripMenuItem.Name = "saveToolStripMenuItem"; saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S; - saveToolStripMenuItem.Size = new Size(181, 22); + saveToolStripMenuItem.Size = new Size(227, 26); saveToolStripMenuItem.Text = "Сохранение"; saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click; // @@ -304,7 +286,7 @@ namespace ProjectTank // loadToolStripMenuItem.Name = "loadToolStripMenuItem"; loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L; - loadToolStripMenuItem.Size = new Size(181, 22); + loadToolStripMenuItem.Size = new Size(227, 26); loadToolStripMenuItem.Text = "Загрузка"; loadToolStripMenuItem.Click += LoadToolStripMenuItem_Click; // @@ -318,14 +300,13 @@ namespace ProjectTank // // FormTankCollection // - AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1047, 567); + ClientSize = new Size(1197, 799); Controls.Add(pictureBox); Controls.Add(groupBoxTools); Controls.Add(menuStrip); MainMenuStrip = menuStrip; - Margin = new Padding(3, 2, 3, 2); Name = "FormTankCollection"; Text = "Коллекция танков"; groupBoxTools.ResumeLayout(false); diff --git a/ProjectTank/ProjectTank/FormTankCollection.cs b/ProjectTank/ProjectTank/FormTankCollection.cs index a1633b8..5716d6b 100644 --- a/ProjectTank/ProjectTank/FormTankCollection.cs +++ b/ProjectTank/ProjectTank/FormTankCollection.cs @@ -168,12 +168,12 @@ public partial class FormTankCollection : Form } } - /// - /// Перерисовка коллекции - /// - /// - /// - private void ButtonRefresh_Click(object sender, EventArgs e) + /// + /// Перерисовка коллекции + /// + /// + /// + private void ButtonRefresh_Click(object sender, EventArgs e) { if (_company == null) { -- 2.25.1 From bd7cd4486d70b7b84e23ae4e9137dce0dbcfb1d2 Mon Sep 17 00:00:00 2001 From: vettaql Date: Mon, 17 Jun 2024 14:14:38 +0400 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectTank/ProjectTank/FormTankCollection.cs | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/ProjectTank/ProjectTank/FormTankCollection.cs b/ProjectTank/ProjectTank/FormTankCollection.cs index 5716d6b..a9d71f5 100644 --- a/ProjectTank/ProjectTank/FormTankCollection.cs +++ b/ProjectTank/ProjectTank/FormTankCollection.cs @@ -101,11 +101,11 @@ public partial class FormTankCollection : Form { if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null) { - _logger.LogError("Удаление объекта из несуществующей коллекции"); return; } - if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) + if (MessageBox.Show("Удалить объект?", "Удаление", + MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; } @@ -113,21 +113,18 @@ public partial class FormTankCollection : Form int pos = Convert.ToInt32(maskedTextBox.Text); try { - object decrementObject = _company - pos; + var res = _company - pos; MessageBox.Show("Объект удален"); - _logger.LogInformation($"Удален объект по позиции {pos}"); + _logger.LogInformation($"Объект удален под индексом {pos}"); pictureBox.Image = _company.Show(); } - catch (ObjectNotFoundException) + catch (Exception ex) { - MessageBox.Show("Объект не найден"); - _logger.LogError($"Удаление не найденного объекта в позиции {pos} "); - } - catch (PositionOutOfCollectionException) - { - MessageBox.Show("Удаление вне рамках коллекции"); - _logger.LogError($"Удаление объекта за пределами коллекции {pos} "); + MessageBox.Show(ex.Message, "Не удалось удалить объект", + MessageBoxButtons.OK, MessageBoxIcon.Error); + _logger.LogError($"Ошибка: {ex.Message}", ex.Message); } + } /// -- 2.25.1