Merge pull request 'Tsukanova I.V. Lab work 1' (#1) from LabWork1 into master

Reviewed-on: http://student.git.athene.tech/Senju/PIbd-22_Tsukanova_I.V._AircraftCarrier_Base/pulls/1

AircraftCarrier/AircraftCarrier/AbstractMap.cs

@@ -1,160 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AircraftCarrier
-{
-    internal abstract class AbstractMap
-    {
-        private IDrawingObject _drawingObject = null;
-        protected int[,] _map = null;
-        protected int _width;
-        protected int _height;
-        protected float _size_x;
-        protected float _size_y;
-        protected readonly Random _random = new();
-        protected readonly int _freeRoad = 0;
-        protected readonly int _barrier = 1;
-
-        public Bitmap CreateMap(int width, int height, IDrawingObject drawningObject)
-        {
-            _width = width;
-            _height = height;
-            _drawingObject = drawningObject;
-            GenerateMap();
-            while (!SetObjectOnMap())
-            {
-                GenerateMap();
-            }
-            return DrawMapWithObject();
-        }
-        public Bitmap MoveObject(Direction direction)
-        {
-            if (_drawingObject != null)
-            {
-                if (true)
-                {
-                    _drawingObject.MoveObject(direction);
-                }
-                (float Left, float Right, float Top, float Bottom) = _drawingObject.GetCurrentPosition();
-
-                if (Check(Left, Right, Top, Bottom) != 0)
-                {
-                    _drawingObject.MoveObject(GetOpositDirection(direction));
-                }
-                return DrawMapWithObject();
-            }
-            return null;
-            
-        }
-
-        private Direction GetOpositDirection(Direction dir)
-        {
-            switch (dir)
-            {
-                case Direction.None:
-                    return Direction.None;
-                case Direction.Up:
-                    return Direction.Down;
-                case Direction.Down:
-                    return Direction.Up;
-                case Direction.Left:
-                    return Direction.Right;
-                case Direction.Right:
-                    return Direction.Left;
-            }
-            return Direction.None;
-        }
-
-        private bool SetObjectOnMap()
-        {
-            if (_drawingObject == null || _map == null)
-            {
-                return false;
-            }
-            int x = _random.Next(0, 10);
-            int y = _random.Next(0, 10);
-            _drawingObject.SetObject(x, y, _width, _height);
-            (float Left, float Right, float Top, float Bottom) = _drawingObject.GetCurrentPosition();
-            float nowX = Left;
-            float nowY = Right;
-            float lenX = Top - Left;
-            float lenY = Bottom - Right;
-            while (Check(nowX, nowY, nowX + lenX, nowY + lenY) != 2)
-            {
-                int result;
-                do
-                {
-                    result = Check(nowX, nowY, nowX + lenX, nowY + lenY);
-                    if (result == 0)
-                    {
-                        _drawingObject.SetObject((int)nowX, (int)nowY, _width, _height);
-                        return true;
-                    }
-                    else
-                    {
-                        nowX += _size_x;
-                    }
-                } while (result != 2);
-                nowX = x;
-                nowY += _size_y;
-            }
-            return false;
-        }
-
-        private int Check(float Left, float Right, float Top, float Bottom)
-        {
-            int startX = (int)(Left / _size_x);
-            int startY = (int)(Right / _size_y);
-            int endX = (int)(Top / _size_x);
-            int endY = (int)(Bottom / _size_y);
-            if (startX < 0 || startY < 0 || endX >= _map.GetLength(0) || endY >= _map.GetLength(0))
-            {
-                return 2;
-            }
-            for (int i = startX; i <= endX; i++)
-            {
-                for (int j = startY; j <= endY; j++)
-                {
-                    if (_map[i, j] == _barrier)
-                    {
-                        return 1;
-                    }
-                }
-            }
-            return 0;
-        }
-
-        private Bitmap DrawMapWithObject()
-        {
-            Bitmap bmp = new(_width, _height);
-            if (_drawingObject == null || _map == null)
-            {
-                return bmp;
-            }
-            Graphics gr = Graphics.FromImage(bmp);
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    if (_map[i, j] == _freeRoad)
-                    {
-                        DrawRoadPart(gr, i, j);
-                    }
-                    else if (_map[i, j] == _barrier)
-                    {
-                        DrawBarrierPart(gr, i, j);
-                    }
-                }
-            }
-            _drawingObject.DrawningObject(gr);
-            return bmp;
-        }
-
-        protected abstract void GenerateMap();
-        protected abstract void DrawRoadPart(Graphics g, int i, int j);
-        protected abstract void DrawBarrierPart(Graphics g, int i, int j);
-    }
-}

AircraftCarrier/AircraftCarrier/Direction.cs

@@ -9,9 +9,8 @@ namespace AircraftCarrier
     /// <summary>
     /// Направление перемещения
     /// </summary>
