Merge pull request 'Лабораторная работа №1. Создание электровоза, управлением кнопками.' (#1) from LabWork1 into master

Reviewed-on: http://student.git.athene.tech/Stranni15k/PIbd-21_Batylkin_A.O._ElectricLocomotive._Base/pulls/1

ElectricLocomotive/ElectricLocomotive/AbstractMap.cs

@@ -1,146 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ElectricLocomotive
-{
-    internal abstract class AbstractMap
-    {
-        private IDrawningObject _drawningObject = null;
-        protected int[,] _map = null;
-        protected int _width;
-        protected int _height;
-        protected float _size_x;
-        protected float _size_y;
-        protected readonly Random _random = new();
-        protected readonly int _freeRoad = 0;
-        protected readonly int _barrier = 1;
-
-        public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject)
-        {
-            _width = width;
-            _height = height;
-            _drawningObject = drawningObject;
-            GenerateMap();
-            while (!SetObjectOnMap())
-            {
-                GenerateMap();
-            }
-            return DrawMapWithObject();
-        }
-        public Bitmap MoveObject(Direction direction)
-        {
-            (float leftX, float topY, float rightX, float bottomY) = _drawningObject.GetCurrentPosition();
-
-            float locomotiveWidth = rightX - leftX;
-            float locomotiveHeight = bottomY - topY;
-
-            for (int i = 0; i < _map.GetLength(0); i++)
-            {
-                for (int j = 0; j < _map.GetLength(1); j++)
-                {
-                    if (_map[i, j] == _barrier)
-                    {
-                        switch (direction)
-                        {
-                            case Direction.Up:
-                                if (_size_y * (j + 1) >= topY - _drawningObject.Step && _size_y * (j + 1) < topY && _size_x * (i + 1) > leftX
-                                    && _size_x * (i + 1) <= rightX)
-                                {
-                                    return DrawMapWithObject();
-                                }
-                                break;
-                            case Direction.Down:
-                                if (_size_y * j <= bottomY + _drawningObject.Step && _size_y * j > bottomY && _size_x * (i + 1) > leftX
-                                    && _size_x * (i + 1) <= rightX)
-                                {
-                                    return DrawMapWithObject();
-                                }
-                                break;
-                            case Direction.Left:
-                                if (_size_x * (i + 1) >= leftX - _drawningObject.Step && _size_x * (i + 1) < leftX && _size_y * (j + 1) < bottomY
-                                    && _size_y * (j + 1) >= topY)
-                                {
-                                    return DrawMapWithObject();
-                                }
-                                break;
-                            case Direction.Right:
-                                if (_size_x * i <= rightX + _drawningObject.Step && _size_x * i > leftX && _size_y * (j + 1) < bottomY
-                                    && _size_y * (j + 1) >= topY)
-                                {
-                                    return DrawMapWithObject();
-                                }
-                                break;
-                        }
-                    }
-                }
-            }
-            if (true)
-            {
-                _drawningObject.MoveObject(direction);
-            }
-            return DrawMapWithObject();
-        }
-
-        private bool SetObjectOnMap()
-        {
-            (float leftX, float topY, float rightX, float bottomY) = _drawningObject.GetCurrentPosition();
-            if (_drawningObject == null || _map == null)
-            {
-                return false;
-            }
-
-            float locomotiveWidth = rightX - leftX;
-            float locomotiveHeight = bottomY - topY;
-
-            int x = _random.Next(0, 10);
-            int y = _random.Next(0, 10);
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    if (_map[i, j] == _barrier)
-                    {
-                        if (x + locomotiveWidth >= _size_x * i && x <= _size_x * i && y + locomotiveHeight > _size_y * j && y <= _size_y * j)
-                        {
-                            return false;
-                        }
-                    }
-                }
-            }
-            _drawningObject.SetObject(x, y, _width, _height);
-            return true;
-        }
-        private Bitmap DrawMapWithObject()
-        {
-            Bitmap bmp = new(_width, _height);
-            if (_drawningObject == null || _map == null)
-            {
-                return bmp;
-            }
-            Graphics gr = Graphics.FromImage(bmp);
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    if (_map[i, j] == _freeRoad)
-                    {
-                        DrawRoadPart(gr, i, j);
-                    }
-                    else if (_map[i, j] == _barrier)
-                    {
-                        DrawBarrierPart(gr, i, j);
-                    }
-                }
-            }
-            _drawningObject.DrawningObject(gr);
-            return bmp;
-        }
-
-        protected abstract void GenerateMap();
-        protected abstract void DrawRoadPart(Graphics g, int i, int j);
-        protected abstract void DrawBarrierPart(Graphics g, int i, int j);
-    }
-}

ElectricLocomotive/ElectricLocomotive/BushesMap.cs

