Bus/Bus/AbstractMap.cs

@@ -1,164 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Bus
-{
-    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 bool CheckBarriers(float Left, float Right, float Top, float Bottom)
-        {
-            int startX = (int)(Left / _size_x);
-            int startY = (int)(Right / _size_y);
-            int endX = (int)(Top / _size_x);
-            int endY = (int)(Bottom / _size_y);
-
-            for (int i = startX; i <= endX; i++)
-            {
-                for (int j = startY; j <= endY; j++)
-                {
-                    if (_map[i, j] == _barrier)
-                    {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-
-        public Bitmap MoveObject(Direction direction)
-        {
-            
-            _drawingObject.MoveObject(direction);
-            (float Left, float Right, float Top, float Bottom) = _drawingObject.GetCurrentPosition();
-            bool isTrue = true;
-            bool collision = CheckCollision();
-            if (CheckBarriers(Left, Right, Top, Bottom))
-            {
-                _drawingObject.MoveObject(MoveObjectBack(direction));
-            }
-            return DrawMapWithObject();
-
-
-            
-            
-
-        }
-
-
-        private Direction MoveObjectBack(Direction direction)
-        {
-            switch (direction)
-            {
-                case Direction.Up:
-                    return Direction.Down;
-                case Direction.Down:
-                    return Direction.Up;
-                case Direction.Left:
-                    return Direction.Right;
-                case Direction.Right:
-                    return Direction.Left;
-            }
-            return Direction.None;
-        }
-
-
-        private bool SetObjectOnMap()
-        {
-            if (_drawingObject == null || _map == null)
-            {
-                return false;
-            }
-            int x = _random.Next(0, 100);
-            int y = _random.Next(0, 100);
-            _drawingObject.SetObject(x, y, _width, _height);
-            if (!CheckBarriers(0, 0, 0, 0)) return false;
-            return true;
-        }
-
-        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);
-    }
-}

Bus/Bus/Bus.csproj

@@ -8,19 +8,4 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
 </Project>

Bus/Bus/Direction.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Bus
-{
-    public enum Direction
-    {
-        None = 0,
-        Up = 1,
-        Down = 2,
-        Left = 3,
-        Right = 4
-    }
-}

Bus/Bus/DrawingBus.cs

@@ -1,145 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Bus
-{
-    public class DrawingBus
-    {
-        public EntityBus Bus { get; protected set; }
-        protected float _startPosX;
-        protected float _startPosY;
-        private int? _pictureWidth = null;
-        private int? _pictureHeight = null;
-        protected readonly int _busWidth = 157;
-        protected readonly int _busHeight = 65;
-        
-        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 SetPosition(int x, int y, int width, int height)
-        {
-            if (x < 0 || y < 0 || width < x+_busWidth || height < y + _busHeight)
-            {
-                _pictureHeight = null;
-                _pictureWidth = null;
-                return;
-            }
-            _startPosX = x;
-            _startPosY = y;
-            _pictureWidth = width;
-            _pictureHeight = height;
-        }
-
-        public void MoveTransport(Direction direction)
-        {
-            if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
-            {
-                return;
-            }
-            switch (direction)
-            {
-                case Direction.Right:
-                    if (_startPosX + _busWidth + Bus.Step < _pictureWidth)
-                    {
-                        _startPosX += Bus.Step;
-                    }
-                    break;
-                case Direction.Left:
-                    if (_startPosX - Bus.Step >= 0)
-                    {
-                        _startPosX -= Bus.Step;
-                    }
-                    break;
-                case Direction.Up:
-                    if (_startPosY - Bus.Step >= 0)
-                    {
-                        _startPosY -= Bus.Step;
-                    }
-                    break;
-                case Direction.Down:
-                    if (_startPosY + _busHeight + Bus.Step < _pictureHeight)
-                    {
-                        _startPosY += Bus.Step;
-                    }
-                    break;
-            }
-
-        }
-
-        public virtual void DrawTransport(Graphics g)
-        {
-             if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
-            {
-                return;
-            }
-            //границы автобуса
-            Pen pen = new(Color.Black);
-            g.DrawRectangle(pen, _startPosX + 10, _startPosY + 10, 150, 50);
-
-            //кузов
-            Brush br = new SolidBrush(Bus?.BodyColor ?? Color.Black);
-            g.FillRectangle(br, _startPosX+  11, _startPosY + 11, 149, 49);
-            
-            //колеса
-            Brush brBlack = new SolidBrush(Color.Black);
-            g.FillEllipse(brBlack, _startPosX + 20, _startPosY + 50, 20, 20);
-            g.FillEllipse(brBlack, _startPosX + 130, _startPosY + 50, 20, 20);
-            Brush brGray = new SolidBrush(Color.Gray);
-            g.FillEllipse(brGray, _startPosX + 25, _startPosY + 55, 10, 10);
-            g.FillEllipse(brGray, _startPosX + 135, _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 + 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(brBlue, _startPosX + 110, _startPosY + 20, 30, 20);
-            g.DrawRectangle(pen, _startPosX + 110, _startPosY + 20, 30, 20);
-            g.FillRectangle(brBlue, _startPosX + 150, _startPosY + 20, 10, 20);
-            g.DrawRectangle(pen, _startPosX + 150, _startPosY + 20, 10, 20);
-        }
-
-        public void ChangeBorbers(int width, int height)
-        {
-            _pictureWidth = width;
-            _pictureHeight = height;
-            if (_pictureWidth <= _busWidth || _pictureHeight <= _busHeight)
-            {
-                _pictureWidth = null;
-                _pictureHeight = null;
-                return;
-            }
-            if (_startPosX + _busWidth > _pictureWidth)
-            {
-                _startPosX = _pictureWidth.Value - _busWidth;
-            }
-            if (_startPosY + _busHeight > _pictureHeight)
-            {
-                _startPosY = _pictureHeight.Value - _busHeight;
-            }
-        }
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return (_startPosX, _startPosY, _startPosX + _busWidth, _startPosY + _busHeight);
-        }
-
-    }
-}

Bus/Bus/DrawingObjectBus.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Bus
-{
-    internal class DrawingObjectBus : IDrawingObject
-    {
-        private DrawingBus _bus = null;
-        public float Step => _bus?.Bus?.Step ?? 0;
-
-        public DrawingObjectBus(DrawingBus bus)
-        {
-            _bus = bus;
-        }
-
-        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);
-        }
-    }
-}

