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

AirplaneWithRadar/ProjectAirplaneWithRadar/Drawnings/DirectionType.cs

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

AirplaneWithRadar/ProjectAirplaneWithRadar/Drawnings/DrawingAirplaneWithRadar.cs

@@ -16,7 +16,7 @@ namespace ProjectAirplaneWithRadar.Drawnings
         /// <param name="additionalColor">Дополнительный цвет</param>
         /// <param name="wheels">Шасси</param>
         /// <param name="rocket">Ракета</param>
-        public DrawingAirplaneWithRadar(int speed, double weight, Color bodyColor, Color additionalColor, bool wheels, bool rocket) : base(150, 85)
+        public DrawingAirplaneWithRadar(int speed, double weight, Color bodyColor, Color additionalColor, bool wheels, bool rocket) : base(150, 93)
         {
             EntityAirplane = new EntityAirplaneWithRadar(speed, weight, bodyColor, additionalColor, wheels, rocket);         
         }

AirplaneWithRadar/ProjectAirplaneWithRadar/Drawnings/DrawningAirplane.cs

@@ -42,6 +42,26 @@ namespace ProjectAirplaneWithRadar.Drawnings
         /// </summary>
         public readonly int PlaneHeight = 85;
 
+        /// <summary>
+        /// Координата X объекта
+        /// </summary>
+        public int? GetPosX => _startPosX;
+
+        /// <summary>
+        /// Координата Y объекта
+        /// </summary>
+        public int? GetPosY => _startPosY;
+
+        /// <summary>
+        /// Ширина объекта
+        /// </summary>
+        public int GetWidth => PlaneWidth;
+
+        /// <summary>
+        /// Высота объекта
+        /// </summary>
+        public int GetHeight => PlaneHeight;
+
         /// <summary>
         /// Пустой конструктор
         /// </summary>
@@ -214,7 +234,7 @@ namespace ProjectAirplaneWithRadar.Drawnings
 
             //Хвост
             Point[] points = {
-                new Point(_startPosX.Value + 10, _startPosY.Value +  10),
+                new Point(_startPosX.Value + 10, _startPosY.Value),
                 new Point(_startPosX.Value + 10, _startPosY.Value +  50),
                 new Point(_startPosX.Value + 50, _startPosY.Value +  50)
             };

AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneWithRadar.Designer.cs

@@ -35,6 +35,8 @@
             buttonDown = new Button();
             buttonUp = new Button();
             ButtonCreateAirplane = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxAirplaneWithRadar).BeginInit();
             SuspendLayout();
             // 
@@ -117,11 +119,33 @@
             ButtonCreateAirplane.UseVisualStyleBackColor = true;
             ButtonCreateAirplane.Click += ButtonCreateAirplane_Click;
             // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(854, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(121, 23);
+            comboBoxStrategy.TabIndex = 7;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Location = new Point(900, 41);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(75, 23);
+            buttonStrategyStep.TabIndex = 8;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += buttonStrategyStep_Click;
+            // 
             // FormAirplaneWithRadar
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(987, 477);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
             Controls.Add(ButtonCreateAirplane);
             Controls.Add(buttonUp);
             Controls.Add(buttonDown);
@@ -144,5 +168,7 @@
         private Button buttonDown;
         private Button buttonUp;
         private Button ButtonCreateAirplane;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
     }
 }

AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneWithRadar.cs

@@ -1,4 +1,5 @@
 using ProjectAirplaneWithRadar.Drawnings;
+using ProjectAirplaneWithRadar.MovementStrategy;
 
 namespace ProjectAirplaneWithRadar
 {
@@ -12,12 +13,18 @@ namespace ProjectAirplaneWithRadar
         /// </summary>
         private DrawningAirplane? _drawingAirplane;
 
+        /// <summary>
+        /// Стратегия перемещения
+        /// </summary>
+        private AbstractStrategy? _strategy;
+
         /// <summary>
         /// Конструктор формы
         /// </summary>
         public FormAirplaneWithRadar()
         {
             InitializeComponent();
+            _strategy = null;
         }
 
         /// <summary>
@@ -47,6 +54,8 @@ namespace ProjectAirplaneWithRadar
             _drawingAirplane.SetPictureSize(pictureBoxAirplaneWithRadar.Width, pictureBoxAirplaneWithRadar.Height);
             _drawingAirplane.SetPosition(random.Next(10, 100), random.Next(10, 100));
 
+            _strategy = null;
+            comboBoxStrategy.Enabled = true;
             UpdatePlane();
         }
 
