ProjectCatamaran/ProjectCatamaran/DirectionType.cs

@@ -4,12 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ProjectCatamaran.MovementStrategy; 
+namespace ProjectCatamaran;
 
-/// <summary>
+public enum DirectionType
-/// Направление перемещения
-/// </summary>
-public enum MovementDirection
 {
     /// <summary>
     /// Вверх
@@ -30,4 +27,5 @@ public enum MovementDirection
     /// Вправо
     /// </summary>
     Right = 4
+
 }

ProjectCatamaran/ProjectCatamaran/DrawningCatamaran.cs

@@ -0,0 +1,217 @@
+namespace ProjectCatamaran;
+
+/// <summary>
+/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+/// </summary>
+public class DrawningCatamaran
+{
+    /// <summary>
+    /// Класс-сущность
+    /// </summary>
+    public EntityCatamaran? EntityCatamaran { get; private set; }
+
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    private int? _pictureWidth;
+
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    private int? _pictureHeight;
+
+    /// <summary>
+    /// Левая координата прорисовки катамарана
+    /// </summary>
+    private int? _startPosX;
+
+    /// <summary>
+    /// Верхняя координата прорисовки катамарана
+    /// </summary>
+    private int? _startPosY;
+
+    /// <summary>
+    /// Ширина прорисовки катамарана
+    /// </summary>
+    private readonly int _drawningCatamaranWidth = 87;
+
+    /// <summary>
+    /// Высота прорисовки катамарана
+    /// </summary>
+    private readonly int _drawningCatamaranHeight = 81;
+
+    /// <summary>
+    /// Инициализация свойств
+    /// </summary>
+    /// <param name="speed"></param>
+    /// <param name="weight"></param>
+    /// <param name="bodyColor"></param>
+    /// <param name="additionalColor"></param>
+    /// <param name="sail"></param>
+    /// <param name="leftfloater"></param>
+    /// <param name="rightfloater"></param>
+    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool sail,
+        bool leftfloater, bool rightfloater)
+    {
+        EntityCatamaran = new EntityCatamaran();
+        EntityCatamaran.Init(speed, weight, bodyColor, additionalColor, sail, leftfloater, rightfloater);
+        _pictureWidth = null;
+        _pictureHeight = null;
+        _startPosX = null;
+        _startPosY = null;
+    }
+
+    /// <summary>
+    /// Установка границ поля
+    /// </summary>
+    /// <param name="width">Ширина поля</param>
+    /// <param name="height">Вершина поля</param>
+    /// <returns> - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
+    public bool SetPictureSize(int width, int height)
+    {
+        if (_drawningCatamaranHeight > height || _drawningCatamaranWidth > width)
+        {
+            return false;
+        }
+
+        _pictureWidth = width;
+        _pictureHeight = height;
+
+        if (_startPosX.HasValue && _startPosY.HasValue)
+        {
+            SetPosition(_startPosX.Value, _startPosY.Value);
+        }
+
+        return true;
+    }
+
+
+    /// <summary>
+    /// Установка позиции
+    /// </summary>
+    /// <param name="x">Координаты Х</param>
+    /// <param name="y">Координаты Y</param>
+    public void SetPosition(int x, int y)
+    {
+        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
+        {
+            return;
+        }
+
+        if (x < 0 || x + _drawningCatamaranWidth > _pictureWidth || y < 0 || y + _drawningCatamaranHeight > _pictureHeight)
+        {
+            _startPosX = _pictureWidth - _drawningCatamaranWidth;
+            _startPosY = _pictureHeight - _drawningCatamaranHeight;
+        }
+        else
+        {
+            _startPosX = x;
+            _startPosY = y;
+        }
+    }
+
+    /// <summary>
+    /// Изменение направления перемещения
+    /// </summary>
+    /// <param name="direction">Направление</param>
+    /// <returns>- перемещение выполнено, false - перемещение невозможно</returns>
+    public bool MoveTransport(DirectionType direction)
+    {
+        if (EntityCatamaran == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return false;
+        }
+        switch (direction)
+        {
+            //влево
+            case DirectionType.Left:
+                if (_startPosX.Value - EntityCatamaran.Step > 0)
+                {
+                    _startPosX -= (int)EntityCatamaran.Step;
+                }
+                return true;
+            //вверх
+            case DirectionType.Up:
+                if (_startPosY.Value - EntityCatamaran.Step > 0)
+                {
+                    _startPosY -= (int)EntityCatamaran.Step;
+                }
+                return true;
+            // вправо
+            case DirectionType.Right:
+                if (_startPosX.Value + EntityCatamaran.Step + _drawningCatamaranWidth < _pictureWidth)
+                {
+                    _startPosX += (int)EntityCatamaran.Step;
+                    return true;
+                }
+                return true;
+            //вниз
+            case DirectionType.Down:
+                if (_startPosY.Value + EntityCatamaran.Step + _drawningCatamaranHeight < _pictureHeight)
+                {
+                    _startPosY += (int)EntityCatamaran.Step;
+                }
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    /// <summary>
+    /// Прорисовка объекта
+    /// </summary>
+    /// <param name="g"></param>
+    public void DrawTransport(Graphics g)
+    {
+        if (EntityCatamaran == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+
+        Pen pen = new(Color.Black);
+        Brush bodyColorBrush = new SolidBrush(EntityCatamaran.BodyColor);
+        Brush additionalBrush = new SolidBrush(EntityCatamaran.AdditionalColor);
+
+        //тело катамарана
+        g.FillRectangle(bodyColorBrush, _startPosX.Value + 10, _startPosY.Value + 40, 57, 30);
+        g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 40, 57, 30);
+
+        g.FillEllipse(bodyColorBrush, _startPosX.Value + 20, _startPosY.Value + 48, 40, 13);
+        g.DrawEllipse(pen, _startPosX.Value + 20, _startPosY.Value + 48, 40, 13);
+
+        //нос катамарана
+        Point[] Nose = new Point[3];
+        Nose[0].X = _startPosX.Value + 67; Nose[0].Y = _startPosY.Value + 40;
+        Nose[1].X = _startPosX.Value + 88; Nose[1].Y = _startPosY.Value + 55;
+        Nose[2].X = _startPosX.Value + 67; Nose[2].Y = _startPosY.Value + 70;
+        g.FillPolygon(bodyColorBrush, Nose);
+        g.DrawPolygon(pen, Nose);
+
+        //поплавки
+        if (EntityCatamaran.Leftfloater)
+        {
+            g.FillEllipse(additionalBrush, _startPosX.Value + 10, _startPosY.Value + 27, 57, 13);
+            g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 27, 57, 13);
+        }
+
+        if (EntityCatamaran.Rightfloater)
+        {
+            g.FillEllipse(additionalBrush, _startPosX.Value + 10, _startPosY.Value + 70, 57, 13);
+            g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 70, 57, 13);
+        }
+
+        //флаг
+        if (EntityCatamaran.Sail)
+        {
+            g.DrawLine(pen, _startPosX.Value + 38, _startPosY.Value + 55, _startPosX.Value + 38, _startPosY.Value + 10);
+            Point[] Flag = new Point[3];
+            Flag[0].X = _startPosX.Value + 38; Flag[0].Y = _startPosY.Value + 10;
+            Flag[1].X = _startPosX.Value + 55; Flag[1].Y = _startPosY.Value + 45;
+            Flag[2].X = _startPosX.Value + 38; Flag[2].Y = _startPosY.Value + 45;
+            g.FillPolygon(additionalBrush, Flag);
+            g.DrawPolygon(pen, Flag);
+        }
+    }
+
+
+}