Bus/Bus/DrawingSportBus.cs

@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Bus
-{
-    internal class DrawingSportBus : DrawingBus
-    {
-        public DrawingSportBus(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) :
-           base(speed, weight, bodyColor)
-        {
-           Bus = new EntitySportBus(speed, weight, bodyColor, dopColor, bodyKit, wing, sportLine);
-        }
-        
-        public override void DrawTransport(Graphics g)
-        {
-            if (Bus is not EntitySportBus sportBus)
-            {
-                return;
-            }
-            Pen pen = new Pen(Color.Black);
-            Brush dopBrush = new SolidBrush(sportBus.DopColor);
-            
-            if (sportBus.BodyKit)
-            {
-                Brush br = new SolidBrush(Bus?.BodyColor ?? Color.Black);
-                Pen pen1 = new(Color.Black);
-                
-                g.DrawRectangle(pen1, _startPosX + 20, _startPosY, 150, 50);    
-                g.FillRectangle(br, _startPosX + 21, _startPosY+1, 149, 49);
-            }
-
-            _startPosX += 10;
-            _startPosY += 15;
-            base.DrawTransport(g);
-            _startPosX -= 10;
-            _startPosY -= 15;
-
-            if (sportBus.Sportline)
-            {
-                Brush brBlue = new SolidBrush(Color.LightBlue);
-                g.FillRectangle(dopBrush, _startPosX + 30, _startPosY + 5, 10, 14);
-                g.DrawRectangle(pen, _startPosX + 29, _startPosY + 4, 10, 15);
-
-                g.FillRectangle(dopBrush, _startPosX + 60, _startPosY + 5, 10, 14);
-                g.DrawRectangle(pen, _startPosX + 59, _startPosY + 4, 10, 15);
-            }
-
-            if (sportBus.Wing)
-            {
-                g.DrawRectangle(pen, _startPosX + 112, _startPosY + 7, 6,50);
-                g.DrawRectangle(pen, _startPosX + 112, _startPosY + 17, 6, 40);
-                g.DrawRectangle(pen, _startPosX + 112, _startPosY + 27, 6, 10);
-                g.DrawRectangle(pen, _startPosX + 112, _startPosY + 37, 6, 10);
-
-            }
-        }
-    }
-}

