DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs

@@ -1,130 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.AccessControl;
-using System.Text;
-using System.Threading.Tasks;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.ScrollBar;
-
-namespace DoubleDeckerBus
-{
-    internal abstract class AbstractMap
-    {
-        private IDrawingObject _drawingObject = null;
-        protected int[,] _map = null;
-        protected int _width;
-        protected int _height;
-        protected float _size_x;
-        protected float _size_y;
-        protected readonly Random _random = new Random();
-        protected readonly int _freeRoad = 0;
-        protected readonly int _barrier = 1;
-
-
-        public Bitmap CreateMap(int width, int height, IDrawingObject drawningObject)
-        {
-            _width = width;
-            _height = height;
-            _drawingObject = drawningObject;
-            GenerateMap();
-            while (!SetObjectOnMap())
-            {
-                GenerateMap();
-            }
-            return DrawMapWithObject();
-        }
-        public Bitmap MoveObject(Direction direction)
-        {
-            
-            _drawingObject.MoveObject(direction);
-
-            bool collision = CheckCollision();
-
-            if (collision) {
-                switch (direction) {
-                    case Direction.Left:
-                        _drawingObject.MoveObject(Direction.Right);
-                        break;
-                    case Direction.Right:
-                        _drawingObject.MoveObject(Direction.Left);
-                        break;
-                    case Direction.Up:
-                        _drawingObject.MoveObject(Direction.Down);
-                        break;
-                    case Direction.Down:
-                        _drawingObject.MoveObject(Direction.Up);
-                        break;
-                }
-            }
-
-            return DrawMapWithObject();
-        }
-        private bool SetObjectOnMap()
-        {
-            if (_drawingObject == null || _map == null)
-            {
-                return false;
-            }
-            int x = _random.Next(0, 10);
-            int y = _random.Next(0, 10);
-            _drawingObject.SetObject(x, y, _width, _height);
-          
-            return !CheckCollision();
-        }
-        private Bitmap DrawMapWithObject()
-        {
-            Bitmap bmp = new(_width, _height);
-            if (_drawingObject == 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);
-                    }
-                }
-            }
-            _drawingObject.DrawingObject(gr);
-            return bmp;
-
-        }
-
-        private bool CheckCollision() {
-            var pos = _drawingObject.GetCurrentPosition();
-            int startX = (int)((pos.Left) / _size_x);
-            int endX = (int)((pos.Right) / _size_x);
-            int startY = (int)((pos.Top) / _size_y);
-            int endY = (int)((pos.Bottom) / _size_y);
-
-            if (startX < 0 || startY < 0 || endX > _map.GetLength(1) || endY > _map.GetLength(0)) { return false; }
-
-            
-
-            for (int y = startY; y < endY; y++)
-            {
-                for (int x = startX; x < endX; x++)
-                {
-                    if (_map[x, y] == _barrier)
-                    {
-                        return true;
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        protected abstract void GenerateMap();
-        protected abstract void DrawRoadPart(Graphics g, int i, int j);
-        protected abstract void DrawBarrierPart(Graphics g, int i, int j);
-    }
-}

DoubleDeckerBus/DoubleDeckerBus/Direction.cs

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

DoubleDeckerBus/DoubleDeckerBus/DrawingDDB.cs

@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DoubleDeckerBus
-{
-    internal class DrawingDDB : DrawingBus
-    {
-        public DrawingDDB(int speed, float weight, Color bodyColor, Color extraColor, bool ledder, bool secondStage) : base(speed, weight, bodyColor, 100, 100) {
-            Bus = new EntityDDB(speed, weight, bodyColor, extraColor, ledder, secondStage);
-        }
-
-        public override void DrawTransport(Graphics g)
-        {
-            if (Bus is not EntityDDB doubleDeckerBus)
-            {
-                return;
-            }
-
-            Pen pen = new(Color.Black);
-            Brush extraBrush = new SolidBrush(doubleDeckerBus.ExtraColor);
-
-            if (doubleDeckerBus.SecondStage) {
-                g.FillRectangle(extraBrush, _startPosX, _startPosY + 10, 100, 30);
-
-                g.DrawRectangle(pen, _startPosX + 30, _startPosY + 20, 10, 20);
-                Brush brBlack = new SolidBrush(Color.Black);
-                g.FillRectangle(brBlack, _startPosX + 30, _startPosY + 20, 10, 20);
-
-
-                Brush brBlue = new SolidBrush(Color.Blue);
-                g.FillEllipse(brBlue, _startPosX + 10, _startPosY + 15, 10, 15);
-                g.FillEllipse(brBlue, _startPosX + 50, _startPosY + 15, 10, 15);
-                g.FillEllipse(brBlue, _startPosX + 70, _startPosY + 15, 10, 15);
-                g.FillEllipse(brBlue, _startPosX + 90, _startPosY + 15, 10, 15);
-            }
-
-            _startPosY += 30;
-            base.DrawTransport(g);
-            _startPosY -= 30;
-
-            if (doubleDeckerBus.Ledder) {
-                //Вертикальные прямые
-                g.DrawLine(pen, new Point((int)(_startPosX), (int)(_startPosY + 70)), new Point((int)(_startPosX), (int)(_startPosY + 10)));
-                g.DrawLine(pen, new Point((int)(_startPosX + 10), (int)(_startPosY + 70)), new Point((int)(_startPosX + 10), (int)(_startPosY + 10)));
-
-                //Горизонтальные прямые
-                g.DrawLine(pen, new Point((int)(_startPosX), (int)(_startPosY + 20)), new Point((int)(_startPosX + 10), (int)(_startPosY + 20)));
-                g.DrawLine(pen, new Point((int)(_startPosX), (int)(_startPosY + 30)), new Point((int)(_startPosX + 10), (int)(_startPosY + 30)));
-                g.DrawLine(pen, new Point((int)(_startPosX), (int)(_startPosY + 40)), new Point((int)(_startPosX + 10), (int)(_startPosY + 40)));
-                g.DrawLine(pen, new Point((int)(_startPosX), (int)(_startPosY + 50)), new Point((int)(_startPosX + 10), (int)(_startPosY + 50)));
-                g.DrawLine(pen, new Point((int)(_startPosX), (int)(_startPosY + 60)), new Point((int)(_startPosX + 10), (int)(_startPosY + 60)));
-            }
-        }
-    }
-}

DoubleDeckerBus/DoubleDeckerBus/DrawingObjectBus.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DoubleDeckerBus
-{
-    internal class DrawingObjectBus : IDrawingObject
-    {
-        private DrawingBus _bus = null;
-
-        public DrawingObjectBus(DrawingBus bus)
-        {
-            _bus = bus;
-        }
-
-        public float Step => _bus?.Bus?.Step ?? 0;
-
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return _bus?.GetCurrentPosition() ?? default;
-        }
-
-        public void MoveObject(Direction direction)
-        {
-            _bus?.MoveTransport(direction);
-        }
-
-        public void SetObject(int x, int y, int width, int height)
-        {
-            _bus.SetPosition(x, y, width, height);
-        }
-
-        void IDrawingObject.DrawingObject(Graphics g)
-        {
-            _bus.DrawTransport(g);
-        }
-    }
-}

DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs

@@ -7,27 +7,20 @@ using System.Threading.Tasks;
 
 namespace DoubleDeckerBus
 {
-    internal class DrawingBus
+    internal class DrawningBus
     {
-        public EntityBus Bus { get; protected set; }
+        public EntityBus Bus { get; private set; }
 
-        protected float _startPosX;
-        protected float _startPosY;
+        private float _startPosX;
+        private float _startPosY;
         private int? _pictureWidth = null;
         private int? _pictureHeight = null;
         private readonly int _busWidth = 100;
-        private readonly int _busHeight = 30;
+        private readonly int _busHeight = 50;
 
-
-
-        public DrawingBus(int speed, float weight, Color bodyColor) {
-            Bus = new EntityBus(speed, weight, bodyColor);
-        }
-
-        protected DrawingBus(int speed, float weight, Color bodyColor, int busWidth, int busHeight) : this(speed, weight, bodyColor) 
-        {
-            _busWidth = busWidth;
-            _busHeight = busHeight;
+        public void Init(int speed, float weight, Color bodyColor) {
+            Bus = new EntityBus();
+            Bus.Init(speed, weight, bodyColor);
         }
 
         public void SetPosition(int x, int y, int width, int height) {
@@ -73,7 +66,7 @@ namespace DoubleDeckerBus
             }
         }
 
-        public virtual void DrawTransport(Graphics g)
+        public void DrawTransport(Graphics g)
         {
             if (_startPosX < 0 || _startPosY < 0
                 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
@@ -81,20 +74,23 @@ namespace DoubleDeckerBus
                 return;
             }
             Pen pen = new(Color.Black);
-            
+            //границы автобсуса
             g.DrawRectangle(pen, _startPosX - 1, _startPosY + 11, 100, 30);
             Brush brBodyColor = new SolidBrush(Bus.BodyColor);
             g.FillRectangle(brBodyColor, _startPosX, _startPosY + 10, 100, 30);
 
+            //Дверь
             g.DrawRectangle(pen, _startPosX + 30, _startPosY + 20, 10, 20);
             Brush brBlack = new SolidBrush(Color.Black);
             g.FillRectangle(brBlack, _startPosX + 30, _startPosY + 20, 10, 20);
 
+            //Колеса
             g.DrawEllipse(pen, _startPosX + 7, _startPosY + 35, 10, 10);
             g.DrawEllipse(pen, _startPosX + 77, _startPosY + 35, 10, 10);
             g.FillEllipse(brBlack, _startPosX + 7, _startPosY + 35, 10, 10);
             g.FillEllipse(brBlack, _startPosX + 77, _startPosY + 35, 10, 10);
 
+            //окна
             Brush brBlue = new SolidBrush(Color.Blue);
             g.FillEllipse(brBlue, _startPosX + 10, _startPosY + 15, 10, 15);
             g.FillEllipse(brBlue, _startPosX + 50, _startPosY + 15, 10, 15);
@@ -117,9 +113,5 @@ namespace DoubleDeckerBus
                 _startPosY = _pictureHeight.Value - _busHeight;
             }
         }
-
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() {
-            return (_startPosX, _startPosX + _busWidth, _startPosY, _startPosY + _busHeight);
-        }
     }
 }

