AccordionBus/AccordionBus/AbstractMap.cs

@@ -1,162 +0,0 @@
-using AccordionBus;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AccordionBus
-{
-    internal abstract class AbstractMap
-    {
-        private IDrawningObject _drawningObject = null;
-        protected int[,] _map = null;
-        protected int _width;
-        protected int _height;
-        protected float _size_x;
-        protected float _size_y;
-        protected readonly Random _random = new();
-        protected readonly int _freeRoad = 0;
-        protected readonly int _barrier = 1;
-
-        public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject)
-        {
-            _width = width;
-            _height = height;
-            _drawningObject = drawningObject;
-            GenerateMap();
-            while (!SetObjectOnMap())
-            {
-                GenerateMap();
-            }
-            return DrawMapWithObject();
-        }
-        public Bitmap MoveObject(Direction direction)
-        {
-            bool free = true;
-            int startPosX = (int)(_drawningObject.GetCurrentPosition().Left / _size_x);
-            int startPosY = (int)(_drawningObject.GetCurrentPosition().Right / _size_y);
-            int busWidth = (int)(_drawningObject.GetCurrentPosition().Top / _size_x);
-            int busHeight = (int)(_drawningObject.GetCurrentPosition().Bottom / _size_y);
-            switch (direction)
-            {
-                // вправо
-                case Direction.Right:
-                    for (int i = busWidth; i <= busWidth + (int)(_drawningObject.Step / _size_x); ++i)
-                    {
-                        for (int j = startPosY; j <= busHeight; ++j)
-                        {
-                            if (_map[i, j] == _barrier)
-                            {
-                                free = false;
-                                break;
-                            }
-                        }
-                    }
-                    break;
-                //влево
-                case Direction.Left:
-                    for (int i = startPosX; i >= (int)(_drawningObject.Step / _size_x); --i)
-                    {
-                        for (int j = startPosY; j <= busHeight; ++j)
-                        {
-                            if (_map[i, j] == _barrier)
-                            {
-                                free = false;
-                                break;
-                            }
-                        }
-                    }
-                    break;
-                //вверх
-                case Direction.Up:
-                    for (int i = startPosX; i <= busWidth; ++i)
-                    {
-                        for (int j = startPosY; j >= (int)(_drawningObject.Step / _size_y); --j)
-                        {
-                            if (_map[i, j] == _barrier)
-                            {
-                                free = false;
-                                break;
-                            }
-                        }
-                    }
-                    break;
-                //вниз
-                case Direction.Down:
-                    for (int i = startPosX; i <= busWidth; ++i)
-                    {
-                        for (int j = busHeight; j <= busHeight + (int)(_drawningObject.Step / _size_y); ++j)
-                        {
-                            if (_map[i, j] == _barrier)
-                            {
-                                free = false;
-                                break;
-                            }
-                        }
-                    }
-                    break;
-            }
-            if (free)
-            {
-                _drawningObject.MoveObject(direction);
-            }
-            return DrawMapWithObject();
-        }
-        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);
-
-            int startPosX = (int)(_drawningObject.GetCurrentPosition().Left / _size_x);
-            int startPosY = (int)(_drawningObject.GetCurrentPosition().Right / _size_y);
-            int busWidth = (int)(_drawningObject.GetCurrentPosition().Top / _size_x);
-            int busHeight = (int)(_drawningObject.GetCurrentPosition().Bottom / _size_y);
-            for (int i = startPosX; i <= busWidth; ++i)
-            {
-                for (int j = startPosY; j <= busHeight; ++j)
-                {
-                    if (_map[i, j] == _barrier)
-                    {
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-        private Bitmap DrawMapWithObject()
-        {
-            Bitmap bmp = new(_width, _height);
-            if (_drawningObject == null || _map == null)
-            {
-                return bmp;
-            }
-            Graphics gr = Graphics.FromImage(bmp);
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    if (_map[i, j] == _freeRoad)
-                    {
-                        DrawRoadPart(gr, i, j);
-                    }
-                    else if (_map[i, j] == _barrier)
-                    {
-                        DrawBarrierPart(gr, i, j);
-                    }
-                }
-            }
-            _drawningObject.DrawningObject(gr);
-            return bmp;
-        }
-
-        protected abstract void GenerateMap();
-        protected abstract void DrawRoadPart(Graphics g, int i, int j);
-        protected abstract void DrawBarrierPart(Graphics g, int i, int j);
-    }
-}

