ProjectElectricLocomotive/ProjectElectricLocomotive/DirectionType.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectElectricLocomotive;
-
-public enum DirectionType
-{
-    /// <summary>
-    /// Вверх
-    /// </summary>
-    Up = 1,
-
-    /// <summary>
-    /// Вниз
-    /// </summary>
-    Down = 2,
-
-    /// <summary>
-    /// Влево
-    /// </summary>
-    Left = 3,
-
-    /// <summary>
-    /// Вправо
-    /// </summary>
-    Right = 4
-}

ProjectElectricLocomotive/ProjectElectricLocomotive/DrawningElectricLocomotive.cs

@@ -1,309 +0,0 @@
-
-namespace ProjectElectricLocomotive;
-
-/// <summary>
-/// Класс, отвечающий за прорисовку и перемещение объекта - сущности
-/// </summary>
-public class DrawningElectricLocomotive
-{
-    /// <summary>
-    /// Класс-сущность
-    /// </summary>
-    public EntityElectricLocomotive? EntityElectricLocomotive { get; private set; }
-
-    /// <summary>
-    /// Ширина окна
-    /// </summary>
-    private int? _pictureWidth;
-
-    /// <summary>
-    /// Высота окна
-    /// </summary>
-    private int? _pictureHeight;
-
-    /// <summary>
-    /// Левая координата прорисовки электровоза
-    /// </summary>
-    private int? _startPosX;
-
-    /// <summary>
-    /// Верхняя координата прорисовки электровоза 
-    /// </summary>
-    private int? _startPosY;
-
-    /// <summary>
-    /// Ширина прорисовки электровоза
-    /// </summary>
-    private readonly int _drawningElectricLocomotiveWidth = 83;
-
-
-    /// <summary>
-    /// Высота прорисовки электровоза
-    /// </summary>
-    private readonly int _drawningElectricLocomotiveHeight = 45;
-
-    /// <summary>
-    /// Инициализация свойств
-    /// </summary>
-    /// <param name="speed"></param>
-    /// <param name="weight"></param>
-    /// <param name="bodyColor"></param>
-    /// <param name="additionalColor"></param>
-    /// <param name="bodyKit"></param>
-    /// <param name="electricHorns"></param>
-    /// <param name="batteryPlacement"></param>
-    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool electricHorns, bool batteryPlacement)
-    {
-        EntityElectricLocomotive = new EntityElectricLocomotive();
-
-        EntityElectricLocomotive.Init(speed, weight, bodyColor, additionalColor, electricHorns, batteryPlacement);
-        _pictureWidth = null;
-        _pictureHeight = null;
-        _startPosX = null;
-        _startPosY = null;
-    }
-
-    /// <summary>
-    /// Установка границ поля
-    /// </summary>
-    /// <param name="width"></param>
-    /// <param name="height"></param>
-    /// <returns>true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
-    public bool SetPictureSize(int width, int height)
-    {
-        if(_drawningElectricLocomotiveHeight > height || _drawningElectricLocomotiveWidth > width)
-        {
-            return false;
-        }
-        _pictureWidth = width;
-        _pictureHeight = height;
-        if (_startPosY.HasValue && _startPosY + _drawningElectricLocomotiveHeight < _pictureHeight )
-        {
-            _startPosY = _pictureHeight - _drawningElectricLocomotiveHeight; 
-        }
-        if (_startPosX.HasValue &&  _startPosX + _drawningElectricLocomotiveWidth < _pictureWidth )
-        {
-            _startPosX = _pictureWidth - _drawningElectricLocomotiveWidth;
-        }
-        return true;
-    }
-
-    /// <summary>
-    /// Установка позиции
-    /// </summary>
-    /// <param name="x">КоОрдината X</param>
-    /// <param name="y">Координата Y</param>
-    public void SetPosition(int x, int y)
-    {
-        if(!_pictureHeight.HasValue || !_pictureWidth.HasValue) {
-            return;
-        }
-
-
-        _startPosX = x;
-        _startPosY = y;
-
-
-        
-        if ( _drawningElectricLocomotiveHeight + y > _pictureHeight)
-        {
-            _startPosY = _pictureHeight - _drawningElectricLocomotiveHeight;
-        }
-        if ( _drawningElectricLocomotiveWidth + x > _pictureWidth)
-        {
-            _startPosX = _pictureWidth - _drawningElectricLocomotiveWidth;
-        }
-        if (x < 0)
-        {
-            _startPosX = 0;
-
-        }
-        if (y < 0)
-        {
-            _startPosY = 0;
-
-        }
-
-    }
-
-    /// <summary>
-    /// Изменение направления перемещения
-    /// </summary>
-    /// <param name="direction">Направление</param>
-    /// <returns>true - перемещение выполнено, false - перемещение невозможно</returns>
-    public bool MoveTransport(DirectionType direction)
-    {
-        if(EntityElectricLocomotive == null || !_startPosX.HasValue || !_startPosY.HasValue)
-        {
-            return false;
-        }
-
-        switch(direction)
-        {
-            //влево
-            case DirectionType.Left:
-                if(_startPosX.Value - EntityElectricLocomotive.Step  > 0)
-                {
-                    _startPosX -= (int)EntityElectricLocomotive.Step;
-                }
-                return true;
-            //вверх
-            case DirectionType.Up:
-                if(_startPosY.Value - EntityElectricLocomotive.Step > 0)
-                {
-                    _startPosY -= (int)EntityElectricLocomotive.Step;
-                }     
-                return true;
-            //вправо
-            case DirectionType.Right:
-                if (_startPosX.Value + _drawningElectricLocomotiveWidth + EntityElectricLocomotive.Step < _pictureWidth)
-                {
-                    _startPosX += (int)EntityElectricLocomotive.Step;
-                }
-                return true;
-            //вниз
-            case DirectionType.Down:
-                if (_startPosY.Value + _drawningElectricLocomotiveHeight +  EntityElectricLocomotive.Step < _pictureHeight)
-                {
-                    _startPosY += (int)EntityElectricLocomotive.Step;
-                }
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    /// <summary>
-    /// Прорисовка объекта
-    /// </summary>
-    /// <param name="g"></param>
-    public void DrawTransport(Graphics g)
-    {
-        if (EntityElectricLocomotive == null || !_startPosX.HasValue || !_startPosY.HasValue)
-        {
-            return;
-        }
-
-        //Создание перьев и кистей для прорисовки электровоза
-        Pen pen = new(Color.Black);
-        Pen penSolid = new(Color.Black, 2);
-        Pen penSolidYellow = new(Color.Yellow, 0.5f);
-        Pen windowPen = new(Color.DeepSkyBlue);
-        Brush additionalBrush = new SolidBrush(EntityElectricLocomotive.AdditionalColor);
-        Brush blackBrush = new SolidBrush(Color.Black);
-        Brush whiteBrush = new SolidBrush(Color.White);
-
-        //Инициализация опорных точек для прорисовки корпуса
-        Point pointStart = new Point(_startPosX.Value + 75, _startPosY.Value + 20);
-        Point point1 = new Point(_startPosX.Value + 75, _startPosY.Value + 5);
-        Point point2 = new Point(_startPosX.Value + 10, _startPosY.Value + 5);
-        Point pointFinish = new Point(_startPosX.Value + 5, _startPosY.Value + 20);
-
-        //Инициализация опорных точек для прорисовки первой "юбки"
-        Point point3 = new Point(_startPosX.Value + 7, _startPosY.Value + 37);
-        Point point4 = new Point(_startPosX.Value + 0, _startPosY.Value + 37 +6 );
-        Point point5 = new Point(_startPosX.Value + 7, _startPosY.Value + 37 + 6 );
-
-        //Инициализация опорных точек для прорисовки второй "юбки"
-        Point point6 = new Point(_startPosX.Value + 69, _startPosY.Value + 37);
-        Point point7 = new Point(_startPosX.Value + 75 + 7, _startPosY.Value + 37 + 6);
-        Point point8 = new Point(_startPosX.Value + 69, _startPosY.Value + 37 + 6);
-       
-        //Совокупность точек полигона уголка первой "юбки"
-        Point[] firstTrianglePoints =
-             {
-                 
-                 point3,
-                 point4,
-                 point5,
-                 
-             };
-        //Совокупность точек полигона уголка второй "юбки"
-        Point[] secondTrianglePoints =
-             {
-
-                 point6,
-                 point7,
-                 point8,
-
-             };
-
-        // Прорисовка уголков "юбок"
-        g.FillPolygon(blackBrush, firstTrianglePoints);
-        g.FillPolygon(blackBrush, secondTrianglePoints);
-
-        //Прорисовка корпуса
-        g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value + 20, 70, 17);
-        g.DrawLine(pen, point3, point4);
-              
-        g.DrawLine(pen, pointStart, point1);
-        g.DrawLine(pen, point1, point2);
-        g.DrawLine(pen, point2, pointFinish);
-
-
-        Brush brWhite = new SolidBrush(Color.White);
-        g.DrawRectangle(windowPen, _startPosX.Value + 24.3f, _startPosY.Value + 9, 8, 8);
-
-        g.DrawRectangle(pen, _startPosX.Value + 35, _startPosY.Value + 14, 8, 12);
-
-        g.FillRectangle(brWhite, _startPosX.Value + 36, _startPosY.Value + 16, 7, 10);
-
-
-        //Прорисовка передней и задней "юбки"
-        g.FillRectangle(blackBrush, _startPosX.Value + 7, _startPosY.Value + 37, 25, 5.3f);
-        g.FillRectangle(blackBrush, _startPosX.Value + 47, _startPosY.Value + 37, 22, 5.3f);
-
-        //Прорисовка двух передних колёс
-        g.FillEllipse(whiteBrush, _startPosX.Value + 6.3f, _startPosY.Value + 37, 10, 10);
-        g.DrawEllipse(penSolid, _startPosX.Value + 9, _startPosY.Value + 37, 8, 8);
-        g.FillEllipse(additionalBrush, _startPosX.Value + 9, _startPosY.Value + 37, 8, 8);
-        g.DrawEllipse(penSolid, _startPosX.Value + 24, _startPosY.Value + 37, 8, 8);
-        g.FillEllipse(additionalBrush, _startPosX.Value + 24, _startPosY.Value + 37, 8, 8);
-
-        //Прорисовка двух задних колёс
-        g.FillEllipse(whiteBrush, _startPosX.Value + 25 + 38, _startPosY.Value + 37, 10, 10);
-        g.DrawEllipse(penSolid, _startPosX.Value + 25 + 26, _startPosY.Value + 37, 8, 8);
-        g.FillEllipse(additionalBrush, _startPosX.Value + 25 + 26, _startPosY.Value + 37, 8, 8);
-        g.DrawEllipse(penSolid, _startPosX.Value+ 25 + 37, _startPosY.Value + 37, 8, 8);
-        g.FillEllipse(additionalBrush, _startPosX.Value + 25 + 37, _startPosY.Value + 37, 8, 8);
-
-        //Прорисовка заднего "шлюза"
-        g.FillRectangle(blackBrush, _startPosX.Value + 75, _startPosY.Value + 9, 5.7f, 27.4f);
-
-        //Прорисовка первого и третьего окна
-        g.DrawRectangle(windowPen, _startPosX.Value + 12, _startPosY.Value + 9, 8, 8);
-        g.DrawRectangle(windowPen, _startPosX.Value + 63, _startPosY.Value + 9, 8, 8);
-
-
-       
-        if (EntityElectricLocomotive.ElectricHorns)
-        {
-
-
-            //Инициализация опорных точек для прорисовки "рогов"
-            Point pointHorns1 = new Point(_startPosX.Value + 13, _startPosY.Value + 5);
-            Point pointHorns2 = new Point(_startPosX.Value + 16, _startPosY.Value + 2);
-            Point pointHorns3 = new Point(_startPosX.Value + 11, _startPosY.Value);
-
-            //Прорисовка "рогов" электровоза
-            g.DrawLine(penSolid, pointHorns1, pointHorns2);
-            g.DrawLine(penSolid, pointHorns2, pointHorns3);
-        }
-        if(EntityElectricLocomotive.BatteryPlacement)
-        { 
-            //Инициализация опорных точек для прорисовки молнии на хранилище батарей
-            Point pointLightning1 = new Point(_startPosX.Value + 39, _startPosY.Value + 37);
-            Point pointLightning2 = new Point(_startPosX.Value + 37, _startPosY.Value + 39);
-            Point pointLightning3 = new Point(_startPosX.Value + 39, _startPosY.Value + 40);
-            Point pointLightning4 = new Point(_startPosX.Value + 37, _startPosY.Value + 41);
-
-            //Прорисовка "хранилища батарей" электровоза
-            g.FillRectangle(blackBrush, _startPosX.Value + 36, _startPosY.Value + 37, 8, 4.5f);
-            g.DrawLine(penSolidYellow, pointLightning1, pointLightning2);
-            g.DrawLine(penSolidYellow, pointLightning2, pointLightning3);
-            g.DrawLine(penSolidYellow, pointLightning3, pointLightning4);
-
-        }
-
-    }
-}