-    public enum Direction
+    internal enum Direction
     {
-        None = 0,
         Up = 1,
         Down = 2,
         Left = 3,

AircraftCarrier/AircraftCarrier/DrawingAircraftCarrier.cs

@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AircraftCarrier
-{
-    internal class DrawingAircraftCarrier : DrawingWarship
-    {
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес военного корабля</param>
-        /// <param name="bodyColor">Цвет основной палубы</param>
-        /// <param name="dopColor">Дополнительный цвет</param>
-        /// <param name="bodyKit">Признак наличия боковой площадки</param>
-        /// <param name="сabin">Признак наличия рубки</param>
-        /// <param name="superEngine">Признак наличия усиленного двигателя</param>
-        public DrawingAircraftCarrier(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool сabin, bool superEngine) :
-            base(speed, weight, bodyColor, 114, 40)
-        {
-            Warship = new EntityAircraftCarrier(speed, weight, bodyColor, dopColor, bodyKit, сabin, superEngine);
-        }
-
-        public override void DrawTransport(Graphics g)
-        {
-            if(Warship is not EntityAircraftCarrier aircraftCarrier)
-            {
-                return;
-            }
-
-            Pen pen = new(Color.Black);
-            Brush dopBrush = new SolidBrush(aircraftCarrier.DopColor);
-            Brush brGray = new SolidBrush(Color.Gray);
-            Brush brRed = new SolidBrush(Color.Red);
-            Brush br = new SolidBrush(Warship?.BodyColor ?? Color.White);
-
-            if (aircraftCarrier.BodyKit)
-            {
-               //боковая площадка
-                PointF pointAircraftCarrier1 = new PointF(_startPosX + 94, _startPosY + 40);
-                PointF pointAircraftCarrier2 = new PointF(_startPosX + 74, _startPosY + 60);
-                PointF pointAircraftCarrier3 = new PointF(_startPosX + 24, _startPosY + 60);
-                PointF pointAircraftCarrier4 = new PointF(_startPosX + 4, _startPosY + 40);
-
-                PointF[] PointsAircraftCarrier =
-                {
-                    pointAircraftCarrier1, pointAircraftCarrier2, pointAircraftCarrier3, pointAircraftCarrier4
-                };
-                g.FillPolygon(br, PointsAircraftCarrier);
-                g.DrawPolygon(pen, PointsAircraftCarrier);
-
-                //полоса
-                PointF pontStartLine1 = new PointF(_startPosX + 4, _startPosY);
-                PointF pontStartLine2 = new PointF(_startPosX + 15, _startPosY);
-                PointF pontStartLine3 = new PointF(_startPosX + 74, _startPosY + 60);
-                PointF pontStartLine4 = new PointF(_startPosX + 59, _startPosY + 60);
-
-                PointF[] PointsStartLine =
-                {
-                    pontStartLine1, pontStartLine2, pontStartLine3, pontStartLine4
-                };
-                g.FillPolygon(brGray, PointsStartLine);
-                g.DrawPolygon(pen, PointsStartLine);
-            }
-
-            if (aircraftCarrier.SuperEngine)
-            {
-                g.FillEllipse(brRed, _startPosX, _startPosY, 10, 10);
-                g.DrawEllipse(pen, _startPosX, _startPosY, 10, 10);
-
-                g.FillEllipse(brRed, _startPosX, _startPosY + 10, 10, 10);
-                g.DrawEllipse(pen, _startPosX, _startPosY + 10, 10, 10);
-
-                g.FillEllipse(brRed, _startPosX, _startPosY + 18, 10, 10);
-                g.DrawEllipse(pen, _startPosX, _startPosY + 18, 10, 10);
-
-                g.FillEllipse(brRed, _startPosX, _startPosY + 30, 10, 10);
-                g.DrawEllipse(pen, _startPosX, _startPosY + 30, 10, 10);
-            }
-
-            base.DrawTransport(g);          
-
-            if (aircraftCarrier.Сabin)
-            {
-                g.FillEllipse(brGray, _startPosX + 10, _startPosY + 15, 10, 10);
-                g.DrawEllipse(pen, _startPosX + 10, _startPosY + 15, 10, 10);                
-
-                g.FillEllipse(brGray, _startPosX + 20, _startPosY + 15, 10, 10);
-                g.DrawEllipse(pen, _startPosX + 20, _startPosY + 15, 10, 10);
-
-                g.FillRectangle(brGray, _startPosX + 15, _startPosY + 15, 10, 10);
-                g.DrawRectangle(pen, _startPosX + 15, _startPosY + 15, 10, 10);
-            }
-        }
-    }
-
-}

AircraftCarrier/AircraftCarrier/DrawingObjectWarship.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AircraftCarrier
-{
-    internal class DrawingObjectWarship : IDrawingObject
-    {
-        private DrawingWarship _warship = null;
-
-        public DrawingObjectWarship(DrawingWarship warship)
-        {
-            _warship = warship;
-        }
-        public float Step => _warship?.Warship?.Step ?? 0;
-
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return _warship?.GetCurrentPosition() ?? default;
-        }
-
-        public void MoveObject(Direction direction)
-        {
-            _warship?.MoveTransport(direction);
-        }
-
-        public void SetObject(int x, int y, int width, int height)
-        {
-            _warship.SetPosition(x, y, width, height);
-        }
-
-        void IDrawingObject.DrawningObject(Graphics g)
-        {
-            _warship.DrawTransport(g);
-        }
-    }
-}

AircraftCarrier/AircraftCarrier/DrawingWarship.cs

@@ -9,20 +9,20 @@ namespace AircraftCarrier
     /// <summary>
     /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
     /// </summary>
-    public class DrawingWarship
+    internal class DrawingWarship
     {
         /// <summary>
         /// Класс-сущность
         /// </summary>
-        public EntityWarship Warship { get; protected set; }
+        public EntityWarship Warship { get; private set; }
         /// <summary>
         /// Левая координата отрисовки военного корабля
         /// </summary>
-        protected float _startPosX;
+        private float _startPosX;
         /// <summary>
         /// Верхняя кооридната отрисовки военного корабля
         /// </summary>
-        protected float _startPosY;
+        private float _startPosY;
         /// <summary>
         /// Ширина окна отрисовки
         /// </summary>
@@ -34,7 +34,7 @@ namespace AircraftCarrier
         /// <summary>
         /// Ширина отрисовки военного корабля
         /// </summary>
-        private readonly int _warshipWidth = 114;
+        private readonly int _warshipWidth = 94;
         /// <summary>
         /// Высота отрисовки военного корабля
         /// </summary>
@@ -45,24 +45,10 @@ namespace AircraftCarrier
         /// <param name="speed">Скорость</param>
         /// <param name="weight">Вес военного корабля</param>
         /// <param name="bodyColor">Цвет главной палубы</param>
-        public DrawingWarship(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight, Color bodyColor)
         {
-            Warship = new EntityWarship(speed, weight, bodyColor);
+            Warship = new EntityWarship();
-        }
+            Warship.Init(speed, weight, bodyColor);
-
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес военного корабля</param>
-        /// <param name="bodyColor">Цвет главной палубы</param>
-        /// <param name="carWidth">Ширина отрисовки автомобиля</param>
-        /// <param name="carHeight">Высота отрисовки автомобиля</param>
-        protected DrawingWarship(int speed, float weight, Color bodyColor, int warshipWidth, int warshipHeight) :
-            this(speed, weight, bodyColor)
-        {
-            _warshipWidth = warshipWidth;
-            _warshipHeight = warshipHeight;
         }
         /// <summary>
         /// Установка позиции военного корабля
@@ -79,8 +65,7 @@ namespace AircraftCarrier
                 _startPosY = y;
                 _pictureWidth = width;
                 _pictureHeight = height;
-            }
+            }      
-            else return;
         }
         /// <summary>
         /// Изменение направления пермещения
