Стадия разработки: добавление стратегии

ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DirectionType.cs

@@ -4,6 +4,10 @@
 /// </summary>
 public enum DirectionType
 {
+    /// <summary>
+    /// Неизвестное направление
+    /// </summary>
+    Unknow = -1,
     /// <summary>
     /// Вверх
     /// </summary>

ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DrawningShip.cs

@@ -33,11 +33,26 @@ public class DrawningShip
     /// Ширина прорисовки
     /// </summary>
     private readonly int _drawningShipWidth = 150;
-
     /// <summary>
     /// Высота прорисовки
     /// </summary>
-    private int _drawningShipHeight = 80;
+    protected int _drawningShipHeight = 80;
+    /// <summary>
+    /// Координаты Х
+    /// </summary>
+    public int? GetPosX => _startPosX;
+    /// <summary>
+    /// Координтаы У
+    /// </summary>
+    public int? GetPosY => _startPosY;
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    public int GetWidht => _drawningShipWidth;
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    public int GetHeight => _drawningShipHeight;
     /// <summary>
     /// Пустой конструктор
     /// </summary>

ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DrawningWarmlyShip.cs

@@ -14,7 +14,7 @@ public class DrawningWarmlyShip : DrawningShip
     /// <param name="additionalcolor"></param>
     /// <param name="shpipipes"></param>
     /// <param name="fueltank"></param>
-    public DrawningWarmlyShip(int speed, double weight, Color bodycolor, Color additionalcolor, bool shpipipes, bool fueltank) : base(150,140)
+    public DrawningWarmlyShip(int speed, double weight, Color bodycolor, Color additionalcolor, bool shpipipes, bool fueltank) : base(150,80)
     {
         EntityShip = new EntityWarmlyShip(speed, weight, bodycolor, additionalcolor, shpipipes, fueltank); //дописать конструктор
     }
@@ -28,6 +28,7 @@ public class DrawningWarmlyShip : DrawningShip
         Brush brush = new SolidBrush(warmlyship.AdditionalColor);
         if (warmlyship.ShipPipes)
         {
+            _drawningShipHeight = 140;
             g.FillRectangle(brush, _startPosX.Value + 70, _startPosY.Value, 12, 60);
             g.FillRectangle(brush, _startPosX.Value + 90, _startPosY.Value, 12, 60);
             _startPosY += 60;

ProjectWarmlyShip/ProjectWarmlyShip/FormWarmlyShip.Designer.cs

@@ -35,6 +35,8 @@
             buttonLeft = new Button();
             buttonDown = new Button();
             buttonСreateShip = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxWarmlyShip).BeginInit();
             SuspendLayout();
             // 
@@ -124,11 +126,33 @@
             buttonСreateShip.UseVisualStyleBackColor = false;
             buttonСreateShip.Click += buttonСreateShip_Click;
             // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(685, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(133, 23);
+            comboBoxStrategy.TabIndex = 7;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Location = new Point(732, 41);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(86, 23);
+            buttonStrategyStep.TabIndex = 8;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += buttonStrategyStep_Click;
+            // 
             // FormWarmlyShip
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(830, 366);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
             Controls.Add(buttonСreateShip);
             Controls.Add(buttonDown);
             Controls.Add(buttonLeft);
@@ -152,5 +176,7 @@
         private Button buttonLeft;
         private Button buttonDown;
         private Button buttonСreateShip;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
     }
 }

ProjectWarmlyShip/ProjectWarmlyShip/FormWarmlyShip.cs

@@ -1,13 +1,16 @@
 using ProjectWarmlyShip.Drawnings;
+using ProjectWarmlyShip.MovementStrategy;
 
 namespace ProjectWarmlyShip
 {
     public partial class FormWarmlyShip : Form
     {
         private DrawningShip? _drawningShip;
+        private AbstractStrategy? _strategy;
         public FormWarmlyShip()
         {
             InitializeComponent();
+            _strategy = null;
         }
         private void CreateObject(string type)
         {
@@ -29,6 +32,8 @@ namespace ProjectWarmlyShip
             }
             _drawningShip.SetPictureSize(pictureBoxWarmlyShip.Width, pictureBoxWarmlyShip.Height);
             _drawningShip.SetPosition(random.Next(10, 100), random.Next(10, 100));
+            _strategy = null;
+            comboBoxStrategy.Enabled = true;
             Bitmap bmp = new(pictureBoxWarmlyShip.Width, pictureBoxWarmlyShip.Height);
             Graphics gr = Graphics.FromImage(bmp);
             _drawningShip.DrawTransport(gr);
@@ -84,6 +89,43 @@ namespace ProjectWarmlyShip
                 pictureBoxWarmlyShip.Image = bmp;
             }
         }
+        private void buttonStrategyStep_Click(object sender, EventArgs e)
+        {
+            if (_drawningShip == null)
+            {
+                return;
+            }
+            if (comboBoxStrategy.Enabled)
+            {
+                _strategy = comboBoxStrategy.SelectedIndex switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_strategy == null)
+                {
+                    return;
+                }
+                _strategy.SetData(new MoveableShip(_drawningShip),
+                pictureBoxWarmlyShip.Width, pictureBoxWarmlyShip.Height);
+            }
+            if (_strategy == null)
+            {
+                return;
+            }
+            comboBoxStrategy.Enabled = false;
+            _strategy.MakeStep();
+            Bitmap bmp = new(pictureBoxWarmlyShip.Width, pictureBoxWarmlyShip.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _drawningShip.DrawTransport(gr);
+            pictureBoxWarmlyShip.Image = bmp;
+            if (_strategy.GetStatus == StrategyStatus.Finish)
+            {
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+            }
+        }
     }
 
 }

ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/AbstractStrategy.cs

