Merge pull request 'Tomasheva_Lab_№1' (#2) from Lab1 into master

Reviewed-on: http://student.git.athene.tech/Saanechkaa/ISEbd-21_Tomasheva_RoadTrain_Base/pulls/2

RoadTrain/RoadTrain/AbstractMap.cs

@@ -1,118 +0,0 @@
-namespace RoadTrain
-{
-    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 bool CheckBarrier(float Left, float Right, float Top, float Bottom)
-        {
-            int startX = (int)(Left / _size_x);
-            int startY = (int)(Right / _size_y);
-            int endX = (int)(Top / _size_x);
-            int endY = (int)(Bottom / _size_y);
-            for (int i = startX; i<= endX; i++)
-            {
-                for (int j = startY; j<= endY; j++)
-                {
-                    if (_map[i, j] == _barrier)
-                    {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-
-        public Bitmap MoveObject(Direction direction)
-        {
-            _drawningObject.MoveObject(direction);
-            (float Left, float Top, float Right, float Bottom) = _drawningObject.GetCurrentPosition();
-            if (CheckBarrier(Left, Top, Right, Bottom))
-            {
-                _drawningObject.MoveObject(MoveObjectNew(direction));
-            }
-            return DrawMapWithObject();
-        }
-
-        private Direction MoveObjectNew(Direction direction)
-        {
-            switch (direction)
-            {
-                case Direction.Up:
-                    return Direction.Down;
-                case Direction.Down:
-                    return Direction.Up;
-                case Direction.Left:
-                    return Direction.Right;
-                case Direction.Right:
-                    return Direction.Left;
-            }
-            return Direction.None;
-        }
-
-        private bool SetObjectOnMap()
-        {
-            if (_drawningObject == null || _map == null)
-            {
-                return false;
-            }
-            int x = _random.Next(0, 10);
-            int y = _random.Next(0, 10);
-            _drawningObject.SetObject(x, y, _width, _height);
-            (float Left, float Top, float Right, float Bottom) = _drawningObject.GetCurrentPosition();
-            if (!CheckBarrier(Left, Top, Right, Bottom)) return true;
-            return false;
-        }
-
-        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);
-
-    }
-}

RoadTrain/RoadTrain/Direction.cs

@@ -1,8 +1,13 @@
-namespace RoadTrain
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RoadTrain
 {
-    public enum Direction
+    internal enum Direction
     {
-        None = 0,
         Up = 1,
         Down = 2,
         Left = 3,

RoadTrain/RoadTrain/DrawningObjectRoadTrain.cs

@@ -1,34 +0,0 @@
-namespace RoadTrain
-{
-    internal class DrawningObjectRoadTrain : IDrawningObject
-    {
-        private DrawningRoadTrain _roadTrain = null;
-
-        public DrawningObjectRoadTrain(DrawningRoadTrain roadTrain)
-        {
-            _roadTrain = roadTrain;
-        }
-
-        public float Step => _roadTrain?.RoadTrain?.Step ?? 0;
-
-        public (float Left, float Top, float Right, float Bottom) GetCurrentPosition()
-        {
-            return _roadTrain?.GetCurrentPosition() ?? default;
-        }
-
-        public void MoveObject(Direction direction)
-        {
-            _roadTrain?.MoveTransport(direction);
-        }
-
-        public void SetObject(int x, int y, int width, int height)
-        {
-            _roadTrain.SetPosition(x, y, width, height);
-        }
-
-        public void DrawningObject(Graphics g)
-        {
-            _roadTrain.DrawTransport(g);
-        }
-    }
-}

RoadTrain/RoadTrain/DrawningRoadTrain.cs

@@ -1,47 +1,52 @@
-namespace RoadTrain
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RoadTrain
 {
-    public class DrawningRoadTrain
+    internal class DrawningRoadTrain
     {
         /// <summary>
         /// Класс-сущность
         /// </summary>
-        public EntityRoadTrain RoadTrain { protected set; get; }
-
+        public EntityRoadTrain RoadTrain { private set; get; }
         /// <summary>
         /// Левая координата отрисовки грузовика
         /// </summary>
-        protected float _startPosX;
-
+        private float _startPosX;
         /// <summary>
         /// Верхняя кооридната отрисовки грузовика
         /// </summary>
-        protected float _startPosY;
-
+        private float _startPosY;
         /// <summary>
         /// Ширина окна отрисовки
         /// </summary>
         private int? _pictureWidth = null;
-
         /// <summary>
         /// Высота окна отрисовки
         /// </summary>
         private int? _pictureHeight = null;
-
         /// <summary>
         /// Ширина отрисовки грузовика
         /// </summary>
         private readonly int _RoadTrainWidth = 185;
-
         /// <summary>
         /// Высота отрисовки грузовика
         /// </summary>
-        private readonly int _RoadTrainHeight = 155;
-
-        public DrawningRoadTrain(int speed, float weight, Color bodyColor)
+        private readonly int _RoadTrainHeight = 150;
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес грузовика</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        public void Init(int speed, float weight, Color bodyColor)
         {
-            RoadTrain = new EntityRoadTrain(speed, weight, bodyColor);
+            RoadTrain = new EntityRoadTrain();
+            RoadTrain.Init(speed, weight, bodyColor);
         }
-
         /// <summary>
         /// Установка позиции грузовика
         /// </summary>
@@ -62,7 +67,6 @@
             _pictureWidth = width;
             _pictureHeight = height;
         }
-
         /// <summary>
         /// Изменение направления перемещения
         /// </summary>
@@ -105,50 +109,38 @@
                     break;
             }
         }
-
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес грузовика</param>
-        /// <param name="bodyColor">Цвет кузова</param>
-        /// <param name="carWidth">Ширина отрисовки грузовика</param>
-        /// <param name="carHeight">Высота отрисовки грузовика</param>
-        protected DrawningRoadTrain(int speed, float weight, Color bodyColor, int RoadTrainWidth, int RoadTrainHeight) :
-        this(speed, weight, bodyColor)
-        {
-            _RoadTrainWidth = RoadTrainWidth;
-            _RoadTrainHeight = RoadTrainHeight;
-        }
-
         /// <summary>
         /// Отрисовка грузовика
         /// </summary>
         /// <param name="g"></param>
-        public virtual void DrawTransport(Graphics g)
+        public void DrawTransport(Graphics g)
         {
+ 
             Brush mainColor = new SolidBrush(RoadTrain?.BodyColor ?? Color.Black);
             Brush brBlack = new SolidBrush(Color.Black);
             Brush brGray = new SolidBrush(Color.Gray);
             Brush brBlue = new SolidBrush(Color.Blue);
+            Brush brYellow = new SolidBrush(Color.Yellow);
+            Brush brBrown = new SolidBrush(Color.Brown);
             Pen pen = new Pen(Color.Black);
-            g.FillRectangle(brBlack, _startPosX+15, _startPosY + 100, 185, 20); //Платформа
-            g.DrawRectangle(pen, _startPosX+15, _startPosY + 100, 185, 20);   
-            g.FillRectangle(mainColor, _startPosX + 125, _startPosY+10, 75, 90);//Кабина
-            g.DrawRectangle(pen, _startPosX + 125, _startPosY+10,75, 90);
-            g.FillRectangle(brBlue, _startPosX + 165, _startPosY + 30, 30, 50);//Окно
-            g.DrawRectangle(pen, _startPosX + 165, _startPosY + 30, 30, 50);
-            g.FillEllipse(brGray, _startPosX+15, _startPosY + 120, 40, 40);//Колёса
-            g.DrawEllipse(pen, _startPosX+15, _startPosY + 120, 40, 40);
-            g.FillEllipse(brBlack, _startPosX + 20, _startPosY + 125, 30, 30);
-            g.FillEllipse(brGray, _startPosX + 60, _startPosY + 120, 40, 40);
-            g.DrawEllipse(pen, _startPosX + 60, _startPosY + 120, 40, 40);
-            g.FillEllipse(brBlack, _startPosX + 65, _startPosY + 125, 30, 30);
-            g.FillEllipse(brGray, _startPosX + 155, _startPosY + 120, 40, 40);
-            g.DrawEllipse(pen, _startPosX + 155, _startPosY + 120, 40, 40);
-            g.FillEllipse(brBlack, _startPosX + 160, _startPosY + 125, 30, 30);
-        }
 
+            g.FillRectangle(brBlack, _startPosX, _startPosY + 90, 185, 20); //Платформа
+            g.DrawRectangle(pen, _startPosX, _startPosY + 90, 185, 20);
+            g.FillRectangle(mainColor, _startPosX + 110, _startPosY, 75, 90);//Кабина
+            g.DrawRectangle(pen, _startPosX + 110, _startPosY, 75, 90);
+            g.FillRectangle(brBlue, _startPosX + 150, _startPosY + 20, 30, 50);//Окно
+            g.DrawRectangle(pen, _startPosX + 150, _startPosY + 20, 30, 50);
+            g.FillEllipse(brGray, _startPosX, _startPosY + 110, 40, 40);//Колёса
+            g.DrawEllipse(pen, _startPosX, _startPosY + 110, 40, 40);
+            g.FillEllipse(brBlack, _startPosX + 5, _startPosY + 115, 30, 30);
+            g.FillEllipse(brGray, _startPosX + 45, _startPosY + 110, 40, 40);
+            g.DrawEllipse(pen, _startPosX + 45, _startPosY + 110, 40, 40);
+            g.FillEllipse(brBlack, _startPosX + 50, _startPosY + 115, 30, 30);
+            g.FillEllipse(brGray, _startPosX + 140, _startPosY + 110, 40, 40);
+            g.DrawEllipse(pen, _startPosX + 140, _startPosY + 110, 40, 40);
+            g.FillEllipse(brBlack, _startPosX + 145, _startPosY + 115, 30, 30);
+
+        }
         /// <summary>
         /// Смена границ формы отрисовки
         /// </summary>
@@ -173,14 +165,5 @@
                 _startPosY = _pictureHeight.Value - _RoadTrainHeight;
             }
         }
-
-        /// <summary>
-        /// Получение текущей позиции объекта
-        /// </summary>
-        /// <returns></returns>
-        public (float Left, float Top, float Right, float Bottom) GetCurrentPosition()
-        {
-            return (_startPosX, _startPosY, _startPosX + _RoadTrainWidth, _startPosY + _RoadTrainHeight);
-        }
     }
 }