ProjectCatamaran/ProjectCatamaran/Drawnings/DirectionType.cs

@@ -1,30 +0,0 @@
-namespace ProjectCatamaran.Drawnings;
-
-public enum DirectionType
-{
-    /// <summary>
-    /// Неизвестное направление
-    /// </summary>
-    Unknow = -1,
-
-    /// <summary>
-    /// Вверх
-    /// </summary>
-    Up = 1,
-
-    /// <summary>
-    /// Вниз
-    /// </summary>
-    Down = 2,
-
-    /// <summary>
-    /// Влево
-    /// </summary>
-    Left = 3,
-
-    /// <summary>
-    /// Вправо
-    /// </summary>
-    Right = 4
-
-}

ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs

@@ -1,231 +0,0 @@
-using ProjectCatamaran.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectCatamaran.Drawnings;
-
-public class DrawningBoat
-{
-    /// <summary>
-    /// Класс-сущность
-    /// </summary>
-    public EntityBoat? EntityBoat { get; protected set; }
-
-    /// <summary>
-    /// Ширина окна
-    /// </summary>
-    private int? _pictureWidth;
-
-    /// <summary>
-    /// Высота окна
-    /// </summary>
-    private int? _pictureHeight;
-
-    /// <summary>
-    /// Левая координата прорисовки катамарана
-    /// </summary>
-    protected int? _startPosX;
-
-    /// <summary>
-    /// Верхняя координата прорисовки катамарана
-    /// </summary>
-    protected int? _startPosY;
-
-    /// <summary>
-    /// Ширина прорисовки катамарана
-    /// </summary>
-    private readonly int _drawningBoatWidth = 80;
-
-    /// <summary>
-    /// Высота прорисовки катамарана
-    /// </summary>
-    private readonly int _drawningBoatHeight = 80;
-
-    /// <summary>
-    /// Координата X объекта
-    /// </summary>
-    public int? GetPosX => _startPosX;
-    /// <summary>
-    /// Координата Y объекта
-    /// </summary>
-    public int? GetPosY => _startPosY;
-    /// <summary>
-    /// Ширина объекта
-    /// </summary>
-    public int GetWidth => _drawningBoatWidth;
-    /// <summary>
-    /// Высота объекта
-    /// </summary>
-    public int GetHeight => _drawningBoatHeight;
-
-    /// <summary>
-    /// Пустой конструктор
-    /// </summary>
-    private DrawningBoat()
-    {
-        _pictureWidth = null;
-        _pictureHeight = null;
-        _startPosX = null;
-        _startPosY = null;
-    }
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    /// <param name="speed"></param>
-    /// <param name="weight"></param>
-    /// <param name="bodyColor"></param
-    public DrawningBoat(int speed, double weight, Color bodyColor) : this()
-    {
-        EntityBoat = new EntityBoat(speed, weight, bodyColor);
-
-    }
-
-    /// <summary>
-    /// Конструктор для наследников
-    /// </summary>
-    /// <param name="drawningCatamaranWidth">Ширина прорисовки катамарана</param>
-    /// <param name="drawningCatamaranHeight">Высота прорисовки катамарана</param>
-    protected DrawningBoat(int drawningCatamaranWidth, int drawningCatamaranHeight) : this()
-    {
-        _drawningBoatWidth = drawningCatamaranWidth;
-        _pictureHeight = drawningCatamaranHeight;
-    }
-
-
-    /// <summary>
-    /// Установка границ поля
-    /// </summary>
-    /// <param name="width">Ширина поля</param>
-    /// <param name="height">Вершина поля</param>
-    /// <returns> - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
-    public bool SetPictureSize(int width, int height)
-    {
-        if (_drawningBoatHeight > height || _drawningBoatWidth > width)
-        {
-            return false;
-        }
-
-        _pictureWidth = width;
-        _pictureHeight = height;
-
-        if (_startPosX.HasValue && _startPosY.HasValue)
-        {
-            SetPosition(_startPosX.Value, _startPosY.Value);
-        }
-
-        return true;
-    }
-
-
-    /// <summary>
-    /// Установка позиции
-    /// </summary>
-    /// <param name="x">Координаты Х</param>
-    /// <param name="y">Координаты Y</param>
-    public void SetPosition(int x, int y)
-    {
-        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
-        {
-            return;
-        }
-
-        if (x < 0 || x + _drawningBoatWidth > _pictureWidth)
-        {
-            _startPosX = _pictureWidth - _drawningBoatWidth;
-        }
-        else
-        {
-            _startPosX = x;
-        }
-
-        if (y < 0 || y + _drawningBoatHeight > _pictureHeight)
-        {
-            _startPosY = _pictureHeight - _drawningBoatHeight;
-        }
-        else
-        {
-            _startPosY = y;
-        }
-    }
-
-    /// <summary>
-    /// Изменение направления перемещения
-    /// </summary>
-    /// <param name="direction">Направление</param>
-    /// <returns>- перемещение выполнено, false - перемещение невозможно</returns>
-    public bool MoveTransport(DirectionType direction)
-    {
-        if (EntityBoat == null || !_startPosX.HasValue || !_startPosY.HasValue)
-        {
-            return false;
-        }
-        switch (direction)
-        {
-            //влево
-            case DirectionType.Left:
-                if (_startPosX.Value - EntityBoat.Step > 0)
-                {
-                    _startPosX -= (int)EntityBoat.Step;
-                }
-                return true;
-            //вверх
-            case DirectionType.Up:
-                if (_startPosY.Value - EntityBoat.Step > 0)
-                {
-                    _startPosY -= (int)EntityBoat.Step;
-                }
-                return true;
-            // вправо
-            case DirectionType.Right:
-                if (_startPosX.Value + EntityBoat.Step + _drawningBoatWidth < _pictureWidth)
-                {
-                    _startPosX += (int)EntityBoat.Step;
-                    return true;
-                }
-                return true;
-            //вниз
-            case DirectionType.Down:
-                if (_startPosY.Value + EntityBoat.Step + _drawningBoatHeight < _pictureHeight)
-                {
-                    _startPosY += (int)EntityBoat.Step;
-                }
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    /// <summary>
-    /// Прорисовка объекта
-    /// </summary>
-    /// <param name="g"></param>
-    public virtual void DrawTransport(Graphics g)
-    {
-        if (EntityBoat == null || !_startPosX.HasValue || !_startPosY.HasValue)
-        {
-            return;
-        }
-
-        Pen pen = new(Color.Black);
-        Brush bodyColorBrush = new SolidBrush(EntityBoat.BodyColor);
-
-        //тело катамарана
-        g.FillRectangle(bodyColorBrush, _startPosX.Value, _startPosY.Value + 32, 57, 30);
-        g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 32, 57, 30);
-
-        g.FillEllipse(bodyColorBrush, _startPosX.Value + 9, _startPosY.Value + 40, 40, 13);
-        g.DrawEllipse(pen, _startPosX.Value + 9, _startPosY.Value + 40, 40, 13);
-
-        //нос катамарана
-        Point[] Nose = new Point[3];
-        Nose[0].X = _startPosX.Value + 57; Nose[0].Y = _startPosY.Value + 32;
-        Nose[1].X = _startPosX.Value + 80; Nose[1].Y = _startPosY.Value + 47;
-        Nose[2].X = _startPosX.Value + 57; Nose[2].Y = _startPosY.Value + 62;
-        g.FillPolygon(bodyColorBrush, Nose);
-        g.DrawPolygon(pen, Nose);
-
-    }
-}

ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningCatamaran.cs

@@ -1,65 +0,0 @@
-using ProjectCatamaran.Entities;
-
-namespace ProjectCatamaran.Drawnings;
-
-/// <summary>
-/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
-/// </summary>
-public class DrawningCatamaran : DrawningBoat
-{
-
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    /// <param name="speed"></param>
-    /// <param name="weight"></param>
-    /// <param name="bodyColor"></param>
-    /// <param name="additionalColor"></param>
-    /// <param name="sail"></param>
-    /// <param name="leftfloater"></param>
-    /// <param name="rightfloater"></param>
-    public DrawningCatamaran(int speed, double weight, Color bodyColor, Color additionalColor, bool sail, bool leftfloater, bool rightfloater) : base(80, 80)
-    {
-        EntityBoat = new EntityCatamaran(speed, weight, bodyColor, additionalColor, sail, leftfloater, rightfloater);
-
-    }
-
-
-    public override void DrawTransport(Graphics g)
-    {
-        if (EntityBoat == null || EntityBoat is not EntityCatamaran catamaran || !_startPosX.HasValue || !_startPosY.HasValue)
-        {
-            return;
-        }
-
-        Pen pen = new(Color.Black);
-        Brush additionalBrush = new SolidBrush(catamaran.AdditionalColor);
-        base.DrawTransport(g);
-        //поплавки
-        if (catamaran.Leftfloater)
-        {
-            g.FillEllipse(additionalBrush, _startPosX.Value, _startPosY.Value + 20, 57, 13);
-            g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value + 20, 57, 13);
-        }
-
-        if (catamaran.Rightfloater)
-        {
-            g.FillEllipse(additionalBrush, _startPosX.Value, _startPosY.Value + 62, 57, 13);
-            g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value + 62, 57, 13);
-        }
-
-        //флаг
-        if (catamaran.Sail)
-        {
-            g.DrawLine(pen, _startPosX.Value + 29, _startPosY.Value + 48, _startPosX.Value + 29, _startPosY.Value);
-            Point[] Flag = new Point[3];
-            Flag[0].X = _startPosX.Value + 29; Flag[0].Y = _startPosY.Value + 38;
-            Flag[1].X = _startPosX.Value + 48; Flag[1].Y = _startPosY.Value + 38;
-            Flag[2].X = _startPosX.Value + 29; Flag[2].Y = _startPosY.Value;
-            g.FillPolygon(additionalBrush, Flag);
-            g.DrawPolygon(pen, Flag);
-        }
-    }
-
-
-}