AccordionBus/AccordionBus/Direction.cs

@@ -11,7 +11,6 @@ namespace AccordionBus
     /// </summary>
     internal enum Direction
     {
-        None = 0,
         Up = 1,
         Down = 2,
         Left = 3,

AccordionBus/AccordionBus/DrawningAccordionBus.cs

@@ -1,104 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AccordionBus
-{
-    /// <summary>
-    /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
-    /// </summary>
-    internal class DrawningAccordionBus : DrawningBus
-    {
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес автобуса</param>
-        /// <param name="bodyColor">Цвет кузова</param>
-        /// <param name="dopColor">Дополнительный цвет</param>
-        /// <param name="compartment">Признак наличия отсека</param>
-        /// <param name="rearviewMirror">Признак наличия зеркала заднего вида</param>
-        /// <param name="busNumber">Признак наличия номера автобуса</param>
-        public DrawningAccordionBus(int speed, float weight, Color bodyColor, Color dopColor, bool compartment, bool rearviewMirror, bool busNumber) :
-            base(speed, weight, bodyColor, 300, 70)
-        {
-            Bus = new EntityAccordionBus(speed, weight, bodyColor, dopColor, compartment, rearviewMirror, busNumber);
-        }
-        public override void DrawTransport(Graphics g)
-        {
-            if (Bus is not EntityAccordionBus accordionBus)
-            {
-                return;
-            }
-
-            Pen pen = new(Color.Black);
-            Brush dopBrush = new SolidBrush(accordionBus.DopColor);
-
-            if (accordionBus.Compartment)
-            {
-                //кузов
-                g.FillRectangle(dopBrush, _startPosX + 10, _startPosY + 10, 110, 50);
-
-                //границы отсека
-                g.DrawRectangle(pen, _startPosX + 10, _startPosY + 10, 110, 50);
-
-                //колесо
-                Brush brBlack = new SolidBrush(Color.Black);
-                g.FillEllipse(brBlack, _startPosX + 35, _startPosY + 50, 20, 20);
-                Brush brGray = new SolidBrush(Color.Gray);
-                g.FillEllipse(brGray, _startPosX + 40, _startPosY + 55, 10, 10);
-
-                //стекла
-                Brush brBlue = new SolidBrush(Color.LightBlue);
-                g.FillRectangle(brBlue, _startPosX + 10, _startPosY + 20, 10, 20);
-                g.DrawRectangle(pen, _startPosX + 10, _startPosY + 20, 10, 20);
-                g.FillRectangle(brBlue, _startPosX + 30, _startPosY + 20, 30, 20);
-                g.DrawRectangle(pen, _startPosX + 30, _startPosY + 20, 30, 20);
-                g.FillRectangle(brBlue, _startPosX + 110, _startPosY + 20, 10, 20);
-                g.DrawRectangle(pen, _startPosX + 110, _startPosY + 20, 10, 20);
-                g.FillRectangle(brBlue, _startPosX + 70, _startPosY + 20, 15, 40);
-                g.DrawRectangle(pen, _startPosX + 70, _startPosY + 20, 15, 40);
-                g.FillRectangle(brBlue, _startPosX + 85, _startPosY + 20, 15, 40);
-                g.DrawRectangle(pen, _startPosX + 85, _startPosY + 20, 15, 40);
-
-                //гармошка
-                g.FillRectangle(brGray, _startPosX + 120, _startPosY + 10, 20, 50);
-                g.DrawRectangle(pen, _startPosX + 120, _startPosY + 10, 20, 50);
-                g.DrawRectangle(pen, _startPosX + 122, _startPosY + 10, 16, 50);
-                g.DrawRectangle(pen, _startPosX + 124, _startPosY + 10, 12, 50);
-                g.DrawRectangle(pen, _startPosX + 126, _startPosY + 10, 8, 50);
-                g.DrawRectangle(pen, _startPosX + 128, _startPosY + 10, 4, 50);
-                g.DrawLine(pen, _startPosX + 130, _startPosY + 10, _startPosX + 130, _startPosY + 60);
-            }
-
-            _startPosX += 130;
-            base.DrawTransport(g);
-            _startPosX -= 130;
-
-            if (accordionBus.RearviewMirror)
-            {
-                g.FillRectangle(dopBrush, _startPosX + 285, _startPosY + 14, 15, 2);
-                g.FillRectangle(dopBrush, _startPosX + 298, _startPosY + 14, 2, 16);
-                g.FillRectangle(dopBrush, _startPosX + 295, _startPosY + 20, 5, 10);
-            }
-
-            if (accordionBus.BusNumber)
-            {
-                //табличка
-                g.FillRectangle(dopBrush, _startPosX + 205, _startPosY + 10, 20, 10);
-                g.DrawRectangle(pen, _startPosX + 205, _startPosY + 10, 20, 10);
-
-                //цифры
-                //1
-                g.DrawLine(pen, _startPosX + 210, _startPosY + 12, _startPosX + 210, _startPosY + 18);
-                //0
-                g.DrawRectangle(pen, _startPosX + 220, _startPosY + 12, 3, 6);
-                //7
-                g.DrawLine(pen, _startPosX + 214, _startPosY + 12, _startPosX + 216, _startPosY + 12); 
-                g.DrawLine(pen, _startPosX + 216, _startPosY + 12, _startPosX + 216, _startPosY + 18);
-            }
-        }
-    }
-}

AccordionBus/AccordionBus/DrawningBus.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection.Metadata.Ecma335;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -16,15 +15,15 @@ namespace AccordionBus
         /// <summary>
         /// Класс-сущность
         /// </summary>
-        public EntityBus Bus { get; protected set; }
+        public EntityBus Bus { get; private set; }
         /// <summary>
         /// Левая координата отрисовки автобуса
         /// </summary>
-        protected float _startPosX;
+        private float _startPosX;
         /// <summary>
         /// Верхняя кооридната отрисовки автобуса
         /// </summary>
-        protected float _startPosY;
+        private float _startPosY;
         /// <summary>
         /// Ширина окна отрисовки
         /// </summary>
@@ -47,23 +46,10 @@ namespace AccordionBus
         /// <param name="speed">Скорость</param>
         /// <param name="weight">Вес автобуса</param>
         /// <param name="bodyColor">Цвет кузова</param>
-        public DrawningBus(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight, Color bodyColor)
         {
-            Bus = new EntityBus(speed, weight, bodyColor);
-        }
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес автобуса</param>
-        /// <param name="bodyColor">Цвет кузова</param>
-        /// <param name="busWidth">Ширина отрисовки автобуса</param>
-        /// <param name="busHeight">Высота отрисовки автобуса</param>
-        protected DrawningBus(int speed, float weight, Color bodyColor, int busWidth, int busHeight) :
-            this(speed, weight, bodyColor)
-        {
-            _busWidth = busWidth;
-            _busHeight = busHeight;
+            Bus = new EntityBus();
+            Bus.Init(speed, weight, bodyColor);
         }
         /// <summary>
         /// Установка позиции автобуса
@@ -129,7 +115,7 @@ namespace AccordionBus
         /// Отрисовка автобуса
         /// </summary>
         /// <param name="g"></param>
-        public virtual void DrawTransport(Graphics g)
+        public void DrawTransport(Graphics g)
         {
             if (_startPosX < 0 || _startPosY < 0
                 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
@@ -191,13 +177,5 @@ namespace AccordionBus
                 _startPosY = _pictureHeight.Value - _busHeight;
             }
         }
-        /// <summary>
-        /// Получение текущей позиции объекта
-        /// </summary>
-        /// <returns></returns>
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return (_startPosX, _startPosY, _startPosX + _busWidth, _startPosY + _busHeight);
-        }
     }
 }