RoadTrain/RoadTrain/DrawningSweeperRoadTrain.cs

@@ -1,74 +0,0 @@
-namespace RoadTrain
-{
-    /// <summary>
-    /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
-    /// </summary>
-    public class DrawningSweeperRoadTrain : DrawningRoadTrain
-    {
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес грузовика</param>
-        /// <param name="bodyColor">Цвет кузова</param>
-        /// <param name="dopColor">Дополнительный цвет</param>
-        /// <param name="waterTank">Признак наличия водяного бака</param>
-        /// <param name="sweepingBush">Признак наличия подметальной щётки</param>
-        public DrawningSweeperRoadTrain(int speed, float weight, Color bodyColor, Color dopColor, bool waterTank, bool sweepingBush) :
-        base(speed, weight, bodyColor, 285, 170)
-        {
-           RoadTrain = new EntitySweeperRoadTrain(speed, weight, bodyColor, dopColor, waterTank,
-           sweepingBush);
-        }
-
-        public override void DrawTransport(Graphics g)
-        {
-            if (RoadTrain is not EntitySweeperRoadTrain SweeperRoadTrain)
-            {
-                return;
-            }
-            Pen pen = new(Color.Black);
-            Brush dopBrush = new SolidBrush(SweeperRoadTrain.DopColor);
-            Brush YellowBrush = new SolidBrush(Color.Yellow);
-            if (SweeperRoadTrain.WaterTank)
-            {
-                g.FillRectangle(dopBrush, _startPosX + 20, _startPosY+20, 105, 80);
-                g.DrawRectangle(pen, _startPosX + 20, _startPosY+20, 105, 80);
-            }
-            base.DrawTransport(g);
-            if (SweeperRoadTrain.SweepingBush)
-            {
-                PointF[] handle = {
-                    new PointF(_startPosX + 200, _startPosY + 100),
-                    new PointF(_startPosX +245,  _startPosY + 105),
-                    new PointF(_startPosX +265,  _startPosY + 130),
-                    new PointF(_startPosX +240,  _startPosY + 130),
-                    new PointF(_startPosX +235,  _startPosY + 120),
-                    new PointF(_startPosX +200,  _startPosY + 120),
-                    new PointF(_startPosX +200,  _startPosY + 105)
-                };
-            g.FillPolygon(dopBrush, handle);
-            g.DrawPolygon(pen, handle);
-
-            PointF[] holder = {
-                    new PointF(_startPosX + 235, _startPosY + 130),
-                    new PointF(_startPosX +285,  _startPosY + 130),
-                    new PointF(_startPosX +290,  _startPosY + 140),
-                    new PointF(_startPosX +225,  _startPosY + 140),
-                    new PointF(_startPosX +235,  _startPosY + 130)
-                };
-            g.FillPolygon(dopBrush, holder);
-            g.DrawPolygon(pen, holder);
-            PointF[] sweep = {
-                    new PointF(_startPosX + 225, _startPosY + 140),
-                    new PointF(_startPosX +290,  _startPosY + 140),
-                    new PointF(_startPosX +300,  _startPosY + 160),
-                    new PointF(_startPosX +215,  _startPosY + 160),
-                    new PointF(_startPosX +225,  _startPosY + 140)
-                };
-            g.FillPolygon(YellowBrush, sweep);
-            g.DrawPolygon(pen, sweep);
-            }
-        }
-    }
-}