ProjectCatamaran/ProjectCatamaran/Entities/EntityCatamaran_1.cs

@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectCatamaran.Entities;
-
-/// <summary>
-/// Класс-сущности "Катамарана_1"
-/// </summary>
-public class EntityBoat
-{
-    /// <summary>
-    /// Скорость
-    /// </summary>
-    public int Speed { get; private set; }
-
-    /// <summary>
-    /// Вес
-    /// </summary>
-    public double Weight { get; private set; }
-
-    /// <summary>
-    /// Основной цвет
-    /// </summary>
-    public Color BodyColor { get; private set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public double Step => Speed * 100 / Weight;
-
-    /// <summary>
-    /// Конструктор сущности
-    /// </summary>
-    /// <param name="speed">Скорость</param>
-    /// <param name="weight">Вес</param>
-    /// <param name="bodyColor">Основной цвет</param>
-
-    public EntityBoat(int speed, double weight, Color bodyColor)
-    {
-        Speed = speed;
-        Weight = weight;
-        BodyColor = bodyColor;
-    }
-}

ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs

@@ -1,10 +1,24 @@
-namespace ProjectCatamaran.Entities;
+namespace ProjectCatamaran;
 
 /// <summary>
 /// Класс-сущность "Катамаран"
 /// </summary>
-public class EntityCatamaran : EntityBoat
+public class EntityCatamaran
 {
+    /// <summary>
+    /// Скорость
+    /// </summary>
+    public int Speed { get; private set; }
+
+    /// <summary>
+    /// Вес
+    /// </summary>
+    public double Weight { get; private set; }
+
+    /// <summary>
+    /// Основной цвет
+    /// </summary>
+    public Color BodyColor { get; private set; }
 
     /// <summary>
     /// Дополнительный цвет (для опциональных элементов) 
@@ -26,9 +40,14 @@ public class EntityCatamaran : EntityBoat
     /// </summary>
     public bool Sail { get; private set; }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    public double Step => Speed * 100 / Weight;
+
 
     /// <summary>
-    /// Инициализация полей объекта-класса катамарана
+    /// 
     /// </summary>
     /// <param name="speed">Скорость</param>
     /// <param name="weight">Вес</param>
@@ -37,8 +56,11 @@ public class EntityCatamaran : EntityBoat
     /// <param name="leftfloater">Признак наличия левого поплавка</param>
     /// <param name="rightfloater">Признак наличия правого поплавка</param>
     /// <param name="sail">Признак наличия паруса</param>
-    public EntityCatamaran(int speed, double weight, Color bodyColor, Color additionalColor, bool leftfloater, bool rightfloater, bool sail) : base(speed, weight, bodyColor)
+    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool leftfloater, bool rightfloater, bool sail)
     {
+        Speed = speed;
+        Weight = weight;
+        BodyColor = bodyColor;
         AdditionalColor = additionalColor;
         Leftfloater = leftfloater;
         Rightfloater = rightfloater;

ProjectCatamaran/ProjectCatamaran/FormCatamaran.Designer.cs

@@ -34,9 +34,6 @@
             buttonLeft = new Button();
             buttonDown = new Button();
             buttonRight = new Button();
-            buttonCreatBoat = new Button();
-            comboBoxStrategy = new ComboBox();
-            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxCatamaran).BeginInit();
             SuspendLayout();
             // 
@@ -48,15 +45,16 @@
             pictureBoxCatamaran.Size = new Size(800, 450);
             pictureBoxCatamaran.TabIndex = 0;
             pictureBoxCatamaran.TabStop = false;
+            pictureBoxCatamaran.Click += ButtonMove_Click;
             // 
             // buttonCreateCatamaran
             // 
             buttonCreateCatamaran.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
             buttonCreateCatamaran.Location = new Point(12, 409);
             buttonCreateCatamaran.Name = "buttonCreateCatamaran";
-            buttonCreateCatamaran.Size = new Size(203, 29);
+            buttonCreateCatamaran.Size = new Size(94, 29);
             buttonCreateCatamaran.TabIndex = 1;
-            buttonCreateCatamaran.Text = "Создать катамаран";
+            buttonCreateCatamaran.Text = "Создать";
             buttonCreateCatamaran.UseVisualStyleBackColor = true;
             buttonCreateCatamaran.Click += ButtonCreateCatamaran_Click;
             // 
@@ -110,45 +108,11 @@
             buttonRight.UseVisualStyleBackColor = false;
             buttonRight.Click += ButtonMove_Click;
             // 
-            // buttonCreatBoat
-            // 
-            buttonCreatBoat.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreatBoat.Location = new Point(233, 409);
-            buttonCreatBoat.Name = "buttonCreatBoat";
-            buttonCreatBoat.Size = new Size(203, 29);
-            buttonCreatBoat.TabIndex = 6;
-            buttonCreatBoat.Text = "Создать лодку";
-            buttonCreatBoat.UseVisualStyleBackColor = true;
-            buttonCreatBoat.Click += ButtonCreatBoat_Click;
-            // 
-            // comboBoxStrategy
-            // 
-            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
-            comboBoxStrategy.FormattingEnabled = true;
-            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
-            comboBoxStrategy.Location = new Point(653, 12);
-            comboBoxStrategy.Name = "comboBoxStrategy";
-            comboBoxStrategy.Size = new Size(135, 28);
-            comboBoxStrategy.TabIndex = 8;
-            // 
-            // buttonStrategyStep
-            // 
-            buttonStrategyStep.Location = new Point(694, 46);
-            buttonStrategyStep.Name = "buttonStrategyStep";
-            buttonStrategyStep.Size = new Size(94, 29);
-            buttonStrategyStep.TabIndex = 9;
-            buttonStrategyStep.Text = "Шаг";
-            buttonStrategyStep.UseVisualStyleBackColor = true;
-            buttonStrategyStep.Click += ButtonStrategyStep_Click;
-            // 
             // FormCatamaran
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(800, 450);
-            Controls.Add(buttonStrategyStep);
-            Controls.Add(comboBoxStrategy);
-            Controls.Add(buttonCreatBoat);
             Controls.Add(buttonRight);
             Controls.Add(buttonDown);
             Controls.Add(buttonLeft);
@@ -169,8 +133,5 @@
         private Button buttonLeft;
         private Button buttonDown;
         private Button buttonRight;
-        private Button buttonCreatBoat;
-        private ComboBox comboBoxStrategy;
-        private Button buttonStrategyStep;
     }
 }

