From 206af8dee08618278c531a08458f5d2e24de5a70 Mon Sep 17 00:00:00 2001 From: Daria Date: Mon, 8 Apr 2024 12:34:46 +0400 Subject: [PATCH 1/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=80=D0=BE=D0=B4=D0=B8=D1=82=D0=B5=D0=BB?= =?UTF-8?q?=D0=B5=D0=B9=20=D0=B8=20=D0=B2=D0=B2=D0=BE=D0=B4=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D0=BE=D1=80=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => Drawnings}/DirectionType.cs | 2 +- .../Excavator/Drawnings/DrawningExcavator.cs | 118 +++++++++++++++ .../DrawningTrackedVehicle.cs} | 135 +++++++++-------- .../{ => Entities}/EntityExcavator.cs | 29 +--- .../Entities/EntityTrackedVehicle.cs | 50 ++++++ Excavator/Excavator/FormExcavator.Designer.cs | 40 +++-- Excavator/Excavator/FormExcavator.cs | 143 +++++++++++------- 7 files changed, 354 insertions(+), 163 deletions(-) rename Excavator/Excavator/{ => Drawnings}/DirectionType.cs (91%) create mode 100644 Excavator/Excavator/Drawnings/DrawningExcavator.cs rename Excavator/Excavator/{DrawningExcavator.cs => Drawnings/DrawningTrackedVehicle.cs} (73%) rename Excavator/Excavator/{ => Entities}/EntityExcavator.cs (64%) create mode 100644 Excavator/Excavator/Entities/EntityTrackedVehicle.cs diff --git a/Excavator/Excavator/DirectionType.cs b/Excavator/Excavator/Drawnings/DirectionType.cs similarity index 91% rename from Excavator/Excavator/DirectionType.cs rename to Excavator/Excavator/Drawnings/DirectionType.cs index 52fa6bd..5343884 100644 --- a/Excavator/Excavator/DirectionType.cs +++ b/Excavator/Excavator/Drawnings/DirectionType.cs @@ -1,4 +1,4 @@ -namespace Excavator; +namespace Excavator.Drawnings; /// /// Направление перемещения diff --git a/Excavator/Excavator/Drawnings/DrawningExcavator.cs b/Excavator/Excavator/Drawnings/DrawningExcavator.cs new file mode 100644 index 0000000..53fcb16 --- /dev/null +++ b/Excavator/Excavator/Drawnings/DrawningExcavator.cs @@ -0,0 +1,118 @@ +using Excavator.Entities; +using System.Drawing.Drawing2D; +using System.Net.Sockets; + +namespace Excavator.Drawnings; + +/// +/// Класс, отвечающий за прорисовку и перемещение объекта-сущности +/// +public class DrawningExcavator : DrawningTrackedVehicle +{ + + + + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия ковша + /// Признак наличия опор + + public DrawningExcavator(int speed, double weight, Color bodyColor, Color additionalColor, bool bucket, bool supports) : base(150,126) + { + EntityTrackedVehicle = new EntityExcavator(speed, weight, bodyColor, additionalColor, bucket, supports); + + } + + + + + + + + + public override void DrawTransport(Graphics g) + { + if (EntityTrackedVehicle == null || EntityTrackedVehicle is not EntityExcavator excavator || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + Pen pen = new(Color.Black); + Brush additionalBrush = new SolidBrush(excavator.AdditionalColor); + Brush brBlue = new SolidBrush(Color.LightBlue); + Brush brGray = new SolidBrush(Color.Gray); + Brush brRed = new SolidBrush(Color.Red); + Brush brYellow = new SolidBrush(Color.Yellow); + Brush brBlack = new SolidBrush(Color.Black); + + + + int bodyHeight = 90; + int cabineHeight = 40; + + int bucketWidth = 30; + + + + + + int wheelsHeight = 40; + + + + Pen bPen = new(Color.Black); + bPen.Width = 3; + + + + _startPosX += 20; + base.DrawTransport(g); + _startPosX -= 20; + + + // ковш + if (excavator.Bucket) + { + + PointF p1 = new Point(_startPosX.Value + bucketWidth, _startPosY.Value + cabineHeight); + PointF p2 = new Point(_startPosX.Value, _startPosY.Value + cabineHeight); + PointF p3 = new Point(_startPosX.Value + bucketWidth , _startPosY.Value + cabineHeight + bodyHeight / 2); + + g.DrawLine(pen, p1, p2); + g.DrawLine(pen, p2, p3); + g.DrawLine(pen, p3, p1); + + g.FillPolygon(additionalBrush, [p1, p2, p3]); + + } + + // опоры + if (excavator.Supports) + { + + g.DrawLine(bPen, + _startPosX.Value + bucketWidth + bodyHeight, _startPosY.Value + cabineHeight + 10, + _startPosX.Value + bucketWidth + bodyHeight + 15, _startPosY.Value + cabineHeight + 10); + g.DrawLine(bPen, + _startPosX.Value + bucketWidth + bodyHeight +15, _startPosY.Value + cabineHeight + 10, + _startPosX.Value + bucketWidth + bodyHeight + 15, _startPosY.Value + bodyHeight + wheelsHeight); + g.DrawLine(bPen, + _startPosX.Value + bucketWidth + bodyHeight + 15, _startPosY.Value + bodyHeight + wheelsHeight, + _startPosX.Value + bucketWidth + bodyHeight + 30, _startPosY.Value + bodyHeight + wheelsHeight); + } + + + + + + } + + + + +} + diff --git a/Excavator/Excavator/DrawningExcavator.cs b/Excavator/Excavator/Drawnings/DrawningTrackedVehicle.cs similarity index 73% rename from Excavator/Excavator/DrawningExcavator.cs rename to Excavator/Excavator/Drawnings/DrawningTrackedVehicle.cs index ed89564..e5f6f3d 100644 --- a/Excavator/Excavator/DrawningExcavator.cs +++ b/Excavator/Excavator/Drawnings/DrawningTrackedVehicle.cs @@ -1,17 +1,20 @@ -using System.Drawing.Drawing2D; -using System.Net.Sockets; +using Excavator.Entities; +using System; +using System.Collections.Generic; +using System.Drawing.Drawing2D; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace Excavator; +namespace Excavator.Drawnings; -/// -/// Класс, отвечающий за прорисовку и перемещение объекта-сущности -/// -public class DrawningExcavator +public class DrawningTrackedVehicle { + /// /// Класс-сущность /// - public EntityExcavator? EntityExcavator { get; private set; } + public EntityTrackedVehicle? EntityTrackedVehicle { get; protected set; } /// /// Ширина окна @@ -26,50 +29,73 @@ public class DrawningExcavator /// /// Левая координата прорисовки эскаватора /// - private int? _startPosX; + protected int? _startPosX; /// /// Верхняя кооридната прорисовки экскаватора /// - private int? _startPosY; + protected int? _startPosY; /// /// Ширина прорисовки экскаватора /// - private readonly int _drawningExcavatorWidth = 145; + private readonly int _drawningExcavatorWidth = 110; /// /// Высота прорисовки экскаватора /// - private readonly int _drawningExcavatorHeight = 125; - + private readonly int _drawningExcavatorHeight = 126; /// - /// Инициализация свойств + /// Пустой конструктор /// - /// Скорость - /// Вес - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия ковша - /// Признак наличия опор - - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bucket, bool supports) + private DrawningTrackedVehicle() { - EntityExcavator = new EntityExcavator(); - EntityExcavator.Init(speed, weight, bodyColor, additionalColor, bucket, supports); _pictureWidth = null; _pictureHeight = null; _startPosX = null; _startPosY = null; } + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + + + + public DrawningTrackedVehicle(int speed, double weight, Color bodyColor) : this() + { + EntityTrackedVehicle = new EntityTrackedVehicle(speed, weight, bodyColor); + + } + + /// + /// Конструктор для наследников + /// + /// Ширина прорисовки гусеничной машины + /// Высота прорисовки гусеничной машины + + + + + protected DrawningTrackedVehicle(int drawningExcavatorWidth, int drawningExcavatorHeight) : this() + { + _drawningExcavatorWidth = drawningExcavatorWidth; + _pictureHeight = drawningExcavatorHeight; + + } + + + /// /// Установка границ поля /// /// Ширина поля /// Высота поля /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах - + public bool SetPictureSize(int width, int height) { @@ -149,7 +175,7 @@ public class DrawningExcavator /// true - перемещене выполнено, false - перемещение невозможно public bool MoveTransport(DirectionType direction) { - if (EntityExcavator == null || !_startPosX.HasValue || !_startPosY.HasValue) + if (EntityTrackedVehicle == null || !_startPosX.HasValue || !_startPosY.HasValue) { return false; } @@ -159,35 +185,35 @@ public class DrawningExcavator //влево case DirectionType.Left: - if (_startPosX.Value - EntityExcavator.Step > 0) + if (_startPosX.Value - EntityTrackedVehicle.Step > 0) { - _startPosX -= (int)EntityExcavator.Step; + _startPosX -= (int)EntityTrackedVehicle.Step; } return true; //вверх case DirectionType.Up: - if (_startPosY.Value - EntityExcavator.Step > 0) + if (_startPosY.Value - EntityTrackedVehicle.Step > 0) { - _startPosY -= (int)EntityExcavator.Step; + _startPosY -= (int)EntityTrackedVehicle.Step; } return true; // вправо case DirectionType.Right: //TODO прописать логику сдвига в право - if (_startPosX.Value + _drawningExcavatorWidth + EntityExcavator.Step < _pictureWidth) + if (_startPosX.Value + _drawningExcavatorWidth + EntityTrackedVehicle.Step < _pictureWidth) { - _startPosX += (int)EntityExcavator.Step; + _startPosX += (int)EntityTrackedVehicle.Step; } return true; //вниз case DirectionType.Down: //TODO прописать логику сдвига в вниз - if (_startPosY.Value + _drawningExcavatorHeight + EntityExcavator.Step < _pictureHeight) + if (_startPosY.Value + _drawningExcavatorHeight + EntityTrackedVehicle.Step < _pictureHeight) { - _startPosY += (int)EntityExcavator.Step; + _startPosY += (int)EntityTrackedVehicle.Step; } return true; default: @@ -239,27 +265,27 @@ public class DrawningExcavator /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { - if (EntityExcavator == null || !_startPosX.HasValue || !_startPosY.HasValue) + if (EntityTrackedVehicle == null || !_startPosX.HasValue || !_startPosY.HasValue) { return; } Pen pen = new(Color.Black); - Brush additionalBrush = new SolidBrush(EntityExcavator.AdditionalColor); + Brush brBlue = new SolidBrush(Color.LightBlue); Brush brGray = new SolidBrush(Color.Gray); Brush brRed = new SolidBrush(Color.Red); Brush brYellow = new SolidBrush(Color.Yellow); Brush brBlack = new SolidBrush(Color.Black); - + int bodyHeight = 90; int cabineHeight = 40; int pipeHeight = 35; - int bucketWidth = 30; + int bucketWidth = 10; int pipeWidth = 7; int pipeOffsetX = 25; @@ -281,7 +307,7 @@ public class DrawningExcavator g.FillRectangle(brBlue, _startPosX.Value + bucketWidth + cabineOffsetX, _startPosY.Value, cabineHeight, cabineHeight); //трак - g.DrawPath(pen, RoundedRect(g, new Rectangle(_startPosX.Value + wheelsOffsetX, _startPosY.Value + bodyHeight, wheelsOffsetX + bodyHeight, wheelsHeight), 15)); + g.DrawPath(pen, RoundedRect(g, new Rectangle(_startPosX.Value , _startPosY.Value + bodyHeight, wheelsOffsetX + bodyHeight, wheelsHeight), 15)); Pen bPen = new(Color.Black); bPen.Width = 3; @@ -315,33 +341,10 @@ public class DrawningExcavator g.FillEllipse(brYellow, _startPosX.Value + bucketWidth + wheelsOffsetX + 13, _startPosY.Value + bodyHeight + wheelsHeight / 6, 9, 9); g.FillEllipse(brYellow, _startPosX.Value + bucketWidth + wheelsOffsetX + 28, _startPosY.Value + bodyHeight + wheelsHeight / 6, 9, 9); - // ковш - if (EntityExcavator.Bucket) - { - PointF p1 = new Point(_startPosX.Value + bucketWidth, _startPosY.Value + cabineHeight); - PointF p2 = new Point(_startPosX.Value, _startPosY.Value + cabineHeight); - PointF p3 = new Point(_startPosX.Value + bucketWidth, _startPosY.Value + cabineHeight + bodyHeight / 2); - g.DrawLine(pen, p1, p2); - g.DrawLine(pen, p2, p3); - g.DrawLine(pen, p3, p1); - - g.FillPolygon(additionalBrush, [p1, p2, p3]); - } - - // опоры - if (EntityExcavator.Supports) - { - g.DrawLine(bPen, - _startPosX.Value + bucketWidth + bodyHeight, _startPosY.Value + cabineHeight + 10, - _startPosX.Value + bucketWidth + bodyHeight + 15, _startPosY.Value + cabineHeight + 10); - g.DrawLine(bPen, - _startPosX.Value + bucketWidth + bodyHeight + 15, _startPosY.Value + cabineHeight + 10, - _startPosX.Value + bucketWidth + bodyHeight + 15, _startPosY.Value + bodyHeight + wheelsHeight); - g.DrawLine(bPen, - _startPosX.Value + bucketWidth + bodyHeight + 15, _startPosY.Value + bodyHeight + wheelsHeight, - _startPosX.Value + bucketWidth + bodyHeight + 30, _startPosY.Value + bodyHeight + wheelsHeight); - } + } } + + diff --git a/Excavator/Excavator/EntityExcavator.cs b/Excavator/Excavator/Entities/EntityExcavator.cs similarity index 64% rename from Excavator/Excavator/EntityExcavator.cs rename to Excavator/Excavator/Entities/EntityExcavator.cs index 1ae8e23..294e379 100644 --- a/Excavator/Excavator/EntityExcavator.cs +++ b/Excavator/Excavator/Entities/EntityExcavator.cs @@ -1,26 +1,10 @@ -namespace Excavator; +namespace Excavator.Entities; /// /// Класс-сущность "Экскаватор" /// -public class EntityExcavator +public class EntityExcavator : EntityTrackedVehicle { - - public int m; - /// - /// Скорость - /// - public int Speed { get; private set; } - - /// - /// Вес - /// - public double Weight { get; private set; } - - /// - /// Основной цвет - /// - public Color BodyColor { get; private set; } /// /// Дополнительный цвет (для опциональных элементов) @@ -45,20 +29,17 @@ public class EntityExcavator public double Step => Speed * 100 / Weight; /// - /// Инициализация полей объекта-класса спортивного автомобиля + /// Инициализация полей объекта-класса экскаватора /// /// Скорость - /// Вес автомобиля + /// Вес экскаватора /// Основной цвет /// Дополнительный цвет /// Признак наличия ковша /// Признак наличия опор - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bucket, bool supports) + public EntityExcavator(int speed, double weight, Color bodyColor, Color additionalColor, bool bucket, bool supports) : base(speed, weight, bodyColor) { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; AdditionalColor = additionalColor; Bucket = bucket; Supports = supports; diff --git a/Excavator/Excavator/Entities/EntityTrackedVehicle.cs b/Excavator/Excavator/Entities/EntityTrackedVehicle.cs new file mode 100644 index 0000000..3fb547f --- /dev/null +++ b/Excavator/Excavator/Entities/EntityTrackedVehicle.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Sockets; +using System.Text; +using System.Threading.Tasks; + +namespace Excavator.Entities; +/// +/// Класс-сущность "Гусеничная машина" +/// +public class EntityTrackedVehicle +{ + public int m; + /// + /// Скорость + /// + 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 EntityTrackedVehicle(int speed, double weight, Color bodyColor) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + + } +} diff --git a/Excavator/Excavator/FormExcavator.Designer.cs b/Excavator/Excavator/FormExcavator.Designer.cs index e3917bf..2d58d5a 100644 --- a/Excavator/Excavator/FormExcavator.Designer.cs +++ b/Excavator/Excavator/FormExcavator.Designer.cs @@ -29,11 +29,12 @@ private void InitializeComponent() { pictureBoxExcavator = new PictureBox(); - buttonCreate = new Button(); + buttonCreateExcavator = new Button(); buttonLeft = new Button(); buttonRight = new Button(); buttonUp = new Button(); buttonDown = new Button(); + buttonCreateTrackedVehicle = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxExcavator).BeginInit(); SuspendLayout(); // @@ -45,18 +46,17 @@ pictureBoxExcavator.Size = new Size(824, 407); pictureBoxExcavator.TabIndex = 0; pictureBoxExcavator.TabStop = false; - // - // buttonCreate + // buttonCreateExcavator // - buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreate.Location = new Point(12, 366); - buttonCreate.Name = "buttonCreate"; - buttonCreate.Size = new Size(94, 29); - buttonCreate.TabIndex = 1; - buttonCreate.Text = "Создать"; - buttonCreate.UseVisualStyleBackColor = true; - buttonCreate.Click += buttonCreate_Click; + buttonCreateExcavator.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateExcavator.Location = new Point(12, 366); + buttonCreateExcavator.Name = "buttonCreateExcavator"; + buttonCreateExcavator.Size = new Size(154, 29); + buttonCreateExcavator.TabIndex = 1; + buttonCreateExcavator.Text = "Создать экскаватор"; + buttonCreateExcavator.UseVisualStyleBackColor = true; + buttonCreateExcavator.Click += buttonCreateExcavator_Click; // // buttonLeft // @@ -106,20 +106,31 @@ buttonDown.UseVisualStyleBackColor = true; buttonDown.Click += ButtonMove_Click; // + // buttonCreateTrackedVehicle + // + buttonCreateTrackedVehicle.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateTrackedVehicle.Location = new Point(183, 366); + buttonCreateTrackedVehicle.Name = "buttonCreateTrackedVehicle"; + buttonCreateTrackedVehicle.Size = new Size(238, 29); + buttonCreateTrackedVehicle.TabIndex = 6; + buttonCreateTrackedVehicle.Text = "Создать гусеничную машину"; + buttonCreateTrackedVehicle.UseVisualStyleBackColor = true; + buttonCreateTrackedVehicle.Click += buttonCreateTrackedVehicle_Click; + // // FormExcavator // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(824, 407); + Controls.Add(buttonCreateTrackedVehicle); Controls.Add(buttonDown); Controls.Add(buttonUp); Controls.Add(buttonRight); Controls.Add(buttonLeft); - Controls.Add(buttonCreate); + Controls.Add(buttonCreateExcavator); Controls.Add(pictureBoxExcavator); Name = "FormExcavator"; Text = "Экскаватор"; - ((System.ComponentModel.ISupportInitialize)pictureBoxExcavator).EndInit(); ResumeLayout(false); } @@ -127,10 +138,11 @@ #endregion private PictureBox pictureBoxExcavator; - private Button buttonCreate; + private Button buttonCreateExcavator; private Button buttonLeft; private Button buttonRight; private Button buttonUp; private Button buttonDown; + private Button buttonCreateTrackedVehicle; } } \ No newline at end of file diff --git a/Excavator/Excavator/FormExcavator.cs b/Excavator/Excavator/FormExcavator.cs index 51bc0fa..10a5607 100644 --- a/Excavator/Excavator/FormExcavator.cs +++ b/Excavator/Excavator/FormExcavator.cs @@ -1,4 +1,6 @@ -namespace Excavator; +using Excavator.Drawnings; + +namespace Excavator; /// /// Форма работы с объектом "Экскаватор" @@ -8,7 +10,7 @@ public partial class FormExcavator : Form /// /// Поле-объект для прорисовки объекта /// - private DrawningExcavator? _drawningExcavator; + private DrawningTrackedVehicle? _drawningTrackedVehicle; /// @@ -24,76 +26,101 @@ public partial class FormExcavator : Form private void Draw() { - if(_drawningExcavator == null) - { - return; - } - Bitmap bmp = new(pictureBoxExcavator.Width, pictureBoxExcavator.Height); - Graphics gr = Graphics.FromImage(bmp); - _drawningExcavator.DrawTransport(gr); - pictureBoxExcavator.Image = bmp; + if (_drawningTrackedVehicle == null) + { + return; + } + Bitmap bmp = new(pictureBoxExcavator.Width, pictureBoxExcavator.Height); + Graphics gr = Graphics.FromImage(bmp); + _drawningTrackedVehicle.DrawTransport(gr); + pictureBoxExcavator.Image = bmp; } + /// + /// Создание объекта класса-перемещения + /// + /// Тип создаваемого объекта + private void CreateObject(string type) + { + Random random = new(); + switch (type) + { + case nameof(DrawningTrackedVehicle): + _drawningTrackedVehicle = new DrawningTrackedVehicle(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(DrawningExcavator): + _drawningTrackedVehicle = new DrawningExcavator(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; + } + + _drawningTrackedVehicle.SetPictureSize(pictureBoxExcavator.Width, pictureBoxExcavator.Height); + _drawningTrackedVehicle.SetPosition(random.Next(0, 100), random.Next(0, 100)); + + Draw(); + } + /// - /// Обработка нажатия кнопки "Создать" + /// Обработка нажатия кнопки "Создать экскаватор" /// /// /// - private void buttonCreate_Click(object sender, EventArgs e) + private void buttonCreateExcavator_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningExcavator)); + + + + + /// + /// Обработка нажатия кнопки "Создать гусеничную машину" + /// + /// + /// + private void buttonCreateTrackedVehicle_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTrackedVehicle)); + + /// + /// Перемещение объекта по форме (нажатие кнопок навигации) + /// + /// + /// + private void ButtonMove_Click(object sender, EventArgs e) { - - Random random = new(); - _drawningExcavator = new DrawningExcavator(); - _drawningExcavator.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))); - _drawningExcavator.SetPictureSize(pictureBoxExcavator.Width, pictureBoxExcavator.Height); - _drawningExcavator.SetPosition(random.Next(10, 100), random.Next(10, 100)); + if (_drawningTrackedVehicle == null) + { + return; + } - + string name = ((Button)sender)?.Name ?? string.Empty; + bool result = false; + switch (name) + { + case "buttonUp": + result = _drawningTrackedVehicle.MoveTransport(DirectionType.Up); + break; + case "buttonDown": + result = _drawningTrackedVehicle.MoveTransport(DirectionType.Down); + break; + case "buttonLeft": + result = _drawningTrackedVehicle.MoveTransport(DirectionType.Left); + break; + case "buttonRight": + result = _drawningTrackedVehicle.MoveTransport(DirectionType.Right); + break; + } + if (result) + { Draw(); + } } - - /// - /// Перемещение объекта по форме (нажатие кнопок навигации) - /// - /// - /// - private void ButtonMove_Click(object sender, EventArgs e) - { - if (_drawningExcavator == null) - { - return; - } - - string name = ((Button)sender)?.Name ?? string.Empty; - bool result = false; - switch (name) - { - case "buttonUp": - result = _drawningExcavator.MoveTransport(DirectionType.Up); - break; - case "buttonDown": - result = _drawningExcavator.MoveTransport(DirectionType.Down); - break; - case "buttonLeft": - result = _drawningExcavator.MoveTransport(DirectionType.Left); - break; - case "buttonRight": - result = _drawningExcavator.MoveTransport(DirectionType.Right); - break; - } - - if (result) - { - Draw(); - } - } + } -- 2.25.1 From d24186d58e292c0f886b30dcccacc4b240fcbaa1 Mon Sep 17 00:00:00 2001 From: Daria Date: Mon, 8 Apr 2024 14:09:52 +0400 Subject: [PATCH 2/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D1=80=D0=B0=D1=82=D0=B5=D0=B3?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Excavator/Drawnings/DirectionType.cs | 4 + .../Drawnings/DrawningTrackedVehicle.cs | 21 +++ Excavator/Excavator/FormExcavator.Designer.cs | 27 ++++ Excavator/Excavator/FormExcavator.cs | 57 ++++++- .../MovementStrategy/AbstractStrategy.cs | 139 ++++++++++++++++++ .../MovementStrategy/IMoveableObject.cs | 24 +++ .../MovementStrategy/MoveToBorder.cs | 51 +++++++ .../MovementStrategy/MoveToCenter.cs | 53 +++++++ .../MoveableTrackedVehicle.cs | 65 ++++++++ .../MovementStrategy/MovementDirection.cs | 23 +++ .../MovementStrategy/ObjectParameters.cs | 72 +++++++++ .../MovementStrategy/StrategyStatus.cs | 19 +++ 12 files changed, 552 insertions(+), 3 deletions(-) create mode 100644 Excavator/Excavator/MovementStrategy/AbstractStrategy.cs create mode 100644 Excavator/Excavator/MovementStrategy/IMoveableObject.cs create mode 100644 Excavator/Excavator/MovementStrategy/MoveToBorder.cs create mode 100644 Excavator/Excavator/MovementStrategy/MoveToCenter.cs create mode 100644 Excavator/Excavator/MovementStrategy/MoveableTrackedVehicle.cs create mode 100644 Excavator/Excavator/MovementStrategy/MovementDirection.cs create mode 100644 Excavator/Excavator/MovementStrategy/ObjectParameters.cs create mode 100644 Excavator/Excavator/MovementStrategy/StrategyStatus.cs diff --git a/Excavator/Excavator/Drawnings/DirectionType.cs b/Excavator/Excavator/Drawnings/DirectionType.cs index 5343884..5fbc009 100644 --- a/Excavator/Excavator/Drawnings/DirectionType.cs +++ b/Excavator/Excavator/Drawnings/DirectionType.cs @@ -5,6 +5,10 @@ /// public enum DirectionType { + /// + /// Неизвестное направление + /// + Unknow = -1, /// /// Вверх /// diff --git a/Excavator/Excavator/Drawnings/DrawningTrackedVehicle.cs b/Excavator/Excavator/Drawnings/DrawningTrackedVehicle.cs index e5f6f3d..9da69cc 100644 --- a/Excavator/Excavator/Drawnings/DrawningTrackedVehicle.cs +++ b/Excavator/Excavator/Drawnings/DrawningTrackedVehicle.cs @@ -45,6 +45,27 @@ public class DrawningTrackedVehicle /// Высота прорисовки экскаватора /// private readonly int _drawningExcavatorHeight = 126; + + + /// + /// Координата X объекта + /// + public int? GetPosX => _startPosX; + + /// + /// Координата Y объекта + /// + public int? GetPosY => _startPosY; + + /// + /// Ширина объекта + /// + public int GetWidth => _drawningExcavatorWidth; + + /// + /// Высота объекта + /// + public int GetHeight => _drawningExcavatorHeight; /// /// Пустой конструктор /// diff --git a/Excavator/Excavator/FormExcavator.Designer.cs b/Excavator/Excavator/FormExcavator.Designer.cs index 2d58d5a..f4bcc9d 100644 --- a/Excavator/Excavator/FormExcavator.Designer.cs +++ b/Excavator/Excavator/FormExcavator.Designer.cs @@ -35,6 +35,8 @@ buttonUp = new Button(); buttonDown = new Button(); buttonCreateTrackedVehicle = new Button(); + ComboBoxStrategy = new ComboBox(); + buttonStrategyStep = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxExcavator).BeginInit(); SuspendLayout(); // @@ -46,6 +48,7 @@ pictureBoxExcavator.Size = new Size(824, 407); pictureBoxExcavator.TabIndex = 0; pictureBoxExcavator.TabStop = false; + // // buttonCreateExcavator // @@ -117,11 +120,33 @@ buttonCreateTrackedVehicle.UseVisualStyleBackColor = true; buttonCreateTrackedVehicle.Click += buttonCreateTrackedVehicle_Click; // + // ComboBoxStrategy + // + ComboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; + ComboBoxStrategy.FormattingEnabled = true; + ComboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" }); + ComboBoxStrategy.Location = new Point(661, 12); + ComboBoxStrategy.Name = "ComboBoxStrategy"; + ComboBoxStrategy.Size = new Size(151, 28); + ComboBoxStrategy.TabIndex = 7; + // + // buttonStrategyStep + // + buttonStrategyStep.Location = new Point(710, 46); + buttonStrategyStep.Name = "buttonStrategyStep"; + buttonStrategyStep.Size = new Size(102, 27); + buttonStrategyStep.TabIndex = 8; + buttonStrategyStep.Text = "Шаг"; + buttonStrategyStep.UseVisualStyleBackColor = true; + buttonStrategyStep.Click += buttonStrategyStep_Click; + // // FormExcavator // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(824, 407); + Controls.Add(buttonStrategyStep); + Controls.Add(ComboBoxStrategy); Controls.Add(buttonCreateTrackedVehicle); Controls.Add(buttonDown); Controls.Add(buttonUp); @@ -144,5 +169,7 @@ private Button buttonUp; private Button buttonDown; private Button buttonCreateTrackedVehicle; + private ComboBox ComboBoxStrategy; + private Button buttonStrategyStep; } } \ No newline at end of file diff --git a/Excavator/Excavator/FormExcavator.cs b/Excavator/Excavator/FormExcavator.cs index 10a5607..9631d6b 100644 --- a/Excavator/Excavator/FormExcavator.cs +++ b/Excavator/Excavator/FormExcavator.cs @@ -1,4 +1,5 @@ using Excavator.Drawnings; +using Excavator.MovementStrategy; namespace Excavator; @@ -11,7 +12,10 @@ public partial class FormExcavator : Form /// Поле-объект для прорисовки объекта /// private DrawningTrackedVehicle? _drawningTrackedVehicle; - + /// + ///Стратегия перемещения + /// + private AbstractStrategy? _strategy; /// /// Конструктор формы @@ -19,6 +23,7 @@ public partial class FormExcavator : Form public FormExcavator() { InitializeComponent(); + _strategy = null; } /// /// Метод прорисовки экскаватора @@ -62,7 +67,8 @@ public partial class FormExcavator : Form _drawningTrackedVehicle.SetPictureSize(pictureBoxExcavator.Width, pictureBoxExcavator.Height); _drawningTrackedVehicle.SetPosition(random.Next(0, 100), random.Next(0, 100)); - + _strategy = null; + ComboBoxStrategy.Enabled = true; Draw(); } @@ -121,6 +127,51 @@ public partial class FormExcavator : Form } } - + + + + /// + /// + /// + /// + /// + private void buttonStrategyStep_Click(object sender, EventArgs e) + { + if (_drawningTrackedVehicle == null) + { + return; + } + + if (ComboBoxStrategy.Enabled) + { + _strategy = ComboBoxStrategy.SelectedIndex switch + { + 0 => new MoveToCenter(), + 1 => new MoveToBorder(), + _ => null, + }; + if (_strategy == null) + { + return; + } + _strategy.SetData(new MoveableTrackedVehicle(_drawningTrackedVehicle), pictureBoxExcavator.Width, pictureBoxExcavator.Height); + } + + if (_strategy == null) + { + return; + } + + ComboBoxStrategy.Enabled = false; + _strategy.MakeStep(); + Draw(); + + if (_strategy.GetStatus() == StrategyStatus.Finish) + { + ComboBoxStrategy.Enabled = true; + _strategy = null; + } + } } + diff --git a/Excavator/Excavator/MovementStrategy/AbstractStrategy.cs b/Excavator/Excavator/MovementStrategy/AbstractStrategy.cs new file mode 100644 index 0000000..59084f4 --- /dev/null +++ b/Excavator/Excavator/MovementStrategy/AbstractStrategy.cs @@ -0,0 +1,139 @@ +namespace Excavator.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; + } +} diff --git a/Excavator/Excavator/MovementStrategy/IMoveableObject.cs b/Excavator/Excavator/MovementStrategy/IMoveableObject.cs new file mode 100644 index 0000000..e8fb9bd --- /dev/null +++ b/Excavator/Excavator/MovementStrategy/IMoveableObject.cs @@ -0,0 +1,24 @@ +namespace Excavator.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/Excavator/Excavator/MovementStrategy/MoveToBorder.cs b/Excavator/Excavator/MovementStrategy/MoveToBorder.cs new file mode 100644 index 0000000..673df83 --- /dev/null +++ b/Excavator/Excavator/MovementStrategy/MoveToBorder.cs @@ -0,0 +1,51 @@ +namespace Excavator.MovementStrategy; +/// +/// Стратегия перемещения объекта к границе +/// +public class MoveToBorder : AbstractStrategy +{ + protected override bool IsTargetDestinaion() + { + var 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() + { + var objParams = GetObjectParameters; + if (objParams == null) + { + return; + } + var diffX = objParams.ObjectMiddleHorizontal - FieldWidth; + if (Math.Abs(diffX) > GetStep()) + { + if (diffX > 0) + { + MoveLeft(); + } + else + { + MoveRight(); + } + } + var diffY = objParams.ObjectMiddleVertical - FieldHeight; + if (Math.Abs(diffY) > GetStep()) + { + if (diffY > 0) + { + MoveUp(); + } + else + { + MoveDown(); + } + } + } +} \ No newline at end of file diff --git a/Excavator/Excavator/MovementStrategy/MoveToCenter.cs b/Excavator/Excavator/MovementStrategy/MoveToCenter.cs new file mode 100644 index 0000000..d51bdf3 --- /dev/null +++ b/Excavator/Excavator/MovementStrategy/MoveToCenter.cs @@ -0,0 +1,53 @@ +namespace Excavator.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/Excavator/Excavator/MovementStrategy/MoveableTrackedVehicle.cs b/Excavator/Excavator/MovementStrategy/MoveableTrackedVehicle.cs new file mode 100644 index 0000000..1b010bb --- /dev/null +++ b/Excavator/Excavator/MovementStrategy/MoveableTrackedVehicle.cs @@ -0,0 +1,65 @@ +using Excavator.Drawnings; + + +namespace Excavator.MovementStrategy; +/// +/// Класс-реализация IMoveableObject с использованием DrawningTrackedVehicle +/// +public class MoveableTrackedVehicle : IMoveableObject + +{ + /// + /// Поле-объект класса DrawningTrackedVehicle или его наследника + /// + private readonly DrawningTrackedVehicle? _trackedvehicle = null; + + /// + /// Конструктор + /// + /// Объект класса DrawningCar + public MoveableTrackedVehicle(DrawningTrackedVehicle trackedvehicle) + { + _trackedvehicle = trackedvehicle; + } + + public ObjectParameters? GetObjectPosition + { + get + { + if (_trackedvehicle == null || _trackedvehicle.EntityTrackedVehicle == null || !_trackedvehicle.GetPosX.HasValue || !_trackedvehicle.GetPosY.HasValue) + { + return null; + } + return new ObjectParameters(_trackedvehicle.GetPosX.Value, _trackedvehicle.GetPosY.Value, _trackedvehicle.GetWidth, _trackedvehicle.GetHeight); + } + } + + public int GetStep => (int)(_trackedvehicle?.EntityTrackedVehicle?.Step ?? 0); + + public bool TryMoveObject(MovementDirection direction) + { + if (_trackedvehicle == null || _trackedvehicle.EntityTrackedVehicle == null) + { + return false; + } + + return _trackedvehicle.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/Excavator/Excavator/MovementStrategy/MovementDirection.cs b/Excavator/Excavator/MovementStrategy/MovementDirection.cs new file mode 100644 index 0000000..14fbd09 --- /dev/null +++ b/Excavator/Excavator/MovementStrategy/MovementDirection.cs @@ -0,0 +1,23 @@ +namespace Excavator.MovementStrategy; +/// +/// Направление перемещения +/// +public enum MovementDirection +{ + /// + /// Вверх + /// + Up = 1, + /// + /// Вниз + /// + Down = 2, + /// + /// Влево + /// + Left = 3, + /// + /// Вправо + /// + Right = 4 +} diff --git a/Excavator/Excavator/MovementStrategy/ObjectParameters.cs b/Excavator/Excavator/MovementStrategy/ObjectParameters.cs new file mode 100644 index 0000000..24a352d --- /dev/null +++ b/Excavator/Excavator/MovementStrategy/ObjectParameters.cs @@ -0,0 +1,72 @@ +namespace Excavator.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/Excavator/Excavator/MovementStrategy/StrategyStatus.cs b/Excavator/Excavator/MovementStrategy/StrategyStatus.cs new file mode 100644 index 0000000..e4fbb6c --- /dev/null +++ b/Excavator/Excavator/MovementStrategy/StrategyStatus.cs @@ -0,0 +1,19 @@ +namespace Excavator.MovementStrategy; +/// +/// Статус выполнения операции перемещения +/// +public enum StrategyStatus +{ + /// + /// Всё готово к началу + /// + NotInit, + /// + /// Выполняется + /// + InProgress, + /// + /// Завершено + /// + Finish +} -- 2.25.1 From 47fdebab72ff281a112eafe4f41dbbd80786f9f7 Mon Sep 17 00:00:00 2001 From: Daria Date: Mon, 8 Apr 2024 14:17:18 +0400 Subject: [PATCH 3/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Excavator/Drawnings/DrawningTrackedVehicle.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Excavator/Excavator/Drawnings/DrawningTrackedVehicle.cs b/Excavator/Excavator/Drawnings/DrawningTrackedVehicle.cs index 9da69cc..b90ffe6 100644 --- a/Excavator/Excavator/Drawnings/DrawningTrackedVehicle.cs +++ b/Excavator/Excavator/Drawnings/DrawningTrackedVehicle.cs @@ -1,13 +1,10 @@ using Excavator.Entities; -using System; -using System.Collections.Generic; -using System.Drawing.Drawing2D; -using System.Linq; -using System.Text; -using System.Threading.Tasks; + namespace Excavator.Drawnings; - +/// +/// Класс, отвечающий за прорисовку и перемещение базового объекта сущности +/// public class DrawningTrackedVehicle { -- 2.25.1 From e57859d3e1b3bfcccc84c0f22a143c14c861070a Mon Sep 17 00:00:00 2001 From: Daria Date: Sat, 13 Apr 2024 18:19:26 +0400 Subject: [PATCH 4/4] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BD=D0=B5=D0=B4=D0=BE=D1=87=D1=91=D1=82?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Excavator/Drawnings/DrawningExcavator.cs | 30 +------------------ .../Drawnings/DrawningTrackedVehicle.cs | 28 ++++------------- 2 files changed, 7 insertions(+), 51 deletions(-) diff --git a/Excavator/Excavator/Drawnings/DrawningExcavator.cs b/Excavator/Excavator/Drawnings/DrawningExcavator.cs index 53fcb16..79b2753 100644 --- a/Excavator/Excavator/Drawnings/DrawningExcavator.cs +++ b/Excavator/Excavator/Drawnings/DrawningExcavator.cs @@ -9,9 +9,6 @@ namespace Excavator.Drawnings; /// public class DrawningExcavator : DrawningTrackedVehicle { - - - /// /// Конструктор /// @@ -28,13 +25,6 @@ public class DrawningExcavator : DrawningTrackedVehicle } - - - - - - - public override void DrawTransport(Graphics g) { if (EntityTrackedVehicle == null || EntityTrackedVehicle is not EntityExcavator excavator || !_startPosX.HasValue || !_startPosY.HasValue) @@ -53,22 +43,12 @@ public class DrawningExcavator : DrawningTrackedVehicle int bodyHeight = 90; int cabineHeight = 40; - int bucketWidth = 30; - - - - - int wheelsHeight = 40; - - Pen bPen = new(Color.Black); bPen.Width = 3; - - _startPosX += 20; base.DrawTransport(g); _startPosX -= 20; @@ -104,15 +84,7 @@ public class DrawningExcavator : DrawningTrackedVehicle _startPosX.Value + bucketWidth + bodyHeight + 15, _startPosY.Value + bodyHeight + wheelsHeight, _startPosX.Value + bucketWidth + bodyHeight + 30, _startPosY.Value + bodyHeight + wheelsHeight); } - - - - - } - - - - + } } diff --git a/Excavator/Excavator/Drawnings/DrawningTrackedVehicle.cs b/Excavator/Excavator/Drawnings/DrawningTrackedVehicle.cs index b90ffe6..01a7b28 100644 --- a/Excavator/Excavator/Drawnings/DrawningTrackedVehicle.cs +++ b/Excavator/Excavator/Drawnings/DrawningTrackedVehicle.cs @@ -1,4 +1,5 @@ -using Excavator.Entities; +using System.Drawing.Drawing2D; +using Excavator.Entities; namespace Excavator.Drawnings; @@ -146,11 +147,6 @@ public class DrawningTrackedVehicle return false; } - - - - - /// /// Установка позиции /// @@ -217,7 +213,6 @@ public class DrawningTrackedVehicle return true; // вправо case DirectionType.Right: - //TODO прописать логику сдвига в право if (_startPosX.Value + _drawningExcavatorWidth + EntityTrackedVehicle.Step < _pictureWidth) { @@ -228,7 +223,6 @@ public class DrawningTrackedVehicle return true; //вниз case DirectionType.Down: - //TODO прописать логику сдвига в вниз if (_startPosY.Value + _drawningExcavatorHeight + EntityTrackedVehicle.Step < _pictureHeight) { _startPosY += (int)EntityTrackedVehicle.Step; @@ -255,18 +249,11 @@ public class DrawningTrackedVehicle return path; } - // top left arc - path.AddArc(arc, 180, 90); - - // top right arc + path.AddArc(arc, 180, 90); arc.X = bounds.Right - diameter; path.AddArc(arc, 270, 90); - - // bottom right arc arc.Y = bounds.Bottom - diameter; path.AddArc(arc, 0, 90); - - // bottom left arc arc.X = bounds.Left; path.AddArc(arc, 90, 90); @@ -297,8 +284,8 @@ public class DrawningTrackedVehicle Brush brRed = new SolidBrush(Color.Red); Brush brYellow = new SolidBrush(Color.Yellow); Brush brBlack = new SolidBrush(Color.Black); + Brush bodycolor = new SolidBrush(EntityTrackedVehicle.BodyColor); - int bodyHeight = 90; int cabineHeight = 40; @@ -314,7 +301,7 @@ public class DrawningTrackedVehicle //кузов g.DrawRectangle(pen, _startPosX.Value + bucketWidth, _startPosY.Value + cabineHeight, bodyHeight, bodyHeight - cabineHeight); - g.FillRectangle(brGray, _startPosX.Value + bucketWidth, _startPosY.Value + cabineHeight, bodyHeight, bodyHeight - cabineHeight); + g.FillRectangle(bodycolor, _startPosX.Value + bucketWidth, _startPosY.Value + cabineHeight, bodyHeight, bodyHeight - cabineHeight); //труба g.DrawRectangle(pen, _startPosX.Value + bucketWidth + pipeOffsetX, _startPosY.Value + cabineHeight - pipeHeight, pipeWidth, pipeHeight); @@ -357,10 +344,7 @@ public class DrawningTrackedVehicle g.DrawEllipse(bPen, _startPosX.Value + bucketWidth + wheelsOffsetX + 13, _startPosY.Value + bodyHeight + wheelsHeight / 6, 9, 9); g.DrawEllipse(bPen, _startPosX.Value + bucketWidth + wheelsOffsetX + 28, _startPosY.Value + bodyHeight + wheelsHeight / 6, 9, 9); g.FillEllipse(brYellow, _startPosX.Value + bucketWidth + wheelsOffsetX + 13, _startPosY.Value + bodyHeight + wheelsHeight / 6, 9, 9); - g.FillEllipse(brYellow, _startPosX.Value + bucketWidth + wheelsOffsetX + 28, _startPosY.Value + bodyHeight + wheelsHeight / 6, 9, 9); - - - + g.FillEllipse(brYellow, _startPosX.Value + bucketWidth + wheelsOffsetX + 28, _startPosY.Value + bodyHeight + wheelsHeight / 6, 9, 9); } } -- 2.25.1