@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ElectricLocomotive
-{
-    internal class BushesMap : AbstractMap
-    {
-
-        private readonly Pen barrierColor = new Pen(Color.DarkGreen, 3);
-        private readonly Brush roadColor = new SolidBrush(Color.Brown);
-
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.DrawLine(barrierColor, new Point(Convert.ToInt32(i * (_size_x - 1)), Convert.ToInt32(j * (_size_y - 1))), new Point(Convert.ToInt32(i * (_size_x - 1)+7), Convert.ToInt32(j * (_size_y - 1))+7));
-            g.DrawLine(barrierColor, new Point(Convert.ToInt32(i * (_size_x - 1)+7), Convert.ToInt32(j * (_size_y - 1))), new Point(Convert.ToInt32(i * (_size_x - 1) + 7), Convert.ToInt32(j * (_size_y - 1)) + 7));
-            g.DrawLine(barrierColor, new Point(Convert.ToInt32(i * (_size_x - 1)+7), Convert.ToInt32(j * (_size_y - 1))+7), new Point(Convert.ToInt32(i * (_size_x - 1) + 14), Convert.ToInt32(j * (_size_y - 1)) ));
-        }
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-        }
-        protected override void GenerateMap()
-        {
-            _map = new int[100, 100];
-            _size_x = (float)_width / _map.GetLength(0);
-            _size_y = (float)_height / _map.GetLength(1);
-            int counter = 0;
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            }
-            while (counter < 20)
-            {
-                int x = _random.Next(0, 100);
-                int y = _random.Next(0, 100);
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-                    counter++;
-                }
-            }
-        }
-    
-    }
-}

ElectricLocomotive/ElectricLocomotive/Direction.cs

@@ -6,9 +6,8 @@ using System.Threading.Tasks;
 
 namespace ElectricLocomotive
 {
-    public enum Direction
+    internal enum Direction
     {
-        None = 0,
         Up = 1,
         Down = 2,
         Left = 3,

ElectricLocomotive/ElectricLocomotive/DrawningElectricLocomotive.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ElectricLocomotive
-{
-    internal class DrawningElectricLocomotive : DrawningLocomotive
-    {
-        public DrawningElectricLocomotive(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) :
-            base(speed, weight, bodyColor, 110, 60)
-        {
-            Locomotive = new EntityElectricLocomotive(speed, weight, bodyColor, dopColor, bodyKit, wing, sportLine);
-        }
-        public override void DrawTransport(Graphics g)
-        {
-            if (Locomotive is not EntityElectricLocomotive sportCar)
-            {
-                return;
-            }
-
-            Pen pen = new(Color.Black);
-            Pen window = new(Color.Blue);
-            Brush dopBrush = new SolidBrush(sportCar.DopColor);
-
-
-            if (sportCar.BodyKit)
-            {
-                Point[] pts = { new Point(Convert.ToInt32(_startPosX) + 15, Convert.ToInt32(_startPosY) + 10), new Point(Convert.ToInt32(_startPosX) + 45, Convert.ToInt32(_startPosY)), new Point(Convert.ToInt32(_startPosX) + 75, Convert.ToInt32(_startPosY) + 10), new Point(Convert.ToInt32(_startPosX) + 45, Convert.ToInt32(_startPosY) + 40) };
-                g.DrawPolygon(Pens.Black, pts);
-            }
-
-            if (sportCar.SportLine)
-            {
-                Point[] pts = { new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 90), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 60), new Point(Convert.ToInt32(_startPosX) + 150, Convert.ToInt32(_startPosY) + 90) };
-                g.FillPolygon(dopBrush, pts);
-            }
-
-            base.DrawTransport(g);
-        }
-    }
-}

ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs

@@ -7,35 +7,71 @@ using System.Threading.Tasks;
 
 namespace ElectricLocomotive
 {
-    public class DrawningLocomotive
+    internal class DrawningLocomotive
     {
-        public EntityLocomotive Locomotive { get; protected set; }
-        protected float _startPosX;
-        protected float _startPosY;
-
-        protected int? _pictureWidth = null;
-        protected int? _pictureHeight = null;
-
-        protected readonly int _locomotiveWidth = 200;
-        protected readonly int _locomotiveHeight = 90;
-        public DrawningLocomotive(int speed, float weight, Color bodyColor)
+        /// <summary>
+        /// Класс-сущность
+        /// </summary>
+        public EntityLocomotive Locomotive { 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>
+        private readonly int _locomotiveWidth = 160;
+        /// <summary>
+        /// Высота отрисовки автомобиля
+        /// </summary>
+        private readonly int _locomotiveHeight = 90;
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автомобиля</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        public void Init(int speed, float weight, Color bodyColor)
         {
-            Locomotive = new EntityLocomotive(speed, weight, bodyColor);
+            Locomotive = new EntityLocomotive();
+            Locomotive.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)
         {
-            if (width <= _locomotiveWidth + x || height <= _locomotiveHeight + y || x < 0 || y < 0)
-            {
-                _pictureWidth = null;
-                _pictureHeight = null;
-                return;
-            }
+            // TODO checks
 
-            _startPosX = x + 10;
+            _startPosX = x;
             _startPosY = y;
             _pictureWidth = width;
             _pictureHeight = height;
+
+            if (_startPosX + _locomotiveWidth > _pictureWidth) { _startPosX = 20; }
+            if (_startPosY - _locomotiveHeight / 2 < 0) { _startPosY = _locomotiveHeight + 10; }
+            if (_startPosY + _locomotiveHeight > _pictureHeight) { _startPosY -= _locomotiveHeight; }
         }
+        /// <summary>
+        /// Изменение направления пермещения
+        /// </summary>
+        /// <param name="direction">Направление</param>
         public void MoveTransport(Direction direction)
         {
             if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
@@ -74,16 +110,11 @@ namespace ElectricLocomotive
                     break;
             }
         }
-
-        protected DrawningLocomotive(int speed, float weight, Color bodyColor, int
-        locomotiveWidth, int locomotiveHeight) :
-        this(speed, weight, bodyColor)
-        {
-            _locomotiveWidth = locomotiveWidth;
-            _locomotiveHeight = locomotiveHeight;
-        }
-
-        public virtual void DrawTransport(Graphics g)
+        /// <summary>
+        /// Отрисовка автомобиля
+        /// </summary>
+        /// <param name="g"></param>
+        public void DrawTransport(Graphics g)
         {
             if (_startPosX < 0 || _startPosY < 0
                 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
@@ -91,43 +122,30 @@ namespace ElectricLocomotive
                 return;
             }
             Brush brBody = new SolidBrush(Locomotive?.BodyColor ?? Color.Black);
-            Brush blackturbo = new SolidBrush(Color.Black);
             Pen pen = new Pen(Color.Black);
-            Pen window = new Pen(Color.Blue);
+            //колёса
+            g.FillEllipse(brBody, _startPosX + 10, _startPosY + 50, 30, 30);
+            g.FillEllipse(brBody, _startPosX + 50, _startPosY + 50, 30, 30);
+            g.FillEllipse(brBody, _startPosX + 90, _startPosY + 50, 30, 30);
+            g.FillEllipse(brBody, _startPosX + 130, _startPosY + 50, 30, 30);
 
-            g.FillPolygon(brBody, new Point[] { new Point(Convert.ToInt32(_startPosX) + 10, Convert.ToInt32(_startPosY) + 90), new Point(Convert.ToInt32(_startPosX) + 10, Convert.ToInt32(_startPosY) + 40), new Point(Convert.ToInt32(_startPosX) + 110, Convert.ToInt32(_startPosY) + 40), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 60), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 90) });
-            g.FillRectangle(blackturbo, _startPosX + 5, _startPosY + 45, 5, 40);
-
-            g.FillEllipse(brBody, _startPosX + 15, _startPosY + 90, 20, 20);
-            g.FillEllipse(brBody, _startPosX + 45, _startPosY + 90, 20, 20);
-
-
-            g.FillEllipse(brBody, _startPosX + 85, _startPosY + 90, 20, 20);
-            g.FillEllipse(brBody, _startPosX + 115, _startPosY + 90, 20, 20);
-
-            // Окна
-
-            g.DrawRectangle(window, _startPosX + 20, _startPosY + 50, 20, 25);
-            g.DrawRectangle(window, _startPosX + 50, _startPosY + 50, 20, 25);
-
-            // Колёса
-
-            g.DrawEllipse(pen, _startPosX + 15, _startPosY + 90, 20, 20);
-            g.DrawEllipse(pen, _startPosX + 45, _startPosY + 90, 20, 20);
-
-
-            g.DrawEllipse(pen, _startPosX + 85, _startPosY + 90, 20, 20);
-            g.DrawEllipse(pen, _startPosX + 115, _startPosY + 90, 20, 20);
-
-            // Дверь
-
-            g.DrawRectangle(pen, _startPosX + 85, _startPosY + 45, 20, 40);
-
-            // Локомотив
-
-            g.DrawPolygon(pen, new Point[] { new Point(Convert.ToInt32(_startPosX) + 10, Convert.ToInt32(_startPosY) + 90), new Point(Convert.ToInt32(_startPosX) + 10, Convert.ToInt32(_startPosY) + 40), new Point(Convert.ToInt32(_startPosX) + 110, Convert.ToInt32(_startPosY) + 40), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 60), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 90) });
+            g.DrawEllipse(pen, _startPosX + 10, _startPosY + 50, 30, 30);
+            g.DrawEllipse(pen, _startPosX + 50, _startPosY + 50, 30, 30);
+            g.DrawEllipse(pen, _startPosX + 90, _startPosY + 50, 30, 30);
+            g.DrawEllipse(pen, _startPosX + 130, _startPosY + 50, 30, 30);
 
+            g.FillRectangle(brBody, _startPosX + 10, _startPosY + 20, 150, 30);
+            g.FillRectangle(brBody, _startPosX + 10, _startPosY - 20, 40, 40);
+            g.FillRectangle(brBody, _startPosX + 100, _startPosY - 20, 10, 40);
+            g.DrawRectangle(pen, _startPosX + 10, _startPosY + 20, 150, 30);
+            g.DrawRectangle(pen, _startPosX + 10, _startPosY - 20, 40, 40);
+            g.DrawRectangle(pen, _startPosX + 100, _startPosY - 20, 10, 40);
         }
