исправление названия класса

2024-03-12 18:50:19 +04:00 · 2024-03-12 18:50:19 +04:00 · e3b59b8f7e
commit e3b59b8f7e
parent e356bb94ae
10 changed files with 437 additions and 6 deletions
--- a/ProjectBulldozer/ProjectBulldozer/DirectionType1.cs
+++ b/ProjectBulldozer/ProjectBulldozer/DirectionType1.cs
@ -6,7 +6,7 @@ using System.Threading.Tasks;

 namespace ProjectBulldozer;

-public enum DirectionType1
+public enum DirectionType
 {
    /// <summary>
    /// Вверх
--- a/ProjectBulldozer/ProjectBulldozer/DrawingBulldozer.cs
+++ b/ProjectBulldozer/ProjectBulldozer/DrawingBulldozer.cs
@ -105,7 +105,7 @@ public class DrawningBulldozer
    /// </summary>
    /// <param name="direction">Направление</param>
    /// <returns>true - перемещене выполнено, false - перемещение
-   public bool MoveTransport(DirectionType1 direction) {
+   public bool MoveTransport(DirectionType direction) {

        if (EntityBulldozer == null || !_startPosX.HasValue ||
        !_startPosY.HasValue)
@ -115,7 +115,7 @@ public class DrawningBulldozer
        switch (direction)
        {
            //влево
-            case DirectionType1.Left:
+            case DirectionType.Left:
                if (_startPosX.Value - EntityBulldozer.Step > 0)
                {
                    _startPosX -= (int)EntityBulldozer.Step;
@ -123,7 +123,7 @@ public class DrawningBulldozer
                return true;

            //вверх
-            case DirectionType1.Up:
+            case DirectionType.Up:
                if (_startPosY.Value - EntityBulldozer.Step > 0)
                {
                    _startPosY -= (int)EntityBulldozer.Step;
@ -131,7 +131,7 @@ public class DrawningBulldozer
                return true;

            // вправо
-            case DirectionType1.Right:
+            case DirectionType.Right:
                if (_startPosX + _BulldozerWidth + EntityBulldozer.Step < _pictureWidth)
                {
                    _startPosX += (int)EntityBulldozer.Step;
@ -139,7 +139,7 @@ public class DrawningBulldozer
                return true;

            //вниз
-            case DirectionType1.Down:
+            case DirectionType.Down:
                if (_startPosY + _BulldozerHeight + EntityBulldozer.Step < _pictureHeight)
                {
                    _startPosY += (int)EntityBulldozer.Step;
--- a/ProjectBulldozer/ProjectBulldozer/MovementStrategy/AbstractStrategy.cs
+++ b/ProjectBulldozer/ProjectBulldozer/MovementStrategy/AbstractStrategy.cs
@ -0,0 +1,129 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectBulldozer.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;
+    }
+
+}
--- a/ProjectBulldozer/ProjectBulldozer/MovementStrategy/IMoveableObject.cs
+++ b/ProjectBulldozer/ProjectBulldozer/MovementStrategy/IMoveableObject.cs
@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectBulldozer.MovementStrategy;
+
+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);
+
+}
--- a/ProjectBulldozer/ProjectBulldozer/MovementStrategy/MoveToBorder.cs
+++ b/ProjectBulldozer/ProjectBulldozer/MovementStrategy/MoveToBorder.cs
@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectBulldozer.MovementStrategy;
+
+public class MoveToBorder : AbstractStrategy
+{
+    /// <summary>
+    /// Стратегия перемещения объекта в правый угол
+    /// </summary>
+    protected override bool IsTargetDestinaion()
+    {
+        var objParams = GetObjectParameters;
+        if (objParams == null) return false;
+
+        return objParams.RightBorder >= FieldWidth - GetStep() && objParams.DownBorder >= FieldHeight - GetStep();
+    }
+
+    protected override void MoveToTarget()
+    {
+        var objParams = GetObjectParameters;
+        if (objParams == null) return;
+
+        if (objParams.RightBorder < FieldWidth - GetStep()) MoveRight();
+        if (objParams.DownBorder < FieldHeight - GetStep()) MoveDown();
+
+    }
+}
--- a/ProjectBulldozer/ProjectBulldozer/MovementStrategy/MoveToCenter.cs
+++ b/ProjectBulldozer/ProjectBulldozer/MovementStrategy/MoveToCenter.cs
@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectBulldozer.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();
+            }
+        }
+    }
+}
--- a/ProjectBulldozer/ProjectBulldozer/MovementStrategy/MoveableBulldozer.cs
+++ b/ProjectBulldozer/ProjectBulldozer/MovementStrategy/MoveableBulldozer.cs
@ -0,0 +1,66 @@
+using ProjectBulldozer.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectBulldozer.MovementStrategy;
+
+public class MoveableBulldozer : IMoveableObject
+{
+
+    /// <summary>
+    /// Поле-объект класса DrawningBulldozerProstoy или его наследника
+    /// </summary>
+    private readonly DrawningBulldozerProstoy? _bulldozer = null;
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="bulldozer">Объект класса DrawningBulldozerProstoy</param>
+    public MoveableBulldozer(DrawningBulldozerProstoy bulldozer)
+    {
+        _bulldozer = bulldozer;
+    }
+    public ObjectParameters? GetObjectPosition
+    {
+        get
+        {
+            if (_bulldozer == null || _bulldozer.EntityBulldozerProstoy == null ||
+            !_bulldozer.GetPosX.HasValue || !_bulldozer.GetPosY.HasValue)
+            {
+                return null;
+            }
+            return new ObjectParameters(_bulldozer.GetPosX.Value,
+            _bulldozer.GetPosY.Value, _bulldozer.GetWidth, _bulldozer.GetHeight);
+        }
+    }
+    public int GetStep => (int)(_bulldozer?.EntityBulldozerProstoy?.Step ?? 0);
+    public bool TryMoveObject(MovementDirection direction)
+    {
+        if (_bulldozer == null || _bulldozer.EntityBulldozerProstoy == null)
+        {
+            return false;
+        }
+        return _bulldozer.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,
+        };
+    }
+
+
+}
--- a/ProjectBulldozer/ProjectBulldozer/MovementStrategy/MovementDirection.cs
+++ b/ProjectBulldozer/ProjectBulldozer/MovementStrategy/MovementDirection.cs
@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectBulldozer.MovementStrategy;
+
+public enum MovementDirection
+{
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Up = 1,
+    /// <summary>
+    /// Вниз
+    /// </summary>
+    Down = 2,
+    /// <summary>
+    /// Влево
+    /// </summary>
+    Left = 3,
+    /// <summary>
+    /// Вправо
+    /// </summary>
+    Right = 4
+
+}
--- a/ProjectBulldozer/ProjectBulldozer/MovementStrategy/ObjectParameters.cs
+++ b/ProjectBulldozer/ProjectBulldozer/MovementStrategy/ObjectParameters.cs
@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectBulldozer.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;
+    }
+
+}
--- a/ProjectBulldozer/ProjectBulldozer/MovementStrategy/StrategyStatus.cs
+++ b/ProjectBulldozer/ProjectBulldozer/MovementStrategy/StrategyStatus.cs
@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectBulldozer.MovementStrategy;
+
+/// <summary>
+/// Статус выполнения операции перемещения
+/// </summary>
+public enum StrategyStatus
+{
+    /// <summary>
+    /// Все готово к началу
+    /// </summary>
+    NotInit,
+    /// <summary>
+    /// Выполняется
+    /// </summary>
+    InProgress,
+    /// <summary>
+    /// Завершено
+    /// </summary>
+    Finish
+
+}