DoubleDeckerBus/DoubleDeckerBus/EntityBus.cs

@@ -12,7 +12,7 @@ namespace DoubleDeckerBus
         public float Weight { get; private set; }
         public Color BodyColor { get; private set; }
         public float Step => Speed * 100 / Weight;
-        public EntityBus(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight, Color bodyColor)
         {
             Random rnd = new Random();
             Speed = (speed <= 0) ? rnd.Next(50, 150) : speed;

DoubleDeckerBus/DoubleDeckerBus/EntityDDB.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DoubleDeckerBus
-{
-    internal class EntityDDB : EntityBus
-    {
-        public Color ExtraColor { get; private set; }
-
-        public bool Ledder { get; private set; }
-
-        public bool SecondStage { get; private set; }
-
-        public EntityDDB(int speed, float height, Color bodyColor, Color extraColor, bool ledder, bool secondStage) : base(speed, height, bodyColor)
-        {
-            ExtraColor = extraColor;
-            Ledder = ledder;
-            SecondStage = secondStage;
-        }
-    }
-}

DoubleDeckerBus/DoubleDeckerBus/FormBus.Designer.cs

@@ -38,7 +38,6 @@
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.pictureBoxBus = new System.Windows.Forms.PictureBox();
-            this.buttonСreateExtra = new System.Windows.Forms.Button();
             this.statusStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).BeginInit();
             this.SuspendLayout();