+        /// <summary>
+        /// Смена границ формы отрисовки
+        /// </summary>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
         public void ChangeBorders(int width, int height)
         {
             _pictureWidth = width;
@@ -147,10 +165,6 @@ namespace ElectricLocomotive
                 _startPosY = _pictureHeight.Value - _locomotiveHeight;
             }
         }
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return (_startPosX, _startPosY, _startPosX + _locomotiveWidth, _startPosY + _locomotiveHeight);
-        }
     }
 }
 

ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ElectricLocomotive
-{
-    internal class DrawningObjectLocomotive : IDrawningObject
-    {
-        private DrawningLocomotive _locomotive = null;
-        public DrawningObjectLocomotive(DrawningLocomotive locomotive)
-        {
-            _locomotive = locomotive;
-        }
-        public float Step => _locomotive?.Locomotive?.Step ?? 0;
-
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return _locomotive?.GetCurrentPosition() ?? default;
-        }
-
-        public void MoveObject(Direction direction)
-        {
-            _locomotive?.MoveTransport(direction);
-        }
-
-        public void SetObject(int x, int y, int width, int height)
-        {
-            _locomotive.SetPosition(x, y, width, height);
-        }
-
-        void IDrawningObject.DrawningObject(Graphics g)
-        {
-            _locomotive.DrawTransport(g);
-        }
-    }
-}

ElectricLocomotive/ElectricLocomotive/EntityElectricLocomotive.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ElectricLocomotive
-{
-    internal class EntityElectricLocomotive : EntityLocomotive
-    {
-        public Color DopColor { get; private set; }
-        public bool BodyKit { get; private set; }
-        public bool Wing { get; private set; }
-        public bool SportLine { get; private set; }
-        public EntityElectricLocomotive(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) :
-            base(speed, weight, bodyColor)
-        {
-            DopColor = dopColor;
-            BodyKit = bodyKit;
-            Wing = wing;
-            SportLine = sportLine;
-        }
-    }
-}

ElectricLocomotive/ElectricLocomotive/EntityLocomotive.cs

@@ -7,13 +7,32 @@ using System.Threading.Tasks;
 
 namespace ElectricLocomotive
 {
-        public class EntityLocomotive
+        internal class EntityLocomotive
         {
+            /// <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;
-            public EntityLocomotive(int speed, float weight, Color bodyColor)
+            /// <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(40, 120) : speed;

ElectricLocomotive/ElectricLocomotive/FieldMap.cs

@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ElectricLocomotive
-{
-    internal class FieldMap : AbstractMap
-    {
-        private readonly Brush barrierColor = new SolidBrush(Color.Brown);
-        private readonly Brush roadColor = new SolidBrush(Color.Green);
-
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillEllipse(barrierColor, i * (_size_x-1), j * (_size_y-1), 30, 15);
-        }
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x), j * (_size_y));
-        }
-        protected override void GenerateMap()
-        {
-            _map = new int[100, 100];
-            _size_x = (float)_width / _map.GetLength(0);
-            _size_y = (float)_height / _map.GetLength(1);
-            int counter = 0;
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            }
-            while (counter < 20)
-            {
-                int x = _random.Next(0, 100);
-                int y = _random.Next(0, 100);
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-                    counter++;
-                }
-            }
-        }
-    }
-}

ElectricLocomotive/ElectricLocomotive/FormLocomotive.Designer.cs

@@ -38,8 +38,6 @@
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonCreateModif = new System.Windows.Forms.Button();
-            this.buttonselectlocomotive = new System.Windows.Forms.Button();
             this.statusStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.SuspendLayout();
@@ -96,7 +94,6 @@
             this.pictureBox1.Size = new System.Drawing.Size(800, 428);
             this.pictureBox1.TabIndex = 2;
             this.pictureBox1.TabStop = false;
-            this.pictureBox1.Click += new System.EventHandler(this.ButtonCreateModif_Click);
             // 
             // buttonLeft
             // 
@@ -150,33 +147,11 @@
             this.buttonUp.UseVisualStyleBackColor = true;
             this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
-            // buttonCreateModif
-            // 
-            this.buttonCreateModif.Location = new System.Drawing.Point(93, 396);
-            this.buttonCreateModif.Name = "buttonCreateModif";
-            this.buttonCreateModif.Size = new System.Drawing.Size(103, 23);
-            this.buttonCreateModif.TabIndex = 7;
-            this.buttonCreateModif.Text = "Модификация";
-            this.buttonCreateModif.UseVisualStyleBackColor = true;
-            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
-            // 
-            // buttonselectlocomotive
-            // 
-            this.buttonselectlocomotive.Location = new System.Drawing.Point(202, 396);
-            this.buttonselectlocomotive.Name = "buttonselectlocomotive";
-            this.buttonselectlocomotive.Size = new System.Drawing.Size(82, 23);
-            this.buttonselectlocomotive.TabIndex = 8;
-            this.buttonselectlocomotive.Text = "Выбрать";
-            this.buttonselectlocomotive.UseVisualStyleBackColor = true;
-            this.buttonselectlocomotive.Click += new System.EventHandler(this.ButtonSelectLocomotive_Click);
-            // 
             // FormLocomotive
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.buttonselectlocomotive);
-            this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonUp);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonDown);
@@ -207,7 +182,5 @@
         private Button buttonDown;
         private Button buttonRight;
         private Button buttonUp;
