diff --git a/Hard/Hard/DirectionType.cs b/Hard/Hard/Drawnings/DirectionType.cs similarity index 78% rename from Hard/Hard/DirectionType.cs rename to Hard/Hard/Drawnings/DirectionType.cs index 835add0..d3538fc 100644 --- a/Hard/Hard/DirectionType.cs +++ b/Hard/Hard/Drawnings/DirectionType.cs @@ -7,10 +7,14 @@ using System.Threading.Tasks; /// /// Направление перемещения /// -namespace Hard; +namespace Hard.Drawnings; public enum DirectionType { + /// + /// Неизвестное направление + /// + Unknow = -1, /// /// Вверх /// @@ -30,5 +34,6 @@ public enum DirectionType /// Вправо /// Right = 4 + } diff --git a/Hard/Hard/Drawnings/DrawningRoadTrain.cs b/Hard/Hard/Drawnings/DrawningRoadTrain.cs new file mode 100644 index 0000000..51f0ae8 --- /dev/null +++ b/Hard/Hard/Drawnings/DrawningRoadTrain.cs @@ -0,0 +1,78 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Sockets; +using System.Text; +using System.Threading.Tasks; +using ExcavatorDifficult.Drawing; +using Hard.Entities; + +namespace Hard.Drawnings; + +/// +/// Класс, отвечающий за прорисовку и перемещение объекта-сущности +/// +public class DrawningRoadTrain : DrawningTruck +{ + private InterDopWheel? Drawningwheel; + /// + /// Конструктор + /// + /// Скорость + /// Вес автомобиля + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия мигалок + /// Признак наличия ковша + + public DrawningRoadTrain(int speed, int weight, Color bodyColor, Color additionalColor, bool flashingLights, bool ladle, bool katki, int width, int height, int numKatki, int numchoose) : base(speed, weight, bodyColor, width, height, numKatki, numchoose) + { + if (EntityTruck != null) + { + EntityTruck = new EntityRoadTrain(speed, weight, bodyColor, additionalColor, flashingLights, ladle, katki); + } + int choose = numchoose % 3; + switch (choose) + { + case 0: + Drawningwheel = new DrawningWheelSquare(); + break; + case 1: + Drawningwheel = new DrawningWheelTriagle(); + break; + case 2: + Drawningwheel = new DrawningWheelCircule(); + break; + } + Drawningwheel.Properties = numKatki; + } + + + public override void DrawTransport(Graphics g) + { + if (EntityTruck == null || EntityTruck is not EntityRoadTrain roadTrain || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + Brush additionalBrush = new SolidBrush(roadTrain.AdditionalColor); + Pen additionalPen = new(roadTrain.AdditionalColor); + base.DrawTransport(g); + // баки + if (roadTrain.Ladle) + { + g.FillEllipse(additionalBrush, _startPosX.Value + 10, _startPosY.Value, 105, 32); + } + // щетка + if (roadTrain.FlashingLights) + { + g.DrawLine(additionalPen, _startPosX.Value + 80, _startPosY.Value + 50, _startPosX.Value + 80, _startPosY.Value + 75); + g.DrawLine(additionalPen, _startPosX.Value + 80, _startPosY.Value + 50, _startPosX.Value + 90, _startPosY.Value + 75); + g.DrawLine(additionalPen, _startPosX.Value + 80, _startPosY.Value + 50, _startPosX.Value + 100, _startPosY.Value + 75); + g.DrawLine(additionalPen, _startPosX.Value + 80, _startPosY.Value + 50, _startPosX.Value + 110, _startPosY.Value + 75); + g.DrawLine(additionalPen, _startPosX.Value + 80, _startPosY.Value + 50, _startPosX.Value + 120, _startPosY.Value + 75); + } + + + } + +} diff --git a/Hard/Hard/DrawningYborshik.cs b/Hard/Hard/Drawnings/DrawningTruck.cs similarity index 57% rename from Hard/Hard/DrawningYborshik.cs rename to Hard/Hard/Drawnings/DrawningTruck.cs index 2c36805..3f96501 100644 --- a/Hard/Hard/DrawningYborshik.cs +++ b/Hard/Hard/Drawnings/DrawningTruck.cs @@ -1,22 +1,21 @@ -using System; +using ExcavatorDifficult.Drawing; +using Hard.Entities; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using static System.Windows.Forms.LinkLabel; -namespace Hard; +namespace Hard.Drawnings; -/// -/// Класс, отвечающий за прорисовку и перемещение объекта-сущности -/// -public class DrawningYborshik +public class DrawningTruck { - public DrawningWheel Wheel; + private InterDopWheel? Drawningwheel; /// /// Класс-сущность + /// /// - public EntityYborshik? EntityYborshik { get; private set; } + public EntityTruck? EntityTruck { get; protected set; } /// /// Ширина окна @@ -31,12 +30,12 @@ public class DrawningYborshik /// /// Левая координата прорисовки автомобиля /// - private int? _startPosX; + protected int? _startPosX; /// /// Верхняя кооридната прорисовки автомобиля /// - private int? _startPosY; + protected int? _startPosY; /// /// Ширина прорисовки автомобиля @@ -49,27 +48,73 @@ public class DrawningYborshik private readonly int _drawningCarHeight = 70; /// - /// Инициализация полей объекта-класса + /// Координата X объекта /// - /// Скорость - /// Вес автомобиля - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия мигалок - /// Признак наличия ковша + public int? GetPosX => _startPosX; - public bool Init(int speed, int weight, Color bodyColor, Color additionalColor, bool flashingLights, bool ladle) + /// + /// Координата Y объекта + /// + public int? GetPosY => _startPosY; + + /// + /// Ширина объекта + /// + public int GetWidth => _drawningCarWidth; + + /// + /// Высота объекта + /// + public int GetHeight => _drawningCarHeight; + + + + + public DrawningTruck(int speed, double weight, Color bodyColor, int width, int height, int numKatki, int numchoose) { - EntityYborshik = new EntityYborshik(); - EntityYborshik.Init(speed, weight, bodyColor, additionalColor, flashingLights, ladle); - _pictureWidth = null; - _pictureHeight = null; - _startPosX = null; - _startPosY = null; - Wheel = new DrawningWheel(); - return true; + if (width > _drawningCarWidth || height > _drawningCarHeight) + { + _pictureWidth = width; + _pictureHeight = height; + EntityTruck = new EntityTruck(speed, weight, bodyColor); + int choose = numchoose % 3; + switch (choose) + { + case 0: + Drawningwheel = new DrawningWheelSquare(); + break; + case 1: + Drawningwheel = new DrawningWheelTriagle(); + break; + case 2: + Drawningwheel = new DrawningWheelCircule(); + break; + } + Drawningwheel.Properties = numKatki; + } } + + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + protected DrawningTruck(int speed, double weight, Color bodyColor, int width, int height, int exWidth, int exHeight, int numKatki) + { + if (width > _drawningCarWidth || height > _drawningCarHeight) + { + _pictureWidth = width; + _pictureHeight = height; + _drawningCarWidth = exWidth; + _drawningCarHeight = exHeight; + EntityTruck = new EntityTruck(speed, weight, bodyColor); + } + } + + + /// /// Установка границ поля /// @@ -87,8 +132,8 @@ public class DrawningYborshik if (_startPosX != null && _startPosY != null) if (_startPosX + _drawningCarWidth > _pictureWidth) _startPosX = _pictureWidth - _drawningCarWidth; - if (_startPosY + _drawningCarHeight > _pictureHeight) - _startPosY = _pictureHeight - _drawningCarHeight; + if (_startPosY + _drawningCarHeight > _pictureHeight) + _startPosY = _pictureHeight - _drawningCarHeight; return true; } else @@ -116,11 +161,11 @@ public class DrawningYborshik x = 0; else if (y + _drawningCarHeight > _pictureHeight) y = _pictureHeight.Value - _drawningCarHeight; - + _startPosX = x; _startPosY = y; - + } /// /// Изменение направления перемещения @@ -129,7 +174,7 @@ public class DrawningYborshik /// true - перемещене выполнено, false - перемещение невозможно public bool MoveTransport(DirectionType direction) { - if (EntityYborshik == null || !_startPosX.HasValue || !_startPosY.HasValue) + if (EntityTruck == null || !_startPosX.HasValue || !_startPosY.HasValue) { return false; } @@ -138,32 +183,32 @@ public class DrawningYborshik { //влево case DirectionType.Left: - if (_startPosX.Value - EntityYborshik.Step > 0) + if (_startPosX.Value - EntityTruck.Step > 0) { - _startPosX -= (int)EntityYborshik.Step; + _startPosX -= (int)EntityTruck.Step; } return true; //вверх case DirectionType.Up: - if (_startPosY.Value - EntityYborshik.Step > 0) + if (_startPosY.Value - EntityTruck.Step > 0) { - _startPosY -= (int)EntityYborshik.Step; + _startPosY -= (int)EntityTruck.Step; } return true; // вправо case DirectionType.Right: //TODO прописать логику сдвига в право - if (_startPosX.Value + EntityYborshik.Step < _pictureWidth - _drawningCarWidth) + if (_startPosX.Value + EntityTruck.Step < _pictureWidth - _drawningCarWidth) { - _startPosX += (int)EntityYborshik.Step; + _startPosX += (int)EntityTruck.Step; } return true; //вниз case DirectionType.Down: //TODO прописать логику сдвига в вниз - if (_startPosY.Value + EntityYborshik.Step < _pictureHeight - _drawningCarHeight) + if (_startPosY.Value + EntityTruck.Step < _pictureHeight - _drawningCarHeight) { - _startPosY += (int)EntityYborshik.Step; + _startPosY += (int)EntityTruck.Step; } return true; default: @@ -175,39 +220,18 @@ public class DrawningYborshik /// Прорисовка объекта /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { - Wheel.DrawWheel(g, _startPosX.Value, _startPosY.Value); - if (EntityYborshik == null || !_startPosX.HasValue || !_startPosY.HasValue) + if (EntityTruck == null || !_startPosX.HasValue || !_startPosY.HasValue) { return; } - - Brush additionalBrush = new SolidBrush(EntityYborshik.AdditionalColor); - Pen additionalPen = new(EntityYborshik.AdditionalColor); - // баки - if (EntityYborshik.Ladle) - { - g.FillEllipse(additionalBrush, _startPosX.Value + 10, _startPosY.Value, 105, 32); - } - // щетка - if (EntityYborshik.FlashingLights) - { - g.DrawLine(additionalPen, _startPosX.Value + 80, _startPosY.Value + 50, _startPosX.Value + 80, _startPosY.Value + 75); - g.DrawLine(additionalPen, _startPosX.Value + 80, _startPosY.Value + 50, _startPosX.Value + 90, _startPosY.Value + 75); - g.DrawLine(additionalPen, _startPosX.Value + 80, _startPosY.Value + 50, _startPosX.Value + 100, _startPosY.Value + 75); - g.DrawLine(additionalPen, _startPosX.Value + 80, _startPosY.Value + 50, _startPosX.Value + 110, _startPosY.Value + 75); - g.DrawLine(additionalPen, _startPosX.Value + 80, _startPosY.Value + 50, _startPosX.Value + 120, _startPosY.Value + 75); - } - Brush br = new SolidBrush(EntityYborshik.BodyColor); - + Drawningwheel.Draw(_startPosX.Value, _startPosY.Value, EntityTruck.BodyColor, g); + Brush br = new SolidBrush(EntityTruck.BodyColor); //кузов уборщика g.FillRectangle(br, _startPosX.Value + 10, _startPosY.Value + 30, 140, 20); g.FillRectangle(br, _startPosX.Value + 115, _startPosY.Value, 35, 30); - } } - - diff --git a/Hard/Hard/DrawningWheel.cs b/Hard/Hard/Drawnings/DrawningWheel.cs similarity index 94% rename from Hard/Hard/DrawningWheel.cs rename to Hard/Hard/Drawnings/DrawningWheel.cs index 03281e3..f01ea27 100644 --- a/Hard/Hard/DrawningWheel.cs +++ b/Hard/Hard/Drawnings/DrawningWheel.cs @@ -1,4 +1,5 @@ -using System; +using Hard.Entities; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -8,7 +9,7 @@ namespace Hard; public class DrawningWheel { - public EntityYborshik? EntityYborshik { get; private set; } + public EntityTruck? EntityTruck { get; private set; } private NumberOfWheel numberOfWheel; diff --git a/Hard/Hard/Drawnings/DrawningWheelCircule.cs b/Hard/Hard/Drawnings/DrawningWheelCircule.cs new file mode 100644 index 0000000..9bb2ecd --- /dev/null +++ b/Hard/Hard/Drawnings/DrawningWheelCircule.cs @@ -0,0 +1,74 @@ +using Hard; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ExcavatorDifficult.Drawing; + +public class DrawningWheelCircule : InterDopWheel +{ + private NumberOfWheel numberOfWheel; + + public int Properties + { + get + { + return Properties; + + } + set + { + switch (value) + { + case 1: + numberOfWheel = NumberOfWheel.OneWheel; + break; + case 2: + numberOfWheel = NumberOfWheel.TwoWheel; + break; + case 3: + numberOfWheel = NumberOfWheel.ThreeWheel; + break; + default: + numberOfWheel = NumberOfWheel.ThreeWheel; + MessageBox.Show("Было введено некорректное количество катков, поэтому было отрисовано стандартное количество катков"); + break; + } + } + } + + public void Draw(int _startPosX, int _startPosY, Color rinkColor, Graphics g) + { + + Brush br = new SolidBrush(Color.Black); + Brush body = new SolidBrush(rinkColor); + switch (numberOfWheel) + { + case NumberOfWheel.OneWheel: + g.FillEllipse(br, _startPosX + 120, _startPosY + 50, 25, 25); + + g.FillEllipse(body, _startPosX + 125, _startPosY + 55, 15, 15); + break; + case NumberOfWheel.TwoWheel: + g.FillEllipse(br, _startPosX + 15, _startPosY + 50, 25, 25); + g.FillEllipse(br, _startPosX + 50, _startPosY + 50, 25, 25); + + g.FillEllipse(body, _startPosX + 20, _startPosY + 55, 15, 15); + g.FillEllipse(body, _startPosX + 55, _startPosY + 55, 15, 15); + break; + case NumberOfWheel.ThreeWheel: + //колеса уборщика + g.FillEllipse(br, _startPosX + 15, _startPosY + 50, 25, 25); + g.FillEllipse(br, _startPosX + 120, _startPosY + 50, 25, 25); + g.FillEllipse(br, _startPosX + 50, _startPosY + 50, 25, 25); + + g.FillEllipse(body, _startPosX + 20, _startPosY + 55, 15, 15); + g.FillEllipse(body, _startPosX + 125, _startPosY + 55, 15, 15); + g.FillEllipse(body, _startPosX + 55, _startPosY + 55, 15, 15); + break; + + } + } +} diff --git a/Hard/Hard/Drawnings/DrawningWheelSq&Ci.cs b/Hard/Hard/Drawnings/DrawningWheelSq&Ci.cs new file mode 100644 index 0000000..6726d53 --- /dev/null +++ b/Hard/Hard/Drawnings/DrawningWheelSq&Ci.cs @@ -0,0 +1,83 @@ +using Hard; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ExcavatorDifficult.Drawing; + +public class DrawningWheelTriagle : InterDopWheel +{ + private NumberOfWheel numberOfWheel; + + public int Properties + { + get + { + return Properties; + + } + set + { + switch (value) + { + case 1: + numberOfWheel = NumberOfWheel.OneWheel; + break; + case 2: + numberOfWheel = NumberOfWheel.TwoWheel; + break; + case 3: + numberOfWheel = NumberOfWheel.ThreeWheel; + break; + default: + numberOfWheel = NumberOfWheel.ThreeWheel; + MessageBox.Show("Было введено некорректное количество катков, поэтому было отрисовано стандартное количество катков"); + break; + } + } + } + + public void Draw(int _startPosX, int _startPosY, Color rinkColor, Graphics g) + { + + Brush br = new SolidBrush(Color.Black); + Brush body = new SolidBrush(rinkColor); + switch (numberOfWheel) + { + case NumberOfWheel.OneWheel: + g.FillEllipse(br, _startPosX + 120, _startPosY + 50, 25, 25); + + g.FillRectangle(body, _startPosX + 125, _startPosY + 55, 15, 15); + + g.FillEllipse(br, _startPosX + 125, _startPosY + 55, 14, 14); + break; + case NumberOfWheel.TwoWheel: + g.FillEllipse(br, _startPosX + 15, _startPosY + 50, 25, 25); + g.FillEllipse(br, _startPosX + 50, _startPosY + 50, 25, 25); + + g.FillRectangle(body, _startPosX + 20, _startPosY + 55, 15, 15); + g.FillRectangle(body, _startPosX + 55, _startPosY + 55, 15, 15); + + g.FillEllipse(br, _startPosX + 20, _startPosY + 55, 14, 14); + g.FillEllipse(br, _startPosX + 55, _startPosY + 55, 14, 14); + break; + case NumberOfWheel.ThreeWheel: + //колеса уборщика + g.FillEllipse(br, _startPosX + 15, _startPosY + 50, 25, 25); + g.FillEllipse(br, _startPosX + 120, _startPosY + 50, 25, 25); + g.FillEllipse(br, _startPosX + 50, _startPosY + 50, 25, 25); + + g.FillRectangle(body, _startPosX + 20, _startPosY + 55, 15, 15); + g.FillRectangle(body, _startPosX + 125, _startPosY + 55, 15, 15); + g.FillRectangle(body, _startPosX + 55, _startPosY + 55, 15, 15); + + g.FillEllipse(br, _startPosX + 20, _startPosY + 55, 14, 14); + g.FillEllipse(br, _startPosX + 125, _startPosY + 55, 14, 14); + g.FillEllipse(br, _startPosX + 55, _startPosY + 55, 14, 14); + break; + + } + } +} diff --git a/Hard/Hard/Drawnings/DrawningWheelSquare.cs b/Hard/Hard/Drawnings/DrawningWheelSquare.cs new file mode 100644 index 0000000..e6a812b --- /dev/null +++ b/Hard/Hard/Drawnings/DrawningWheelSquare.cs @@ -0,0 +1,74 @@ +using Hard; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ExcavatorDifficult.Drawing; + +public class DrawningWheelSquare : InterDopWheel +{ + private NumberOfWheel numberOfWheel; + + public int Properties + { + get + { + return Properties; + + } + set + { + switch (value) + { + case 1: + numberOfWheel = NumberOfWheel.OneWheel; + break; + case 2: + numberOfWheel = NumberOfWheel.TwoWheel; + break; + case 3: + numberOfWheel = NumberOfWheel.ThreeWheel; + break; + default: + numberOfWheel = NumberOfWheel.ThreeWheel; + MessageBox.Show("Было введено некорректное количество катков, поэтому было отрисовано стандартное количество катков"); + break; + } + } + } + + public void Draw(int _startPosX, int _startPosY, Color rinkColor, Graphics g) + { + + Brush br = new SolidBrush(Color.Black); + Brush body = new SolidBrush(rinkColor); + switch (numberOfWheel) + { + case NumberOfWheel.OneWheel: + g.FillEllipse(br, _startPosX + 120, _startPosY + 50, 25, 25); + + g.FillRectangle(body, _startPosX + 125, _startPosY + 55, 15, 15); + break; + case NumberOfWheel.TwoWheel: + g.FillEllipse(br, _startPosX + 15, _startPosY + 50, 25, 25); + g.FillEllipse(br, _startPosX + 50, _startPosY + 50, 25, 25); + + g.FillRectangle(body, _startPosX + 20, _startPosY + 55, 15, 15); + g.FillRectangle(body, _startPosX + 55, _startPosY + 55, 15, 15); + break; + case NumberOfWheel.ThreeWheel: + //колеса уборщика + g.FillEllipse(br, _startPosX + 15, _startPosY + 50, 25, 25); + g.FillEllipse(br, _startPosX + 120, _startPosY + 50, 25, 25); + g.FillEllipse(br, _startPosX + 50, _startPosY + 50, 25, 25); + + g.FillRectangle(body, _startPosX + 20, _startPosY + 55, 15, 15); + g.FillRectangle(body, _startPosX + 125, _startPosY + 55, 15, 15); + g.FillRectangle(body, _startPosX + 55, _startPosY + 55, 15, 15); + break; + + } + } +} diff --git a/Hard/Hard/Drawnings/InterDopWheel.cs b/Hard/Hard/Drawnings/InterDopWheel.cs new file mode 100644 index 0000000..a406f3c --- /dev/null +++ b/Hard/Hard/Drawnings/InterDopWheel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ExcavatorDifficult.Drawing; + +public interface InterDopWheel +{ + public int Properties { get; set; } + + public void Draw( int _startPosX, int _startPosY, Color rinkColor, Graphics g); +} diff --git a/Hard/Hard/EntityYborshik.cs b/Hard/Hard/Entities/EntityRoadTrain.cs similarity index 70% rename from Hard/Hard/EntityYborshik.cs rename to Hard/Hard/Entities/EntityRoadTrain.cs index 7d4d803..fa15aaf 100644 --- a/Hard/Hard/EntityYborshik.cs +++ b/Hard/Hard/Entities/EntityRoadTrain.cs @@ -4,24 +4,10 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Hard; +namespace Hard.Entities; -public class EntityYborshik +public class EntityRoadTrain : EntityTruck { - /// - /// Скорость - /// - public int Speed { get; private set; } - - /// - /// Вес - /// - public double Weight { get; private set; } - - /// - /// Основной цвет - /// - public Color BodyColor { get; private set; } /// /// Дополнительный цвет (для опциональных элементов) @@ -40,9 +26,10 @@ public class EntityYborshik public bool Ladle { get; private set; } /// - /// Шаг перемещения уборочной машины - /// - public double Step => Speed * 100 / Weight; + /// Катки гусеничные + /// + public bool Wheel { get; private set; } + /// /// Инициализация полей объекта-класса спортивного автомобиля @@ -53,14 +40,13 @@ public class EntityYborshik /// Дополнительный цвет /// Признак наличия мигалок /// Признак наличия ковша - public void Init(int speed, int weight, Color bodyColor, Color additionalColor, bool flashingLights, bool ladle) + public EntityRoadTrain(int speed, int weight, Color bodyColor, Color additionalColor, bool flashingLights, bool ladle, bool wheel) : base(speed, weight, bodyColor) { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; AdditionalColor = additionalColor; FlashingLights = flashingLights; Ladle = ladle; + Wheel = wheel; + } } diff --git a/Hard/Hard/Entities/EntityTruck.cs b/Hard/Hard/Entities/EntityTruck.cs new file mode 100644 index 0000000..72542cc --- /dev/null +++ b/Hard/Hard/Entities/EntityTruck.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Hard.Entities; + +public class EntityTruck{ + /// + /// Скорость + /// + public int Speed { get; private set; } + + /// + /// Вес + /// + public double Weight { get; private set; } + + /// + /// Основной цвет + /// + public Color BodyColor { get; private set; } + + public double Step => Speed * 100 / Weight; + /// + /// Конструктор сущности + /// + /// Скорость + /// Вес автомобиля + /// Основной цвет + public EntityTruck(int speed, double weight, Color bodyColor) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + } + +} + diff --git a/Hard/Hard/FormYborshik.Designer.cs b/Hard/Hard/FormRoadTrain.Designer.cs similarity index 57% rename from Hard/Hard/FormYborshik.Designer.cs rename to Hard/Hard/FormRoadTrain.Designer.cs index 3ac765b..8b3f02b 100644 --- a/Hard/Hard/FormYborshik.Designer.cs +++ b/Hard/Hard/FormRoadTrain.Designer.cs @@ -1,6 +1,6 @@ namespace Hard { - partial class FormYborshik + partial class FormRoadTrain { /// /// Required designer variable. @@ -28,120 +28,160 @@ /// private void InitializeComponent() { - pictureBoxYborshik = new PictureBox(); buttonCreate = new Button(); - numericUpDownwheelYborshik = new NumericUpDown(); buttonLeft = new Button(); - buttonDown = new Button(); - buttonRight = new Button(); buttonUp = new Button(); + buttonRight = new Button(); + buttonDown = new Button(); + pictureBoxYborshik = new PictureBox(); + buttonCreateTruck = new Button(); + comboBoxStrategy = new ComboBox(); + buttonStrategyStep = new Button(); + numericUpDownwheelTruck = new NumericUpDown(); ((System.ComponentModel.ISupportInitialize)pictureBoxYborshik).BeginInit(); - ((System.ComponentModel.ISupportInitialize)numericUpDownwheelYborshik).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownwheelTruck).BeginInit(); SuspendLayout(); // - // pictureBoxYborshik - // - pictureBoxYborshik.Dock = DockStyle.Fill; - pictureBoxYborshik.Location = new Point(0, 0); - pictureBoxYborshik.Name = "pictureBoxYborshik"; - pictureBoxYborshik.Size = new Size(800, 450); - pictureBoxYborshik.TabIndex = 0; - pictureBoxYborshik.TabStop = false; - // // buttonCreate // buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreate.Location = new Point(0, 421); + buttonCreate.Location = new Point(0, 425); buttonCreate.Name = "buttonCreate"; - buttonCreate.Size = new Size(94, 29); - buttonCreate.TabIndex = 1; - buttonCreate.Text = "Создать"; + buttonCreate.Size = new Size(327, 29); + buttonCreate.TabIndex = 0; + buttonCreate.Text = "Создать подметально-уборочную машину\r\n"; buttonCreate.UseVisualStyleBackColor = true; buttonCreate.Click += buttonCreate_Click; // - // numericUpDownwheelYborshik - // - numericUpDownwheelYborshik.Location = new Point(91, 423); - numericUpDownwheelYborshik.Margin = new Padding(3, 4, 3, 4); - numericUpDownwheelYborshik.Name = "numericUpDownwheelYborshik"; - numericUpDownwheelYborshik.Size = new Size(150, 27); - numericUpDownwheelYborshik.TabIndex = 8; - // // buttonLeft // buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; buttonLeft.BackgroundImage = Properties.Resources.Strelkaleft; buttonLeft.BackgroundImageLayout = ImageLayout.Stretch; - buttonLeft.Location = new Point(674, 415); + buttonLeft.Location = new Point(752, 422); buttonLeft.Name = "buttonLeft"; buttonLeft.Size = new Size(35, 35); - buttonLeft.TabIndex = 9; + buttonLeft.TabIndex = 1; buttonLeft.UseVisualStyleBackColor = true; buttonLeft.Click += buttonMove_Click; // - // buttonDown - // - buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; - buttonDown.BackgroundImage = Properties.Resources.Strelkadown; - buttonDown.BackgroundImageLayout = ImageLayout.Stretch; - buttonDown.Location = new Point(704, 415); - buttonDown.Name = "buttonDown"; - buttonDown.Size = new Size(35, 35); - buttonDown.TabIndex = 10; - buttonDown.UseVisualStyleBackColor = true; - buttonDown.Click += buttonMove_Click; - // - // buttonRight - // - buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; - buttonRight.BackgroundImage = Properties.Resources.Strelkaright; - buttonRight.BackgroundImageLayout = ImageLayout.Stretch; - buttonRight.Location = new Point(735, 415); - buttonRight.Name = "buttonRight"; - buttonRight.Size = new Size(35, 35); - buttonRight.TabIndex = 11; - buttonRight.UseVisualStyleBackColor = true; - buttonRight.Click += buttonMove_Click; - // // buttonUp // buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; buttonUp.BackgroundImage = Properties.Resources.Strelkaup; buttonUp.BackgroundImageLayout = ImageLayout.Stretch; - buttonUp.Location = new Point(704, 383); + buttonUp.Location = new Point(784, 392); buttonUp.Name = "buttonUp"; buttonUp.Size = new Size(35, 35); - buttonUp.TabIndex = 12; + buttonUp.TabIndex = 2; buttonUp.UseVisualStyleBackColor = true; buttonUp.Click += buttonMove_Click; // - // FormYborshik + // buttonRight + // + buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonRight.BackgroundImage = Properties.Resources.Strelkaright; + buttonRight.BackgroundImageLayout = ImageLayout.Stretch; + buttonRight.Location = new Point(815, 422); + buttonRight.Name = "buttonRight"; + buttonRight.Size = new Size(35, 35); + buttonRight.TabIndex = 3; + buttonRight.UseVisualStyleBackColor = true; + buttonRight.Click += buttonMove_Click; + // + // buttonDown + // + buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonDown.BackgroundImage = Properties.Resources.Strelkadown; + buttonDown.BackgroundImageLayout = ImageLayout.Stretch; + buttonDown.Location = new Point(784, 422); + buttonDown.Name = "buttonDown"; + buttonDown.Size = new Size(35, 35); + buttonDown.TabIndex = 4; + buttonDown.UseVisualStyleBackColor = true; + buttonDown.Click += buttonMove_Click; + // + // pictureBoxYborshik + // + pictureBoxYborshik.Dock = DockStyle.Fill; + pictureBoxYborshik.Location = new Point(0, 0); + pictureBoxYborshik.Name = "pictureBoxYborshik"; + pictureBoxYborshik.Size = new Size(851, 456); + pictureBoxYborshik.TabIndex = 5; + pictureBoxYborshik.TabStop = false; + // + // buttonCreateTruck + // + buttonCreateTruck.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateTruck.Location = new Point(333, 425); + buttonCreateTruck.Name = "buttonCreateTruck"; + buttonCreateTruck.Size = new Size(141, 29); + buttonCreateTruck.TabIndex = 6; + buttonCreateTruck.Text = "Создать грузовик"; + buttonCreateTruck.UseVisualStyleBackColor = true; + buttonCreateTruck.Click += buttonCreateTruck_Click; + // + // comboBoxStrategy + // + comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxStrategy.FormattingEnabled = true; + comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" }); + comboBoxStrategy.Location = new Point(700, 0); + comboBoxStrategy.Name = "comboBoxStrategy"; + comboBoxStrategy.Size = new Size(151, 28); + comboBoxStrategy.TabIndex = 7; + // + // buttonStrategyStep + // + buttonStrategyStep.Location = new Point(757, 34); + buttonStrategyStep.Name = "buttonStrategyStep"; + buttonStrategyStep.Size = new Size(94, 29); + buttonStrategyStep.TabIndex = 8; + buttonStrategyStep.Text = "Шаг"; + buttonStrategyStep.UseVisualStyleBackColor = true; + buttonStrategyStep.Click += buttonStrategyStep_Click; + // + // numericUpDownwheelTruck + // + numericUpDownwheelTruck.Location = new Point(480, 425); + numericUpDownwheelTruck.Margin = new Padding(3, 4, 3, 4); + numericUpDownwheelTruck.Name = "numericUpDownwheelTruck"; + numericUpDownwheelTruck.Size = new Size(150, 27); + numericUpDownwheelTruck.TabIndex = 9; + // + // FormRoadTrain // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); - Controls.Add(buttonUp); - Controls.Add(buttonRight); + ClientSize = new Size(851, 456); + Controls.Add(numericUpDownwheelTruck); + Controls.Add(buttonStrategyStep); + Controls.Add(comboBoxStrategy); + Controls.Add(buttonCreateTruck); Controls.Add(buttonDown); + Controls.Add(buttonRight); + Controls.Add(buttonUp); Controls.Add(buttonLeft); - Controls.Add(numericUpDownwheelYborshik); Controls.Add(buttonCreate); Controls.Add(pictureBoxYborshik); - Name = "FormYborshik"; + Name = "FormRoadTrain"; Text = "FormYborshik"; ((System.ComponentModel.ISupportInitialize)pictureBoxYborshik).EndInit(); - ((System.ComponentModel.ISupportInitialize)numericUpDownwheelYborshik).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownwheelTruck).EndInit(); ResumeLayout(false); } #endregion - private PictureBox pictureBoxYborshik; private Button buttonCreate; - private NumericUpDown numericUpDownwheelYborshik; private Button buttonLeft; - private Button buttonDown; - private Button buttonRight; private Button buttonUp; + private Button buttonRight; + private Button buttonDown; + private PictureBox pictureBoxYborshik; + private Button buttonCreateTruck; + private ComboBox comboBoxStrategy; + private Button buttonStrategyStep; + private NumericUpDown numericUpDownwheelTruck; } } \ No newline at end of file diff --git a/Hard/Hard/FormRoadTrain.cs b/Hard/Hard/FormRoadTrain.cs new file mode 100644 index 0000000..adfaaba --- /dev/null +++ b/Hard/Hard/FormRoadTrain.cs @@ -0,0 +1,154 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using Hard.Drawnings; +using Hard.MovementStrategy; + +namespace Hard +{ + /// + /// Форма работы с объектом "Спортивный автомобиль" + /// + public partial class FormRoadTrain : Form + { + /// + /// Поле-объект для прорисовки объекта + /// + private DrawningTruck? _drawningTruck; + + + /// + /// Стратегия перемещения + /// + private AbstractStrategy? _strategy; + + /// + /// Конструктор формы + /// + public FormRoadTrain() + { + InitializeComponent(); + _strategy = null; + } + + private void Draw() + { + if (_drawningTruck == null) + { + return; + } + + Bitmap bmp = new(pictureBoxYborshik.Width, pictureBoxYborshik.Height); + Graphics gr = Graphics.FromImage(bmp); + _drawningTruck.DrawTransport(gr); + pictureBoxYborshik.Image = bmp; + } + + + + + /// + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + + private void buttonCreate_Click(object sender, EventArgs e) + { + Random random = new(); + _drawningTruck = new DrawningTruck(random.Next(100, 300), random.Next(1000, 3000), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), + pictureBoxYborshik.Width, pictureBoxYborshik.Height, random.Next(1, 4), random.Next(1, 4)); + _drawningTruck.SetPosition(random.Next(10, 100), random.Next(10, 100)); + Draw(); + } + private void buttonCreateTruck_Click(object sender, EventArgs e) + { + Random random = new(); + _drawningTruck = new DrawningRoadTrain(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)), + pictureBoxYborshik.Width, pictureBoxYborshik.Height, random.Next(1, 4), random.Next(1, 4)); + _drawningTruck.SetPosition(random.Next(10, 100), random.Next(10, 100)); + Draw(); + } + + private void buttonMove_Click(object sender, EventArgs e) + { + if (_drawningTruck == null) + { + return; + } + + string name = ((Button)sender)?.Name ?? string.Empty; + bool result = false; + switch (name) + { + case "buttonUp": + result = _drawningTruck.MoveTransport(DirectionType.Up); + break; + case "buttonDown": + result = _drawningTruck.MoveTransport(DirectionType.Down); + break; + case "buttonLeft": + result = _drawningTruck.MoveTransport(DirectionType.Left); + break; + case "buttonRight": + result = _drawningTruck.MoveTransport(DirectionType.Right); + break; + } + + if (result) + { + Draw(); + } + } + + private void buttonStrategyStep_Click(object sender, EventArgs e) + { + if (_drawningTruck == null) + { + return; + } + + if (comboBoxStrategy.Enabled) + { + _strategy = comboBoxStrategy.SelectedIndex switch + { + 0 => new MoveToCenter(), + 1 => new MoveToBorder(), + _ => null, + }; + if (_strategy == null) + { + return; + } + _strategy.SetData(new MoveableTruck(_drawningTruck), pictureBoxYborshik.Width, pictureBoxYborshik.Height); + } + + if (_strategy == null) + { + return; + } + + comboBoxStrategy.Enabled = false; + _strategy.MakeStep(); + Draw(); + + if (_strategy.GetStatus() == StrategyStatus.Finish) + { + comboBoxStrategy.Enabled = true; + _strategy = null; + } + } + } +} diff --git a/Hard/Hard/FormYborshik.resx b/Hard/Hard/FormRoadTrain.resx similarity index 100% rename from Hard/Hard/FormYborshik.resx rename to Hard/Hard/FormRoadTrain.resx diff --git a/Hard/Hard/FormYborshik.cs b/Hard/Hard/FormYborshik.cs deleted file mode 100644 index 78c75e8..0000000 --- a/Hard/Hard/FormYborshik.cs +++ /dev/null @@ -1,93 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace Hard -{ - public partial class FormYborshik : Form - { - /// - /// Поле-объект для прорисовки объекта - /// - private DrawningYborshik? _drawningYborshik; - - /// - /// Конструктор формы - /// - public FormYborshik() - { - InitializeComponent(); - } - - private void Draw() - { - if (_drawningYborshik == null) - { - return; - } - - Bitmap bmp = new(pictureBoxYborshik.Width, pictureBoxYborshik.Height); - Graphics gr = Graphics.FromImage(bmp); - _drawningYborshik.DrawTransport(gr); - pictureBoxYborshik.Image = bmp; - } - - /// - /// Обработка нажатия кнопки "Создать" - /// - /// - /// - - private void buttonCreate_Click(object sender, EventArgs e) - { - Random random = new(); - _drawningYborshik = new DrawningYborshik(); - _drawningYborshik.Init(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))); - _drawningYborshik.SetPictureSize(pictureBoxYborshik.Width, pictureBoxYborshik.Height); - _drawningYborshik.SetPosition(random.Next(10, 100), random.Next(10, 100)); - _drawningYborshik.Wheel.WheelNum = (int)numericUpDownwheelYborshik.Value; - Draw(); - - } - private void buttonMove_Click(object sender, EventArgs e) - { - if (_drawningYborshik == null) - { - return; - } - - string name = ((Button)sender)?.Name ?? string.Empty; - bool result = false; - switch (name) - { - case "buttonUp": - result = _drawningYborshik.MoveTransport(DirectionType.Up); - break; - case "buttonDown": - result = _drawningYborshik.MoveTransport(DirectionType.Down); - break; - case "buttonLeft": - result = _drawningYborshik.MoveTransport(DirectionType.Left); - break; - case "buttonRight": - result = _drawningYborshik.MoveTransport(DirectionType.Right); - break; - } - - if (result) - { - Draw(); - } - } - } -} - diff --git a/Hard/Hard/MovementStrategy/AbstractStrategy.cs b/Hard/Hard/MovementStrategy/AbstractStrategy.cs new file mode 100644 index 0000000..0e1d625 --- /dev/null +++ b/Hard/Hard/MovementStrategy/AbstractStrategy.cs @@ -0,0 +1,142 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Hard.MovementStrategy; + +public abstract class AbstractStrategy +{ + /// + /// Перемещаемый объект + /// + 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/Hard/Hard/MovementStrategy/IMoveableObjects.cs b/Hard/Hard/MovementStrategy/IMoveableObjects.cs new file mode 100644 index 0000000..8a08b97 --- /dev/null +++ b/Hard/Hard/MovementStrategy/IMoveableObjects.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Hard.MovementStrategy; + +public interface IMoveableObjectcs +{ + /// + /// Получение координаты объекта + /// + ObjectParameters? GetObjectPosition { get; } + + /// + /// Шаг объекта + /// + int GetStep { get; } + + /// + /// Попытка переместить объект в указанном направлении + /// + /// Направление + /// true - объект перемещен, false - перемещение невозможно + bool TryMoveObject(MovementDirection direction); +} diff --git a/Hard/Hard/MovementStrategy/MoveToBorder.cs b/Hard/Hard/MovementStrategy/MoveToBorder.cs new file mode 100644 index 0000000..6355fd9 --- /dev/null +++ b/Hard/Hard/MovementStrategy/MoveToBorder.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Hard.MovementStrategy; + +public class MoveToBorder : AbstractStrategy +{ + protected override bool IsTargetDestinaion() + { + var objectparams = GetObjectParameters; + if (objectparams != null) + { + return objectparams.RightBorder <= FieldWidth && + objectparams.RightBorder + GetStep() >= FieldWidth && + objectparams.DownBorder <= FieldHeight && + objectparams.DownBorder + GetStep() >= FieldHeight; + } + return false; + } + + protected override void MoveToTarget() + { + var objectparams = GetObjectParameters; + if (objectparams == null) + { + return; + } + var dX = objectparams.RightBorder - FieldWidth; + if (Math.Abs(dX) > GetStep()) + { + if (dX > 0) + { + MoveLeft(); + } + else + { + MoveRight(); + } + } + var dY = objectparams.DownBorder - FieldHeight; + if (Math.Abs(dY) > GetStep()) + { + if (dY > 0) + { + MoveUp(); + } + else + { + MoveDown(); + } + } + } +} diff --git a/Hard/Hard/MovementStrategy/MoveToCenter.cs b/Hard/Hard/MovementStrategy/MoveToCenter.cs new file mode 100644 index 0000000..c149478 --- /dev/null +++ b/Hard/Hard/MovementStrategy/MoveToCenter.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Hard.MovementStrategy; + +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(); + } + } + } +} diff --git a/Hard/Hard/MovementStrategy/MoveableTruck.cs b/Hard/Hard/MovementStrategy/MoveableTruck.cs new file mode 100644 index 0000000..e21cb0f --- /dev/null +++ b/Hard/Hard/MovementStrategy/MoveableTruck.cs @@ -0,0 +1,68 @@ +using Hard.Drawnings; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.TrackBar; + +namespace Hard.MovementStrategy; + +public class MoveableTruck : IMoveableObjectcs +{ + /// + /// Поле-объект класса DrawningCar или его наследника + /// + private readonly DrawningTruck? _truck = null; + + /// + /// Конструктор + /// + /// Объект класса DrawningCar + public MoveableTruck(DrawningTruck truck) + { + _truck = truck; + } + + public ObjectParameters? GetObjectPosition + { + get + { + if (_truck == null || _truck.EntityTruck == null || !_truck.GetPosX.HasValue || !_truck.GetPosY.HasValue) + { + return null; + } + return new ObjectParameters(_truck.GetPosX.Value, _truck.GetPosY.Value, _truck.GetWidth, _truck.GetHeight); + } + } + + public int GetStep => (int)(_truck?.EntityTruck?.Step ?? 0); + + public bool TryMoveObject(MovementDirection direction) + { + if (_truck == null || _truck.EntityTruck == null) + { + return false; + } + + return _truck.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/Hard/Hard/MovementStrategy/MovementDirection.cs b/Hard/Hard/MovementStrategy/MovementDirection.cs new file mode 100644 index 0000000..9edd955 --- /dev/null +++ b/Hard/Hard/MovementStrategy/MovementDirection.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Hard.MovementStrategy; + +public enum MovementDirection +{ + /// + /// Вверх + /// + Up = 1, + + /// + /// Вниз + /// + Down = 2, + + /// + /// Влево + /// + Left = 3, + + /// + /// Вправо + /// + Right = 4 +} diff --git a/Hard/Hard/MovementStrategy/ObjectParameters.cs b/Hard/Hard/MovementStrategy/ObjectParameters.cs new file mode 100644 index 0000000..b3f3a2c --- /dev/null +++ b/Hard/Hard/MovementStrategy/ObjectParameters.cs @@ -0,0 +1,75 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Hard.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/Hard/Hard/MovementStrategy/StrategyStatus.cs b/Hard/Hard/MovementStrategy/StrategyStatus.cs new file mode 100644 index 0000000..e96fc80 --- /dev/null +++ b/Hard/Hard/MovementStrategy/StrategyStatus.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Hard.MovementStrategy; + +public enum StrategyStatus +{ + /// + /// Все готово к началу + /// + NotInit, + + /// + /// Выполняется + /// + InProgress, + + /// + /// Завершено + /// + Finish +} diff --git a/Hard/Hard/Program.cs b/Hard/Hard/Program.cs index 595ba7b..c0e5f68 100644 --- a/Hard/Hard/Program.cs +++ b/Hard/Hard/Program.cs @@ -11,7 +11,7 @@ namespace Hard // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormYborshik()); + Application.Run(new FormRoadTrain()); } } } \ No newline at end of file