ProjectCatamaran/ProjectCatamaran/FormCatamaran.cs

@@ -7,8 +7,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using ProjectCatamaran.Drawnings;
-using ProjectCatamaran.MovementStrategy;
 
 namespace ProjectCatamaran
 {
@@ -17,13 +15,7 @@ namespace ProjectCatamaran
         /// <summary>
         /// Поле-объект для прорисовки объекта
         /// </summary>
-        private DrawningBoat? _drawningBoat;
+        private DrawningCatamaran? _drawningCatamaran;
-
-        /// <summary>
-        /// Стратегия перемещения
-        /// </summary>
-        private AbstractStrategy? _strategy;
-
 
         /// <summary>
         /// Конструктор формы
@@ -31,68 +23,42 @@ namespace ProjectCatamaran
         public FormCatamaran()
         {
             InitializeComponent();
-            _strategy = null;
         }
 
+
+
         /// <summary>
-        /// Создание объекта класса-перемещения
+        /// Обработка нажатия кнопки "Создать"
         /// </summary>
-        /// <param name="type"></param>
+        /// <param name="sender"></param>
-        private void CreateObject(string type)
+        /// <param name="e"></param>
+        private void ButtonCreateCatamaran_Click(object sender, EventArgs e)
         {
             Random random = new();
-            switch (type)
+            _drawningCatamaran = new DrawningCatamaran();
-            {
+            _drawningCatamaran.Init(random.Next(100, 300), random.Next(1000, 3000),
-                case nameof(DrawningBoat):
+                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-                    _drawningBoat = new DrawningBoat(random.Next(100,
+                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-                    300), random.Next(1000, 3000),
+                Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-                    Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
+            _drawningCatamaran.SetPictureSize(pictureBoxCatamaran.Width, pictureBoxCatamaran.Height);
-                    break;
+            _drawningCatamaran.SetPosition(random.Next(10, 100), random.Next(10, 100));
-                case nameof(DrawningCatamaran):
-                    _drawningBoat = new DrawningCatamaran(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)),
-                 Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-                    break;
-                default:
-                    return;
-            }
-            _drawningBoat.SetPictureSize(pictureBoxCatamaran.Width, pictureBoxCatamaran.Height);
-            _drawningBoat.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            _strategy = null;
-            comboBoxStrategy.Enabled = true;
             Draw();
+
         }
 
-
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать катамаран"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreateCatamaran_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningCatamaran));
-
-
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать лодку"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreatBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBoat));
-
         /// <summary>
         /// Метод прорисовки катамарана
         /// </summary>
         private void Draw()
         {
-            if (_drawningBoat == null)
+            if (_drawningCatamaran == null)
             {
                 return;
             }
             Bitmap bmp = new(pictureBoxCatamaran.Width,
             pictureBoxCatamaran.Height);
             Graphics gr = Graphics.FromImage(bmp);
-            _drawningBoat.DrawTransport(gr);
+            _drawningCatamaran.DrawTransport(gr);
             pictureBoxCatamaran.Image = bmp;
         }
 
@@ -104,7 +70,7 @@ namespace ProjectCatamaran
         private void ButtonMove_Click(object sender, EventArgs e)
         {
 
-            if (_drawningBoat == null)
+            if (_drawningCatamaran == null)
             {
                 return;
             }
@@ -113,16 +79,16 @@ namespace ProjectCatamaran
             switch (name)
             {
                 case "buttonUp":
-                    result = _drawningBoat.MoveTransport(DirectionType.Up);
+                    result = _drawningCatamaran.MoveTransport(DirectionType.Up);
                     break;
                 case "buttonDown":
-                    result = _drawningBoat.MoveTransport(DirectionType.Down);
+                    result = _drawningCatamaran.MoveTransport(DirectionType.Down);
                     break;
                 case "buttonLeft":
-                    result = _drawningBoat.MoveTransport(DirectionType.Left);
+                    result = _drawningCatamaran.MoveTransport(DirectionType.Left);
                     break;
                 case "buttonRight":
-                    result = _drawningBoat.MoveTransport(DirectionType.Right);
+                    result = _drawningCatamaran.MoveTransport(DirectionType.Right);
                     break;
             }
             if (result)
@@ -131,48 +97,5 @@ namespace ProjectCatamaran
             }
         }
 
-        /// <summary>
-        /// обработка нажатия кнопки шаг
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonStrategyStep_Click(object sender, EventArgs e)
-        {
-            if (_drawningBoat == null)
-            {
-                return;
-            }
-
-            if (comboBoxStrategy.Enabled)
-            {
-                _strategy = comboBoxStrategy.SelectedIndex switch
-                {
-                    0 => new MoveToCenter(),
-                    1 => new MoveToBorder(),
-                    _ => null,
-                };
-
-                if (_strategy == null)
-                {
-                    return;
-                }
-                _strategy.SetData(new MovebleBoat(_drawningBoat), pictureBoxCatamaran.Width, pictureBoxCatamaran.Height);
-            }
-
-            if (_strategy == null)
-            {
-                return;
-            }
-
-            comboBoxStrategy.Enabled = false;
-            _strategy.MakeStep();
-            Draw();
-
-            if (_strategy.GetStatus() == StrategyStatus.Finish)
-            {
-                comboBoxStrategy.Enabled = true;
-                _strategy = null;
-            }
-        }
     }
 }

