From 7c96c833556886bf834df0ddbdeec00c25f04a8e Mon Sep 17 00:00:00 2001 From: zolotovart Date: Mon, 11 Mar 2024 19:33:37 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D1=80=D0=B0=D1=82=D0=B5=D0=B3?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectAirbus/Drawnings/DirectionType.cs | 4 + .../ProjectAirbus/Drawnings/DrawingShip.cs | 47 ++++--- .../ProjectAirbus/FormLinkor.Designer.cs | 26 ++++ ProjectAirbus/ProjectAirbus/FormLinkor.cs | 52 +++++++- .../MovementStrategy/AbstractStrategy.cs | 125 ++++++++++++++++++ .../MovementStrategy/IMoveableObject.cs | 25 ++++ .../MovementStrategy/MoveToBorder.cs | 39 ++++++ .../MovementStrategy/MoveToCenter.cs | 55 ++++++++ .../MovementStrategy/MoveableShip.cs | 66 +++++++++ .../MovementStrategy/MovementDirection.cs | 27 ++++ .../MovementStrategy/ObjectParametrs.cs | 65 +++++++++ .../MovementStrategy/StrategyStatus.cs | 16 +++ 12 files changed, 530 insertions(+), 17 deletions(-) create mode 100644 ProjectAirbus/ProjectAirbus/MovementStrategy/AbstractStrategy.cs create mode 100644 ProjectAirbus/ProjectAirbus/MovementStrategy/IMoveableObject.cs create mode 100644 ProjectAirbus/ProjectAirbus/MovementStrategy/MoveToBorder.cs create mode 100644 ProjectAirbus/ProjectAirbus/MovementStrategy/MoveToCenter.cs create mode 100644 ProjectAirbus/ProjectAirbus/MovementStrategy/MoveableShip.cs create mode 100644 ProjectAirbus/ProjectAirbus/MovementStrategy/MovementDirection.cs create mode 100644 ProjectAirbus/ProjectAirbus/MovementStrategy/ObjectParametrs.cs create mode 100644 ProjectAirbus/ProjectAirbus/MovementStrategy/StrategyStatus.cs diff --git a/ProjectAirbus/ProjectAirbus/Drawnings/DirectionType.cs b/ProjectAirbus/ProjectAirbus/Drawnings/DirectionType.cs index 83d5360..9d5386e 100644 --- a/ProjectAirbus/ProjectAirbus/Drawnings/DirectionType.cs +++ b/ProjectAirbus/ProjectAirbus/Drawnings/DirectionType.cs @@ -11,6 +11,10 @@ namespace ProjectLinkor.Drawnings /// public enum DirectionType { + /// + /// Неизвестное направление + /// + Unknow = -1, /// /// Вверх /// diff --git a/ProjectAirbus/ProjectAirbus/Drawnings/DrawingShip.cs b/ProjectAirbus/ProjectAirbus/Drawnings/DrawingShip.cs index 8da4fb7..a3e5dd6 100644 --- a/ProjectAirbus/ProjectAirbus/Drawnings/DrawingShip.cs +++ b/ProjectAirbus/ProjectAirbus/Drawnings/DrawingShip.cs @@ -32,11 +32,28 @@ public class DrawingShip /// /// Ширина прорисовки корабля /// - private readonly int _drawningLinkorWidth = 95; + private readonly int _drawningShipWidth = 95; /// /// Высота прорисовки корабля /// - private readonly int _drawningLinkorHeight = 40; + private readonly int _drawningShipHeight = 40; + + /// + /// Координата X объекта + /// + public int? GetPosX => _startPosX; + /// + /// Координата Y объекта + /// + public int? GetPosY => _startPosY; + // + /// Ширина объекта + /// + public int GetWidth => _drawningShipWidth; + // + /// Высота объекта + /// + public int GetHeight => _drawningShipHeight; /// /// Пустой конструктор @@ -66,8 +83,8 @@ public class DrawingShip /// Высота прорисовки корабля protected DrawingShip(int drawningLinkorWidth, int drawningLinkorHeight) : this() { - _drawningLinkorWidth = drawningLinkorWidth; - _drawningLinkorHeight = drawningLinkorHeight; + _drawningShipWidth = drawningLinkorWidth; + _drawningShipHeight = drawningLinkorHeight; } /// /// Установка границ поля @@ -80,7 +97,7 @@ public class DrawingShip // TODO проверка, что объект "влезает" в размеры поля // если влезает, сохраняем границы и корректируем позицию объекта, если она была уже установлена - if (width > _drawningLinkorWidth && height > _drawningLinkorHeight) + if (width > _drawningShipWidth && height > _drawningShipHeight) { _pictureWidth = width; _pictureHeight = height; @@ -89,13 +106,13 @@ public class DrawingShip { if (_startPosX.Value < 0) _startPosX = 0; if (_startPosY.Value < 0) _startPosY = 0; - if (_startPosX.Value + _drawningLinkorWidth > _pictureWidth) + if (_startPosX.Value + _drawningShipWidth > _pictureWidth) { - _startPosX = _pictureWidth - _drawningLinkorWidth; + _startPosX = _pictureWidth - _drawningShipWidth; } - if (_startPosY.Value + _drawningLinkorHeight > _pictureHeight) + if (_startPosY.Value + _drawningShipHeight > _pictureHeight) { - _startPosY = _pictureHeight - _drawningLinkorHeight; + _startPosY = _pictureHeight - _drawningShipHeight; } } @@ -124,13 +141,13 @@ public class DrawingShip if (_startPosX.Value < 0) _startPosX = 0; if (_startPosY.Value < 0) _startPosY = 0; - if (_startPosX.Value + _drawningLinkorWidth > _pictureWidth) + if (_startPosX.Value + _drawningShipWidth > _pictureWidth) { - _startPosX = _pictureWidth - _drawningLinkorWidth; + _startPosX = _pictureWidth - _drawningShipWidth; } - if (_startPosY.Value + _drawningLinkorHeight > _pictureHeight) + if (_startPosY.Value + _drawningShipHeight > _pictureHeight) { - _startPosY = _pictureHeight - _drawningLinkorHeight; + _startPosY = _pictureHeight - _drawningShipHeight; } } @@ -167,14 +184,14 @@ public class DrawingShip return true; // вправо case DirectionType.Right: - if (_startPosX.Value + _drawningLinkorWidth + EntityShip.Step < _pictureWidth) + if (_startPosX.Value + _drawningShipWidth + EntityShip.Step < _pictureWidth) { _startPosX += (int)EntityShip.Step; } return true; //вниз case DirectionType.Down: - if (_startPosY.Value + _drawningLinkorHeight + EntityShip.Step < _pictureHeight) + if (_startPosY.Value + _drawningShipHeight + EntityShip.Step < _pictureHeight) { _startPosY += (int)EntityShip.Step; } diff --git a/ProjectAirbus/ProjectAirbus/FormLinkor.Designer.cs b/ProjectAirbus/ProjectAirbus/FormLinkor.Designer.cs index 68059e5..b277cc7 100644 --- a/ProjectAirbus/ProjectAirbus/FormLinkor.Designer.cs +++ b/ProjectAirbus/ProjectAirbus/FormLinkor.Designer.cs @@ -35,6 +35,8 @@ buttonDown = new Button(); buttonUp = new Button(); buttonCreateShip = new Button(); + comboBoxStrategy = new ComboBox(); + buttonStrategyStep = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxLinkor).BeginInit(); SuspendLayout(); // @@ -117,11 +119,33 @@ buttonCreateShip.UseVisualStyleBackColor = true; buttonCreateShip.Click += ButtonCreateShip_Click; // + // comboBoxStrategy + // + comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxStrategy.FormattingEnabled = true; + comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" }); + comboBoxStrategy.Location = new Point(606, 12); + comboBoxStrategy.Name = "comboBoxStrategy"; + comboBoxStrategy.Size = new Size(182, 33); + comboBoxStrategy.TabIndex = 7; + // + // buttonStrategyStep + // + buttonStrategyStep.Location = new Point(676, 51); + buttonStrategyStep.Name = "buttonStrategyStep"; + buttonStrategyStep.Size = new Size(112, 34); + buttonStrategyStep.TabIndex = 8; + buttonStrategyStep.Text = "Шаг"; + buttonStrategyStep.UseVisualStyleBackColor = true; + buttonStrategyStep.Click += ButtonStrategyStep_Click; + // // FormLinkor // AutoScaleDimensions = new SizeF(10F, 25F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(800, 414); + Controls.Add(buttonStrategyStep); + Controls.Add(comboBoxStrategy); Controls.Add(buttonCreateShip); Controls.Add(buttonUp); Controls.Add(buttonDown); @@ -146,5 +170,7 @@ private Button buttonDown; private Button buttonUp; private Button buttonCreateShip; + private ComboBox comboBoxStrategy; + private Button buttonStrategyStep; } } \ No newline at end of file diff --git a/ProjectAirbus/ProjectAirbus/FormLinkor.cs b/ProjectAirbus/ProjectAirbus/FormLinkor.cs index 0e9dc0a..e74b39e 100644 --- a/ProjectAirbus/ProjectAirbus/FormLinkor.cs +++ b/ProjectAirbus/ProjectAirbus/FormLinkor.cs @@ -8,6 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using ProjectLinkor.Drawnings; +using ProjectLinkor.MovementStrategy; namespace ProjectLinkor { @@ -15,9 +16,15 @@ namespace ProjectLinkor { private DrawingShip? _drawingShip; + /// + /// Стратегия перемещения + /// + private AbstractStrategy? _strategy; + public FormLinkor() { InitializeComponent(); + _strategy = null; } @@ -54,6 +61,8 @@ namespace ProjectLinkor } _drawingShip.SetPictureSize(pictureBoxLinkor.Width, pictureBoxLinkor.Height); _drawingShip.SetPosition(random.Next(10, 100), random.Next(10, 100)); + _strategy = null; + comboBoxStrategy.Enabled = true; Draw(); } /// @@ -106,7 +115,6 @@ namespace ProjectLinkor } - private void FormLinkor_SizeChanged(object sender, EventArgs e) { if (_drawingShip == null) @@ -118,7 +126,47 @@ namespace ProjectLinkor Draw(); } } + /* + private void pictureBoxLinkor_Click(object sender, EventArgs e) + { - + } + */ + + private void ButtonStrategyStep_Click(object sender, EventArgs e) + { + if (_drawingShip == null) + { + return; + } + if (comboBoxStrategy.Enabled) + { + _strategy = comboBoxStrategy.SelectedIndex switch + { + 0 => new MoveToCenter(), + 1 => new MoveToBorder(), + _ => null, + }; + if (_strategy == null) + { + return; + } + _strategy.SetData(new MoveableShip(_drawingShip), + pictureBoxLinkor.Width, pictureBoxLinkor.Height); + } + if (_strategy == null) + { + return; + } + comboBoxStrategy.Enabled = false; + _strategy.MakeStep(); + Draw(); + if (_strategy.GetStatus() == StrategyStatus.Finish) + { + comboBoxStrategy.Enabled = true; + _strategy = null; + } + + } } } diff --git a/ProjectAirbus/ProjectAirbus/MovementStrategy/AbstractStrategy.cs b/ProjectAirbus/ProjectAirbus/MovementStrategy/AbstractStrategy.cs new file mode 100644 index 0000000..e046289 --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/MovementStrategy/AbstractStrategy.cs @@ -0,0 +1,125 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLinkor.MovementStrategy; + +public abstract class AbstractStrategy +{ + /// + /// Перемещаемый объект + /// + private IMoveableObject? _moveableObject; + /// + /// Статус перемещения + /// + private StrategyStatus _state = StrategyStatus.NotInit; + /// + /// Ширина поля + /// + protected int FieldWidth { get; private set; } + /// + /// Высота поля + /// + protected int FieldHeight { get; private set; } + /// + /// Статус перемещения + /// + public StrategyStatus GetStatus() { return _state; } + /// + /// Установка данных + /// + /// Перемещаемый объект + /// Ширина поля + /// Высота поля + 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; + } + /// + /// Шаг перемещения + /// + public void MakeStep() + { + if (_state != StrategyStatus.InProgress) + { + return; + } + if (IsTargetDestinaion()) + { + _state = StrategyStatus.Finish; + return; + } + MoveToTarget(); + } + /// + /// Перемещение влево + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveLeft() => MoveTo(MovementDirection.Left); + /// + /// Перемещение вправо + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveRight() => MoveTo(MovementDirection.Right); + /// + /// Перемещение вверх + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveUp() => MoveTo(MovementDirection.Up); + /// + /// Перемещение вниз + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveDown() => MoveTo(MovementDirection.Down); + /// + /// Параметры объекта + /// + protected ObjectParametrs? GetObjectParameters => + _moveableObject?.GetObjectPosition; + /// + /// Шаг объекта + /// + /// + protected int? GetStep() + { + if (_state != StrategyStatus.InProgress) + { + return null; + } + return _moveableObject?.GetStep; + } + /// + /// Перемещение к цели + /// + protected abstract void MoveToTarget(); + /// + /// Достигнута ли цель + /// + /// + protected abstract bool IsTargetDestinaion(); + /// + /// Попытка перемещения в требуемом направлении + /// + /// Направление + /// Результат попытки (true - удалось переместиться, false - неудача) + private bool MoveTo(MovementDirection movementDirection) + { + if (_state != StrategyStatus.InProgress) + { + return false; + } + return _moveableObject?.TryMoveObject(movementDirection) ?? false; + } + +} diff --git a/ProjectAirbus/ProjectAirbus/MovementStrategy/IMoveableObject.cs b/ProjectAirbus/ProjectAirbus/MovementStrategy/IMoveableObject.cs new file mode 100644 index 0000000..b12ad5c --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/MovementStrategy/IMoveableObject.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLinkor.MovementStrategy; + +public interface IMoveableObject +{ + /// + /// Получение координаты объекта + /// + ObjectParametrs? GetObjectPosition { get; } + /// + /// Шаг объекта + /// + int GetStep { get; } + /// + /// Попытка переместить объект в указанном направлении + /// + /// Направление + /// true - объект перемещен, false - перемещение невозможно + bool TryMoveObject(MovementDirection direction); +} diff --git a/ProjectAirbus/ProjectAirbus/MovementStrategy/MoveToBorder.cs b/ProjectAirbus/ProjectAirbus/MovementStrategy/MoveToBorder.cs new file mode 100644 index 0000000..f287d2c --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/MovementStrategy/MoveToBorder.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLinkor.MovementStrategy; + +public class MoveToBorder : AbstractStrategy +{ + protected override bool IsTargetDestinaion() + { + ObjectParametrs? objParams = GetObjectParameters; + if (objParams == null) + { + return false; + } + return objParams.RightBorder + GetStep() >= FieldWidth && + objParams.DownBorder + GetStep() >= FieldHeight; + } + protected override void MoveToTarget() + { + ObjectParametrs? objParams = GetObjectParameters; + if (objParams == null) + { + return; + } + int diffX = objParams.RightBorder - FieldWidth; + if (Math.Abs(diffX) > GetStep()) + { + MoveRight(); + } + int diffY = objParams.DownBorder - FieldHeight; + if (Math.Abs(diffY) > GetStep()) + { + MoveDown(); + } + } +} diff --git a/ProjectAirbus/ProjectAirbus/MovementStrategy/MoveToCenter.cs b/ProjectAirbus/ProjectAirbus/MovementStrategy/MoveToCenter.cs new file mode 100644 index 0000000..c17e205 --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/MovementStrategy/MoveToCenter.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLinkor.MovementStrategy; + +public class MoveToCenter : AbstractStrategy +{ + protected override bool IsTargetDestinaion() + { + ObjectParametrs? 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() + { + ObjectParametrs? 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(); + } + } + } +} diff --git a/ProjectAirbus/ProjectAirbus/MovementStrategy/MoveableShip.cs b/ProjectAirbus/ProjectAirbus/MovementStrategy/MoveableShip.cs new file mode 100644 index 0000000..42a2135 --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/MovementStrategy/MoveableShip.cs @@ -0,0 +1,66 @@ +using ProjectLinkor.Drawnings; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLinkor.MovementStrategy; +/// +/// Класс-реализация IMoveableObject с использованием DrawingShip +/// +public class MoveableShip : IMoveableObject +{ + /// + /// Поле-объект класса DrawningCar или его наследника + /// + private readonly DrawingShip? _ship = null; + /// + /// Конструктор + /// + /// Объект класса DrawningCar + public MoveableShip(DrawingShip ship) + { + _ship = ship; + } + + public ObjectParametrs? GetObjectPosition + { + get + { + if (_ship == null || _ship.EntityShip == null || + !_ship.GetPosX.HasValue || !_ship.GetPosY.HasValue) + { + return null; + } + return new ObjectParametrs(_ship.GetPosX.Value, _ship.GetPosY.Value, _ship.GetWidth, _ship.GetHeight); + } + } + public int GetStep => (int)(_ship?.EntityShip?.Step ?? 0); + public bool TryMoveObject(MovementDirection direction) + { + if (_ship == null || _ship.EntityShip == null) + { + return false; + } + return _ship.MoveTransport(GetDirectionType(direction)); + } + + + /// + /// Конвертация из MovementDirection в DirectionType + /// + /// MovementDirection + /// DirectionType + 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, + }; + } +} diff --git a/ProjectAirbus/ProjectAirbus/MovementStrategy/MovementDirection.cs b/ProjectAirbus/ProjectAirbus/MovementStrategy/MovementDirection.cs new file mode 100644 index 0000000..34c9dd6 --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/MovementStrategy/MovementDirection.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLinkor.MovementStrategy; + +public enum MovementDirection +{ + /// + /// Вверх + /// + Up = 1, + /// + /// Вниз + /// + Down = 2, + /// + /// Влево + /// + Left = 3, + // + /// Вправо + /// + Right = 4 +} diff --git a/ProjectAirbus/ProjectAirbus/MovementStrategy/ObjectParametrs.cs b/ProjectAirbus/ProjectAirbus/MovementStrategy/ObjectParametrs.cs new file mode 100644 index 0000000..dfc3f85 --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/MovementStrategy/ObjectParametrs.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLinkor.MovementStrategy; + +public class ObjectParametrs +{ + /// + /// Координата X + /// + private readonly int _x; + /// + /// Координата Y + /// + private readonly int _y; + /// + /// Ширина объекта + /// + private readonly int _width; + /// + /// Высота объекта + /// + private readonly int _height; + /// + /// Левая граница + /// + public int LeftBorder => _x; + /// + /// Верхняя граница + /// + public int TopBorder => _y; + /// + /// Правая граница + /// + public int RightBorder => _x + _width; + /// + /// Нижняя граница + /// + public int DownBorder => _y + _height; + /// + /// Середина объекта + /// + public int ObjectMiddleHorizontal => _x + _width / 2; + /// + /// Середина объекта + /// + public int ObjectMiddleVertical => _y + _height / 2; + /// + /// Конструктор + /// + /// Координата X + /// Координата Y + /// Ширина объекта + /// Высота объекта + public ObjectParametrs(int x, int y, int width, int height) + { + _x = x; + _y = y; + _width = width; + _height = height; + } +} diff --git a/ProjectAirbus/ProjectAirbus/MovementStrategy/StrategyStatus.cs b/ProjectAirbus/ProjectAirbus/MovementStrategy/StrategyStatus.cs new file mode 100644 index 0000000..4f934ae --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/MovementStrategy/StrategyStatus.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLinkor.MovementStrategy; +public enum StrategyStatus +{ + //всё готово к началу + NotInit, + //выполняется + InProgress, + //завершено + Finish +}