-        private Button buttonCreateModif;
-        private Button buttonselectlocomotive;
     }
 }

ElectricLocomotive/ElectricLocomotive/FormLocomotive.cs

@@ -13,11 +13,25 @@ namespace ElectricLocomotive
     public partial class FormLocomotive : Form
     {
         private DrawningLocomotive _locomotive;
-        public DrawningLocomotive SelectedLocomotive { get; private set; }
         public FormLocomotive()
         {
             InitializeComponent();
         }
+
+        private void ButtonCreate_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            _locomotive = new DrawningLocomotive();
+            _locomotive.Init(rnd.Next(40, 120), rnd.Next(1500, 2000),
+           Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            _locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100),
+           pictureBox1.Width, pictureBox1.Height);
+            toolStripStatusLabelSpeed.Text = $"Скорость: {_locomotive.Locomotive.Speed}";
+            toolStripStatusLabelWeight.Text = $"Вес: {_locomotive.Locomotive.Weight}";
+            toolStripStatusLabelColor.Text = $"Цвет:{_locomotive.Locomotive.BodyColor.Name}";
+            Draw();
+        }
+
         private void Draw()
         {
             Bitmap bmp = new(pictureBox1.Width, pictureBox1.Height);
@@ -25,31 +39,16 @@ namespace ElectricLocomotive
             _locomotive?.DrawTransport(gr);
             pictureBox1.Image = bmp;
         }
-        private void SetData()
-        {
-            Random rnd = new();
-            _locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100),
-            pictureBox1.Width, pictureBox1.Height);
-            toolStripStatusLabelSpeed.Text = $"Скорость: {_locomotive.Locomotive.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {_locomotive.Locomotive.Weight}";
-            toolStripStatusLabelColor.Text = $"Цвет: { _locomotive.Locomotive.BodyColor.Name} ";
-        }
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),
-           rnd.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            _locomotive = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000),
-           color);
-            SetData();
-            Draw();
-        }
-
+        /// <summary>
+        /// Обработка нажатия кнопки "Создать"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <summary>
+        /// Изменение размеров формы
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void ButtonMove_Click(object sender, EventArgs e)
         {
             //получаем имя кнопки
@@ -71,42 +70,16 @@ namespace ElectricLocomotive
             }
             Draw();
         }
-
-        private void PictureBoxLocomotive_Resize(object sender, EventArgs e)
+        /// <summary>
+        /// Изменение размеров формы
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PictureBoxCar_Resize(object sender, EventArgs e)
         {
             _locomotive?.ChangeBorders(pictureBox1.Width, pictureBox1.Height);
             Draw();
         }
 
-        private void ButtonCreateModif_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),
-           rnd.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),
-           rnd.Next(0, 256));
-            ColorDialog dialogDop = new();
-            if (dialogDop.ShowDialog() == DialogResult.OK)
-            {
-                dopColor = dialogDop.Color;
-            }
-            _locomotive = new DrawningElectricLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000),
-           color, dopColor,
-            Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0,
-           2)), Convert.ToBoolean(rnd.Next(0, 2)));
-            SetData();
-            Draw();
-        }
-
-        private void ButtonSelectLocomotive_Click(object sender, EventArgs e)
-        {
-            SelectedLocomotive = _locomotive;
-            DialogResult = DialogResult.OK;
-        }
     }
 }

ElectricLocomotive/ElectricLocomotive/FormMapWithSetLocomotive.Designer.cs