@@ -103,14 +88,14 @@ namespace AircraftCarrier
                     break;
                 //влево
                 case Direction.Left:
-                    if(_startPosX - Warship.Step >= 0)
+                    if(_startPosX - Warship.Step > 0)
                     {
                         _startPosX -= Warship.Step;
                     }
                     break;
                 //вверх
                 case Direction.Up:
-                    if (_startPosY - Warship.Step >= 0)
+                    if (_startPosY - Warship.Step > 0)
                     {
                         _startPosY -= Warship.Step;
                     }
@@ -129,7 +114,7 @@ namespace AircraftCarrier
         /// Отрисовка военного корабля
         /// </summary>
         /// <param name="g"></param>
-        public virtual void DrawTransport(Graphics g)
+        public void DrawTransport(Graphics g)
         {
             if (_startPosX < 0 || _startPosY < 0
             || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
@@ -137,37 +122,38 @@ namespace AircraftCarrier
                 return;
             }
             Pen pen = new(Color.Black);
-            Brush brOrange = new SolidBrush(Color.Orange);
+
-            Brush brPurple = new SolidBrush(Color.RebeccaPurple);
+            //границы военного корабля
+            PointF point1 = new PointF(_startPosX, _startPosY);
+            PointF point2 = new PointF(_startPosX + 74, _startPosY);
+            PointF point3 = new PointF(_startPosX + 94, _startPosY + 20);
+            PointF point4 = new PointF(_startPosX + 74, _startPosY + 40);
+            PointF point5 = new PointF(_startPosX, _startPosY + 40);
+
+            PointF[] curvePoints =
+            {
+                point1, point2, point3, point4, point5
+            };
+            g.DrawPolygon(pen, curvePoints);
 
             //главная палуба
             Brush br = new SolidBrush(Warship?.BodyColor ?? Color.White);
-            PointF pointWarship1 = new PointF(_startPosX + 4, _startPosY);
+            g.FillPolygon(br, curvePoints);
-            PointF pointWarship2 = new PointF(_startPosX + 94, _startPosY);
-            PointF pointWarship3 = new PointF(_startPosX + 114, _startPosY + 20);
-            PointF pointWarship4 = new PointF(_startPosX + 94, _startPosY + 40);
-            PointF pointWarship5 = new PointF(_startPosX + 4, _startPosY + 40);
 
-            PointF[] PointsWarship =
+            //мачта
-            {
+            Brush brWhite = new SolidBrush(Color.White);
-                pointWarship1, pointWarship2, pointWarship3, pointWarship4, pointWarship5
+            g.FillEllipse(brWhite, _startPosX + 59, _startPosY + 13, 15, 15);
-            };
-            g.FillPolygon(br, PointsWarship);
-            g.DrawPolygon(pen, PointsWarship);
-
-            //мачта           
-            g.FillEllipse(brOrange, _startPosX + 79, _startPosY + 13, 15, 15);
 
             //границы мачты
-            g.DrawEllipse(pen, _startPosX + 79, _startPosY + 13, 15, 15);
+            g.DrawEllipse(pen, _startPosX + 59, _startPosY + 13, 15, 15);
 
-            //палуба         
+            //палуба
-            g.FillRectangle(brPurple, _startPosX + 64, _startPosY + 10, 10, 20);
+            g.FillRectangle(brWhite, _startPosX + 44, _startPosY + 10, 10, 20);
-            g.FillRectangle(brPurple, _startPosX + 44, _startPosY + 15, 20, 10);
+            g.FillRectangle(brWhite, _startPosX + 24, _startPosY + 15, 20, 10);
 
             //границы палуба
-            g.DrawRectangle(pen, _startPosX + 64, _startPosY + 10, 10, 20);
+            g.DrawRectangle(pen, _startPosX + 44, _startPosY + 10, 10, 20);
-            g.DrawRectangle(pen, _startPosX + 44, _startPosY + 15, 20, 10);
+            g.DrawRectangle(pen, _startPosX + 24, _startPosY + 15, 20, 10);
 
             //двигатели
             Brush brBlack = new SolidBrush(Color.Black);
@@ -199,13 +185,6 @@ namespace AircraftCarrier
                 _startPosY = _pictureHeight.Value - _warshipHeight;
             }
         }
-        /// <summary>
+
-        /// Получение текущей позиции объекта
-        /// </summary>
-        /// <returns></returns>
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return (_startPosX, _startPosY, _startPosX + _warshipWidth, _startPosY + _warshipHeight);
-        }
     }
 }

AircraftCarrier/AircraftCarrier/EntityAircraftCarrier.cs