AccordionBus/AccordionBus/DrawningObjectBus.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AccordionBus
-{
-    internal class DrawningObjectBus : IDrawningObject
-    {
-        public DrawningBus _bus = null;
-
-        public DrawningObjectBus(DrawningBus 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 IDrawningObject.DrawningObject(Graphics g)
-        {
-            _bus?.DrawTransport(g);
-        }
-    }
-}

AccordionBus/AccordionBus/EntityAccordionBus.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AccordionBus
-{
-    /// <summary>
-    /// Класс-сущность "Автобус с гармошкой"
-    /// </summary>
-    internal class EntityAccordionBus : EntityBus
-    {
-        /// <summary>
-        /// Дополнительный цвет
-        /// </summary>
-        public Color DopColor { get; private set; }
-        /// <summary>
-        /// Признак наличия отсека
-        /// </summary>
-        public bool Compartment { get; private set; }
-        /// <summary>
-        /// Признак наличия зеркала заднего вида
-        /// </summary>
-        public bool RearviewMirror { get; private set; }
-        /// <summary>
-        /// Признак наличия номера автобуса
-        /// </summary>
-        public bool BusNumber { get; private set; }
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес автобуса</param>
-        /// <param name="bodyColor">Цвет кузова</param>
-        /// <param name="dopColor">Дополнительный цвет</param>
-        /// <param name="compartment">Признак наличия отсека</param>
-        /// <param name="rearviewMirror">Признак наличия зеркала заднего вида</param>
-        /// <param name="busNumber">Признак наличия номера автобуса</param>
-        public EntityAccordionBus(int speed, float weight, Color bodyColor, Color dopColor, bool compartment, bool rearviewMirror, bool busNumber) :
-            base(speed, weight, bodyColor)
-        {
-            DopColor = dopColor;
-            Compartment = compartment;
-            RearviewMirror = rearviewMirror;
-            BusNumber = busNumber;
-        }
-    }
-}

AccordionBus/AccordionBus/EntityBus.cs

@@ -34,7 +34,7 @@ namespace AccordionBus
         /// <param name="weight"></param>
         /// <param name="bodyColor"></param>
         /// <returns></returns>
-        public EntityBus(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;

AccordionBus/AccordionBus/FormBus.Designer.cs

@@ -38,7 +38,6 @@
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonCreateModif = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).BeginInit();
             this.statusStrip.SuspendLayout();
             this.SuspendLayout();
@@ -143,23 +142,11 @@
             this.buttonRight.UseVisualStyleBackColor = true;
             this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
-            // buttonCreateModif
-            // 
-            this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreateModif.Location = new System.Drawing.Point(123, 382);
-            this.buttonCreateModif.Name = "buttonCreateModif";
-            this.buttonCreateModif.Size = new System.Drawing.Size(117, 29);
-            this.buttonCreateModif.TabIndex = 7;
-            this.buttonCreateModif.Text = "Модификация";
-            this.buttonCreateModif.UseVisualStyleBackColor = true;
-            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
-            // 
             // FormBus
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.buttonLeft);
@@ -189,6 +176,5 @@
         private Button buttonLeft;
         private Button buttonDown;
         private Button buttonRight;
