diff --git a/AccordionBus/AccordionBus/Drawnings/DirectionType.cs b/AccordionBus/AccordionBus/Drawnings/DirectionType.cs index 7ddcd8d..6ffc89e 100644 --- a/AccordionBus/AccordionBus/Drawnings/DirectionType.cs +++ b/AccordionBus/AccordionBus/Drawnings/DirectionType.cs @@ -8,5 +8,5 @@ namespace AccordionBus.Drawnings; public enum DirectionType { - Up = 1, Down = 2, Left = 3, Right = 4, + Up = 1, Down = 2, Left = 3, Right = 4, Unknow = -1 } diff --git a/AccordionBus/AccordionBus/Drawnings/DrawningBus.cs b/AccordionBus/AccordionBus/Drawnings/DrawningBus.cs index 00c4421..adc25db 100644 --- a/AccordionBus/AccordionBus/Drawnings/DrawningBus.cs +++ b/AccordionBus/AccordionBus/Drawnings/DrawningBus.cs @@ -38,6 +38,23 @@ public class DrawningBus /// Высота прорисовки автомобиля /// private readonly int _drawningBusHeight = 40; + /// + /// Координата X + /// + public int? GetPosX=>_startPosX; + /// + /// Координата Y + /// + public int? GetPosY => _startPosY; + /// + /// Ширина объекта + /// + public int GetWidth => _drawningBusWidth; + /// + /// Высота объекта + /// + public int GetHeight => _drawningBusHeight; + /// /// Пустой конструктор /// diff --git a/AccordionBus/AccordionBus/FormAccordionBus.Designer.cs b/AccordionBus/AccordionBus/FormAccordionBus.Designer.cs index b9c093e..d04f3ee 100644 --- a/AccordionBus/AccordionBus/FormAccordionBus.Designer.cs +++ b/AccordionBus/AccordionBus/FormAccordionBus.Designer.cs @@ -33,6 +33,8 @@ buttonDown = new Button(); buttonRight = new Button(); buttonCreateBus = new Button(); + comboBoxStrategy = new ComboBox(); + buttonStrategyStep = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxAccordionBus).BeginInit(); SuspendLayout(); // @@ -53,7 +55,7 @@ buttonCreate.Name = "buttonCreate"; buttonCreate.Size = new Size(216, 23); buttonCreate.TabIndex = 6; - buttonCreate.Text = "Создать\r\n автобус с гармошкой"; + buttonCreate.Text = "Создать автобус с гармошкой"; buttonCreate.UseVisualStyleBackColor = true; buttonCreate.Click += ButtonCreateAccordionBus_Click; // @@ -116,15 +118,37 @@ buttonCreateBus.Name = "buttonCreateBus"; buttonCreateBus.Size = new Size(216, 23); buttonCreateBus.TabIndex = 11; - buttonCreateBus.Text = "Создать\r\n автобус без гармошки"; + buttonCreateBus.Text = "Создать автобус без гармошки"; buttonCreateBus.UseVisualStyleBackColor = true; buttonCreateBus.Click += buttonCreateBus_Click; // + // comboBoxStrategy + // + comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxStrategy.FormattingEnabled = true; + comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" }); + comboBoxStrategy.Location = new Point(667, 12); + comboBoxStrategy.Name = "comboBoxStrategy"; + comboBoxStrategy.Size = new Size(121, 23); + comboBoxStrategy.TabIndex = 12; + // + // buttonStrategyStep + // + buttonStrategyStep.Location = new Point(713, 41); + buttonStrategyStep.Name = "buttonStrategyStep"; + buttonStrategyStep.Size = new Size(75, 23); + buttonStrategyStep.TabIndex = 13; + buttonStrategyStep.Text = "Шаг"; + buttonStrategyStep.UseVisualStyleBackColor = true; + buttonStrategyStep.Click += ButtonStrategyStep_Click; + // // FormAccordionBus // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(800, 450); + Controls.Add(buttonStrategyStep); + Controls.Add(comboBoxStrategy); Controls.Add(buttonCreateBus); Controls.Add(buttonRight); Controls.Add(buttonDown); @@ -146,5 +170,7 @@ private Button buttonDown; private Button buttonRight; private Button buttonCreateBus; + private ComboBox comboBoxStrategy; + private Button buttonStrategyStep; } } \ No newline at end of file diff --git a/AccordionBus/AccordionBus/FormAccordionBus.cs b/AccordionBus/AccordionBus/FormAccordionBus.cs index f6571fa..af30c5e 100644 --- a/AccordionBus/AccordionBus/FormAccordionBus.cs +++ b/AccordionBus/AccordionBus/FormAccordionBus.cs @@ -8,6 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using AccordionBus.Drawnings; +using AccordionBus.MovementStrategy; namespace AccordionBus; public partial class FormAccordionBus : Form @@ -17,11 +18,16 @@ public partial class FormAccordionBus : Form /// private DrawningBus? _drawningBus; /// + /// Стратегия перемещения + /// + private AbstractStategy? _strategy; + /// /// Конструктор формы /// public FormAccordionBus() { InitializeComponent(); + _strategy = null; } /// /// Метод прорисовки машины @@ -50,23 +56,25 @@ public partial class FormAccordionBus : Form switch (type) { case nameof(DrawningBus): - _drawningBus = new DrawningBus(rnd.Next(100, 300), rnd.Next(1000, 3000), + _drawningBus = new DrawningBus(rnd.Next(100, 300), rnd.Next(1000, 3000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); break; case nameof(DrawningAccordionBus): - _drawningBus = new DrawningAccordionBus(rnd.Next(650, 700), rnd.Next(15760,16130), - Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),rnd.Next(0, 256)), - Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),rnd.Next(0, 256)), + _drawningBus = new DrawningAccordionBus(rnd.Next(650, 700), rnd.Next(15760, 16130), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Convert.ToBoolean(rnd.Next(0, 2)), + Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), - Convert.ToBoolean(rnd.Next(0, 2)), - Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); break; default: return; } - _drawningBus.SetPictureSize(pictureBoxAccordionBus.Width,pictureBoxAccordionBus.Height); - _drawningBus.SetPosition(rnd.Next(10,100), rnd.Next(10,100)); + _drawningBus.SetPictureSize(pictureBoxAccordionBus.Width, pictureBoxAccordionBus.Height); + _drawningBus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100)); + _strategy = null; + Draw(); } @@ -75,7 +83,7 @@ public partial class FormAccordionBus : Form /// /// /// - private void ButtonCreateAccordionBus_Click(object sender, EventArgs e) =>CreateObject(nameof(DrawningAccordionBus)); + private void ButtonCreateAccordionBus_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAccordionBus)); /// /// Обработка нажатия кнопки "Создать автобус" @@ -83,7 +91,7 @@ public partial class FormAccordionBus : Form /// /// public void buttonCreateBus_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBus)); - + /// /// Перемещение объекта по форме (нажатие кнопок навигации) /// @@ -121,4 +129,45 @@ public partial class FormAccordionBus : Form Draw(); } } + + /// + /// Обработка нажатия кнопки "Шаг" + /// + /// + /// + 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), + pictureBoxAccordionBus.Width, pictureBoxAccordionBus.Height); + } + if (_strategy == null) + { + return; + } + comboBoxStrategy.Enabled = false; + _strategy.MakeStep(); + Draw(); + if (_strategy.GetStatus() == StrategyStatus.Finish) + { + comboBoxStrategy.Enabled = true; + _strategy = null; + } + } + } diff --git a/AccordionBus/AccordionBus/MovementStrategy/AbstractStategy.cs b/AccordionBus/AccordionBus/MovementStrategy/AbstractStategy.cs new file mode 100644 index 0000000..532bffa --- /dev/null +++ b/AccordionBus/AccordionBus/MovementStrategy/AbstractStategy.cs @@ -0,0 +1,123 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AccordionBus.MovementStrategy; +public abstract class AbstractStategy +{ + /// + /// Перемещаемый объект + /// + 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 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/AccordionBus/AccordionBus/MovementStrategy/IMoveableObject.cs b/AccordionBus/AccordionBus/MovementStrategy/IMoveableObject.cs new file mode 100644 index 0000000..0bc4636 --- /dev/null +++ b/AccordionBus/AccordionBus/MovementStrategy/IMoveableObject.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AccordionBus.MovementStrategy; + +public interface IMoveableObject +{ + /// + /// Получение координаты объекта + /// + ObjectParameters? GetObjectPosition { get; } + /// + /// Шаг объекта + /// + int GetStep { get; } + /// + /// Попытка переместить объект в указанном направлении + /// + /// Направление + /// true - объект перемещен, false - перемещение невозможно + bool TryMoveObject(MovementDirection direction); +} diff --git a/AccordionBus/AccordionBus/MovementStrategy/MoveToBorder.cs b/AccordionBus/AccordionBus/MovementStrategy/MoveToBorder.cs new file mode 100644 index 0000000..cdb0963 --- /dev/null +++ b/AccordionBus/AccordionBus/MovementStrategy/MoveToBorder.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AccordionBus.MovementStrategy; + +public class MoveToBorder : AbstractStategy +{ + protected override bool IsTargetDestinaion() + { + ObjectParameters? objParams = GetObjectParameters; + if (objParams == null) + { + return false; + } + return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth + && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth && + objParams.ObjectMiddleVertical - GetStep() <= FieldHeight + && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight; + } + protected override void MoveToTarget() + { + ObjectParameters? objParams = GetObjectParameters; + if (objParams == null) + { + return; + } + int diffX = objParams.ObjectMiddleHorizontal - FieldWidth; + if (Math.Abs(diffX) > GetStep()) + { + if (diffX < 0) + { + MoveLeft(); + } + else + { + MoveRight(); + } + } + int diffY = objParams.ObjectMiddleVertical - FieldHeight; + if (Math.Abs(diffY) > GetStep()) + { + if (diffY < 0) + { + MoveUp(); + } + else + { + MoveDown(); + } + } + } + +} diff --git a/AccordionBus/AccordionBus/MovementStrategy/MoveToCenter.cs b/AccordionBus/AccordionBus/MovementStrategy/MoveToCenter.cs new file mode 100644 index 0000000..a637c46 --- /dev/null +++ b/AccordionBus/AccordionBus/MovementStrategy/MoveToCenter.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AccordionBus.MovementStrategy; + +public class MoveToCenter : AbstractStategy +{ + 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/AccordionBus/AccordionBus/MovementStrategy/MoveableBus.cs b/AccordionBus/AccordionBus/MovementStrategy/MoveableBus.cs new file mode 100644 index 0000000..77aef9e --- /dev/null +++ b/AccordionBus/AccordionBus/MovementStrategy/MoveableBus.cs @@ -0,0 +1,62 @@ +using AccordionBus.Drawnings; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AccordionBus.MovementStrategy; + +public class MoveableBus:IMoveableObject +{ + /// + /// Поле-объект класса 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/AccordionBus/AccordionBus/MovementStrategy/MovementDirection.cs b/AccordionBus/AccordionBus/MovementStrategy/MovementDirection.cs new file mode 100644 index 0000000..e9189b0 --- /dev/null +++ b/AccordionBus/AccordionBus/MovementStrategy/MovementDirection.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AccordionBus.MovementStrategy; + +public enum MovementDirection +{ + Up = 1, Down = 2, Left = 3, Right = 4 +} diff --git a/AccordionBus/AccordionBus/MovementStrategy/ObjectParameters.cs b/AccordionBus/AccordionBus/MovementStrategy/ObjectParameters.cs new file mode 100644 index 0000000..932b59b --- /dev/null +++ b/AccordionBus/AccordionBus/MovementStrategy/ObjectParameters.cs @@ -0,0 +1,66 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AccordionBus.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/AccordionBus/AccordionBus/MovementStrategy/StrategyStatus.cs b/AccordionBus/AccordionBus/MovementStrategy/StrategyStatus.cs new file mode 100644 index 0000000..73197a2 --- /dev/null +++ b/AccordionBus/AccordionBus/MovementStrategy/StrategyStatus.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AccordionBus.MovementStrategy; + +public enum StrategyStatus +{ + /// + ///Всё готово к началу + /// + NotInit, + + /// + ///Выполняется + /// + InProgress, + + /// + ///Завершено + /// + Finish +}