@@ -50,38 +49,36 @@
             this.toolStripStatusLabelSpeed,
             this.toolStripStatusLabelWeight,
             this.toolStripStatusLabelBodyColor});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 316);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 425);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0);
-            this.statusStrip1.Size = new System.Drawing.Size(700, 22);
+            this.statusStrip1.Size = new System.Drawing.Size(800, 26);
             this.statusStrip1.TabIndex = 1;
             this.statusStrip1.Text = "statusStrip1";
             // 
             // toolStripStatusLabelSpeed
             // 
             this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(65, 17);
+            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(80, 20);
             this.toolStripStatusLabelSpeed.Text = "Скорость: ";
             // 
             // toolStripStatusLabelWeight
             // 
             this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(32, 17);
+            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(40, 20);
             this.toolStripStatusLabelWeight.Text = "Вес: ";
             // 
             // toolStripStatusLabelBodyColor
             // 
             this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
-            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(39, 17);
+            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(49, 20);
             this.toolStripStatusLabelBodyColor.Text = "Цвет: ";
             // 
             // 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(0, 297);
-            this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonCreate.Location = new System.Drawing.Point(0, 396);
             this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(87, 21);
+            this.buttonCreate.Size = new System.Drawing.Size(99, 28);
             this.buttonCreate.TabIndex = 2;
             this.buttonCreate.Text = "Создать";
             this.buttonCreate.UseVisualStyleBackColor = true;
