From 9b810760470cf9ec625d74911716955834ec34ab Mon Sep 17 00:00:00 2001
From: Oleg <volt.kei@mail.ru>
Date: Tue, 13 Sep 2022 11:17:44 +0400
Subject: [PATCH 1/5] =?UTF-8?q?Lab1.=20=D0=94=D0=BE=D0=B4=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=B0=D1=82=D1=8C=20=D0=B4=D0=BE=D0=BC=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Trolleybus/Trolleybus/Direction.cs            |  19 +++
 Trolleybus/Trolleybus/DrawingTrolleybus.cs    | 140 ++++++++++++++++++
 Trolleybus/Trolleybus/EntityTrolleybus.cs     |  46 ++++++
 Trolleybus/Trolleybus/Form1.Designer.cs       | 131 +++++++++++++++-
 Trolleybus/Trolleybus/Form1.cs                |  30 ++++
 Trolleybus/Trolleybus/Form1.resx              | 123 +++++++++++++++
 .../Properties/Resources.Designer.cs          | 107 ++++++++-----
 .../Trolleybus/Properties/Resources.resx      |  26 +++-
 Trolleybus/Trolleybus/Resources/down30.png    | Bin 0 -> 2030 bytes
 Trolleybus/Trolleybus/Resources/left30.png    | Bin 0 -> 2112 bytes
 Trolleybus/Trolleybus/Resources/right30.png   | Bin 0 -> 2138 bytes
 Trolleybus/Trolleybus/Resources/up30.png      | Bin 0 -> 1986 bytes
 Trolleybus/Trolleybus/Trolleybus.csproj       |  19 +++
 13 files changed, 598 insertions(+), 43 deletions(-)
 create mode 100644 Trolleybus/Trolleybus/Direction.cs
 create mode 100644 Trolleybus/Trolleybus/DrawingTrolleybus.cs
 create mode 100644 Trolleybus/Trolleybus/EntityTrolleybus.cs
 create mode 100644 Trolleybus/Trolleybus/Form1.resx
 create mode 100644 Trolleybus/Trolleybus/Resources/down30.png
 create mode 100644 Trolleybus/Trolleybus/Resources/left30.png
 create mode 100644 Trolleybus/Trolleybus/Resources/right30.png
 create mode 100644 Trolleybus/Trolleybus/Resources/up30.png