@@ -77,7 +86,7 @@ namespace ProjectAirplaneWithRadar
             Graphics gr = Graphics.FromImage(bmp);
             _drawingAirplane?.DrawTransport(gr);
             pictureBoxAirplaneWithRadar.Image = bmp;
-        }        
+        }
 
         /// <summary>
         /// Перемещение объекта по форме (нажатие кнопок навигации)
@@ -119,5 +128,48 @@ namespace ProjectAirplaneWithRadar
                 UpdatePlane();
             }
         }
+
+        /// <summary>
+        /// Обработка нажатия кнопки "Шаг"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonStrategyStep_Click(object sender, EventArgs e)
+        {
+            if(_drawingAirplane == null)
+            {
+                return;
+            }
+
+            if (comboBoxStrategy.Enabled)
+            {
+                _strategy = comboBoxStrategy.SelectedIndex switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_strategy == null)
+                {
+                    return;
+                }
+                _strategy.SetData(new MoveablePlane(_drawingAirplane), pictureBoxAirplaneWithRadar.Width, pictureBoxAirplaneWithRadar.Height);
+            }
+
+            if(_strategy == null)
+            {
+                return;
+            }
+
+            comboBoxStrategy.Enabled = false;
+            _strategy.MakeStep();
+            UpdatePlane();
+
+            if(_strategy.GetStatus() == StrategyStatus.Finish)
+            {
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+            }
+        }
     }
 }

AirplaneWithRadar/ProjectAirplaneWithRadar/MovementStrategy/AbstractStrategy.cs

@@ -0,0 +1,141 @@
+namespace ProjectAirplaneWithRadar.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>
+        /// <returns></returns>
+        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 (IsTargetDestination())
+            {
+                _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 IsTargetDestination();
+
+        /// <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;
+        }
+    }
+}

AirplaneWithRadar/ProjectAirplaneWithRadar/MovementStrategy/IMoveableObject.cs

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

AirplaneWithRadar/ProjectAirplaneWithRadar/MovementStrategy/MoveToBorder.cs

@@ -0,0 +1,53 @@
+namespace ProjectAirplaneWithRadar.MovementStrategy
+{
+    /// <summary>
+    /// Стратегия перемещения объекта к правой нижней границы
+    /// </summary>
+    public class MoveToBorder : AbstractStrategy
+    {
+        protected override bool IsTargetDestination()
+        {
+            ObjectParameters? objParams = GetObjectParameters;
+            if (objParams == null)
+            {
+                return false;
+            }
+
+            return objParams.RightBorder <= FieldWidth && objParams.RightBorder + GetStep() >= FieldWidth &&
+            objParams.DownBorder <= FieldHeight && 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();
+                }
+            }
+        }
+    }
+}

AirplaneWithRadar/ProjectAirplaneWithRadar/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,55 @@
+namespace ProjectAirplaneWithRadar.MovementStrategy
+{
+    /// <summary>
+    /// Стратегия перемещения объекта в центр экрана
+    /// </summary>
+    public class MoveToCenter : AbstractStrategy
+    {
+        protected override bool IsTargetDestination()
+        {
+            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();
+                }
+            }
+        }
+    }
+}

AirplaneWithRadar/ProjectAirplaneWithRadar/MovementStrategy/MoveablePlane.cs

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

AirplaneWithRadar/ProjectAirplaneWithRadar/MovementStrategy/MovementDirection.cs

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

AirplaneWithRadar/ProjectAirplaneWithRadar/MovementStrategy/ObjectParameters.cs

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

AirplaneWithRadar/ProjectAirplaneWithRadar/MovementStrategy/StrategyStatus.cs

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