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,120 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection.Metadata.Ecma335;
-using System.Text;
-using System.Threading.Tasks;
-
-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

@@ -8,7 +8,6 @@ namespace RoadTrain
 {
     internal enum Direction
     {
-        None = 0,
         Up = 1,
         Down = 2,
         Left = 3,

RoadTrain/RoadTrain/DrawningObjectRoadTrain.cs

@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-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

@@ -11,15 +11,15 @@ namespace RoadTrain
         /// <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>
@@ -35,10 +35,17 @@ namespace RoadTrain
         /// <summary>
         /// Высота отрисовки грузовика
         /// </summary>
-        private readonly int _RoadTrainHeight = 155;
+        private readonly int _RoadTrainHeight = 150;
-        public DrawningRoadTrain(int speed, float weight, Color bodyColor)
+        /// <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>
         /// Установка позиции грузовика
@@ -103,46 +110,36 @@ namespace RoadTrain
             }
         }
         /// <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(brBlack, _startPosX, _startPosY + 90, 185, 20); //Платформа
-            g.FillRectangle(mainColor, _startPosX + 125, _startPosY+10, 75, 90);//Кабина
+            g.DrawRectangle(pen, _startPosX, _startPosY + 90, 185, 20);
-            g.DrawRectangle(pen, _startPosX + 125, _startPosY+10,75, 90);
+            g.FillRectangle(mainColor, _startPosX + 110, _startPosY, 75, 90);//Кабина
-            g.FillRectangle(brBlue, _startPosX + 165, _startPosY + 30, 30, 50);//Окно
+            g.DrawRectangle(pen, _startPosX + 110, _startPosY, 75, 90);
-            g.DrawRectangle(pen, _startPosX + 165, _startPosY + 30, 30, 50);
+            g.FillRectangle(brBlue, _startPosX + 150, _startPosY + 20, 30, 50);//Окно
-            g.FillEllipse(brGray, _startPosX+15, _startPosY + 120, 40, 40);//Колёса
+            g.DrawRectangle(pen, _startPosX + 150, _startPosY + 20, 30, 50);
-            g.DrawEllipse(pen, _startPosX+15, _startPosY + 120, 40, 40);
+            g.FillEllipse(brGray, _startPosX, _startPosY + 110, 40, 40);//Колёса
-            g.FillEllipse(brBlack, _startPosX + 20, _startPosY + 125, 30, 30);
+            g.DrawEllipse(pen, _startPosX, _startPosY + 110, 40, 40);
-            g.FillEllipse(brGray, _startPosX + 60, _startPosY + 120, 40, 40);
+            g.FillEllipse(brBlack, _startPosX + 5, _startPosY + 115, 30, 30);
-            g.DrawEllipse(pen, _startPosX + 60, _startPosY + 120, 40, 40);
+            g.FillEllipse(brGray, _startPosX + 45, _startPosY + 110, 40, 40);
-            g.FillEllipse(brBlack, _startPosX + 65, _startPosY + 125, 30, 30);
+            g.DrawEllipse(pen, _startPosX + 45, _startPosY + 110, 40, 40);
-            g.FillEllipse(brGray, _startPosX + 155, _startPosY + 120, 40, 40);
+            g.FillEllipse(brBlack, _startPosX + 50, _startPosY + 115, 30, 30);
-            g.DrawEllipse(pen, _startPosX + 155, _startPosY + 120, 40, 40);
+            g.FillEllipse(brGray, _startPosX + 140, _startPosY + 110, 40, 40);
-            g.FillEllipse(brBlack, _startPosX + 160, _startPosY + 125, 30, 30);
+            g.DrawEllipse(pen, _startPosX + 140, _startPosY + 110, 40, 40);
-            
+            g.FillEllipse(brBlack, _startPosX + 145, _startPosY + 115, 30, 30);
+
         }
         /// <summary>
         /// Смена границ формы отрисовки
@@ -168,13 +165,5 @@ namespace RoadTrain
                 _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,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RoadTrain