Bus/Bus/EntityBus.cs

@@ -1,24 +0,0 @@
- using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Bus
-{
-    public class EntityBus
-    {
-        public int Speed { get; private set; }
-        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)
-        {
-            Random rnd = new Random();
-            Speed = speed <=0 ? rnd.Next(50,150) : speed;
-            Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
-            BodyColor = bodyColor;
-        }
-    }
-}

Bus/Bus/EntitySportBus.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Bus
-{
-    internal class EntitySportBus : EntityBus
-    {
-        public Color DopColor { get; private set; }
-        public Color DopColor1 { get; private set; }
-        public bool BodyKit { get; private set; }
-        public bool Wing { get; private set; }
-        public bool Sportline { get; private set; }
-
-        public EntitySportBus(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportline) :
-            base(speed, weight, bodyColor)
-        {
-            DopColor = dopColor;
-            DopColor1 = bodyColor;
-            BodyKit = bodyKit = true;
-            Wing = wing = true;
-            Sportline = sportline = true;
-        }
-    }
-}

Bus/Bus/Form1.Designer.cs

@@ -0,0 +1,39 @@
+namespace Bus
+{
+    partial class Form1
+    {
+        /// <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.components = new System.ComponentModel.Container();
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Text = "Form1";
+        }
+
+        #endregion
+    }
+}

Bus/Bus/Form1.cs

@@ -0,0 +1,10 @@
+namespace Bus
+{
+    public partial class Form1 : Form
+    {
+        public Form1()
+        {
+            InitializeComponent();
+        }
+    }
+}

Bus/Bus/Form1.resx

@@ -117,17 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="Frame 3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Frame 3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Frame 4" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Frame 4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Frame 5" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Frame 5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Frame 6" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Frame 6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
 </root>

Bus/Bus/FormBus.Designer.cs