RoadTrain/RoadTrain/EntityRoadTrain.cs

@@ -1,27 +1,29 @@
-namespace RoadTrain
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RoadTrain
 {
-    public class EntityRoadTrain
+    internal class EntityRoadTrain
     {
         /// <summary>
         /// Скорость
         /// </summary>
         public int Speed { get; private set; }
-
         /// <summary>
         /// Вес
         /// </summary>
         public float Weight { get; private set; }
-
         /// <summary>
         /// Цвет кузова
         /// </summary>
         public Color BodyColor { get; private set; }
-
         /// <summary>
         /// Шаг перемещения грузовика
         /// </summary>
         public float Step => Speed * 100 / Weight;
-
         /// <summary>
         /// Инициализация полей объекта-класса грузовика
         /// </summary>
@@ -29,13 +31,12 @@
         /// <param name="weight"></param>
         /// <param name="bodyColor"></param>
         /// <returns></returns>
-        public EntityRoadTrain(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight, Color bodyColor)
         {
             Random rnd = new();
             Speed = speed <= 0 ? rnd.Next(50, 150) : speed;
             Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
             BodyColor = bodyColor;
         }
-        
     }
 }

RoadTrain/RoadTrain/EntitySweeperRoadTrain.cs

@@ -1,41 +0,0 @@
-namespace RoadTrain
-{
-    /// <summary>
-    /// Класс-сущность "Подметально-уборочная машина"
-    /// </summary>
-    internal class EntitySweeperRoadTrain : EntityRoadTrain
-    {
-        /// <summary>
-        /// Дополнительный цвет
-        /// </summary>
-        public Color DopColor { get; private set; }
-
-        /// <summary>
-        /// Признак наличия бака под воду
-        /// </summary>
-        public bool WaterTank { get; private set; }
-
-        /// <summary>
-        /// Признак наличия подметательной щётки
-        /// </summary>
-        public bool SweepingBush { get; private set; }
-
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес грузовика</param>
-        /// <param name="bodyColor">Цвет кузова</param>
-        /// <param name="dopColor">Дополнительный цвет</param>
-        /// <param name="waterTank">Признак водяного бака</param>
-        /// <param name="sweepingBush">Признак подметательной щётки</param>
-        public EntitySweeperRoadTrain(int speed, float weight, Color bodyColor, Color
-       dopColor, bool waterTank, bool sweepingBush) :
-        base(speed, weight, bodyColor)
-        {
-            DopColor = dopColor;
-            WaterTank = waterTank;
-            SweepingBush = sweepingBush;
-        }
-    }
-}

RoadTrain/RoadTrain/FormMapWithSetRoadTrains.Designer.cs