diff --git a/Trolleybus/Trolleybus/Direction.cs b/Trolleybus/Trolleybus/Direction.cs
new file mode 100644
index 0000000..68bfa63
--- /dev/null
+++ b/Trolleybus/Trolleybus/Direction.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Trolleybus
+{
+    /// <summary>
+    /// Направление перемещения
+    /// </summary>
+    internal enum Direction
+    {
+        Up = 1,
+        Down = 2,
+        Left = 3,
+        Right = 4
+    }
+}
diff --git a/Trolleybus/Trolleybus/DrawingTrolleybus.cs b/Trolleybus/Trolleybus/DrawingTrolleybus.cs
new file mode 100644
index 0000000..f1ac88b
--- /dev/null
+++ b/Trolleybus/Trolleybus/DrawingTrolleybus.cs
@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Drawing;
+
+namespace Trolleybus
+{
+    /// <summary>
+    /// Класс прорисовки и перемещения
+    /// </summary>
+    internal class DrawingTrolleybus
+    {
+        public EntityTrolleybus Trolleybus { get; private set; }
+        /// <summary>
+        /// левая координата отрисовки
+        /// </summary>
+        private float _startPosX;
+        /// <summary>
+        /// верхняя координата отрисовки
+        /// </summary>
+        private float _startPosY;
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private int? _pictureWidth = null;
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private int? _pictureHeight = null;
+        /// <summary>
+        /// Ширина отрисовки
+        /// </summary>
+        protected readonly int _trolleybusWidth = 0;
+        /// <summary>
+        /// Высота отрисовки
+        /// </summary>
+        protected readonly int _trolleybusHeight = 0;
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автомобиля</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        public void Init(int speed, float weight, Color bodyColor)
+        {
+            Trolleybus = new EntityTrolleybus();
+            Trolleybus.Init(speed, weight, bodyColor);
+        }
+        /// <summary>
+        /// Установка позиции
+        /// </summary>
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+        public void SetPosition(int x, int y, int width, int height)
+        {
+            _startPosX = x;
+            _startPosY = y;
+            _pictureWidth = width;
+            _pictureHeight = height;
+        }
+        /// <summary>
+        /// Изменение направвления перемещения
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        public void MoveTransport(Direction direction)
+        {
+            if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
+            {
+                return;
+            }
+            switch (direction)
+            {
+                //вправо
+                case Direction.Right:
+                    if(_startPosX + _trolleybusWidth + Trolleybus.Step< _pictureWidth)
+                    {
+                        _startPosX += Trolleybus.Step;
+                    }
+                    break;
+                //влево
+                case Direction.Left:
+                    if (_startPosX + _trolleybusWidth - Trolleybus.Step < _pictureWidth)
+                    {
+                        _startPosX += Trolleybus.Step;
+                    }
+                    break;
+                //вверх
+                case Direction.Up:
+                    if (_startPosX + _trolleybusWidth - Trolleybus.Step < _pictureHeight)
+                    {
+                        _startPosX += Trolleybus.Step;
+                    }
+                    break;
+                //вниз
+                case Direction.Down:
+                    if (_startPosX + _trolleybusWidth + Trolleybus.Step < _pictureHeight)
+                    {
+                        _startPosX += Trolleybus.Step;
+                    }
+                    break;
+            }
+        }
+        /// <summary>
+        /// Отрисовка троллейбуса
+        /// </summary>
+        /// <param name="g"></param>
+        public void DrawTransport(Graphics g)
+        {
+
+        }
+        /// <summary>
+        /// Смена границ формы отрисовки
+        /// </summary>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+        public void ChangeBorders(int width, int height)
+        {
+            _pictureWidth = width;
+            _pictureHeight = height;
+            if(_pictureWidth <= _trolleybusWidth || _pictureHeight <= _trolleybusHeight)
+            {
+                _pictureWidth = null;
+                _pictureHeight = null;
+                return;
+            }
+            if (_startPosX + _trolleybusWidth > _pictureWidth)
+            {
+                _startPosX = _pictureWidth.Value - _trolleybusWidth;
+            }
+            if (_startPosY + _trolleybusHeight > _pictureHeight)
+            {
+                _startPosY = _pictureHeight.Value - _trolleybusHeight;
+            }
+        }
+    }
+}
diff --git a/Trolleybus/Trolleybus/EntityTrolleybus.cs b/Trolleybus/Trolleybus/EntityTrolleybus.cs
new file mode 100644
index 0000000..686b943
--- /dev/null
+++ b/Trolleybus/Trolleybus/EntityTrolleybus.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Drawing;
+
+namespace Trolleybus
+{
+    /// <summary>
+    /// Класс-сущность "Троллейбус"
+    /// </summary>
+    internal class EntityTrolleybus
+    {
+        /// <summary>
+        /// Скорость
+        /// </summary>
+        public int Speed { get; private set; }
+        /// <summary>
+        /// Вес
+        /// </summary>
+        public float Weight { get; private set; }
+        /// <summary>
+        /// Цвет кузова
+        /// </summary>
+        public Color BodyColor { get; private set; }
+        /// <summary>
+        /// Шаг перемещения троллейбуса
+        /// </summary>
+        public float Step => Speed * 100 / Weight;
+        /// <summary>
+        /// Инициализация полей объекта-класса троллейбуса
+        /// </summary>
+        /// <param name="speed"></param>
+        /// <param name="weight"></param>
+        /// <param name="bodyColor"></param>
+        /// <returns></returns>
+        public void Init(int speed, float weight, Color bodyColor)
+        {
+            Random rnd = new Random();
+            Speed = speed <= 0? rnd.Next(50, 150): speed;
+            Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
+            bodyColor = bodyColor;
+        }
+    }
+}
diff --git a/Trolleybus/Trolleybus/Form1.Designer.cs b/Trolleybus/Trolleybus/Form1.Designer.cs
index b2e84f3..29311d9 100644
--- a/Trolleybus/Trolleybus/Form1.Designer.cs
+++ b/Trolleybus/Trolleybus/Form1.Designer.cs
@@ -29,13 +29,142 @@ namespace Trolleybus
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
+            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
+            this.buttonCreate = new System.Windows.Forms.Button();
+            this.button5 = new System.Windows.Forms.Button();
+            this.button4 = new System.Windows.Forms.Button();
+            this.button3 = new System.Windows.Forms.Button();
+            this.button2 = new System.Windows.Forms.Button();
+            this.pictureBoxTrolleybus = new System.Windows.Forms.PictureBox();
+            this.statusStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTrolleybus)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // statusStrip1
+            // 
+            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripStatusLabelSpeed,
+            this.toolStripStatusLabelWeight,
+            this.toolStripStatusLabelBodyColor});
+            this.statusStrip1.Location = new System.Drawing.Point(0, 428);
+            this.statusStrip1.Name = "statusStrip1";
+            this.statusStrip1.Size = new System.Drawing.Size(800, 22);
+            this.statusStrip1.TabIndex = 1;
+            this.statusStrip1.Text = "statusStrip1";
+            // 
+            // toolStripStatusLabelSpeed
+            // 
+            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
+            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(59, 17);
+            this.toolStripStatusLabelSpeed.Text = "Скорость";
+            // 
+            // toolStripStatusLabelWeight
+            // 
+            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
+            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(26, 17);
+            this.toolStripStatusLabelWeight.Text = "Вес";
+            // 
+            // toolStripStatusLabelBodyColor
+            // 
+            this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
+            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(33, 17);
+            this.toolStripStatusLabelBodyColor.Text = "Цвет";
+            // 
+            // buttonCreate
+            // 
+            this.buttonCreate.Location = new System.Drawing.Point(12, 395);
+            this.buttonCreate.Name = "buttonCreate";
+            this.buttonCreate.Size = new System.Drawing.Size(75, 23);
+            this.buttonCreate.TabIndex = 2;
+            this.buttonCreate.Text = "Создать";
+            this.buttonCreate.UseVisualStyleBackColor = true;
+            this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
+            // 
+            // button5
+            // 
+            this.button5.BackgroundImage = global::Trolleybus.Properties.Resources.up30;
+            this.button5.Location = new System.Drawing.Point(722, 359);
+            this.button5.Name = "button5";
+            this.button5.Size = new System.Drawing.Size(30, 30);
+            this.button5.TabIndex = 6;
+            this.button5.Text = "button5";
+            this.button5.UseVisualStyleBackColor = true;
+            // 
+            // button4
+            // 
+            this.button4.Image = global::Trolleybus.Properties.Resources.right30;
+            this.button4.Location = new System.Drawing.Point(758, 395);
+            this.button4.Name = "button4";
+            this.button4.Size = new System.Drawing.Size(30, 30);
+            this.button4.TabIndex = 5;
+            this.button4.Text = "button4";
+            this.button4.UseVisualStyleBackColor = true;
+            // 
+            // button3
+            // 
+            this.button3.BackgroundImage = global::Trolleybus.Properties.Resources.left30;
+            this.button3.Location = new System.Drawing.Point(686, 395);
+            this.button3.Name = "button3";
+            this.button3.Size = new System.Drawing.Size(30, 30);
+            this.button3.TabIndex = 4;
+            this.button3.Text = "button3";
+            this.button3.UseVisualStyleBackColor = true;
+            // 
+            // button2
+            // 
+            this.button2.Image = global::Trolleybus.Properties.Resources.down30;
+            this.button2.Location = new System.Drawing.Point(722, 395);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(30, 30);
+            this.button2.TabIndex = 3;
+            this.button2.Text = "button2";
+            this.button2.UseVisualStyleBackColor = true;
+            // 
+            // pictureBoxTrolleybus
+            // 
+            this.pictureBoxTrolleybus.Location = new System.Drawing.Point(0, 0);
+            this.pictureBoxTrolleybus.Name = "pictureBoxTrolleybus";
+            this.pictureBoxTrolleybus.Size = new System.Drawing.Size(800, 425);
+            this.pictureBoxTrolleybus.TabIndex = 0;
+            this.pictureBoxTrolleybus.TabStop = false;
+            // 
+            // Form1
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.button5);
+            this.Controls.Add(this.button4);
+            this.Controls.Add(this.button3);
+            this.Controls.Add(this.button2);
+            this.Controls.Add(this.buttonCreate);
+            this.Controls.Add(this.statusStrip1);
+            this.Controls.Add(this.pictureBoxTrolleybus);
+            this.Name = "Form1";
             this.Text = "Form1";
