From e84985aaf55acc07145d5c5b2d73994ed34a21e2 Mon Sep 17 00:00:00 2001 From: ksenianeva <95441235+ksenianeva@users.noreply.github.com> Date: Tue, 13 Dec 2022 12:26:09 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B5=D0=B4=D1=8C=D0=BC=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0.=20=D0=9B?= =?UTF-8?q?=D0=BE=D0=B3=D0=B5=D1=80=20+=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormMapWithSetShips.Designer.cs | 18 +++--- .../ContainerShip/FormMapWithSetShips.cs | 60 +++++++++++++++---- .../ContainerShip/FormMapWithSetShips.resx | 3 + ContainerShip/ContainerShip/MapsCollection.cs | 4 +- .../ContainerShip/SetShipsGeneric.cs | 8 ++- 5 files changed, 70 insertions(+), 23 deletions(-) diff --git a/ContainerShip/ContainerShip/FormMapWithSetShips.Designer.cs b/ContainerShip/ContainerShip/FormMapWithSetShips.Designer.cs index 70195a7..926fae2 100644 --- a/ContainerShip/ContainerShip/FormMapWithSetShips.Designer.cs +++ b/ContainerShip/ContainerShip/FormMapWithSetShips.Designer.cs @@ -72,7 +72,7 @@ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right; this.groupBox1.Location = new System.Drawing.Point(553, 33); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(300, 654); + this.groupBox1.Size = new System.Drawing.Size(300, 709); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "Инструменты"; @@ -154,7 +154,7 @@ this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonUp.BackgroundImage = global::ContainerShip.Properties.Resources.upArrow; this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonUp.Location = new System.Drawing.Point(131, 536); + this.buttonUp.Location = new System.Drawing.Point(131, 591); this.buttonUp.Name = "buttonUp"; this.buttonUp.Size = new System.Drawing.Size(50, 50); this.buttonUp.TabIndex = 9; @@ -166,7 +166,7 @@ this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonRight.BackgroundImage = global::ContainerShip.Properties.Resources.LeftArrow; this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonRight.Location = new System.Drawing.Point(187, 592); + this.buttonRight.Location = new System.Drawing.Point(187, 647); this.buttonRight.Name = "buttonRight"; this.buttonRight.Size = new System.Drawing.Size(50, 50); this.buttonRight.TabIndex = 8; @@ -178,7 +178,7 @@ this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonDown.BackgroundImage = global::ContainerShip.Properties.Resources.DownArrow; this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonDown.Location = new System.Drawing.Point(131, 592); + this.buttonDown.Location = new System.Drawing.Point(131, 647); this.buttonDown.Name = "buttonDown"; this.buttonDown.Size = new System.Drawing.Size(50, 50); this.buttonDown.TabIndex = 7; @@ -190,7 +190,7 @@ this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonLeft.BackgroundImage = global::ContainerShip.Properties.Resources.RightArrow; this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonLeft.Location = new System.Drawing.Point(75, 592); + this.buttonLeft.Location = new System.Drawing.Point(75, 647); this.buttonLeft.Name = "buttonLeft"; this.buttonLeft.Size = new System.Drawing.Size(50, 50); this.buttonLeft.TabIndex = 6; @@ -240,7 +240,7 @@ this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill; this.pictureBox.Location = new System.Drawing.Point(0, 33); this.pictureBox.Name = "pictureBox"; - this.pictureBox.Size = new System.Drawing.Size(553, 654); + this.pictureBox.Size = new System.Drawing.Size(553, 709); this.pictureBox.TabIndex = 1; this.pictureBox.TabStop = false; // @@ -267,14 +267,14 @@ // SaveToolStripMenuItem // this.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem"; - this.SaveToolStripMenuItem.Size = new System.Drawing.Size(270, 34); + this.SaveToolStripMenuItem.Size = new System.Drawing.Size(212, 34); this.SaveToolStripMenuItem.Text = "Сохранение"; this.SaveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click); // // LoadToolStripMenuItem // this.LoadToolStripMenuItem.Name = "LoadToolStripMenuItem"; - this.LoadToolStripMenuItem.Size = new System.Drawing.Size(270, 34); + this.LoadToolStripMenuItem.Size = new System.Drawing.Size(212, 34); this.LoadToolStripMenuItem.Text = "Загрузка"; this.LoadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click); // @@ -291,7 +291,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(853, 687); + this.ClientSize = new System.Drawing.Size(853, 742); this.Controls.Add(this.pictureBox); this.Controls.Add(this.groupBox1); this.Controls.Add(this.menuStrip); diff --git a/ContainerShip/ContainerShip/FormMapWithSetShips.cs b/ContainerShip/ContainerShip/FormMapWithSetShips.cs index b35292a..19aeb7f 100644 --- a/ContainerShip/ContainerShip/FormMapWithSetShips.cs +++ b/ContainerShip/ContainerShip/FormMapWithSetShips.cs @@ -33,12 +33,14 @@ namespace ContainerShip /// Логер /// private readonly ILogger _logger; + private Action addShipAction; public FormMapWithSetShips(ILogger logger) { InitializeComponent(); _logger = logger; _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height); ComboBoxSelectorMap.Items.Clear(); + addShipAction = addShip; foreach (var elem in _mapsDict) { ComboBoxSelectorMap.Items.Add(elem.Key); @@ -66,6 +68,30 @@ namespace ContainerShip listBoxMaps.SelectedIndex = index; } } + private void addShip(DrawingShip ship) + { + try + { + _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].add(new DrawingObjectShip(ship)); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + _logger.LogInformation($"Добавлен объект {ship}"); + } + catch(ArgumentNullException ex) + { + MessageBox.Show(ex.Message); + _logger.LogWarning($"Ошибка: {ex.Message}"); + } + catch(StorageOverflowException ex) + { + MessageBox.Show(ex.Message); + _logger.LogWarning($"Ошибка: {ex.Message}"); + } + catch (Exception ex) + { + MessageBox.Show($"Неизвестная ошибка: {ex.Message}", "Ошибка!", MessageBoxButtons.OK, MessageBoxIcon.Error); + _logger.LogWarning($"Ошибка: {ex.Message}"); + } + } /// /// Добавление объекта /// @@ -78,9 +104,7 @@ namespace ContainerShip return; } var formShipConfig = new FormShipConfig(); - formShipConfig.AddEvent(new Action(ship => { - _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].add(new DrawingObjectShip(ship)); - pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();})); + formShipConfig.AddEvent(addShipAction); formShipConfig.Show(); } /// @@ -105,19 +129,20 @@ namespace ContainerShip int pos = Convert.ToInt32(maskedTextBoxPosition.Text); try { - if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null) - { - MessageBox.Show("Объект удален"); - pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); - } + IDrawingObject drawingObject = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos; + MessageBox.Show("Объект удален"); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + _logger.LogInformation($"Удален объект {drawingObject}"); } catch (ShipNotFoundException ex) { MessageBox.Show($"Ошибка удаления: {ex.Message}"); + _logger.LogWarning($"Ошибка: {ex.Message}"); } catch (Exception ex) { - MessageBox.Show($"Неизвестная ошибка: {ex.Message}") ; + MessageBox.Show($"Неизвестная ошибка: {ex.Message}"); + _logger.LogWarning($"Ошибка: {ex.Message}"); } } /// @@ -202,6 +227,7 @@ namespace ContainerShip private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e) { pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + _logger.LogInformation($"Выбрана карта {listBoxMaps.SelectedItem?.ToString() ?? string.Empty}"); } /// /// Удаление карты @@ -214,11 +240,12 @@ namespace ContainerShip { return; } - + string deletedMapName = listBoxMaps.SelectedItem?.ToString(); if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty); ReloadMaps(); + _logger.LogInformation($"Удалена карта {deletedMapName}"); } } @@ -230,6 +257,7 @@ namespace ContainerShip { _mapsCollection.SaveData(saveFileDialog.FileName); MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + _logger.LogInformation($"Данные сохранены в файле {saveFileDialog.FileName}"); } catch (Exception ex) { @@ -247,10 +275,22 @@ namespace ContainerShip _mapsCollection.LoadData(openFileDialog.FileName); MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); ReloadMaps(); + _logger.LogInformation($"Данные загружены из файла {openFileDialog.FileName}"); + } + catch (FileFormatException ex) + { + MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + _logger.LogWarning($"Ошибка: {ex.Message}"); + } + catch (FileNotFoundException ex) + { + MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + _logger.LogWarning($"Ошибка: {ex.Message}"); } catch (Exception ex) { MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + _logger.LogWarning($"Ошибка: {ex.Message}"); } } } diff --git a/ContainerShip/ContainerShip/FormMapWithSetShips.resx b/ContainerShip/ContainerShip/FormMapWithSetShips.resx index 0034e6c..52520fa 100644 --- a/ContainerShip/ContainerShip/FormMapWithSetShips.resx +++ b/ContainerShip/ContainerShip/FormMapWithSetShips.resx @@ -66,4 +66,7 @@ 357, 17 + + 25 + \ No newline at end of file diff --git a/ContainerShip/ContainerShip/MapsCollection.cs b/ContainerShip/ContainerShip/MapsCollection.cs index 605ca47..094674c 100644 --- a/ContainerShip/ContainerShip/MapsCollection.cs +++ b/ContainerShip/ContainerShip/MapsCollection.cs @@ -129,7 +129,7 @@ namespace ContainerShip { if (!File.Exists(filename)) { - throw new Exception("Файл не найден"); + throw new FileNotFoundException("Файл не найден"); } using (FileStream fs = new(filename, FileMode.Open)) using (StreamReader sr = new StreamReader(fs)) @@ -139,7 +139,7 @@ namespace ContainerShip line.Trim(); if (line != "MapsCollection") { - throw new Exception("Неправильный формат данных в файле"); + throw new FileFormatException("Неправильный формат данных в файле"); } _mapStorages.Clear(); while ((line = sr.ReadLine()) != null) diff --git a/ContainerShip/ContainerShip/SetShipsGeneric.cs b/ContainerShip/ContainerShip/SetShipsGeneric.cs index 196ab35..d42a56b 100644 --- a/ContainerShip/ContainerShip/SetShipsGeneric.cs +++ b/ContainerShip/ContainerShip/SetShipsGeneric.cs @@ -44,7 +44,11 @@ namespace ContainerShip /// public int Insert(T ship, int position) { - if (position < 0 || position >= _maxCount || _places.Count + 1 >= _maxCount) + if(position < 0 || position >= _maxCount) + { + throw new ShipNotFoundException(position); + } + if ( _places.Count >= _maxCount) { throw new StorageOverflowException(_maxCount); } @@ -57,7 +61,7 @@ namespace ContainerShip /// /// public T Remove(int position) - { + { if (position < 0 || position >= _maxCount) { throw new ShipNotFoundException(position);