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

solution/lab1/Drawnings/DirectionType.cs

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

solution/lab1/Drawnings/DrawningTrackedVehicle.cs

@@ -41,11 +41,35 @@ public class DrawningTrackedVehicle
     /// <summary>
     /// Высота прорисовки истребителя
     /// </summary>
-    private readonly int _drawningFighterHeight = 54;
+    private readonly int _drawningFighterHeight = 69;
+
+    /// <summary>
+    /// Координата Х объекта
+    /// </summary>
+    /// <returns></returns>
+    public int? GetPosX => _startPosX;
+    /// <summary>
+    /// Координата У объекта
+    /// </summary>
+    /// <returns></returns>
+
+    public int? GetPosY => _startPosY;
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    /// <returns></returns>
+    public int GetWidth => _drawningFighterWidth;
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    /// <returns></returns>
+    public int GetHeight => _drawningFighterHeight;
+
+
     /// <summary>
     /// Пустой конструктор
     /// </summary>
-     private DrawningTrackedVehicle()
+    private DrawningTrackedVehicle()
     {
         _pictureWidth = null;
         _pictureHeight = null;
@@ -73,10 +97,10 @@ public class DrawningTrackedVehicle
     /// <param name="_drawningFighterHeight">>Высота прорисовки истребителя</param>
 
 
-      protected DrawningTrackedVehicle(int _drawningFighterWidth, int _drawningFighterHeight) : this()
+      protected DrawningTrackedVehicle(int drawningFighterWidth, int drawningFighterHeight) : this()
     {
-        _drawningFighterWidth = _drawningFighterWidth;
-        _drawningFighterHeight = _drawningFighterHeight;
+        _drawningFighterWidth = drawningFighterWidth;
+        _drawningFighterHeight = drawningFighterHeight;
 
     }
 

solution/lab1/FormFighter.Designer.cs

@@ -35,6 +35,8 @@
             buttonUp = new Button();
             buttonRight = new Button();
             buttonCreateTrackedVehicle = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxFighter).BeginInit();
             SuspendLayout();
             // 
@@ -43,9 +45,10 @@
             pictureBoxFighter.Dock = DockStyle.Fill;
             pictureBoxFighter.Location = new Point(0, 0);
             pictureBoxFighter.Name = "pictureBoxFighter";
-            pictureBoxFighter.Size = new Size(1015, 584);
+            pictureBoxFighter.Size = new Size(1164, 584);
             pictureBoxFighter.TabIndex = 0;
             pictureBoxFighter.TabStop = false;
+            pictureBoxFighter.Click += pictureBoxFighter_Click;
             // 
             // buttonCreate
             // 
@@ -64,7 +67,7 @@
             buttonLeft.BackColor = SystemColors.Control;
             buttonLeft.BackgroundImage = Properties.Resources.arrowLeft;
             buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonLeft.Location = new Point(796, 505);
+            buttonLeft.Location = new Point(945, 505);
             buttonLeft.Name = "buttonLeft";
             buttonLeft.Size = new Size(52, 52);
             buttonLeft.TabIndex = 2;
@@ -77,7 +80,7 @@
             buttonDown.BackColor = SystemColors.Control;
             buttonDown.BackgroundImage = Properties.Resources.arrowDown;
             buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonDown.Location = new Point(854, 505);
+            buttonDown.Location = new Point(1003, 505);
             buttonDown.Name = "buttonDown";
             buttonDown.Size = new Size(52, 52);
             buttonDown.TabIndex = 3;
@@ -90,7 +93,7 @@
             buttonUp.BackColor = SystemColors.Control;
             buttonUp.BackgroundImage = Properties.Resources.arrowUp;
             buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonUp.Location = new Point(854, 447);
+            buttonUp.Location = new Point(1003, 447);
             buttonUp.Name = "buttonUp";
             buttonUp.Size = new Size(52, 52);
             buttonUp.TabIndex = 4;
@@ -103,7 +106,7 @@
             buttonRight.BackColor = SystemColors.Control;
             buttonRight.BackgroundImage = Properties.Resources.arrowRight;
             buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonRight.Location = new Point(912, 505);
+            buttonRight.Location = new Point(1061, 505);
             buttonRight.Name = "buttonRight";
             buttonRight.Size = new Size(52, 52);
             buttonRight.TabIndex = 5;
@@ -121,11 +124,33 @@
             buttonCreateTrackedVehicle.UseVisualStyleBackColor = true;
             buttonCreateTrackedVehicle.Click += ButtonCreateTrackedVehicle_Click;
             // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(970, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(182, 33);
+            comboBoxStrategy.TabIndex = 7;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Location = new Point(1040, 51);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(112, 34);
+            buttonStrategyStep.TabIndex = 8;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += button1_Click;
+            // 
             // FormFighter
             // 
             AutoScaleDimensions = new SizeF(10F, 25F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1015, 584);