-        private Button buttonCreateModif;
     }
 }

AccordionBus/AccordionBus/FormBus.cs

@@ -19,17 +19,6 @@ namespace AccordionBus
             _bus?.DrawTransport(gr);
             pictureBoxBus.Image = bmp;
         }
-        /// <summary>
-		/// Ìåòîä óñòàíîâêè äàííûõ
-		/// </summary>
-		private 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}";
-        }
         /// <summary>
         /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ñîçäàòü"
         /// </summary>
@@ -38,8 +27,12 @@ namespace AccordionBus
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            _bus = new DrawningBus(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();
         }
         /// <summary>
@@ -78,20 +71,5 @@ namespace AccordionBus
             _bus?.ChangeBorders(pictureBoxBus.Width, pictureBoxBus.Height);
             Draw();
         }
-        /// <summary>
-        /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ìîäèôèêàöèÿ"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreateModif_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            _bus = new DrawningAccordionBus(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)), Convert.ToBoolean(rnd.Next(0, 2)));
-            SetData();
-            Draw();
-        }
     }
 }

AccordionBus/AccordionBus/FormMap.Designer.cs

@@ -1,209 +0,0 @@
-namespace AccordionBus
-{
-    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.pictureBoxBus = new System.Windows.Forms.PictureBox();
-            this.statusStrip = 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.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.buttonCreateModif = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).BeginInit();
-            this.statusStrip.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // 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, 424);
-            this.pictureBoxBus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBoxBus.TabIndex = 0;
-            this.pictureBoxBus.TabStop = false;
-            // 
-            // statusStrip
-            // 
-            this.statusStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripStatusLabelSpeed,
-            this.toolStripStatusLabelWeight,
-            this.toolStripStatusLabelBodyColor});
-            this.statusStrip.Location = new System.Drawing.Point(0, 424);
-            this.statusStrip.Name = "statusStrip";
-            this.statusStrip.Size = new System.Drawing.Size(800, 26);
-            this.statusStrip.TabIndex = 1;
-            // 
-            // 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(45, 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(12, 382);
-            this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(94, 29);
-            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::AccordionBus.Properties.Resources.arrowUp;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(722, 345);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 30);
-            this.buttonUp.TabIndex = 3;
-            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::AccordionBus.Properties.Resources.arrowLeft;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(686, 381);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
-            this.buttonLeft.TabIndex = 4;
-            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::AccordionBus.Properties.Resources.arrowDown;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(722, 381);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 30);
-            this.buttonDown.TabIndex = 5;
-            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::AccordionBus.Properties.Resources.arrowRight;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(758, 381);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 30);
-            this.buttonRight.TabIndex = 6;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonCreateModif
-            // 
-            this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreateModif.Location = new System.Drawing.Point(123, 382);
-            this.buttonCreateModif.Name = "buttonCreateModif";
-            this.buttonCreateModif.Size = new System.Drawing.Size(117, 29);
-            this.buttonCreateModif.TabIndex = 7;
-            this.buttonCreateModif.Text = "Модификация";
-            this.buttonCreateModif.UseVisualStyleBackColor = true;
-            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Карта подземного туннеля"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28);
-            this.comboBoxSelectorMap.TabIndex = 8;
-            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, 450);
-            this.Controls.Add(this.comboBoxSelectorMap);
-            this.Controls.Add(this.buttonCreateModif);
-            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.statusStrip);
-            this.Name = "FormMap";
-            this.Text = "Карта";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).EndInit();
-            this.statusStrip.ResumeLayout(false);
-            this.statusStrip.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private PictureBox pictureBoxBus;
-        private StatusStrip statusStrip;
-        private ToolStripStatusLabel toolStripStatusLabelSpeed;
-        private ToolStripStatusLabel toolStripStatusLabelWeight;
-        private ToolStripStatusLabel toolStripStatusLabelBodyColor;
-        private Button buttonCreate;
-        private Button buttonUp;
-        private Button buttonLeft;
-        private Button buttonDown;
-        private Button buttonRight;
-        private Button buttonCreateModif;
-        private ComboBox comboBoxSelectorMap;
-    }
-}

