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

ProjectCleaningCar/ProjectCleaningCar/Drawning/DirectionType.cs

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

ProjectCleaningCar/ProjectCleaningCar/Drawning/DrawningCar.cs

@@ -1,7 +1,9 @@
 using ProjectCleaningCar.Entities;
 
 namespace ProjectCleaningCar.Drawning;
-
+/// <summary>
+/// Класс, отвечающий за прорисовку базового объекта-сущности
+/// </summary>
 public class DrawningCar
 {
     /// <summary>
@@ -31,7 +33,23 @@ public class DrawningCar
     /// <summary>
     /// Высота прорисовки машины
     /// </summary>
-    private readonly int _drawningCarHeight = 80;
+    private readonly int _drawningCarHeight = 65;
+    /// <summary>
+    /// Координата X объекта
+    /// </summary>
+    public int? GetPosX => _startPosX;
+    /// <summary>
+    /// Координата Y объекта
+    /// </summary>
+    public int? GetPosY => _startPosY;
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    public int GetWidth => _drawningCarWidth;
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    public int GetHeight => _drawningCarHeight;
     /// <summary>
     /// Пустой конструктор
     /// </summary>

ProjectCleaningCar/ProjectCleaningCar/Drawning/DrawningCleaningCar.cs

@@ -2,7 +2,7 @@
 
 namespace ProjectCleaningCar.Drawning;
 /// <summary>
-/// Класс, отвечающий за прорисовку и перемещение объекта сущности
+/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
 /// </summary>
 public class DrawningCleaningCar : DrawningCar
 {
@@ -17,7 +17,7 @@ public class DrawningCleaningCar : DrawningCar
     /// <param name="sweepingBrush">Подметательная щётка</param>
     /// <param name="flashlight">Проблескового маячок</param>
     public DrawningCleaningCar(int speed, double weight, Color bodyColor, Color
-additionalColor, bool tank, bool sweepingBrush, bool flashlight) : base(130, 90)
+additionalColor, bool tank, bool sweepingBrush, bool flashlight) : base(132, 65)
     {
         EntityCar = new EntityCleaningCar(speed, weight, bodyColor, additionalColor,
 tank, sweepingBrush, flashlight);
@@ -48,10 +48,10 @@ tank, sweepingBrush, flashlight);
         if (cleaningCar.SweepingBrush)
         {
             Pen additionalPen = new(cleaningCar.AdditionalColor);
-            g.DrawEllipse(additionalPen, _startPosX.Value + 125, _startPosY.Value + 50, 18, 18);
+            g.DrawEllipse(additionalPen, _startPosX.Value + 122, _startPosY.Value + 45, 18, 18);
-            g.FillEllipse(additionalBrush, _startPosX.Value + 125, _startPosY.Value + 50, 18, 18);
+            g.FillEllipse(additionalBrush, _startPosX.Value + 122, _startPosY.Value + 45, 18, 18);
-            g.FillEllipse(bodyBrush, _startPosX.Value + 129, _startPosY.Value + 54, 10, 10);
+            g.FillEllipse(bodyBrush, _startPosX.Value + 126, _startPosY.Value + 49, 10, 10);
-            g.DrawLine(pen, _startPosX.Value + 120, _startPosY.Value + 50, _startPosX.Value + 135, _startPosY.Value + 60); ////////!!!!!
+            g.DrawLine(pen, _startPosX.Value + 117, _startPosY.Value + 45, _startPosX.Value + 131, _startPosY.Value + 54);
         }
         //проблесковый маячок
         if (cleaningCar.Flashlight)

ProjectCleaningCar/ProjectCleaningCar/FormCleaningCar.Designer.cs

@@ -35,6 +35,8 @@
             buttonUp = new Button();
             buttonDown = new Button();
             buttonCreateCar = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxCleaningCar).BeginInit();
             SuspendLayout();
             // 
@@ -109,6 +111,7 @@
             // 
             // buttonCreateCar
             // 
+            buttonCreateCar.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
             buttonCreateCar.Location = new Point(210, 421);
             buttonCreateCar.Name = "buttonCreateCar";
             buttonCreateCar.Size = new Size(192, 32);
@@ -117,11 +120,35 @@
             buttonCreateCar.UseVisualStyleBackColor = true;
             buttonCreateCar.Click += ButtonCreateCar_Click;
             // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(710, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(102, 23);
+            comboBoxStrategy.TabIndex = 7;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            buttonStrategyStep.Location = new Point(742, 41);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(70, 21);
+            buttonStrategyStep.TabIndex = 8;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += ButtonStrategyStep_Click;
+            // 
             // FormCleaningCar
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(824, 465);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
             Controls.Add(buttonCreateCar);
             Controls.Add(buttonDown);
             Controls.Add(buttonUp);
@@ -144,5 +171,7 @@
         private Button buttonUp;
         private Button buttonDown;
         private Button buttonCreateCar;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
     }
 }

ProjectCleaningCar/ProjectCleaningCar/FormCleaningCar.cs

@@ -1,4 +1,5 @@
 using ProjectCleaningCar.Drawning;
+using ProjectCleaningCar.MovementStrategy;
 
 namespace ProjectCleaningCar;
 /// <summary>
@@ -11,11 +12,16 @@ public partial class FormCleaningCar : Form
     /// </summary>
     private DrawningCar? _drawningCar;
     /// <summary>