+            this.statusStrip1.ResumeLayout(false);
+            this.statusStrip1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTrolleybus)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
         }
 
         #endregion
+
+        private System.Windows.Forms.PictureBox pictureBoxTrolleybus;
+        private System.Windows.Forms.StatusStrip statusStrip1;
+        private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelSpeed;
+        private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelWeight;
+        private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelBodyColor;
+        private System.Windows.Forms.Button buttonCreate;
+        private System.Windows.Forms.Button button2;
+        private System.Windows.Forms.Button button3;
+        private System.Windows.Forms.Button button4;
+        private System.Windows.Forms.Button button5;
     }
 }
 
diff --git a/Trolleybus/Trolleybus/Form1.cs b/Trolleybus/Trolleybus/Form1.cs
index ff03b79..7455084 100644
--- a/Trolleybus/Trolleybus/Form1.cs
+++ b/Trolleybus/Trolleybus/Form1.cs
@@ -12,9 +12,39 @@ namespace Trolleybus
 {
     public partial class Form1 : Form
     {
+        private DrawingTrolleybus _trolleybus;
         public Form1()
         {
             InitializeComponent();
         }
+        /// <summary>
+        /// Метод прорисовки троллейбуса 
+        /// </summary>
+
+        private void Draw()
+        {
+            Bitmap bmp = new Bitmap(pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _trolleybus?.DrawTransport(gr);
+            pictureBoxTrolleybus.Image = bmp;
+        }
+
+        /// <summary>
+        /// Обработка нажатия "Создать"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+
+        private void buttonCreate_Click(object sender, EventArgs e)
+        {
+            Random rnd = new Random();
+            _trolleybus = new DrawingTrolleybus();
+            _trolleybus.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            _trolleybus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height);
+            toolStripStatusLabelSpeed.Text = $"Скорость: {_trolleybus.Trolleybus.Speed}";
+            toolStripStatusLabelWeight.Text = $"Вес: {_trolleybus.Trolleybus.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Цвет: {_trolleybus.Trolleybus.BodyColor.Name}";
+            Draw();
+        }
     }
 }