@@ -1,220 +0,0 @@
-namespace ElectricLocomotive
-{
-    partial class FormMapWithSetLocomotive
-    {
-        /// <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.pictureBox1 = new System.Windows.Forms.PictureBox();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            this.buttonAddLocomotive = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
-            this.buttonRemoveCar = new System.Windows.Forms.Button();
-            this.buttonShowStorage = new System.Windows.Forms.Button();
-            this.buttonShowOnMap = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // pictureBox1
-            // 
-            this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pictureBox1.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(631, 449);
-            this.pictureBox1.TabIndex = 10;
-            this.pictureBox1.TabStop = false;
-            // 
-            // buttonUp
-            // 
-            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonUp.AutoSize = true;
-            this.buttonUp.BackgroundImage = global::ElectricLocomotive.Properties.Resources.arrowup;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(699, 372);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 30);
-            this.buttonUp.TabIndex = 14;
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonRight
-            // 
-            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonRight.AutoSize = true;
-            this.buttonRight.BackgroundImage = global::ElectricLocomotive.Properties.Resources.arrowright;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(735, 408);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 30);
-            this.buttonRight.TabIndex = 13;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonDown
-            // 
-            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonDown.AutoSize = true;
-            this.buttonDown.BackgroundImage = global::ElectricLocomotive.Properties.Resources.arrowdown;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(699, 408);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 30);
-            this.buttonDown.TabIndex = 12;
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonLeft
-            // 
-            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonLeft.AutoSize = true;
-            this.buttonLeft.BackgroundImage = global::ElectricLocomotive.Properties.Resources.arrowleft;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(663, 408);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
-            this.buttonLeft.TabIndex = 11;
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(637, 9);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(83, 15);
-            this.label1.TabIndex = 15;
-            this.label1.Text = "Инструменты";
-            // 
-            // buttonAddLocomotive
-            // 
-            this.buttonAddLocomotive.Location = new System.Drawing.Point(637, 98);
-            this.buttonAddLocomotive.Name = "buttonAddLocomotive";
-            this.buttonAddLocomotive.Size = new System.Drawing.Size(151, 28);
-            this.buttonAddLocomotive.TabIndex = 17;
-            this.buttonAddLocomotive.Text = "Добавить локомотив";
-            this.buttonAddLocomotive.UseVisualStyleBackColor = true;
-            this.buttonAddLocomotive.Click += new System.EventHandler(this.ButtonAddLocomotive_Click);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Карта с грязью",
-            "Карта с кустами"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(637, 43);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 23);
-            this.comboBoxSelectorMap.TabIndex = 22;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // maskedTextBoxPosition
-            // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(637, 151);
-            this.maskedTextBoxPosition.Mask = "00";
-            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            this.maskedTextBoxPosition.Size = new System.Drawing.Size(151, 23);
-            this.maskedTextBoxPosition.TabIndex = 23;
-            this.maskedTextBoxPosition.ValidatingType = typeof(int);
-            // 
-            // buttonRemoveCar
-            // 
-            this.buttonRemoveCar.Location = new System.Drawing.Point(637, 178);
-            this.buttonRemoveCar.Name = "buttonRemoveCar";
-            this.buttonRemoveCar.Size = new System.Drawing.Size(151, 28);
-            this.buttonRemoveCar.TabIndex = 24;
-            this.buttonRemoveCar.Text = "Удалить локомотив";
-            this.buttonRemoveCar.UseVisualStyleBackColor = true;
-            this.buttonRemoveCar.Click += new System.EventHandler(this.ButtonRemoveLocomotive_Click);
-            // 
-            // buttonShowStorage
-            // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(637, 239);
-            this.buttonShowStorage.Name = "buttonShowStorage";
-            this.buttonShowStorage.Size = new System.Drawing.Size(151, 28);
-            this.buttonShowStorage.TabIndex = 25;
-            this.buttonShowStorage.Text = "Посмотреть хранилище";
-            this.buttonShowStorage.UseVisualStyleBackColor = true;
-            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
-            // 
-            // buttonShowOnMap
-            // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(637, 328);
-            this.buttonShowOnMap.Name = "buttonShowOnMap";
-            this.buttonShowOnMap.Size = new System.Drawing.Size(151, 28);
-            this.buttonShowOnMap.TabIndex = 26;
-            this.buttonShowOnMap.Text = "Посмотреть карту";
-            this.buttonShowOnMap.UseVisualStyleBackColor = true;
-            this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
-            // 
-            // FormMapWithSetLocomotive
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.buttonRemoveCar);
-            this.Controls.Add(this.buttonShowStorage);
-            this.Controls.Add(this.buttonShowOnMap);
-            this.Controls.Add(this.maskedTextBoxPosition);
-            this.Controls.Add(this.comboBoxSelectorMap);
-            this.Controls.Add(this.buttonAddLocomotive);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.buttonUp);
-            this.Controls.Add(this.buttonRight);
-            this.Controls.Add(this.buttonDown);
-            this.Controls.Add(this.buttonLeft);
-            this.Controls.Add(this.pictureBox1);
-            this.Name = "FormMapWithSetLocomotive";
-            this.Text = "Карта с набором объектов";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-        private PictureBox pictureBox1;
-        private Button buttonUp;
-        private Button buttonRight;
-        private Button buttonDown;
-        private Button buttonLeft;
-        private Label label1;
-        private Button buttonAddLocomotive;
-        private ComboBox comboBoxSelectorMap;
-        private MaskedTextBox maskedTextBoxPosition;
-        private Button buttonRemoveCar;
-        private Button buttonShowStorage;
-        private Button buttonShowOnMap;
-    }
-}

ElectricLocomotive/ElectricLocomotive/FormMapWithSetLocomotive.cs