@@ -1,216 +0,0 @@
-namespace RoadTrain
-{
-    partial class FormMapWithSetRoadTrains
-    {
-        /// <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.pictureBox = new System.Windows.Forms.PictureBox();
-            this.groupBox = new System.Windows.Forms.GroupBox();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
-            this.buttonShowOnMap = new System.Windows.Forms.Button();
-            this.buttonShowStorage = new System.Windows.Forms.Button();
-            this.buttonRemoveRoadTrain = new System.Windows.Forms.Button();
-            this.buttonAddRoadTrain = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
-            this.groupBox.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // pictureBox
-            // 
-            this.pictureBox.Location = new System.Drawing.Point(3, 3);
-            this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(644, 445);
-            this.pictureBox.TabIndex = 0;
-            this.pictureBox.TabStop = false;
-            // 
-            // groupBox
-            // 
-            this.groupBox.Controls.Add(this.buttonRight);
-            this.groupBox.Controls.Add(this.buttonUp);
-            this.groupBox.Controls.Add(this.buttonDown);
-            this.groupBox.Controls.Add(this.buttonLeft);
-            this.groupBox.Controls.Add(this.maskedTextBoxPosition);
-            this.groupBox.Controls.Add(this.buttonShowOnMap);
-            this.groupBox.Controls.Add(this.buttonShowStorage);
-            this.groupBox.Controls.Add(this.buttonRemoveRoadTrain);
-            this.groupBox.Controls.Add(this.buttonAddRoadTrain);
-            this.groupBox.Controls.Add(this.comboBoxSelectorMap);
-            this.groupBox.Location = new System.Drawing.Point(653, 3);
-            this.groupBox.Name = "groupBox";
-            this.groupBox.Size = new System.Drawing.Size(175, 445);
-            this.groupBox.TabIndex = 1;
-            this.groupBox.TabStop = false;
-            this.groupBox.Text = "Инструменты";
-            // 
-            // buttonRight
-            // 
-            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonRight.BackgroundImage = global::RoadTrain.Properties.Resources.arrowRight;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonRight.Location = new System.Drawing.Point(103, 415);
-            this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(26, 22);
-            this.buttonRight.TabIndex = 13;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonUp
-            // 
-            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonUp.BackgroundImage = global::RoadTrain.Properties.Resources.arrowUp;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonUp.Location = new System.Drawing.Point(74, 387);
-            this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(26, 22);
-            this.buttonUp.TabIndex = 12;
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.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.BackgroundImage = global::RoadTrain.Properties.Resources.arrowDown;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonDown.Location = new System.Drawing.Point(74, 414);
-            this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(26, 22);
-            this.buttonDown.TabIndex = 11;
-            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.BackgroundImage = global::RoadTrain.Properties.Resources.arrowLeft;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonLeft.Location = new System.Drawing.Point(43, 414);
-            this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(26, 22);
-            this.buttonLeft.TabIndex = 10;
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // maskedTextBoxPosition
-            // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 159);
-            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            this.maskedTextBoxPosition.Size = new System.Drawing.Size(160, 23);
-            this.maskedTextBoxPosition.TabIndex = 5;
-            // 
-            // buttonShowOnMap
-            // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(6, 318);
-            this.buttonShowOnMap.Name = "buttonShowOnMap";
-            this.buttonShowOnMap.Size = new System.Drawing.Size(160, 23);
-            this.buttonShowOnMap.TabIndex = 4;
-            this.buttonShowOnMap.Text = "Посмотреть карту";
-            this.buttonShowOnMap.UseVisualStyleBackColor = true;
-            this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
-            // 
-            // buttonShowStorage
-            // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(6, 253);
-            this.buttonShowStorage.Name = "buttonShowStorage";
-            this.buttonShowStorage.Size = new System.Drawing.Size(160, 32);
-            this.buttonShowStorage.TabIndex = 3;
-            this.buttonShowStorage.Text = "Посмотреть хранилище";
-            this.buttonShowStorage.UseVisualStyleBackColor = true;
-            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
-            // 
-            // buttonRemoveRoadTrain
-            // 
-            this.buttonRemoveRoadTrain.Location = new System.Drawing.Point(6, 188);
-            this.buttonRemoveRoadTrain.Name = "buttonRemoveRoadTrain";
-            this.buttonRemoveRoadTrain.Size = new System.Drawing.Size(160, 27);
-            this.buttonRemoveRoadTrain.TabIndex = 2;
-            this.buttonRemoveRoadTrain.Text = "Удалить грузовик";
-            this.buttonRemoveRoadTrain.UseVisualStyleBackColor = true;
-            this.buttonRemoveRoadTrain.Click += new System.EventHandler(this.ButtonRemoveRoadTrain_Click);
-            // 
-            // buttonAddRoadTrain
-            // 
-            this.buttonAddRoadTrain.Location = new System.Drawing.Point(6, 89);
-            this.buttonAddRoadTrain.Name = "buttonAddRoadTrain";
-            this.buttonAddRoadTrain.Size = new System.Drawing.Size(160, 32);
-            this.buttonAddRoadTrain.TabIndex = 1;
-            this.buttonAddRoadTrain.Text = "Добавить грузовик";
-            this.buttonAddRoadTrain.UseVisualStyleBackColor = true;
-            this.buttonAddRoadTrain.Click += new System.EventHandler(this.ButtonAddRoadTrain_Click);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Дорога"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 31);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(160, 23);
-            this.comboBoxSelectorMap.TabIndex = 0;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // FormMapWithSetRoadTrains
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(831, 450);
-            this.Controls.Add(this.groupBox);
-            this.Controls.Add(this.pictureBox);
-            this.Name = "FormMapWithSetRoadTrains";
-            this.Text = "Карта с набором объектов";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-            this.groupBox.ResumeLayout(false);
-            this.groupBox.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private PictureBox pictureBox;
-        private GroupBox groupBox;
-        private ComboBox comboBoxSelectorMap;
-        private Button buttonShowOnMap;
-        private Button buttonShowStorage;
-        private Button buttonRemoveRoadTrain;
-        private Button buttonAddRoadTrain;
-        private MaskedTextBox maskedTextBoxPosition;
-        private Button buttonRight;
-        private Button buttonUp;
-        private Button buttonDown;
-        private Button buttonLeft;
-    }
-}

RoadTrain/RoadTrain/FormMapWithSetRoadTrains.cs