ProjectElectricLocomotive/ProjectElectricLocomotive/EntityElectricLocomotive.cs

@@ -1,64 +0,0 @@
-
-namespace ProjectElectricLocomotive;
-
-/// <summary>
-/// Класс-сущность "Тепловоз"
-/// </summary>
-public class EntityElectricLocomotive
-{
-    /// <summary>
-    /// Скорость
-    /// </summary>
-    public int Speed { get; private set; }
-
-    /// <summary>
-    /// Вес
-    /// </summary>
-    public double Weight {  get; private set; }
-
-    /// <summary>
-    /// Основной цвет
-    /// </summary>
-    public Color BodyColor { get; private set; }
-
-    /// <summary>
-    /// Дополнительный цвет (для дополнительных элементов)
-    /// </summary>
-    public Color AdditionalColor { get; private set; }
-
-    /// <summary>
-    /// Признак (опция) наличия "корпус"
-    /// </summary>
-    public bool ElectricHorns { get; private set; }
-
-    /// <summary>
-    /// Признак (опция) наличия места под батарею
-    /// </summary>
-    public bool BatteryPlacement { get; private set; }
-
-    /// <summary>
-    /// Шаг перемещения объекта
-    /// </summary>
-    public double Step => Speed * 100 / Weight;
-
-    /// <summary>
-    /// Инициализация полей объекта-класса тепловоза
-    /// </summary>
-    /// <param name="speed"></param>
-    /// <param name="weight"></param>
-    /// <param name="bodycolor"></param>
-    /// <param name="additionalcolor"></param>
-    /// <param name="electrichorns"></param>
-    /// <param name="batteryplacement"></param>
-
-    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool electricHorns, bool batteryPlacement)
-    {
-        Speed = speed;
-        Weight = weight;
-        BodyColor = bodyColor;
-        AdditionalColor = additionalColor;
-        ElectricHorns = electricHorns;
-        BatteryPlacement = batteryPlacement;
-       
-    }
-}