ProjectCatamaran/ProjectCatamaran/MovementStrategy/AbstractStrategy.cs

@@ -1,126 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectCatamaran.MovementStrategy;
-/// <summary>
-/// Класс-стратегия перемещения объекта
-/// </summary>
-public abstract class AbstractStrategy
-{
-    /// <summary>
-    /// Перемещаемый объект
-    /// </summary>
-    private IMoveableObject? _moveableObject;
-    /// <summary>
-    /// Статус перемещения
-    /// </summary>
-    private StrategyStatus _state = StrategyStatus.NotInit;
-    /// <summary>
-    /// Ширина поля
-    /// </summary>
-    protected int FieldWidth { get; private set; }
-    /// <summary>
-    /// Высота поля
-    /// </summary>
-    protected int FieldHeight { get; private set; }
-    /// <summary>
-    /// Статус перемещения
-    /// </summary>
-    public StrategyStatus GetStatus() { return _state; }
-    /// <summary>
-    /// Установка данных
-    /// </summary>
-    /// <param name="moveableObject">Перемещаемый объект</param>
-    /// <param name="width">Ширина поля</param>
-    /// <param name="height">Высота поля</param>
-    public void SetData(IMoveableObject moveableObject, int width, int height)
-    {
-        if (moveableObject == null)
-        {
-            _state = StrategyStatus.NotInit;
-            return;
-        }
-        _state = StrategyStatus.InProgress;
-        _moveableObject = moveableObject;
-        FieldWidth = width;
-        FieldHeight = height;
-    }
-    /// <summary>
-    /// Шаг перемещения
-    /// </summary>
-    public void MakeStep()
-    {
-        if (_state != StrategyStatus.InProgress)
-        {
-            return;
-        }
-        if (IsTargetDestinaion())
-        {
-            _state = StrategyStatus.Finish;
-            return;
-        }
-        MoveToTarget();
-    }
-    /// <summary>
-    /// Перемещение влево
-    /// </summary>
-    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
-    protected bool MoveLeft() => MoveTo(MovementDirection.Left);
-    /// <summary>
-    /// Перемещение вправо
-    /// </summary>
-    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
-    protected bool MoveRight() => MoveTo(MovementDirection.Right);
-    /// <summary>
-    /// Перемещение вверх
-    /// </summary>
-    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
-    protected bool MoveUp() => MoveTo(MovementDirection.Up);
-    /// <summary>
-    /// Перемещение вниз
-    /// </summary>
-    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
-    protected bool MoveDown() => MoveTo(MovementDirection.Down);
-    /// <summary>
-    /// Параметры объекта
-    /// </summary>
-    protected ObjectParameters? GetObjectParameters =>
-    _moveableObject?.GetObjectPosition;
-    /// <summary>
-    /// Шаг объекта
-    /// </summary>
-    /// <returns></returns>
-    protected int? GetStep()
-    {
-        if (_state != StrategyStatus.InProgress)
-        {
-            return null;
-        }
-        return _moveableObject?.GetStep;
-    }
-    /// <summary>
-    /// Перемещение к цели
-    /// </summary>
-    protected abstract void MoveToTarget();
-    /// <summary>
-    /// Достигнута ли цель
-    /// </summary>
-    /// <returns></returns>
-    protected abstract bool IsTargetDestinaion();
-    /// <summary>
-    /// Попытка перемещения в требуемом направлении
-    /// </summary>
-    /// <param name="movementDirection">Направление</param>
-    /// <returns>Результат попытки (true - удалось переместиться, false - неудача)</returns>
-    private bool MoveTo(MovementDirection movementDirection)
-    {
-        if (_state != StrategyStatus.InProgress)
-        {
-            return false;
-        }
-        return _moveableObject?.TryMoveObject(movementDirection) ?? false;
-    }
-}