@@ -1,208 +0,0 @@
-namespace Bus
-{
-    partial class FormBus
-    {
-        /// <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.statusStrip1 = new System.Windows.Forms.StatusStrip();
-            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
-            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.buttonSelectedBus = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).BeginInit();
-            this.statusStrip1.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(827, 429);
-            this.pictureBoxBus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBoxBus.TabIndex = 0;
-            this.pictureBoxBus.TabStop = false;
-            this.pictureBoxBus.Resize += new System.EventHandler(this.PictureBoxBus_Resize);
-            // 
-            // 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, 429);
-            this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(827, 26);
-            this.statusStrip1.TabIndex = 1;
-            this.statusStrip1.Text = "statusStrip1";
-            // 
-            // toolStripStatusLabelSpeed
-            // 
-            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20);
-            this.toolStripStatusLabelSpeed.Text = "Скорость:";
-            // 
-            // toolStripStatusLabelWeight
-            // 
-            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20);
-            this.toolStripStatusLabelWeight.Text = "Вес:";
-            // 
-            // toolStripStatusLabelBodyColor
-            // 
-            this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
-            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(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(11, 384);
-            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::Bus.Properties.Resources.Frame_3;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(744, 346);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(40, 40);
-            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::Bus.Properties.Resources.Frame_6;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(704, 386);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(40, 40);
-            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::Bus.Properties.Resources.Frame_5;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(744, 386);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(40, 40);
-            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::Bus.Properties.Resources.Frame_4;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(784, 386);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(40, 40);
-            this.buttonRight.TabIndex = 6;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonCreateModif
-            // 
-            this.buttonCreateModif.Location = new System.Drawing.Point(111, 384);
-            this.buttonCreateModif.Name = "buttonCreateModif";
-            this.buttonCreateModif.Size = new System.Drawing.Size(141, 29);
-            this.buttonCreateModif.TabIndex = 7;
-            this.buttonCreateModif.Text = "Модификация";
-            this.buttonCreateModif.UseVisualStyleBackColor = true;
-            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
-            // 
-            // buttonSelectedBus
-            // 
-            this.buttonSelectedBus.Location = new System.Drawing.Point(592, 386);
-            this.buttonSelectedBus.Name = "buttonSelectedBus";
-            this.buttonSelectedBus.Size = new System.Drawing.Size(94, 29);
-            this.buttonSelectedBus.TabIndex = 8;
-            this.buttonSelectedBus.Text = "Выбрать";
-            this.buttonSelectedBus.UseVisualStyleBackColor = true;
-            this.buttonSelectedBus.Click += new System.EventHandler(this.ButtonSelectedBus_Click);
-            // 
-            // FormBus
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(827, 455);
-            this.Controls.Add(this.buttonSelectedBus);
-            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.statusStrip1);
-            this.Name = "FormBus";
-            this.Text = "Автобус";
-            this.Click += new System.EventHandler(this.ButtonMove_Click);
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).EndInit();
-            this.statusStrip1.ResumeLayout(false);
-            this.statusStrip1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private PictureBox pictureBoxBus;
-        private StatusStrip statusStrip1;
-        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 Button buttonSelectedBus;
-    }
-}

Bus/Bus/FormBus.cs

@@ -1,104 +0,0 @@
-namespace Bus
-{
-    public partial class FormBus : Form
-    {
-
-        private DrawingBus _bus;
-
-        public DrawingBus SelectedBus { get; private set; } 
-
-        public FormBus()
-        {
-            InitializeComponent();
-        }
-
-        private void Draw()
-        {
-            Bitmap bmp = new(pictureBoxBus.Width, pictureBoxBus.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _bus?.DrawTransport(gr);
-            pictureBoxBus.Image = bmp;
-        }
-
-        private void SetData()
-        {
-            Random rnd = new();
-            _bus.SetPosition(rnd.Next(20, 100), rnd.Next(20, 100), pictureBoxBus.Width, pictureBoxBus.Height);
-            toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_bus.Bus?.Speed}";
-            toolStripStatusLabelWeight.Text = $"Âåñ: {_bus.Bus?.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Öâåò: {_bus.Bus?.BodyColor.Name}";
-
-        }
-
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            _bus = new DrawingBus(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
-            SetData();
-            Draw();
-        }
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            switch (name)
-            {
-                case "buttonUp":
-                    _bus?.MoveTransport(Direction.Up);
-                    break;
-                case "buttonDown":
-                    _bus?.MoveTransport(Direction.Down);
-                    break;
-                case "buttonLeft":
-                    _bus?.MoveTransport(Direction.Left);
-                    break;
-                case "buttonRight":
-                    _bus?.MoveTransport(Direction.Right);
-                    break;
-            }
-            Draw();
-        }
-
-        private void PictureBoxBus_Resize(object sender, EventArgs e)
-        {
-            _bus?.ChangeBorbers(pictureBoxBus.Width, pictureBoxBus.Height);
-            Draw();
-        }
-
-        private void ButtonCreateModif_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-
-            Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-            ColorDialog dialogDop = new();
-            if (dialogDop.ShowDialog() == DialogResult.OK)
-            {
-                dopColor = dialogDop.Color;
-            }
-
-            _bus = new DrawingSportBus(rnd.Next(100, 300), rnd.Next(1000, 2000), color, dopColor,             
-            Convert.ToBoolean(rnd.Next(0, 1)), Convert.ToBoolean(rnd.Next(0,1)), Convert.ToBoolean(rnd.Next(0,1)));
-                        
-            SetData();
-            Draw();
-        }
-
-        private void ButtonSelectedBus_Click(object sender, EventArgs e)
-        {
-            SelectedBus = _bus;
-            DialogResult = DialogResult.OK;
-        }
-    }
-}

