Лабораторная работа №3

2024-03-24 16:13:26 +04:00 · 2024-03-24 16:13:12 +04:00
9 changed files with 160 additions and 149 deletions
--- a/Battleship/Battleship/CollectionGenericObjects/AbstractCompany.cs
+++ b/Battleship/Battleship/CollectionGenericObjects/AbstractCompany.cs
@ -7,7 +7,7 @@ public abstract class AbstractCompany
    /// <summary>
    /// Размер места (ширина)
    /// </summary>
-    protected readonly int _placeSizeWidth = 210;
+    protected readonly int _placeSizeWidth = 238;

    /// <summary>
    /// Размер места (высота)
@ -29,7 +29,7 @@ public abstract class AbstractCompany
    /// <summary>
    /// Вычисление максимального количества элементов, который можно разместить в окне
    /// </summary>
-    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _pictureHeight);
+    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight) + 2;


    /// <summary>
@ -52,20 +52,19 @@ public abstract class AbstractCompany
    /// <param name="company">Компания</param>
    /// <param name="car">Добавляемый объект</param>
    /// <returns></returns>
-    public static bool operator +(AbstractCompany company, DrawingWarship car)
+    public static int operator +(AbstractCompany company, DrawingWarship warship)
    {
-        return company._collection?.Insert(car) ?? false;
+        return company._collection.Insert(warship);
    }
-
    /// <summary>
    /// Перезагрузка оператора удаления для класса
    /// </summary>
    /// <param name="company">Компания</param>
    /// <param name="position">Номер удаляемого объекта</param>
    /// <returns></returns>
-    public static bool operator -(AbstractCompany company, int position) 
+    public static DrawingWarship operator -(AbstractCompany company, int position) 
    { 
-        return company._collection?.Remove(position) ?? false;
+        return company._collection.Remove(position);
    }

    /// <summary>
@ -89,7 +88,7 @@ public abstract class AbstractCompany
        DrawBackground(graphics);

        SetObjectsPosition();
-        for (int i = 0; i < (_collection?.Count ?? 0); i++)
+        for (int i = 0; i < (_collection?.Count ?? 0); ++i)
        {
            DrawingWarship? obj = _collection?.Get(i);
            obj?.DrawTransport(graphics);
@ -107,5 +106,4 @@ public abstract class AbstractCompany
    /// Расстановка объектов
    /// </summary>
    protected abstract void SetObjectsPosition();
-}
-
+}
--- a/Battleship/Battleship/CollectionGenericObjects/ICollectionGenericObjects.cs
+++ b/Battleship/Battleship/CollectionGenericObjects/ICollectionGenericObjects.cs
@ -14,7 +14,7 @@ public interface ICollectionGenericObjects<T>
    int Count { get; }

    /// <summary>
-    /// Установка минимального количества элементов
+    /// Установка максимального количества элементов
    /// </summary>
    int SetMaxCount { set; }

@ -23,7 +23,7 @@ public interface ICollectionGenericObjects<T>
    /// </summary>
    /// <param name="obj">Добавляемый объект</param>
    /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-    bool Insert(T obj);
+    int Insert(T obj);

    /// <summary>
    /// Добавление объекта в коллекцию на конкретную позицию
@ -31,14 +31,14 @@ public interface ICollectionGenericObjects<T>
    /// <param name="obj">Добавляемый объект</param>
    /// <param name="position">Позиция</param>
    /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-    bool Insert(T obj, int position);
+    int Insert(T obj, int position);

    /// <summary>
    /// Удаление объекта из коллекции с конкретной позиции
    /// </summary>
    /// <param name="position"></param>
    /// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
-    bool Remove(int position);
+    T? Remove(int position);

    /// <summary>
    /// Получение объекта по позиции
@ -46,4 +46,4 @@ public interface ICollectionGenericObjects<T>
    /// <param name="position">Позиция</param>
    /// <returns>Объект</returns>
    T? Get(int position);
-}
+}
--- a/Battleship/Battleship/CollectionGenericObjects/MassiveGenericObjects.cs
+++ b/Battleship/Battleship/CollectionGenericObjects/MassiveGenericObjects.cs
@ -1,14 +1,16 @@
-namespace Battleship.CollectionGenericObjects;
+using Battleship.CollectionGenericObjects;
+
+//namespace Battleship.CollectionGenericObjects;

 /// <summary>
