Добавляется стратегия

ProjectElectricLocomotive/Drawnings/DirectionType.cs

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

ProjectElectricLocomotive/Drawnings/DrawningLocomotive.cs

@@ -39,7 +39,26 @@ public  class DrawningLocomotive
         /// Высота прорисовки локомотива
         /// </summary>
         private readonly int _drawningLocomotiveHeight = 90;
+        
+        /// <summary>
+        /// Координата X объекта
+        /// </summary>
+        public int? GetPosX => _startPosX;
+        
+        /// <summary>
+        /// Координата Y объекта
+        /// </summary>
+        public int? GetPosY => _startPosY;    
+        
+        /// <summary>
+        /// Ширина объекта
+        /// </summary>
+        public int GetWidth => _drawningLocomotiveWidth;
 
+        /// <summary>
+        /// Высота объекта
+        /// </summary>
+        public int GetHeight => _drawningLocomotiveHeight;
         /// <summary>
         /// Пустой конструктор
         /// </summary>

ProjectElectricLocomotive/FormlectricLocomotive.Designer.cs

@@ -35,6 +35,8 @@
             buttonRight = new Button();
             buttonDown = new Button();
             buttonCreateLocomotive = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxElectricLocomotive).BeginInit();
             SuspendLayout();
             // 
@@ -118,11 +120,33 @@
             buttonCreateLocomotive.UseVisualStyleBackColor = true;
             buttonCreateLocomotive.Click += buttonCreateLocomotive_Click;
             // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(594, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(182, 33);
+            comboBoxStrategy.TabIndex = 7;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Location = new Point(664, 51);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(112, 34);
+            buttonStrategyStep.TabIndex = 8;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += buttonStrategyStep_Click;
+            // 
             // FormlectricLocomotive
             // 
             AutoScaleDimensions = new SizeF(10F, 25F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(788, 399);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
             Controls.Add(buttonCreateLocomotive);
             Controls.Add(buttonDown);
             Controls.Add(buttonRight);
@@ -145,5 +169,7 @@
         private Button buttonRight;
         private Button buttonDown;
         private Button buttonCreateLocomotive;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
     }
 }

ProjectElectricLocomotive/FormlectricLocomotive.cs

@@ -9,11 +9,23 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using ProjectElectricLocomotive.Drawnings;
+using ProjectElectricLocomotive.MovementStrategy;
 
 namespace ProjectElectricLocomotive
 {
     public partial class FormlectricLocomotive : Form
     {
+        /// <summary>
+        /// Стратегия перемещения
+        /// </summary>
+        private AbstractStrategy? _strategy;
+
+        public FormlectricLocomotive() 
+        {
+            InitializeComponent();
+            _strategy = null;
+        }
+
         private void Draw()
         {
             if (_drawnningLocomotive == null)
@@ -47,15 +59,13 @@ namespace ProjectElectricLocomotive
             }
             _drawnningLocomotive.SetPictureSize(pictureBoxElectricLocomotive.Width, pictureBoxElectricLocomotive.Height);
             _drawnningLocomotive.SetPosition(random.Next(10, 100), random.Next(10, 100));
-
+            _strategy = null;
+            comboBoxStrategy.Enabled = true;
             Draw();
         }
 
         private DrawningLocomotive? _drawnningLocomotive;
-        public FormlectricLocomotive()
+
-        {
-            InitializeComponent();
-        }
 
         /// <summary>
         /// Обработка кнопки создать "ЭлектроЛокомотив"
@@ -104,6 +114,40 @@ namespace ProjectElectricLocomotive
 
         }
 
-
+        
+        private void buttonStrategyStep_Click(object sender, EventArgs e)
+        {
+            if (_drawnningLocomotive == null)
+            {
+                return;
+            }
+            if (comboBoxStrategy.Enabled)
+            {
+                _strategy = comboBoxStrategy.SelectedIndex switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_strategy == null)
+                {
+                    return;
+                }
+                _strategy.SetData(new MoveableLocomotive(_drawnningLocomotive),
+                pictureBoxElectricLocomotive.Width, pictureBoxElectricLocomotive.Height);
+            }
+            if (_strategy == null)
+            {
+                return;
+            }
+            comboBoxStrategy.Enabled = false;
+            _strategy.MakeStep();
+            Draw();
+            if (_strategy.GetStatus() == StrategyStatus.Finish)
+            {
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+            }
+        }
     }
 }

ProjectElectricLocomotive/MovementStrategy/AbstractStrategy.cs

@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.MovementStrategy;
+
+public abstract class AbstractStrategy
+{
+    /// <summary>
+    /// Перемещаемый объект
+    /// </summary>
+    private IMovableObject _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(IMovableObject 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;
+    }
+}

ProjectElectricLocomotive/MovementStrategy/IMovableObject.cs

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

ProjectElectricLocomotive/MovementStrategy/MoveToBorder.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.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();
+            }
+        }
+    }
+}

ProjectElectricLocomotive/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.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();
+            }
+        }
+    }
+}

ProjectElectricLocomotive/MovementStrategy/MoveableLocomotive.cs

@@ -0,0 +1,65 @@
+using ProjectElectricLocomotive.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.MovementStrategy
+{
+    public class MoveableLocomotive : IMovableObject
+    {
+
+        private readonly DrawningLocomotive? _locomotive = null;
+
+        public MoveableLocomotive(DrawningLocomotive locomotive)
+        {
+            _locomotive = locomotive;
+        }
+
+        public ObjectParameters? GetObjectPosition
+        {
+            get
+            {
+                if (_locomotive == null || _locomotive.EntityLocomotive == null || !_locomotive.GetPosX.HasValue || !_locomotive.GetPosY.HasValue)
+                {
+                    return null;
+                }
+                return new ObjectParameters(_locomotive.GetPosX.Value, _locomotive.GetPosY.Value, _locomotive.GetWidth, _locomotive.GetHeight);
+            }
+        }
+
+
+
+        public int GetStep => (int)(_locomotive?.EntityLocomotive?.Step ?? 0);
+
+        
+
+        public bool TryMoveObject(MovementDirection direction)
+        {
+            if (_locomotive == null || _locomotive.EntityLocomotive == null)
+            {
+                return false;
+            }
+
+            return _locomotive.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,
+            };
+        }
+    }
+}

ProjectElectricLocomotive/MovementStrategy/MovementDirection.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.MovementStrategy;
+
+public enum MovementDirection
+{
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Up = 1,
+    /// <summary>
+    /// Вниз
+    /// </summary>
+    Down = 2,
+    /// <summary>
+    /// Влево
+    /// </summary>
+    Left = 3,
+    /// <summary>
+    /// Вправо
+    /// </summary>
+    Right = 4
+}

ProjectElectricLocomotive/MovementStrategy/ObjectParameters.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.MovementStrategy
+{
+    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;
+        }
+
+
+    }
+}

ProjectElectricLocomotive/MovementStrategy/StrategyStatus.cs

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