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

ProjectAirFighter/ProjectAirFighter/Drawning/DirectionType.cs

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

ProjectAirFighter/ProjectAirFighter/Drawning/DrawningWarPlane.cs

@@ -37,13 +37,32 @@ public class DrawningWarPlane
     /// <summary>
     /// Ширина прорисовки самолета
     /// </summary>
-    private int? _drawningWarPlaneWidth = 120;
+    private readonly int _drawningWarPlaneWidth = 120;
 
     /// <summary>
     /// Высота прорисовки самолета
     /// </summary>
-    private int? _drawningWarPlaneHeight = 140;
+    private readonly int  _drawningWarPlaneHeight = 140;
 
+    /// <summary>
+    /// Координаты X объекта
+    /// </summary>
+    public int? GetPosX => _startPosX;
+
+    /// <summary>
+    /// Координаты Y объекта
+    /// </summary>
+    public int? GetPosY => _startPosY;
+
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    public int GetHeight => _drawningWarPlaneHeight;
+
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    public int GetWigdth => _drawningWarPlaneWidth;
     private DrawningWarPlane() {
         _pictureHeight = null;
         _pictureWidth = null;

ProjectAirFighter/ProjectAirFighter/FormAirFighter.Designer.cs

@@ -35,6 +35,8 @@
             buttonDown = new Button();
             buttonRight = new Button();
             buttonCreateWarPlane = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxAirFighter).BeginInit();
             SuspendLayout();
             // 
@@ -121,11 +123,33 @@
             buttonCreateWarPlane.UseVisualStyleBackColor = true;
             buttonCreateWarPlane.Click += buttonCreateWarPlane_Click;
             // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(791, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(121, 23);
+            comboBoxStrategy.TabIndex = 7;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Location = new Point(829, 41);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(75, 23);
+            buttonStrategyStep.TabIndex = 8;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += buttonStrategyStep_Click;
+            // 
             // FormAirFighter
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(924, 557);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
             Controls.Add(buttonCreateWarPlane);
             Controls.Add(buttonRight);
             Controls.Add(buttonDown);
@@ -149,5 +173,7 @@
         private Button buttonDown;
         private Button buttonRight;
         private Button buttonCreateWarPlane;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
     }
 }

ProjectAirFighter/ProjectAirFighter/FormAirFighter.cs

@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using ProjectAirFighter.Drawning;
 using ProjectAirFighter.Entities;
+using ProjectAirFighter.MovementStrategy;
 
 namespace ProjectAirFighter
 {
@@ -18,18 +19,17 @@ namespace ProjectAirFighter
     {
         private DrawningWarPlane? _drawningWarPlane;
 
-     
         /// <summary>
         /// Стратегия перемещения
         /// </summary>
-        //private AbstractStrategy? _strategy;
+        private AbstractStrategy? _strategy;
         /// <summary>
         /// Конструктор формы
         /// </summary>
         public FormAirFighter()
         {
             InitializeComponent();
-            //_strategy = null;
+            _strategy = null;
         }
         /// <summary>
         /// Метод прорисовки
@@ -70,6 +70,8 @@ namespace ProjectAirFighter
             _drawningWarPlane.SetPictureSize(pictureBoxAirFighter.Width,
             pictureBoxAirFighter.Height);
             _drawningWarPlane.SetPosition(random.Next(10, 100), random.Next(10, 100));
+            _strategy = null;
+            comboBoxStrategy.Enabled = true;
             Draw();
         }
         private void ButtonCreate_Click(object sender, EventArgs e)
@@ -127,6 +129,41 @@ namespace ProjectAirFighter
 
         }
 
+        private void buttonStrategyStep_Click(object sender, EventArgs e)
+        {
+            if (_drawningWarPlane == null)
+            {
+                return;
+            }
+            if (comboBoxStrategy.Enabled)
+            {
+                _strategy = comboBoxStrategy.SelectedIndex switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_strategy == null)
+                {
+                    return;
+                }
+                _strategy.SetDate(new MoveableWarPlane(_drawningWarPlane), pictureBoxAirFighter.Width, pictureBoxAirFighter.Height);
+            }
 
+            if (_strategy == null)
+            {
+                return;
+            }
+
+            comboBoxStrategy.Enabled = false;
+            _strategy.MakeStep();
+            Draw();
+
+            if (_strategy.GetStatus() == StrategyStatus.Finish)
+            {
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+            }
+        }
     }
 }

ProjectAirFighter/ProjectAirFighter/MovementStrategy/AbstractStrategy.cs

@@ -0,0 +1,123 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectAirFighter.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; }
+
+    public void SetDate(IMoveableObject moveableObject, int width, int height)
+    {
+        if (moveableObject == null)
+        {
+            _state = StrategyStatus.NotInit;
+            return;
+        }
+
+        _state = StrategyStatus.InProgress;
+        _moveableObject = moveableObject;
+        FieldWidth = width;
+        FieldHeight = height;
+    }
+
+    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;
+        }
+}
+

ProjectAirFighter/ProjectAirFighter/MovementStrategy/IMoveableObject.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectAirFighter.MovementStrategy;
+
+public interface IMoveableObject
+{
+    /// <summary>
+    /// Получение координаты объекта
+    /// </summary>
+    ObjectParameters? GetObjectPosition {  get; }
+    
+    /// <summary>
+    /// Шаг объекта
+    /// </summary>
+    int GetStep {  get; }
+    
+    bool TryMoveObject(MovementDirection direction);
+}

ProjectAirFighter/ProjectAirFighter/MovementStrategy/MoveToBorder.cs

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

ProjectAirFighter/ProjectAirFighter/MovementStrategy/MoveToCenter.cs

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

ProjectAirFighter/ProjectAirFighter/MovementStrategy/MoveableWarPlane.cs

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

ProjectAirFighter/ProjectAirFighter/MovementStrategy/MovementDirection.cs

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

ProjectAirFighter/ProjectAirFighter/MovementStrategy/ObjectParameters.cs

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

ProjectAirFighter/ProjectAirFighter/MovementStrategy/StrategyStatus.cs

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

ProjectAirFighter/ProjectAirFighter/ProjectAirFighter.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>