+    /// Стратегия перемещения
+    /// </summary>
+    private AbstractStrategy? _strategy;
+    /// <summary>
     /// Конструктор формы
     /// </summary>
     public FormCleaningCar()
     {
         InitializeComponent();
+        _strategy = null;
     }
     /// <summary>
     /// Метод прорисовки машины
@@ -70,6 +76,9 @@ public partial class FormCleaningCar : Form
         }
         _drawningCar.SetPictureSize(pictureBoxCleaningCar.Width, pictureBoxCleaningCar.Height);
         _drawningCar.SetPosition(random.Next(0, 200), random.Next(0, 200));
+        _strategy = null;
+        comboBoxStrategy.Enabled = true;
+        Draw();
     }
     /// <summary>
     /// Перемещение объекта по форме (нажатие кнопок навигации)
@@ -104,4 +113,45 @@ public partial class FormCleaningCar : Form
             Draw();
         }
     }
+    /// <summary>
+    /// Обработка нажатия кнопки "Шаг"
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonStrategyStep_Click(object sender, EventArgs e)
+    {
+        if (_drawningCar == null)
+        {
+            return;
+        }
+        if (comboBoxStrategy.Enabled)
+        {
+            _strategy = comboBoxStrategy.SelectedIndex switch
+            {
+                0 => new MoveToCenter(),
+                1 => new MoveToBorder(),
+                _ => null,
+            };
+            if (_strategy == null)
+            {
+                return;
+            }
+            _strategy.SetData(new MoveableCar(_drawningCar),
+            pictureBoxCleaningCar.Width, pictureBoxCleaningCar.Height);
+        }
+        if (_strategy == null)
+        {
+            return;
+        }
+
+        comboBoxStrategy.Enabled = false;
+        _strategy.MakeStep();
+        Draw();
+
+        if (_strategy.GetStatus() == StrategyStatus.Finish)
+        {
+            comboBoxStrategy.Enabled = true;
+            _strategy = null;
+        }
+    }
 }

ProjectCleaningCar/ProjectCleaningCar/MovementStrategy/AbstractStrategy.cs

@@ -0,0 +1,120 @@
+namespace ProjectCleaningCar.MovementStrategy;
+
+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;
+    }
+}

ProjectCleaningCar/ProjectCleaningCar/MovementStrategy/IMoveableObject.cs

@@ -0,0 +1,21 @@
+namespace ProjectCleaningCar.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);
+}

ProjectCleaningCar/ProjectCleaningCar/MovementStrategy/MoveToBorder.cs

@@ -0,0 +1,49 @@
+namespace ProjectCleaningCar.MovementStrategy;
+/// <summary>
+/// Стратегия перемещения объекта к границе экрана
+/// </summary>
+public class MoveToBorder : AbstractStrategy
+{
+    protected override bool IsTargetDestinaion()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return false;
+        }
+        return objParams.RightBorder + GetStep() >= FieldWidth && objParams.DownBorder + GetStep() >= FieldHeight;\
+    }
+
+    protected override void MoveToTarget()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return;
+        }
+        int diffX = objParams.RightBorder;
+        if (Math.Abs(diffX) > GetStep())
+        {
+            if (diffX < 0)
+            {
+                MoveLeft();
+            }
+            else
+            {
+                MoveRight();
+            }
+        }
+        int diffY = objParams.DownBorder;
+        if (Math.Abs(diffY) > GetStep())
+        {
+            if (diffY < 0)
+            {
+                MoveUp();
+            }
+            else
+            {
+                MoveDown();
+            }
+        }
+    }
+}

ProjectCleaningCar/ProjectCleaningCar/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,50 @@
+namespace ProjectCleaningCar.MovementStrategy;
+/// <summary>
+/// Стратегия перемещения объекта в центр экрана
+/// </summary>
+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();
+            }
+        }
+    }
+}

ProjectCleaningCar/ProjectCleaningCar/MovementStrategy/MoveableCar.cs

@@ -0,0 +1,57 @@
+using ProjectCleaningCar.Drawning;
+
+namespace ProjectCleaningCar.MovementStrategy;
+/// <summary>
+/// Класс-реализация IMoveableObject с использованием DrawningCar
+/// </summary>
+public class MoveableCar : IMoveableObject
+{
+    /// <summary>
+    /// Поле-объект класса DrawningCar или его наследника
+    /// </summary>
+    private readonly DrawningCar? _car = null;
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="car">Объект класса DrawningCar</param>
+    public MoveableCar(DrawningCar car)
+    {
+        _car = car;
+    }
+    public ObjectParameters? GetObjectPosition
+    {
+        get
+        {
+            if (_car == null || _car.EntityCar == null || !_car.GetPosX.HasValue || !_car.GetPosY.HasValue)
+            {
+                return null;
+            }
+            return new ObjectParameters(_car.GetPosX.Value, _car.GetPosY.Value, _car.GetWidth, _car.GetHeight);
+        }
+    }
+    public int GetStep => (int)(_car?.EntityCar?.Step ?? 0);
+    public bool TryMoveObject(MovementDirection direction)
+    {
+        if (_car == null || _car.EntityCar == null)
+        {
+            return false;
+        }
+        return _car.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
+        };
+    }
+}

ProjectCleaningCar/ProjectCleaningCar/MovementStrategy/MovementDirection.cs

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

ProjectCleaningCar/ProjectCleaningCar/MovementStrategy/ObjectParameters.cs

@@ -0,0 +1,61 @@
+namespace ProjectCleaningCar.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;
+    }
+}

ProjectCleaningCar/ProjectCleaningCar/MovementStrategy/StrategyStatus.cs

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