Bus/Bus/FormBus.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>

Bus/Bus/FormMapWithSetDoubleDeckerBus.Designer.cs

@@ -1,214 +0,0 @@
-namespace Bus
-{
-    partial class FormMapWithSetDoubleDeckerBus
-    {
-        /// <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.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonShowOnMap = new System.Windows.Forms.Button();
-            this.buttonShowStorage = new System.Windows.Forms.Button();
-            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
-            this.buttonRemoveBus = new System.Windows.Forms.Button();
-            this.buttonAddBus = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            this.pictureBox = new System.Windows.Forms.PictureBox();
-            this.groupBox1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Controls.Add(this.buttonRight);
-            this.groupBox1.Controls.Add(this.buttonDown);
-            this.groupBox1.Controls.Add(this.buttonLeft);
-            this.groupBox1.Controls.Add(this.buttonUp);
-            this.groupBox1.Controls.Add(this.buttonShowOnMap);
-            this.groupBox1.Controls.Add(this.buttonShowStorage);
-            this.groupBox1.Controls.Add(this.maskedTextBoxPosition);
-            this.groupBox1.Controls.Add(this.buttonRemoveBus);
-            this.groupBox1.Controls.Add(this.buttonAddBus);
-            this.groupBox1.Controls.Add(this.comboBoxSelectorMap);
-            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBox1.Location = new System.Drawing.Point(550, 0);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(250, 450);
-            this.groupBox1.TabIndex = 0;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "Инструменты";
-            // 
-            // buttonRight
-            // 
-            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonRight.BackgroundImage = global::Bus.Properties.Resources.Frame_4;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(95, 398);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(40, 40);
-            this.buttonRight.TabIndex = 10;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonDown
-            // 
-            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonDown.BackgroundImage = global::Bus.Properties.Resources.Frame_5;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(55, 398);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(40, 40);
-            this.buttonDown.TabIndex = 9;
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonLeft
-            // 
-            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonLeft.BackgroundImage = global::Bus.Properties.Resources.Frame_6;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(15, 398);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(40, 40);
-            this.buttonLeft.TabIndex = 8;
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonUp
-            // 
-            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonUp.BackgroundImage = global::Bus.Properties.Resources.Frame_3;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(55, 358);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(40, 40);
-            this.buttonUp.TabIndex = 7;
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonShowOnMap
-            // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(6, 281);
-            this.buttonShowOnMap.Name = "buttonShowOnMap";
-            this.buttonShowOnMap.Size = new System.Drawing.Size(193, 29);
-            this.buttonShowOnMap.TabIndex = 5;
-            this.buttonShowOnMap.Text = "Посмотреть карту";
-            this.buttonShowOnMap.UseVisualStyleBackColor = true;
-            this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
-            // 
-            // buttonShowStorage
-            // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(6, 246);
-            this.buttonShowStorage.Name = "buttonShowStorage";
-            this.buttonShowStorage.Size = new System.Drawing.Size(193, 29);
-            this.buttonShowStorage.TabIndex = 4;
-            this.buttonShowStorage.Text = "Посмотреть хранилище";
-            this.buttonShowStorage.UseVisualStyleBackColor = true;
-            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
-            // 
-            // maskedTextBoxPosition
-            // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 122);
-            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            this.maskedTextBoxPosition.Size = new System.Drawing.Size(100, 27);
-            this.maskedTextBoxPosition.TabIndex = 11;
-            // 
-            // buttonRemoveBus
-            // 
-            this.buttonRemoveBus.Location = new System.Drawing.Point(6, 155);
-            this.buttonRemoveBus.Name = "buttonRemoveBus";
-            this.buttonRemoveBus.Size = new System.Drawing.Size(151, 32);
-            this.buttonRemoveBus.TabIndex = 2;
-            this.buttonRemoveBus.Text = "Удалить автобус";
-            this.buttonRemoveBus.UseVisualStyleBackColor = true;
-            this.buttonRemoveBus.Click += new System.EventHandler(this.ButtonRemoveBus_Click);
-            // 
-            // buttonAddBus
-            // 
-            this.buttonAddBus.Location = new System.Drawing.Point(6, 83);
-            this.buttonAddBus.Name = "buttonAddBus";
-            this.buttonAddBus.Size = new System.Drawing.Size(151, 33);
-            this.buttonAddBus.TabIndex = 1;
-            this.buttonAddBus.Text = "Добавить автобус";
-            this.buttonAddBus.UseVisualStyleBackColor = true;
-            this.buttonAddBus.Click += new System.EventHandler(this.ButtonAddBus_Click);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Водная карта"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 26);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28);
-            this.comboBoxSelectorMap.TabIndex = 0;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // pictureBox
-            // 
-            this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(550, 450);
-            this.pictureBox.TabIndex = 1;
-            this.pictureBox.TabStop = false;
-            // 
-            // FormMapWithSetDoubleDeckerBus
-            // 
-            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.pictureBox);
-            this.Controls.Add(this.groupBox1);
-            this.Name = "FormMapWithSetDoubleDeckerBus";
-            this.Text = "Автобус";
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private GroupBox groupBox1;
-        private PictureBox pictureBox;
-        private Button buttonShowOnMap;
-        private Button buttonShowStorage;
-        private MaskedTextBox maskedTextBoxPosition;
-        private Button buttonRemoveBus;
-        private Button buttonAddBus;
-        private ComboBox comboBoxSelectorMap;
-        private Button buttonRight;
-        private Button buttonDown;
-        private Button buttonLeft;
-        private Button buttonUp;
-    }
-}