@@ -0,0 +1,115 @@
+namespace ProjectWarmlyShip.MovementStrategy;
+
+public abstract class AbstractStrategy
+{
+    /// <summary>
+    /// Перемещаемый объект
+    /// </summary>
+    private IMoveableObjects? _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 {get { return _state; }}
+    /// <summary>
+    /// Установка данных
+    /// </summary>
+    /// <param name="moveableObjects"></param>
+    /// <param name="width"></param>
+    /// <param name="height"></param>
+    public void SetData(IMoveableObjects moveableObjects, int width, int height)
+    {
+        if (moveableObjects == null)
+        {
+            _state = StrategyStatus.NotInit;
+            return;
+        }
+        _state = StrategyStatus.InProgress;
+        _moveableObject = moveableObjects;
+        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;
+    }
+}
+

ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/IMoveableObjects.cs

@@ -0,0 +1,17 @@
+namespace ProjectWarmlyShip.MovementStrategy;
+
+public interface IMoveableObjects
+{
+    //Получение координаты обхекта
+    ObjectParameters? GetObjectPosition { get; }
+    /// <summary>
+    /// Шаг объекта
+    /// </summary>
+    int GetStep {  get; }
+    /// <summary>
+    /// Попытка переместить объект в указанном направлении
+    /// </summary>
+    /// <param name="direction"></param>
+    /// <returns></returns>
+    bool TryMoveObject(MovementDirection direction);
+}

ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/MoveToBorder.cs

@@ -0,0 +1,31 @@
+namespace ProjectWarmlyShip.MovementStrategy;
+
+public class MoveToBorder : AbstractStrategy
+{
+    protected override bool IsTargetDestinaion()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return false;
+        }
+        return objParams.LeftBorder - GetStep() <= 0 ||
+            objParams.RightBorder + GetStep() >= FieldWidth ||
+            objParams.TopBorder - GetStep() <= 0
+            || objParams.ObjectMiddleVertical + GetStep() >= FieldHeight;
+    }
+
+    protected override void MoveToTarget()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return;
+        }
+        //реализация в правый нижний угол
+        int x = objParams.RightBorder;
+        if (x + GetStep() < FieldWidth) MoveRight();
+        int y = objParams.DownBorder;
+        if (y + GetStep() < FieldHeight) MoveDown();
+    }
+}

ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,49 @@
+namespace ProjectWarmlyShip.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();
+            }
+        }
+    }
+}

ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/MoveableShip.cs

@@ -0,0 +1,49 @@
+using ProjectWarmlyShip.Drawnings;
+
+namespace ProjectWarmlyShip.MovementStrategy;
+
+public class MoveableShip : IMoveableObjects
+{
+    private DrawningShip? _drawningship;
+    public MoveableShip(DrawningShip? drawningship)
+    {
+        _drawningship = drawningship;
+    }
+    public ObjectParameters? GetObjectPosition
+    {
+        get
+        {
+            if (_drawningship == null || _drawningship.EntityShip == null || !_drawningship.GetPosX.HasValue || !_drawningship.GetPosY.HasValue)
+            {
+                return null;
+            }
+            return new ObjectParameters(_drawningship.GetPosX.Value, _drawningship.GetPosY.Value, _drawningship.GetWidht, _drawningship.GetHeight);
+        }
+    }
+    public int GetStep => (int)(_drawningship?.EntityShip?.Step ?? 0);
+    public bool TryMoveObject(MovementDirection direction)
+    {
+        if (_drawningship == null || _drawningship.EntityShip == null)
+        {
+            return false;
+        }
+        return _drawningship.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,
+        };
+    }
+
+}

ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/MovementDirection.cs

@@ -0,0 +1,21 @@
+namespace ProjectWarmlyShip.MovementStrategy;
+
+public enum MovementDirection
+{
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Up = 1,
+    /// <summary>
+    /// Вниз
+    /// </summary>
+    Down = 2,
+    /// <summary>
+    /// Влево
+    /// </summary>
+    Left = 3,
+    /// <summary>
+    /// Вправо
+    /// </summary>
+    Right = 4
+}

ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/ObjectParameters.cs

@@ -0,0 +1,59 @@
+namespace ProjectWarmlyShip.MovementStrategy;
+
+public class ObjectParameters
+{
+    /// <summary>
+    /// Координата х
+    /// </summary>
+    private readonly int _x;
+    /// <summary>
+    /// Координата у
+    /// </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"></param>
+    /// <param name="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;
+    }
+}

ProjectWarmlyShip/ProjectWarmlyShip/MovementStrategy/StrategyStatus.cs

@@ -0,0 +1,15 @@
+namespace ProjectWarmlyShip.MovementStrategy;
+
+public enum StrategyStatus
+{
+    /// <summary>
+    /// Все готово к началу
+    /// </summary>
+    NotInit,
+    /// <summary>
+    /// Выполняется
+    /// </summary>
+    InProgress,
+    // Завершена
+    Finish
+}