Добавлена стратегия перемещения

AirBus/AirBus/Drawings/DirectionType.cs

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

AirBus/AirBus/Drawings/DrawingAirBus.cs

@@ -38,9 +38,7 @@ namespace AirBus.Drawings
 
             Pen pen = new(Color.Black, 1);
             Brush additionalBrush = new SolidBrush(airBus.AdditionalColor);
-            Brush br = new SolidBrush(airBus.BodyColor);
+            
-            Brush brBlack = new SolidBrush(Color.Black);
-
             base.DrawTransport(g);
 
             if (airBus.ExtraEngine) // двигатели опционально
@@ -59,17 +57,7 @@ namespace AirBus.Drawings
 
                 g.FillRectangle(additionalBrush, _startPosX.Value + 90, _startPosY.Value + 25, 50, 10);
                 g.DrawRectangle(pen, _startPosX.Value + 90, _startPosY.Value + 25, 50, 10);
-
-
             }
-        }
+        } 
-
-        
-
-        
-        
-
-
-        
     }
 }

AirBus/AirBus/Drawings/DrawingPlane.cs

@@ -44,6 +44,26 @@ namespace AirBus.Drawings
         /// </summary>
         private readonly int _drawingAirBusHeight = 72;
 
+        /// <summary>
+        /// Координата X объекта
+        /// </summary>
+        public int? GetPosX => _startPosX;
+
+        /// <summary>
+        /// Координата Y объекта
+        /// </summary>
+        public int? GetPosY => _startPosY;
+
+        /// <summary>
+        /// Ширина объекта
+        /// </summary>
+        public int GetWidth => _drawingAirBusWidth;
+
+        /// <summary>
+        /// Высота объекта
+        /// </summary>
+        public int GetHeight => _drawingAirBusHeight;
+
         /// <summary>
         /// Пустой конструктор
         /// </summary>
@@ -56,7 +76,7 @@ namespace AirBus.Drawings
         }
 
       /// <summary>
-      /// Конструктор
+      /// Конструктор для наследников
       /// </summary>
       /// <param name="drawingAirBusWidth">Ширина прорисовки</param>
       /// <param name="drawingAirBusHeight">Высота прорисовки</param>

AirBus/AirBus/Entities/EntityAirBus.cs

@@ -27,7 +27,7 @@ namespace AirBus.Entities
         public bool SecondFloor { get; private set; }
 
         /// <summary>
-        /// Инициализация полей объекта-класса самолёта "Аэробус"
+        /// Конструктор объекта-класса самолёта "Аэробус"
         /// </summary>
         /// <param name="speed">Скорость</param>
         /// <param name="weight">Вес</param>

AirBus/AirBus/FormAirBus.Designer.cs

@@ -36,6 +36,8 @@
             buttonDown = new Button();
             buttonRight = new Button();
             buttonCreatePlane = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxAirBus).BeginInit();
             SuspendLayout();
             // 
@@ -121,11 +123,33 @@
             buttonCreatePlane.UseVisualStyleBackColor = true;
             buttonCreatePlane.Click += buttonCreateAirBus_Click;
             // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(841, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(151, 28);
+            comboBoxStrategy.TabIndex = 3;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Location = new Point(898, 46);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(94, 29);
+            buttonStrategyStep.TabIndex = 4;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += buttonStrategyStep_Click;
+            // 
             // FormAirBus
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(1004, 468);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
             Controls.Add(buttonRight);
             Controls.Add(buttonDown);
             Controls.Add(buttonUp);
@@ -148,5 +172,7 @@
         private Button buttonDown;
         private Button buttonRight;
         private Button buttonCreatePlane;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
     }
 }

AirBus/AirBus/FormAirBus.cs