-/// Параметрированный набор объектов
+/// Параметризованный набор объектов
 /// </summary>
 /// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
 public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
    where T : class
 {
    /// <summary>
-    /// Массив объектов, которые хранили
+    /// Массив объектов, которые храним
    /// </summary>
    private T?[] _collection;

@ -21,76 +23,86 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
    /// </summary>
    public MassiveGenericObjects()
    {
-        _collection = Array.Empty<T>();
+        _collection = Array.Empty<T?>();
    }

    public T? Get(int position)
    {
-        //TODO проверка позиции
-        if(position >= _collection.Length || position < 0)
+        // TODO проверка позиции
+        if (position >= _collection.Length || position < 0)
        {
            return null;
        }
        return _collection[position];
    }

-    public bool Insert(T obj)
+    public int Insert(T obj)
    {
-        //TODO вставка в свободное место набора
+        // TODO вставка в свободное место набора
        int index = 0;
        while (index < _collection.Length)
        {
            if (_collection[index] == null)
            {
                _collection[index] = obj;
-                return true;
+                return index;
            }
            index++;
        }
-        return false;
+        return -1;
    }

-    public bool Insert(T obj, int position)
+    public int Insert(T obj, int position)
    {
        // TODO проверка позиции
        // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
-        //     ищется свободное место после этой позиции и идет вставка туда
+        //      ищется свободное место после этой позиции и идет вставка туда
+        //      если нет после, ищем до
        // TODO вставка
        if (position >= _collection.Length || position < 0)
-            return false;
+            return -1;

-        while (position + 1 < _collection.Length)
+        // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
+        if (_collection[position] != null)
        {
-            if (_collection[position] == null)
+            // проверка, что после вставляемого элемента в массиве есть пустой элемент
+            int nullIndex = -1;
+            for (int i = position + 1; i < Count; i++)
            {
-                _collection[position] = obj;
-                return true;
+                if (_collection[i] == null)
+                {
+                    nullIndex = i;
+                    break;
+                }
            }
-            position++;
-        }
-
-        while (position - 1 >= 0)
-        {
-            if (_collection[position] == null)
+            // Если пустого элемента нет, то выходим
+            if (nullIndex < 0)
            {
-                _collection[position] = obj;
-                return true;
+                return -1;
+            }
+            // сдвиг всех объектов, находящихся справа от позиции до первого пустого элемента
+            int j = nullIndex - 1;
+            while (j >= position)
+            {
+                _collection[j + 1] = _collection[j];
+                j--;
            }
-            position--;
        }
-        return false;
-
+        // TODO вставка по позиции
+        _collection[position] = obj;
+        return position;
    }

-    public bool Remove(int position)
+    public T? Remove(int position)
    {
        // TODO проверка позиции
        // TODO удаление объекта из массива, присвоив элементу массива значение null
        if (position >= _collection.Length || position < 0)
        {
-            return false;
+            return null;
        }
+        T temp = _collection[position];
        _collection[position] = null;
-        return true;
+        return temp;
    }
 }
--- a/Battleship/Battleship/CollectionGenericObjects/WarshipSharingService.cs
+++ b/Battleship/Battleship/CollectionGenericObjects/WarshipSharingService.cs
@ -2,16 +2,24 @@

 namespace Battleship.CollectionGenericObjects;