@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AircraftCarrier
-{
-    internal class EntityAircraftCarrier : EntityWarship
-    {
-        /// <summary>
-        /// Дополнительный цвет
-        /// </summary>
-        public Color DopColor { get; private set; }
-        /// <summary>
-        /// Признак наличия боковой площадки
-        /// </summary>
-        public bool BodyKit { get; private set; }
-        /// <summary>
-        /// Признак наличия рубки
-        /// </summary>
-        public bool Сabin { get; private set; }
-        /// <summary>
-        /// Признак наличия усиленного двигателя
-        /// </summary>
-        public bool SuperEngine { get; private set; }
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес военного корабля</param>
-        /// <param name="bodyColor">Цвет основной палубы</param>
-        /// <param name="dopColor">Дополнительный цвет</param>
-        /// <param name="bodyKit">Признак наличия боковой площадки</param>
-        /// <param name="сabin">Признак наличия рубки</param>
-        /// <param name="superEngine">Признак наличия усиленного двигателя</param>
-        public EntityAircraftCarrier(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool сabin, bool superEngine) :
-            base(speed, weight, bodyColor)
-        {
-            DopColor = dopColor;
-            BodyKit = bodyKit;
-            Сabin = сabin;
-            SuperEngine = superEngine;
-        }
-    }
-}

AircraftCarrier/AircraftCarrier/EntityWarship.cs

@@ -9,7 +9,7 @@ namespace AircraftCarrier
     /// <summary>
     /// Класс - сущность "Военный корабль"
     /// </summary>
-    public class EntityWarship
+    internal class EntityWarship
     {
         /// <summary>
         /// Скорость
@@ -33,7 +33,7 @@ namespace AircraftCarrier
         /// <param name="speed"></param>
         /// <param name="weight"></param>
         /// <param name="bodyColor"></param>
-        public EntityWarship(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight, Color bodyColor)
         {
             Random rnd = new();
             Speed = speed <= 0 ? rnd.Next(50, 150) : speed;

AircraftCarrier/AircraftCarrier/FormMapWithSetWarships.Designer.cs

@@ -1,221 +0,0 @@
-namespace AircraftCarrier
-{
-    partial class FormMapWithSetWarships
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.groupBoxTools = new System.Windows.Forms.GroupBox();
-            this.buttonShowOnMap = new System.Windows.Forms.Button();
-            this.buttonShowStorage = new System.Windows.Forms.Button();
-            this.buttonRemoveWarship = new System.Windows.Forms.Button();
-            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
-            this.buttonAddWarship = new System.Windows.Forms.Button();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            this.pictureBox = new System.Windows.Forms.PictureBox();
-            this.groupBoxTools.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // groupBoxTools
-            // 
-            this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
-            this.groupBoxTools.Controls.Add(this.buttonShowStorage);
-            this.groupBoxTools.Controls.Add(this.buttonRemoveWarship);
-            this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
-            this.groupBoxTools.Controls.Add(this.buttonAddWarship);
-            this.groupBoxTools.Controls.Add(this.buttonRight);
-            this.groupBoxTools.Controls.Add(this.buttonLeft);
-            this.groupBoxTools.Controls.Add(this.buttonUp);
-            this.groupBoxTools.Controls.Add(this.buttonDown);
-            this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
-            this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(787, 0);
-            this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Size = new System.Drawing.Size(200, 593);
-            this.groupBoxTools.TabIndex = 0;
-            this.groupBoxTools.TabStop = false;
-            this.groupBoxTools.Text = "Tools";
-            // 
-            // buttonShowOnMap
-            // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(13, 431);
-            this.buttonShowOnMap.Name = "buttonShowOnMap";
-            this.buttonShowOnMap.Size = new System.Drawing.Size(175, 35);
-            this.buttonShowOnMap.TabIndex = 18;
-            this.buttonShowOnMap.Text = "Show map";
-            this.buttonShowOnMap.UseVisualStyleBackColor = true;
-            this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
-            // 
-            // buttonShowStorage
-            // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(13, 323);
-            this.buttonShowStorage.Name = "buttonShowStorage";
-            this.buttonShowStorage.Size = new System.Drawing.Size(175, 35);
-            this.buttonShowStorage.TabIndex = 17;
-            this.buttonShowStorage.Text = "Show storage";
-            this.buttonShowStorage.UseVisualStyleBackColor = true;
-            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
-            // 
-            // buttonRemoveWarship
-            // 
-            this.buttonRemoveWarship.Location = new System.Drawing.Point(13, 208);
-            this.buttonRemoveWarship.Name = "buttonRemoveWarship";
-            this.buttonRemoveWarship.Size = new System.Drawing.Size(175, 35);
-            this.buttonRemoveWarship.TabIndex = 16;
-            this.buttonRemoveWarship.Text = "Remove warship";
-            this.buttonRemoveWarship.UseVisualStyleBackColor = true;
-            this.buttonRemoveWarship.Click += new System.EventHandler(this.ButtonRemoveWarship_Click);
-            // 
-            // maskedTextBoxPosition
-            // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(13, 177);
-            this.maskedTextBoxPosition.Mask = "00";
-            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            this.maskedTextBoxPosition.Size = new System.Drawing.Size(175, 23);
-            this.maskedTextBoxPosition.TabIndex = 15;
-            this.maskedTextBoxPosition.ValidatingType = typeof(int);
-            // 
-            // buttonAddWarship
-            // 
-            this.buttonAddWarship.Location = new System.Drawing.Point(13, 114);
-            this.buttonAddWarship.Name = "buttonAddWarship";
-            this.buttonAddWarship.Size = new System.Drawing.Size(175, 35);
-            this.buttonAddWarship.TabIndex = 14;
-            this.buttonAddWarship.Text = "Add warship";
-            this.buttonAddWarship.UseVisualStyleBackColor = true;
-            this.buttonAddWarship.Click += new System.EventHandler(this.ButtonAddWarship_Click);
-            // 
-            // buttonRight
-            // 
-            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonRight.BackgroundImage = global::AircraftCarrier.Properties.Resources.ArrowRight;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(121, 553);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 30);
-            this.buttonRight.TabIndex = 13;
-            this.buttonRight.Text = " ";
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonLeft
-            // 
-            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonLeft.BackgroundImage = global::AircraftCarrier.Properties.Resources.ArrowLeft;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(49, 553);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
-            this.buttonLeft.TabIndex = 12;
-            this.buttonLeft.Text = " ";
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonUp
-            // 
-            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonUp.BackgroundImage = global::AircraftCarrier.Properties.Resources.ArrowUp;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(85, 517);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 30);
-            this.buttonUp.TabIndex = 11;
-            this.buttonUp.Text = " ";
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonDown
-            // 
-            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonDown.BackgroundImage = global::AircraftCarrier.Properties.Resources.ArrowDown;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(85, 553);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 30);
-            this.buttonDown.TabIndex = 10;
-            this.buttonDown.Text = " ";
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Преграды-линии"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(13, 22);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 23);
-            this.comboBoxSelectorMap.TabIndex = 9;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // pictureBox
-            // 
-            this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(787, 593);
-            this.pictureBox.TabIndex = 1;
-            this.pictureBox.TabStop = false;
-            // 
-            // FormMapWithSetWarships
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(987, 593);
-            this.Controls.Add(this.pictureBox);
-            this.Controls.Add(this.groupBoxTools);
-            this.Name = "FormMapWithSetWarships";
-            this.Text = "FormMapWithSetWarships";
-            this.groupBoxTools.ResumeLayout(false);
-            this.groupBoxTools.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private GroupBox groupBoxTools;
-        private PictureBox pictureBox;
-        private ComboBox comboBoxSelectorMap;
-        private Button buttonRight;
-        private Button buttonLeft;
-        private Button buttonUp;
-        private Button buttonDown;
-        private Button buttonShowOnMap;
-        private Button buttonShowStorage;
-        private Button buttonRemoveWarship;
-        private MaskedTextBox maskedTextBoxPosition;
-        private Button buttonAddWarship;
-    }
-}