@@ -1,163 +0,0 @@
-namespace RoadTrain
-{
-    public partial class FormMapWithSetRoadTrains : Form
-    {
-        /// <summary>         
-        /// Объект от класса карты с набором объектов         
-        /// </summary>     
-        private MapWithSetRoadTrainsGeneric<DrawningObjectRoadTrain, AbstractMap> _mapRoadTrainsCollectionGeneric;
-
-        /// <summary>         
-        /// Конструктор         
-        /// </summary>        
-        public FormMapWithSetRoadTrains()
-        {
-            InitializeComponent();
-        }
-
-        /// <summary>         
-        /// Выбор карты         
-        /// </summary>        
-        /// <param name="sender"></param>      
-        /// <param name="e"></param>       
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            AbstractMap map = null;
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Простая карта":
-                    map = new SimpleMap();
-                    break;
-                case "Дорога":
-                    map = new RoadMap();
-                    break;
-            }
-            if (map != null)
-            {
-                _mapRoadTrainsCollectionGeneric = new MapWithSetRoadTrainsGeneric<DrawningObjectRoadTrain, AbstractMap>(
-                    pictureBox.Width, pictureBox.Height, map);
-            }
-            else
-            {
-                _mapRoadTrainsCollectionGeneric = null;
-            }
-        }
-
-        /// <summary>     
-        /// Добавление объекта       
-        /// </summary>         
-        /// <param name="sender"></param>       
-        /// <param name="e"></param>       
-        private void ButtonAddRoadTrain_Click(object sender, EventArgs e)
-        {
-            if (_mapRoadTrainsCollectionGeneric == null)
-            {
-                return;
-            }
-            FormRoadTrain form = new();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                DrawningObjectRoadTrain roadTrain = new(form.SelectedRoadTrain);
-                if (_mapRoadTrainsCollectionGeneric + roadTrain >= 0)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapRoadTrainsCollectionGeneric.ShowSet();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-                pictureBox.Image = _mapRoadTrainsCollectionGeneric.ShowSet();
-            }
-        }
-
-        /// <summary>     
-        /// Удаление объекта   
-        /// </summary>        
-        /// <param name="sender"></param>       
-        /// <param name="e"></param>    
-        private void ButtonRemoveRoadTrain_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 (_mapRoadTrainsCollectionGeneric - pos != null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapRoadTrainsCollectionGeneric.ShowSet();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-            pictureBox.Image = _mapRoadTrainsCollectionGeneric.ShowSet();
-        }
-
-        /// <summary>   
-        /// Вывод набора         
-        /// </summary>        
-        /// <param name="sender"></param>     
-        /// <param name="e"></param>         
-        private void ButtonShowStorage_Click(object sender, EventArgs e)
-        {
-            if (_mapRoadTrainsCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox.Image = _mapRoadTrainsCollectionGeneric.ShowSet();
-            pictureBox.Image = _mapRoadTrainsCollectionGeneric.ShowSet();
-        }
-
-        /// <summary>        
-        /// Вывод карты        
-        /// </summary>        
-        /// <param name="sender"></param>        
-        /// <param name="e"></param>       
-        private void ButtonShowOnMap_Click(object sender, EventArgs e)
-        {
-            if (_mapRoadTrainsCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox.Image = _mapRoadTrainsCollectionGeneric.ShowOnMap();
-        }
-
-        /// <summary>     
-        /// Перемещение         
-        /// </summary>         
-        /// <param name="sender"></param>      
-        /// <param name="e"></param>      
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            if (_mapRoadTrainsCollectionGeneric == 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;
-            }
-            pictureBox.Image = _mapRoadTrainsCollectionGeneric.MoveObject(dir);
-        }
-    }
-}

RoadTrain/RoadTrain/FormMapWithSetRoadTrains.resx

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

RoadTrain/RoadTrain/FormRoadTrain.Designer.cs

@@ -28,7 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.statusStripRoadTrain = new System.Windows.Forms.StatusStrip();
+            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
             this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
@@ -38,62 +38,58 @@
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonCreateModif = new System.Windows.Forms.Button();
-            this.buttonSelectCar = new System.Windows.Forms.Button();
-            this.statusStripRoadTrain.SuspendLayout();
+            this.statusStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxRoadTrain)).BeginInit();
             this.SuspendLayout();
             // 
-            // statusStripRoadTrain
+            // statusStrip1
             // 
-            this.statusStripRoadTrain.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.statusStripRoadTrain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
+            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripStatusLabelSpeed,
             this.toolStripStatusLabelWeight,
             this.toolStripStatusLabelBodyColor});
-            this.statusStripRoadTrain.Location = new System.Drawing.Point(0, 318);
-            this.statusStripRoadTrain.Name = "statusStripRoadTrain";
-            this.statusStripRoadTrain.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0);
-            this.statusStripRoadTrain.Size = new System.Drawing.Size(772, 22);
-            this.statusStripRoadTrain.TabIndex = 0;
-            this.statusStripRoadTrain.Text = "statusStrip1";
+            this.statusStrip1.Location = new System.Drawing.Point(0, 427);
+            this.statusStrip1.Name = "statusStrip1";
+            this.statusStrip1.Size = new System.Drawing.Size(882, 26);
+            this.statusStrip1.TabIndex = 0;
+            this.statusStrip1.Text = "statusStrip1";
             // 
             // toolStripStatusLabelSpeed
             // 
             this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17);
+            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20);
             this.toolStripStatusLabelSpeed.Text = "Скорость:";
             // 
             // toolStripStatusLabelWeight
             // 
             this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(29, 17);
+            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20);
             this.toolStripStatusLabelWeight.Text = "Вес:";
             // 
             // toolStripStatusLabelBodyColor
             // 
             this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
-            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17);
+            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(45, 20);
             this.toolStripStatusLabelBodyColor.Text = "Цвет:";
             // 
             // pictureBoxRoadTrain
             // 
             this.pictureBoxRoadTrain.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureBoxRoadTrain.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxRoadTrain.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.pictureBoxRoadTrain.Name = "pictureBoxRoadTrain";
-            this.pictureBoxRoadTrain.Size = new System.Drawing.Size(772, 318);
+            this.pictureBoxRoadTrain.Size = new System.Drawing.Size(882, 427);
             this.pictureBoxRoadTrain.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
             this.pictureBoxRoadTrain.TabIndex = 1;
             this.pictureBoxRoadTrain.TabStop = false;
+            this.pictureBoxRoadTrain.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
             // buttonCreate
             // 
             this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreate.Location = new System.Drawing.Point(10, 290);
-            this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonCreate.Location = new System.Drawing.Point(12, 386);
             this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(82, 22);
+            this.buttonCreate.Size = new System.Drawing.Size(94, 29);
             this.buttonCreate.TabIndex = 2;
             this.buttonCreate.Text = "Создать";
             this.buttonCreate.UseVisualStyleBackColor = true;
@@ -104,10 +100,9 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::RoadTrain.Properties.Resources.arrowDown;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonDown.Location = new System.Drawing.Point(705, 289);
-            this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonDown.Location = new System.Drawing.Point(806, 385);
             this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(26, 22);
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
             this.buttonDown.TabIndex = 3;
             this.buttonDown.UseVisualStyleBackColor = true;
             this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -117,10 +112,9 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::RoadTrain.Properties.Resources.arrowRight;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonRight.Location = new System.Drawing.Point(737, 289);
-            this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonRight.Location = new System.Drawing.Point(842, 385);
             this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(26, 22);
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
             this.buttonRight.TabIndex = 4;
             this.buttonRight.UseVisualStyleBackColor = true;
             this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -130,10 +124,9 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::RoadTrain.Properties.Resources.arrowLeft;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonLeft.Location = new System.Drawing.Point(674, 289);