@@ -92,10 +89,9 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.UpArrow;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(628, 253);
-            this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonUp.Location = new System.Drawing.Point(718, 337);
             this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(26, 22);
+            this.buttonUp.Size = new System.Drawing.Size(30, 29);
             this.buttonUp.TabIndex = 3;
             this.buttonUp.Text = " ";
             this.buttonUp.UseVisualStyleBackColor = true;
@@ -106,10 +102,9 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.LeftArrow;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(606, 272);
-            this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonLeft.Location = new System.Drawing.Point(693, 363);
             this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(26, 22);
+            this.buttonLeft.Size = new System.Drawing.Size(30, 29);
             this.buttonLeft.TabIndex = 4;
             this.buttonLeft.Text = " ";
             this.buttonLeft.UseVisualStyleBackColor = true;
@@ -120,10 +115,9 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.DownArrow;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(629, 291);
-            this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonDown.Location = new System.Drawing.Point(719, 388);
             this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(26, 22);
+            this.buttonDown.Size = new System.Drawing.Size(30, 29);
             this.buttonDown.TabIndex = 5;
             this.buttonDown.Text = " ";
             this.buttonDown.UseVisualStyleBackColor = true;
@@ -134,10 +128,9 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.RightArrow;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(652, 272);
-            this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonRight.Location = new System.Drawing.Point(745, 363);
             this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(26, 22);
+            this.buttonRight.Size = new System.Drawing.Size(30, 29);
             this.buttonRight.TabIndex = 6;
             this.buttonRight.Text = " ";
             this.buttonRight.UseVisualStyleBackColor = true;
@@ -147,30 +140,18 @@
             // 
             this.pictureBoxBus.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureBoxBus.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxBus.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.pictureBoxBus.Name = "pictureBoxBus";
-            this.pictureBoxBus.Size = new System.Drawing.Size(700, 316);
+            this.pictureBoxBus.Size = new System.Drawing.Size(800, 425);
             this.pictureBoxBus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
             this.pictureBoxBus.TabIndex = 7;
             this.pictureBoxBus.TabStop = false;
             this.pictureBoxBus.Resize += new System.EventHandler(this.PictureBoxBus_Resize);
             // 
-            // buttonСreateExtra
-            // 
-            this.buttonСreateExtra.Location = new System.Drawing.Point(103, 297);
-            this.buttonСreateExtra.Name = "buttonСreateExtra";
-            this.buttonСreateExtra.Size = new System.Drawing.Size(99, 21);
-            this.buttonСreateExtra.TabIndex = 8;
-            this.buttonСreateExtra.Text = "Модификация";
-            this.buttonСreateExtra.UseVisualStyleBackColor = true;
-            this.buttonСreateExtra.Click += new System.EventHandler(this.ButtonСreateExtra_Click);
-            // 
             // FormBus
             // 
-            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(700, 338);
-            this.Controls.Add(this.buttonСreateExtra);
+            this.ClientSize = new System.Drawing.Size(800, 451);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.buttonLeft);
@@ -178,7 +159,6 @@
             this.Controls.Add(this.buttonCreate);
             this.Controls.Add(this.pictureBoxBus);
             this.Controls.Add(this.statusStrip1);
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "FormBus";
             this.Text = "Двухэтажный автобус";
             this.Resize += new System.EventHandler(this.PictureBoxBus_Resize);
@@ -201,6 +181,5 @@
         private Button buttonDown;
         private Button buttonRight;
         private PictureBox pictureBoxBus;
-        private Button buttonСreateExtra;
     }
 }

DoubleDeckerBus/DoubleDeckerBus/FormBus.cs

