From 93f658233b497d274c3096fc35187c32612df9e0 Mon Sep 17 00:00:00 2001 From: nikos77781 Date: Mon, 26 Feb 2024 00:45:15 +0400 Subject: [PATCH 1/3] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Excavator/Excavator/DirectionType.cs | 27 ++ Excavator/Excavator/DrawningExcavator.cs | 304 ++++++++++++++++++ Excavator/Excavator/EntityExcavator.cs | 53 +++ Excavator/Excavator/Excavator.csproj | 15 + Excavator/Excavator/Form1.Designer.cs | 39 --- Excavator/Excavator/Form1.cs | 10 - Excavator/Excavator/FormExcavator.Designer.cs | 134 ++++++++ Excavator/Excavator/FormExcavator.cs | 90 ++++++ .../{Form1.resx => FormExcavator.resx} | 52 +-- Excavator/Excavator/Program.cs | 2 +- .../Properties/Resources.Designer.cs | 143 ++++++++ Excavator/Excavator/Properties/Resources.resx | 145 +++++++++ Excavator/Excavator/Resources/arrowDown.png | Bin 0 -> 359 bytes Excavator/Excavator/Resources/arrowLeft.png | Bin 0 -> 340 bytes Excavator/Excavator/Resources/arrowRight.png | Bin 0 -> 326 bytes Excavator/Excavator/Resources/arrowUp.png | Bin 0 -> 373 bytes .../icons8-стрелка-50 (1).png | Bin 0 -> 359 bytes .../icons8-стрелка-50 (2).png | Bin 0 -> 340 bytes .../icons8-стрелка-50 (3).png | Bin 0 -> 373 bytes .../Resources/icons8-стрелка-50.png | Bin 0 -> 326 bytes 20 files changed, 938 insertions(+), 76 deletions(-) create mode 100644 Excavator/Excavator/DirectionType.cs create mode 100644 Excavator/Excavator/DrawningExcavator.cs create mode 100644 Excavator/Excavator/EntityExcavator.cs delete mode 100644 Excavator/Excavator/Form1.Designer.cs delete mode 100644 Excavator/Excavator/Form1.cs create mode 100644 Excavator/Excavator/FormExcavator.Designer.cs create mode 100644 Excavator/Excavator/FormExcavator.cs rename Excavator/Excavator/{Form1.resx => FormExcavator.resx} (93%) create mode 100644 Excavator/Excavator/Properties/Resources.Designer.cs create mode 100644 Excavator/Excavator/Properties/Resources.resx create mode 100644 Excavator/Excavator/Resources/arrowDown.png create mode 100644 Excavator/Excavator/Resources/arrowLeft.png create mode 100644 Excavator/Excavator/Resources/arrowRight.png create mode 100644 Excavator/Excavator/Resources/arrowUp.png create mode 100644 Excavator/Excavator/Resources/icons8-стрелка-50 (1).png create mode 100644 Excavator/Excavator/Resources/icons8-стрелка-50 (2).png create mode 100644 Excavator/Excavator/Resources/icons8-стрелка-50 (3).png create mode 100644 Excavator/Excavator/Resources/icons8-стрелка-50.png diff --git a/Excavator/Excavator/DirectionType.cs b/Excavator/Excavator/DirectionType.cs new file mode 100644 index 0000000..9302014 --- /dev/null +++ b/Excavator/Excavator/DirectionType.cs @@ -0,0 +1,27 @@ +namespace Excavator; + +/// +/// Направление перемещения +/// +public enum DirectionType +{ + /// + /// Вверх + /// + Up = 1, + + /// + /// Вниз + /// + Down = 2, + + /// + /// Влево + /// + Left = 3, + + /// + /// Вправо + /// + Right = 4 +} diff --git a/Excavator/Excavator/DrawningExcavator.cs b/Excavator/Excavator/DrawningExcavator.cs new file mode 100644 index 0000000..1057260 --- /dev/null +++ b/Excavator/Excavator/DrawningExcavator.cs @@ -0,0 +1,304 @@ +using System.Net.Sockets; + +namespace Excavator; + +/// +/// Класс, отвечающий за прорисовку и перемещение объекта-сущности +/// +public class DrawningExcavator +{ + /// + /// Класс-сущность + /// + public EntityExcavator? EntityExcavator { get; private set; } + + /// + /// Ширина окна + /// + private int? _pictureWidth; + + /// + /// Высота окна + /// + private int? _pictureHeight; + + /// + /// Левая координата прорисовки экскаваторя + /// + private int? _startPosX; + + /// + /// Верхняя кооридната прорисовки экскаваторя + /// + private int? _startPosY; + + /// + /// Ширина прорисовки экскаватора + /// + private readonly int _drawningExcavatorWidth = 145; + + /// + /// Высота прорисовки экскаватора + /// + private readonly int _drawningExcavatorHeight = 100; + + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия обвеса + /// Признак наличия антикрыла + public void Init(int speed, double weight, Color bodyColor, Color additionalColor,bool supports, bool bucket) + { + EntityExcavator = new EntityExcavator(); + EntityExcavator.Init(speed, weight, bodyColor, additionalColor, supports, bucket); + _pictureWidth = null; + _pictureHeight = null; + _startPosX = null; + _startPosY = null; + } + + /// + /// Установка границ поля + /// + /// Ширина поля + /// Высота поля + /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах + + public bool SetPictureSize(int width, int height) + { + if (width > _drawningExcavatorWidth && height > _drawningExcavatorHeight) + { + _pictureWidth = width; + _pictureHeight = height; + if (_startPosX != null && _startPosY != null) + { + if (_startPosX.Value + _drawningExcavatorWidth > _pictureWidth) + { + _startPosX = _pictureWidth - _drawningExcavatorWidth; + } + if (_startPosY.Value + _drawningExcavatorHeight > _pictureHeight) + { + _startPosY = _pictureHeight - _drawningExcavatorHeight; + } + } + + return true; + } + return false; + } + + /// + /// Установка позиции + /// + /// Координата X + /// Координата Y + public void SetPosition(int x, int y) + { + if (!_pictureHeight.HasValue || !_pictureWidth.HasValue) + { + return; + } + + + _startPosX = x; + _startPosY = y; + + if (_drawningExcavatorWidth + _startPosX > _pictureWidth) + { + _startPosX = _pictureWidth - _drawningExcavatorWidth; + } + if (_drawningExcavatorHeight + _startPosY > _pictureHeight) + { + _startPosY = _pictureHeight - _drawningExcavatorHeight; + } + } + + /// + /// Изменение направления перемещения + /// + /// Направление + /// 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.Value) + { + _startPosX += (int)EntityExcavator.Step; + } + return true; + //вниз + case DirectionType.Down: + if (_startPosY.Value + _drawningExcavatorHeight + EntityExcavator.Step < _pictureHeight.Value) + { + _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); + + // Ковш + if(EntityExcavator.Bucket) + { + + Point[] pointBucket1 = + { + new Point(_startPosX.Value + 90, _startPosY.Value + 50), + new Point(_startPosX.Value + 90, _startPosY.Value), + new Point(_startPosX.Value + 135, _startPosY.Value), + new Point(_startPosX.Value + 135, _startPosY.Value + 30), + new Point(_startPosX.Value + 125, _startPosY.Value + 30), + new Point(_startPosX.Value + 125, _startPosY.Value + 10), + new Point(_startPosX.Value + 105, _startPosY.Value + 10), + new Point(_startPosX.Value + 105, _startPosY.Value + 45), + new Point(_startPosX.Value + 100, _startPosY.Value + 50), + new Point(_startPosX.Value + 90, _startPosY.Value + 50), + }; + g.FillPolygon(additionalBrush, pointBucket1); + g.DrawPolygon(pen, pointBucket1); + + Point[] pointBucket2 = + { + new Point(_startPosX.Value + 125, _startPosY.Value + 30), + new Point(_startPosX.Value + 135, _startPosY.Value+ 30), + new Point(_startPosX.Value + 145, _startPosY.Value + 40), + new Point(_startPosX.Value + 145, _startPosY.Value + 60), + new Point(_startPosX.Value + 140, _startPosY.Value + 70), + new Point(_startPosX.Value + 120, _startPosY.Value + 70), + new Point(_startPosX.Value + 125, _startPosY.Value + 60), + new Point(_startPosX.Value + 125, _startPosY.Value + 30), + }; + Brush br1 = new SolidBrush(Color.FromArgb(100, 100, 100)); + g.FillPolygon(br1, pointBucket2); + g.DrawPolygon(pen, pointBucket2); + } + + // Гусеницы + Brush brGrey = new SolidBrush(Color.FromArgb(100, 100, 100)); + Brush br = new SolidBrush(EntityExcavator.BodyColor); + + g.FillEllipse(brGrey, _startPosX.Value + 30, _startPosY.Value + 75, 25, 25); + g.FillEllipse(brGrey, _startPosX.Value + 75, _startPosY.Value + 75, 25, 25); + g.FillRectangle(brGrey, _startPosX.Value + 40, _startPosY.Value + 75, 50, 25); + + Rectangle rect1 = new Rectangle(_startPosX.Value + 30, _startPosY.Value + 75, 25, 25); + g.DrawArc(pen, rect1, 90, 180); + Rectangle rect2 = new Rectangle(_startPosX.Value + 75, _startPosY.Value + 75, 25, 25); + g.DrawArc(pen, rect2, 270, 180); + g.DrawLine(pen, _startPosX.Value + 40, _startPosY.Value + 100, _startPosX.Value + 90, _startPosY.Value + 100); + + + g.FillEllipse(br, _startPosX.Value + 33, _startPosY.Value + 78, 18, 18); + g.FillEllipse(br, _startPosX.Value + 78, _startPosY.Value + 78, 18, 18); + g.FillEllipse(br, _startPosX.Value + 51, _startPosY.Value + 89, 7, 7); + g.FillEllipse(br, _startPosX.Value + 61, _startPosY.Value + 89, 7, 7); + g.FillEllipse(br, _startPosX.Value + 71, _startPosY.Value + 89, 7, 7); + g.FillEllipse(br, _startPosX.Value + 57, _startPosY.Value + 81, 4, 4); + g.FillEllipse(br, _startPosX.Value + 69, _startPosY.Value + 81, 4, 4); + + g.DrawEllipse(pen, _startPosX.Value + 33, _startPosY.Value + 78, 18, 18); + g.DrawEllipse(pen, _startPosX.Value + 78, _startPosY.Value + 78, 18, 18); + g.DrawEllipse(pen, _startPosX.Value + 51, _startPosY.Value + 89, 7, 7); + g.DrawEllipse(pen, _startPosX.Value + 61, _startPosY.Value + 89, 7, 7); + g.DrawEllipse(pen, _startPosX.Value + 71, _startPosY.Value + 89, 7, 7); + g.DrawEllipse(pen, _startPosX.Value + 57, _startPosY.Value + 81, 4, 4); + g.DrawEllipse(pen, _startPosX.Value + 69, _startPosY.Value + 81, 4, 4); + + // Корпус + Point[] pointBody1 = + { + new Point(_startPosX.Value + 30, _startPosY.Value + 75), + new Point(_startPosX.Value + 30, _startPosY.Value + 50), + new Point(_startPosX.Value + 70, _startPosY.Value + 50), + new Point(_startPosX.Value + 70, _startPosY.Value + 20), + new Point(_startPosX.Value + 100, _startPosY.Value + 20), + new Point(_startPosX.Value + 100, _startPosY.Value + 75), + new Point(_startPosX.Value + 30, _startPosY.Value + 75), + }; + g.FillPolygon(br, pointBody1); + g.DrawPolygon(pen, pointBody1); + g.FillRectangle(br, _startPosX.Value + 40, _startPosY.Value + 25, 10, 25); + g.FillRectangle(br, _startPosX.Value + 40, _startPosY.Value + 25, 10, 25); + g.DrawRectangle(pen, _startPosX.Value + 40, _startPosY.Value + 25, 10, 25); + + // Окно + Brush brLBlue = new SolidBrush(Color.LightBlue); + + g.FillRectangle(brLBlue, _startPosX.Value + 72, _startPosY.Value + 22, 26, 26); + g.DrawRectangle(pen, _startPosX.Value + 72, _startPosY.Value + 22, 26, 26); + + // Опоры + if (EntityExcavator.Supports) + { + Point[] pointSupport1 = + { + new Point(_startPosX.Value + 10, _startPosY.Value + 100), + new Point(_startPosX.Value + 20, _startPosY.Value + 100), + new Point(_startPosX.Value + 50, _startPosY.Value + 70), + new Point(_startPosX.Value + 50, _startPosY.Value + 60), + new Point(_startPosX.Value + 30, _startPosY.Value + 60), + new Point(_startPosX.Value + 10, _startPosY.Value + 100), + }; + g.FillPolygon(additionalBrush, pointSupport1); + g.DrawPolygon(pen, pointSupport1); + g.FillRectangle(additionalBrush, _startPosX.Value, _startPosY.Value + 95, 30, 5); + g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 95, 30, 5); + + Point[] pointSupport2 = + { + new Point(_startPosX.Value + 120, _startPosY.Value + 100), + new Point(_startPosX.Value + 110, _startPosY.Value + 100), + new Point(_startPosX.Value + 80, _startPosY.Value + 70), + new Point(_startPosX.Value + 80, _startPosY.Value + 60), + new Point(_startPosX.Value + 100, _startPosY.Value + 60), + new Point(_startPosX.Value + 120, _startPosY.Value + 100), + }; + g.FillPolygon(additionalBrush, pointSupport2); + g.DrawPolygon(pen, pointSupport2); + g.FillRectangle(additionalBrush, _startPosX.Value + 100, _startPosY.Value + 95, 30, 5); + g.DrawRectangle(pen, _startPosX.Value + 100, _startPosY.Value + 95, 30, 5); + } + + } +} \ No newline at end of file diff --git a/Excavator/Excavator/EntityExcavator.cs b/Excavator/Excavator/EntityExcavator.cs new file mode 100644 index 0000000..2836c8f --- /dev/null +++ b/Excavator/Excavator/EntityExcavator.cs @@ -0,0 +1,53 @@ +namespace Excavator; + +/// +/// Класс-сущность "Экскаватор" +/// +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 Supports { get; private set; } + + /// + /// Признак (опция) наличия Ковша + /// + public bool Bucket { get; private set; } + + /// + /// Шаг перемещения экскаватора + /// + public double Step => Speed * 100 / Weight; + + + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool supports, bool bucket) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + AdditionalColor = additionalColor; + Supports = supports; + Bucket = bucket; + } +} \ No newline at end of file diff --git a/Excavator/Excavator/Excavator.csproj b/Excavator/Excavator/Excavator.csproj index e1a0735..244387d 100644 --- a/Excavator/Excavator/Excavator.csproj +++ b/Excavator/Excavator/Excavator.csproj @@ -8,4 +8,19 @@ enable + + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + \ No newline at end of file diff --git a/Excavator/Excavator/Form1.Designer.cs b/Excavator/Excavator/Form1.Designer.cs deleted file mode 100644 index fe991b1..0000000 --- a/Excavator/Excavator/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace Excavator -{ - 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 - } -} \ No newline at end of file diff --git a/Excavator/Excavator/Form1.cs b/Excavator/Excavator/Form1.cs deleted file mode 100644 index 8955887..0000000 --- a/Excavator/Excavator/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Excavator -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Excavator/Excavator/FormExcavator.Designer.cs b/Excavator/Excavator/FormExcavator.Designer.cs new file mode 100644 index 0000000..d315652 --- /dev/null +++ b/Excavator/Excavator/FormExcavator.Designer.cs @@ -0,0 +1,134 @@ +namespace Excavator +{ + partial class FormExcavator + { + /// + /// 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() + { + pictureBoxExcavator = new PictureBox(); + buttonCreateExcavator = new Button(); + buttonLeft = new Button(); + buttonUp = new Button(); + buttonDown = new Button(); + buttonRight = new Button(); + ((System.ComponentModel.ISupportInitialize)pictureBoxExcavator).BeginInit(); + SuspendLayout(); + // + // pictureBoxExcavator + // + pictureBoxExcavator.Dock = DockStyle.Fill; + pictureBoxExcavator.Location = new Point(0, 0); + pictureBoxExcavator.Name = "pictureBoxExcavator"; + pictureBoxExcavator.Size = new Size(923, 597); + pictureBoxExcavator.TabIndex = 0; + pictureBoxExcavator.TabStop = false; + // + // buttonCreateExcavator + // + buttonCreateExcavator.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateExcavator.Location = new Point(12, 562); + buttonCreateExcavator.Name = "buttonCreateExcavator"; + buttonCreateExcavator.Size = new Size(75, 23); + buttonCreateExcavator.TabIndex = 1; + buttonCreateExcavator.Text = "Создать"; + buttonCreateExcavator.UseVisualStyleBackColor = true; + buttonCreateExcavator.Click += ButtonCreateExcavator_Click; + // + // buttonLeft + // + buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonLeft.BackgroundImage = Properties.Resources.arrowLeft; + buttonLeft.BackgroundImageLayout = ImageLayout.Stretch; + buttonLeft.Location = new Point(740, 535); + buttonLeft.Name = "buttonLeft"; + buttonLeft.Size = new Size(50, 50); + buttonLeft.TabIndex = 2; + buttonLeft.UseVisualStyleBackColor = true; + buttonLeft.Click += ButtonMove_Click; + // + // buttonUp + // + buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonUp.BackgroundImage = Properties.Resources.arrowUp; + buttonUp.BackgroundImageLayout = ImageLayout.Stretch; + buttonUp.Location = new Point(796, 479); + buttonUp.Name = "buttonUp"; + buttonUp.Size = new Size(50, 50); + buttonUp.TabIndex = 3; + buttonUp.UseVisualStyleBackColor = true; + buttonUp.Click += ButtonMove_Click; + // + // buttonDown + // + buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonDown.BackgroundImage = Properties.Resources.arrowDown; + buttonDown.BackgroundImageLayout = ImageLayout.Stretch; + buttonDown.Location = new Point(796, 535); + buttonDown.Name = "buttonDown"; + buttonDown.Size = new Size(50, 50); + buttonDown.TabIndex = 4; + buttonDown.UseVisualStyleBackColor = true; + buttonDown.Click += ButtonMove_Click; + // + // buttonRight + // + buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonRight.BackgroundImage = Properties.Resources.arrowRight; + buttonRight.BackgroundImageLayout = ImageLayout.Stretch; + buttonRight.Location = new Point(852, 535); + buttonRight.Name = "buttonRight"; + buttonRight.Size = new Size(50, 50); + buttonRight.TabIndex = 5; + buttonRight.UseVisualStyleBackColor = true; + buttonRight.Click += ButtonMove_Click; + // + // FormExcavator + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(923, 597); + Controls.Add(buttonRight); + Controls.Add(buttonDown); + Controls.Add(buttonUp); + Controls.Add(buttonLeft); + Controls.Add(buttonCreateExcavator); + Controls.Add(pictureBoxExcavator); + Name = "FormExcavator"; + Text = "Экскаватор"; + ((System.ComponentModel.ISupportInitialize)pictureBoxExcavator).EndInit(); + ResumeLayout(false); + } + + #endregion + + private PictureBox pictureBoxExcavator; + private Button buttonCreateExcavator; + private Button buttonLeft; + private Button buttonUp; + private Button buttonDown; + private Button buttonRight; + } +} \ No newline at end of file diff --git a/Excavator/Excavator/FormExcavator.cs b/Excavator/Excavator/FormExcavator.cs new file mode 100644 index 0000000..f6cd833 --- /dev/null +++ b/Excavator/Excavator/FormExcavator.cs @@ -0,0 +1,90 @@ +namespace Excavator; + +/// +/// Форма работы с объектом "Экскаватор" +/// +public partial class FormExcavator : Form +{ + /// + /// Поле-объект для прорисовки объекта + /// + private DrawningExcavator? _drawningExcavator; + + /// + /// Конструктор формы + /// + public FormExcavator() + { + InitializeComponent(); + } + + /// + /// Метод прорисовки экскаватора + /// + 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; + } + + /// + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + private void ButtonCreateExcavator_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)); + 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(); + } + } +} \ No newline at end of file diff --git a/Excavator/Excavator/Form1.resx b/Excavator/Excavator/FormExcavator.resx similarity index 93% rename from Excavator/Excavator/Form1.resx rename to Excavator/Excavator/FormExcavator.resx index 1af7de1..a395bff 100644 --- a/Excavator/Excavator/Form1.resx +++ b/Excavator/Excavator/FormExcavator.resx @@ -1,24 +1,24 @@  - diff --git a/Excavator/Excavator/Program.cs b/Excavator/Excavator/Program.cs index 0facf42..4f04208 100644 --- a/Excavator/Excavator/Program.cs +++ b/Excavator/Excavator/Program.cs @@ -11,7 +11,7 @@ namespace Excavator // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new Form1()); + Application.Run(new FormExcavator()); } } } \ No newline at end of file diff --git a/Excavator/Excavator/Properties/Resources.Designer.cs b/Excavator/Excavator/Properties/Resources.Designer.cs new file mode 100644 index 0000000..e94fa7a --- /dev/null +++ b/Excavator/Excavator/Properties/Resources.Designer.cs @@ -0,0 +1,143 @@ +//------------------------------------------------------------------------------ +// +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 +// +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. +// +//------------------------------------------------------------------------------ + +namespace Excavator.Properties { + using System; + + + /// + /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. + /// + // Этот класс создан автоматически классом StronglyTypedResourceBuilder + // с помощью такого средства, как ResGen или Visual Studio. + // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen + // с параметром /str или перестройте свой проект VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Excavator.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Перезаписывает свойство CurrentUICulture текущего потока для всех + /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrowDown { + get { + object obj = ResourceManager.GetObject("arrowDown", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrowLeft { + get { + object obj = ResourceManager.GetObject("arrowLeft", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrowRight { + get { + object obj = ResourceManager.GetObject("arrowRight", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrowUp { + get { + object obj = ResourceManager.GetObject("arrowUp", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_стрелка_50 { + get { + object obj = ResourceManager.GetObject("icons8-стрелка-50", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_стрелка_50__1_ { + get { + object obj = ResourceManager.GetObject("icons8-стрелка-50 (1)", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_стрелка_50__2_ { + get { + object obj = ResourceManager.GetObject("icons8-стрелка-50 (2)", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_стрелка_50__3_ { + get { + object obj = ResourceManager.GetObject("icons8-стрелка-50 (3)", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + } +} diff --git a/Excavator/Excavator/Properties/Resources.resx b/Excavator/Excavator/Properties/Resources.resx new file mode 100644 index 0000000..e9aa919 --- /dev/null +++ b/Excavator/Excavator/Properties/Resources.resx @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + ..\Resources\arrowRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-стрелка-50 (3).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrowDown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrowLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-стрелка-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-стрелка-50 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-стрелка-50 (2).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrowUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + \ No newline at end of file diff --git a/Excavator/Excavator/Resources/arrowDown.png b/Excavator/Excavator/Resources/arrowDown.png new file mode 100644 index 0000000000000000000000000000000000000000..96a18d705d5f3df9d9121b59f2df131a555272ca GIT binary patch literal 359 zcmV-t0hs=YP)rTSSd5qQ(|cV~ePT!0YbZYhw)g_yxRS2uNwht*Zb4002ovPDHLk FV1jc9j{E=s literal 0 HcmV?d00001 diff --git a/Excavator/Excavator/Resources/arrowLeft.png b/Excavator/Excavator/Resources/arrowLeft.png new file mode 100644 index 0000000000000000000000000000000000000000..8f6aa3a9a123ae0f0915a42c446ed0f2ec1f875e GIT binary patch literal 340 zcmV-a0jvIrP)@Xf?}skd47W zA%joANEwt8gVNP4x9;GN>r&^O|NEUfQ(`bZ(ksihs@yc8$j}qCEWfHktAdUn|SSjNDeZE{f>bD zo|CSK1zabvc-7}?Z{RtBg{$8}Ca{~pqE%nWc>+sTe*w8D1u}`f5+LoL{iOs*-6C#E zfYeRnAc4iJ)|?vVBTBnv+?4=nj`2q&K#I9owOhqQ36SRTVbHNAyT-9o0;FjjPbEO= m=5dw#lW7!1Q4~dy{=Ea;hX>FIOUe%b0000i8vX*EUFz#YJ8`BzHz}>d&5!;;x`2Zf5?*2z6%qVJ0*&=FJfd>Ffd!{}n=`?(i?A8gc&Gqe|H{8c(sHo-cHyJEdU3P;ZKt_Y?oQJ|v6r&k0o9|&y~ z+!mdnmU<$vh2wVOst&g!9ZEUsWkrTSSd5qQ(|cV~ePT!0YbZYhw)g_yxRS2uNwht*Zb4002ovPDHLk FV1jc9j{E=s literal 0 HcmV?d00001 diff --git a/Excavator/Excavator/Resources/icons8-стрелка-50 (2).png b/Excavator/Excavator/Resources/icons8-стрелка-50 (2).png new file mode 100644 index 0000000000000000000000000000000000000000..8f6aa3a9a123ae0f0915a42c446ed0f2ec1f875e GIT binary patch literal 340 zcmV-a0jvIrP)@Xf?}skd47W zA%joANEwt8gVNP4x9;GN>r&^O|NEUfQ(`bZ(ksihs@yc8$j}qCEWfHktAdUn|SSjNDeZE{f>bD zo|CSK1zabvc-7}?Z{RtBg{$8}Ca{~pqE%nWc>+sTe*w8D1u}`f5+LoL{iOs*-6C#E zfYeRnAc4iJ)|?vVBTBnv+?4=nj`2q&K#I9owOhqQ36SRTVbHNAyT-9o0;FjjPbEO= m=5dw#lW7!1Q4~dy{=Ea;hX>FIOUe%b0000*&=FJfd>Ffd!{}n=`?(i?A8gc&Gqe|H{8c(sHo-cHyJEdU3P;ZKt_Y?oQJ|v6r&k0o9|&y~ z+!mdnmU<$vh2wVOst&g!9ZEUsWki8vX*EUFz#YJ8`BzHz}>d&5!;;x`2Zf5?*2z6%qVJ0 Date: Tue, 27 Feb 2024 09:22:15 +0400 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Excavator/Excavator/DrawningExcavator.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Excavator/Excavator/DrawningExcavator.cs b/Excavator/Excavator/DrawningExcavator.cs index 1057260..9d2f6ef 100644 --- a/Excavator/Excavator/DrawningExcavator.cs +++ b/Excavator/Excavator/DrawningExcavator.cs @@ -147,14 +147,14 @@ public class DrawningExcavator return true; // вправо case DirectionType.Right: - if (_startPosX.Value + _drawningExcavatorWidth + EntityExcavator.Step < _pictureWidth.Value) + if (_startPosX.Value + _drawningExcavatorWidth + EntityExcavator.Step < _pictureWidth) { _startPosX += (int)EntityExcavator.Step; } return true; //вниз case DirectionType.Down: - if (_startPosY.Value + _drawningExcavatorHeight + EntityExcavator.Step < _pictureHeight.Value) + if (_startPosY.Value + _drawningExcavatorHeight + EntityExcavator.Step < _pictureHeight) { _startPosY += (int)EntityExcavator.Step; } -- 2.25.1 From 228712e3ceab919edc82fd6dd69fbbedf86134d8 Mon Sep 17 00:00:00 2001 From: nikos77781 Date: Tue, 27 Feb 2024 09:25:01 +0400 Subject: [PATCH 3/3] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Excavator/Excavator/DrawningExcavator.cs | 2 - .../Properties/Resources.Designer.cs | 40 ------------------- Excavator/Excavator/Properties/Resources.resx | 12 ------ 3 files changed, 54 deletions(-) diff --git a/Excavator/Excavator/DrawningExcavator.cs b/Excavator/Excavator/DrawningExcavator.cs index 9d2f6ef..e2d84c7 100644 --- a/Excavator/Excavator/DrawningExcavator.cs +++ b/Excavator/Excavator/DrawningExcavator.cs @@ -102,8 +102,6 @@ public class DrawningExcavator { return; } - - _startPosX = x; _startPosY = y; diff --git a/Excavator/Excavator/Properties/Resources.Designer.cs b/Excavator/Excavator/Properties/Resources.Designer.cs index e94fa7a..51c3b56 100644 --- a/Excavator/Excavator/Properties/Resources.Designer.cs +++ b/Excavator/Excavator/Properties/Resources.Designer.cs @@ -99,45 +99,5 @@ namespace Excavator.Properties { return ((System.Drawing.Bitmap)(obj)); } } - - /// - /// Поиск локализованного ресурса типа System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap icons8_стрелка_50 { - get { - object obj = ResourceManager.GetObject("icons8-стрелка-50", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Поиск локализованного ресурса типа System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap icons8_стрелка_50__1_ { - get { - object obj = ResourceManager.GetObject("icons8-стрелка-50 (1)", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Поиск локализованного ресурса типа System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap icons8_стрелка_50__2_ { - get { - object obj = ResourceManager.GetObject("icons8-стрелка-50 (2)", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Поиск локализованного ресурса типа System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap icons8_стрелка_50__3_ { - get { - object obj = ResourceManager.GetObject("icons8-стрелка-50 (3)", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } } } diff --git a/Excavator/Excavator/Properties/Resources.resx b/Excavator/Excavator/Properties/Resources.resx index e9aa919..5466fc7 100644 --- a/Excavator/Excavator/Properties/Resources.resx +++ b/Excavator/Excavator/Properties/Resources.resx @@ -121,24 +121,12 @@ ..\Resources\arrowRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-стрелка-50 (3).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrowDown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\arrowLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-стрелка-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-стрелка-50 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-стрелка-50 (2).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrowUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a -- 2.25.1