diff --git a/Trolleybus/Trolleybus/Form1.resx b/Trolleybus/Trolleybus/Form1.resx
new file mode 100644
index 0000000..174ebc7
--- /dev/null
+++ b/Trolleybus/Trolleybus/Form1.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Trolleybus/Trolleybus/Properties/Resources.Designer.cs b/Trolleybus/Trolleybus/Properties/Resources.Designer.cs
index 2f95526..f10ee69 100644
--- a/Trolleybus/Trolleybus/Properties/Resources.Designer.cs
+++ b/Trolleybus/Trolleybus/Properties/Resources.Designer.cs
@@ -1,70 +1,103 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программным средством.
-//     Версия среды выполнения: 4.0.30319.42000
+//     Этот код создан программой.
+//     Исполняемая версия:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильному поведению и будут утрачены, если
-//     код создан повторно.
+//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     повторной генерации кода.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-
-namespace Trolleybus.Properties
-{
+namespace Trolleybus.Properties {
+    using System;
+    
+    
     /// <summary>
-    ///   Класс ресурсов со строгим типом для поиска локализованных строк и пр.
+    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
     /// </summary>
-    // Этот класс был автоматически создан при помощи StronglyTypedResourceBuilder
-    // класс с помощью таких средств, как ResGen или Visual Studio.
-    // Для добавления или удаления члена измените файл .ResX, а затем перезапустите ResGen
-    // с параметром /str или заново постройте свой VS-проект.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    // Этот класс создан автоматически классом 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
-    {
-
+    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()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
-        ///   Возврат кэшированного экземпляра ResourceManager, используемого этим классом.
+        ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Trolleybus.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
-        ///   Переопределяет свойство CurrentUICulture текущего потока для всех
-        ///   подстановки ресурсов с помощью этого класса ресурсов со строгим типом.
+        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
+        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap down30 {
+            get {
+                object obj = ResourceManager.GetObject("down30", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap left30 {
+            get {
+                object obj = ResourceManager.GetObject("left30", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap right30 {
+            get {
+                object obj = ResourceManager.GetObject("right30", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap up30 {
+            get {
+                object obj = ResourceManager.GetObject("up30", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }
diff --git a/Trolleybus/Trolleybus/Properties/Resources.resx b/Trolleybus/Trolleybus/Properties/Resources.resx
index af7dbeb..b5cfe0a 100644
--- a/Trolleybus/Trolleybus/Properties/Resources.resx
+++ b/Trolleybus/Trolleybus/Properties/Resources.resx
@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
@@ -68,9 +69,10 @@
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="name" use="required" type="xsd:string" />
               <xsd:attribute name="type" type="xsd:string" />
               <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
@@ -85,9 +87,10 @@
                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -109,9 +112,22 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="down30" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\down30.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="left30" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\left30.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="up30" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\up30.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="right30" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\right30.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Trolleybus/Trolleybus/Resources/down30.png b/Trolleybus/Trolleybus/Resources/down30.png
new file mode 100644
index 0000000000000000000000000000000000000000..51b090e913d382bba3b2ba6616ca0dc4e6c69df9
GIT binary patch
literal 2030
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
R6!^a&Cwo`B3PeES{{Z$Lr(*yB

literal 0
HcmV?d00001

diff --git a/Trolleybus/Trolleybus/Resources/left30.png b/Trolleybus/Trolleybus/Resources/left30.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5ac6028cea42ab483b42153f73621676139fd97
GIT binary patch
literal 2112
zcmai#`#%$GAIG;aD@~<4F~@GoVNNkyk!j3f7IM0CM>!=kW-@Kg8c&3riuBB)mDBxb
zDwbYJ%pG#8STk}eryMe;i5W)E`Ujrphwt@yeXgIb>-&0r-k+@VZcdPW(0u>^0D^VK
zcuJN2Yrr7s>G9L!s8nRgc35vP7(6oJJ}$LDvZs?Bpsq*#yVS^rp<U4c!1H_sNsye>
z?~Qi;lMDbTw*MMnF-%cSdZ`-g;2Y~jx*AIjiU|c!sZ^8js0eaMP;{sXDJHCR=?oMA
zkY{2sXz#eoi(eA)xvA>%E4`bGX&wHEYW>2RL#4P~vzsyR?*#u*G-F-?F7z~NeRQPK
znWs<0ctmZ6;CGn_UG^*GEPgv8(s+1%mYg*6Qlpn*lGrjfyNT-E_E|ndvYwR?TB);<
zJ*Rv3#!Bn}**iL^d-QKIY04^4JnetT#0aza-aXz8pp5=OFt@uHHcdhw2|)c-R$T1h
z<Kx3isb#S$*=%@tAad->W8oWLao6D6%mdS4@0EV8IB0dYx185h`}Apv&iOW^J<i#=
zKqq2xaWO{LP#lbxkypHZO1I^u%=I(2Y(C$cKp@-!xe3>}84xwc+}vCq2V15wT;uV0
zPVo6Dj}u;|K79XV$lTPsd>#jK2FVsqz3bcFSgxe`#S!pc)oztY(pP60r0@gx>WBMi
z_i|J*C~7K;`H^m!qiK_%3mNSaGmS5@Zy6dIR?z%ZZP=B#65is-%Su|Qsx^Cb)W7N4
zR0cfSS|_uSvUss6W;z>gM!RM|(i~5o>wg}o{5YeLID#-VF}Vjiaq=oYabu}c`WBo_
zpUO#gy8Ho85065)S)m}4GRHk;Xk=6bs)||Xx-m|n6GaP!pcCXpZV%(Mz2D2IVo()%
zn%nch+DT4Mj>l2(N3v@#JoQXTX@Rfoy8vN5d2;)nX@Ci&x!uwpW@=i^V5o<WTh^&u
z3=KVQ?ECC2-2w!G>N-74o6?JqU;Vb%wG`n>C!1SX*e^2(L}GC(ElybaTrfXxw>)+#
zQ4~361k6)pH8okS*{U?>>dg#t#jd)|aVw~lEp8!Gm}s&Yv`<1yh4WBsIvol<9a8~c
zNe?uuq2iOW_n@>u;`~OYP&HY+<}vPmF+()<?tlvxTL?<2NWv%WX?70tlU?>g!5P>?
z_j%P1l@1@C220$AxLfN2CnAx^<182LC$5aQ@kd9EAZOdSyuQA_m`pU3Luyncw%<C$
z3|j>LJ%oUxNDI~O<rTo#u=iYZbMxr0zH>h1nTYt+D+xPWFW`WPWGJ*8DH>`B;{g(s
zH@H`O%W{8o+VLl$!;;M(-@m>|<N+RWdari||8wWKWK=(`U3tjedv$g72}u_Hy9464
zPxJk?ED`|yC~KkSf*K<7S&MlZMs3J5zmYT+mFys!b-Z2=_nNxg*rJry4jtkLh?d7l
z$#Sw;diAwYidv}1<RIBBWIf9^Pt%5wjF$b5yAp7$qoZTss9iyeBVyp%#NToP1?^iJ
z6NQ&rQ@(8FfP=mE7#kaFV6oWNJRl#7$K%BtZRzr!Kt5PDy)Cb|+!iNyUZ;S;7^Q6l
zrV)OgD@R>Y1pd|(|D$S}v=<y4AudP8kjbppTiTSHnVt0w4J^|e+7t{$*_^uMFHkt<
z9H67NEki<~i!h@8kM*JNpP1g(7CJVrm-y8F@n--KJ(;!8?TJRy){7774s=x|utVP~
z3t+!H8x`8D6F%2n8o1zCfY<TMu6g#1y9GL^OYh2i<mv5wC0PfoWKhqnnfM5E_AlIN
z|Mu;ly93A!Z5xNi!wq-tC<)Xs2Wz{cCS!z?4gxiYf|ahTla$3_OM#kWL0#dSwY`_m
zWMQ(2T94y4mM+mP!t&rZmLhkWd%C+_x_f%=fmUosY*j?k1pf=!eD>7w^0Sipei+>>
zC=Cv9un!@PwNzf4>cq;ldLiJViMR4ln*=s|#iG(aB%mdU8EB>tk+^Jf2VauL@N--y
zkCV^dpKFOgcoGQzfv>0$?L(w%FJdr^AQFs#tMYSJNlD2rHO+Qyd2FmKzbVf_``|;7
zNW>lFXo-J_UL0U~MMS_lXATPnSbaaas!?49$JTbXsnXEhJ>mLjex5L!*_m-b%k9OB
z7d*!Gg~5|9=g#f7X||V$x8G@HqC&fi&Qm+Mz6l9d{r&w|avrWlqikxh7e67^BrXg-
z=P~*Q22MBy>V4jyD?BWW>(4~KBH$M~a*o2UO=7~wkJPC_6L%%2KQc~xLE~t!%uXqy
z@L!wbd7Rif4d^cf+*CN~B6Igu0)AnD<yTZvq6axQy~TWvD>3;*w~VNuW!+YR!VC<U
zxoSukDUdASlzG0v@GEjP+$_t(KEx?coteBX!peB5AmNm84(&Wgy)NF<MpNRFqhU>P
zZjisMSDo?6K17<pDk)B|0_***5FIV6*OOxy91bUCtZHih!1vYZ_w3+~ec{5lHgss2
zDij8TJ^n=}VH=lkw##g&mHw&kfi<;)RvI_2$?DtL-k3`H_o1av{FQH9Umu?%p`oGJ
z9L<cXjA~7**WDjJRFs$oxX4t;Q}9MQI_c63>p>XbzB5mzSf{wU=E9@1!%`g;E(8R)
zhlhvr5@zm_GAS*p(3}}{q6!__0)+||)rk+ntoCfj?}o9Xr9opR8t*zB^Ov$zo%SV(
znm^FL`C~SGXKP)GpK}HV27EqWHvss0GXeiFe_7M2P4)jYptK!9n4iEcrTGobBPdI0
PqXV!GZkRf|z_kAY>$LR@

literal 0
HcmV?d00001

diff --git a/Trolleybus/Trolleybus/Resources/right30.png b/Trolleybus/Trolleybus/Resources/right30.png
new file mode 100644
index 0000000000000000000000000000000000000000..26c7b47bf9541857ebddeccd1c0e6df8cf3a6a8a
GIT binary patch
literal 2138
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
ZuQah{=bpc4-v|En5CULtRe|@U{vVBA1pNR2

literal 0
HcmV?d00001

diff --git a/Trolleybus/Trolleybus/Resources/up30.png b/Trolleybus/Trolleybus/Resources/up30.png
new file mode 100644
index 0000000000000000000000000000000000000000..286e01aa95d47a45cd3a3b2e27677d1b9049fa83
GIT binary patch
literal 1986
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

literal 0
HcmV?d00001

diff --git a/Trolleybus/Trolleybus/Trolleybus.csproj b/Trolleybus/Trolleybus/Trolleybus.csproj
index 5cb518c..ce41cd2 100644
--- a/Trolleybus/Trolleybus/Trolleybus.csproj
+++ b/Trolleybus/Trolleybus/Trolleybus.csproj
@@ -46,6 +46,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Direction.cs" />
+    <Compile Include="DrawingTrolleybus.cs" />
+    <Compile Include="EntityTrolleybus.cs" />
     <Compile Include="Form1.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -54,6 +57,9 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Form1.resx">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -62,6 +68,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -76,5 +83,17 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\up30.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\left30.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\down30.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\right30.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

From 717fbc3ca5c5dc6d037b5420a20a1c2d3c62fbd8 Mon Sep 17 00:00:00 2001
From: Oleg <ocelot1401@gmail.com>
Date: Sat, 17 Sep 2022 18:06:08 +0400
Subject: [PATCH 2/5] intermediate  1

---
 Trolleybus/Trolleybus/DrawingTrolleybus.cs | 31 +++++++++++++++++++++-
 Trolleybus/Trolleybus/Form1.Designer.cs    | 22 +++++++--------
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/Trolleybus/Trolleybus/DrawingTrolleybus.cs b/Trolleybus/Trolleybus/DrawingTrolleybus.cs
index f1ac88b..5ba3a9d 100644
--- a/Trolleybus/Trolleybus/DrawingTrolleybus.cs
+++ b/Trolleybus/Trolleybus/DrawingTrolleybus.cs
@@ -110,7 +110,36 @@ namespace Trolleybus
         /// <param name="g"></param>
         public void DrawTransport(Graphics g)
         {
-
+            if (_startPosX < 0 || _startPosY < 0
+               || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
+            {
+                return;
+            }
+            Pen pen = new Pen(Color.Black);
+            Brush brBlue = new SolidBrush(Color.LightBlue);
+            Brush dBlue = new SolidBrush(Color.DarkBlue);
+            Brush bWhite = new SolidBrush(Color.White);
+            g.DrawRectangle(pen, _startPosX, _startPosY, 200, 50);
+            g.DrawRectangle(pen, _startPosX + 100, _startPosY + 10, 20, 40);
+            Pen WinBlue = new Pen(Color.Blue);
+            g.FillEllipse(brBlue, _startPosX, _startPosY + 5, 20, 25);
+            g.DrawEllipse(WinBlue, _startPosX, _startPosY + 5, 20, 25);
+            g.FillEllipse(brBlue, _startPosX + 25, _startPosY + 5, 20, 25);
+            g.DrawEllipse(WinBlue, _startPosX + 25, _startPosY + 5, 20, 25);
+            g.FillEllipse(brBlue, _startPosX + 50, _startPosY + 5, 20, 25);
+            g.DrawEllipse(WinBlue, _startPosX + 50, _startPosY + 5, 20, 25);
+            g.FillEllipse(brBlue, _startPosX + 75, _startPosY + 5, 20, 25);
+            g.DrawEllipse(WinBlue, _startPosX + 75, _startPosY + 5, 20, 25);
+            g.FillEllipse(brBlue, _startPosX + 120, _startPosY + 5, 20, 25);
+            g.DrawEllipse(WinBlue, _startPosX + 120, _startPosY + 5, 20, 25);
+            g.FillEllipse(brBlue, _startPosX + 145, _startPosY + 5, 20, 25);
+            g.DrawEllipse(WinBlue, _startPosX + 145, _startPosY + 5, 20, 25);
+            g.FillEllipse(brBlue, _startPosX + 170, _startPosY + 5, 20, 25);
+            g.DrawEllipse(WinBlue, _startPosX + 170, _startPosY + 5, 20, 25);
+            g.FillEllipse(bWhite, _startPosX, _startPosY + 40, 30, 30);
+            g.DrawEllipse(pen, _startPosX, _startPosY + 40, 30, 30);
+            g.FillEllipse(bWhite, _startPosX + 170, _startPosY + 40, 30, 30);
+            g.DrawEllipse(pen, _startPosX + 170, _startPosY + 40, 30, 30);
         }
         /// <summary>
         /// Смена границ формы отрисовки
diff --git a/Trolleybus/Trolleybus/Form1.Designer.cs b/Trolleybus/Trolleybus/Form1.Designer.cs
index 29311d9..753eeea 100644
--- a/Trolleybus/Trolleybus/Form1.Designer.cs
+++ b/Trolleybus/Trolleybus/Form1.Designer.cs
@@ -75,7 +75,7 @@ namespace Trolleybus
             // 
             // buttonCreate
             // 
-            this.buttonCreate.Location = new System.Drawing.Point(12, 395);
+            this.buttonCreate.Location = new System.Drawing.Point(12, 390);
             this.buttonCreate.Name = "buttonCreate";
             this.buttonCreate.Size = new System.Drawing.Size(75, 23);
             this.buttonCreate.TabIndex = 2;
@@ -86,41 +86,41 @@ namespace Trolleybus
             // button5
             // 
             this.button5.BackgroundImage = global::Trolleybus.Properties.Resources.up30;
-            this.button5.Location = new System.Drawing.Point(722, 359);
+            this.button5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.button5.Location = new System.Drawing.Point(729, 347);
             this.button5.Name = "button5";
             this.button5.Size = new System.Drawing.Size(30, 30);
             this.button5.TabIndex = 6;
-            this.button5.Text = "button5";
             this.button5.UseVisualStyleBackColor = true;
             // 
             // button4
             // 
-            this.button4.Image = global::Trolleybus.Properties.Resources.right30;
-            this.button4.Location = new System.Drawing.Point(758, 395);
+            this.button4.BackgroundImage = global::Trolleybus.Properties.Resources.right30;
+            this.button4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.button4.Location = new System.Drawing.Point(765, 383);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(30, 30);
             this.button4.TabIndex = 5;
-            this.button4.Text = "button4";
             this.button4.UseVisualStyleBackColor = true;
             // 
             // button3
             // 
             this.button3.BackgroundImage = global::Trolleybus.Properties.Resources.left30;
-            this.button3.Location = new System.Drawing.Point(686, 395);
+            this.button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.button3.Location = new System.Drawing.Point(693, 383);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(30, 30);
             this.button3.TabIndex = 4;
-            this.button3.Text = "button3";
             this.button3.UseVisualStyleBackColor = true;
             // 
             // button2
             // 
-            this.button2.Image = global::Trolleybus.Properties.Resources.down30;
-            this.button2.Location = new System.Drawing.Point(722, 395);
+            this.button2.BackgroundImage = global::Trolleybus.Properties.Resources.down30;
+            this.button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.button2.Location = new System.Drawing.Point(729, 383);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(30, 30);
             this.button2.TabIndex = 3;
-            this.button2.Text = "button2";
             this.button2.UseVisualStyleBackColor = true;
             // 
             // pictureBoxTrolleybus

From 9b74a54dbfa8c877ebe55be666bd7b4eb2b6cf2f Mon Sep 17 00:00:00 2001
From: Oleg <ocelot1401@gmail.com>
Date: Sat, 17 Sep 2022 20:19:26 +0400
Subject: [PATCH 3/5] Intermediate 2

---
 Trolleybus/Trolleybus/DrawingTrolleybus.cs | 32 +++++---
 Trolleybus/Trolleybus/Form1.Designer.cs    | 96 +++++++++++-----------
 Trolleybus/Trolleybus/Form1.cs             | 30 ++++++-
 3 files changed, 101 insertions(+), 57 deletions(-)

diff --git a/Trolleybus/Trolleybus/DrawingTrolleybus.cs b/Trolleybus/Trolleybus/DrawingTrolleybus.cs
index 5ba3a9d..e50e156 100644
--- a/Trolleybus/Trolleybus/DrawingTrolleybus.cs
+++ b/Trolleybus/Trolleybus/DrawingTrolleybus.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Drawing;
+using System.Windows.Forms;
 
 namespace Trolleybus
 {
@@ -22,6 +23,14 @@ namespace Trolleybus
         /// </summary>
         private float _startPosY;
         /// <summary>
+        /// левая координата начала отрисовки
+        /// </summary>
+        private float _startX;
+        /// <summary>
+        /// Верхняя координата начала отрисовки
+        /// </summary>
+        private float _startY;
+        /// <summary>
         /// Ширина окна отрисовки
         /// </summary>
         private int? _pictureWidth = null;
@@ -32,11 +41,11 @@ namespace Trolleybus
         /// <summary>
         /// Ширина отрисовки
         /// </summary>
-        protected readonly int _trolleybusWidth = 0;
+        protected readonly int _trolleybusWidth = 200;
         /// <summary>
         /// Высота отрисовки
         /// </summary>
-        protected readonly int _trolleybusHeight = 0;
+        protected readonly int _trolleybusHeight = 50;
         /// <summary>
         /// Инициализация свойств
         /// </summary>
@@ -55,10 +64,13 @@ namespace Trolleybus
         /// <param name="y">Координата Y</param>
         /// <param name="width">Ширина картинки</param>
         /// <param name="height">Высота картинки</param>
-        public void SetPosition(int x, int y, int width, int height)
+//        public void SetPosition(int x, int y, int startX, int startY, int width, int height)
+        public void SetPosition(int x, int y, int startX, int startY, int width, int height)
         {
             _startPosX = x;
             _startPosY = y;
+            _startX = startX;
+            _startY = startY;
             _pictureWidth = width;
             _pictureHeight = height;
         }
@@ -76,30 +88,30 @@ namespace Trolleybus
             {
                 //вправо
                 case Direction.Right:
-                    if(_startPosX + _trolleybusWidth + Trolleybus.Step< _pictureWidth)
+                    if(_startPosX + _trolleybusWidth + Trolleybus.Step < _pictureWidth)
                     {
                         _startPosX += Trolleybus.Step;
                     }
                     break;
                 //влево
                 case Direction.Left:
-                    if (_startPosX + _trolleybusWidth - Trolleybus.Step < _pictureWidth)
+                    if (_startPosX > _startX)
                     {
-                        _startPosX += Trolleybus.Step;
+                        _startPosX -= Trolleybus.Step;
                     }
                     break;
                 //вверх
                 case Direction.Up:
-                    if (_startPosX + _trolleybusWidth - Trolleybus.Step < _pictureHeight)
+                    if (_startPosY > _startY)
                     {
-                        _startPosX += Trolleybus.Step;
+                        _startPosY -= Trolleybus.Step;
                     }
                     break;
                 //вниз
                 case Direction.Down:
-                    if (_startPosX + _trolleybusWidth + Trolleybus.Step < _pictureHeight)
+                    if (_startPosY + _trolleybusHeight + Trolleybus.Step < _pictureHeight)
                     {
-                        _startPosX += Trolleybus.Step;
+                        _startPosY += Trolleybus.Step;
                     }
                     break;
             }
diff --git a/Trolleybus/Trolleybus/Form1.Designer.cs b/Trolleybus/Trolleybus/Form1.Designer.cs
index 753eeea..7160c1d 100644
--- a/Trolleybus/Trolleybus/Form1.Designer.cs
+++ b/Trolleybus/Trolleybus/Form1.Designer.cs
@@ -34,10 +34,10 @@ namespace Trolleybus
             this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
             this.buttonCreate = new System.Windows.Forms.Button();
-            this.button5 = new System.Windows.Forms.Button();
-            this.button4 = new System.Windows.Forms.Button();
-            this.button3 = new System.Windows.Forms.Button();
-            this.button2 = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
             this.pictureBoxTrolleybus = new System.Windows.Forms.PictureBox();
             this.statusStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTrolleybus)).BeginInit();
@@ -83,51 +83,55 @@ namespace Trolleybus
             this.buttonCreate.UseVisualStyleBackColor = true;
             this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
             // 
-            // button5
+            // buttonUp
             // 
-            this.button5.BackgroundImage = global::Trolleybus.Properties.Resources.up30;
-            this.button5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.button5.Location = new System.Drawing.Point(729, 347);
-            this.button5.Name = "button5";
-            this.button5.Size = new System.Drawing.Size(30, 30);
-            this.button5.TabIndex = 6;
-            this.button5.UseVisualStyleBackColor = true;
+            this.buttonUp.BackgroundImage = global::Trolleybus.Properties.Resources.up30;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(729, 347);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(30, 30);
+            this.buttonUp.TabIndex = 6;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
-            // button4
+            // buttonRight
             // 
-            this.button4.BackgroundImage = global::Trolleybus.Properties.Resources.right30;
-            this.button4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.button4.Location = new System.Drawing.Point(765, 383);
-            this.button4.Name = "button4";
-            this.button4.Size = new System.Drawing.Size(30, 30);
-            this.button4.TabIndex = 5;
-            this.button4.UseVisualStyleBackColor = true;
+            this.buttonRight.BackgroundImage = global::Trolleybus.Properties.Resources.right30;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(765, 383);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            this.buttonRight.TabIndex = 5;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
-            // button3
+            // buttonLeft
             // 
-            this.button3.BackgroundImage = global::Trolleybus.Properties.Resources.left30;
-            this.button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.button3.Location = new System.Drawing.Point(693, 383);
-            this.button3.Name = "button3";
-            this.button3.Size = new System.Drawing.Size(30, 30);
-            this.button3.TabIndex = 4;
-            this.button3.UseVisualStyleBackColor = true;
+            this.buttonLeft.BackgroundImage = global::Trolleybus.Properties.Resources.left30;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(693, 383);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+            this.buttonLeft.TabIndex = 4;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
-            // button2
+            // buttonDown
             // 
-            this.button2.BackgroundImage = global::Trolleybus.Properties.Resources.down30;
-            this.button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.button2.Location = new System.Drawing.Point(729, 383);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(30, 30);
-            this.button2.TabIndex = 3;
-            this.button2.UseVisualStyleBackColor = true;
+            this.buttonDown.BackgroundImage = global::Trolleybus.Properties.Resources.down30;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(729, 383);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.TabIndex = 3;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
             // pictureBoxTrolleybus
             // 
-            this.pictureBoxTrolleybus.Location = new System.Drawing.Point(0, 0);
+            this.pictureBoxTrolleybus.Location = new System.Drawing.Point(12, 12);
             this.pictureBoxTrolleybus.Name = "pictureBoxTrolleybus";
-            this.pictureBoxTrolleybus.Size = new System.Drawing.Size(800, 425);
+            this.pictureBoxTrolleybus.Size = new System.Drawing.Size(776, 413);
             this.pictureBoxTrolleybus.TabIndex = 0;
             this.pictureBoxTrolleybus.TabStop = false;
             // 
@@ -136,10 +140,10 @@ namespace Trolleybus
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.button5);
-            this.Controls.Add(this.button4);
-            this.Controls.Add(this.button3);
-            this.Controls.Add(this.button2);
+            this.Controls.Add(this.buttonUp);
+            this.Controls.Add(this.buttonRight);
+            this.Controls.Add(this.buttonLeft);
+            this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.buttonCreate);
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.pictureBoxTrolleybus);
@@ -161,10 +165,10 @@ namespace Trolleybus
         private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelWeight;
         private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelBodyColor;
         private System.Windows.Forms.Button buttonCreate;
-        private System.Windows.Forms.Button button2;
-        private System.Windows.Forms.Button button3;
-        private System.Windows.Forms.Button button4;
-        private System.Windows.Forms.Button button5;
+        private System.Windows.Forms.Button buttonDown;
+        private System.Windows.Forms.Button buttonLeft;
+        private System.Windows.Forms.Button buttonRight;
+        private System.Windows.Forms.Button buttonUp;
     }
 }
 
diff --git a/Trolleybus/Trolleybus/Form1.cs b/Trolleybus/Trolleybus/Form1.cs
index 7455084..07959cc 100644
--- a/Trolleybus/Trolleybus/Form1.cs
+++ b/Trolleybus/Trolleybus/Form1.cs
@@ -40,11 +40,39 @@ namespace Trolleybus
             Random rnd = new Random();
             _trolleybus = new DrawingTrolleybus();
             _trolleybus.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            _trolleybus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height);
+            _trolleybus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), Location.X, Location.Y, pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height);
+//            _trolleybus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height);
             toolStripStatusLabelSpeed.Text = $"Скорость: {_trolleybus.Trolleybus.Speed}";
             toolStripStatusLabelWeight.Text = $"Вес: {_trolleybus.Trolleybus.Weight}";
             toolStripStatusLabelBodyColor.Text = $"Цвет: {_trolleybus.Trolleybus.BodyColor.Name}";
             Draw();
         }
+
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            //получаем имя кнопки
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            switch (name)
+            {
+                case "buttonUp":
+                    _trolleybus?.MoveTransport(Direction.Up);
+                    break;
+                case "buttonDown":
+                    _trolleybus?.MoveTransport(Direction.Down);
+                    break;
+                case "buttonLeft":
+                    _trolleybus?.MoveTransport(Direction.Left);
+                    break;
+                case "buttonRight":
+                    _trolleybus?.MoveTransport(Direction.Right);
+                    break;
+            }
+            Draw();
+        }
+        private void PictureBoxTrolleybus_Resize(object sender, EventArgs e)
+        {
+            _trolleybus?.ChangeBorders(pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height);
+            Draw();
+        }
     }
 }

From 9da23c5b30f1a00705755f9e3caf74feb5e830b4 Mon Sep 17 00:00:00 2001
From: Oleg <ocelot1401@gmail.com>
Date: Sat, 17 Sep 2022 20:30:26 +0400
Subject: [PATCH 4/5] Final

---
 Trolleybus/Trolleybus/DrawingTrolleybus.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Trolleybus/Trolleybus/DrawingTrolleybus.cs b/Trolleybus/Trolleybus/DrawingTrolleybus.cs
index e50e156..d963d78 100644
--- a/Trolleybus/Trolleybus/DrawingTrolleybus.cs
+++ b/Trolleybus/Trolleybus/DrawingTrolleybus.cs
@@ -9,7 +9,7 @@ using System.Windows.Forms;
 namespace Trolleybus
 {
     /// <summary>
-    /// Класс прорисовки и перемещения
+    /// Класс прорисовки и перемещения объекта
     /// </summary>
     internal class DrawingTrolleybus
     {

From ee9c15b506bb664749b2810c266cb5eb4465e771 Mon Sep 17 00:00:00 2001
From: Oleg <ocelot1401@gmail.com>
Date: Fri, 30 Sep 2022 11:22:36 +0400
Subject: [PATCH 5/5] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=89?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=BB=D0=B5=D0=B2=D0=BE=20?=
 =?UTF-8?q?=D0=B8=20=D0=B2=D0=B2=D0=B5=D1=80=D1=85.=20=D0=98=D1=81=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20pictureBox?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Trolleybus/Trolleybus/DrawingTrolleybus.cs | 14 +++++++-------
 Trolleybus/Trolleybus/Form1.Designer.cs    |  4 ++--
 Trolleybus/Trolleybus/Form1.cs             |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Trolleybus/Trolleybus/DrawingTrolleybus.cs b/Trolleybus/Trolleybus/DrawingTrolleybus.cs
index d963d78..a2e0bdf 100644
--- a/Trolleybus/Trolleybus/DrawingTrolleybus.cs
+++ b/Trolleybus/Trolleybus/DrawingTrolleybus.cs
@@ -25,11 +25,11 @@ namespace Trolleybus
         /// <summary>
         /// левая координата начала отрисовки
         /// </summary>
-        private float _startX;
+        //private float _startX;
         /// <summary>
         /// Верхняя координата начала отрисовки
         /// </summary>
-        private float _startY;
+        //private float _startY;
         /// <summary>
         /// Ширина окна отрисовки
         /// </summary>
@@ -65,12 +65,12 @@ namespace Trolleybus
         /// <param name="width">Ширина картинки</param>
         /// <param name="height">Высота картинки</param>
 //        public void SetPosition(int x, int y, int startX, int startY, int width, int height)
-        public void SetPosition(int x, int y, int startX, int startY, int width, int height)
+        public void SetPosition(int x, int y, int width, int height)
         {
             _startPosX = x;
             _startPosY = y;
-            _startX = startX;
-            _startY = startY;
+//            _startX = startX;
+//            _startY = startY;
             _pictureWidth = width;
             _pictureHeight = height;
         }
@@ -95,14 +95,14 @@ namespace Trolleybus
                     break;
                 //влево
                 case Direction.Left:
-                    if (_startPosX > _startX)
+                    if (_startPosX - Trolleybus.Step > 0)
                     {
                         _startPosX -= Trolleybus.Step;
                     }
                     break;
                 //вверх
                 case Direction.Up:
-                    if (_startPosY > _startY)
+                    if (_startPosY - Trolleybus.Step > 0)
                     {
                         _startPosY -= Trolleybus.Step;
                     }
diff --git a/Trolleybus/Trolleybus/Form1.Designer.cs b/Trolleybus/Trolleybus/Form1.Designer.cs
index 7160c1d..46cbfec 100644
--- a/Trolleybus/Trolleybus/Form1.Designer.cs
+++ b/Trolleybus/Trolleybus/Form1.Designer.cs
@@ -129,9 +129,9 @@ namespace Trolleybus
             // 
             // pictureBoxTrolleybus
             // 
-            this.pictureBoxTrolleybus.Location = new System.Drawing.Point(12, 12);
+            this.pictureBoxTrolleybus.Location = new System.Drawing.Point(0, -1);
             this.pictureBoxTrolleybus.Name = "pictureBoxTrolleybus";
-            this.pictureBoxTrolleybus.Size = new System.Drawing.Size(776, 413);
+            this.pictureBoxTrolleybus.Size = new System.Drawing.Size(800, 451);
             this.pictureBoxTrolleybus.TabIndex = 0;
             this.pictureBoxTrolleybus.TabStop = false;
             // 
diff --git a/Trolleybus/Trolleybus/Form1.cs b/Trolleybus/Trolleybus/Form1.cs
index 07959cc..0fb3bf8 100644
--- a/Trolleybus/Trolleybus/Form1.cs
+++ b/Trolleybus/Trolleybus/Form1.cs
@@ -40,8 +40,8 @@ namespace Trolleybus
             Random rnd = new Random();
             _trolleybus = new DrawingTrolleybus();
             _trolleybus.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            _trolleybus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), Location.X, Location.Y, pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height);
-//            _trolleybus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height);
+            //_trolleybus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), Location.X, Location.Y, pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height);
+            _trolleybus.SetPosition(rnd.Next(10, 100), rnd.Next(pictureBoxTrolleybus.Size.Height - 150, pictureBoxTrolleybus.Size.Height - 100), pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height);
             toolStripStatusLabelSpeed.Text = $"Скорость: {_trolleybus.Trolleybus.Speed}";
             toolStripStatusLabelWeight.Text = $"Вес: {_trolleybus.Trolleybus.Weight}";
             toolStripStatusLabelBodyColor.Text = $"Цвет: {_trolleybus.Trolleybus.BodyColor.Name}";