Bus/Bus/FormMapWithSetDoubleDeckerBus.cs

@@ -1,149 +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 Bus
-{
-    public partial class FormMapWithSetDoubleDeckerBus : Form
-    {
-        private MapWithSetDoubleDeckerBusGeneric<DrawingObjectBus, AbstractMap> _mapBusCollectionGeneric;
-
-        //DrawingBus SelectedBus { get; private set; }
-
-        public FormMapWithSetDoubleDeckerBus()
-        {
-            InitializeComponent();
-            AbstractMap map = new SimpleMap();
-            _mapBusCollectionGeneric = new MapWithSetDoubleDeckerBusGeneric<DrawingObjectBus, AbstractMap>(
-                   pictureBox.Width, pictureBox.Height, map);
-
-        }
-        
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            AbstractMap map = null;
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Простая карта":
-                    map = new SimpleMap();
-                    break;
-                case "Водная карта":
-                    map = new MyMap();
-                    break;
-            }
-
-            if(map != null)
-            {
-                _mapBusCollectionGeneric = new MapWithSetDoubleDeckerBusGeneric<DrawingObjectBus, AbstractMap>(pictureBox.Width, pictureBox.Height, map);
-            }
-
-            else
-            {
-                _mapBusCollectionGeneric = null;
-            }
-        }
-
-        private void ButtonAddBus_Click(object sender, EventArgs e)
-        {
-            if (_mapBusCollectionGeneric == null)
-            {
-                return;
-            }
-            FormBus form = new();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                if (form.SelectedBus == null)
-                {
-                    MessageBox.Show("Сначала создайте объект");
-                    return;
-                }
-
-                DrawingObjectBus bus = new(form.SelectedBus);
-
-                if (_mapBusCollectionGeneric + bus != -1)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapBusCollectionGeneric.ShowSet();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            }
-        }
-
-        private void ButtonRemoveBus_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
-            {
-                return;
-            }
-            if (MessageBox.Show("Удалить объект?", "Удаление",
-            MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapBusCollectionGeneric - pos != null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapBusCollectionGeneric.ShowSet();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-        }
-
-        private void ButtonShowStorage_Click(object sender, EventArgs e)
-        {
-            if (_mapBusCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox.Image = _mapBusCollectionGeneric.ShowSet();
-        }
-
-        private void ButtonShowOnMap_Click(object sender, EventArgs e)
-        {
-            if (_mapBusCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox.Image = _mapBusCollectionGeneric.ShowOnMap();
-        }
-
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            if (_mapBusCollectionGeneric == null)
-            {
-                return;
-            }
-
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            Direction dir = Direction.None;
-            switch (name)
-            {
-                case "buttonUp":
-                    dir = Direction.Up;
-                    break;
-                case "buttonDown":
-                    dir = Direction.Down;
-                    break;
-                case "buttonLeft":
-                    dir = Direction.Left;
-                    break;
-                case "buttonRight":
-                    dir = Direction.Right;
-                    break;
-            }
-            pictureBox.Image = _mapBusCollectionGeneric.MoveObject(dir);
-        }        
-    }
-}

