Merge pull request 'Yahontov O.U. LabWork1' (#1) from LabWork1 into master

Reviewed-on: http://student.git.athene.tech/Arklightning/PIbd-21_Yahontov_O.U._Trolleybus_Base/pulls/1

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
+    }
+}

Trolleybus/Trolleybus/DrawingTrolleybus.cs

@@ -0,0 +1,181 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Drawing;
+using System.Windows.Forms;
+
+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 float _startX;
+        /// <summary>
+        /// Верхняя координата начала отрисовки
+        /// </summary>
+        //private float _startY;
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private int? _pictureWidth = null;
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private int? _pictureHeight = null;
+        /// <summary>
+        /// Ширина отрисовки
+        /// </summary>
+        protected readonly int _trolleybusWidth = 200;
+        /// <summary>
+        /// Высота отрисовки
+        /// </summary>
+        protected readonly int _trolleybusHeight = 50;
+        /// <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 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;
+            _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 - Trolleybus.Step > 0)
+                    {
+                        _startPosX -= Trolleybus.Step;
+                    }
+                    break;
+                //вверх
+                case Direction.Up:
+                    if (_startPosY - Trolleybus.Step > 0)
+                    {
+                        _startPosY -= Trolleybus.Step;
+                    }
+                    break;
+                //вниз
+                case Direction.Down:
+                    if (_startPosY + _trolleybusHeight + Trolleybus.Step < _pictureHeight)
+                    {
+                        _startPosY += Trolleybus.Step;
+                    }
+                    break;
+            }
+        }
+        /// <summary>
+        /// Отрисовка троллейбуса
+        /// </summary>
+        /// <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>
+        /// Смена границ формы отрисовки
+        /// </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;
+            }
+        }
+    }
+}

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;
+        }
+    }
+}

Trolleybus/Trolleybus/Form1.Designer.cs

@@ -29,13 +29,146 @@ 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.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();
+            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, 390);
+            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);
+            // 
+            // buttonUp
+            // 
+            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);
+            // 
+            // buttonRight
+            // 
+            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);
+            // 
+            // buttonLeft
+            // 
+            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);
+            // 
+            // buttonDown
+            // 
+            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, -1);
+            this.pictureBoxTrolleybus.Name = "pictureBoxTrolleybus";
+            this.pictureBoxTrolleybus.Size = new System.Drawing.Size(800, 451);
+            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.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);
+            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 buttonDown;
+        private System.Windows.Forms.Button buttonLeft;
+        private System.Windows.Forms.Button buttonRight;
+        private System.Windows.Forms.Button buttonUp;
     }
 }
 

Trolleybus/Trolleybus/Form1.cs

@@ -12,9 +12,67 @@ 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), 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}";
+            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();
+        }
     }
 }

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>

Trolleybus/Trolleybus/Properties/Resources.Designer.cs

@@ -1,48 +1,44 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программным средством.
+//     Этот код создан программой.
-//     Версия среды выполнения: 4.0.30319.42000
+//     Исполняемая версия:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильному поведению и будут утрачены, если
+//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     код создан повторно.
+//     повторной генерации кода.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
+namespace Trolleybus.Properties {
+    using System;
+    
     
-namespace Trolleybus.Properties
-{
     /// <summary>
-    ///   Класс ресурсов со строгим типом для поиска локализованных строк и пр.
+    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
     /// </summary>
-    // Этот класс был автоматически создан при помощи StronglyTypedResourceBuilder
+    // Этот класс создан автоматически классом StronglyTypedResourceBuilder
-    // класс с помощью таких средств, как ResGen или Visual Studio.
+    // с помощью такого средства, как ResGen или Visual Studio.
-    // Для добавления или удаления члена измените файл .ResX, а затем перезапустите ResGen
+    // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
-    // с параметром /str или заново постройте свой VS-проект.
+    // с параметром /str или перестройте свой проект VS.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [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
+        internal static global::System.Resources.ResourceManager ResourceManager {
-        {
+            get {
-            get
+                if (object.ReferenceEquals(resourceMan, null)) {
-            {
-                if ((resourceMan == null))
-                {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Trolleybus.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
@@ -51,20 +47,57 @@ namespace Trolleybus.Properties
         }
         
         /// <summary>
-        ///   Переопределяет свойство CurrentUICulture текущего потока для всех
+        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
-        ///   подстановки ресурсов с помощью этого класса ресурсов со строгим типом.
+        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
+        internal static global::System.Globalization.CultureInfo Culture {
-        {
+            get {
-            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));
+            }
+        }
     }
 }

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>

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>