-            this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonLeft.Location = new System.Drawing.Point(770, 385);
             this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(26, 22);
+            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
             this.buttonLeft.TabIndex = 5;
             this.buttonLeft.UseVisualStyleBackColor = true;
             this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -143,66 +136,39 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::RoadTrain.Properties.Resources.arrowUp;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonUp.Location = new System.Drawing.Point(705, 262);
-            this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonUp.Location = new System.Drawing.Point(806, 349);
             this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(26, 22);
+            this.buttonUp.Size = new System.Drawing.Size(30, 30);
             this.buttonUp.TabIndex = 6;
             this.buttonUp.UseVisualStyleBackColor = true;
             this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
-            // buttonCreateModif
-            // 
-            this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreateModif.Location = new System.Drawing.Point(98, 290);
-            this.buttonCreateModif.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonCreateModif.Name = "buttonCreateModif";
-            this.buttonCreateModif.Size = new System.Drawing.Size(123, 22);
-            this.buttonCreateModif.TabIndex = 2;
-            this.buttonCreateModif.Text = "Модифицировать";
-            this.buttonCreateModif.UseVisualStyleBackColor = true;
-            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
-            // 
-            // buttonSelectCar
-            // 
-            this.buttonSelectCar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonSelectCar.Location = new System.Drawing.Point(227, 290);
-            this.buttonSelectCar.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonSelectCar.Name = "buttonSelectCar";
-            this.buttonSelectCar.Size = new System.Drawing.Size(104, 22);
-            this.buttonSelectCar.TabIndex = 2;
-            this.buttonSelectCar.Text = "Выбрать";
-            this.buttonSelectCar.UseVisualStyleBackColor = true;
-            this.buttonSelectCar.Click += new System.EventHandler(this.ButtonSelectRoadTrain_Click);
-            // 
             // FormRoadTrain
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(772, 340);
+            this.ClientSize = new System.Drawing.Size(882, 453);
             this.Controls.Add(this.buttonUp);
             this.Controls.Add(this.buttonLeft);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonDown);
-            this.Controls.Add(this.buttonSelectCar);
-            this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonCreate);
             this.Controls.Add(this.pictureBoxRoadTrain);
-            this.Controls.Add(this.statusStripRoadTrain);
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Controls.Add(this.statusStrip1);
             this.Name = "FormRoadTrain";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "Грузовик";
-            this.statusStripRoadTrain.ResumeLayout(false);
-            this.statusStripRoadTrain.PerformLayout();
+            this.statusStrip1.ResumeLayout(false);
+            this.statusStrip1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxRoadTrain)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
+
         }
 
         #endregion
 
-        private StatusStrip statusStripRoadTrain;
+        private StatusStrip statusStrip1;
         private ToolStripStatusLabel toolStripStatusLabelSpeed;
         private ToolStripStatusLabel toolStripStatusLabelWeight;
         private ToolStripStatusLabel toolStripStatusLabelBodyColor;
@@ -212,7 +178,5 @@
         private Button buttonRight;
         private Button buttonLeft;
         private Button buttonUp;
-        private Button buttonCreateModif;
-        private Button buttonSelectCar;
     }
 }

RoadTrain/RoadTrain/FormRoadTrain.cs

@@ -1,10 +1,18 @@
-namespace RoadTrain
+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 RoadTrain
 {
     public partial class FormRoadTrain : Form
     {
         private DrawningRoadTrain _RoadTrain;
-        public DrawningRoadTrain SelectedRoadTrain { get; private set; }
-
         public FormRoadTrain()
         {
             InitializeComponent();
@@ -20,19 +28,6 @@
             _RoadTrain?.DrawTransport(gr);
             pictureBoxRoadTrain.Image = bmp;
         }
-
-        /// <summary>
-        /// Метод установки данных
-        /// </summary>
-        private void SetData()
-        {
-            Random rnd = new();
-            _RoadTrain.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxRoadTrain.Width, pictureBoxRoadTrain.Height);
-            toolStripStatusLabelSpeed.Text = $"Скорость: {_RoadTrain.RoadTrain.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {_RoadTrain.RoadTrain.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Цвет: {_RoadTrain.RoadTrain.BodyColor.Name}";
-        }
-
         /// <summary>
         /// Обработка нажатия кнопки "Создать"
         /// </summary>
@@ -41,14 +36,14 @@
         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;
-            }
-            _RoadTrain = new DrawningRoadTrain(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
-            SetData();
+            _RoadTrain = new DrawningRoadTrain();
+            _RoadTrain.Init(rnd.Next(100, 300), rnd.Next(1000, 2000),
+            Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            _RoadTrain.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100),
+            pictureBoxRoadTrain.Width, pictureBoxRoadTrain.Height);
+            toolStripStatusLabelSpeed.Text = $"Скорость: {_RoadTrain.RoadTrain.Speed}";
+            toolStripStatusLabelWeight.Text = $"Вес: {_RoadTrain.RoadTrain.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Цвет: {_RoadTrain.RoadTrain.BodyColor.Name}";
             Draw();
         }
 
@@ -78,7 +73,6 @@
             }
             Draw();
         }
-
         /// <summary>
         /// Изменение размеров формы
         /// </summary>
@@ -90,41 +84,5 @@
             Draw();
         }
 
-        /// <summary>         
-        /// Обработка нажатия кнопки "Модификация"       
-        /// </summary>        
-        /// <param name="sender"></param>        
-        /// <param name="e"></param>
-        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;
-            }
-            _RoadTrain = new DrawningSweeperRoadTrain(rnd.Next(100, 300), rnd.Next(1000, 2000), color, dopColor,
-                Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
-            SetData();
-            Draw();
-        }
-
-        /// <summary>         
-        /// Обработка нажатия кнопки "Выбрать"        
-        /// </summary>         
-        /// <param name="sender"></param>        
-        /// <param name="e"></param>   
-        private void ButtonSelectRoadTrain_Click(object sender, EventArgs e)
-        {
-            SelectedRoadTrain = _RoadTrain;
-            DialogResult = DialogResult.OK;
-        }
     }
 }

