From 843eb88f3dc05510eec4dd0b7c06efb9cb726355 Mon Sep 17 00:00:00 2001 From: Roman-Klemendeev <147613551+Roman-Klemendeev@users.noreply.github.com> Date: Tue, 9 Apr 2024 00:13:56 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=B0=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DrawningGasolineTanker.cs | 206 ---------------- .../Drawnings/DirectionType.cs | 28 +++ .../Drawnings/DrawningGasolineTanker.cs | 53 +++++ .../Drawnings/DrawningTanker.cs | 220 ++++++++++++++++++ .../Entities/EntityGasolineTanker.cs | 37 +++ .../Entities/EntityTanker.cs | 36 +++ .../EntityGasolineTanker.cs | 68 ------ .../FormGasolineTanker.Designer.cs | 133 +++++++---- .../FormGasolineTanker.cs | 120 ++++++++-- .../MovementStrategy/AbstractStrategy.cs | 119 ++++++++++ .../MovementStrategy/IMoveableObjectcs.cs | 22 ++ .../MovementStrategy/MoveToBorder.cs | 39 ++++ .../MovementStrategy/MoveToCenter.cs | 56 +++++ .../MovementStrategy/MoveableTanker.cs | 62 +++++ .../MovementDirection.cs} | 10 +- .../MovementStrategy/ObjectParameters.cs | 60 +++++ .../MovementStrategy/StrategyStatus.cs | 19 ++ 17 files changed, 939 insertions(+), 349 deletions(-) delete mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/DrawningGasolineTanker.cs create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/Drawnings/DirectionType.cs create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/Drawnings/DrawningGasolineTanker.cs create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/Drawnings/DrawningTanker.cs create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/Entities/EntityGasolineTanker.cs create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/Entities/EntityTanker.cs delete mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/EntityGasolineTanker.cs create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/AbstractStrategy.cs create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/IMoveableObjectcs.cs create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/MoveToBorder.cs create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/MoveToCenter.cs create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/MoveableTanker.cs rename ProjectGasolineTanker/ProjectGasolineTanker/{DirectionType.cs => MovementStrategy/MovementDirection.cs} (74%) create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/ObjectParameters.cs create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/StrategyStatus.cs diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/DrawningGasolineTanker.cs b/ProjectGasolineTanker/ProjectGasolineTanker/DrawningGasolineTanker.cs deleted file mode 100644 index 5dec59b..0000000 --- a/ProjectGasolineTanker/ProjectGasolineTanker/DrawningGasolineTanker.cs +++ /dev/null @@ -1,206 +0,0 @@ - -namespace ProjectGasolineTanker; -public class DrawningGasolineTanker -{ - /// - /// Класс-сущность - /// - public EntityGasolineTanker? EntityGasolineTanker { get; private set; } - - /// - /// Ширина окна - /// - private int? _pictureWidth; - - /// - /// Высота окна - /// - private int? _pictureHeight; - - /// - /// Левая координата прорисовки автомобиля - /// - private int? _startPosX; - - /// - /// Верхняя кооридната прорисовки автомобиля - /// - private int? _startPosY; - - /// - /// Ширина прорисовки автомобиля - /// - private readonly int _drawningCarWidth = 90; - - /// - /// Высота прорисовки автомобиля - /// - private readonly int _drawningCarHeight = 63; - - /// - /// Инициализация свойств - /// - /// Скорость - /// Вес - /// Основной цвет - /// Дополнительный цвет - /// Признак - /// Признак - /// Признак - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool tank, bool signalbeacon, bool gas) - { - EntityGasolineTanker = new EntityGasolineTanker(); - EntityGasolineTanker.Init(speed, weight, bodyColor, additionalColor, tank, signalbeacon, gas); - _pictureWidth = null; - _pictureHeight = null; - _startPosX = null; - _startPosY = null; - } - - /// - /// Установка границ поля - /// - /// Ширина поля - /// Высота поля - /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах - public bool SetPictureSize(int width, int height) - { - if (width > _drawningCarWidth && height > _drawningCarHeight) - { - _pictureWidth = width; - _pictureHeight = height; - if (_startPosX != null && _startPosY != null) - { - if (_startPosX.Value < 0) _startPosX = 0; - if (_startPosY.Value < 0) _startPosY = 0; - if (_startPosX.Value + _drawningCarWidth > _pictureWidth) - { - _startPosX = _pictureWidth - _drawningCarWidth; - } - if (_startPosY.Value + _drawningCarHeight > _pictureHeight) - { - _startPosY = _pictureHeight - _drawningCarHeight; - } - } - - return true; - } - return false; - } - - /// - /// Установка позиции - /// - /// Координата X - /// Координата Y - public void SetPosition(int x, int y) - { - if (!_pictureHeight.HasValue || !_pictureWidth.HasValue) - { - return; - } - _startPosX = x; - _startPosY = y; - if (_pictureHeight.Value < (_startPosY + _drawningCarHeight)) - { - _startPosY = _pictureHeight - _drawningCarHeight; - } - if (_pictureWidth.Value < (_startPosX = _drawningCarWidth)) - { - _startPosX = _pictureWidth - _drawningCarWidth; - } - } - - /// - /// Изменение направления перемещения - /// - /// Направление - /// true - перемещене выполнено, false - перемещение невозможно - public bool MoveTransport(DirectionType direction) - { - if (EntityGasolineTanker == null || !_startPosX.HasValue || !_startPosY.HasValue) - { - return false; - } - - switch (direction) - { - //влево - case DirectionType.Left: - if (_startPosX.Value - EntityGasolineTanker.Step > 0) - { - _startPosX -= (int)EntityGasolineTanker.Step; - } - return true; - //вверх - case DirectionType.Up: - if (_startPosY.Value - EntityGasolineTanker.Step > 0) - { - _startPosY -= (int)EntityGasolineTanker.Step; - } - return true; - // вправо - case DirectionType.Right: - if (_startPosX.Value + _drawningCarWidth + EntityGasolineTanker.Step < _pictureWidth) - { - _startPosX += (int)EntityGasolineTanker.Step; - } - return true; - //вниз - case DirectionType.Down: - if (_startPosY + EntityGasolineTanker.Step + _drawningCarHeight < _pictureHeight) - { - _startPosY += (int)EntityGasolineTanker.Step; - } - return true; - default: - return false; - } - } - - /// - /// Прорисовка объекта - /// - /// - public void DrawTransport(Graphics g) - { - if (EntityGasolineTanker == null || !_startPosX.HasValue || !_startPosY.HasValue) - { - return; - } - - Pen pen = new(Color.Black); - Brush additionalBrush = new SolidBrush(EntityGasolineTanker.AdditionalColor); - - - - - //кузов - Brush br = new SolidBrush(EntityGasolineTanker.BodyColor); - g.FillRectangle(br, _startPosX.Value + 0, _startPosY.Value + 35, 90, 7); - g.FillRectangle(br, _startPosX.Value + 67, _startPosY.Value + 5, 22, 28); - - - //колеса - Brush brBlack = new SolidBrush(Color.Black); - g.FillEllipse(brBlack, _startPosX.Value + 0, _startPosY.Value + 40, 23, 23); - g.FillEllipse(brBlack, _startPosX.Value + 23, _startPosY.Value + 40, 23, 23); - g.FillEllipse(brBlack, _startPosX.Value + 67, _startPosY.Value + 40, 23, 23); - if (EntityGasolineTanker.Tank) - { - g.DrawEllipse(pen, _startPosX.Value + 0, _startPosY.Value + 5, 64, 30); - g.FillEllipse(additionalBrush, _startPosX.Value + 0, _startPosY.Value + 5, 64, 30); - - - } - if (EntityGasolineTanker.Signalbeacon) - { - - g.FillRectangle(additionalBrush, _startPosX.Value + 79, _startPosY.Value + 0, 5, 5); - g.DrawEllipse(pen, _startPosX.Value + 79, _startPosY.Value + 0, 5, 10); - g.FillEllipse(additionalBrush, _startPosX.Value + 79, _startPosY.Value + 0, 5, 10); - - - } - } -} diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/Drawnings/DirectionType.cs b/ProjectGasolineTanker/ProjectGasolineTanker/Drawnings/DirectionType.cs new file mode 100644 index 0000000..82a308a --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/Drawnings/DirectionType.cs @@ -0,0 +1,28 @@ +namespace ProjectGasolineTanker.Drawnings; +public enum DirectionType +{ + /// + /// Неизвестное направление + /// + Unknow = -1, + + /// + /// Вверх + /// + Up = 1, + + /// + /// Вниз + /// + Down = 2, + + /// + /// Влево + /// + Left = 3, + + /// + /// Вправо + /// + Right = 4 +} \ No newline at end of file diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/Drawnings/DrawningGasolineTanker.cs b/ProjectGasolineTanker/ProjectGasolineTanker/Drawnings/DrawningGasolineTanker.cs new file mode 100644 index 0000000..f45c91f --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/Drawnings/DrawningGasolineTanker.cs @@ -0,0 +1,53 @@ +using ProjectGasolineTanker.Entities; + +namespace ProjectGasolineTanker.Drawnings; +public class DrawningGasolineTanker : DrawningTanker +{ + + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак + /// Признак + public DrawningGasolineTanker(int speed, double weight, Color bodyColor, Color additionalColor, bool tank, bool signalbeacon) : base(90, 63) + { + EntityTanker = new EntityGasolineTanker(speed, weight, bodyColor, additionalColor, tank, signalbeacon); + } + + public override void DrawTransport(Graphics g) + { + if (EntityTanker == null || EntityTanker is not EntityGasolineTanker gasolineTanker || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + + + Pen pen = new(Color.Black); + Brush additionalBrush = new SolidBrush(gasolineTanker.AdditionalColor); + + if (gasolineTanker.Tank) + { + g.DrawEllipse(pen, _startPosX.Value + 0, _startPosY.Value + 5, 64, 30); + g.FillEllipse(additionalBrush, _startPosX.Value + 0, _startPosY.Value + 5, 64, 30); + + + } + _startPosY += 5; + base.DrawTransport(g); + _startPosY -= 5; + if (gasolineTanker.Signalbeacon) + { + + g.FillRectangle(additionalBrush, _startPosX.Value + 79, _startPosY.Value + 0, 5, 5); + g.DrawEllipse(pen, _startPosX.Value + 79, _startPosY.Value + 0, 5, 10); + g.FillEllipse(additionalBrush, _startPosX.Value + 79, _startPosY.Value + 0, 5, 10); + + + } + } +} diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/Drawnings/DrawningTanker.cs b/ProjectGasolineTanker/ProjectGasolineTanker/Drawnings/DrawningTanker.cs new file mode 100644 index 0000000..71f3562 --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/Drawnings/DrawningTanker.cs @@ -0,0 +1,220 @@ +using ProjectGasolineTanker.Entities; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectGasolineTanker.Drawnings; + +public class DrawningTanker +{ + /// + /// Класс-сущность + /// + public EntityTanker? EntityTanker { get; protected set; } + + /// + /// Ширина окна + /// + private int? _pictureWidth; + + /// + /// Высота окна + /// + private int? _pictureHeight; + + /// + /// Левая координата прорисовки автомобиля + /// + protected int? _startPosX; + + /// + /// Верхняя кооридната прорисовки автомобиля + /// + protected int? _startPosY; + + /// + /// Ширина прорисовки автомобиля + /// + private readonly int _drawningCarWidth = 90; + + /// + /// Высота прорисовки автомобиля + /// + private readonly int _drawningCarHeight = 58; + + /// + /// Координата X объекта + /// + public int? GetPosX => _startPosX; + + /// + /// Координата Y объекта + /// + public int? GetPosY => _startPosY; + + /// + /// Ширина объекта + /// + public int GetWidth => _drawningCarWidth; + + /// + /// Высота объекта + /// + public int GetHeight => _drawningCarHeight; + + /// + /// Пустой конструктор + /// + private DrawningTanker() + { + _pictureWidth = null; + _pictureHeight = null; + _startPosX = null; + _startPosY = null; + } + + /// + /// Конструктор + /// + /// Скорость + /// Вес танка + /// Основной цвет + public DrawningTanker(int speed, double weight, Color bodyColor) : this() + { + EntityTanker = new EntityTanker(speed, weight, bodyColor); + } + /// + /// Конструктор + /// + /// Ширина прорисовки танка + /// Высота прорисовки танка + protected DrawningTanker(int drawningCarWidth, int drawningCarHeight) : this() + { + _drawningCarWidth = drawningCarWidth; + _drawningCarHeight = drawningCarHeight; + } + /// + /// Установка границ поля + /// + /// Ширина поля + /// Высота поля + /// true - границы заданы, false - проверка не пройдена , нельзя разместить объект в этих размерах + public bool SetPictureSize(int width, int height) + { + + if (height < _drawningCarHeight || width < _drawningCarWidth) + { + return false; + } + _pictureHeight = height; + _pictureWidth = width; + if (_startPosX != null && _startPosY != null) + { + if (_startPosX < 0) _startPosX = 0; + if (_startPosY < 0) _startPosY = 0; + if (_pictureHeight.Value < _startPosY + _drawningCarHeight) + { + _startPosY = _pictureHeight - _drawningCarHeight; + } + if (_pictureWidth.Value < _startPosX + _drawningCarWidth) + { + _startPosX = _pictureWidth - _drawningCarWidth; + } + } + + return true; + } + /// + /// Установка позиции + /// + /// Координата X + /// Координата Y + public void SetPosition(int x, int y) + { + if (!_pictureWidth.HasValue || !_pictureHeight.HasValue) + { + return; + } + _startPosX = x; + _startPosY = y; + if (_startPosX < 0) _startPosX = 0; + if (_startPosY < 0) _startPosY = 0; + if (_pictureHeight.Value < _startPosY + _drawningCarHeight) + { + _startPosY = _pictureHeight - _drawningCarHeight; + } + if (_pictureWidth.Value < _startPosX + _drawningCarWidth) + { + _startPosX = _pictureWidth - _drawningCarWidth; + } + + } + /// + /// Изменение направления перемещения + /// + /// направление + /// + public bool MoveTransport(DirectionType dicretion) + { + if (EntityTanker == null || _startPosX == null || _startPosY == null) + { + return false; + } + switch (dicretion) + { + //влево + case DirectionType.Left: + if (_startPosX.Value - EntityTanker.Step > 0) + { + _startPosX -= (int)EntityTanker.Step; + } + return true; + //вправо + case DirectionType.Right: + if (_startPosX.Value + _drawningCarWidth + EntityTanker.Step < _pictureWidth) + { + _startPosX += (int)EntityTanker.Step; + } + return true; + //вверх + case DirectionType.Up: + if (_startPosY.Value - EntityTanker.Step > 0) + { + _startPosY -= (int)EntityTanker.Step; + } + return true; + //вниз + case DirectionType.Down: + if (_startPosY + EntityTanker.Step + _drawningCarHeight < _pictureHeight) + { + _startPosY += (int)EntityTanker.Step; + } + return true; + default: + return false; + } + } + public virtual void DrawTransport(Graphics g) + { + if (EntityTanker == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + //кузов + Brush br = new SolidBrush(EntityTanker.BodyColor); + g.FillRectangle(br, _startPosX.Value + 0, _startPosY.Value + 30, 90, 7); + g.FillRectangle(br, _startPosX.Value + 67, _startPosY.Value + 0, 22, 28); + + + //колеса + Brush brBlack = new SolidBrush(Color.Black); + g.FillEllipse(brBlack, _startPosX.Value + 0, _startPosY.Value + 35, 23, 23); + g.FillEllipse(brBlack, _startPosX.Value + 23, _startPosY.Value + 35, 23, 23); + g.FillEllipse(brBlack, _startPosX.Value + 67, _startPosY.Value + 35, 23, 23); + + } +} diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/Entities/EntityGasolineTanker.cs b/ProjectGasolineTanker/ProjectGasolineTanker/Entities/EntityGasolineTanker.cs new file mode 100644 index 0000000..9e6b80c --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/Entities/EntityGasolineTanker.cs @@ -0,0 +1,37 @@ + +namespace ProjectGasolineTanker.Entities; +/// +/// Класс-сущность Бензовоз +/// +public class EntityGasolineTanker : EntityTanker +{ + /// + /// Дополниетльный цвет + /// + public Color AdditionalColor { get; private set; } + /// + /// Наличие безнобака + /// + public bool Tank { get; private set; } + /// + /// Наличие радара + /// + public bool Signalbeacon { get; private set; } + + /// + /// Инициализация полей объекта-класса зенитной установки + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак + /// Признак + + public EntityGasolineTanker(int speed, double weight, Color bodyColor, Color additionalColor, bool tank, bool signalbeacon) : base(speed, weight, bodyColor) + { + Signalbeacon = signalbeacon; + Tank = tank; + AdditionalColor = additionalColor; + } +} diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/Entities/EntityTanker.cs b/ProjectGasolineTanker/ProjectGasolineTanker/Entities/EntityTanker.cs new file mode 100644 index 0000000..f607ac1 --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/Entities/EntityTanker.cs @@ -0,0 +1,36 @@ +namespace ProjectGasolineTanker.Entities; +/// +/// Класс - сущность Грузовик +/// +public class EntityTanker +{ + /// + /// Скорость + /// + 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 EntityTanker(int speed, double weight, Color bodyColor) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + } +} \ No newline at end of file diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/EntityGasolineTanker.cs b/ProjectGasolineTanker/ProjectGasolineTanker/EntityGasolineTanker.cs deleted file mode 100644 index e7bcd1b..0000000 --- a/ProjectGasolineTanker/ProjectGasolineTanker/EntityGasolineTanker.cs +++ /dev/null @@ -1,68 +0,0 @@ -namespace ProjectGasolineTanker; - -/// -/// Класс-сущность "Бензовоз" -/// -public class EntityGasolineTanker -{ - /// - /// Скорость - /// - public int Speed { get; private set; } - - /// - /// Вес - /// - public double Weight { get; private set; } - - /// - /// Основной цвет - /// - public Color BodyColor { get; private set; } - - /// - /// Дополнительный цвет (для опциональных элементов) - /// - public Color AdditionalColor { get; private set; } - - /// - /// Признак (опция) наличия бака - /// - public bool Tank { get; private set; } - - /// - /// Признак (опция) сигнальным маяком - /// - public bool Signalbeacon { get; private set; } - - /// - /// Признак (опция) - /// - public bool Gas { get; private set; } - - /// - /// Шаг перемещения автомобиля - /// - public double Step => Speed * 100 / Weight; - - /// - /// Инициализация полей объекта-класса спортивного автомобиля - /// - /// Скорость - /// Вес автомобиля - /// Основной цвет - /// Дополнительный цвет - /// Признак - /// Признак - /// Признак наличия - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool tank, bool signalbeacon, bool gas) - { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; - AdditionalColor = additionalColor; - Tank = tank; - Signalbeacon = signalbeacon; - Gas = gas; - } -} \ No newline at end of file diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/FormGasolineTanker.Designer.cs b/ProjectGasolineTanker/ProjectGasolineTanker/FormGasolineTanker.Designer.cs index 07edf1b..033d56e 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/FormGasolineTanker.Designer.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/FormGasolineTanker.Designer.cs @@ -29,11 +29,14 @@ private void InitializeComponent() { pictureBoxGasolineTanker = new PictureBox(); - buttoncreate = new Button(); + buttonCreateGasolineTanker = new Button(); buttonleft = new Button(); - buttonRight = new Button(); - buttonDown = new Button(); buttonUp = new Button(); + buttonDown = new Button(); + buttonRight = new Button(); + buttonCreateTanker = new Button(); + comboBoxStrategy = new ComboBox(); + buttonStrategyStep = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxGasolineTanker).BeginInit(); SuspendLayout(); // @@ -42,80 +45,113 @@ pictureBoxGasolineTanker.Dock = DockStyle.Fill; pictureBoxGasolineTanker.Location = new Point(0, 0); pictureBoxGasolineTanker.Name = "pictureBoxGasolineTanker"; - pictureBoxGasolineTanker.Size = new Size(800, 451); + pictureBoxGasolineTanker.Size = new Size(923, 597); pictureBoxGasolineTanker.TabIndex = 0; pictureBoxGasolineTanker.TabStop = false; - // - // buttoncreate + // buttonCreateGasolineTanker // - buttoncreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttoncreate.Location = new Point(0, 416); - buttoncreate.Name = "buttoncreate"; - buttoncreate.Size = new Size(75, 23); - buttoncreate.TabIndex = 1; - buttoncreate.Text = "Создать"; - buttoncreate.UseVisualStyleBackColor = true; - buttoncreate.Click += buttoncreate_Click; + buttonCreateGasolineTanker.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateGasolineTanker.Location = new Point(12, 562); + buttonCreateGasolineTanker.Name = "buttonCreateGasolineTanker"; + buttonCreateGasolineTanker.Size = new Size(223, 23); + buttonCreateGasolineTanker.TabIndex = 1; + buttonCreateGasolineTanker.Text = "Создать бензовоз"; + buttonCreateGasolineTanker.UseVisualStyleBackColor = true; + buttonCreateGasolineTanker.Click += ButtonCreateGasolineTanker_Click; // // buttonleft // buttonleft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; buttonleft.BackgroundImage = Properties.Resources.arrowLeft; buttonleft.BackgroundImageLayout = ImageLayout.Stretch; - buttonleft.Location = new Point(673, 404); - buttonleft.Name = "buttonleft"; + buttonleft.Location = new Point(787, 550); + buttonleft.Name = "buttonLeft"; buttonleft.Size = new Size(35, 35); buttonleft.TabIndex = 2; buttonleft.UseVisualStyleBackColor = true; buttonleft.Click += ButtonMove_Click; // - // buttonRight - // - buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; - buttonRight.BackgroundImage = Properties.Resources.arrowRight; - buttonRight.BackgroundImageLayout = ImageLayout.Stretch; - buttonRight.Location = new Point(755, 404); - 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.arrowDown; - buttonDown.BackgroundImageLayout = ImageLayout.Stretch; - buttonDown.Location = new Point(714, 404); - buttonDown.Name = "buttonDown"; - buttonDown.Size = new Size(35, 35); - buttonDown.TabIndex = 4; - buttonDown.UseVisualStyleBackColor = true; - buttonDown.Click += ButtonMove_Click; - // // buttonUp // buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; buttonUp.BackgroundImage = Properties.Resources.arrowUp; buttonUp.BackgroundImageLayout = ImageLayout.Stretch; - buttonUp.Location = new Point(714, 363); + buttonUp.Location = new Point(828, 509); buttonUp.Name = "buttonUp"; buttonUp.Size = new Size(35, 35); - buttonUp.TabIndex = 5; + buttonUp.TabIndex = 3; buttonUp.UseVisualStyleBackColor = true; buttonUp.Click += ButtonMove_Click; // + // buttonDown + // + buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonDown.BackgroundImage = Properties.Resources.arrowDown; + buttonDown.BackgroundImageLayout = ImageLayout.Stretch; + buttonDown.Location = new Point(828, 550); + buttonDown.Name = "buttonDown"; + buttonDown.Size = new Size(35, 35); + buttonDown.TabIndex = 4; + buttonDown.UseVisualStyleBackColor = true; + buttonDown.Click += ButtonMove_Click; + // + // buttonRight + // + buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonRight.BackgroundImage = Properties.Resources.arrowRight; + buttonRight.BackgroundImageLayout = ImageLayout.Stretch; + buttonRight.Location = new Point(869, 550); + buttonRight.Name = "buttonRight"; + buttonRight.Size = new Size(35, 35); + buttonRight.TabIndex = 5; + buttonRight.UseVisualStyleBackColor = true; + buttonRight.Click += ButtonMove_Click; + // + // buttonCreateTanker + // + buttonCreateTanker.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateTanker.Location = new Point(250, 562); + buttonCreateTanker.Name = "buttonCreateTanker"; + buttonCreateTanker.Size = new Size(223, 23); + buttonCreateTanker.TabIndex = 6; + buttonCreateTanker.Text = "Создать грузовик"; + buttonCreateTanker.UseVisualStyleBackColor = true; + buttonCreateTanker.Click += ButtonCreateTanker_Click; + // + // comboBoxStrategy + // + comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxStrategy.FormattingEnabled = true; + comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" }); + comboBoxStrategy.Location = new Point(790, 12); + comboBoxStrategy.Name = "comboBoxStrategy"; + comboBoxStrategy.Size = new Size(121, 23); + comboBoxStrategy.TabIndex = 7; + // + // buttonStrategyStep + // + buttonStrategyStep.Location = new Point(836, 41); + buttonStrategyStep.Name = "buttonStrategyStep"; + buttonStrategyStep.Size = new Size(75, 23); + buttonStrategyStep.TabIndex = 8; + buttonStrategyStep.Text = "Шаг"; + buttonStrategyStep.UseVisualStyleBackColor = true; + buttonStrategyStep.Click += ButtonStrategyStep_Click; + // // FormGasolineTanker // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 451); - Controls.Add(buttonUp); - Controls.Add(buttonDown); + ClientSize = new Size(923, 597); + Controls.Add(buttonStrategyStep); + Controls.Add(comboBoxStrategy); + Controls.Add(buttonCreateTanker); Controls.Add(buttonRight); + Controls.Add(buttonDown); + Controls.Add(buttonUp); Controls.Add(buttonleft); - Controls.Add(buttoncreate); + Controls.Add(buttonCreateGasolineTanker); Controls.Add(pictureBoxGasolineTanker); Name = "FormGasolineTanker"; Text = "Бензовоз"; @@ -126,10 +162,13 @@ #endregion private PictureBox pictureBoxGasolineTanker; - private Button buttoncreate; + private Button buttonCreateGasolineTanker; private Button buttonleft; private Button buttonRight; private Button buttonDown; private Button buttonUp; + private Button buttonCreateTanker; + private ComboBox comboBoxStrategy; + private Button buttonStrategyStep; } } \ No newline at end of file diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/FormGasolineTanker.cs b/ProjectGasolineTanker/ProjectGasolineTanker/FormGasolineTanker.cs index 42e5be4..3afc3d4 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/FormGasolineTanker.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/FormGasolineTanker.cs @@ -1,69 +1,145 @@  +using ProjectGasolineTanker.Drawnings; +using ProjectGasolineTanker.MovementStrategy; +using ProjectGasollineTanker.MovementStrategy; namespace ProjectGasolineTanker; public partial class FormGasolineTanker : Form { - private DrawningGasolineTanker? _drawningGasolineTanker; + private DrawningTanker? _drawningTanker; + + private AbstractStrategy? _strategy; public FormGasolineTanker() { InitializeComponent(); + _strategy = null; } private void Draw() { - if (_drawningGasolineTanker == null) + if (_drawningTanker == null) { return; } Bitmap bmp = new(pictureBoxGasolineTanker.Width, pictureBoxGasolineTanker.Height); Graphics gr = Graphics.FromImage(bmp); - _drawningGasolineTanker.DrawTransport(gr); + _drawningTanker.DrawTransport(gr); pictureBoxGasolineTanker.Image = bmp; } - private void buttoncreate_Click(object sender, EventArgs e) + + /// + /// Создание объекта класса-перемещения + /// + /// Тип создаваемого объекта + private void CreateObject(string type) { - Random random = new(); - _drawningGasolineTanker = new DrawningGasolineTanker(); - _drawningGasolineTanker.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)), Convert.ToBoolean(random.Next(0, 2))); - _drawningGasolineTanker.SetPictureSize(pictureBoxGasolineTanker.Width, pictureBoxGasolineTanker.Height); - _drawningGasolineTanker.SetPosition(random.Next(10, 100), random.Next(10, 100)); + Random random = new Random(); + switch (type) + { + case nameof(DrawningTanker): + _drawningTanker = new DrawningTanker(random.Next(100, 300), random.Next(1000, 3000), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256))); + break; + case nameof(DrawningGasolineTanker): + _drawningTanker = new DrawningGasolineTanker(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))); + break; + default: + return; + } + _drawningTanker.SetPictureSize(pictureBoxGasolineTanker.Width, pictureBoxGasolineTanker.Height); + _drawningTanker.SetPosition(random.Next(10, 100), random.Next(10, 100)); + _strategy = null; + comboBoxStrategy.Enabled = true; Draw(); } + + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + + private void ButtonCreateGasolineTanker_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningGasolineTanker)); + private void ButtonCreateTanker_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTanker)); + + /// + /// Перемещение объекта по форме (нажатие кнопок навигации) + /// + /// + /// private void ButtonMove_Click(object sender, EventArgs e) { - if (_drawningGasolineTanker == null) + if (_drawningTanker == null) { return; } - string name = ((Button)sender)?.Name ?? string.Empty; bool result = false; switch (name) { case "buttonUp": - result = _drawningGasolineTanker.MoveTransport(DirectionType.Up); + result = _drawningTanker.MoveTransport(DirectionType.Up); break; - case "buttonDown": - result = _drawningGasolineTanker.MoveTransport(DirectionType.Down); - break; - case "buttonleft": - result = _drawningGasolineTanker.MoveTransport(DirectionType.Left); + case "buttonLeft": + result = _drawningTanker.MoveTransport(DirectionType.Left); break; case "buttonRight": - result = _drawningGasolineTanker.MoveTransport(DirectionType.Right); + result = _drawningTanker.MoveTransport(DirectionType.Right); + break; + case "buttonDown": + result = _drawningTanker.MoveTransport(DirectionType.Down); break; } - if (result) { Draw(); } } + /// + /// Обработка нажатия кнопки "Шаг" + /// + /// + /// + private void ButtonStrategyStep_Click(object sender, EventArgs e) + { + if (_drawningTanker == null) + { + return; + } + if (comboBoxStrategy.Enabled) + { + _strategy = comboBoxStrategy.SelectedIndex switch + { + 0 => new MoveToCenter(), + 1 => new MoveToBorder(), + _ => null, + }; + if (_strategy == null) + { + return; + } + _strategy.SetData(new MoveableTanker(_drawningTanker), + pictureBoxGasolineTanker.Width, pictureBoxGasolineTanker.Height); + } + if (_strategy == null) + { + return; + } + comboBoxStrategy.Enabled = false; + _strategy.MakeStep(); + Draw(); + if (_strategy.GetStatus() == StrategyStatus.Finish) + { + comboBoxStrategy.Enabled = true; + _strategy = null; + } + } } + + diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/AbstractStrategy.cs b/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/AbstractStrategy.cs new file mode 100644 index 0000000..4a9b608 --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/AbstractStrategy.cs @@ -0,0 +1,119 @@ +using ProjectGasolineTanker.MovementStrategy; + +namespace ProjectGasollineTanker.MovementStrategy; + +public abstract class AbstractStrategy +{ + /// + /// Перемещаемый объект + /// + private IMoveableObject? _moveableObject; + /// + /// Статус перемещения + /// + private StrategyStatus _state = StrategyStatus.NotInit; + /// + /// Ширина поля + /// + protected int FieldWidth { get; private set; } + /// + /// Высота поля + /// + protected int FieldHeight { get; private set; } + /// + /// Статус перемещения + /// + public StrategyStatus GetStatus() { return _state; } + /// + /// Установка данных + /// + /// Перемещаемый объект + /// Ширина поля + /// Высота поля + public void SetData(IMoveableObject moveableObject, int width, int height) + { + if (moveableObject == null) + { + _state = StrategyStatus.NotInit; + return; + } + _state = StrategyStatus.InProgress; + _moveableObject = moveableObject; + FieldWidth = width; + FieldHeight = height; + } + /// + /// Шаг перемещения + /// + public void MakeStep() + { + if (_state != StrategyStatus.InProgress) + { + return; + } + if (IsTargetDestinaion()) + { + _state = StrategyStatus.Finish; + return; + } + MoveToTarget(); + } + /// + /// Перемещение влево + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveLeft() => MoveTo(MovementDirection.Left); + /// + /// Перемещение вправо + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveRight() => MoveTo(MovementDirection.Right); + /// + /// Перемещение вверх + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveUp() => MoveTo(MovementDirection.Up); + /// + /// Перемещение вниз + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveDown() => MoveTo(MovementDirection.Down); + /// + /// Параметры объекта + /// + protected 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; + } +} \ No newline at end of file diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/IMoveableObjectcs.cs b/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/IMoveableObjectcs.cs new file mode 100644 index 0000000..ce7a352 --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/IMoveableObjectcs.cs @@ -0,0 +1,22 @@ + +namespace ProjectGasolineTanker.MovementStrategy; + +public interface IMoveableObject +{ + /// + /// Получение координаты объекта + /// + + ObjectParameters? GetObjectPosition { get; } + /// + /// Шаг объекта + /// + int GetStep { get; } + + /// + /// Попытка переместить объект в указанном направлении + /// + /// Направление + /// true - объект перемещен, false - перемещение невозможно + bool TryMoveObject(MovementDirection direction); +} \ No newline at end of file diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/MoveToBorder.cs b/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/MoveToBorder.cs new file mode 100644 index 0000000..467fd0e --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/MoveToBorder.cs @@ -0,0 +1,39 @@ +using ProjectGasolineTanker.MovementStrategy; +using ProjectGasollineTanker.MovementStrategy; + +internal class MoveToBorder : AbstractStrategy +{ + /// + /// Стратегия перемещения объекта к Краю экрана + /// + protected override bool IsTargetDestinaion() + { + ObjectParameters? objParams = GetObjectParameters; + if (objParams == null) + { + return false; + } + return objParams.RightBorder + GetStep() >= FieldWidth && + 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()) + { + MoveRight(); + } + + int diffY = objParams.DownBorder - FieldHeight; + if (Math.Abs(diffY) > GetStep()) + { + MoveDown(); + } + } +} \ No newline at end of file diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/MoveToCenter.cs b/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/MoveToCenter.cs new file mode 100644 index 0000000..fcc76e2 --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/MoveToCenter.cs @@ -0,0 +1,56 @@ + + +using ProjectGasollineTanker.MovementStrategy; + +namespace ProjectGasolineTanker.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(); + } + } + } +} \ No newline at end of file diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/MoveableTanker.cs b/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/MoveableTanker.cs new file mode 100644 index 0000000..ed2c37b --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/MoveableTanker.cs @@ -0,0 +1,62 @@ +using ProjectGasolineTanker.Drawnings; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ProjectGasollineTanker.MovementStrategy; +namespace ProjectGasolineTanker.MovementStrategy; + +public class MoveableTanker : IMoveableObject +{ + /// + /// Поле-объект класса или его DrawningTanker наследника + /// + private readonly DrawningTanker? _tanker = null; + /// + /// Конструктор + /// + /// Объект класса DrawningTanker + public MoveableTanker(DrawningTanker tanker) + { + _tanker = tanker; + } + public ObjectParameters? GetObjectPosition + { + get + { + if (_tanker == null || _tanker.EntityTanker == null || + !_tanker.GetPosX.HasValue || !_tanker.GetPosY.HasValue) + { + return null; + } + return new ObjectParameters(_tanker.GetPosX.Value, + _tanker.GetPosY.Value, _tanker.GetWidth, _tanker.GetHeight); + } + } + public int GetStep => (int)(_tanker?.EntityTanker?.Step ?? 0); + public bool TryMoveObject(MovementDirection direction) + { + if (_tanker == null || _tanker.EntityTanker == null) + { + return false; + } + return _tanker.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, + }; + } +} \ No newline at end of file diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/DirectionType.cs b/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/MovementDirection.cs similarity index 74% rename from ProjectGasolineTanker/ProjectGasolineTanker/DirectionType.cs rename to ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/MovementDirection.cs index 1a4eafb..5ec314c 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/DirectionType.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/MovementDirection.cs @@ -1,24 +1,22 @@  -namespace ProjectGasolineTanker; -public enum DirectionType +namespace ProjectGasolineTanker.MovementStrategy; + +public enum MovementDirection { /// /// Вверх /// Up = 1, - /// /// Вниз /// Down = 2, - /// /// Влево /// Left = 3, - /// /// Вправо /// - Right = 4 + Right = 4, } diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/ObjectParameters.cs b/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/ObjectParameters.cs new file mode 100644 index 0000000..6a77835 --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/ObjectParameters.cs @@ -0,0 +1,60 @@ +using ProjectGasollineTanker.MovementStrategy; +namespace ProjectGasolineTanker.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; + } +} \ No newline at end of file diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/StrategyStatus.cs b/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/StrategyStatus.cs new file mode 100644 index 0000000..769b848 --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/MovementStrategy/StrategyStatus.cs @@ -0,0 +1,19 @@ + +using ProjectGasollineTanker.MovementStrategy; +namespace ProjectGasolineTanker.MovementStrategy; + +public enum StrategyStatus +{ + /// + /// Все готово к началу + /// + NotInit, + /// + /// Выполняется + /// + InProgress, + /// + /// Завершино + /// + Finish +} \ No newline at end of file