+/// <summary>
+/// Реализация абстрактной компании - доки
+/// </summary>
 public class WarshipSharingService : AbstractCompany
 {
-
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="picWidth"></param>
+    /// <param name="picHeight"></param>
+    /// <param name="collection"></param>
    public WarshipSharingService(int picWidth, int picHeight, ICollectionGenericObjects<DrawingWarship> collection) : base(picWidth, picHeight, collection)
    {
    }

    protected override void DrawBackground(Graphics g)
    {
-        Pen pen = new(Color.Black, 3);
+        Pen pen = new(Color.DarkSlateBlue, 4);
        for (int i = 0; i <= _pictureWidth / _placeSizeWidth; i++)
        {
            for (int j = 0; j <= _pictureHeight / _placeSizeHeight; j++)
@ -22,20 +30,21 @@ public class WarshipSharingService : AbstractCompany
        }
    }

+    //установка объектов 
    protected override void SetObjectsPosition()
    {
        int width = _pictureWidth / _placeSizeWidth;
        int height = _pictureHeight / _placeSizeHeight;

        int posWidth = 0;
-        int posHeight = height;
+        int posHeight = height - 1;

        for (int i = 0; i < (_collection?.Count ?? 0); i++)
        {
            if (_collection?.Get(i) != null)
            {
                _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
-                _collection?.Get(i)?.SetPosition(_placeSizeWidth * posWidth + 4, posHeight * _placeSizeHeight + 4, width, height);
+                _collection?.Get(i)?.SetPosition(_placeSizeWidth * posWidth + 4, posHeight * _placeSizeHeight + 4);
            }

            if (posWidth < width)
@ -45,7 +54,7 @@ public class WarshipSharingService : AbstractCompany
                posWidth = 0;
                posHeight--;
            }
-            if (posHeight < 0)
+            if (posHeight > height)
            {
                return;
            }
--- a/Battleship/Battleship/Drawings/DrawingBattleship.cs
+++ b/Battleship/Battleship/Drawings/DrawingBattleship.cs
@ -1,5 +1,4 @@
 using Battleship.Entities;
-//using System.Drawings;

 namespace Battleship.Drawings;
 /// <summary>
@ -17,9 +16,7 @@ public class DrawingBattleship : DrawingWarship
    /// <param name="bodyDeck">Признак наличия палубы</param>
    /// <param name="compartment">Признак наличия отсека для ракет</param>
    /// <param name="tower">Признак наличия башни</param>
-    /// 
-
-    public DrawingBattleship(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyDeck, bool compartment, bool tower) : base(129, 60)
+    public DrawingBattleship(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyDeck, bool compartment, bool tower) : base(129, 80)
    {
        EntityWarship = new EntityBattleship(speed, weight, bodyColor, compartment, tower, bodyDeck, additionalColor);
    }
--- a/Battleship/Battleship/Drawings/DrawingWarship.cs
+++ b/Battleship/Battleship/Drawings/DrawingWarship.cs
@ -37,7 +37,7 @@ public class DrawingWarship
    /// <summary>
    /// Высота прорисовки военного корабля
    /// </summary>
-    private readonly int _drawingWarshipHeight = 40;
+    private readonly int _drawingWarshipHeight = 80;

    /// <summary>
    /// Координата Х объекта
@ -135,7 +135,7 @@ public class DrawingWarship
    /// <param name="x">Координата X</param>
    /// <param name="y">Координата Y</param>

-    public void SetPosition(int x, int y, int width, int height)
+    public void SetPosition(int x, int y)
    {
        if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
        {
@ -238,7 +238,7 @@ public class DrawingWarship
        Brush brBlack = new SolidBrush(Color.Black);
        g.FillRectangle(brBlack, _startPosX.Value + 5, _startPosY.Value + 7, 5, 10); //верхний
        g.FillRectangle(brBlack, _startPosX.Value + 5, _startPosY.Value + 22, 5, 10); //нижний
-        //границы двигателей
+                                                                                      //границы двигателей
        g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value + 7, 5, 10); //двигатель верхний
        g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value + 22, 5, 10); //двигатель нижний

--- a/Battleship/Battleship/FormWarshipCollection.Designer.cs
+++ b/Battleship/Battleship/FormWarshipCollection.Designer.cs
@ -32,28 +32,28 @@
            buttonRefresh = new Button();
            buttonGoToCheck = new Button();
            buttonRemoveWarship = new Button();
-            maskedTextBox = new MaskedTextBox();
            buttonAddBattleship = new Button();
            buttonAddWarship = new Button();
            comboBoxSelectionCompany = new ComboBox();
            pictureBox = new PictureBox();
+            maskedTextBox1 = new MaskedTextBox();
            groupBoxTools.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
            SuspendLayout();
            // 
            // groupBoxTools
            // 
+            groupBoxTools.Controls.Add(maskedTextBox1);
            groupBoxTools.Controls.Add(buttonRefresh);
            groupBoxTools.Controls.Add(buttonGoToCheck);
            groupBoxTools.Controls.Add(buttonRemoveWarship);
-            groupBoxTools.Controls.Add(maskedTextBox);
            groupBoxTools.Controls.Add(buttonAddBattleship);
            groupBoxTools.Controls.Add(buttonAddWarship);
            groupBoxTools.Controls.Add(comboBoxSelectionCompany);
            groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(706, 0);
+            groupBoxTools.Location = new Point(861, 0);
            groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(273, 594);
+            groupBoxTools.Size = new Size(292, 583);
            groupBoxTools.TabIndex = 0;
            groupBoxTools.TabStop = false;
            groupBoxTools.Text = "Инструменты";
@ -63,18 +63,18 @@
            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            buttonRefresh.Location = new Point(12, 477);
            buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(255, 42);
+            buttonRefresh.Size = new Size(274, 42);
            buttonRefresh.TabIndex = 6;
            buttonRefresh.Text = "Обновить";
            buttonRefresh.UseVisualStyleBackColor = true;
-            buttonRefresh.Click += buttonRefresh_Click;
+            buttonRefresh.Click += ButtonRefresh_Click;
            // 
            // buttonGoToCheck
            // 
            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            buttonGoToCheck.Location = new Point(12, 381);
            buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(255, 42);
+            buttonGoToCheck.Size = new Size(274, 42);
            buttonGoToCheck.TabIndex = 5;
            buttonGoToCheck.Text = "Передать на тесты";
            buttonGoToCheck.UseVisualStyleBackColor = true;
@ -85,41 +85,33 @@
            buttonRemoveWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            buttonRemoveWarship.Location = new Point(12, 283);
            buttonRemoveWarship.Name = "buttonRemoveWarship";
-            buttonRemoveWarship.Size = new Size(255, 42);
+            buttonRemoveWarship.Size = new Size(274, 42);
            buttonRemoveWarship.TabIndex = 4;
            buttonRemoveWarship.Text = "Удалить корабль";
            buttonRemoveWarship.UseVisualStyleBackColor = true;
-            // 
-            // maskedTextBox
-            // 
-            maskedTextBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            maskedTextBox.Location = new Point(12, 238);
-            maskedTextBox.Mask = "00";
-            maskedTextBox.Name = "maskedTextBox";
-            maskedTextBox.Size = new Size(255, 27);
-            maskedTextBox.TabIndex = 3;
+            buttonRemoveWarship.Click += buttonRemoveWarship_Click_1;
            // 
            // buttonAddBattleship
            // 
            buttonAddBattleship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            buttonAddBattleship.Location = new Point(12, 143);
            buttonAddBattleship.Name = "buttonAddBattleship";
-            buttonAddBattleship.Size = new Size(255, 42);
+            buttonAddBattleship.Size = new Size(274, 42);
            buttonAddBattleship.TabIndex = 2;
            buttonAddBattleship.Text = "Добавление линкора";
            buttonAddBattleship.UseVisualStyleBackColor = true;
-            buttonAddBattleship.Click += buttonAddBattleship_Click;
+            buttonAddBattleship.Click += ButtonAddBattleship_Click;
            // 
            // buttonAddWarship
            // 
            buttonAddWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            buttonAddWarship.Location = new Point(12, 95);
            buttonAddWarship.Name = "buttonAddWarship";
-            buttonAddWarship.Size = new Size(255, 42);
+            buttonAddWarship.Size = new Size(274, 42);
            buttonAddWarship.TabIndex = 1;
            buttonAddWarship.Text = "Добавление корабля";
            buttonAddWarship.UseVisualStyleBackColor = true;
-            buttonAddWarship.Click += buttonAddWarship_Click;
+            buttonAddWarship.Click += ButtonAddWarship_Click;
            // 
            // comboBoxSelectionCompany
            // 
@ -129,7 +121,7 @@
            comboBoxSelectionCompany.Items.AddRange(new object[] { "Хранилище" });
            comboBoxSelectionCompany.Location = new Point(12, 26);
            comboBoxSelectionCompany.Name = "comboBoxSelectionCompany";
-            comboBoxSelectionCompany.Size = new Size(255, 28);
+            comboBoxSelectionCompany.Size = new Size(274, 28);
            comboBoxSelectionCompany.TabIndex = 0;
            comboBoxSelectionCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
            // 
@ -138,20 +130,28 @@
            pictureBox.Dock = DockStyle.Fill;
            pictureBox.Location = new Point(0, 0);
            pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(706, 594);
+            pictureBox.Size = new Size(861, 583);
            pictureBox.TabIndex = 1;
            pictureBox.TabStop = false;
            // 
+            // maskedTextBox1
+            // 
+            maskedTextBox1.Anchor = AnchorStyles.Left | AnchorStyles.Right;
+            maskedTextBox1.Location = new Point(12, 250);
+            maskedTextBox1.Mask = "00";
+            maskedTextBox1.Name = "maskedTextBox1";
+            maskedTextBox1.Size = new Size(274, 27);
+            maskedTextBox1.TabIndex = 7;
+            // 
            // FormWarshipCollection
            // 
            AutoScaleDimensions = new SizeF(8F, 20F);
            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(979, 594);
+            ClientSize = new Size(1153, 583);
            Controls.Add(pictureBox);
            Controls.Add(groupBoxTools);
            Name = "FormWarshipCollection";
            Text = "Коллекция кораблей";
-            //Load += this.FormWarshipCollection_Load;
            groupBoxTools.ResumeLayout(false);
            groupBoxTools.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
@ -161,13 +161,12 @@

        private GroupBox groupBoxTools;
        private ComboBox comboBoxSelectionCompany;
-        private MaskedTextBox maskedTextBoxPosition;
        private Button buttonAddBattleship;
        private Button buttonAddWarship;
        private Button buttonRemoveWarship;
-        private MaskedTextBox maskedTextBox;
        private PictureBox pictureBox;
        private Button buttonRefresh;
        private Button buttonGoToCheck;
+        private MaskedTextBox maskedTextBox1;
    }
 }