ProjectElectricLocomotive/ProjectElectricLocomotive/Form1.Designer.cs

@@ -0,0 +1,39 @@
+namespace ProjectElectricLocomotive
+{
+    partial class Form1
+    {
+        /// <summary>
+        ///  Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        ///  Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        ///  Required method for Designer support - do not modify
+        ///  the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Text = "Form1";
+        }
+
+        #endregion
+    }
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/Form1.cs

@@ -0,0 +1,10 @@
+namespace ProjectElectricLocomotive
+{
+    public partial class Form1 : Form
+    {
+        public Form1()
+        {
+            InitializeComponent();
+        }
+    }
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/Form1.resx

@@ -1,17 +1,17 @@
 <?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
+    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the
+    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes
+    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>
@@ -26,36 +26,36 @@
         <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
+    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
+    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support
+    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture.
+    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
+    
-    The mimetype is used for serialized objects, and tells the
+    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not
+    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
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can
+    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
+    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
+    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
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->

ProjectElectricLocomotive/ProjectElectricLocomotive/FormElectricLocomotive.Designer.cs

@@ -1,138 +0,0 @@
-namespace ProjectElectricLocomotive
-{
-    partial class FormElectricLocomotive
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            pictureBoxElectricLocomotive = new PictureBox();
-            buttonCreate = new Button();
-            buttonLeft = new Button();
-            buttonDown = new Button();
-            buttonRight = new Button();
-            buttonUp = new Button();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxElectricLocomotive).BeginInit();
-            SuspendLayout();
-            // 
-            // pictureBoxElectricLocomotive
-            // 
-            pictureBoxElectricLocomotive.Dock = DockStyle.Fill;
-            pictureBoxElectricLocomotive.Location = new Point(0, 0);
-            pictureBoxElectricLocomotive.Name = "pictureBoxElectricLocomotive";
-            pictureBoxElectricLocomotive.Size = new Size(866, 479);
-            pictureBoxElectricLocomotive.TabIndex = 0;
-            pictureBoxElectricLocomotive.TabStop = false;
-            // 
-            // buttonCreate
-            // 
-            buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreate.Location = new Point(12, 430);
-            buttonCreate.Name = "buttonCreate";
-            buttonCreate.Size = new Size(104, 37);
-            buttonCreate.TabIndex = 1;
-            buttonCreate.Text = "Создать";
-            buttonCreate.UseVisualStyleBackColor = true;
-            buttonCreate.Click += ButtonCreate_Click;
-            // 
-            // buttonLeft
-            // 
-            buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonLeft.BackColor = Color.Snow;
-            buttonLeft.BackgroundImage = Properties.Resources.buttonLeft;
-            buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonLeft.Location = new Point(695, 405);
-            buttonLeft.Name = "buttonLeft";
-            buttonLeft.Size = new Size(45, 45);
-            buttonLeft.TabIndex = 2;
-            buttonLeft.UseVisualStyleBackColor = false;
-            buttonLeft.Click += ButtonMove_Click;
-            // 
-            // buttonDown
-            // 
-            buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonDown.BackColor = Color.Snow;
-            buttonDown.BackgroundImage = Properties.Resources.buttonDown;
-            buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonDown.Location = new Point(746, 405);
-            buttonDown.Name = "buttonDown";
-            buttonDown.Size = new Size(45, 45);
-            buttonDown.TabIndex = 3;
-            buttonDown.UseVisualStyleBackColor = false;
-            buttonDown.Click += ButtonMove_Click;
-            // 
-            // buttonRight
-            // 
-            buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonRight.BackColor = Color.Snow;
-            buttonRight.BackgroundImage = Properties.Resources.buttonRight;
-            buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonRight.Location = new Point(795, 405);
-            buttonRight.Name = "buttonRight";
-            buttonRight.Size = new Size(45, 45);
-            buttonRight.TabIndex = 4;
-            buttonRight.UseVisualStyleBackColor = false;
-            buttonRight.Click += ButtonMove_Click;
-            // 
-            // buttonUp
-            // 
-            buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonUp.BackColor = Color.Snow;
-            buttonUp.BackgroundImage = Properties.Resources.buttonUp;
-            buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonUp.Location = new Point(746, 354);
-            buttonUp.Name = "buttonUp";
-            buttonUp.Size = new Size(45, 45);
-            buttonUp.TabIndex = 5;
-            buttonUp.UseVisualStyleBackColor = false;
-            buttonUp.Click += ButtonMove_Click;
-            // 
-            // FormElectricLocomotive
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(866, 479);
-            Controls.Add(buttonUp);
-            Controls.Add(buttonRight);
-            Controls.Add(buttonDown);
-            Controls.Add(buttonLeft);
-            Controls.Add(buttonCreate);
-            Controls.Add(pictureBoxElectricLocomotive);
-            Name = "FormElectricLocomotive";
-            Text = "Электровоз";
-            ((System.ComponentModel.ISupportInitialize)pictureBoxElectricLocomotive).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private PictureBox pictureBoxElectricLocomotive;
-        private Button buttonCreate;
-        private Button buttonLeft;
-        private Button buttonDown;
-        private Button buttonRight;
-        private Button buttonUp;
-    }
-}