@@ -1,132 +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 ElectricLocomotive
-{
-    public partial class FormMapWithSetLocomotive : Form
-    {
-        private MapWithSetLocomotivGeneric<DrawningObjectLocomotive, AbstractMap> _mapLocomotivesCollectionGeneric;
-        public FormMapWithSetLocomotive()
-        {
-            InitializeComponent();
-        }
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender,
-       EventArgs e)
-        {
-            AbstractMap map = null;
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Простая карта":
-                    map = new SimpleMap();
-                    break;
-                case "Карта с грязью":
-                    map = new FieldMap();
-                    break;
-                case "Карта с кустами":
-                    map = new BushesMap();
-                    break;
-            }
-            if (map != null)
-            {
-                _mapLocomotivesCollectionGeneric = new MapWithSetLocomotivGeneric<DrawningObjectLocomotive, AbstractMap>(pictureBox1.Width, pictureBox1.Height, map);
-            }
-            else
-            {
-                _mapLocomotivesCollectionGeneric = null;
-            }
-        }
-        private void ButtonAddLocomotive_Click(object sender, EventArgs e)
-        {
-            if (_mapLocomotivesCollectionGeneric == null)
-            {
-                return;
-            }
-            FormLocomotive form = new();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                DrawningObjectLocomotive Locomotive = new(form.SelectedLocomotive);
-                if (_mapLocomotivesCollectionGeneric + Locomotive != -1)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox1.Image = _mapLocomotivesCollectionGeneric.ShowSet();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            }
-        }
-        private void ButtonRemoveLocomotive_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
-            {
-                return;
-            }
-            if (MessageBox.Show("Удалить объект?", "Удаление",
-           MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapLocomotivesCollectionGeneric - pos != null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBox1.Image = _mapLocomotivesCollectionGeneric.ShowSet();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-        }
-        private void ButtonShowStorage_Click(object sender, EventArgs e)
-        {
-            if (_mapLocomotivesCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox1.Image = _mapLocomotivesCollectionGeneric.ShowSet();
-        }
-        private void ButtonShowOnMap_Click(object sender, EventArgs e)
-        {
-            if (_mapLocomotivesCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox1.Image = _mapLocomotivesCollectionGeneric.ShowOnMap();
-        }
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            if (_mapLocomotivesCollectionGeneric == null)
-            {
-                return;
-            }
-            //получаем имя кнопки
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            Direction dir = Direction.None;
-            switch (name)
-            {
-                case "buttonUp":
-                    dir = Direction.Up;
-                    break;
-                case "buttonDown":
-                    dir = Direction.Down;
-                    break;
-                case "buttonLeft":
-                    dir = Direction.Left;
-                    break;
-                case "buttonRight":
-                    dir = Direction.Right;
-                    break;
-            }
-            pictureBox1.Image = _mapLocomotivesCollectionGeneric.MoveObject(dir);
-        }
-    }
-}
-

ElectricLocomotive/ElectricLocomotive/FormMapWithSetLocomotive.resx

@@ -1,60 +0,0 @@
-<root>
-  <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>
-</root>

ElectricLocomotive/ElectricLocomotive/IDrawningObject.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ElectricLocomotive
-{
-    internal interface IDrawningObject
-    {
-		public float Step { get; }
-		void SetObject(int x, int y, int width, int height);
-		void MoveObject(Direction direction);
-		void DrawningObject(Graphics g);
-		(float Left, float Right, float Top, float Bottom) GetCurrentPosition();
-	}
-}

ElectricLocomotive/ElectricLocomotive/MapWithSetLocomotivGeneric.cs