RoadTrain/RoadTrain/FormRoadTrain.resx

@@ -57,7 +57,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="statusStripRoadTrain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
 </root>

RoadTrain/RoadTrain/IDrawningObject.cs

@@ -1,37 +0,0 @@
-namespace RoadTrain
-{
-    internal interface IDrawningObject
-    {
-        /// <summary>
-        /// Шаг перемещения объекта
-        /// </summary>
-        public float Step { get; }
-
-        /// <summary>
-        /// Установка позиции объекта
-        /// </summary>
-        /// <param name="x">Координата X</param>
-        /// <param name="y">Координата Y</param>
-        /// <param name="width">Ширина полотна</param>
-        /// <param name="height">Высота полотна</param>
-        void SetObject(int x, int y, int width, int height);
-
-        /// <summary>
-        /// Изменение направления пермещения объекта
-        /// </summary>
-        /// <param name="direction">Направление</param>
-        void MoveObject(Direction direction);
-
-        /// <summary>
-        /// Отрисовка объекта
-        /// </summary>
-        /// <param name="g"></param>
-        void DrawningObject(Graphics g);
-
-        /// <summary>
-        /// Получение текущей позиции объекта
-        /// </summary>
-        /// <returns></returns>
-        (float Left, float Top, float Right, float Bottom) GetCurrentPosition();
-    }
-}

RoadTrain/RoadTrain/MapWithSetRoadTrainsGeneric.cs

@@ -1,196 +0,0 @@
-namespace RoadTrain
-{
-    /// <summary>     
-    /// Карта с набром объектов под нее   
-    /// </summary>    
-    /// <typeparam name="T"></typeparam>   
-    /// <typeparam name="U"></typeparam> 
-    internal class MapWithSetRoadTrainsGeneric<T, U>
-        where T : class, IDrawningObject
-        where U : AbstractMap
-    {
-        /// <summary>        
-        /// Ширина окна отрисовки       
-        /// </summary> 
-        private readonly int _pictureWidth;
-
-        /// <summary>        
-        /// Высота окна отрисовки      
-        /// </summary> 
-        private readonly int _pictureHeight;
-
-        /// <summary>      
-        /// Размер занимаемого объектом места (ширина)        
-        /// </summary> 
-        private readonly int _placeSizeWidth = 200;
-
-        /// <summary>        
-        /// Размер занимаемого объектом места (высота)        
-        /// </summary> 
-        private readonly int _placeSizeHeight = 170;
-
-        /// <summary>        
-        /// Набор объектов         
-        /// </summary> 
-        private readonly SetRoadTrainsGeneric<T> _setRoadTrains;
-
-        /// <summary>      
-        /// Карта        
-        /// </summary> 
-        private readonly U _map;
-
-        /// <summary>        
-        /// Конструктор      
-        /// </summary>        
-        /// <param name="picWidth"></param>      
-        /// <param name="picHeight"></param>        
-        /// <param name="map"></param>   
-        public MapWithSetRoadTrainsGeneric(int picWidth, int picHeight, U map)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _setRoadTrains = new SetRoadTrainsGeneric<T>(width * height - 2);
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-            _map = map;
-        }
-
-        /// <summary>        
-        /// Перегрузка оператора сложения       
-        /// </summary>         
-        /// <param name="map"></param>    
-        /// <param name="roadTrain"></param>       
-        /// <returns></returns> 
-        public static int operator +(MapWithSetRoadTrainsGeneric<T, U> map, T roadTrain)
-        {
-            return map._setRoadTrains.Insert(roadTrain);
-        }
-
-        /// <summary>       
-        /// Перегрузка оператора вычитания      
-        /// </summary>        
-        /// <param name="map"></param>        
-        /// <param name="position"></param>   
-        /// <returns></returns> 
-        public static T operator -(MapWithSetRoadTrainsGeneric<T, U> map, int position)
-        {
-            return map._setRoadTrains.Remove(position);
-        }
-
-        /// <summary>        
-        /// Вывод всего набора объектов       
-        /// </summary>        
-        /// <returns></returns> 
-        public Bitmap ShowSet()
-        {
-            Bitmap bmp = new(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawLocomotives(gr);
-            return bmp;
-        }
-
-        /// <summary>       
-        /// Просмотр объекта на карте        
-        /// </summary>        
-        /// <returns></returns> 
-        public Bitmap ShowOnMap()
-        {
-            Shaking();
-            for (int i = 0; i < _setRoadTrains.Count; i++)
-            {
-                var roadTrain = _setRoadTrains.Get(i);
-                if (roadTrain != null)
-                {
-                    return _map.CreateMap(_pictureWidth, _pictureHeight, roadTrain);
-                }
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-
-        /// <summary>     
-        /// Перемещение объекта по крате       
-        /// </summary>       
-        /// <param name="direction"></param>       
-        /// <returns></returns>   
-        public Bitmap MoveObject(Direction direction)
-        {
-            if (_map != null)
-            {
-                return _map.MoveObject(direction);
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-
-        /// <summary>        
-        /// "Взбалтываем" набор, чтобы все элементы оказались в начале        
-        /// </summary>   
-        private void Shaking()
-        {
-            int j = _setRoadTrains.Count - 1;
-            for (int i = 0; i < _setRoadTrains.Count; i++)
-            {
-                if (_setRoadTrains.Get(i) == null)
-                {
-                    for (; j > i; j--)
-                    {
-                        var roadTrain = _setRoadTrains.Get(j);
-                        if (roadTrain != null)
-                        {
-                            _setRoadTrains.Insert(roadTrain, i);
-                            _setRoadTrains.Remove(j);
-                            break;
-                        }
-                    }
-                    if (j <= i)
-                    {
-                        return;
-                    }
-                }
-            }
-        }
-
-        /// <summary>  
-        /// Метод отрисовки фона        
-        /// </summary>       
-        /// <param name="g"></param> 
-        private void DrawBackground(Graphics g)
-        {
-            Pen pen = new(Color.Black, 3);
-            for (int i = 0; i < _pictureWidth / _placeSizeWidth - 1; i++)
-            {
-                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
-                {
-                    //линия рамзетки места
-                    g.DrawLine(pen, i * _placeSizeWidth + 120 * i, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth + 120 * i, j * _placeSizeHeight);
-                }
-                g.DrawLine(pen, i * _placeSizeWidth + 120 * i, 0, i * _placeSizeWidth + 120 * i, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
-            }
-        }
-
-        /// <summary>      
-        /// Метод прорисовки объектов       
-        /// </summary>       
-        /// <param name="g"></param> 
-        private void DrawLocomotives(Graphics g)
-        {
-            int x = 0;
-            int y = 0;
-            int j = 0;
-
-            for (int i = 0; i < _setRoadTrains.Count; i++)
-            {
-                if (j >= _pictureWidth / _placeSizeWidth - 1)
-                {
-                    x = 0;
-                    y += _placeSizeHeight;
-                    j = 0;
-                }
-                _setRoadTrains.Get(i)?.SetObject(x, y + 2 * _pictureWidth / _placeSizeWidth, _pictureWidth, _pictureHeight);
-                _setRoadTrains.Get(i)?.DrawningObject(g);
-                x += _placeSizeWidth + 120;
-                j++;
-            }
-        }
-    }
-}

RoadTrain/RoadTrain/Program.cs

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

RoadTrain/RoadTrain/RoadMap.cs

@@ -1,55 +0,0 @@
-namespace RoadTrain
-{
-    internal class RoadMap : AbstractMap
-    {
-        /// <summary>
-        /// Цвет участка закрытого
-        /// </summary>
-        private readonly Brush barrierColor = new SolidBrush(Color.Green);
-
-        /// <summary>
-        /// Цвет участка открытого
-        /// </summary>
-        private readonly Brush roadColor = new SolidBrush(Color.DarkGray);
-
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x +
-           1), 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[50, 50];
-            _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, 48);
-                int y = _random.Next(1, 49);
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-                    _map[x+1, y-1] = _barrier;
-                    _map[x + 1, y] = _barrier;
-                    _map[x + 2, y] = _barrier;
-                    counter = counter + 4;
-                }
-            }
-        }
-    }
-}