ProjectElectricLocomotive/ProjectElectricLocomotive/FormElectricLocomotive.cs

@@ -1,95 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace ProjectElectricLocomotive;
-
-public partial class FormElectricLocomotive : Form
-{
-    private DrawningElectricLocomotive? _drawningElectricLocomotive;
-
-    public FormElectricLocomotive()
-    {
-        InitializeComponent();
-    }
-
-    /// <summary>
-    /// Метод прорисовки электровоза
-    /// </summary>
-    private void Draw()
-    {
-        if (_drawningElectricLocomotive == null)
-        {
-            return;
-        }
-        Bitmap bmp = new(pictureBoxElectricLocomotive.Width,
-        pictureBoxElectricLocomotive.Height);
-        Graphics gr = Graphics.FromImage(bmp);
-        _drawningElectricLocomotive.DrawTransport(gr);
-        pictureBoxElectricLocomotive.Image = bmp;
-    }
-
-    private void ButtonCreate_Click(object sender, EventArgs e)
-    {
-        Random random = new();
-        _drawningElectricLocomotive = new DrawningElectricLocomotive();
-        _drawningElectricLocomotive.Init(random.Next(100, 300), random.Next(1000, 3000),
-            Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-            Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-             Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-        _drawningElectricLocomotive.SetPictureSize(pictureBoxElectricLocomotive.Width, pictureBoxElectricLocomotive.Height);
-        _drawningElectricLocomotive.SetPosition(random.Next(0,pictureBoxElectricLocomotive.Width), random.Next(0,pictureBoxElectricLocomotive.Height));
-
-        Bitmap bmp = new(pictureBoxElectricLocomotive.Width, pictureBoxElectricLocomotive.Height);
-        Graphics gr = Graphics.FromImage(bmp);
-        _drawningElectricLocomotive.DrawTransport(gr);
-        pictureBoxElectricLocomotive.Image = bmp;
-    }
-
-    /// <summary>
-    /// Перемещение объекта по форме (нажатие кнопок навигации)
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonMove_Click(object sender, EventArgs e)
-    {
-        if (_drawningElectricLocomotive == null)
-        {
-            return;
-        }
-        string name = ((Button)sender)?.Name ?? string.Empty;
-        bool result = false;
-        switch (name)
-        {
-            case "buttonUp":
-                result =
-                _drawningElectricLocomotive.MoveTransport(DirectionType.Up);
-                break;
-            case "buttonDown":
-                result =
-                _drawningElectricLocomotive.MoveTransport(DirectionType.Down);
-                break;
-            case "buttonLeft":
-                result =
-                _drawningElectricLocomotive.MoveTransport(DirectionType.Left);
-                break;
-            case "buttonRight":
-                result =
-                _drawningElectricLocomotive.MoveTransport(DirectionType.Right);
-                break;
-        }
-        if (result)
-        {
-            Draw();
-        }
-    }
-}
-
-
-

ProjectElectricLocomotive/ProjectElectricLocomotive/Program.cs

@@ -11,7 +11,7 @@ namespace ProjectElectricLocomotive
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormElectricLocomotive());
+            Application.Run(new Form1());
         }
     }
 }