--- a/Battleship/Battleship/FormWarshipCollection.cs
+++ b/Battleship/Battleship/FormWarshipCollection.cs
@ -55,15 +55,15 @@ public partial class FormWarshipCollection : Form
                break;
            case nameof(DrawingBattleship):
                drawingWarship = new DrawingBattleship(random.Next(100, 300), random.Next(1000, 3000),
-                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+                    GetColor(random),
+                    GetColor(random),
                Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
                break;
            default:
                return;
        }

-        if (_company + drawingWarship)
+        if (_company + drawingWarship != -1)
        {
            MessageBox.Show("Объект добавлен");
            pictureBox.Image = _company.Show();
@ -90,55 +90,6 @@ public partial class FormWarshipCollection : Form
        return color;
    }

-    /// <summary>
-    /// Добавление линкора
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void buttonAddBattleship_Click(object sender, EventArgs e)
-    {
-        CreateObject(nameof(DrawingBattleship));
-    }
-
-    /// <summary>
-    /// Добавление военного корабля
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void buttonAddWarship_Click(object sender, EventArgs e)
-    {
-        CreateObject(nameof(DrawingWarship));
-    }
-
-    /// <summary>
-    /// Удаление объекта
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonRemoveCar_Click(object sender, EventArgs e)
-    {
-        if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
-        {
-            return;
-        }
-
-        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
-        {
-            return;
-        }
-
-        int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-        if (_company - pos)
-        {
-            MessageBox.Show("Объект удален");
-            pictureBox.Image = _company.Show();
-        }
-        else
-        {
-            MessageBox.Show("Не удалось удалить объект");
-        }
-    }
-
    /// <summary>
    /// Передача на тесты
    /// </summary>