AircraftCarrier/AircraftCarrier/FormMapWithSetWarships.cs

@@ -1,159 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using static System.Windows.Forms.DataFormats;
-
-namespace AircraftCarrier
-{
-    public partial class FormMapWithSetWarships : Form
-    {
-        /// <summary>
-        /// Объект от класса карты с набором объектов
-        /// </summary>
-        private MapWithSetWarshipsGeneric<DrawingObjectWarship, AbstractMap> _mapWarshipsCollectionGeneric;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        public FormMapWithSetWarships()
-        {
-            InitializeComponent();
-        }
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            AbstractMap map = null;
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Простая карта":
-                    map = new SimpleMap();
-                    break;
-                case "Преграды-линии":
-                    map = new LineMap();
-                    break;
-            }
-            if (map != null)
-            {
-                _mapWarshipsCollectionGeneric = new MapWithSetWarshipsGeneric<DrawingObjectWarship, AbstractMap>(
-                    pictureBox.Width, pictureBox.Height, map);
-            }
-            else
-            {
-                _mapWarshipsCollectionGeneric = null;
-            }
-        }
-        /// <summary>
-        /// Добавление объекта
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonAddWarship_Click(object sender, EventArgs e)
-        {
-            if (_mapWarshipsCollectionGeneric == null)
-            {
-                return;
-            }
-            FormWarship form = new();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                DrawingObjectWarship warship = new(form.SelectedWarship);
-                if (_mapWarshipsCollectionGeneric + warship >= 0)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapWarshipsCollectionGeneric.ShowSet();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            }
-        }
-        /// <summary>
-        /// Удаление объекта
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonRemoveWarship_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
-            {
-                return;
-            }
-            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapWarshipsCollectionGeneric - pos != null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapWarshipsCollectionGeneric.ShowSet();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-        }
-        /// <summary>
-        /// Вывод набора
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonShowStorage_Click(object sender, EventArgs e)
-        {
-            if (_mapWarshipsCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox.Image = _mapWarshipsCollectionGeneric.ShowSet();
-        }
-        /// <summary>
-        /// Вывод карты
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonShowOnMap_Click(object sender, EventArgs e)
-        {
-            if(_mapWarshipsCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox.Image = _mapWarshipsCollectionGeneric.ShowOnMap();
-        }
-        /// <summary>
-        /// Перемещение
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            if (_mapWarshipsCollectionGeneric == null)
-            {
-                return;
-            }
-            //получаем имя кнопки
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            Direction dir = Direction.None;
-            switch (name)
-            {
-                case "buttonUp":
-                    dir = Direction.Up;
-                    break;
-                case "buttonDown":
-                    dir = Direction.Down;
-                    break;
-                case "buttonLeft":
-                    dir = Direction.Left;
-                    break;
-                case "buttonRight":
-                    dir = Direction.Right;
-                    break;
-            }
-            pictureBox.Image = _mapWarshipsCollectionGeneric.MoveObject(dir);
-        }
-    }
-}

AircraftCarrier/AircraftCarrier/FormMapWithSetWarships.resx

@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

AircraftCarrier/AircraftCarrier/FormWarship.Designer.cs

@@ -38,8 +38,6 @@
             this.buttonUp = new System.Windows.Forms.Button();
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonCreateModif = new System.Windows.Forms.Button();
-            this.buttonSelectWarship = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWarship)).BeginInit();
             this.statusStrip.SuspendLayout();
             this.SuspendLayout();
@@ -49,7 +47,7 @@
             this.pictureBoxWarship.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureBoxWarship.Location = new System.Drawing.Point(0, 0);
             this.pictureBoxWarship.Name = "pictureBoxWarship";
-            this.pictureBoxWarship.Size = new System.Drawing.Size(768, 426);
+            this.pictureBoxWarship.Size = new System.Drawing.Size(510, 426);
             this.pictureBoxWarship.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
             this.pictureBoxWarship.TabIndex = 0;
             this.pictureBoxWarship.TabStop = false;