Bus/Bus/FormMapWithSetDoubleDeckerBus.resx

@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

Bus/Bus/IDrawingObject.cs

@@ -1,17 +0,0 @@
- using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Bus
-{
-    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();
-    }
-}

Bus/Bus/MapWithSetDoubleDeckerBusGeneric.cs

@@ -1,146 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Bus
-{
-    internal class MapWithSetDoubleDeckerBusGeneric<T, U>
-        where T : class, IDrawingObject
-        where U : AbstractMap
-    {
-        private readonly int _pictureWidth;
-        private readonly int _pictureHeight;
-        private readonly int _placeSizeWidth = 210;
-        private readonly int _placeSizeHeight = 90;
-        private readonly SetDoubleDeckerBusGeneric<T> _setBus;
-        private readonly U _map;
-
-        public MapWithSetDoubleDeckerBusGeneric(int picWidth, int picHeight, U map)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _setBus = new SetDoubleDeckerBusGeneric<T>(width * height);
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-            _map = map;
-        }
-
-        public static int operator +(MapWithSetDoubleDeckerBusGeneric<T, U> map, T bus)
-        {
-            return map._setBus.Insert(bus);
-        }
-
-        public static T operator -(MapWithSetDoubleDeckerBusGeneric<T, U> map, int position)
-        {
-            return map._setBus.Remove(position);
-        }
-
-        public Bitmap ShowSet()
-        {
-            Bitmap bmp = new(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawBus(gr);
-            return bmp;
-        }
-
-        public Bitmap ShowOnMap()
-        {
-            Shaking();
-            for (int i = 0; i< _setBus.Count; i++)
-            {
-                var bus = _setBus.Get(i);
-                if (bus != null)
-                {
-                    return _map.CreateMap(_pictureWidth, _pictureHeight, bus);
-                }
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-
-        public Bitmap MoveObject(Direction direction)
-        {
-            if (_map != null)
-            {
-                return _map.MoveObject(direction);
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-
-        private void Shaking()
-        {
-            int j = _setBus.Count - 1;
-            for (int i = 0; i<_setBus.Count;i++)
-            {
-                if(_setBus.Get(i) == null)
-                {
-                    for(; j > i; j--)
-                    {
-                        var bus = _setBus.Get(j);
-                        if (bus != null)
-                        {
-                            _setBus.Insert(bus, i);
-                            _setBus.Remove(j);
-                            break;
-                        }
-                    }
-                    if (j <= i)
-                    {
-                        return;
-                    }
-                }
-            }
-        }
-
-        private void DrawBackground(Graphics g)
-        {
-            Pen pen = new(Color.Black, 3);
-            Brush pointColor = new SolidBrush(Color.Orange);
-            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
-            {
-                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
-                {
-                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
-                    g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight,
-                        i * _placeSizeWidth + _placeSizeWidth / 2, (int)((j * _placeSizeHeight) - (40)));
-
-                    g.FillPolygon(pointColor, new Point[] {
-                        new Point(i * _placeSizeWidth + _placeSizeWidth / 2, (int)((j * _placeSizeHeight) - (40))),
-                        new Point(i * _placeSizeWidth + _placeSizeWidth / 2 - 10, (int)((j * _placeSizeHeight) - (50))),
-                        new Point(i * _placeSizeWidth + _placeSizeWidth / 2, (int)((j * _placeSizeHeight) - (60))),
-                        new Point(i * _placeSizeWidth + _placeSizeWidth / 2 + 10, (int)((j * _placeSizeHeight) - (50)))
-                    });
-                }
-                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
-            }
-        }
-
-        private void DrawBus(Graphics g)
-        {
-            int width = _pictureWidth / _placeSizeWidth;
-            int height = _pictureHeight / _placeSizeHeight;
-
-            int currentWidth = width - 1;
-            int currentHeight = 0;
-
-            for (int i = 0; i < _setBus.Count; i++)
-            {
-                _setBus.Get(i)?.SetObject(currentWidth * _placeSizeWidth,
-                    currentHeight * _placeSizeHeight,
-                    _pictureWidth, _pictureHeight);
-                _setBus.Get(i)?.DrawingObject(g);
-
-                if (currentWidth > 0)
-                    currentWidth--;
-                else
-                {
-                    currentWidth = width - 1;
-                    currentHeight++;
-                }
-                if (currentHeight > height) return;
-            }
-        }
-    }
-}

Bus/Bus/MyMap.cs

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

Bus/Bus/Program.cs

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

Bus/Bus/Properties/Resources.Designer.cs

@@ -1,103 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
-//
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Bus.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
-    /// </summary>
-    // Этот класс создан автоматически классом StronglyTypedResourceBuilder
-    // с помощью такого средства, как ResGen или Visual Studio.
-    // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
-    // с параметром /str или перестройте свой проект VS.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Bus.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
-        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Frame_3 {
-            get {
-                object obj = ResourceManager.GetObject("Frame 3", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Frame_4 {
-            get {
-                object obj = ResourceManager.GetObject("Frame 4", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Frame_5 {
-            get {
-                object obj = ResourceManager.GetObject("Frame 5", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Frame_6 {
-            get {
-                object obj = ResourceManager.GetObject("Frame 6", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-    }
-}

Bus/Bus/SetDoubleDeckerBusGeneric.cs

@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Bus
-{
-    internal class SetDoubleDeckerBusGeneric<T>
-        where T : class
-    {
-        private readonly T[] _places;
-        public int Count => _places.Length;
-        private int BusPlaces = 0;
-
-        public SetDoubleDeckerBusGeneric(int count)
-        {
-            _places = new T[count];
-        }
-
-        public int Insert(T bus)
-        {
-            return Insert(bus, 0);
-        }
-
-        public int Insert(T bus, int position)
-        {
-            if (position < 0 || position >= _places.Length || BusPlaces == _places.Length)
-            {
-                return -1;
-            }
-            BusPlaces++;
-            while (_places[position] != null)
-            {
-                for (int i = _places.Length - 1; i > 0; --i)
-                {
-                    if (_places[i] == null && _places[i - 1] != null)
-                    {
-                        _places[i] = _places[i - 1];
-                        _places[i - 1] = null;
-                    }
-                }
-            }
-            _places[position] = bus;
-            return position;
-        }
-
-        public T Remove(int position)
-        {
-            if (position < 0 || position >= _places.Length) return null;
-            T savedBus = _places[position];
-            _places[position] = null;
-            return savedBus;
-        }
-
-        public T Get(int position)
-        {
-            if (position < 0 || position >= _places.Length) return null;
-            return _places[position];
-        }
-    }
-}

Bus/Bus/SimpleMap.cs

@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Bus
-{
-    internal class SimpleMap : AbstractMap
-    {
-        Brush barrierColor = new SolidBrush(Color.Black);
-        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++;
-                }
-            }
-        }
-    }
-}