AccordionBus/AccordionBus/FormMap.cs

@@ -1,103 +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 AccordionBus
-{
-    public partial class FormMap : Form
-    {
-        private AbstractMap _abstractMap;
-        public FormMap()
-        {
-            InitializeComponent();
-            _abstractMap = new SimpleMap();
-        }
-        /// <summary>
-        /// Заполнение информации по объекту
-        /// </summary>
-        /// <param name="bus"></param>
-        private void SetData(DrawningBus 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 DrawningObjectBus(bus));
-        }
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var bus = new DrawningBus(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            SetData(bus);
-        }
-        /// <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;
-            }
-            pictureBoxBus.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 bus = new DrawningAccordionBus(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)), Convert.ToBoolean(rnd.Next(0, 2)));
-            SetData(bus);
-        }
-        /// <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 UndergroundTunnelMap();
-                    break;
-            }
-        }
-    }
-}

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

AccordionBus/AccordionBus/IDrawningObject.cs

@@ -1,44 +0,0 @@
-using AccordionBus;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AccordionBus
-{
-    /// <summary>
-    /// Интерфейс для работы с объектом, прорисовываемым на форме
-    /// </summary>
-    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>
-        /// <returns></returns>
-        void MoveObject(Direction direction);
-        /// <summary>
-        /// Отрисовка объекта
-        /// </summary>
-        /// <param name="g"></param>
-        void DrawningObject(Graphics g);
-        /// <summary>
-        /// Получение текущей позиции объекта
-        /// </summary>
-        /// <returns></returns>
-        (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
-    }
-}

AccordionBus/AccordionBus/Program.cs

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

AccordionBus/AccordionBus/SimpleMap.cs

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

AccordionBus/AccordionBus/UndergroundTunnelMap.cs

@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AccordionBus
-{
-    /// <summary>
-    /// Реализация карты подземного туннеля абстрактного класса AbstractMap
-    /// </summary>
-    internal class UndergroundTunnelMap : 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;
-                }
-            }
-            int x = 0;
-            int y = 30;
-            while (counter < 50)
-            {
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-                    counter++;
-                }
-                x++;
-            }
-            counter = 0;
-            x = 50;
-            y += 30;
-            while (counter < 50)
-            {
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-                    counter++;
-                }
-                x++;
-            }
-            counter = 0;
-            x = 0;
-            y += 30;
-            while (counter < 50)
-            {
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-                    counter++;
-                }
-                x++;
-            }
-        }
-    }
-}