@@ -8,15 +8,19 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using AirBus.Drawings;
+using AirBus.MovementStrategy;
 
 namespace AirBus;
 
 public partial class FormAirBus : Form
 {
     private DrawingPlane? _drawingPlane;
+
+    private AbstractStrategy? _strategy;
     public FormAirBus()
     {
         InitializeComponent();
+        _strategy = null;
     }
 
     private void Draw()
@@ -36,7 +40,7 @@ public partial class FormAirBus : Form
     {
         Random random = new();
         switch (type)
-        { 
+        {
             case nameof(DrawingPlane):
                 _drawingPlane = new DrawingPlane(random.Next(100, 300), random.Next(1000, 3000),
                 Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
@@ -52,28 +56,24 @@ public partial class FormAirBus : Form
         }
         _drawingPlane.SetPictureSize(pictureBoxAirBus.Width, pictureBoxAirBus.Height);
         _drawingPlane.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 buttonCreateAirBus_Click(object sender, EventArgs e)
+    private void buttonCreateAirBus_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingAirBus));
-    {
-        CreateObject(nameof(DrawingAirBus));
-    }
 
     /// <summary>
     /// Обработка нажатия кнопки "Создать самолёт"
     /// </summary>
     /// <param name="sender"></param>
     /// <param name="e"></param>
-    private void buttonCreatePlane_Click(object sender, EventArgs e)
+    private void buttonCreatePlane_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingPlane));
-    {
-        CreateObject(nameof(DrawingPlane));
-    }
 
     private void ButtonMove_Click(object sender, EventArgs e)
     {
@@ -100,9 +100,52 @@ public partial class FormAirBus : Form
                 break;
         }
 
-        if(result)
+        if (result)
         {
             Draw();
         }
     }
+
+    /// <summary>
+    /// Обработка нажатия кнопки "Шаг"
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonStrategyStep_Click(object sender, EventArgs e)
+    {
+        if (_drawingPlane == null)
+        {
+            return;
+        }
+        if (comboBoxStrategy.Enabled)
+        {
+            _strategy = comboBoxStrategy.SelectedIndex switch
+            {
+                0 => new MoveToCenter(),
+                1 => new MoveToBorder(),
+                _ => null,
+            };
+            if (_strategy == null)
+            {
+                return;
+            }
+            _strategy.SetData(new MoveablePlane(_drawingPlane),
+            pictureBoxAirBus.Width, pictureBoxAirBus.Height);
+        }
+        if (_strategy == null)
+        {
+            return;
+        }
+
+        comboBoxStrategy.Enabled = false;
+        _strategy.MakeStep();
+        Draw();
+
+        if (_strategy.GetStatus() == StrategyStatus.Finish)
+        {
+            comboBoxStrategy.Enabled = true;
+            _strategy = null;
+        }
+    }
 }
+

AirBus/AirBus/MovementStrategy/AbstractStrategy.cs

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

AirBus/AirBus/MovementStrategy/IMoveableObject.cs

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

AirBus/AirBus/MovementStrategy/MoveToBorder.cs

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

AirBus/AirBus/MovementStrategy/MoveToCenter.cs

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

AirBus/AirBus/MovementStrategy/MoveablePlane.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using AirBus.Drawings;
+
+namespace AirBus.MovementStrategy;
+
+/// <summary>
+/// Класс реализация IMoveableObject с использованияем DrawingPlane
+/// </summary>
+public class MoveablePlane : IMoveableObject
+{
+
+    /// <summary>
+    /// Поле-объект класса DrawingPlane или его наследника
+    /// </summary>
+    private readonly DrawingPlane? _plane = null;
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="plane">Объект класса DrawingPlane</param>
+    public MoveablePlane(DrawingPlane plane)
+    {
+        _plane = plane;
+    }
+    public ObjectParameters? GetObjectPosition
+    {
+        get
+        {
+            if (_plane == null || _plane.EntityPlane == null || !_plane.GetPosX.HasValue || !_plane.GetPosY.HasValue)
+            {
+                return null;
+            }
+            return new ObjectParameters(_plane.GetPosX.Value,
+            _plane.GetPosY.Value, _plane.GetWidth, _plane.GetHeight);
+        }
+    }
+    public int GetStep => (int)(_plane?.EntityPlane?.Step ?? 0);
+    public bool TryMoveObject(MovementDirection direction)
+    {
+        if (_plane == null || _plane.EntityPlane == null)
+        {
+            return false;
+        }
+        return _plane.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,
+        };
+
+    }
+}

AirBus/AirBus/MovementStrategy/MovementDirection.cs

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

AirBus/AirBus/MovementStrategy/ObjectParameters.cs

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

AirBus/AirBus/MovementStrategy/StrategyStatus.cs

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