diff --git a/ProjectExcavator/ProjectExcavator/DirectionType.cs b/ProjectExcavator/ProjectExcavator/DirectionType.cs
new file mode 100644
index 0000000..20f68ec
--- /dev/null
+++ b/ProjectExcavator/ProjectExcavator/DirectionType.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectExcavator;
+
+public enum DirectionType
+{
+ ///
+ /// Вверх
+ ///
+ Up = 1,
+
+ ///
+ /// Вниз
+ ///
+ Down = 2,
+
+ ///
+ /// Влево
+ ///
+ Left = 3,
+
+ ///
+ /// Вправо
+ ///
+ Right = 4
+}
diff --git a/ProjectExcavator/ProjectExcavator/DrawningExcavator.cs b/ProjectExcavator/ProjectExcavator/DrawningExcavator.cs
new file mode 100644
index 0000000..8c3f28d
--- /dev/null
+++ b/ProjectExcavator/ProjectExcavator/DrawningExcavator.cs
@@ -0,0 +1,328 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectExcavator;
+
+///
+/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+///
+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 = 135;
+
+ ///
+ /// Высота прорисовки Экскаватора
+ ///
+ private readonly int _drawningExcavatorHeight = 82;
+
+ ///
+ /// Инициализация свойств
+ ///
+ /// Скорость
+ /// Вес
+ /// Основной цвет
+ /// Дополнительный цвет
+ /// Признак наличия ковша
+ /// Признак наличия поддержки
+ public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bucket, bool supports)
+ {
+ EntityExcavator = new EntityExcavator();
+ EntityExcavator.Init(speed, weight, bodyColor, additionalColor, bucket,supports);
+ _pictureWidth = null;
+ _pictureHeight = null;
+ _startPosX = null;
+ _startPosY = null;
+ }
+
+ ///
+ /// Установка границ поля
+ ///
+ /// Ширина поля
+ /// Высота поля
+ /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах
+ public bool SetPictureSize(int width, int height)
+ {
+ //проверка, что объект "влезает" в размеры поля
+ if (_drawningExcavatorWidth > width || _drawningExcavatorHeight > height)
+ {
+ EntityExcavator = null;
+ return false;
+ }
+
+ // если влезает, сохраняем границы и корректируем позицию объекта, если она была уже установлена
+ else
+ {
+ _pictureWidth = width;
+ _pictureHeight = height;
+
+ if (_startPosX.HasValue && (_startPosX.Value + _drawningExcavatorWidth > _pictureWidth))
+ {
+ _startPosX = _pictureWidth - _drawningExcavatorWidth;
+ }
+
+ if (_startPosY.HasValue && (_startPosY + _drawningExcavatorHeight > _pictureHeight))
+ {
+ _startPosY = _pictureHeight - _drawningExcavatorHeight;
+ }
+
+ return true;
+ }
+ }
+
+ ///
+ /// Установка позиции
+ ///
+ /// Координата X
+ /// Координата Y
+ public void SetPosition(int x, int y)
+ {
+ // если при установке объекта в эти координаты, он будет "выходить" за границы формы
+ // то надо изменить координаты, чтобы он оставался в этих границах
+ _startPosX = x;
+ _startPosY = y;
+ if (_startPosX + _drawningExcavatorWidth > _pictureWidth)
+ {
+ _startPosX = _pictureWidth - _drawningExcavatorWidth;
+ }
+
+ if (_startPosX < 0)
+ {
+ _startPosX = 0;
+ }
+
+ if (_startPosY + _drawningExcavatorHeight > _pictureHeight)
+ {
+ _startPosY = _pictureHeight - _drawningExcavatorHeight;
+ }
+
+ if (_startPosY < 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 + EntityExcavator.Step < _pictureWidth - _drawningExcavatorWidth)
+ {
+ _startPosX += (int)EntityExcavator.Step;
+ }
+ return true;
+ //вниз
+ case DirectionType.Down:
+ if (_startPosY.Value + EntityExcavator.Step < _pictureHeight - _drawningExcavatorHeight)
+ {
+ _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);
+ Pen blackPen = new Pen(Color.Black, 2);
+ Brush brBrown = new SolidBrush(Color.DarkSlateGray);
+
+ //Ковш со стрелой
+ if (EntityExcavator.Bucket)
+ {
+ //стрела
+ Point point1 = new Point(_startPosX.Value + 70, _startPosY.Value + 11);
+ Point point2 = new Point(_startPosX.Value + 110, _startPosY.Value + 3);
+ Point point3 = new Point(_startPosX.Value + 120, _startPosY.Value + 4);
+ Point point4 = new Point(_startPosX.Value + 120, _startPosY.Value + 7);
+ Point point5 = new Point(_startPosX.Value + 70, _startPosY.Value + 28);
+ Point[] BucketPart1=
+ {
+ point1,
+ point2,
+ point3,
+ point4,
+ point5
+ };
+ g.DrawPolygon(blackPen, BucketPart1);
+ g.FillPolygon(additionalBrush, BucketPart1);
+
+ Point point6 = new Point(_startPosX.Value + 112, _startPosY.Value + 2);
+ Point point7 = new Point(_startPosX.Value + 120, _startPosY.Value + 3);
+ Point point8 = new Point(_startPosX.Value + 125, _startPosY.Value + 7);
+ Point point9 = new Point(_startPosX.Value + 135, _startPosY.Value + 35);
+ Point point10 = new Point(_startPosX.Value + 132, _startPosY.Value + 35);
+ Point[] BucketPart2 =
+ {
+ point6,
+ point7,
+ point8,
+ point9,
+ point10
+ };
+ g.DrawPolygon(pen, BucketPart2);
+ g.FillPolygon(additionalBrush, BucketPart2);
+
+ //ковш
+ Point point21 = new Point(_startPosX.Value + 130, _startPosY.Value + 35);
+ Point point22 = new Point(_startPosX.Value + 135, _startPosY.Value + 35);
+ Point point23 = new Point(_startPosX.Value + 135, _startPosY.Value + 40 );
+ Point point24 = new Point(_startPosX.Value + 125, _startPosY.Value + 45);
+ Point point25 = new Point(_startPosX.Value + 115, _startPosY.Value + 40);
+ Point[] BucketPart3 =
+ {
+ point21,
+ point22,
+ point23,
+ point24,
+ point25,
+ };
+ g.DrawPolygon(blackPen, BucketPart3);
+ g.FillPolygon(brBrown, BucketPart3);
+
+ //шарниры
+ g.DrawEllipse(pen, _startPosX.Value + 114, _startPosY.Value + 3, 6, 6);
+ g.FillEllipse(brBrown, _startPosX.Value + 114, _startPosY.Value + 3, 6, 6);
+
+ g.FillEllipse(brBrown, _startPosX.Value + 127, _startPosY.Value + 32, 6, 6);
+ }
+
+ //контур и заливка основы
+ Brush br = new SolidBrush(EntityExcavator.BodyColor);
+ g.FillRectangle(br, _startPosX.Value + 65, _startPosY.Value + 10, 25, 25);//кабина
+ g.DrawRectangle(pen, _startPosX.Value + 65, _startPosY.Value + 10, 25, 25);
+
+ g.FillRectangle(br, _startPosX.Value + 20, _startPosY.Value + 35, 70, 20);//основа
+ g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 35, 70, 20);
+
+ Brush brBlue = new SolidBrush(Color.LightBlue);
+ g.FillRectangle(brBlue, _startPosX.Value + 72, _startPosY.Value + 12, 15, 15);//окно
+ g.DrawRectangle(pen, _startPosX.Value + 72, _startPosY.Value + 12, 15, 15);
+
+ g.FillRectangle(br, _startPosX.Value + 40, _startPosY.Value + 13, 5, 22);//труба
+ g.DrawRectangle(pen, _startPosX.Value + 40, _startPosY.Value + 13, 5, 22);
+
+ g.FillEllipse(brBrown, _startPosX.Value + 17, _startPosY.Value + 59, 13, 13);//большое правое колесо
+ g.DrawEllipse(pen, _startPosX.Value + 17, _startPosY.Value + 59, 13, 13);
+
+ g.FillEllipse(brBrown, _startPosX.Value + 80, _startPosY.Value + 59, 13, 13);//большое левое колесо
+ g.DrawEllipse(pen, _startPosX.Value + 80, _startPosY.Value + 59, 13, 13);
+
+ g.FillEllipse(brBrown, _startPosX.Value + 34, _startPosY.Value + 63, 9, 9);//среднее правое колесо
+ g.DrawEllipse(pen, _startPosX.Value + 34, _startPosY.Value + 63, 9, 9);
+
+ g.FillEllipse(brBrown, _startPosX.Value + 50, _startPosY.Value + 63, 9, 9);//средние колесо в середине
+ g.DrawEllipse(pen, _startPosX.Value + 50, _startPosY.Value + 63, 9, 9);
+
+ g.FillEllipse(brBrown, _startPosX.Value + 66, _startPosY.Value + 63, 9, 9);//среднее левое колесо
+ g.DrawEllipse(pen, _startPosX.Value + 66, _startPosY.Value + 63, 9, 9);
+
+ g.FillEllipse(brBrown, _startPosX.Value + 44, _startPosY.Value + 59, 5, 5);//маленькое правое колесо
+ g.DrawEllipse(pen, _startPosX.Value + 44, _startPosY.Value + 59, 5, 5);
+
+ g.FillEllipse(brBrown, _startPosX.Value + 59, _startPosY.Value + 59, 5, 5);//маленькое левое колесо
+ g.DrawEllipse(pen, _startPosX.Value + 59, _startPosY.Value + 59, 5, 5);
+
+ //гусеницы
+ g.DrawArc(blackPen, _startPosX.Value + 14, _startPosY.Value + 56, 20, 20, 125, 125);//правая дуга
+ g.DrawArc(blackPen, _startPosX.Value + 76, _startPosY.Value + 56, 20, 20, 290, 125);//левая дуга
+ g.DrawLine(blackPen, _startPosX.Value + 20, _startPosY.Value + 57, _startPosX.Value + 90, _startPosY.Value + 57);
+ g.DrawLine(blackPen, _startPosX.Value + 19, _startPosY.Value + 74, _startPosX.Value + 91, _startPosY.Value + 74);
+
+ // Поддержка
+ if (EntityExcavator.Supports)
+ {
+ Point point1 = new Point(_startPosX.Value + 22 , _startPosY.Value + 55);
+ Point point2 = new Point(_startPosX.Value + 22, _startPosY.Value + 50);
+ Point point3 = new Point(_startPosX.Value + 15, _startPosY.Value + 50);
+ Point point4 = new Point(_startPosX.Value + 8 , _startPosY.Value + 80);
+ Point point5 = new Point(_startPosX.Value, _startPosY.Value + 82);
+ Point point6 = new Point(_startPosX.Value + 12, _startPosY.Value + 82);
+ Point[] BuckePoint =
+ {
+ point1,
+ point2,
+ point3,
+ point4,
+ point5,
+ point6
+ };
+ g.DrawPolygon(pen, BuckePoint);
+ g.FillPolygon(additionalBrush, BuckePoint);
+
+ g.DrawEllipse(blackPen, _startPosX.Value + 17, _startPosY.Value + 47, 6, 6);
+ g.FillEllipse(brBrown, _startPosX.Value + 17, _startPosY.Value + 47, 6, 6);
+ }
+
+
+ }
+}
diff --git a/ProjectExcavator/ProjectExcavator/EntityExcavator.cs b/ProjectExcavator/ProjectExcavator/EntityExcavator.cs
new file mode 100644
index 0000000..64c297b
--- /dev/null
+++ b/ProjectExcavator/ProjectExcavator/EntityExcavator.cs
@@ -0,0 +1,60 @@
+namespace ProjectExcavator;
+
+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 Supports { get; private set; }
+
+ ///
+ /// Шаг перемещения автомобиля
+ ///
+ public double Step => Speed * 100 / Weight;
+
+
+ ///
+ /// Инициализация полей объекта-класса спортивного автомобиля
+ ///
+ /// Скорость
+ /// Вес автомобиля
+ /// Основной цвет
+ /// Дополнительный цвет
+ /// Признак (опция) наличия ковша
+
+
+ public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bucket, bool supports)
+ {
+ Speed = speed;
+ Weight = weight;
+ BodyColor = bodyColor;
+ AdditionalColor = additionalColor;
+ Bucket = bucket;
+ Supports = supports;
+ }
+}
diff --git a/ProjectExcavator/ProjectExcavator/Form1.Designer.cs b/ProjectExcavator/ProjectExcavator/Form1.Designer.cs
deleted file mode 100644
index 451fd85..0000000
--- a/ProjectExcavator/ProjectExcavator/Form1.Designer.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-namespace ProjectExcavator
-{
- 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/ProjectExcavator/ProjectExcavator/Form1.cs b/ProjectExcavator/ProjectExcavator/Form1.cs
deleted file mode 100644
index 1eb2162..0000000
--- a/ProjectExcavator/ProjectExcavator/Form1.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace ProjectExcavator
-{
- public partial class Form1 : Form
- {
- public Form1()
- {
- InitializeComponent();
- }
- }
-}
\ No newline at end of file
diff --git a/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs b/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs
new file mode 100644
index 0000000..3512515
--- /dev/null
+++ b/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs
@@ -0,0 +1,133 @@
+namespace ProjectExcavator
+{
+ 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();
+ buttonDown = new Button();
+ buttonUp = 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(905, 597);
+ pictureBoxExcavator.TabIndex = 0;
+ pictureBoxExcavator.TabStop = false;
+ //
+ // buttonCreateExcavator
+ //
+ buttonCreateExcavator.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+ buttonCreateExcavator.Location = new Point(12, 540);
+ buttonCreateExcavator.Name = "buttonCreateExcavator";
+ buttonCreateExcavator.Size = new Size(100, 45);
+ buttonCreateExcavator.TabIndex = 0;
+ buttonCreateExcavator.Text = "Создать";
+ buttonCreateExcavator.Click += ButtonCreateExcavator_Click;
+ //
+ // buttonLeft
+ //
+ buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonLeft.BackgroundImage = Properties.Resources.white_Left_30;
+ buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
+ buttonLeft.Location = new Point(745, 540);
+ buttonLeft.Name = "buttonLeft";
+ buttonLeft.Size = new Size(45, 45);
+ buttonLeft.TabIndex = 1;
+ buttonLeft.UseVisualStyleBackColor = true;
+ buttonLeft.Click += ButtonMove_Click;
+ //
+ // buttonDown
+ //
+ buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonDown.BackgroundImage = Properties.Resources.white_arrow_30;
+ buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
+ buttonDown.Location = new Point(796, 540);
+ buttonDown.Name = "buttonDown";
+ buttonDown.Size = new Size(45, 45);
+ buttonDown.TabIndex = 2;
+ buttonDown.UseVisualStyleBackColor = true;
+ buttonDown.Click += ButtonMove_Click;
+ //
+ // buttonUp
+ //
+ buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonUp.BackgroundImage = Properties.Resources.white_UP;
+ buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
+ buttonUp.Location = new Point(796, 489);
+ buttonUp.Name = "buttonUp";
+ buttonUp.Size = new Size(45, 45);
+ buttonUp.TabIndex = 3;
+ buttonUp.UseVisualStyleBackColor = true;
+ buttonUp.Click += ButtonMove_Click;
+ //
+ // buttonRight
+ //
+ buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonRight.BackgroundImage = Properties.Resources.white_right_30;
+ buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
+ buttonRight.Location = new Point(847, 540);
+ buttonRight.Name = "buttonRight";
+ buttonRight.Size = new Size(45, 45);
+ buttonRight.TabIndex = 4;
+ buttonRight.UseVisualStyleBackColor = true;
+ buttonRight.Click += ButtonMove_Click;
+ //
+ // FormExcavator
+ //
+ AutoScaleDimensions = new SizeF(8F, 20F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(905, 597);
+ Controls.Add(buttonRight);
+ Controls.Add(buttonUp);
+ Controls.Add(buttonDown);
+ 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 buttonDown;
+ private Button buttonUp;
+ private Button buttonRight;
+ }
+}
\ No newline at end of file
diff --git a/ProjectExcavator/ProjectExcavator/FormExcavator.cs b/ProjectExcavator/ProjectExcavator/FormExcavator.cs
new file mode 100644
index 0000000..fefa2a2
--- /dev/null
+++ b/ProjectExcavator/ProjectExcavator/FormExcavator.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ProjectExcavator
+{
+ 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();
+ }
+ }
+ }
+}
diff --git a/ProjectExcavator/ProjectExcavator/Form1.resx b/ProjectExcavator/ProjectExcavator/FormExcavator.resx
similarity index 93%
rename from ProjectExcavator/ProjectExcavator/Form1.resx
rename to ProjectExcavator/ProjectExcavator/FormExcavator.resx
index 1af7de1..af32865 100644
--- a/ProjectExcavator/ProjectExcavator/Form1.resx
+++ b/ProjectExcavator/ProjectExcavator/FormExcavator.resx
@@ -1,17 +1,17 @@
-
diff --git a/ProjectExcavator/ProjectExcavator/Program.cs b/ProjectExcavator/ProjectExcavator/Program.cs
index c5b8144..59b8c54 100644
--- a/ProjectExcavator/ProjectExcavator/Program.cs
+++ b/ProjectExcavator/ProjectExcavator/Program.cs
@@ -11,7 +11,7 @@ namespace ProjectExcavator
// 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/ProjectExcavator/ProjectExcavator/ProjectExcavator.csproj b/ProjectExcavator/ProjectExcavator/ProjectExcavator.csproj
index e1a0735..244387d 100644
--- a/ProjectExcavator/ProjectExcavator/ProjectExcavator.csproj
+++ b/ProjectExcavator/ProjectExcavator/ProjectExcavator.csproj
@@ -8,4 +8,19 @@
enable
+
+
+ True
+ True
+ Resources.resx
+
+
+
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
\ No newline at end of file
diff --git a/ProjectExcavator/ProjectExcavator/Properties/Resources.Designer.cs b/ProjectExcavator/ProjectExcavator/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..eb11e90
--- /dev/null
+++ b/ProjectExcavator/ProjectExcavator/Properties/Resources.Designer.cs
@@ -0,0 +1,103 @@
+//------------------------------------------------------------------------------
+//
+// Этот код создан программой.
+// Исполняемая версия:4.0.30319.42000
+//
+// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+// повторной генерации кода.
+//
+//------------------------------------------------------------------------------
+
+namespace ProjectExcavator.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("ProjectExcavator.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 white_arrow_30 {
+ get {
+ object obj = ResourceManager.GetObject("white-arrow-30", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap white_Left_30 {
+ get {
+ object obj = ResourceManager.GetObject("white-Left-30", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap white_right_30 {
+ get {
+ object obj = ResourceManager.GetObject("white-right-30", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap white_UP {
+ get {
+ object obj = ResourceManager.GetObject("white-UP", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+ }
+}
diff --git a/ProjectExcavator/ProjectExcavator/Properties/Resources.resx b/ProjectExcavator/ProjectExcavator/Properties/Resources.resx
new file mode 100644
index 0000000..06e1200
--- /dev/null
+++ b/ProjectExcavator/ProjectExcavator/Properties/Resources.resx
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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\white-arrow-30.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\white-Left-30.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\white-right-30.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\white-UP.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
\ No newline at end of file
diff --git a/ProjectExcavator/ProjectExcavator/Resources/white-Left-30.png b/ProjectExcavator/ProjectExcavator/Resources/white-Left-30.png
new file mode 100644
index 0000000..a1b5b9e
Binary files /dev/null and b/ProjectExcavator/ProjectExcavator/Resources/white-Left-30.png differ
diff --git a/ProjectExcavator/ProjectExcavator/Resources/white-UP.png b/ProjectExcavator/ProjectExcavator/Resources/white-UP.png
new file mode 100644
index 0000000..438ba97
Binary files /dev/null and b/ProjectExcavator/ProjectExcavator/Resources/white-UP.png differ
diff --git a/ProjectExcavator/ProjectExcavator/Resources/white-arrow-30.png b/ProjectExcavator/ProjectExcavator/Resources/white-arrow-30.png
new file mode 100644
index 0000000..37e1d9b
Binary files /dev/null and b/ProjectExcavator/ProjectExcavator/Resources/white-arrow-30.png differ
diff --git a/ProjectExcavator/ProjectExcavator/Resources/white-right-30.png b/ProjectExcavator/ProjectExcavator/Resources/white-right-30.png
new file mode 100644
index 0000000..82b42d2
Binary files /dev/null and b/ProjectExcavator/ProjectExcavator/Resources/white-right-30.png differ