@@ -2,7 +2,7 @@ namespace DoubleDeckerBus
 {
     public partial class FormBus : Form
     {
-        private DrawingBus _bus;
+        private DrawningBus _bus;
         public FormBus()
         {
             InitializeComponent();
@@ -19,12 +19,18 @@ namespace DoubleDeckerBus
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            _bus = new DrawingBus(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            SetData();
+            _bus = new DrawningBus();
+            _bus.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            _bus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxBus.Width, pictureBoxBus.Height);
+            toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_bus.Bus.Speed}";
+            toolStripStatusLabelWeight.Text = $"Âåñ: {_bus.Bus.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Öâåò: {_bus.Bus.BodyColor.Name}";
             Draw();
         }
 
-        private void ButtonMove_Click(object sender, EventArgs e) {
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            //ïîëó÷àåì èìÿ êíîïêè
             string name = ((Button)sender)?.Name ?? string.Empty;
             switch (name)
             {
@@ -44,28 +50,10 @@ namespace DoubleDeckerBus
             Draw();
         }
 
-        public void SetData() {
-            Random rnd = new();
-            _bus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxBus.Width, pictureBoxBus.Height);
-            toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_bus.Bus.Speed}";
-            toolStripStatusLabelWeight.Text = $"Âåñ: {_bus.Bus.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Öâåò: {_bus.Bus.BodyColor.Name}";
-        }
-
-        private void PictureBoxBus_Resize(object sender, EventArgs e) {
+        private void PictureBoxBus_Resize(object sender, EventArgs e)
+        {
             _bus?.ChangeBorders(pictureBoxBus.Width, pictureBoxBus.Height);
             Draw();
         }
-
-        private void ButtonÑreateExtra_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            _bus = new DrawingDDB(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();
-            Draw();
-        }
     }
 }

DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs

@@ -1,214 +0,0 @@
-namespace DoubleDeckerBus
-{
-    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.buttonCreate = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.pictureBoxBus = new System.Windows.Forms.PictureBox();
-            this.buttonСreateExtra = new System.Windows.Forms.Button();
-            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
-            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).BeginInit();
-            this.statusStrip1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // 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(0, 389);
-            this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(99, 28);
-            this.buttonCreate.TabIndex = 2;
-            this.buttonCreate.Text = "Создать";
-            this.buttonCreate.UseVisualStyleBackColor = true;
-            this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
-            // 
-            // buttonUp
-            // 
-            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonUp.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.UpArrow;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(718, 337);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 29);
-            this.buttonUp.TabIndex = 3;
-            this.buttonUp.Text = " ";
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.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::DoubleDeckerBus.Properties.Resources.LeftArrow;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(693, 363);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 29);
-            this.buttonLeft.TabIndex = 4;
-            this.buttonLeft.Text = " ";
-            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::DoubleDeckerBus.Properties.Resources.DownArrow;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(719, 388);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 29);
-            this.buttonDown.TabIndex = 5;
-            this.buttonDown.Text = " ";
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.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::DoubleDeckerBus.Properties.Resources.RightArrow;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(745, 363);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 29);
-            this.buttonRight.TabIndex = 6;
-            this.buttonRight.Text = " ";
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // pictureBoxBus
-            // 
-            this.pictureBoxBus.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxBus.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxBus.Name = "pictureBoxBus";
-            this.pictureBoxBus.Size = new System.Drawing.Size(800, 425);
-            this.pictureBoxBus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBoxBus.TabIndex = 7;
-            this.pictureBoxBus.TabStop = false;
-            // 
-            // buttonСreateExtra
-            // 
-            this.buttonСreateExtra.Location = new System.Drawing.Point(118, 388);
-            this.buttonСreateExtra.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.buttonСreateExtra.Name = "buttonСreateExtra";
-            this.buttonСreateExtra.Size = new System.Drawing.Size(113, 28);
-            this.buttonСreateExtra.TabIndex = 8;
-            this.buttonСreateExtra.Text = "Модификация";
-            this.buttonСreateExtra.UseVisualStyleBackColor = true;
-            this.buttonСreateExtra.Click += new System.EventHandler(this.ButtonСreateExtra_Click);
-            // 
-            // toolStripStatusLabelSpeed
-            // 
-            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(80, 20);
-            this.toolStripStatusLabelSpeed.Text = "Скорость: ";
-            // 
-            // toolStripStatusLabelWeight
-            // 
-            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(40, 20);
-            this.toolStripStatusLabelWeight.Text = "Вес: ";
-            // 
-            // toolStripStatusLabelBodyColor
-            // 
-            this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
-            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(49, 20);
-            this.toolStripStatusLabelBodyColor.Text = "Цвет: ";
-            // 
-            // statusStrip1
-            // 
-            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.statusStrip1.Location = new System.Drawing.Point(0, 425);
-            this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(800, 26);
-            this.statusStrip1.TabIndex = 1;
-            this.statusStrip1.Text = "statusStrip1";
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Водная карта"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(0, 0);
-            this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(138, 28);
-            this.comboBoxSelectorMap.TabIndex = 9;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // FormMap
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 451);
-            this.Controls.Add(this.comboBoxSelectorMap);
-            this.Controls.Add(this.buttonСreateExtra);
-            this.Controls.Add(this.buttonRight);
-            this.Controls.Add(this.buttonDown);
-            this.Controls.Add(this.buttonLeft);
-            this.Controls.Add(this.buttonUp);
-            this.Controls.Add(this.buttonCreate);
-            this.Controls.Add(this.pictureBoxBus);
-            this.Controls.Add(this.statusStrip1);
-            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.Name = "FormMap";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).EndInit();
-            this.statusStrip1.ResumeLayout(false);
-            this.statusStrip1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-            #endregion
-        private Button buttonCreate;
-        private Button buttonUp;
-        private Button buttonLeft;
-        private Button buttonDown;
-        private Button buttonRight;
-        private PictureBox pictureBoxBus;
-        private Button buttonСreateExtra;
-        private ToolStripStatusLabel toolStripStatusLabelSpeed;
-        private ToolStripStatusLabel toolStripStatusLabelWeight;
-        private ToolStripStatusLabel toolStripStatusLabelBodyColor;
-        private StatusStrip statusStrip1;
-        private ComboBox comboBoxSelectorMap;
-    }
-}