@@ -63,7 +61,7 @@
             this.toolStripStatusLabelBodyColor});
             this.statusStrip.Location = new System.Drawing.Point(0, 426);
             this.statusStrip.Name = "statusStrip";
-            this.statusStrip.Size = new System.Drawing.Size(768, 22);
+            this.statusStrip.Size = new System.Drawing.Size(510, 22);
             this.statusStrip.TabIndex = 1;
             // 
             // toolStripStatusLabelSpeed
@@ -100,7 +98,7 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::AircraftCarrier.Properties.Resources.ArrowDown;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(686, 386);
+            this.buttonDown.Location = new System.Drawing.Point(428, 386);
             this.buttonDown.Name = "buttonDown";
             this.buttonDown.Size = new System.Drawing.Size(30, 30);
             this.buttonDown.TabIndex = 3;
@@ -113,7 +111,7 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::AircraftCarrier.Properties.Resources.ArrowUp;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(686, 350);
+            this.buttonUp.Location = new System.Drawing.Point(428, 350);
             this.buttonUp.Name = "buttonUp";
             this.buttonUp.Size = new System.Drawing.Size(30, 30);
             this.buttonUp.TabIndex = 4;
@@ -126,7 +124,7 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::AircraftCarrier.Properties.Resources.ArrowLeft;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(650, 386);
+            this.buttonLeft.Location = new System.Drawing.Point(392, 386);
             this.buttonLeft.Name = "buttonLeft";
             this.buttonLeft.Size = new System.Drawing.Size(30, 30);
             this.buttonLeft.TabIndex = 5;
@@ -139,7 +137,7 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::AircraftCarrier.Properties.Resources.ArrowRight;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(722, 386);
+            this.buttonRight.Location = new System.Drawing.Point(464, 386);
             this.buttonRight.Name = "buttonRight";
             this.buttonRight.Size = new System.Drawing.Size(30, 30);
             this.buttonRight.TabIndex = 6;
@@ -147,33 +145,11 @@
             this.buttonRight.UseVisualStyleBackColor = true;
             this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
-            // buttonCreateModif
-            // 
-            this.buttonCreateModif.Location = new System.Drawing.Point(93, 393);
-            this.buttonCreateModif.Name = "buttonCreateModif";
-            this.buttonCreateModif.Size = new System.Drawing.Size(92, 23);
-            this.buttonCreateModif.TabIndex = 7;
-            this.buttonCreateModif.Text = "Modification";
-            this.buttonCreateModif.UseVisualStyleBackColor = true;
-            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
-            // 
-            // buttonSelectWarship
-            // 
-            this.buttonSelectWarship.Location = new System.Drawing.Point(530, 393);
-            this.buttonSelectWarship.Name = "buttonSelectWarship";
-            this.buttonSelectWarship.Size = new System.Drawing.Size(75, 23);
-            this.buttonSelectWarship.TabIndex = 8;
-            this.buttonSelectWarship.Text = "Select";
-            this.buttonSelectWarship.UseVisualStyleBackColor = true;
-            this.buttonSelectWarship.Click += new System.EventHandler(this.ButtonSelectWarship_Click);
-            // 
             // FormWarship
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(768, 448);
+            this.ClientSize = new System.Drawing.Size(510, 448);
-            this.Controls.Add(this.buttonSelectWarship);
-            this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonLeft);
             this.Controls.Add(this.buttonUp);
@@ -203,7 +179,5 @@
         private Button buttonUp;
         private Button buttonLeft;
         private Button buttonRight;
-        private Button buttonCreateModif;
-        private Button buttonSelectWarship;
     }
 }

AircraftCarrier/AircraftCarrier/FormWarship.cs

@@ -3,10 +3,6 @@ namespace AircraftCarrier
     public partial class FormWarship : Form
     {
         private DrawingWarship _warship;
-        /// <summary>
-        /// Âûáðàííûé îáúåêò
-        /// </summary>
-        public DrawingWarship SelectedWarship { get; private set; } 
         public FormWarship()
         {
             InitializeComponent();
@@ -22,39 +18,22 @@ namespace AircraftCarrier
             pictureBoxWarship.Image = bmp;
         }
         /// <summary>
-        /// Ìåòîä óñòàíîâêè äàííûõ
-        /// </summary>
-        private void SetData()
-        {
-            Random rnd = new();
-            _warship.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxWarship.Width, pictureBoxWarship.Height);
-            toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_warship.Warship.Speed}";
-            toolStripStatusLabelWeight.Text = $"Âåñ: {_warship.Warship.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Öâåò: {_warship.Warship.BodyColor.Name}";
-        }
-        /// <summary>
         /// Îáðàáîòêà íàæàòèÿ êíîïêè "Create"
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void ButtonCreate_Click(object sender, EventArgs e)
-        {
+        {          
             Random rnd = new();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            _warship = new DrawingWarship();
-            ColorDialog dialog = new();
+            _warship.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            if (dialog.ShowDialog() == DialogResult.OK)
+            _warship.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxWarship.Width, pictureBoxWarship.Height);
-            {
+            toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_warship.Warship.Speed}";
-                color = dialog.Color;
+            toolStripStatusLabelWeight.Text = $"Âåñ: {_warship.Warship.Weight}";
-            }
+            toolStripStatusLabelBodyColor.Text = $"Öâåò: {_warship.Warship.BodyColor.Name}";
-            _warship = new DrawingWarship(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
-            SetData();
             Draw();
         }
-        /// <summary>
+       
-        /// Îáðàáîòêà íàæàòèÿ ñòðåëî÷åê
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
         private void ButtonMove_Click(object sender, EventArgs e)
         {
             string name = ((Button)sender)?.Name ?? string.Empty;
@@ -85,37 +64,5 @@ namespace AircraftCarrier
             _warship?.ChangeBorders(pictureBoxWarship.Width,pictureBoxWarship.Height);
             Draw();
         }