RoadTrain/RoadTrain/SetRoadTrainsGeneric.cs

@@ -1,120 +0,0 @@
-namespace RoadTrain
-{
-    /// <summary> 
-    /// Параметризованный набор объектов  
-    /// </summary>     
-    /// <typeparam name="T"></typeparam> 
-    public class SetRoadTrainsGeneric<T>
-         where T : class
-    {
-        /// <summary>  
-        /// Массив объектов, которые храним   
-        /// </summary>   
-        private readonly T[] _places;
-
-        /// <summary>  
-        /// Количество объектов в массиве  
-        /// </summary>
-        public int Count => _places.Length;
-
-        /// <summary> 
-        /// Конструктор 
-        /// </summary>   
-        /// <param name="count"></param>
-        public SetRoadTrainsGeneric(int count)
-        {
-            _places = new T[count];
-        }
-
-        /// <summary>  
-        /// Добавление объекта в набор  
-        /// </summary> 
-        /// <param name="roadTrain">Добавляемый грузовик</param>  
-        /// <returns></returns>   
-        public int Insert(T roadTrain)
-        {
-            return Insert(roadTrain, 0);
-        }
-
-        /// <summary>  
-        /// Добавление объекта в набор на конкретную позицию  
-        /// </summary>  
-        /// <param name="roadTrain">Добавляемый грузовик</param>
-        /// <param name="position">Позиция</param>  
-        /// <returns></returns> 
-        public int Insert(T roadTrain, int position)
-        {
-            // проверка позиции
-            if (position < 0 || position >= _places.Length)
-            {
-                return -1;
-            }
-
-            // проверка, что элемент массива по этой позиции пустой
-            if (_places[position] == null)
-            {
-                _places[position] = roadTrain;
-                return position;
-            }
-
-            int emptyIndex = -1;
-
-            // проверка, что после вставляемого элемента в массиве есть пустой элемент
-            for (int i = position + 1; i < Count; i++)
-            {
-                if (_places[i] == null)
-                {
-                    emptyIndex = i;
-                    break;
-                }
-            }
-
-            if (emptyIndex == -1)
-            {
-                return -1;
-            }
-
-            // сдвиг всех объектов, находящихся справа от позиции до первого пустого элемента 
-            for (int i = emptyIndex; i > position; i--)
-            {
-                _places[i] = _places[i - 1];
-            }
-
-            // вставка по позиции
-            _places[position] = roadTrain;
-
-            return position;
-        }
-
-        /// <summary>   
-        /// Удаление объекта из набора с конкретной позиции 
-        /// </summary>  
-        /// <param name="position"></param>   
-        /// <returns></returns> 
-        public T Remove(int position)
-        {
-            // проверка позиции 
-            if (position >= _places.Length || position < 0)
-                return null;
-            T delObj = _places[position];
-            // удаление объекта из массива
-            _places[position] = null;
-            return delObj;
-        }
-
-        /// <summary>   
-        /// Получение объекта из набора по позиции  
-        /// </summary>   
-        /// <param name="position"></param>  
-        /// <returns></returns> 
-        public T Get(int position)
-        {
-            // проверка позиции
-            if (position >= _places.Length || position < 0)
-            {
-                return null;
-            }
-            return _places[position];
-        }
-    }
-}

RoadTrain/RoadTrain/SimpleMap.cs

@@ -1,55 +0,0 @@
-namespace RoadTrain
-{
-    /// <summary>
-    /// Простая реализация абсрактного класса AbstractMap
-    /// </summary>
-    internal class SimpleMap : AbstractMap
-    {
-        /// <summary>
-        /// Цвет участка закрытого
-        /// </summary>
-        private readonly Brush barrierColor = new SolidBrush(Color.Black);
-
-        /// <summary>
-        /// Цвет участка открытого
-        /// </summary>
-        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 +
-           1), 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 < 50)
-            {
-                int x = _random.Next(0, 100);
-                int y = _random.Next(0, 100);
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-                    counter++;
-                }
-            }
-        }
-    }
-}