ProjectCatamaran/ProjectCatamaran/MovementStrategy/IMoveableObject.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectCatamaran.MovementStrategy;
-
-/// <summary>
-/// Интерфейс для работы с перемещаемым объектом
-/// </summary>
-public interface IMoveableObject
-{
-    /// <summary>
-    /// Получение координаты объекта
-    /// </summary>
-    ObjectParameters? GetObjectPosition { get; }
-
-    /// <summary>
-    /// Шаг объекта
-    /// </summary>
-    int GetStep { get; }
-
-    /// <summary>
-    /// Попытка переместить объект в указанном направлении
-    /// </summary>
-    /// <param name="direction">Направление</param>
-    /// <returns>true - объект перемещен, false - перемещение невозможно</returns>
-    bool TryMoveObject(MovementDirection direction);
-}

ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectCatamaran.MovementStrategy;
-
-public class MoveToBorder : AbstractStrategy
-{
-    protected override bool IsTargetDestinaion()
-    {
-        ObjectParameters? objParams = GetObjectParameters;
-        if (objParams == null)
-        {
-            return false;
-        }
-        return objParams.RightBorder - GetStep() <= FieldWidth
-        && objParams.RightBorder + GetStep() >= FieldWidth &&
-        objParams.DownBorder - GetStep() <= FieldHeight
-        && objParams.DownBorder + GetStep() >= FieldHeight;
-    }
-    protected override void MoveToTarget()
-    {
-        ObjectParameters? objParams = GetObjectParameters;
-        if (objParams == null)
-        {
-            return;
-        }
-        int diffX = objParams.RightBorder - FieldWidth;
-        if (Math.Abs(diffX) > GetStep())
-        {
-            if (diffX > 0)
-            {
-                MoveLeft();
-            }
-            else
-            {
-                MoveRight();
-            }
-        }
-        int diffY = objParams.DownBorder - FieldHeight;
-        if (Math.Abs(diffY) > GetStep())
-        {
-            if (diffY > 0)
-            {
-                MoveUp();
-            }
-            else
-            {
-                MoveDown();
-            }
-        }
-    }
-}
-

ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToCenter.cs

