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

ProjectSportCar/ProjectSportCar/Drawnings/DirectionType.cs

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

ProjectSportCar/ProjectSportCar/Drawnings/DrawningCar.cs

@@ -39,6 +39,26 @@ public class DrawningCar
 	/// </summary>
 	private readonly int _drawningCarHeight = 50;
 
+	/// <summary>
+	/// Координата X объекта
+	/// </summary>
+	public int? GetPosX => _startPosX;
+
+	/// <summary>
+	/// Координата Y объекта
+	/// </summary>
+	public int? GetPosY => _startPosY;
+
+	/// <summary>
+	/// Ширина объекта
+	/// </summary>
+	public int GetWidth => _drawningCarWidth;
+
+	/// <summary>
+	/// Высота объекта
+	/// </summary>
+	public int GetHeight => _drawningCarHeight;
+
 	/// <summary>
 	/// Пустой конструктор
 	/// </summary>

ProjectSportCar/ProjectSportCar/FormSportCar.Designer.cs

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

ProjectSportCar/ProjectSportCar/FormSportCar.cs

@@ -1,4 +1,5 @@
 using ProjectSportCar.Drawnings;
+using ProjectSportCar.MovementStrategy;
 
 namespace ProjectSportCar;
 
@@ -12,12 +13,18 @@ public partial class FormSportCar : Form
 	/// </summary>
 	private DrawningCar? _drawningCar;
 
+	/// <summary>
+	/// Стратегия перемещения
+	/// </summary>
+	private AbstractStrategy? _strategy;
+
 	/// <summary>
 	/// Конструктор формы
 	/// </summary>
 	public FormSportCar()
 	{
 		InitializeComponent();
+		_strategy = null;
 	}
 
 	/// <summary>
@@ -61,6 +68,8 @@ public partial class FormSportCar : Form
 
 		_drawningCar.SetPictureSize(pictureBoxSportCar.Width, pictureBoxSportCar.Height);
 		_drawningCar.SetPosition(random.Next(10, 100), random.Next(10, 100));
+		_strategy = null;
+		comboBoxStrategy.Enabled = true;
 		Draw();
 	}
 
@@ -113,4 +122,47 @@ public partial class FormSportCar : Form
 			Draw();
 		}
 	}
+
+	/// <summary>
+	/// Обработка нажатия кнопки "Шаг"
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+	private void ButtonStrategyStep_Click(object sender, EventArgs e)
+	{
+		if (_drawningCar == null)
+		{
+			return;
+		}
+
+		if (comboBoxStrategy.Enabled)
+		{
+			_strategy = comboBoxStrategy.SelectedIndex switch
+			{
+				0 => new MoveToCenter(),
+				1 => new MoveToBorder(),
+				_ => null,
+			};
+			if (_strategy == null)
+			{
+				return;
+			}
+			_strategy.SetData(new MoveableCar(_drawningCar), pictureBoxSportCar.Width, pictureBoxSportCar.Height);
+		}
+
+		if (_strategy == null)
+		{
+			return;
+		}
+
+		comboBoxStrategy.Enabled = false;
+		_strategy.MakeStep();
+		Draw();
+
+		if (_strategy.GetStatus() == StrategyStatus.Finish)
+		{
+			comboBoxStrategy.Enabled = true;
+			_strategy = null;
+		}
+	}
 }

ProjectSportCar/ProjectSportCar/MovementStrategy/AbstractStrategy.cs

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

ProjectSportCar/ProjectSportCar/MovementStrategy/IMoveableObjectcs.cs

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

ProjectSportCar/ProjectSportCar/MovementStrategy/MoveToBorder.cs

@@ -0,0 +1,14 @@
+namespace ProjectSportCar.MovementStrategy;
+
+public class MoveToBorder : AbstractStrategy
+{
+	protected override bool IsTargetDestinaion()
+	{
+		throw new NotImplementedException();
+	}
+
+	protected override void MoveToTarget()
+	{
+		throw new NotImplementedException();
+	}
+}

ProjectSportCar/ProjectSportCar/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,54 @@
+namespace ProjectSportCar.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();
+			}
+		}
+	}
+}

ProjectSportCar/ProjectSportCar/MovementStrategy/MoveableCar.cs

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

ProjectSportCar/ProjectSportCar/MovementStrategy/MovementDirection.cs

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

ProjectSportCar/ProjectSportCar/MovementStrategy/ObjectParameters.cs

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

ProjectSportCar/ProjectSportCar/MovementStrategy/StrategyStatus.cs

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