+            ClientSize = new Size(1164, 584);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
             Controls.Add(buttonCreateTrackedVehicle);
             Controls.Add(buttonRight);
             Controls.Add(buttonUp);
@@ -149,5 +174,7 @@
         private Button buttonUp;
         private Button buttonRight;
         private Button buttonCreateTrackedVehicle;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
     }
 }

solution/lab1/FormFighter.cs

@@ -1,5 +1,6 @@
 using lab1;
 using lab1.Drawnings;
+using lab1.MovementStrategy;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -17,9 +18,15 @@ namespace lab1;
 public partial class FormFighter : Form
 {
     private DrawningTrackedVehicle? _drawningTrackedVehicle;
+    /// <summary>
+    /// Стратегия перемещения
+    /// </summary>
+    private AbstractSrategy? _strategy;
     public FormFighter()
     {
         InitializeComponent();
+        _strategy = null;
+        comboBoxStrategy.Enabled = true;
     }
 
     private void Draw()
@@ -60,6 +67,8 @@ public partial class FormFighter : Form
         }
         _drawningTrackedVehicle.SetPictureSize(pictureBoxFighter.Width, pictureBoxFighter.Height);
         _drawningTrackedVehicle.SetPosition(random.Next(10, 100), random.Next(10, 100));
+        _strategy = null;
+
         Draw();
     }
 
@@ -79,15 +88,15 @@ public partial class FormFighter : Form
     /// <param name="sender"></param>
     /// <param name="e"></param>
     private void ButtonCreateTrackedVehicle_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTrackedVehicle));
-   
-
-  
 
 
 
-  
 
-    
+
+
+
+
+
 
     private void ButtonMove_Click(object sender, EventArgs e)
     {
@@ -120,12 +129,58 @@ public partial class FormFighter : Form
         }
     }
 
-  
+
 
     private void FormFighter_Load(object sender, EventArgs e)
     {
 
     }
 
-   
+    private void checkBox1_CheckedChanged(object sender, EventArgs e)
+    {
+
+    }
+
+    private void pictureBoxFighter_Click(object sender, EventArgs e)
+    {
+
+    }
+
+    private void button1_Click(object sender, EventArgs e)
+    {
+        if (_drawningTrackedVehicle == null)
+        {
+            return;
+        }
+
+        if (comboBoxStrategy.Enabled)
+        {
+            _strategy = comboBoxStrategy.SelectedIndex switch
+            {
+                0 => new MoveToCenter(),
+                1 => new MoveToBorder(),
+                _ => null,
+            };
+            if (_strategy == null)
+            {
+                return;
+            }
+            _strategy.SetData(new MoveableTrackedVehicle(_drawningTrackedVehicle), pictureBoxFighter.Width, pictureBoxFighter.Height);
+        }
+
+        if (_strategy == null)
+        {
+            return;
+        }
+        comboBoxStrategy.Enabled = false;
+        _strategy.MakeStep();
+        Draw();
+
+        if (_strategy.GetStatus() == StrategyStatus.Finish)
+        {
+            comboBoxStrategy.Enabled = true;
+            _strategy = null;
+        }
+    }
 }
+

solution/lab1/MovementStrategy/AbstractSrategy.cs

@@ -0,0 +1,123 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace lab1.MovementStrategy;
+
+public abstract class AbstractSrategy
+{
+    /// <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>
+    /// <returns></returns>
+    public StrategyStatus GetStatus() { return _state; }
+    /// <summary>
+    /// Установка данных
+    /// </summary>
+    /// <param name="moveableObjects">Перемещаемый объект</param>
+    /// <param name="width">Ширина поля</param>
+    /// <param name="height">Высота поля</param>
+    public void SetData(IMoveableObject moveableObjects, int width, int height)
+    {
+        if (moveableObjects == null)
+        {
+            _state = StrategyStatus.NotInit;
+            return;
+        }
+        _state = StrategyStatus.InProgress;
+        _moveableObject = moveableObjects;
+        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;
+    }
+
+}

solution/lab1/MovementStrategy/IMoveableObject.cs

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

solution/lab1/MovementStrategy/MoveToBorder.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace lab1.MovementStrategy;
+
+public class MoveToBorder : AbstractSrategy
+{
+    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();
+    }
+
+}

solution/lab1/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace lab1.MovementStrategy;
+
+public class MoveToCenter : AbstractSrategy
+{
+    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();
+            }
+        }
+    }
+}

solution/lab1/MovementStrategy/MoveableTrackedVehicle.cs

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

solution/lab1/MovementStrategy/MovementDirection.cs

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

solution/lab1/MovementStrategy/ObjectParameters.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace lab1.MovementStrategy;
+
+public class ObjectParameters
+{
+    /// <summary>
+    /// Координатва х
+    /// </summary>
+    private readonly int _x;
+    /// <summary>
+    /// Координатва у
+    /// </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">Координата х</param>
+    /// <param name="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;
+    }
+}

solution/lab1/MovementStrategy/StrategyStatus.cs

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