diff --git a/TrolleybusProject/TrolleybusProject/DirectionType.cs b/TrolleybusProject/TrolleybusProject/DirectionType.cs index 39d3b0f..81b2b42 100644 --- a/TrolleybusProject/TrolleybusProject/DirectionType.cs +++ b/TrolleybusProject/TrolleybusProject/DirectionType.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace TrolleybusProject.Drawnings; public enum DirectionType -{ +{ Unknow=-1, /// /// Вверх /// diff --git a/TrolleybusProject/TrolleybusProject/Drawnings/DrawningBus.cs b/TrolleybusProject/TrolleybusProject/Drawnings/DrawningBus.cs index 785995e..3a60e8e 100644 --- a/TrolleybusProject/TrolleybusProject/Drawnings/DrawningBus.cs +++ b/TrolleybusProject/TrolleybusProject/Drawnings/DrawningBus.cs @@ -40,6 +40,24 @@ public class DrawningBus public readonly int _drawningBusHeight = 86; + /// + /// Координата X объекта + /// + public int? GetPosX => _startPosX; + /// + /// Координата Y объекта + /// + public int? GetPosY => _startPosY; + /// + /// Ширина объекта + /// + public int GetWidth => _drawningBusWidth; + /// + /// Высота объекта + /// + public int GetHeight => _drawningBusHeight; + + /// /// Конструктор пустой diff --git a/TrolleybusProject/TrolleybusProject/FormTrolleybus.Designer.cs b/TrolleybusProject/TrolleybusProject/FormTrolleybus.Designer.cs index 49c9e8d..0205489 100644 --- a/TrolleybusProject/TrolleybusProject/FormTrolleybus.Designer.cs +++ b/TrolleybusProject/TrolleybusProject/FormTrolleybus.Designer.cs @@ -35,6 +35,8 @@ buttonUp = new Button(); buttonDown = new Button(); buttonCreateBus = new Button(); + comboBoxStrategy = new ComboBox(); + buttonStrategyStep = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxTrolleybus).BeginInit(); SuspendLayout(); // @@ -117,11 +119,33 @@ buttonCreateBus.UseVisualStyleBackColor = true; buttonCreateBus.Click += buttonCreateBus_Click; // + // comboBoxStrategy + // + comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxStrategy.FormattingEnabled = true; + comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" }); + comboBoxStrategy.Location = new Point(1079, 29); + comboBoxStrategy.Name = "comboBoxStrategy"; + comboBoxStrategy.Size = new Size(182, 33); + comboBoxStrategy.TabIndex = 7; + // + // buttonStrategyStep + // + buttonStrategyStep.Location = new Point(1149, 68); + buttonStrategyStep.Name = "buttonStrategyStep"; + buttonStrategyStep.Size = new Size(112, 34); + buttonStrategyStep.TabIndex = 8; + buttonStrategyStep.Text = "Шаг"; + buttonStrategyStep.UseVisualStyleBackColor = true; + buttonStrategyStep.Click += buttonStrategyStep_Click; + // // FormTrolleybus // AutoScaleDimensions = new SizeF(10F, 25F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(1273, 561); + Controls.Add(buttonStrategyStep); + Controls.Add(comboBoxStrategy); Controls.Add(buttonCreateBus); Controls.Add(buttonDown); Controls.Add(buttonUp); @@ -144,5 +168,7 @@ private Button buttonUp; private Button buttonDown; private Button buttonCreateBus; + private ComboBox comboBoxStrategy; + private Button buttonStrategyStep; } } \ No newline at end of file diff --git a/TrolleybusProject/TrolleybusProject/FormTrolleybus.cs b/TrolleybusProject/TrolleybusProject/FormTrolleybus.cs index bfa8d9e..644be9c 100644 --- a/TrolleybusProject/TrolleybusProject/FormTrolleybus.cs +++ b/TrolleybusProject/TrolleybusProject/FormTrolleybus.cs @@ -8,16 +8,19 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using TrolleybusProject.Drawnings; +using TrolleybusProject.MovementStrategy; namespace TrolleybusProject { public partial class FormTrolleybus : Form { private DrawningBus? _drawningBus; + + private AbstractractStrategy? _strategy; public FormTrolleybus() { InitializeComponent(); - + _strategy = null; } @@ -73,8 +76,9 @@ namespace TrolleybusProject pictureBoxTrolleybus.Height); _drawningBus.SetPosition(random.Next(10, 100), random.Next(10, 100)); - Draw(); - + _strategy = null; + comboBoxStrategy.Enabled = true; + Draw(); } @@ -89,6 +93,11 @@ namespace TrolleybusProject CreateObject(nameof(DrawningTrolleybus)); } + + + + + private void buttonMove_Click(object sender, EventArgs e) { if (_drawningBus == null) @@ -122,10 +131,55 @@ namespace TrolleybusProject } + + + + + private void buttonCreateBus_Click(object sender, EventArgs e) { CreateObject(nameof(DrawningBus)); } + + + + + + private void buttonStrategyStep_Click(object sender, EventArgs e) + { + if (_drawningBus == null) + { + return; + } + if (comboBoxStrategy.Enabled) + { + _strategy = comboBoxStrategy.SelectedIndex switch + { + 0 => new MoveToCenter(), + 1 => new MoveToBorder(), + _ => null, + }; + if (_strategy == null) + { + return; + } + _strategy.SetData(new MoveableBus(_drawningBus), + pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height); + } + if (_strategy == null) + { + return; + } + comboBoxStrategy.Enabled = false; + _strategy.MakeStep(); + Draw(); + if (_strategy.GetStatus() == StrategyStatus.Finish) + { + comboBoxStrategy.Enabled = true; + _strategy = null; + } + } + } -} \ No newline at end of file +} diff --git a/TrolleybusProject/TrolleybusProject/MovementStrategy/AbstractractStrategy.cs b/TrolleybusProject/TrolleybusProject/MovementStrategy/AbstractractStrategy.cs new file mode 100644 index 0000000..a71e8f9 --- /dev/null +++ b/TrolleybusProject/TrolleybusProject/MovementStrategy/AbstractractStrategy.cs @@ -0,0 +1,127 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TrolleybusProject.MovementStrategy; + +public abstract class AbstractractStrategy +{ + /// + /// Перемещаемый объект + /// + private IMoveableObjectcs? _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(IMoveableObjectcs 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 ObjectParameters? 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/TrolleybusProject/TrolleybusProject/MovementStrategy/IMoveableObjectcs.cs b/TrolleybusProject/TrolleybusProject/MovementStrategy/IMoveableObjectcs.cs new file mode 100644 index 0000000..ba63901 --- /dev/null +++ b/TrolleybusProject/TrolleybusProject/MovementStrategy/IMoveableObjectcs.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TrolleybusProject.MovementStrategy; + +public interface IMoveableObjectcs +{ + /// + /// Получение координаты объекта + /// + ObjectParameters? GetObjectPosition { get; } + /// + /// Шаг объекта + /// + int GetStep { get; } + /// + /// Попытка переместить объект в указанном направлении + /// + /// Направление + /// true - объект перемещен, false - перемещение невозможно +bool TryMoveObject(MovementDirection direction); + + + + + +} diff --git a/TrolleybusProject/TrolleybusProject/MovementStrategy/MoveToBorder.cs b/TrolleybusProject/TrolleybusProject/MovementStrategy/MoveToBorder.cs new file mode 100644 index 0000000..655d0be --- /dev/null +++ b/TrolleybusProject/TrolleybusProject/MovementStrategy/MoveToBorder.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TrolleybusProject.MovementStrategy; + +public class MoveToBorder: AbstractractStrategy +{ + protected override bool IsTargetDestinaion() + { + 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(); + } + } + } +} diff --git a/TrolleybusProject/TrolleybusProject/MovementStrategy/MoveToCenter.cs b/TrolleybusProject/TrolleybusProject/MovementStrategy/MoveToCenter.cs new file mode 100644 index 0000000..40df469 --- /dev/null +++ b/TrolleybusProject/TrolleybusProject/MovementStrategy/MoveToCenter.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TrolleybusProject.MovementStrategy; + +public class MoveToCenter : AbstractractStrategy +{ + 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(); + } + } + } + +} diff --git a/TrolleybusProject/TrolleybusProject/MovementStrategy/MoveableBus.cs b/TrolleybusProject/TrolleybusProject/MovementStrategy/MoveableBus.cs new file mode 100644 index 0000000..a69c00d --- /dev/null +++ b/TrolleybusProject/TrolleybusProject/MovementStrategy/MoveableBus.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TrolleybusProject.Drawnings; + +namespace TrolleybusProject.MovementStrategy; + +public class MoveableBus : IMoveableObjectcs +{ + /// + /// Поле-объект класса DrawningBus или его наследника + /// + private readonly DrawningBus? _bus = null; + /// + /// Конструктор + /// + /// Объект класса DrawningBus + public MoveableBus(DrawningBus bus) + { + _bus = bus; + } + public ObjectParameters? GetObjectPosition + { + get + { + if (_bus == null || _bus.EntityBus == null || + !_bus.GetPosX.HasValue || !_bus.GetPosY.HasValue) + { + return null; + } + return new ObjectParameters(_bus.GetPosX.Value, + _bus.GetPosY.Value, _bus.GetWidth, _bus.GetHeight); + } + } + public int GetStep => (int)(_bus?.EntityBus?.Step ?? 0); + public bool TryMoveObject(MovementDirection direction) + { + if (_bus == null || _bus.EntityBus == null) + { + return false; + } + return _bus.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/TrolleybusProject/TrolleybusProject/MovementStrategy/MovementDirection.cs b/TrolleybusProject/TrolleybusProject/MovementStrategy/MovementDirection.cs new file mode 100644 index 0000000..ddce05a --- /dev/null +++ b/TrolleybusProject/TrolleybusProject/MovementStrategy/MovementDirection.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TrolleybusProject.MovementStrategy; + +public enum MovementDirection +{ + /// + /// Вверх + /// + Up = 1, + /// + /// Вниз + /// + Down = 2, + /// + /// Влево + /// + Left = 3, + /// + /// Вправо + /// + Right = 4 +} diff --git a/TrolleybusProject/TrolleybusProject/MovementStrategy/ObjectParameters.cs b/TrolleybusProject/TrolleybusProject/MovementStrategy/ObjectParameters.cs new file mode 100644 index 0000000..69bdae0 --- /dev/null +++ b/TrolleybusProject/TrolleybusProject/MovementStrategy/ObjectParameters.cs @@ -0,0 +1,70 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TrolleybusProject.MovementStrategy +{ + public class ObjectParameters + { + /// + /// Координата 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 ObjectParameters(int x, int y, int width, int height) + { + _x = x; + _y = y; + _width = width; + _height = height; + } + + + + + } +} diff --git a/TrolleybusProject/TrolleybusProject/MovementStrategy/StrategyStatus.cs b/TrolleybusProject/TrolleybusProject/MovementStrategy/StrategyStatus.cs new file mode 100644 index 0000000..5c85260 --- /dev/null +++ b/TrolleybusProject/TrolleybusProject/MovementStrategy/StrategyStatus.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TrolleybusProject.MovementStrategy; + +public enum StrategyStatus +{ + /// + /// Все готово к началу + /// + NotInit, + /// + /// Выполняется + /// + InProgress, + /// + /// Завершено + /// + Finish + + +}