@@ -1,151 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ElectricLocomotive
-{
-    internal class MapWithSetLocomotivGeneric<T, U>
- where T : class, IDrawningObject
-        where U : AbstractMap
-    {
-        // Ширина окна отрисовки
-        private readonly int _pictureWidth;
-        // Высота окна отрисовки
-        private readonly int _pictureHeight;
-        // Размер занимаемого объектом места (ширина)
-        private readonly int _placeSizeWidth = 180;
-        // Размер занимаемого объектом места (высота)
-        private readonly int _placeSizeHeight = 150;
-        // Набор объектов
-        private readonly SetLocomotivGeneric<T> _setLocomotive;
-        // Карта
-        private readonly U _map;
-
-        private readonly T[] _places;
-        // Конструктор
-        public MapWithSetLocomotivGeneric(int picWidth, int picHeight, U map)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _setLocomotive = new SetLocomotivGeneric<T>(width * height);
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-            _map = map;
-        }
-        // Перегрузка оператора сложения
-        public static int operator +(MapWithSetLocomotivGeneric<T, U> map, T Locomotive)
-        {
-            return map._setLocomotive.Insert(Locomotive);
-        }
-        // Перегрузка оператора вычитания
-        public static T operator -(MapWithSetLocomotivGeneric<T, U> map, int position)
-        {
-
-            return map._setLocomotive.Remove(position);
-        }
-        // Вывод всего набора объектов
-        public Bitmap ShowSet()
-        {
-            Bitmap bmp = new(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawLocomotive(gr);
-            return bmp;
-        }
-        // Просмотр объекта на карте
-        public Bitmap ShowOnMap()
-        {
-            Shaking();
-            for (int i = 0; i < _setLocomotive.Count; i++)
-            {
-                var Locomotive = _setLocomotive.Get(i);
-                if (Locomotive != null)
-                {
-                    return _map.CreateMap(_pictureWidth, _pictureHeight, Locomotive);
-                }
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-        // Перемещение объекта по карте
-        public Bitmap MoveObject(Direction direction)
-        {
-            if (_map != null)
-            {
-                return _map.MoveObject(direction);
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-        // "Взбалтываем" набор, чтобы все элементы оказались в начале
-        private void Shaking()
-        {
-            int j = _setLocomotive.Count - 1;
-            for (int i = 0; i < _setLocomotive.Count; i++)
-            {
-                if (_setLocomotive.Get(i) == null)
-                {
-                    for (; j > i; j--)
-                    {
-                        var Locomotive = _setLocomotive.Get(j);
-                        if (Locomotive != null)
-                        {
-                            _setLocomotive.Insert(Locomotive, i);
-                            _setLocomotive.Remove(j);
-                            break;
-                        }
-                    }
-                    if (j <= i)
-                    {
-                        return;
-                    }
-                }
-            }
-        }
-        // Метод отрисовки фона
-        private void DrawBackground(Graphics g)
-        {
-            Pen pen = new(Color.Sienna, 3);
-            Brush brush = new SolidBrush(Color.DodgerBlue);
-            g.FillRectangle(brush, 0, 0, _pictureWidth, _pictureHeight);
-            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
-            {
-                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
-                {
-                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight + 2, i * _placeSizeWidth + _placeSizeWidth / 2 + 40, j * _placeSizeHeight + 2);
-                }
-                g.DrawLine(pen, i * _placeSizeWidth + 7, 2, i * _placeSizeWidth + 7, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
-                g.DrawLine(pen, i * _placeSizeWidth + 3, 2, i * _placeSizeWidth + 3, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
-            }
-        }
-        // Метод прорисовки объектов
-        private void DrawLocomotive(Graphics g)
-        {
-            int widthEl = _pictureWidth / _placeSizeWidth;
-            int heightEl = _pictureHeight / _placeSizeHeight;
-
-            int curWidth = 0;
-            int curHeight = 0;
-
-            for (int i = _setLocomotive.Count; i >= 0; i--)
-            {
-                _setLocomotive.Get(i)?.SetObject(_pictureWidth - _placeSizeWidth * curWidth - 85,
-                    curHeight * _placeSizeHeight + 10, _pictureWidth, _pictureHeight);
-                _setLocomotive.Get(i)?.DrawningObject(g);
-
-                if (curWidth < widthEl)
-                    curWidth++;
-                else
-                {
-                    curWidth = 1;
-                    curHeight++;
-                }
-                if (curHeight > heightEl)
-                {
-                    return;
-                }
-
-            }
-        }
-    }
-}

ElectricLocomotive/ElectricLocomotive/Program.cs

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

ElectricLocomotive/ElectricLocomotive/SetLocomotivGeneric.cs

@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ElectricLocomotive
-{
-    internal class SetLocomotivGeneric<T>
-where T : class
-	{
-		// Массив объектов, которые храним
-		private readonly T[] _places;
-		// Количество объектов в массиве
-		public int Count => _places.Length;
-		// Конструктор
-		public SetLocomotivGeneric(int count)
-		{
-			_places = new T[count];
-		}
-		// Добавление объекта в набор
-		public int Insert(T Locomotive)
-		{
-			// вставка в начало набора
-			return Insert(Locomotive, 0);
-		}
-		// Добавление объекта в набор на конкретную позицию
-		public int Insert(T Locomotive, int position)
-		{
-			//  проверка позиции
-			if (position >= _places.Length || position < 0)
-				return -1;
-			//проверка, что элемент массива по этой позиции пустой, если нет, то
-			if (_places[position] == null)
-			{
-				_places[position] = Locomotive;
-				return position;
-			}
-			//проверка, что после вставляемого элемента в массиве есть пустой элемент
-			int findEmptyPos = -1;
-
-			for (int i = position + 1; i < Count; i++)
-			{
-				if (_places[i] == null)
-				{
-					findEmptyPos = i;
-					break;
-				}
-			}
-			if (findEmptyPos < 0) return -1;
-
-			//сдвиг всех объектов, находящихся справа от позиции до первого пустого элемента
-			for (int i = findEmptyPos; i > position; i--)
-			{
-				_places[i] = _places[i - 1];
-			}
-			// вставка по позиции
-			_places[position] = Locomotive;
-			return position;
-		}
-		// Удаление объекта из набора с конкретной позиции
-		public T Remove(int position)
-		{
-			// проверка позиции
-			if (position >= _places.Length || position < 0) return null;
-			// удаление объекта из массива, присовив элементу массива значение null
-			T temp = _places[position];
-			_places[position] = null;
-			return temp;
-		}
-		// Получение объекта из набора по позиции
-		public T Get(int position)
-		{
-			// проверка позиции
-			if (position >= _places.Length || position < 0)
-				return null;
-			return _places[position];
-		}
-	}
-}

ElectricLocomotive/ElectricLocomotive/SimpleMap.cs

@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ElectricLocomotive
-{
-    internal class SimpleMap : AbstractMap
-    {
-        private readonly Brush barrierColor = new SolidBrush(Color.Black);
-        private readonly Brush roadColor = new SolidBrush(Color.Gray);
-
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x), j * (_size_y));
-        }
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x), j * (_size_y));
-        }
-        protected override void GenerateMap()
-        {
-            _map = new int[100, 100];
-            _size_x = (float)_width / _map.GetLength(0);
-            _size_y = (float)_height / _map.GetLength(1);
-            int counter = 0;
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            }
-            while (counter < 50)
-            {
-                int x = _random.Next(0, 100);
-                int y = _random.Next(0, 100);
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-                    counter++;
-                }
-            }
-        }
-    }
-}