@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectCatamaran.MovementStrategy;
-
-public class MoveToCenter : AbstractStrategy
-{
-    protected override bool IsTargetDestinaion()
-    {
-        ObjectParameters? objParams = GetObjectParameters;
-        if (objParams == null)
-        {
-            return false;
-        }
-        return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2
-        && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
-        objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2
-        && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
-    }
-    protected override void MoveToTarget()
-    {
-        ObjectParameters? objParams = GetObjectParameters;
-        if (objParams == null)
-        {
-            return;
-        }
-        int diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
-        if (Math.Abs(diffX) > GetStep())
-        {
-            if (diffX > 0)
-            {
-                MoveLeft();
-            }
-            else
-            {
-                MoveRight();
-            }
-        }
-        int diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
-        if (Math.Abs(diffY) > GetStep())
-        {
-            if (diffY > 0)
-            {
-                MoveUp();
-            }
-            else
-            {
-                MoveDown();
-            }
-        }
-    }
-}

ProjectCatamaran/ProjectCatamaran/MovementStrategy/MovebleBoat.cs

@@ -1,62 +0,0 @@
-using ProjectCatamaran.Drawnings;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectCatamaran.MovementStrategy;
-
-public class MovebleBoat : IMoveableObject
-{
-    /// <summary>
-    /// Поле-объект класса DrawningBoat или его наследника
-    /// </summary>
-    private readonly DrawningBoat? _boat = null;
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    /// <param name="Boat">Объект класса DrawningBoat</param>
-    public MovebleBoat(DrawningBoat boat)
-    {
-        _boat = boat;
-    }
-    public ObjectParameters? GetObjectPosition
-    {
-        get
-        {
-            if (_boat == null || _boat.EntityBoat == null ||
-            !_boat.GetPosX.HasValue || !_boat.GetPosY.HasValue)
-            {
-                return null;
-            }
-            return new ObjectParameters(_boat.GetPosX.Value,
-            _boat.GetPosY.Value, _boat.GetWidth, _boat.GetHeight);
-        }
-    }
-    public int GetStep => (int)(_boat?.EntityBoat?.Step ?? 0);
-    public bool TryMoveObject(MovementDirection direction)
-    {
-        if (_boat == null || _boat.EntityBoat == null)
-        {
-            return false;
-        }
-        return _boat.MoveTransport(GetDirectionType(direction));
-    }
-    /// <summary>
-    /// Конвертация из MovementDirection в DirectionType
-    /// </summary>
-    /// <param name="direction">MovementDirection</param>
-    /// <returns>DirectionType</returns>
-    private static DirectionType GetDirectionType(MovementDirection direction)
-    {
-        return direction switch
-        {
-            MovementDirection.Left => DirectionType.Left,
-            MovementDirection.Right => DirectionType.Right,
-            MovementDirection.Up => DirectionType.Up,
-            MovementDirection.Down => DirectionType.Down,
-            _ => DirectionType.Unknow,
-        };
-    }
-}