-        /// <summary>
-        /// Îáðàáîòêà íàæàòèÿ êíîïêè "Modification"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreateModif_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-            ColorDialog dialogDop = new();
-            if (dialogDop.ShowDialog() == DialogResult.OK)
-            {
-                dopColor = dialogDop.Color;
-            }
-            _warship = new DrawingAircraftCarrier(rnd.Next(100, 300), rnd.Next(1000, 2000), color, dopColor,
-                Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
-            SetData();
-            Draw();
-
-        }
-
-        private void ButtonSelectWarship_Click(object sender, EventArgs e)
-        {
-            SelectedWarship = _warship;
-            DialogResult = DialogResult.OK;
-        }
     }
 }

AircraftCarrier/AircraftCarrier/IDrawingObject.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AircraftCarrier
-{
-    /// <summary>
-    /// Интерфейс для работы с объектом, прорисовываемым на форме
-    /// </summary>
-    internal interface IDrawingObject
-    {
-        /// <summary>
-		/// Шаг перемещения объекта
-		/// </summary>
-		public float Step { get; }
-        /// <summary>
-        /// Установка позиции объекта
-        /// </summary>
-        /// <param name="x">Координата X</param>
-        /// <param name="y">Координата Y</param>
-        /// <param name="width">Ширина полотна</param>
-        /// <param name="height">Высота полотна</param>
-        void SetObject(int x, int y, int width, int height);
-        /// <summary>
-        /// Изменение направления пермещения объекта
-        /// </summary>
-        /// <param name="direction">Направление</param>
-        /// <returns></returns>
-        void MoveObject(Direction direction);
-        /// <summary>
-        /// Отрисовка объекта
-        /// </summary>
-        /// <param name="g"></param>
-        void DrawningObject(Graphics g);
-        /// <summary>
-        /// Получение текущей позиции объекта
-        /// </summary>
-        /// <returns></returns>
-        (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
-    }
-}

AircraftCarrier/AircraftCarrier/LineMap.cs

@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace AircraftCarrier
-{
-    internal class LineMap : AbstractMap
-    {
-        /// <summary>
-        /// Цвет участка закрытого
-        /// </summary>
-        private readonly Brush barrierColor = new SolidBrush(Color.Brown);
-        /// <summary>
-        /// Цвет участка открытого
-        /// </summary>
-        private readonly Brush waterColor = new SolidBrush(Color.Blue);
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y);
-        }
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(waterColor, i * _size_x, j * _size_y, _size_x, _size_y);
-        }
-        protected override void GenerateMap()
-        {
-            _map = new int[100, 100];
-            _size_x = (float)_width / _map.GetLength(0);
-            _size_y = (float)_height / _map.GetLength(1);
-            int counter = 0;
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            }
-            bool flag = true;
-            while (counter < 20)
-            {
-                int lineX = _random.Next(11, 89);
-                int lineY = _random.Next(11, 89);
-
-                if (flag)
-                {
-                    for (int i = lineY; i <= lineY + 10; i++)
-                        _map[lineX, i] = _barrier;
-                    flag = false;
-                }
-                else
-                {
-                    for (int i = lineX; i <= lineX + 10; i++)
-                        _map[i, lineY] = _barrier;
-                    flag = true;
-                }
-                counter++;
-            }
-        }
-    }
-}

AircraftCarrier/AircraftCarrier/MapWithSetWarshipsGeneric.cs

@@ -1,179 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AircraftCarrier
-{
-    /// <summary>
-    /// Карта с набром объектов под нее
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <typeparam name="U"></typeparam>
-    internal class MapWithSetWarshipsGeneric <T, U>
-        where T : class, IDrawingObject
-        where U : AbstractMap
-    {
-        /// <summary>
-        /// Ширина окна отрисовки
-        /// </summary>
-        private readonly int _pictureWidth;
-        /// <summary>
-        /// Высота окна отрисовки
-        /// </summary>
-        private readonly int _pictureHeight;
-        /// <summary>
-        /// Размер занимаемого объектом места (ширина)
-        /// </summary>
-        private readonly int _placeSizeWidth = 120;
-        /// <summary>
-        /// Размер занимаемого объектом места (высота)
-        /// </summary>
-        private readonly int _placeSizeHeight = 50;
-        /// <summary>
-        /// Набор объектов
-        /// </summary>
-        private readonly SetWarshipsGeneric<T> _setWarships;
-        /// <summary>
-        /// Карта
-        /// </summary>
-        private readonly U _map;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="picWidth"></param>
-        /// <param name="picHeight"></param>
-        /// <param name="map"></param>
-        public MapWithSetWarshipsGeneric(int picWidth, int picHeight, U map)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _setWarships = new SetWarshipsGeneric<T>(width * height);
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-            _map = map;
-        }
-        /// <summary>
-        /// Перегрузка оператора сложения
-        /// </summary>
-        /// <param name="map"></param>
-        /// <param name="warship"></param>
-        /// <returns></returns>
-        public static int operator +(MapWithSetWarshipsGeneric<T, U> map, T warship)
-        {
-            return map._setWarships.Insert(warship);
-        }
-        /// <summary>
-        /// Перегрузка оператора вычитания
-        /// </summary>
-        /// <param name="map"></param>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public static T operator -(MapWithSetWarshipsGeneric<T, U> map, int position)
-        {
-            return map._setWarships.Remove(position);
-        }
-        /// <summary>
-        /// Вывод всего набора объектов
-        /// </summary>
-        /// <returns></returns>
-        public Bitmap ShowSet()
-        {
-            Bitmap bmp = new(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawWarships(gr);
-            return bmp;
-        }
-        /// <summary>
-        /// Просмотр объекта на карте
-        /// </summary>
-        /// <returns></returns>
-        public Bitmap ShowOnMap()
-        {
-            Shaking();
-            for (int i = 0; i < _setWarships.Count; i++)
-            {
-                var warship = _setWarships.Get(i);
-                if (warship != null)
-                {
-                    return _map.CreateMap(_pictureWidth, _pictureHeight, warship);
-                }
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-        /// <summary>
-        /// Перемещение объекта по крате
-        /// </summary>
-        /// <param name="direction"></param>
-        /// <returns></returns>
-        public Bitmap MoveObject(Direction direction)
-        {
-            if (_map != null)
-            {
-                return _map.MoveObject(direction);
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-        /// <summary>
-        /// "Взбалтываем" набор, чтобы все элементы оказались в начале
-        /// </summary>
-        private void Shaking()
-        {
-            int j = _setWarships.Count - 1;
-            for (int i = 0; i < _setWarships.Count; i++)
-            {
-                if (_setWarships.Get(i) == null)
-                {
-                    for (; j > i; j--)
-                    {
-                        var car = _setWarships.Get(j);
-                        if (car != null)
-                        {
-                            _setWarships.Insert(car, i);
-                            _setWarships.Remove(j);
-                            break;
-                        }
-                    }
-                    if (j <= i)
-                    {
-                        return;
-                    }
-                }
-            }
-        }
-        /// <summary>
-        /// Метод отрисовки фона
-        /// </summary>
-        /// <param name="g"></param>
-        private void DrawBackground(Graphics g)
-        {
-            Pen pen = new(Color.Black, 2);
-            g.FillRectangle(Brushes.Aqua, 0, 0, _pictureWidth, _pictureHeight);
-            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
-            {
-                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
-                {//линия рамзетки места
-                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
-                }
-                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
-            }
-        }
-        /// <summary>
-        /// Метод прорисовки объектов
-        /// </summary>
-        /// <param name="g"></param>
-        private void DrawWarships(Graphics g)
-        {
-            int countInLine = _pictureWidth / _placeSizeWidth;
-            int maxLeft = (countInLine - 1) * _placeSizeWidth;
-            //for (int i = 0; i < _setWarships.Count; i++)
-            for (int i = 0; i < _setWarships.Count; i++)
-            {
-                _setWarships.Get(i)?.SetObject(maxLeft - i % countInLine * _placeSizeWidth, i / countInLine * _placeSizeHeight + 3, _pictureWidth, _pictureHeight);
-                _setWarships.Get(i)?.DrawningObject(g);
-            }
-        }
-    }
-}

AircraftCarrier/AircraftCarrier/Program.cs

@@ -11,7 +11,7 @@ namespace AircraftCarrier
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormMapWithSetWarships());
+            Application.Run(new FormWarship());
         }
     }
 }