-{
-    /// <summary>
-    /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
-    /// </summary>
-    internal 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

@@ -31,13 +31,12 @@ namespace RoadTrain
         /// <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,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-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/FormMap.Designer.cs

@@ -1,208 +0,0 @@
-namespace RoadTrain
-{
-    partial class FormMap
-    {
-        /// <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.statusStripRoadTrain = new System.Windows.Forms.StatusStrip();
-            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
-            this.pictureBoxRoadTrain = new System.Windows.Forms.PictureBox();
-            this.buttonCreate = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            this.buttonCreateModif = new System.Windows.Forms.Button();
-            this.statusStripRoadTrain.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxRoadTrain)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // statusStripRoadTrain
-            // 
-            this.statusStripRoadTrain.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.statusStripRoadTrain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripStatusLabelSpeed,
-            this.toolStripStatusLabelWeight,
-            this.toolStripStatusLabelBodyColor});
-            this.statusStripRoadTrain.Location = new System.Drawing.Point(0, 427);
-            this.statusStripRoadTrain.Name = "statusStripRoadTrain";
-            this.statusStripRoadTrain.Size = new System.Drawing.Size(882, 26);
-            this.statusStripRoadTrain.TabIndex = 0;
-            this.statusStripRoadTrain.Text = "statusStrip1";
-            // 
-            // toolStripStatusLabelSpeed
-            // 
-            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20);
-            this.toolStripStatusLabelSpeed.Text = "Скорость:";
-            // 
-            // toolStripStatusLabelWeight
-            // 
-            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20);
-            this.toolStripStatusLabelWeight.Text = "Вес:";
-            // 
-            // toolStripStatusLabelBodyColor
-            // 
-            this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
-            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(42, 20);
-            this.toolStripStatusLabelBodyColor.Text = "Цвет";
-            // 
-            // pictureBoxRoadTrain
-            // 
-            this.pictureBoxRoadTrain.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxRoadTrain.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxRoadTrain.Name = "pictureBoxRoadTrain";
-            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;
-            // 
-            // 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(23, 383);
-            this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(94, 29);
-            this.buttonCreate.TabIndex = 3;
-            this.buttonCreate.Text = "Создать";
-            this.buttonCreate.UseVisualStyleBackColor = true;
-            this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_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(771, 383);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
-            this.buttonLeft.TabIndex = 6;
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.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(807, 383);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 30);
-            this.buttonDown.TabIndex = 7;
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.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(807, 347);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 30);
-            this.buttonUp.TabIndex = 8;
-            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.BackgroundImage = global::RoadTrain.Properties.Resources.arrowRight;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonRight.Location = new System.Drawing.Point(840, 384);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 30);
-            this.buttonRight.TabIndex = 9;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Дорога"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(23, 12);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28);
-            this.comboBoxSelectorMap.TabIndex = 10;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // buttonCreateModif
-            // 
-            this.buttonCreateModif.Location = new System.Drawing.Point(145, 383);
-            this.buttonCreateModif.Name = "buttonCreateModif";
-            this.buttonCreateModif.Size = new System.Drawing.Size(129, 29);
-            this.buttonCreateModif.TabIndex = 11;
-            this.buttonCreateModif.Text = "Модификация";
-            this.buttonCreateModif.UseVisualStyleBackColor = true;
-            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
-            // 
-            // FormMap
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(882, 453);
-            this.Controls.Add(this.buttonCreateModif);
-            this.Controls.Add(this.comboBoxSelectorMap);
-            this.Controls.Add(this.buttonRight);
-            this.Controls.Add(this.buttonUp);
-            this.Controls.Add(this.buttonDown);
-            this.Controls.Add(this.buttonLeft);
-            this.Controls.Add(this.buttonCreate);
-            this.Controls.Add(this.pictureBoxRoadTrain);
-            this.Controls.Add(this.statusStripRoadTrain);
-            this.Name = "FormMap";
-            this.Text = "Карта";
-            this.statusStripRoadTrain.ResumeLayout(false);
-            this.statusStripRoadTrain.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxRoadTrain)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private StatusStrip statusStripRoadTrain;
-        private ToolStripStatusLabel toolStripStatusLabelSpeed;
-        private ToolStripStatusLabel toolStripStatusLabelWeight;
-        private ToolStripStatusLabel toolStripStatusLabelBodyColor;
-        private PictureBox pictureBoxRoadTrain;
-        private Button buttonCreate;
-        private Button buttonLeft;
-        private Button buttonDown;
-        private Button buttonUp;
-        private Button buttonRight;
-        private ComboBox comboBoxSelectorMap;
-        private Button buttonCreateModif;
-    }
-}

RoadTrain/RoadTrain/FormMap.cs

