From b6c46f97c2f6bfc6fe774335d26a173aa3ad8d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=B8=D1=8F=20=D0=9A=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0?= Date: Tue, 27 Feb 2024 22:40:05 +0400 Subject: [PATCH 1/2] =?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 --- ExcavatorDifficult/ExcavatorDifficult.sln | 25 -- .../ExcavatorDifficult.csproj | 11 - .../ExcavatorDifficult/Form1.Designer.cs | 39 --- .../ExcavatorDifficult/Form1.cs | 10 - .../ExcavatorDifficult/Form1.resx | 120 -------- .../ExcavatorDifficult/Program.cs | 17 -- .../WinFormsAppExcavator/DrawingExcavator.cs | 261 ------------------ .../{ => Drawings}/DirectionType.cs | 2 +- .../Drawings/DrawingExcavator.cs | 115 ++++++++ .../Drawings/DrawingExcavatorEmpty.cs | 236 ++++++++++++++++ .../Entity/EntityExcavator.cs | 51 ++++ .../Entity/EntityExcavatorEmpty.cs | 42 +++ .../WinFormsAppExcavator/EntityExcavator.cs | 70 ----- .../FormExcavator.Designer.cs | 18 +- .../WinFormsAppExcavator/FormExcavator.cs | 75 +++-- 15 files changed, 517 insertions(+), 575 deletions(-) delete mode 100644 ExcavatorDifficult/ExcavatorDifficult.sln delete mode 100644 ExcavatorDifficult/ExcavatorDifficult/ExcavatorDifficult.csproj delete mode 100644 ExcavatorDifficult/ExcavatorDifficult/Form1.Designer.cs delete mode 100644 ExcavatorDifficult/ExcavatorDifficult/Form1.cs delete mode 100644 ExcavatorDifficult/ExcavatorDifficult/Form1.resx delete mode 100644 ExcavatorDifficult/ExcavatorDifficult/Program.cs delete mode 100644 WinFormsAppExcavator/WinFormsAppExcavator/DrawingExcavator.cs rename WinFormsAppExcavator/WinFormsAppExcavator/{ => Drawings}/DirectionType.cs (89%) create mode 100644 WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DrawingExcavator.cs create mode 100644 WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DrawingExcavatorEmpty.cs create mode 100644 WinFormsAppExcavator/WinFormsAppExcavator/Entity/EntityExcavator.cs create mode 100644 WinFormsAppExcavator/WinFormsAppExcavator/Entity/EntityExcavatorEmpty.cs delete mode 100644 WinFormsAppExcavator/WinFormsAppExcavator/EntityExcavator.cs diff --git a/ExcavatorDifficult/ExcavatorDifficult.sln b/ExcavatorDifficult/ExcavatorDifficult.sln deleted file mode 100644 index 50b5f3a..0000000 --- a/ExcavatorDifficult/ExcavatorDifficult.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.8.34511.84 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExcavatorDifficult", "ExcavatorDifficult\ExcavatorDifficult.csproj", "{211B997C-88F3-497D-99BB-75E15A496217}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {211B997C-88F3-497D-99BB-75E15A496217}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {211B997C-88F3-497D-99BB-75E15A496217}.Debug|Any CPU.Build.0 = Debug|Any CPU - {211B997C-88F3-497D-99BB-75E15A496217}.Release|Any CPU.ActiveCfg = Release|Any CPU - {211B997C-88F3-497D-99BB-75E15A496217}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {3A9B8F79-81EB-4D27-B962-A6CA06C42421} - EndGlobalSection -EndGlobal diff --git a/ExcavatorDifficult/ExcavatorDifficult/ExcavatorDifficult.csproj b/ExcavatorDifficult/ExcavatorDifficult/ExcavatorDifficult.csproj deleted file mode 100644 index 663fdb8..0000000 --- a/ExcavatorDifficult/ExcavatorDifficult/ExcavatorDifficult.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - WinExe - net8.0-windows - enable - true - enable - - - \ No newline at end of file diff --git a/ExcavatorDifficult/ExcavatorDifficult/Form1.Designer.cs b/ExcavatorDifficult/ExcavatorDifficult/Form1.Designer.cs deleted file mode 100644 index 62d6e38..0000000 --- a/ExcavatorDifficult/ExcavatorDifficult/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace ExcavatorDifficult -{ - partial class Form1 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "Form1"; - } - - #endregion - } -} diff --git a/ExcavatorDifficult/ExcavatorDifficult/Form1.cs b/ExcavatorDifficult/ExcavatorDifficult/Form1.cs deleted file mode 100644 index 0f16e60..0000000 --- a/ExcavatorDifficult/ExcavatorDifficult/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace ExcavatorDifficult -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} diff --git a/ExcavatorDifficult/ExcavatorDifficult/Form1.resx b/ExcavatorDifficult/ExcavatorDifficult/Form1.resx deleted file mode 100644 index 1af7de1..0000000 --- a/ExcavatorDifficult/ExcavatorDifficult/Form1.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/ExcavatorDifficult/ExcavatorDifficult/Program.cs b/ExcavatorDifficult/ExcavatorDifficult/Program.cs deleted file mode 100644 index dbca9b6..0000000 --- a/ExcavatorDifficult/ExcavatorDifficult/Program.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace ExcavatorDifficult -{ - internal static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - static void Main() - { - // To customize application configuration such as set high DPI settings or default font, - // see https://aka.ms/applicationconfiguration. - ApplicationConfiguration.Initialize(); - Application.Run(new Form1()); - } - } -} \ No newline at end of file diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/DrawingExcavator.cs b/WinFormsAppExcavator/WinFormsAppExcavator/DrawingExcavator.cs deleted file mode 100644 index 3012094..0000000 --- a/WinFormsAppExcavator/WinFormsAppExcavator/DrawingExcavator.cs +++ /dev/null @@ -1,261 +0,0 @@ -namespace WinFormsAppExcavator; - -/// -/// Класс, отвечающий за прорисовку и передвижение объекта сущности -/// -public class DrawingExcavator -{ - /// - /// Класс-сущность - /// - public EntityExcavator? EntityExcavator { get; private set; } - - /// - /// Ширина окна - /// - private int? _pictureWidth; - - /// - /// Высота окна - /// - private int? _pictureHeight; - - /// - /// Левая координата прорисовки экскаватора - /// - private int? _startPosX; - - /// - /// Верхняя кооридната прорисовки экскаватора - /// - private int? _startPosY; - - /// - /// Ширина прорисовки экскаватора - /// - private readonly int _drawningExcavatorWidth = 174; - - /// - /// Высота прорисовки экскаватора - /// - private readonly int _drawningExcavatorHeight =80; - - - /// - /// Инициализация свойств - /// - /// Скорость - /// Вес - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия обвеса - /// Признак наличия антикрыла - /// Признак наличия гоночной полосы - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bucket, bool support, bool bulldozerDump) - { - EntityExcavator = new EntityExcavator(); - EntityExcavator.Init(speed, weight, bodyColor, additionalColor, bucket, support, bulldozerDump); - _pictureWidth = null; - _pictureHeight = null; - _startPosX = null; - _startPosY = null; - } - - /// - /// Установка границ поля - /// - /// Ширина поля - /// Высота поля - /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах - public bool SetPictureSize(int width, int height) - { - - if (_drawningExcavatorWidth < width && _drawningExcavatorHeight < height) - { - _pictureWidth = width; - _pictureHeight = height; - if (_startPosX.HasValue && _startPosY.HasValue) - { - if (_startPosX+_drawningExcavatorWidth>=_pictureWidth - || _startPosY+_drawningExcavatorHeight>=_pictureHeight) - { - _startPosX = 0; - _startPosY = 0; - } - - } - return true; - } - - return false; - } - - /// - /// Установка позиции - /// - /// Координата X - /// Координата Y - public void SetPosition(int x, int y) - { - if (!_pictureHeight.HasValue || !_pictureWidth.HasValue) - { - return; - } - if (x + _drawningExcavatorWidth < _pictureWidth && _drawningExcavatorHeight + y < _pictureHeight && x>0 && y>0) - { - _startPosX = x; - _startPosY = y; - } - if (x + _drawningExcavatorWidth >_pictureWidth || x < 0) - { - _startPosX = 0; - - } - if (y+_drawningExcavatorHeight > _pictureHeight || y < 0) - { - _startPosY = 0; - } - - } - - /// - /// Изменение направления перемещения - /// - /// Направление - /// true - перемещение выполнено, false - перемещение невозможно - public bool MoveTransport(DirectionType direction) - { - if (EntityExcavator == null || !_startPosX.HasValue || !_startPosY.HasValue) - { - return false; - } - - switch (direction) - { - //влево - case DirectionType.Left: - if (_startPosX.Value - EntityExcavator.Step > 0) - { - _startPosX -= (int)EntityExcavator.Step; - } - return true; - //вверх - case DirectionType.Up: - if (_startPosY.Value - EntityExcavator.Step > 0) - { - _startPosY -= (int)EntityExcavator.Step; - } - return true; - // вправо - case DirectionType.Right: - if (_startPosX.Value+_drawningExcavatorWidth + EntityExcavator.Step < _pictureWidth) - { - _startPosX += (int)EntityExcavator.Step; - } - return true; - //вниз - case DirectionType.Down: - if (_startPosY.Value+_drawningExcavatorHeight + EntityExcavator.Step< _pictureHeight) - { - _startPosY += (int)EntityExcavator.Step; - } - return true; - default: - return false; - } - } - - /// - /// Прорисовка объекта - /// - /// - public void DrawTransport(Graphics g) - { - if (EntityExcavator == null || !_startPosX.HasValue || !_startPosY.HasValue) - { - return; - } - - Pen pen = new(Color.Black); - Brush additionalBrush = new SolidBrush(EntityExcavator.AdditionalColor); - Brush bodybrush = new SolidBrush(EntityExcavator.BodyColor); - - //границы экскаватора - g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 20, 100, 30); - g.DrawRectangle(pen, _startPosX.Value+30, _startPosY.Value, 10,20); - g.DrawRectangle(pen, _startPosX.Value+80, _startPosY.Value, 20,20); - g.DrawArc(pen, _startPosX.Value, _startPosY.Value + 45, 30, 40, 130, 100); - g.DrawArc(pen, _startPosX.Value + 80, _startPosY.Value + 50, 30, 40, 285, 110); - g.DrawLine(pen, _startPosX.Value+5, _startPosY.Value + 80, _startPosX.Value + 109, _startPosY.Value + 80); - g.DrawEllipse(pen, _startPosX.Value+5, _startPosY.Value + 53, 25, 25); - g.DrawEllipse(pen, _startPosX.Value + 80, _startPosY.Value + 53, 25, 25); - g.DrawEllipse(pen, _startPosX.Value+30, _startPosY.Value + 69, 10, 10); - g.DrawEllipse(pen, _startPosX.Value+48, _startPosY.Value + 69, 10, 10); - g.DrawEllipse(pen, _startPosX.Value+65, _startPosY.Value + 69, 10, 10); - g.DrawEllipse(pen, _startPosX.Value+40, _startPosY.Value + 53, 7, 7); - g.DrawEllipse(pen, _startPosX.Value + 60, _startPosY.Value + 53, 7, 7); - - //заливка кабины и основного железа - Brush br = new SolidBrush(Color.Black); - g.FillRectangle(bodybrush, _startPosX.Value, _startPosY.Value + 20, 100, 30); - g.FillRectangle(bodybrush, _startPosX.Value+30, _startPosY.Value, 10, 20); - g.FillRectangle(bodybrush, _startPosX.Value+80, _startPosY.Value, 20, 20); - g.FillEllipse(br, _startPosX.Value + 5, _startPosY.Value + 53, 25, 25); - g.FillEllipse(br, _startPosX.Value + 80, _startPosY.Value + 53, 25, 25); - g.FillEllipse(br, _startPosX.Value + 30, _startPosY.Value + 69, 10, 10); - g.FillEllipse(br, _startPosX.Value + 48, _startPosY.Value + 69, 10, 10); - g.FillEllipse(br, _startPosX.Value + 65, _startPosY.Value + 69, 10, 10); - g.FillEllipse(br, _startPosX.Value + 40, _startPosY.Value + 53, 7, 7); - g.FillEllipse(br, _startPosX.Value + 60, _startPosY.Value + 53, 7, 7); - - //фары - Brush brfara = new SolidBrush(Color.Blue); - g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 27, 10, 10); - g.FillRectangle(brfara, _startPosX.Value, _startPosY.Value + 27, 10, 10); - //окно - g.FillRectangle(brfara, _startPosX.Value + 85, _startPosY.Value + 10, 10, 10); - - - if (EntityExcavator.Bucket) - { - Point point1 = new Point(_startPosX.Value+100, _startPosY.Value); - Point point2 = new Point(_startPosX.Value+180, _startPosY.Value); - Point point4 = new Point(_startPosX.Value + 180, _startPosY.Value + 40); - Point point5 = new Point(_startPosX.Value + 170, _startPosY.Value + 60); - Point point6 = new Point(_startPosX.Value + 150, _startPosY.Value + 60); - Point point7 = new Point(_startPosX.Value + 140, _startPosY.Value + 40); - Point point8 = new Point(_startPosX.Value + 172, _startPosY.Value + 40); - Point point9 = new Point(_startPosX.Value + 172, _startPosY.Value + 10); - Point point10 = new Point(_startPosX.Value + 100, _startPosY.Value+10); - - Point[] Bucket = { point1, point2, point4, point5, point6, point7,point8,point9,point10}; - g.FillPolygon(additionalBrush, Bucket); - } - - if (EntityExcavator.Support) - { - Point point1 = new Point(_startPosX.Value+2, _startPosY.Value+50); - Point point2 = new Point(_startPosX.Value + 12, _startPosY.Value+80); - Point point3 = new Point(_startPosX.Value + 22, _startPosY.Value + 80); - Point point4 = new Point(_startPosX.Value + 12, _startPosY.Value+50); - Point[] Support = { point1, point2, point3, point4 }; - g.FillPolygon(additionalBrush, Support); - - } - - if (EntityExcavator.BulldozerDump) - { - Point point11 = new Point(_startPosX.Value + 100, _startPosY.Value+40); - Point point12= new Point(_startPosX.Value + 160, _startPosY.Value+80); - Point point13= new Point(_startPosX.Value + 130, _startPosY.Value + 80); - Point point14 = new Point(_startPosX.Value + 100, _startPosY.Value+50); - Point[] Dump = { point11, point12, point13, point14 }; - g.FillPolygon(additionalBrush, Dump); - } - - - - - } -} - diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/DirectionType.cs b/WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DirectionType.cs similarity index 89% rename from WinFormsAppExcavator/WinFormsAppExcavator/DirectionType.cs rename to WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DirectionType.cs index e3600da..a34f5b2 100644 --- a/WinFormsAppExcavator/WinFormsAppExcavator/DirectionType.cs +++ b/WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DirectionType.cs @@ -1,4 +1,4 @@ -namespace WinFormsAppExcavator; +namespace WinFormsAppExcavator.Drawings; /// /// направление перемещения diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DrawingExcavator.cs b/WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DrawingExcavator.cs new file mode 100644 index 0000000..79fb431 --- /dev/null +++ b/WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DrawingExcavator.cs @@ -0,0 +1,115 @@ +using WinFormsAppExcavator.Entity; + +namespace WinFormsAppExcavator.Drawings; + +/// +/// Класс, отвечающий за прорисовку и передвижение объекта сущности +/// +public class DrawingExcavator : DrawingExcavatorEmpty +{ + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия обвеса + /// Признак наличия антикрыла + /// Признак наличия гоночной полосы + public DrawingExcavator(int speed, double weight, Color bodyColor, Color additionalColor, bool bucket, bool support, bool bulldozerDump) : base (100, 90) + { + EntityExcavatorEmpty = new EntityExcavator(speed, weight, bodyColor, additionalColor, bucket, support, bulldozerDump); + + } + + public override void DrawTransport(Graphics g) + { + if (EntityExcavatorEmpty == null || EntityExcavatorEmpty is not EntityExcavator entityExcavator || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + Brush additionalBrush = new SolidBrush(entityExcavator.AdditionalColor); + Brush bodybrush = new SolidBrush(entityExcavator.BodyColor); + + //границы экскаватора + g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 20, 100, 30); + g.DrawRectangle(pen, _startPosX.Value + 30, _startPosY.Value, 10, 20); + g.DrawRectangle(pen, _startPosX.Value + 80, _startPosY.Value, 20, 20); + g.DrawArc(pen, _startPosX.Value, _startPosY.Value + 45, 30, 40, 130, 100); + g.DrawArc(pen, _startPosX.Value + 80, _startPosY.Value + 50, 30, 40, 285, 110); + g.DrawLine(pen, _startPosX.Value + 5, _startPosY.Value + 80, _startPosX.Value + 109, _startPosY.Value + 80); + g.DrawEllipse(pen, _startPosX.Value + 5, _startPosY.Value + 53, 25, 25); + g.DrawEllipse(pen, _startPosX.Value + 80, _startPosY.Value + 53, 25, 25); + g.DrawEllipse(pen, _startPosX.Value + 30, _startPosY.Value + 69, 10, 10); + g.DrawEllipse(pen, _startPosX.Value + 48, _startPosY.Value + 69, 10, 10); + g.DrawEllipse(pen, _startPosX.Value + 65, _startPosY.Value + 69, 10, 10); + g.DrawEllipse(pen, _startPosX.Value + 40, _startPosY.Value + 53, 7, 7); + g.DrawEllipse(pen, _startPosX.Value + 60, _startPosY.Value + 53, 7, 7); + + //заливка кабины и основного железа + Brush br = new SolidBrush(Color.Black); + g.FillRectangle(bodybrush, _startPosX.Value, _startPosY.Value + 20, 100, 30); + g.FillRectangle(bodybrush, _startPosX.Value + 30, _startPosY.Value, 10, 20); + g.FillRectangle(bodybrush, _startPosX.Value + 80, _startPosY.Value, 20, 20); + g.FillEllipse(br, _startPosX.Value + 5, _startPosY.Value + 53, 25, 25); + g.FillEllipse(br, _startPosX.Value + 80, _startPosY.Value + 53, 25, 25); + g.FillEllipse(br, _startPosX.Value + 30, _startPosY.Value + 69, 10, 10); + g.FillEllipse(br, _startPosX.Value + 48, _startPosY.Value + 69, 10, 10); + g.FillEllipse(br, _startPosX.Value + 65, _startPosY.Value + 69, 10, 10); + g.FillEllipse(br, _startPosX.Value + 40, _startPosY.Value + 53, 7, 7); + g.FillEllipse(br, _startPosX.Value + 60, _startPosY.Value + 53, 7, 7); + + //фары + Brush brfara = new SolidBrush(Color.Blue); + g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 27, 10, 10); + g.FillRectangle(brfara, _startPosX.Value, _startPosY.Value + 27, 10, 10); + //окно + g.FillRectangle(brfara, _startPosX.Value + 85, _startPosY.Value + 10, 10, 10); + + + if (entityExcavator.Bucket) + { + Point point1 = new Point(_startPosX.Value + 100, _startPosY.Value); + Point point2 = new Point(_startPosX.Value + 180, _startPosY.Value); + Point point4 = new Point(_startPosX.Value + 180, _startPosY.Value + 40); + Point point5 = new Point(_startPosX.Value + 170, _startPosY.Value + 60); + Point point6 = new Point(_startPosX.Value + 150, _startPosY.Value + 60); + Point point7 = new Point(_startPosX.Value + 140, _startPosY.Value + 40); + Point point8 = new Point(_startPosX.Value + 172, _startPosY.Value + 40); + Point point9 = new Point(_startPosX.Value + 172, _startPosY.Value + 10); + Point point10 = new Point(_startPosX.Value + 100, _startPosY.Value + 10); + + Point[] Bucket = { point1, point2, point4, point5, point6, point7, point8, point9, point10 }; + g.FillPolygon(additionalBrush, Bucket); + } + + if (entityExcavator.Support) + { + Point point1 = new Point(_startPosX.Value + 2, _startPosY.Value + 50); + Point point2 = new Point(_startPosX.Value + 12, _startPosY.Value + 80); + Point point3 = new Point(_startPosX.Value + 22, _startPosY.Value + 80); + Point point4 = new Point(_startPosX.Value + 12, _startPosY.Value + 50); + Point[] Support = { point1, point2, point3, point4 }; + g.FillPolygon(additionalBrush, Support); + + } + + if (entityExcavator.BulldozerDump) + { + Point point11 = new Point(_startPosX.Value + 100, _startPosY.Value + 40); + Point point12 = new Point(_startPosX.Value + 160, _startPosY.Value + 80); + Point point13 = new Point(_startPosX.Value + 130, _startPosY.Value + 80); + Point point14 = new Point(_startPosX.Value + 100, _startPosY.Value + 50); + Point[] Dump = { point11, point12, point13, point14 }; + g.FillPolygon(additionalBrush, Dump); + } + + + + base.DrawTransport(g); + } +} + diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DrawingExcavatorEmpty.cs b/WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DrawingExcavatorEmpty.cs new file mode 100644 index 0000000..99930f3 --- /dev/null +++ b/WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DrawingExcavatorEmpty.cs @@ -0,0 +1,236 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using WinFormsAppExcavator.Entity; + +namespace WinFormsAppExcavator.Drawings; +public class DrawingExcavatorEmpty +{ + + + /// + /// Класс-сущность + /// + public EntityExcavatorEmpty? EntityExcavatorEmpty { get; protected set; } + + /// + /// Ширина окна + /// + private int? _pictureWidth; + + /// + /// Высота окна + /// + private int? _pictureHeight; + + /// + /// Левая координата прорисовки экскаватора + /// + protected int? _startPosX; + + /// + /// Верхняя кооридната прорисовки экскаватора + /// + protected int? _startPosY; + + /// + /// Ширина прорисовки экскаватора + /// + private readonly int _drawningExcavatorWidth = 173; + + /// + /// Высота прорисовки экскаватора + /// + private readonly int _drawningExcavatorHeight = 75; + + /// + /// Пустой конструктор + /// + private DrawingExcavatorEmpty() + { + _pictureWidth = null; + _pictureHeight = null; + _startPosX = null; + _startPosY = null; + } + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + public DrawingExcavatorEmpty(int speed, double weight, Color bodyColor) : this() + { + EntityExcavatorEmpty = new EntityExcavatorEmpty(speed, weight, bodyColor); + } + + + /// + /// Конструктор + /// + /// Ширина прорисовки экскаватора + /// Высота прорисовки экскаватора + public DrawingExcavatorEmpty(int _drawningExcavatorWidth, int _drawningExcavatorHeight) :this() + { + _pictureWidth = _drawningExcavatorWidth; + _pictureHeight = _drawningExcavatorHeight; + + } + + /// + /// Установка границ поля + /// + /// Ширина поля + /// Высота поля + /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах + public bool SetPictureSize(int width, int height) + { + + if (_drawningExcavatorWidth < width && _drawningExcavatorHeight < height) + { + _pictureWidth = width; + _pictureHeight = height; + if (_startPosX.HasValue && _startPosY.HasValue) + { + if (_startPosX + _drawningExcavatorWidth >= _pictureWidth + || _startPosY + _drawningExcavatorHeight >= _pictureHeight) + { + _startPosX = 0; + _startPosY = 0; + } + + } + return true; + } + + return false; + } + + /// + /// Установка позиции + /// + /// Координата X + /// Координата Y + public void SetPosition(int x, int y) + { + if (!_pictureHeight.HasValue || !_pictureWidth.HasValue) + { + return; + } + if (x + _drawningExcavatorWidth < _pictureWidth && _drawningExcavatorHeight + y < _pictureHeight && x > 0 && y > 0) + { + _startPosX = x; + _startPosY = y; + } + if (x + _drawningExcavatorWidth > _pictureWidth || x < 0) + { + _startPosX = 0; + + } + if (y + _drawningExcavatorHeight > _pictureHeight || y < 0) + { + _startPosY = 0; + } + + } + + /// + /// Изменение направления перемещения + /// + /// Направление + /// true - перемещение выполнено, false - перемещение невозможно + public bool MoveTransport(DirectionType direction) + { + if (EntityExcavatorEmpty == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return false; + } + + switch (direction) + { + //влево + case DirectionType.Left: + if (_startPosX.Value - EntityExcavatorEmpty.Step > 0) + { + _startPosX -= (int)EntityExcavatorEmpty.Step; + } + return true; + //вверх + case DirectionType.Up: + if (_startPosY.Value - EntityExcavatorEmpty.Step > 0) + { + _startPosY -= (int)EntityExcavatorEmpty.Step; + } + return true; + // вправо + case DirectionType.Right: + if (_startPosX.Value + _drawningExcavatorWidth + EntityExcavatorEmpty.Step < _pictureWidth) + { + _startPosX += (int)EntityExcavatorEmpty.Step; + } + return true; + //вниз + case DirectionType.Down: + if (_startPosY.Value + _drawningExcavatorHeight + EntityExcavatorEmpty.Step < _pictureHeight) + { + _startPosY += (int)EntityExcavatorEmpty.Step; + } + return true; + default: + return false; + } + } + + /// + /// Прорисовка объекта + /// + /// + public virtual void DrawTransport(Graphics g) + { + if (EntityExcavatorEmpty == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + Brush bodybrush = new SolidBrush(EntityExcavatorEmpty.BodyColor); + + //границы экскаватора + g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 20, 100, 30); + g.DrawRectangle(pen, _startPosX.Value + 30, _startPosY.Value, 10, 20); + g.DrawRectangle(pen, _startPosX.Value + 80, _startPosY.Value, 20, 20); + g.DrawArc(pen, _startPosX.Value, _startPosY.Value + 45, 30, 40, 130, 100); + g.DrawArc(pen, _startPosX.Value + 80, _startPosY.Value + 50, 30, 40, 285, 110); + g.DrawLine(pen, _startPosX.Value + 5, _startPosY.Value + 80, _startPosX.Value + 109, _startPosY.Value + 80); + g.DrawEllipse(pen, _startPosX.Value + 5, _startPosY.Value + 53, 25, 25); + g.DrawEllipse(pen, _startPosX.Value + 80, _startPosY.Value + 53, 25, 25); + g.DrawEllipse(pen, _startPosX.Value + 30, _startPosY.Value + 69, 10, 10); + g.DrawEllipse(pen, _startPosX.Value + 48, _startPosY.Value + 69, 10, 10); + g.DrawEllipse(pen, _startPosX.Value + 65, _startPosY.Value + 69, 10, 10); + g.DrawEllipse(pen, _startPosX.Value + 40, _startPosY.Value + 53, 7, 7); + g.DrawEllipse(pen, _startPosX.Value + 60, _startPosY.Value + 53, 7, 7); + + //заливка кабины и основного железа + Brush br = new SolidBrush(Color.Black); + g.FillRectangle(bodybrush, _startPosX.Value, _startPosY.Value + 20, 100, 30); + g.FillRectangle(bodybrush, _startPosX.Value + 30, _startPosY.Value, 10, 20); + g.FillRectangle(bodybrush, _startPosX.Value + 80, _startPosY.Value, 20, 20); + g.FillEllipse(br, _startPosX.Value + 5, _startPosY.Value + 53, 25, 25); + g.FillEllipse(br, _startPosX.Value + 80, _startPosY.Value + 53, 25, 25); + g.FillEllipse(br, _startPosX.Value + 30, _startPosY.Value + 69, 10, 10); + g.FillEllipse(br, _startPosX.Value + 48, _startPosY.Value + 69, 10, 10); + g.FillEllipse(br, _startPosX.Value + 65, _startPosY.Value + 69, 10, 10); + g.FillEllipse(br, _startPosX.Value + 40, _startPosY.Value + 53, 7, 7); + g.FillEllipse(br, _startPosX.Value + 60, _startPosY.Value + 53, 7, 7); + + //фары + Brush brfara = new SolidBrush(Color.Blue); + g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 27, 10, 10); + g.FillRectangle(brfara, _startPosX.Value, _startPosY.Value + 27, 10, 10); + //окно + g.FillRectangle(brfara, _startPosX.Value + 85, _startPosY.Value + 10, 10, 10); + + } +} diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/Entity/EntityExcavator.cs b/WinFormsAppExcavator/WinFormsAppExcavator/Entity/EntityExcavator.cs new file mode 100644 index 0000000..6c0acc9 --- /dev/null +++ b/WinFormsAppExcavator/WinFormsAppExcavator/Entity/EntityExcavator.cs @@ -0,0 +1,51 @@ +namespace WinFormsAppExcavator.Entity; + +public class EntityExcavator : EntityExcavatorEmpty +{ + + /// + /// Дополнительный цвет (для опциональных элементов) + /// + public Color AdditionalColor { get; private set; } + + /// + /// Признак (опция) наличия ковша + /// + public bool Bucket { get; private set; } + + /// + /// Признак (опция) наличие опоры + /// + public bool Support { get; private set; } + + /// + /// Признак (опция) наличие бульдозерного отвала + /// + public bool BulldozerDump { get; private set; } + + + + /// + /// Конструктор + /// + /// Дополнительный цвет + /// Признак наличия ковша + /// Признак наличия опоры + /// Признак наличия бульдозерного обвеса + + + public EntityExcavator(int speed, double weight, Color bodyColor, Color additionalColor, bool bucket, bool support, bool bulldozerDump) : base (speed, weight, bodyColor) + + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + AdditionalColor = additionalColor; + Bucket = bucket; + Support = support; + BulldozerDump = bulldozerDump; + + } +} + + diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/Entity/EntityExcavatorEmpty.cs b/WinFormsAppExcavator/WinFormsAppExcavator/Entity/EntityExcavatorEmpty.cs new file mode 100644 index 0000000..5b43622 --- /dev/null +++ b/WinFormsAppExcavator/WinFormsAppExcavator/Entity/EntityExcavatorEmpty.cs @@ -0,0 +1,42 @@ +namespace WinFormsAppExcavator.Entity; + +/// +/// класс-сущность для экскаватора без дополнений +/// +public class EntityExcavatorEmpty +{ + /// + /// Скорость + /// + public int Speed { get; set; } + + /// + /// Вес + /// + public double Weight { get; set; } + + /// + /// Основной цвет + /// + public Color BodyColor { get; set; } + + /// + /// Шаг перемещения автомобиля + /// + public double Step => Speed * 100 / Weight; + + /// + /// конструктор сущности + /// + /// Скорость + /// Вес автомобиля + /// Основной цвет + + + public EntityExcavatorEmpty(int speed, double weight, Color bodyColor) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + } +} \ No newline at end of file diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/EntityExcavator.cs b/WinFormsAppExcavator/WinFormsAppExcavator/EntityExcavator.cs deleted file mode 100644 index 3a16436..0000000 --- a/WinFormsAppExcavator/WinFormsAppExcavator/EntityExcavator.cs +++ /dev/null @@ -1,70 +0,0 @@ -namespace WinFormsAppExcavator; - -public class EntityExcavator -{ - /// - /// Скорость - /// - 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 Bucket { get; private set; } - - /// - /// Признак (опция) наличие опоры - /// - public bool Support { get; private set; } - - /// - /// Признак (опция) наличие бульдозерного отвала - /// - public bool BulldozerDump { get; private set; } - - /// - /// Шаг перемещения автомобиля - /// - public double Step => Speed * 100 / Weight; - - /// - /// Инициализация полей объекта-класса экскаватора - /// - /// Скорость - /// Вес автомобиля - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия ковша - /// Признак наличия опоры - /// Признак наличия бульдозерного обвеса - - - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bucket, bool support, bool bulldozerDump) - { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; - AdditionalColor = additionalColor; - Bucket = bucket; - Support = support; - BulldozerDump = bulldozerDump; - - } -} - - diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavator.Designer.cs b/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavator.Designer.cs index 81e7e5a..9c6cc3d 100644 --- a/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavator.Designer.cs +++ b/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavator.Designer.cs @@ -35,6 +35,7 @@ namespace WinFormsAppExcavator buttonRight = new Button(); buttonDown = new Button(); buttonUp = new Button(); + CreateExcavatorEmpty = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxExcavator).BeginInit(); SuspendLayout(); // @@ -52,9 +53,9 @@ namespace WinFormsAppExcavator buttonCreat.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; buttonCreat.Location = new Point(12, 288); buttonCreat.Name = "buttonCreat"; - buttonCreat.Size = new Size(94, 29); + buttonCreat.Size = new Size(192, 29); buttonCreat.TabIndex = 1; - buttonCreat.Text = "Создать"; + buttonCreat.Text = "Создать Экскаватор"; buttonCreat.UseVisualStyleBackColor = true; buttonCreat.Click += ButtonCreat_Click; // @@ -106,11 +107,23 @@ namespace WinFormsAppExcavator buttonUp.UseVisualStyleBackColor = true; buttonUp.Click += ButtonMove_Click; // + // CreateExcavatorEmpty + // + CreateExcavatorEmpty.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + CreateExcavatorEmpty.Location = new Point(224, 288); + CreateExcavatorEmpty.Name = "CreateExcavatorEmpty"; + CreateExcavatorEmpty.Size = new Size(227, 29); + CreateExcavatorEmpty.TabIndex = 6; + CreateExcavatorEmpty.Text = "Создать Экскаватор простой"; + CreateExcavatorEmpty.UseVisualStyleBackColor = true; + CreateExcavatorEmpty.Click += CreateExcavatorEmpty_Click; + // // FormExcavator // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(898, 329); + Controls.Add(CreateExcavatorEmpty); Controls.Add(buttonUp); Controls.Add(buttonDown); Controls.Add(buttonRight); @@ -131,5 +144,6 @@ namespace WinFormsAppExcavator private Button buttonDown; private Button buttonUp; public Button buttonCreat; + public Button CreateExcavatorEmpty; } } \ No newline at end of file diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavator.cs b/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavator.cs index 30c55b6..166bba4 100644 --- a/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavator.cs +++ b/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavator.cs @@ -1,4 +1,7 @@ -namespace WinFormsAppExcavator +using System; +using WinFormsAppExcavator.Drawings; + +namespace WinFormsAppExcavator { /// /// форма с объектом Экскаватор @@ -8,7 +11,7 @@ /// /// поле объект для прорисовки объекта /// - private DrawingExcavator? _drawingExcavator; + private DrawingExcavatorEmpty? _drawingExcavatorEmpty; /// /// Конструктор формы @@ -24,34 +27,66 @@ private void Draw() { - if (_drawingExcavator == null) + if (_drawingExcavatorEmpty == null) { return; } Bitmap bmp = new(pictureBoxExcavator.Width, pictureBoxExcavator.Height); Graphics gr = Graphics.FromImage(bmp); - _drawingExcavator.DrawTransport(gr); + _drawingExcavatorEmpty.DrawTransport(gr); pictureBoxExcavator.Image = bmp; } + + /// + ///создание объекта класса перемещения + /// + + private void CreateObject (String type) + { + Random random= new(); + switch (type) + { + case nameof(DrawingExcavatorEmpty): + _drawingExcavatorEmpty = new DrawingExcavatorEmpty(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(DrawingExcavator): + _drawingExcavatorEmpty = new DrawingExcavator(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))); + break; + default: + return; + } + + _drawingExcavatorEmpty.SetPictureSize(pictureBoxExcavator.Width, pictureBoxExcavator.Height); + _drawingExcavatorEmpty.SetPosition(random.Next(10, 100), random.Next(10, 100)); + + Draw(); + } + /// - /// обработка кнопки создать + /// обработка кнопки создать экскаватор /// /// /// private void ButtonCreat_Click(object sender, EventArgs e) { - Random random = new(); - _drawingExcavator = new DrawingExcavator(); - _drawingExcavator.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))); - _drawingExcavator.SetPictureSize(pictureBoxExcavator.Width, pictureBoxExcavator.Height); - _drawingExcavator.SetPosition(random.Next(10, 100), random.Next(10, 100)); + CreateObject(nameof(DrawingExcavator)); + } - Draw(); + + /// + /// обработка кнопки создать без дополнений + /// + /// + /// + private void CreateExcavatorEmpty_Click(object sender, EventArgs e) + { + CreateObject(nameof(DrawingExcavatorEmpty)); } /// @@ -61,7 +96,7 @@ /// private void ButtonMove_Click(object sender, EventArgs e) { - if (_drawingExcavator == null) + if (_drawingExcavatorEmpty == null) { return; } @@ -71,16 +106,16 @@ switch (name) { case "buttonUp": - result = _drawingExcavator.MoveTransport(DirectionType.Up); + result = _drawingExcavatorEmpty.MoveTransport(DirectionType.Up); break; case "buttonDown": - result = _drawingExcavator.MoveTransport(DirectionType.Down); + result = _drawingExcavatorEmpty.MoveTransport(DirectionType.Down); break; case "buttonLeft": - result = _drawingExcavator.MoveTransport(DirectionType.Left); + result = _drawingExcavatorEmpty.MoveTransport(DirectionType.Left); break; case "buttonRight": - result = _drawingExcavator.MoveTransport(DirectionType.Right); + result = _drawingExcavatorEmpty.MoveTransport(DirectionType.Right); break; } @@ -89,5 +124,7 @@ Draw(); } } + + } } -- 2.25.1 From 489f70b80fe4bfb3f0ed77518ea8128a6b60ff61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=B8=D1=8F=20=D0=9A=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0?= Date: Wed, 28 Feb 2024 13:28:37 +0400 Subject: [PATCH 2/2] =?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 --- .../Drawings/DrawingExcavator.cs | 35 ----- .../Drawings/DrawingExcavatorEmpty.cs | 20 +++ .../FormExcavator.Designer.cs | 26 ++++ .../WinFormsAppExcavator/FormExcavator.cs | 63 +++++++- .../MovementStrategy/AbstractStrategy.cs | 140 ++++++++++++++++++ .../MovementStrategy/IMoveableObjectcs.cs | 24 +++ .../MovementStrategy/MoveToBorder.cs | 56 +++++++ .../MovementStrategy/MoveToCenter.cs | 48 ++++++ .../MovementStrategy/MoveableExcavator.cs | 69 +++++++++ .../MovementStrategy/MovementDirection.cs | 24 +++ .../MovementStrategy/ObjectParameters.cs | 73 +++++++++ .../MovementStrategy/StrategyStatus.cs | 22 +++ 12 files changed, 561 insertions(+), 39 deletions(-) create mode 100644 WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/AbstractStrategy.cs create mode 100644 WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/IMoveableObjectcs.cs create mode 100644 WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/MoveToBorder.cs create mode 100644 WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/MoveToCenter.cs create mode 100644 WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/MoveableExcavator.cs create mode 100644 WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/MovementDirection.cs create mode 100644 WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/ObjectParameters.cs create mode 100644 WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/StrategyStatus.cs diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DrawingExcavator.cs b/WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DrawingExcavator.cs index 79fb431..1b598b2 100644 --- a/WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DrawingExcavator.cs +++ b/WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DrawingExcavator.cs @@ -34,41 +34,6 @@ public class DrawingExcavator : DrawingExcavatorEmpty Brush additionalBrush = new SolidBrush(entityExcavator.AdditionalColor); Brush bodybrush = new SolidBrush(entityExcavator.BodyColor); - //границы экскаватора - g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 20, 100, 30); - g.DrawRectangle(pen, _startPosX.Value + 30, _startPosY.Value, 10, 20); - g.DrawRectangle(pen, _startPosX.Value + 80, _startPosY.Value, 20, 20); - g.DrawArc(pen, _startPosX.Value, _startPosY.Value + 45, 30, 40, 130, 100); - g.DrawArc(pen, _startPosX.Value + 80, _startPosY.Value + 50, 30, 40, 285, 110); - g.DrawLine(pen, _startPosX.Value + 5, _startPosY.Value + 80, _startPosX.Value + 109, _startPosY.Value + 80); - g.DrawEllipse(pen, _startPosX.Value + 5, _startPosY.Value + 53, 25, 25); - g.DrawEllipse(pen, _startPosX.Value + 80, _startPosY.Value + 53, 25, 25); - g.DrawEllipse(pen, _startPosX.Value + 30, _startPosY.Value + 69, 10, 10); - g.DrawEllipse(pen, _startPosX.Value + 48, _startPosY.Value + 69, 10, 10); - g.DrawEllipse(pen, _startPosX.Value + 65, _startPosY.Value + 69, 10, 10); - g.DrawEllipse(pen, _startPosX.Value + 40, _startPosY.Value + 53, 7, 7); - g.DrawEllipse(pen, _startPosX.Value + 60, _startPosY.Value + 53, 7, 7); - - //заливка кабины и основного железа - Brush br = new SolidBrush(Color.Black); - g.FillRectangle(bodybrush, _startPosX.Value, _startPosY.Value + 20, 100, 30); - g.FillRectangle(bodybrush, _startPosX.Value + 30, _startPosY.Value, 10, 20); - g.FillRectangle(bodybrush, _startPosX.Value + 80, _startPosY.Value, 20, 20); - g.FillEllipse(br, _startPosX.Value + 5, _startPosY.Value + 53, 25, 25); - g.FillEllipse(br, _startPosX.Value + 80, _startPosY.Value + 53, 25, 25); - g.FillEllipse(br, _startPosX.Value + 30, _startPosY.Value + 69, 10, 10); - g.FillEllipse(br, _startPosX.Value + 48, _startPosY.Value + 69, 10, 10); - g.FillEllipse(br, _startPosX.Value + 65, _startPosY.Value + 69, 10, 10); - g.FillEllipse(br, _startPosX.Value + 40, _startPosY.Value + 53, 7, 7); - g.FillEllipse(br, _startPosX.Value + 60, _startPosY.Value + 53, 7, 7); - - //фары - Brush brfara = new SolidBrush(Color.Blue); - g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 27, 10, 10); - g.FillRectangle(brfara, _startPosX.Value, _startPosY.Value + 27, 10, 10); - //окно - g.FillRectangle(brfara, _startPosX.Value + 85, _startPosY.Value + 10, 10, 10); - if (entityExcavator.Bucket) { diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DrawingExcavatorEmpty.cs b/WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DrawingExcavatorEmpty.cs index 99930f3..c7c05eb 100644 --- a/WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DrawingExcavatorEmpty.cs +++ b/WinFormsAppExcavator/WinFormsAppExcavator/Drawings/DrawingExcavatorEmpty.cs @@ -45,6 +45,26 @@ public class DrawingExcavatorEmpty /// private readonly int _drawningExcavatorHeight = 75; + /// + /// Координата X объекта + /// + public int? GetPosX => _startPosX; + + /// + /// Координата Y объекта + /// + public int? GetPosY => _startPosY; + + /// + /// Ширина объекта + /// + public int GetWidth => _drawningExcavatorWidth; + + /// + /// Высота объекта + /// + public int GetHeight => _drawningExcavatorHeight; + /// /// Пустой конструктор /// diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavator.Designer.cs b/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavator.Designer.cs index 9c6cc3d..5897aac 100644 --- a/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavator.Designer.cs +++ b/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavator.Designer.cs @@ -36,6 +36,8 @@ namespace WinFormsAppExcavator buttonDown = new Button(); buttonUp = new Button(); CreateExcavatorEmpty = new Button(); + buttonStrategyStep = new Button(); + comboBoxStrategy = new ComboBox(); ((System.ComponentModel.ISupportInitialize)pictureBoxExcavator).BeginInit(); SuspendLayout(); // @@ -118,11 +120,33 @@ namespace WinFormsAppExcavator CreateExcavatorEmpty.UseVisualStyleBackColor = true; CreateExcavatorEmpty.Click += CreateExcavatorEmpty_Click; // + // buttonStrategyStep + // + buttonStrategyStep.Location = new Point(790, 48); + buttonStrategyStep.Name = "buttonStrategyStep"; + buttonStrategyStep.Size = new Size(94, 29); + buttonStrategyStep.TabIndex = 8; + buttonStrategyStep.Text = "Шаг"; + buttonStrategyStep.UseVisualStyleBackColor = true; + buttonStrategyStep.Click += ButtonStrategyStep_Click; + // + // comboBoxStrategy + // + comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxStrategy.FormattingEnabled = true; + comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" }); + comboBoxStrategy.Location = new Point(733, 12); + comboBoxStrategy.Name = "comboBoxStrategy"; + comboBoxStrategy.Size = new Size(151, 28); + comboBoxStrategy.TabIndex = 9; + // // FormExcavator // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(898, 329); + Controls.Add(comboBoxStrategy); + Controls.Add(buttonStrategyStep); Controls.Add(CreateExcavatorEmpty); Controls.Add(buttonUp); Controls.Add(buttonDown); @@ -145,5 +169,7 @@ namespace WinFormsAppExcavator private Button buttonUp; public Button buttonCreat; public Button CreateExcavatorEmpty; + private Button buttonStrategyStep; + private ComboBox comboBoxStrategy; } } \ No newline at end of file diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavator.cs b/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavator.cs index 166bba4..2ce12f8 100644 --- a/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavator.cs +++ b/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavator.cs @@ -1,5 +1,6 @@ using System; using WinFormsAppExcavator.Drawings; +using WinFormsAppExcavator.MovementStrategy; namespace WinFormsAppExcavator { @@ -13,12 +14,19 @@ namespace WinFormsAppExcavator /// private DrawingExcavatorEmpty? _drawingExcavatorEmpty; + + /// + /// Стратегия перемещения + /// + private AbstractStrategy? _strategy; + /// /// Конструктор формы /// public FormExcavator() { InitializeComponent(); + _strategy = null; } /// @@ -42,10 +50,10 @@ namespace WinFormsAppExcavator /// ///создание объекта класса перемещения /// - - private void CreateObject (String type) + + private void CreateObject(String type) { - Random random= new(); + Random random = new(); switch (type) { case nameof(DrawingExcavatorEmpty): @@ -65,6 +73,9 @@ namespace WinFormsAppExcavator _drawingExcavatorEmpty.SetPictureSize(pictureBoxExcavator.Width, pictureBoxExcavator.Height); _drawingExcavatorEmpty.SetPosition(random.Next(10, 100), random.Next(10, 100)); + _strategy = null; + comboBoxStrategy.Enabled = true; + Draw(); } @@ -125,6 +136,50 @@ namespace WinFormsAppExcavator } } - + + + /// + /// Обработка нажатия кнопки "Шаг" + /// + /// + /// + private void ButtonStrategyStep_Click(object sender, EventArgs e) + { + if (_drawingExcavatorEmpty == null) + { + return; + } + + if (comboBoxStrategy.Enabled) + { + _strategy = comboBoxStrategy.SelectedIndex switch + { + 0 => new MoveToCenter(), + 1 => new MoveToBorder(), + _ => null, + }; + if (_strategy == null) + { + return; + } + _strategy.SetData(new MoveableExcavator(_drawingExcavatorEmpty), 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/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/AbstractStrategy.cs b/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/AbstractStrategy.cs new file mode 100644 index 0000000..d2f93f2 --- /dev/null +++ b/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/AbstractStrategy.cs @@ -0,0 +1,140 @@ +namespace WinFormsAppExcavator.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/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/IMoveableObjectcs.cs b/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/IMoveableObjectcs.cs new file mode 100644 index 0000000..8e45246 --- /dev/null +++ b/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/IMoveableObjectcs.cs @@ -0,0 +1,24 @@ +namespace WinFormsAppExcavator.MovementStrategy; + +/// +/// Интерфейс для работы с перемещаемым объектом +/// +public interface IMoveableObjectcs +{ + /// + /// Получение координаты объекта + /// + ObjectParameters? GetObjectPosition { get; } + + /// + /// Шаг объекта + /// + int GetStep { get; } + + /// + /// Попытка переместить объект в указанном направлении + /// + /// Направление + /// true - объект перемещен, false - перемещение невозможно + bool TryMoveObject(MovementDirection direction); +} diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/MoveToBorder.cs b/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/MoveToBorder.cs new file mode 100644 index 0000000..e1f7aa8 --- /dev/null +++ b/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/MoveToBorder.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WinFormsAppExcavator.MovementStrategy +{ + internal class MoveToBorder : 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; + if (Math.Abs(diffX) > GetStep()) + { + if (diffX > 0) + { + MoveLeft(); + } + else + { + MoveRight(); + } + } + int diffY = objParams.ObjectMiddleVertical - FieldHeight; + if (Math.Abs(diffY) > GetStep()) + { + if (diffY > 0) + { + MoveUp(); + } + else + { + MoveDown(); + } + } + } + } +} diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/MoveToCenter.cs b/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/MoveToCenter.cs new file mode 100644 index 0000000..2cc5426 --- /dev/null +++ b/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/MoveToCenter.cs @@ -0,0 +1,48 @@ +namespace WinFormsAppExcavator.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/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/MoveableExcavator.cs b/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/MoveableExcavator.cs new file mode 100644 index 0000000..9cb5a9b --- /dev/null +++ b/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/MoveableExcavator.cs @@ -0,0 +1,69 @@ + + +using WinFormsAppExcavator.Drawings; + +namespace WinFormsAppExcavator.MovementStrategy; +/// +/// Класс-реализация IMoveableObject с использованием DrawningExcavator +/// +public class MoveableExcavator : IMoveableObjectcs +{ + + + + /// + /// Поле-объект класса DrawningCar или его наследника + /// + private readonly DrawingExcavatorEmpty? _excavator = null; + + /// + /// Конструктор + /// + /// Объект класса DrawningCar + public MoveableExcavator(DrawingExcavatorEmpty excavator) + { + _excavator = excavator; + } + + + public ObjectParameters? GetObjectPosition + { + get + { + if (_excavator == null || _excavator.EntityExcavatorEmpty == null || !_excavator.GetPosX.HasValue || !_excavator.GetPosY.HasValue) + { + return null; + } + return new ObjectParameters(_excavator.GetPosX.Value, _excavator.GetPosY.Value, _excavator.GetWidth, _excavator.GetHeight); + } + } + + public int GetStep => (int)(_excavator?.EntityExcavatorEmpty?.Step ?? 0); + + public bool TryMoveObject(MovementDirection direction) + { + if (_excavator == null || _excavator.EntityExcavatorEmpty == null) + { + return false; + } + + return _excavator.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, + }; + } + +} diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/MovementDirection.cs b/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/MovementDirection.cs new file mode 100644 index 0000000..4eb10e1 --- /dev/null +++ b/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/MovementDirection.cs @@ -0,0 +1,24 @@ +namespace WinFormsAppExcavator.MovementStrategy; +/// +/// направление перемещения +/// +public enum MovementDirection +{ + /// + /// Вверх + /// + Up = 1, + /// + /// Вниз + /// + Down = 2, + /// + /// Влево + /// + Left = 3, + /// + /// Вправо + /// + Right = 4 + +} diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/ObjectParameters.cs b/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/ObjectParameters.cs new file mode 100644 index 0000000..20601c8 --- /dev/null +++ b/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/ObjectParameters.cs @@ -0,0 +1,73 @@ +namespace WinFormsAppExcavator.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/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/StrategyStatus.cs b/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/StrategyStatus.cs new file mode 100644 index 0000000..191d357 --- /dev/null +++ b/WinFormsAppExcavator/WinFormsAppExcavator/MovementStrategy/StrategyStatus.cs @@ -0,0 +1,22 @@ + +namespace WinFormsAppExcavator.MovementStrategy; +/// +///статус выполнения операции перемещения +/// +public enum StrategyStatus +{ + /// + /// все готово к началу + /// + NotInit, + + /// + /// выполняется + /// + InProgress, + + /// + /// завершено + /// + Finish +} -- 2.25.1