ProjectCatamaran/ProjectCatamaran/MovementStrategy/ObjectParameters.cs

@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectCatamaran.MovementStrategy
-
-{
-    /// <summary>
-    /// Парметры-координаты объекта
-    /// </summary>
-    public class ObjectParameters
-    {
-        /// <summary>
-        /// Координата X
-        /// </summary>
-        private readonly int _x;
-        /// <summary>
-        /// Координата Y
-        /// </summary>
-        private readonly int _y;
-        /// <summary>
-        /// Ширина объекта
-        /// </summary>
-        private readonly int _width;
-        /// <summary>
-        /// Высота объекта
-        /// </summary>
-        private readonly int _height;
-        /// <summary>
-        /// Левая граница
-        /// </summary>
-        public int LeftBorder => _x;
-        /// <summary>
-        /// Верхняя граница
-        /// </summary>
-        public int TopBorder => _y;
-        /// <summary>
-        /// Правая граница
-        /// </summary>
-        public int RightBorder => _x + _width;
-        /// <summary>
-        /// Нижняя граница
-        /// </summary>
-        public int DownBorder => _y + _height;
-        /// <summary>
-        /// Середина объекта
-        /// </summary>
-        public int ObjectMiddleHorizontal => _x + _width / 2;
-        /// <summary>
-        /// Середина объекта
-        /// </summary>
-        public int ObjectMiddleVertical => _y + _height / 2;
-
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="x">Координата X</param>
-        /// <param name="y">Координата Y</param>
-        /// <param name="width">Ширина объекта</param>
-        /// <param name="height">Высота объекта</param>
-        public ObjectParameters(int x, int y, int width, int height)
-        {
-            _x = x;
-            _y = y;
-            _width = width;
-            _height = height;
-        }
-    }
-}

ProjectCatamaran/ProjectCatamaran/MovementStrategy/StrategyStatus.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectCatamaran.MovementStrategy;
-
-/// <summary>
-/// Статус выполнения операции перемещения
-/// </summary>
-public enum StrategyStatus
-{
-    /// <summary>
-    /// Все готово к началу
-    /// </summary>
-    NotInit,
-
-    /// <summary>
-    /// Выполняется
-    /// </summary>
-    InProgress,
-
-    /// <summary>
-    /// Завершено
-    /// </summary>
-    Finish
-}

ProjectCatamaran/ProjectCatamaran/Program.cs

@@ -1,4 +1,4 @@
-namespace ProjectCatamaran.Resources
+namespace ProjectCatamaran
 {
     internal static class Program
     {