diff --git a/ProjectAccordionBus/ProjectAccordionBus/Drawnings/DirectionType.cs b/ProjectAccordionBus/ProjectAccordionBus/Drawnings/DirectionType.cs index 16785f4..2e66619 100644 --- a/ProjectAccordionBus/ProjectAccordionBus/Drawnings/DirectionType.cs +++ b/ProjectAccordionBus/ProjectAccordionBus/Drawnings/DirectionType.cs @@ -11,6 +11,11 @@ namespace ProjectAccordionBus.Drawnings; /// public enum DirectionType { + /// + /// Неизвестное направление + /// + Unknow = -1, + /// /// Вверх /// diff --git a/ProjectAccordionBus/ProjectAccordionBus/Drawnings/DrawningAccordionBus.cs b/ProjectAccordionBus/ProjectAccordionBus/Drawnings/DrawningAccordionBus.cs index 4ae20ef..cc0df31 100644 --- a/ProjectAccordionBus/ProjectAccordionBus/Drawnings/DrawningAccordionBus.cs +++ b/ProjectAccordionBus/ProjectAccordionBus/Drawnings/DrawningAccordionBus.cs @@ -4,14 +4,15 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using static System.Windows.Forms.VisualStyles.VisualStyleElement; namespace ProjectAccordionBus.Drawnings; public class DrawningAccordionBus : DrawningBus { - public DrawningAccordionBus(EntityAccordionBus entity) : base(110, 40) + public DrawningAccordionBus(int speed, double weight, Color bodyColor, Color additionalColor, bool compartment, bool entrance, bool windows) : base(110, 40) { - EntityBus = entity; + EntityBus = new EntityAccordionBus(speed, weight, bodyColor, additionalColor, compartment, entrance, windows); } public override void DrawTransport(Graphics g) diff --git a/ProjectAccordionBus/ProjectAccordionBus/Drawnings/DrawningBus.cs b/ProjectAccordionBus/ProjectAccordionBus/Drawnings/DrawningBus.cs index 706a287..7e3eddb 100644 --- a/ProjectAccordionBus/ProjectAccordionBus/Drawnings/DrawningBus.cs +++ b/ProjectAccordionBus/ProjectAccordionBus/Drawnings/DrawningBus.cs @@ -8,19 +8,60 @@ using System.Threading.Tasks; namespace ProjectAccordionBus.Drawnings; public class DrawningBus { + /// + /// Класс-сущность + /// public EntityBus? EntityBus { get; protected set; } + /// + /// Ширина окна + /// private int? _pictureWidth; + /// + /// Высота окна + /// private int? _pictureHeight; + /// + /// Левая координата прорисовки транспорта + /// protected int? _startPosX; + /// + /// Верхняя координата прорисовки транспорта + /// protected int? _startPosY; - private int _drawningBusWidth = 50; + /// + /// Ширина прорисовки транспорта + /// + private readonly int _drawningBusWidth = 50; - private readonly int _drawningBusHeight = 40; + /// + /// Высота прорисовки транспорта + /// + private readonly int _drawningBusHeight = 35; + + /// + /// Координата X объекта + /// + public int? GetPosX => _startPosX; + + /// + /// Координата Y объекта + /// + public int? GetPosY => _startPosY; + + /// + /// Ширина объекта + /// + public int GetWidth => _drawningBusWidth; + + /// + /// Высота объекта + /// + public int GetHight => _drawningBusHeight; // Пустой конструктор private DrawningBus() @@ -32,9 +73,9 @@ public class DrawningBus } // Конструктор - public DrawningBus(EntityBus entity) : this() + public DrawningBus(int speed, double weight, Color bodyColor) : this() { - EntityBus = entity; + EntityBus = new EntityBus(speed, weight, bodyColor); } // Конструктор diff --git a/ProjectAccordionBus/ProjectAccordionBus/Entities/EntityAccordionBus.cs b/ProjectAccordionBus/ProjectAccordionBus/Entities/EntityAccordionBus.cs index 350ceca..ed7ce3c 100644 --- a/ProjectAccordionBus/ProjectAccordionBus/Entities/EntityAccordionBus.cs +++ b/ProjectAccordionBus/ProjectAccordionBus/Entities/EntityAccordionBus.cs @@ -28,7 +28,7 @@ public class EntityAccordionBus : EntityBus { AdditionalColor = additionalColor; Compartment = compartment; // отсек - Entrance = entrance; // крылья + Entrance = entrance; Windows = windows; } diff --git a/ProjectAccordionBus/ProjectAccordionBus/FormAccordionBus.Designer.cs b/ProjectAccordionBus/ProjectAccordionBus/FormAccordionBus.Designer.cs index 6aff280..de70f29 100644 --- a/ProjectAccordionBus/ProjectAccordionBus/FormAccordionBus.Designer.cs +++ b/ProjectAccordionBus/ProjectAccordionBus/FormAccordionBus.Designer.cs @@ -36,6 +36,8 @@ buttonUp = new Button(); buttonRight = new Button(); buttonCreateBus = new Button(); + comboBoxStrategy = new ComboBox(); + buttonStrategyStep = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxAccordionBus).BeginInit(); SuspendLayout(); // @@ -119,11 +121,34 @@ buttonCreateBus.UseVisualStyleBackColor = true; buttonCreateBus.Click += buttonCreateBus_Click; // + // comboBoxStrategy + // + comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxStrategy.FormattingEnabled = true; + comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" }); + comboBoxStrategy.Location = new Point(595, 12); + comboBoxStrategy.Name = "comboBoxStrategy"; + comboBoxStrategy.Size = new Size(121, 23); + comboBoxStrategy.TabIndex = 7; + comboBoxStrategy.SelectedIndexChanged += comboBoxStrategy_SelectedIndexChanged; + // + // buttonStrategyStep + // + buttonStrategyStep.Location = new Point(641, 41); + buttonStrategyStep.Name = "buttonStrategyStep"; + buttonStrategyStep.Size = new Size(75, 23); + buttonStrategyStep.TabIndex = 8; + buttonStrategyStep.Text = "Шаг"; + buttonStrategyStep.UseVisualStyleBackColor = true; + buttonStrategyStep.Click += buttonStrategyStep_Click; + // // FormAccordionBus // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(728, 386); + Controls.Add(buttonStrategyStep); + Controls.Add(comboBoxStrategy); Controls.Add(buttonCreateBus); Controls.Add(buttonRight); Controls.Add(buttonUp); @@ -151,5 +176,7 @@ private Button buttonUp; private Button buttonRight; private Button buttonCreateBus; + private ComboBox comboBoxStrategy; + private Button buttonStrategyStep; } } \ No newline at end of file diff --git a/ProjectAccordionBus/ProjectAccordionBus/FormAccordionBus.cs b/ProjectAccordionBus/ProjectAccordionBus/FormAccordionBus.cs index b4600a1..74a57e6 100644 --- a/ProjectAccordionBus/ProjectAccordionBus/FormAccordionBus.cs +++ b/ProjectAccordionBus/ProjectAccordionBus/FormAccordionBus.cs @@ -1,5 +1,6 @@ using ProjectAccordionBus.Drawnings; using ProjectAccordionBus.Entities; +using ProjectAccordionBus.MovementStrategy; using System; using System.Collections.Generic; using System.ComponentModel; @@ -16,14 +17,13 @@ public partial class FormAccordionBus : Form private DrawningBus? _drawningBus; - private EntityBus? _entity; - - private EntityAccordionBus? _entityAccordionBus; + private AbstractStrategy? _strategy; public FormAccordionBus() { InitializeComponent(); + _strategy = null; } private void Draw() @@ -45,16 +45,14 @@ public partial class FormAccordionBus : Form switch (type) { case nameof(DrawningBus): - _entity = new EntityBus(random.Next(100, 300), random.Next(1000, 3000), + _drawningBus = new DrawningBus(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256))); - _drawningBus = new DrawningBus(_entity); break; case nameof(DrawningAccordionBus): - _entityAccordionBus = new EntityAccordionBus(random.Next(100, 300), random.Next(1000, 3000), + _drawningBus = new DrawningAccordionBus(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); - _drawningBus = new DrawningAccordionBus(_entityAccordionBus); break; default: return; @@ -62,7 +60,8 @@ public partial class FormAccordionBus : Form _drawningBus.SetPictureSize(pictureBoxAccordionBus.Width, pictureBoxAccordionBus.Height); _drawningBus.SetPosition(random.Next(10, 100), random.Next(10, 100)); - + _strategy = null; + comboBoxStrategy.Enabled = true; Draw(); } @@ -107,7 +106,48 @@ public partial class FormAccordionBus : Form } } - + 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; + } + } + + private void comboBoxStrategy_SelectedIndexChanged(object sender, EventArgs e) + { + + } } diff --git a/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/AbstractStrategy.cs b/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/AbstractStrategy.cs new file mode 100644 index 0000000..fd3b8d8 --- /dev/null +++ b/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/AbstractStrategy.cs @@ -0,0 +1,126 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectAccordionBus.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 (IsTargetDestination()) + { + _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 IsTargetDestination(); + + protected bool MoveTo(MovementDirection movementDirection) + { + if (_state != StrategyStatus.InProgress) + { + return false; + } + + return _moveableObject?.TryMoveObject(movementDirection) ?? false; + } +} diff --git a/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/IMoveableObject.cs b/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/IMoveableObject.cs new file mode 100644 index 0000000..ed3a6c9 --- /dev/null +++ b/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/IMoveableObject.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectAccordionBus.MovementStrategy; +public interface IMoveableObject +{ + /// + /// Получение координаты объекта + /// + ObjectParameters? GetObjectPosition { get; } + + /// + /// Шаг объекта + /// + int GetStep { get; } + + /// + /// Попытка переместить объект в указанном направлении + /// + /// + /// + bool TryMoveObject(MovementDirection direction); +} diff --git a/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/MoveToBorder.cs b/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/MoveToBorder.cs new file mode 100644 index 0000000..631f194 --- /dev/null +++ b/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/MoveToBorder.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectAccordionBus.MovementStrategy; + +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(); + } + } + } +} diff --git a/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/MoveToCenter.cs b/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/MoveToCenter.cs new file mode 100644 index 0000000..cbe9ece --- /dev/null +++ b/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/MoveToCenter.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectAccordionBus.MovementStrategy; + +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(); + } + } + } +} diff --git a/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/MoveableBus.cs b/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/MoveableBus.cs new file mode 100644 index 0000000..89d463f --- /dev/null +++ b/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/MoveableBus.cs @@ -0,0 +1,61 @@ +using ProjectAccordionBus.Drawnings; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectAccordionBus.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.GetHight); + } + } + + 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)); + } + + 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/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/MovementDirection.cs b/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/MovementDirection.cs new file mode 100644 index 0000000..12494ef --- /dev/null +++ b/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/MovementDirection.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectAccordionBus.MovementStrategy; +public enum MovementDirection +{ + /// + /// Вверх + /// + Up = 1, + + /// + /// Вниз + /// + Down = 2, + + /// + /// Влево + /// + Left = 3, + + /// + /// Вправо + /// + Right = 4 +} diff --git a/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/ObjectParameters.cs b/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/ObjectParameters.cs new file mode 100644 index 0000000..6c41340 --- /dev/null +++ b/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/ObjectParameters.cs @@ -0,0 +1,67 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectAccordionBus.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; + + public ObjectParameters(int x, int y, int width, int height) + { + _x = x; + _y = y; + _width = width; + _height = height; + } +} \ No newline at end of file diff --git a/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/StrategyStatus.cs b/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/StrategyStatus.cs new file mode 100644 index 0000000..6f91a50 --- /dev/null +++ b/ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/StrategyStatus.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectAccordionBus.MovementStrategy; +public enum StrategyStatus +{ + /// + /// Все готово к началу + NotInit, + + /// + /// Выполняется + /// + InProgress, + + /// + /// Завершено + /// + Finish +} +