AircraftCarrier/AircraftCarrier/SetWarshipsGeneric.cs

@@ -1,102 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AircraftCarrier
-{
-    /// <summary>
-    /// Параметризованный набор объектов
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal class SetWarshipsGeneric<T>
-        where T : class
-    {
-        /// <summary>
-		/// Массив объектов, которые храним
-		/// </summary>
-		private readonly T[] _places;
-        /// <summary>
-        /// Количество объектов в массиве
-        /// </summary>
-        public int Count => _places.Length;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="count"></param>
-        public SetWarshipsGeneric(int count)
-        {
-            _places = new T[count];
-        }
-        /// <summary>
-        /// Добавление объекта в набор
-        /// </summary>
-        /// <param name="warship">Добавляемый военный корабль</param>
-        /// <returns></returns>
-        public int Insert(T warship)
-        {
-            return Insert(warship, 0);
-        }
-        /// <summary>
-        /// Добавление объекта в набор на конкретную позицию
-        /// </summary>
-        /// <param name="warship">Добавляемый военный корабль</param>
-        /// <param name="position">Позиция</param>
-        /// <returns></returns>
-        public int Insert(T warship, int position)
-        {
-            int EmptyElement = -1;
-            if (position >= Count || position < 0) return -1;
-
-            if (_places[position] == null)
-            {
-                _places[position] = warship;
-                return 1;
-            }
-
-            else if (_places[position] != null)
-            {
-                for (int i = position + 1; i < Count; i++)
-                    if (_places[i] == null)
-                    {
-                        EmptyElement = i;
-                        break;
-                    }
-
-                if (EmptyElement == -1)
-                    return -1;
-
-                for (int i = EmptyElement; i > position; i--)
-                    _places[i] = _places[i - 1];
-            }
-
-            _places[position] = warship;
-            return 1;
-        }
-        /// <summary>
-        /// Удаление объекта из набора с конкретной позиции
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public T Remove(int position)
-        {
-            if (position >= Count || position < 0 || _places[position] == null)
-                return null;
-
-            T deleted = _places[position];
-            _places[position] = null;
-            return deleted;
-        }
-        /// <summary>
-        /// Получение объекта из набора по позиции
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public T Get(int position)
-        {
-            if (position >= _places.Length) return null;
-            return _places[position];
-        }
-    }
-}

AircraftCarrier/AircraftCarrier/SimpleMap.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AircraftCarrier
-{
-    /// <summary>
-    /// Простая реализация абсрактного класса AbstractMap
-    /// </summary>
-    internal class SimpleMap : AbstractMap
-    {
-        /// <summary>
-        /// Цвет участка закрытого
-        /// </summary>
-        private readonly Brush barrierColor = new SolidBrush(Color.Brown);
-        /// <summary>
-        /// Цвет участка открытого
-        /// </summary>
-        private readonly Brush waterColor = new SolidBrush(Color.Blue);
-
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-        }
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(waterColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-        }
-        protected override void GenerateMap()
-        {
-            _map = new int[100, 100];
-            _size_x = (float)_width / _map.GetLength(0);
-            _size_y = (float)_height / _map.GetLength(1);
-            int counter = 0;
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            }
-            while (counter < 50)
-            {
-                int x = _random.Next(0, 100);
-                int y = _random.Next(0, 100);
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-                    counter++;
-                }
-            }
-        }
-    }
-}