DoubleDeckerBus/DoubleDeckerBus/FormMap.cs

@@ -1,87 +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 DoubleDeckerBus
-{
-    public partial class FormMap : Form
-    {
-        private AbstractMap _abstractMap;
-        public FormMap()
-        {
-            InitializeComponent();
-            _abstractMap = new SimpleMap();
-            comboBoxSelectorMap.SelectedIndex = 0;
-        }
-
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var bus = new DrawingBus(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            SetData(bus);
-        }
-
-        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;
-            }
-            pictureBoxBus.Image = _abstractMap?.MoveObject(dir);
-        }
-
-        private void SetData(DrawingBus bus)
-        {
-            toolStripStatusLabelSpeed.Text = $"Скорость: {bus.Bus.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {bus.Bus.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Цвет: {bus.Bus.BodyColor.Name}";
-            pictureBoxBus.Image = _abstractMap.CreateMap(pictureBoxBus.Width, pictureBoxBus.Height,
-                new DrawingObjectBus(bus));
-        }
-
-        private void ButtonСreateExtra_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var bus = new DrawingDDB(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(bus);
-        }
-
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Простая карта":
-                    _abstractMap = new SimpleMap();
-                    break;
-                case "Водная карта":
-                    _abstractMap = new WaterMap();
-                    break;
-            }
-        }
-    }
-
-
-}
-

DoubleDeckerBus/DoubleDeckerBus/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="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>

DoubleDeckerBus/DoubleDeckerBus/IDrawingObject.cs

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

DoubleDeckerBus/DoubleDeckerBus/Program.cs

@@ -11,7 +11,7 @@ namespace DoubleDeckerBus
             // 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 FormBus());
         }
     }
 }

DoubleDeckerBus/DoubleDeckerBus/SimpleMap.cs

@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DoubleDeckerBus
-{
-    internal class SimpleMap : AbstractMap
-    {
-        private readonly Brush barrierColor = new SolidBrush(Color.Black);
-        private readonly Brush roadColor = new SolidBrush(Color.Gray);
-
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 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++;
-                }
-            }
-        }
-    }
-}

DoubleDeckerBus/DoubleDeckerBus/WaterMap.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DoubleDeckerBus
-{
-    internal class WaterMap : AbstractMap
-    {
-        private readonly Brush barrierColor = new SolidBrush(Color.Blue);
-        private readonly Brush grassColor = new SolidBrush(Color.Green);
-        private readonly Brush lightGrassColor = new SolidBrush(Color.LightGreen);
-        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)
-        {
-            Random rnd = new Random();
-            if (rnd.Next(0, 7) == 6)
-            {
-                g.FillRectangle(grassColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-            }
-            else {
-                g.FillRectangle(lightGrassColor, 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++;
-                }
-            }
-        }
-    }
-}