ProjectElectricLocomotive/ProjectElectricLocomotive/ProjectElectricLocomotive.csproj

@@ -8,19 +8,4 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
 </Project>

ProjectElectricLocomotive/ProjectElectricLocomotive/Properties/Resources.Designer.cs

@@ -1,103 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
-//
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ProjectElectricLocomotive.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
-    /// </summary>
-    // Этот класс создан автоматически классом StronglyTypedResourceBuilder
-    // с помощью такого средства, как ResGen или Visual Studio.
-    // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
-    // с параметром /str или перестройте свой проект VS.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ProjectElectricLocomotive.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
-        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap buttonDown {
-            get {
-                object obj = ResourceManager.GetObject("buttonDown", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap buttonLeft {
-            get {
-                object obj = ResourceManager.GetObject("buttonLeft", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap buttonRight {
-            get {
-                object obj = ResourceManager.GetObject("buttonRight", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap buttonUp {
-            get {
-                object obj = ResourceManager.GetObject("buttonUp", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-    }
-}

ProjectElectricLocomotive/ProjectElectricLocomotive/Properties/Resources.resx

@@ -1,133 +0,0 @@
-<?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>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="buttonLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\buttonLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="buttonDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\buttonDown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="buttonUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\buttonUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="buttonRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\buttonRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-</root>