@ -152,8 +103,8 @@ public partial class FormWarshipCollection : Form
        }

        DrawingWarship? warship = null;
-        int counter = 100;
-        while (warship == null) 
+        int counter = 120;
+        while (warship == null)
        {
            warship = _company.GetRandomObject();
            counter--;
@ -163,18 +114,69 @@ public partial class FormWarshipCollection : Form
            }
        }

-        FormBattleship form = new FormBattleship();
-        form.SetWarship = warship;
+        FormBattleship form = new()
+        {
+            SetWarship = warship
+        };
        form.ShowDialog();

    }

+    /// <summary>
+    /// Добавление линкора
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddBattleship_Click(object sender, EventArgs e)
+    {
+        CreateObject(nameof(DrawingBattleship));
+    }
+
+    /// <summary>
+    /// Добавление военного корабля
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddWarship_Click(object sender, EventArgs e)
+    {
+        CreateObject(nameof(DrawingWarship));
+    }
+
+    /// <summary>
+    /// Удаление объекта
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonRemoveWarship_Click_1(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(maskedTextBox1.Text) || _company == null)
+        {
+            return;
+        }
+
+        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+        {
+            return;
+        }
+
+        int pos = Convert.ToInt32(maskedTextBox1.Text);
+        if (_company - pos != null)
+        {
+            MessageBox.Show("Объект удален");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось удалить объект");
+        }
+    }
+
    /// <summary>
    /// Обновление
    /// </summary>
    /// <param name="sender"></param>
    /// <param name="e"></param>
-    private void buttonRefresh_Click(object sender, EventArgs e)
+    private void ButtonRefresh_Click(object sender, EventArgs e)
    {
        if (_company == null)
        {
--- a/Battleship/Battleship/MovementStrategy/IMoveableObjectcs.cs
+++ b/Battleship/Battleship/MovementStrategy/IMoveableObjectcs.cs
@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Battleship.MovementStrategy;
+namespace Battleship.MovementStrategy;

 public interface IMoveableObjectcs
 {
Author	SHA1	Message	Date
victinass	3ac1dab1c9	Лабораторная работа №3	2024-03-24 16:13:26 +04:00
victinass	3fa56e548d	Лабораторная работа №3	2024-03-24 16:13:12 +04:00