@@ -1,108 +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 RoadTrain
-{
-    public partial class FormMap : Form
-    {
-        private AbstractMap _abstractMap;
-        public FormMap()
-        {
-            InitializeComponent();
-            _abstractMap = new SimpleMap();
-        }
-        /// <summary>
-        /// Заполнение информации по объекту
-        /// </summary>
-        /// <param name="car"></param>
-        private void SetData(DrawningRoadTrain roadTrain)
-        {
-            toolStripStatusLabelSpeed.Text = $"Скорость: {roadTrain.RoadTrain.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {roadTrain.RoadTrain.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Цвет: {roadTrain.RoadTrain.BodyColor.Name}";
-            pictureBoxRoadTrain.Image = _abstractMap.CreateMap(pictureBoxRoadTrain.Width, pictureBoxRoadTrain.Height, new DrawningObjectRoadTrain(roadTrain));
-        }
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var roadTrain = new DrawningRoadTrain(rnd.Next(100, 300), rnd.Next(1000, 2000),
-           Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            SetData(roadTrain);
-        }
-        /// <summary>
-        /// Изменение размеров формы
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            //получаем имя кнопки
-            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;
-            }
-            pictureBoxRoadTrain.Image = _abstractMap?.MoveObject(dir);
-        }
-        /// <summary>
-        /// Обработка нажатия кнопки "Модификация"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreateModif_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var roadTrain = new DrawningSweeperRoadTrain(rnd.Next(100, 300), rnd.Next(1000,
-           2000),
-            Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0,
-           256)),
-            Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0,
-           256)),
-            Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0,
-           2)));
-            SetData(roadTrain);
-        }
-        /// <summary>
-        /// Смена карты
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender,
-       EventArgs e)
-        {
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Простая карта":
-                    _abstractMap = new SimpleMap();
-                    break;
-                case "Дорога":
-                    _abstractMap = new RoadMap();
-                    break;
-            }
-        }
-    }
-}

RoadTrain/RoadTrain/FormMap.resx

@@ -1,63 +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>
-  <metadata name="statusStripRoadTrain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</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,22 +38,22 @@
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonUp = 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.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.statusStripRoadTrain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripStatusLabelSpeed,
             this.toolStripStatusLabelWeight,
             this.toolStripStatusLabelBodyColor});
-            this.statusStripRoadTrain.Location = new System.Drawing.Point(0, 427);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 427);
-            this.statusStripRoadTrain.Name = "statusStripRoadTrain";
+            this.statusStrip1.Name = "statusStrip1";
-            this.statusStripRoadTrain.Size = new System.Drawing.Size(882, 26);
+            this.statusStrip1.Size = new System.Drawing.Size(882, 26);
-            this.statusStripRoadTrain.TabIndex = 0;
+            this.statusStrip1.TabIndex = 0;
-            this.statusStripRoadTrain.Text = "statusStrip1";
+            this.statusStrip1.Text = "statusStrip1";
             // 
             // toolStripStatusLabelSpeed
             // 
@@ -154,12 +154,12 @@
             this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.buttonCreate);
             this.Controls.Add(this.pictureBoxRoadTrain);
-            this.Controls.Add(this.statusStripRoadTrain);
+            this.Controls.Add(this.statusStrip1);
             this.Name = "FormRoadTrain";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "Грузовик";
-            this.statusStripRoadTrain.ResumeLayout(false);
+            this.statusStrip1.ResumeLayout(false);
-            this.statusStripRoadTrain.PerformLayout();
+            this.statusStrip1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxRoadTrain)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
@@ -168,7 +168,7 @@
 
         #endregion
 
-        private StatusStrip statusStripRoadTrain;
+        private StatusStrip statusStrip1;
         private ToolStripStatusLabel toolStripStatusLabelSpeed;
         private ToolStripStatusLabel toolStripStatusLabelWeight;
         private ToolStripStatusLabel toolStripStatusLabelBodyColor;

RoadTrain/RoadTrain/FormRoadTrain.cs

@@ -29,17 +29,6 @@ namespace RoadTrain
             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>
         /// <param name="sender"></param>
@@ -47,8 +36,14 @@ namespace RoadTrain
         private void buttonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            _RoadTrain = new DrawningRoadTrain(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            _RoadTrain = new DrawningRoadTrain();
-            SetData();
+            _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();
         }
 
@@ -88,5 +83,6 @@ namespace RoadTrain
             _RoadTrain?.ChangeBorders(pictureBoxRoadTrain.Width, pictureBoxRoadTrain.Height);
             Draw();
         }
+
     }
 }

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,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-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/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 FormMap());
+            Application.Run(new FormRoadTrain());
         }
     }
 }

RoadTrain/RoadTrain/RoadMap.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-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/SimpleMap.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-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++;
-                }
-            }
-        }
-    }
-}