export

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/DirectionType.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base
+{
+    /// <summary>
+    /// Направление перемещения
+    /// </summary>
+    public enum DirectionType
+    {
+        /// <summary>
+        /// Вверх
+        /// </summary>
+        Up = 1,
+        /// <summary>
+        /// Вниз
+        /// </summary>
+        Down = 2,
+        /// <summary>
+        /// Влево
+        /// </summary>
+        Left = 3,
+        /// <summary>
+        /// Вправо
+        /// </summary>
+        Right = 4
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/DrawningObjects/DrawningBus.cs

@@ -0,0 +1,234 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.Entities;
+using PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.MovementStrategy;
+
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.DrawningObjects
+{
+    /// <summary>
+    /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+    /// </summary>
+    public class DrawningBus
+    {
+        /// <summary>
+        /// Класс-сущность
+        /// </summary>
+        public EntityBus? EntityBus { get; protected set; }
+
+        /// <summary>
+        /// Получение объекта IMoveableObject из объекта DrawningCar
+        /// </summary>
+        public IMoveableObject GetMoveableObject => new DrawningObjectBus(this);
+
+         
+        /// <summary>
+        /// Ширина окна
+        /// </summary>
+        private int _pictureWidth;
+
+        /// <summary>
+        /// Высота окна
+        /// </summary>
+        private int _pictureHeight;
+
+        /// <summary>
+        /// Левая координата прорисовки автобуса
+        /// </summary>
+        /// 
+        protected int _startPosX;
+
+        /// <summary>
+        /// Верхняя кооридната прорисовки автобуса
+        /// </summary>
+        protected int _startPosY;
+
+        /// <summary>
+        /// Ширина прорисовки автобуса
+        /// </summary>
+        protected readonly int _busWidth = 110;
+
+        /// <summary>
+        /// Высота прорисовки автобуса
+        /// </summary>
+        protected readonly int _busHeight = 70;
+
+        /// <summary>
+        /// Координата X объекта
+        /// </summary>
+        public int GetPosX => _startPosX;
+
+        /// <summary>
+        /// Координата Y объекта
+        /// </summary>
+        public int GetPosY => _startPosY;
+
+        /// <summary>
+        /// Ширина объекта
+        /// </summary>
+        public int GetWidth => _busWidth;
+
+        /// <summary>
+        /// Высота объекта
+        /// </summary>
+        public int GetHeight => _busHeight;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес</param>
+        /// <param name="bodyColor">Основной цвет</param>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+        public DrawningBus(int speed, double weight, Color bodyColor, int
+        width, int height)
+        {
+            if (width < _busWidth || height < _busHeight)
+            {
+                return;
+            }
+            _pictureWidth = width;
+            _pictureHeight = height;
+            EntityBus = new EntityBus(speed, weight, bodyColor);
+        }
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес</param>
+        /// <param name="bodyColor">Основной цвет</param>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+        /// <param name="busWidth">Ширина прорисовки автобуса</param>
+        /// <param name="busHeight">Высота прорисовки автобуса</param>
+        protected DrawningBus(int speed, double weight, Color bodyColor, int
+        width, int height, int busWidth, int busHeight)
+        {
+            if (width <= _busWidth || height <= _busHeight)
+            {
+                return;
+            }
+            _pictureWidth = width;
+            _pictureHeight = height;
+            _busWidth = busWidth;
+            _busHeight = busHeight;
+            EntityBus = new EntityBus(speed, weight, bodyColor);
+        }
+
+        /// <summary>
+        /// Установка позиции
+        /// </summary>
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+        public void SetPosition(int x, int y)
+        {
+            if (x < 0 || x + _busWidth > _pictureWidth)
+            {
+                x = Math.Max(0, _pictureWidth - _busWidth);
+            }
+            if (y < 0 || y + _busHeight > _pictureHeight)
+            {
+                y = Math.Max(0, _pictureHeight - _busHeight);
+            }
+            _startPosX = x;
+            _startPosY = y;
+        }
+
+        /// <summary>
+        /// Проверка, что объект может переместится по указанному направлению
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        /// <returns>true - можно переместится по указанному направлению</returns>
+        public bool CanMove(DirectionType direction)
+        {
+            if (EntityBus == null)
+            {
+                return false;
+            }
+            return direction switch
+            {
+                //влево
+                DirectionType.Left => _startPosX - EntityBus.Step > 0,
+                //вверх
+                DirectionType.Up => _startPosY - EntityBus.Step > 0,
+                //вправо
+                DirectionType.Right => _startPosX + _busWidth + EntityBus.Step < _pictureWidth,
+                //вниз
+                DirectionType.Down => _startPosY + _busHeight + EntityBus.Step < _pictureHeight,
+                _ => false,
+            };
+        }
+
+        /// <summary>
+        /// Изменение направления перемещения
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        public void MoveTransport(DirectionType direction)
+        {
+            if (!CanMove(direction) || EntityBus == null)
+            {
+                return;
+            }
+            switch (direction)
+            {
+                //влево
+                case DirectionType.Left:
+                    _startPosX -= (int)EntityBus.Step;
+                    break;
+                //вверх
+                case DirectionType.Up:
+                    _startPosY -= (int)EntityBus.Step;
+                    break;
+                // вправо
+                case DirectionType.Right:
+                    _startPosX += (int)EntityBus.Step;
+                    break;
+                //вниз
+                case DirectionType.Down:
+                    _startPosY += (int)EntityBus.Step;
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Прорисовка объекта
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void DrawTransport(Graphics g)
+        {
+            if (EntityBus == null)
+            {
+                return;
+            }
+
+            Pen pen = new(Color.Black);
+
+            // Границы первого этажа автобуса
+            g.DrawRectangle(pen, _startPosX, _startPosY + 30, 100, 30);
+            Brush brBodyColor = new SolidBrush(EntityBus.BodyColor);
+            g.FillRectangle(brBodyColor, _startPosX, _startPosY + 30, 100, 30);
+
+            // Дверь
+            g.DrawRectangle(pen, _startPosX + 30, _startPosY + 40, 10, 20);
+            Brush brBlack = new SolidBrush(Color.Black);
+            g.FillRectangle(brBlack, _startPosX + 30, _startPosY + 40, 10, 20);
+
+            // Колеса
+            g.DrawEllipse(pen, _startPosX + 7, _startPosY + 55, 10, 10);
+            g.DrawEllipse(pen, _startPosX + 77, _startPosY + 55, 10, 10);
+            g.FillEllipse(brBlack, _startPosX + 7, _startPosY + 55, 10, 10);
+            g.FillEllipse(brBlack, _startPosX + 77, _startPosY + 55, 10, 10);
+
+            // Окна
+            Brush brBlue = new SolidBrush(Color.Blue);
+            g.FillEllipse(brBlue, _startPosX + 10, _startPosY + 35, 10, 15);
+            g.FillEllipse(brBlue, _startPosX + 50, _startPosY + 35, 10, 15);
+            g.FillEllipse(brBlue, _startPosX + 70, _startPosY + 35, 10, 15);
+            g.FillEllipse(brBlue, _startPosX + 90, _startPosY + 35, 10, 15);
+        }
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/DrawningObjects/DrawningDoubleDeckerBus.cs

@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.NetworkInformation;
+using System.Text;
+using System.Threading.Tasks;
+using PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.Entities;
+
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.DrawningObjects
+{
+    /// <summary>
+    /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+    /// </summary>
+    public class DrawningDoubleDeckerBus : DrawningBus
+    {
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        /// <param name="additionalColor">Дополнительный цвет</param>
+        /// <param name="secondFloor">Признак наличия второго этажа</param>
+        /// <param name="ladder">Признак наличия лестницы на второй этаж</param>
+        /// <param name="lineBetweenFloor">Признак наличия полосы между этажами</param>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+        /// <returns>true - объект создан, false - проверка не пройдена, 
+        /// нельзя создать объект в этих размерах</returns>
+        public DrawningDoubleDeckerBus(int speed, double weight, Color bodyColor, Color
+additionalColor, bool secondFloor, bool ladder, bool lineBetweenFloor, int width, int height) :
+            base(speed, weight, bodyColor, width, height, 120, 85)
+        {
+            if (EntityBus != null)
+            {
+                EntityBus = new EntityDoubleDeckerBus(speed, weight, bodyColor,
+                additionalColor, secondFloor, ladder, lineBetweenFloor);
+            }
+        }
+
+        /// <summary>
+        /// Прорисовка объекта
+        /// </summary>
+        /// <param name="g"></param>
+        public override void DrawTransport(Graphics g)
+        {
+            if (EntityBus is not EntityDoubleDeckerBus doubleDeckerBus)
+            {
+                return;
+            }
+
+            Pen pen = new(Color.Black);
+            Brush brAdditionalColor = new SolidBrush(doubleDeckerBus.AdditionalColor);
+            Brush brBlue = new SolidBrush(Color.Blue);
+            Brush brBlack = new SolidBrush(Color.Black);
+
+            // второй этаж
+            if (doubleDeckerBus.SecondFloor)
+            {
+                // Границы второго этажа автобуса
+                g.FillRectangle(brAdditionalColor, _startPosX, _startPosY, 100, 30);
+
+                // Дверь второго этажа
+                g.DrawRectangle(pen, _startPosX, _startPosY + 10, 10, 20);
+                g.FillRectangle(brAdditionalColor, _startPosX, _startPosY + 10, 10, 20);
+
+                // Окна второго этажа
+                g.FillEllipse(brBlue, _startPosX + 12, _startPosY + 5, 10, 15);
+                g.FillEllipse(brBlue, _startPosX + 30, _startPosY + 5, 10, 15);
+                g.FillEllipse(brBlue, _startPosX + 50, _startPosY + 5, 10, 15);
+                g.FillEllipse(brBlue, _startPosX + 70, _startPosY + 5, 10, 15);
+                g.FillEllipse(brBlue, _startPosX + 90, _startPosY + 5, 10, 15);
+            }
+
+            base.DrawTransport(g);
+
+            // лестница на второй этаж
+            if (doubleDeckerBus.Ladder)
+            {
+                if (doubleDeckerBus.SecondFloor == true)
+                {
+                    //Вертикальные прямые
+                    g.DrawLine(pen, new Point(_startPosX, _startPosY + 55), new Point(_startPosX, _startPosY + 25));
+                    g.DrawLine(pen, new Point(_startPosX + 10, _startPosY + 55), new Point(_startPosX + 10, _startPosY + 25));
+
+                    //Горизонтальные прямые
+                    g.DrawLine(pen, new Point(_startPosX, _startPosY + 35), new Point(_startPosX + 10, _startPosY + 35));
+                    g.DrawLine(pen, new Point(_startPosX, _startPosY + 45), new Point(_startPosX + 10, _startPosY + 45));
+                    g.DrawLine(pen, new Point(_startPosX, _startPosY + 55), new Point(_startPosX + 10, _startPosY + 55));
+                }
+            }
+
+            // полоса между этажами
+            if (doubleDeckerBus.LineBetweenFloor)
+            {
+                g.FillRectangle(brBlack, _startPosX, _startPosY + 30, 100, 3);
+            }
+        }
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/Entities/EntityBus.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.Entities
+{
+    /// <summary>
+    /// Класс-сущность "Автобус"
+    /// </summary>
+    public class EntityBus
+    {
+        /// <summary>
+        /// Скорость
+        /// </summary>
+        public int Speed { get; private set; }
+
+        /// <summary>
+        /// Вес
+        /// </summary>
+        public double Weight { get; private set; }
+
+        /// <summary>
+        /// Основной цвет
+        /// </summary>
+        public Color BodyColor { get; private set; }
+
+        /// <summary>
+        /// Шаг перемещения автомобиля
+        /// </summary>
+        public double Step => (double)Speed * 100 / Weight;
+
+        /// <summary>
+        /// Конструктор с параметрами
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автомобиля</param>
+        /// <param name="bodyColor">Основной цвет</param>
+        public EntityBus(int speed, double weight, Color bodyColor)
+        {
+            Speed = speed;
+            Weight = weight;
+            BodyColor = bodyColor;
+        }
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/Entities/EntityDoubleDeckerBus.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.Entities
+{
+    /// <summary>
+    /// Класс-сущность "Двухэтажный автобус"
+    /// </summary>
+    public class EntityDoubleDeckerBus : EntityBus
+    {
+        /// <summary>
+        /// Дополнительный цвет (для опциональных элементов)
+        /// </summary>
+        public Color AdditionalColor { get; private set; }
+
+        /// <summary>
+        /// Признак (опция) наличия второго этажа
+        /// </summary>
+        public bool SecondFloor { get; private set; }
+
+        /// <summary>
+        /// Признак (опция) наличия лестницы на второй этаж
+        /// </summary>
+        public bool Ladder { get; private set; }
+
+        /// <summary>
+        /// Признак (опция) наличия полосы между этажами
+        /// </summary>
+        public bool LineBetweenFloor { get; private set; }
+
+        /// <summary>
+        /// Инициализация полей объекта-класса двухэтажного автобуса
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автобуса</param>
+        /// <param name="bodyColor">Основной цвет</param>
+        /// <param name="additionalColor">Дополнительный цвет</param>
+        /// <param name="secondFloor">Признак наличия второго этажа</param>
+        /// <param name="ladder">Признак наличия лестницы на второй этаж</param>
+        /// <param name="lineBetweenFloor">Признак наличия полосы между этажами</param>
+        public EntityDoubleDeckerBus(int speed, double weight, Color bodyColor, Color
+        additionalColor, bool secondFloor, bool ladder, bool lineBetweenFloor) : base(speed, weight, bodyColor)
+        {
+            AdditionalColor = additionalColor;
+            SecondFloor = secondFloor;
+            Ladder = ladder;
+            LineBetweenFloor = lineBetweenFloor;
+        }
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/Form1.Designer.cs

@@ -1,39 +0,0 @@
-namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base
-{
-    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
-    }
-}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/Form1.cs

@@ -1,10 +0,0 @@
-namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base
-{
-    public partial class Form1 : Form
-    {
-        public Form1()
-        {
-            InitializeComponent();
-        }
-    }
-}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/FormBusCollection.Designer.cs

@@ -0,0 +1,207 @@
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base
+{
+    partial class FormBusCollection
+    {
+        /// <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()
+        {
+            toolsPanel = new Panel();
+            panelSets = new Panel();
+            textBoxStorageName = new TextBox();
+            listBoxObjects = new ListBox();
+            ButtonAddObject = new Button();
+            ButtonDelObject = new Button();
+            SetsLabel = new Label();
+            ButtonRefreshCollection = new Button();
+            ButtonDeleteBus = new Button();
+            maskedTextBoxNumber = new TextBox();
+            ButtonAddBus = new Button();
+            LabelTools = new Label();
+            pictureBoxCollection = new PictureBox();
+            toolsPanel.SuspendLayout();
+            panelSets.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit();
+            SuspendLayout();
+            // 
+            // toolsPanel
+            // 
+            toolsPanel.Controls.Add(panelSets);
+            toolsPanel.Controls.Add(ButtonRefreshCollection);
+            toolsPanel.Controls.Add(ButtonDeleteBus);
+            toolsPanel.Controls.Add(maskedTextBoxNumber);
+            toolsPanel.Controls.Add(ButtonAddBus);
+            toolsPanel.Controls.Add(LabelTools);
+            toolsPanel.Location = new Point(662, -2);
+            toolsPanel.Name = "toolsPanel";
+            toolsPanel.Size = new Size(221, 504);
+            toolsPanel.TabIndex = 0;
+            // 
+            // panelSets
+            // 
+            panelSets.Controls.Add(textBoxStorageName);
+            panelSets.Controls.Add(listBoxObjects);
+            panelSets.Controls.Add(ButtonAddObject);
+            panelSets.Controls.Add(ButtonDelObject);
+            panelSets.Controls.Add(SetsLabel);
+            panelSets.Location = new Point(8, 20);
+            panelSets.Name = "panelSets";
+            panelSets.Size = new Size(210, 208);
+            panelSets.TabIndex = 6;
+            // 
+            // textBoxStorageName
+            // 
+            textBoxStorageName.Location = new Point(10, 27);
+            textBoxStorageName.Name = "textBoxStorageName";
+            textBoxStorageName.Size = new Size(190, 27);
+            textBoxStorageName.TabIndex = 12;
+            // 
+            // listBoxObjects
+            // 
+            listBoxObjects.FormattingEnabled = true;
+            listBoxObjects.ItemHeight = 20;
+            listBoxObjects.Location = new Point(10, 99);
+            listBoxObjects.Name = "listBoxObjects";
+            listBoxObjects.Size = new Size(190, 64);
+            listBoxObjects.TabIndex = 11;
+            listBoxObjects.SelectedIndexChanged += listBoxObjects_SelectedIndexChanged;
+            // 
+            // ButtonAddObject
+            // 
+            ButtonAddObject.Location = new Point(10, 60);
+            ButtonAddObject.Name = "ButtonAddObject";
+            ButtonAddObject.Size = new Size(191, 33);
+            ButtonAddObject.TabIndex = 8;
+            ButtonAddObject.Text = "Добавить набор";
+            ButtonAddObject.UseVisualStyleBackColor = true;
+            ButtonAddObject.Click += ButtonAddObject_Click;
+            // 
+            // ButtonDelObject
+            // 
+            ButtonDelObject.Location = new Point(10, 169);
+            ButtonDelObject.Name = "ButtonDelObject";
+            ButtonDelObject.Size = new Size(192, 33);
+            ButtonDelObject.TabIndex = 7;
+            ButtonDelObject.Text = "Удалить набор\r\n";
+            ButtonDelObject.UseVisualStyleBackColor = true;
+            ButtonDelObject.Click += ButtonDelObject_Click;
+            // 
+            // SetsLabel
+            // 
+            SetsLabel.AutoSize = true;
+            SetsLabel.Location = new Point(3, 4);
+            SetsLabel.Name = "SetsLabel";
+            SetsLabel.Size = new Size(66, 20);
+            SetsLabel.TabIndex = 0;
+            SetsLabel.Text = "Наборы";
+            // 
+            // ButtonRefreshCollection
+            // 
+            ButtonRefreshCollection.Location = new Point(8, 452);
+            ButtonRefreshCollection.Name = "ButtonRefreshCollection";
+            ButtonRefreshCollection.Size = new Size(197, 41);
+            ButtonRefreshCollection.TabIndex = 4;
+            ButtonRefreshCollection.Text = "Обновить коллекцию";
+            ButtonRefreshCollection.UseVisualStyleBackColor = true;
+            ButtonRefreshCollection.Click += ButtonRefreshCollection_Click;
+            // 
+            // ButtonDeleteBus
+            // 
+            ButtonDeleteBus.Location = new Point(8, 379);
+            ButtonDeleteBus.Name = "ButtonDeleteBus";
+            ButtonDeleteBus.Size = new Size(197, 41);
+            ButtonDeleteBus.TabIndex = 3;
+            ButtonDeleteBus.Text = "Удалить автобус";
+            ButtonDeleteBus.UseVisualStyleBackColor = true;
+            ButtonDeleteBus.Click += ButtonDeleteBus_Click;
+            // 
+            // maskedTextBoxNumber
+            // 
+            maskedTextBoxNumber.Location = new Point(48, 346);
+            maskedTextBoxNumber.Name = "maskedTextBoxNumber";
+            maskedTextBoxNumber.Size = new Size(125, 27);
+            maskedTextBoxNumber.TabIndex = 2;
+            // 
+            // ButtonAddBus
+            // 
+            ButtonAddBus.Location = new Point(8, 284);
+            ButtonAddBus.Name = "ButtonAddBus";
+            ButtonAddBus.Size = new Size(197, 41);
+            ButtonAddBus.TabIndex = 1;
+            ButtonAddBus.Text = "Добавить автобус";
+            ButtonAddBus.UseVisualStyleBackColor = true;
+            ButtonAddBus.Click += ButtonAddBus_Click;
+            // 
+            // LabelTools
+            // 
+            LabelTools.AutoSize = true;
+            LabelTools.Location = new Point(5, 0);
+            LabelTools.Name = "LabelTools";
+            LabelTools.Size = new Size(103, 20);
+            LabelTools.TabIndex = 0;
+            LabelTools.Text = "Инструменты";
+            // 
+            // pictureBoxCollection
+            // 
+            pictureBoxCollection.Location = new Point(1, -2);
+            pictureBoxCollection.Name = "pictureBoxCollection";
+            pictureBoxCollection.Size = new Size(663, 504);
+            pictureBoxCollection.TabIndex = 1;
+            pictureBoxCollection.TabStop = false;
+            // 
+            // FormBusCollection
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(882, 510);
+            Controls.Add(pictureBoxCollection);
+            Controls.Add(toolsPanel);
+            Name = "FormBusCollection";
+            Text = "Набор автобусов";
+            toolsPanel.ResumeLayout(false);
+            toolsPanel.PerformLayout();
+            panelSets.ResumeLayout(false);
+            panelSets.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private Panel toolsPanel;
+        private Label LabelTools;
+        private Button ButtonDeleteBus;
+        private Button ButtonAddBus;
+        private Button ButtonRefreshCollection;
+        private PictureBox pictureBoxCollection;
+        public TextBox maskedTextBoxNumber;
+        private Panel panelSets;
+        private Label SetsLabel;
+        private Button ButtonDelObject;
+        private Button ButtonAddObject;
+        private ListBox listBoxObjects;
+        private TextBox textBoxStorageName;
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/FormBusCollection.cs

@@ -0,0 +1,191 @@
+using PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.Generics;
+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;
+using PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.DrawningObjects;
+using PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.MovementStrategy;
+
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base
+{
+    /// <summary>
+    /// Форма для работы с набором объектов класса DrawningBus
+    /// </summary>
+    public partial class FormBusCollection : Form
+    {
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly TheBusesGenericStorage _storage;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormBusCollection()
+        {
+            InitializeComponent();
+            _storage = new TheBusesGenericStorage(pictureBoxCollection.Width, pictureBoxCollection.Height);
+        }
+
+        /// <summary>
+        /// Заполнение listBoxObjects
+        /// </summary>
+        private void ReloadObjects()
+        {
+            int index = listBoxObjects.SelectedIndex;
+
+            listBoxObjects.Items.Clear();
+            for (int i = 0; i < _storage.Keys.Count; i++)
+            {
+                listBoxObjects.Items.Add(_storage.Keys[i]);
+            }
+
+            if (listBoxObjects.Items.Count > 0 && (index == -1 || index >= listBoxObjects.Items.Count))
+            {
+                listBoxObjects.SelectedIndex = 0;
+            }
+
+            else if (listBoxObjects.Items.Count > 0 && index > -1 && index < listBoxObjects.Items.Count)
+            {
+                listBoxObjects.SelectedIndex = index;
+            }
+        }
+
+        /// <summary>
+        /// Добавление набора в коллекцию
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddObject_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxStorageName.Text))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _storage.AddSet(textBoxStorageName.Text);
+            ReloadObjects();
+        }
+
+        /// <summary>
+        /// Выбор набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void listBoxObjects_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            pictureBoxCollection.Image = _storage[listBoxObjects.SelectedItem?.ToString() ?? string.Empty]?.ShowTheBuses();
+        }
+
+        /// <summary>
+        /// Удаление набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonDelObject_Click(object sender, EventArgs e)
+        {
+            if (listBoxObjects.SelectedIndex == -1)
+            {
+                return;
+            }
+            if (MessageBox.Show($"Удалить объект{listBoxObjects.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo,
+                MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _storage.DelSet(listBoxObjects.SelectedItem.ToString()
+                ?? string.Empty);
+                ReloadObjects();
+            }
+        }
+
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddBus_Click(object sender, EventArgs e)
+        {
+            if (listBoxObjects.SelectedIndex == -1)
+            {
+                return;
+            }
+            var obj = _storage[listBoxObjects.SelectedItem.ToString() ?? string.Empty];
+            if (obj == null)
+            {
+                return;
+            }
+            FormDoubleDeckerBus form = new();
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                if (obj + form.SelectedBus)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBoxCollection.Image = obj.ShowTheBuses();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// Удаление объекта из набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonDeleteBus_Click(object sender, EventArgs e)
+        {
+            if (listBoxObjects.SelectedIndex == -1)
+            {
+                return;
+            }
+            var obj = _storage[listBoxObjects.SelectedItem.ToString() ??
+            string.Empty];
+            if (obj == null)
+            {
+                return;
+            }
+            if (MessageBox.Show("Удалить объект?", "Удаление",
+            MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            int pos = Convert.ToInt32(maskedTextBoxNumber.Text);
+            if (obj - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBoxCollection.Image = obj.ShowTheBuses();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+
+        /// <summary>
+        /// Обновление рисунка по набору
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRefreshCollection_Click(object sender, EventArgs e)
+        {
+            if (listBoxObjects.SelectedIndex == -1)
+            {
+                return;
+            }
+            var obj = _storage[listBoxObjects.SelectedItem.ToString() ??
+            string.Empty];
+            if (obj == null)
+            {
+                return;
+            }
+            pictureBoxCollection.Image = obj.ShowTheBuses();
+        }
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/FormBusCollection.resx

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
+  <!--
     Microsoft ResX Schema 
-    
+
     Version 2.0
-    
+
-    The primary goals of this format is to allow a simple XML format 
+    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the 
+    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes 
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
+
-    There are any number of "resheader" rows that contain simple 
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
+
-    Each data row contains a name, and value. The row also contains a 
+    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support 
+    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture. 
+    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the 
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
+
-    The mimetype is used for serialized objects, and tells the 
+    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not 
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
+
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can 
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/FormDoubleDeckerBus.Designer.cs

@@ -0,0 +1,192 @@
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base
+{
+    partial class FormDoubleDeckerBus
+    {
+        /// <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()
+        {
+            pictureBoxDoubleDeckerBus = new PictureBox();
+            buttonLeft = new Button();
+            buttonUp = new Button();
+            buttonDown = new Button();
+            buttonRight = new Button();
+            buttonCreateDoubleDeckerBus = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStep = new Button();
+            buttonCreateBus = new Button();
+            ButtonSelectedBus = new Button();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxDoubleDeckerBus).BeginInit();
+            SuspendLayout();
+            // 
+            // pictureBoxDoubleDeckerBus
+            // 
+            pictureBoxDoubleDeckerBus.BackgroundImageLayout = ImageLayout.Zoom;
+            pictureBoxDoubleDeckerBus.Dock = DockStyle.Fill;
+            pictureBoxDoubleDeckerBus.Location = new Point(0, 0);
+            pictureBoxDoubleDeckerBus.Name = "pictureBoxDoubleDeckerBus";
+            pictureBoxDoubleDeckerBus.Size = new Size(882, 453);
+            pictureBoxDoubleDeckerBus.SizeMode = PictureBoxSizeMode.AutoSize;
+            pictureBoxDoubleDeckerBus.TabIndex = 0;
+            pictureBoxDoubleDeckerBus.TabStop = false;
+            // 
+            // buttonLeft
+            // 
+            buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonLeft.BackgroundImage = Properties.Resources.LeftArrow;
+            buttonLeft.BackgroundImageLayout = ImageLayout.Zoom;
+            buttonLeft.Location = new Point(768, 412);
+            buttonLeft.Name = "buttonLeft";
+            buttonLeft.Size = new Size(30, 30);
+            buttonLeft.TabIndex = 2;
+            buttonLeft.UseVisualStyleBackColor = true;
+            buttonLeft.Click += ButtonMove_Click;
+            // 
+            // buttonUp
+            // 
+            buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonUp.BackgroundImage = Properties.Resources.UpArrow;
+            buttonUp.BackgroundImageLayout = ImageLayout.Zoom;
+            buttonUp.Location = new Point(804, 375);
+            buttonUp.Name = "buttonUp";
+            buttonUp.Size = new Size(30, 30);
+            buttonUp.TabIndex = 3;
+            buttonUp.UseVisualStyleBackColor = true;
+            buttonUp.Click += ButtonMove_Click;
+            // 
+            // buttonDown
+            // 
+            buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonDown.BackgroundImage = Properties.Resources.DownArrow;
+            buttonDown.BackgroundImageLayout = ImageLayout.Zoom;
+            buttonDown.Location = new Point(804, 411);
+            buttonDown.Name = "buttonDown";
+            buttonDown.Size = new Size(30, 30);
+            buttonDown.TabIndex = 4;
+            buttonDown.UseVisualStyleBackColor = true;
+            buttonDown.Click += ButtonMove_Click;
+            // 
+            // buttonRight
+            // 
+            buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonRight.BackgroundImage = Properties.Resources.RightArrow;
+            buttonRight.BackgroundImageLayout = ImageLayout.Zoom;
+            buttonRight.Location = new Point(840, 412);
+            buttonRight.Name = "buttonRight";
+            buttonRight.Size = new Size(30, 30);
+            buttonRight.TabIndex = 5;
+            buttonRight.UseVisualStyleBackColor = true;
+            buttonRight.Click += ButtonMove_Click;
+            // 
+            // buttonCreateDoubleDeckerBus
+            // 
+            buttonCreateDoubleDeckerBus.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreateDoubleDeckerBus.Location = new Point(12, 389);
+            buttonCreateDoubleDeckerBus.Name = "buttonCreateDoubleDeckerBus";
+            buttonCreateDoubleDeckerBus.Size = new Size(167, 52);
+            buttonCreateDoubleDeckerBus.TabIndex = 6;
+            buttonCreateDoubleDeckerBus.Text = "Создать двухэтажный автобус";
+            buttonCreateDoubleDeckerBus.UseVisualStyleBackColor = true;
+            buttonCreateDoubleDeckerBus.Click += ButtonCreateDoubleDeckerBus_Click;
+            // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(768, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(102, 28);
+            comboBoxStrategy.TabIndex = 7;
+            // 
+            // buttonStep
+            // 
+            buttonStep.Location = new Point(804, 46);
+            buttonStep.Name = "buttonStep";
+            buttonStep.Size = new Size(66, 26);
+            buttonStep.TabIndex = 8;
+            buttonStep.Text = "Шаг";
+            buttonStep.UseVisualStyleBackColor = true;
+            buttonStep.Click += ButtonStep_Click;
+            // 
+            // buttonCreateBus
+            // 
+            buttonCreateBus.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreateBus.Location = new Point(185, 389);
+            buttonCreateBus.Name = "buttonCreateBus";
+            buttonCreateBus.Size = new Size(167, 52);
+            buttonCreateBus.TabIndex = 10;
+            buttonCreateBus.Text = "Создать автобус";
+            buttonCreateBus.UseVisualStyleBackColor = true;
+            buttonCreateBus.Click += buttonCreateBus_Click;
+            // 
+            // ButtonSelectedBus
+            // 
+            ButtonSelectedBus.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            ButtonSelectedBus.Location = new Point(358, 389);
+            ButtonSelectedBus.Name = "ButtonSelectedBus";
+            ButtonSelectedBus.Size = new Size(167, 52);
+            ButtonSelectedBus.TabIndex = 11;
+            ButtonSelectedBus.Text = "Добавить автобус";
+            ButtonSelectedBus.UseVisualStyleBackColor = true;
+            ButtonSelectedBus.Click += ButtonSelectedBus_Click;
+            // 
+            // FormDoubleDeckerBus
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(882, 453);
+            Controls.Add(ButtonSelectedBus);
+            Controls.Add(buttonCreateBus);
+            Controls.Add(buttonStep);
+            Controls.Add(comboBoxStrategy);
+            Controls.Add(buttonCreateDoubleDeckerBus);
+            Controls.Add(buttonRight);
+            Controls.Add(buttonDown);
+            Controls.Add(buttonUp);
+            Controls.Add(buttonLeft);
+            Controls.Add(pictureBoxDoubleDeckerBus);
+            Name = "FormDoubleDeckerBus";
+            StartPosition = FormStartPosition.CenterScreen;
+            Text = "Двухэтажный автобус";
+            ((System.ComponentModel.ISupportInitialize)pictureBoxDoubleDeckerBus).EndInit();
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private PictureBox pictureBoxDoubleDeckerBus;
+        private Button buttonLeft;
+        private Button buttonUp;
+        private Button buttonDown;
+        private Button buttonRight;
+        private Button buttonCreateDoubleDeckerBus;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStep;
+        private Button buttonCreateBus;
+        private Button ButtonSelectedBus;
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/FormDoubleDeckerBus.cs

@@ -0,0 +1,178 @@
+using PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.DrawningObjects;
+using PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.MovementStrategy;
+
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base
+{
+    public partial class FormDoubleDeckerBus : Form
+    {
+        /// <summary>
+        /// Ôîðìà ðàáîòû ñ îáúåêòîì "Äâóõýòàæíûé àâòîáóñ"
+        /// </summary>
+        private DrawningBus? _drawningBus;
+
+        /// <summary>
+        /// Ñòðàòåãèÿ ïåðåìåùåíèÿ
+        /// </summary>
+        private AbstractStrategy? _strategy;
+
+        /// <summary>
+        /// Âûáðàííûé àâòîáóñ
+        /// </summary>
+        public DrawningBus? SelectedBus { get; private set; }
+
+        /// <summary>
+        /// Èíèöèàëèçàöèÿ ôîðìû
+        /// </summary>
+        public FormDoubleDeckerBus()
+        {
+            InitializeComponent();
+            _strategy = null;
+            SelectedBus = null;
+        }
+
+        /// <summary>
+        /// Ìåòîä ïðîðèñîâêè ìàøèíû
+        /// </summary>
+        private void Draw()
+        {
+            if (_drawningBus == null)
+            {
+                return;
+            }
+            Bitmap bmp = new(pictureBoxDoubleDeckerBus.Width, pictureBoxDoubleDeckerBus.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _drawningBus.DrawTransport(gr);
+            pictureBoxDoubleDeckerBus.Image = bmp;
+        }
+
+        /// <summary>
+        /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ñîçäàòü äâóõýòàæíûé àâòîáóñ"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreateDoubleDeckerBus_Click(object sender, EventArgs e)
+        {
+            Random random = new();
+            Color color = Color.FromArgb(random.Next(0, 256),
+            random.Next(0, 256), random.Next(0, 256));
+            ColorDialog dialogColor = new();
+            if (dialogColor.ShowDialog() == DialogResult.OK)
+            {
+                color = dialogColor.Color;
+            }
+
+            Color dopColor = Color.FromArgb(random.Next(0, 256),
+            random.Next(0, 256), random.Next(0, 256));
+            ColorDialog dialogDopColor = new();
+            if (dialogDopColor.ShowDialog() == DialogResult.OK)
+            {
+                dopColor = dialogDopColor.Color;
+            }
+
+            _drawningBus = new DrawningDoubleDeckerBus(random.Next(100, 300),
+            random.Next(1000, 3000), color, dopColor, Convert.ToBoolean(random.Next(0, 2)),
+            Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)),
+            pictureBoxDoubleDeckerBus.Width, pictureBoxDoubleDeckerBus.Height);
+            _drawningBus.SetPosition(random.Next(10, 100), random.Next(10, 100));
+            Draw();
+        }
+
+        /// <summary>
+        /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ñîçäàòü àâòîáóñ"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonCreateBus_Click(object sender, EventArgs e)
+        {
+            Random random = new();
+            Color color = Color.FromArgb(random.Next(0, 256),
+            random.Next(0, 256), random.Next(0, 256));
+            ColorDialog dialogColor = new();
+            if (dialogColor.ShowDialog() == DialogResult.OK)
+            {
+                color = dialogColor.Color;
+            }
+
+            _drawningBus = new DrawningBus(random.Next(100, 300), random.Next(1000, 3000),
+            color, pictureBoxDoubleDeckerBus.Width, pictureBoxDoubleDeckerBus.Height);
+            _drawningBus.SetPosition(random.Next(10, 100), random.Next(10, 100));
+            Draw();
+        }
+
+        /// <summary>
+        /// Èçìåíåíèå ïîëîæåíèÿ àâòîìîáèëÿ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if (_drawningBus == null)
+            {
+                return;
+            }
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            switch (name)
+            {
+                case "buttonUp":
+                    _drawningBus.MoveTransport(DirectionType.Up);
+                    break;
+                case "buttonDown":
+                    _drawningBus.MoveTransport(DirectionType.Down);
+                    break;
+                case "buttonLeft":
+                    _drawningBus.MoveTransport(DirectionType.Left);
+                    break;
+                case "buttonRight":
+                    _drawningBus.MoveTransport(DirectionType.Right);
+                    break;
+            }
+            Draw();
+        }
+
+        /// <summary>
+        /// Îáðàáîòêà íàæàòèÿ êíîïêè "Øàã"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonStep_Click(object sender, EventArgs e)
+        {
+            if (_drawningBus == null)
+            {
+                return;
+            }
+            if (comboBoxStrategy.Enabled)
+            {
+                _strategy = comboBoxStrategy.SelectedIndex switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_strategy == null)
+                {
+                    return;
+                }
+                _strategy.SetData(_drawningBus.GetMoveableObject,
+                pictureBoxDoubleDeckerBus.Width, pictureBoxDoubleDeckerBus.Height);
+            }
+            if (_strategy == null)
+            {
+                return;
+            }
+            comboBoxStrategy.Enabled = false;
+            _strategy.MakeStep();
+            Draw();
+            if (_strategy.GetStatus() == Status.Finish)
+            {
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+            }
+        }
+
+        private void ButtonSelectedBus_Click(object sender, EventArgs e)
+        {
+            SelectedBus = _drawningBus;
+            DialogResult = DialogResult.OK;
+        }
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/FormDoubleDeckerBus.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/Generics/SetGeneric.cs

@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.Generics
+{
+    /// <summary>
+    /// Параметризованный набор объектов
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class SetGeneric<T>
+        where T : class
+    {
+        /// <summary>
+        /// Список объектов, которые храним
+        /// </summary>
+        private readonly List<T?> _places;
+
+        /// <summary>
+        /// Количество объектов в cписке
+        /// </summary>
+        public int Count => _places.Count;
+
+        /// <summary>
+        /// Максимальное количество объектов в cписке
+        /// </summary>
+        private readonly int _maxCount;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="count"></param>
+        public SetGeneric(int count)
+        {
+            _maxCount = count;
+            _places = new List<T?>(count);
+        }
+
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="bus">Добавляемый автобус</param>
+        /// <returns></returns>
+        public bool Insert(T bus)
+        {
+            if (_places.Count == _maxCount)
+            {
+                return false;
+            }
+
+            Insert(bus, 0);
+            return true;
+        }
+
+        /// <summary>
+        /// Добавление объекта в набор на конкретную позицию
+        /// </summary>
+        /// <param name="bus">Добавляемый автобус</param>
+        /// <param name="position">Позиция</param>
+        /// <returns></returns>
+        public bool Insert(T bus, int position)
+        {
+            if (!(position >= 0 && position <= Count && _places.Count < _maxCount))
+            {
+                return false;
+            }
+
+            _places.Insert(position, bus);
+            return true;
+        }
+
+        /// <summary>
+        /// Удаление объекта из набора с конкретной позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public bool Remove(int position)
+        {
+            if (position < 0 || position >= Count)
+            {
+                return false;
+            }
+
+            _places.RemoveAt(position);
+            return true;
+        }
+
+        /// <summary>
+        /// Получение объекта из набора по позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T? this[int position]
+        {
+            get
+            {
+                if (position < 0 || position >= _maxCount)
+                {
+                    return null;
+                }
+
+                return _places[position];
+            }
+            set
+            {
+                if (!(position >= 0 && position < Count && _places.Count < _maxCount))
+                {
+                    return;
+                }
+
+                _places.Insert(position, value);
+                return;
+            }
+        }
+
+        /// <summary>
+        /// Проход по списку
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<T?> GetTheBuses(int? maxTheBuses = null)
+        {
+            for (int i = 0; i < _places.Count; ++i)
+            {
+                yield return _places[i];
+                if (maxTheBuses.HasValue && i == maxTheBuses.Value)
+                {
+                    yield break;
+                }
+            }
+        }
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/Generics/TheBusesGenericCollection.cs

@@ -0,0 +1,154 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.VisualBasic;
+using PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.DrawningObjects;
+using PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.MovementStrategy;
+
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.Generics
+{
+    /// <summary>
+    /// Параметризованный класс для набора объектов DrawningBus
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <typeparam name="U"></typeparam>
+    internal class TheBusesGenericCollection<T, U>
+        where T : DrawningBus
+        where U : IMoveableObject
+    {
+        /// <summary>
+        /// Ширина окна прорисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+
+        /// <summary>
+        /// Высота окна прорисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+
+        /// <summary>
+        /// Размер занимаемого объектом места (ширина)
+        /// </summary>
+        private readonly int _placeSizeWidth = 210;
+
+        /// <summary>
+        /// Размер занимаемого объектом места (высота)
+        /// </summary>
+        private readonly int _placeSizeHeight = 90;
+
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly SetGeneric<T> _collection;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="picWidth"></param>
+        /// <param name="picHeight"></param>
+        public TheBusesGenericCollection(int picWidth, int picHeight)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _collection = new SetGeneric<T>(width * height);
+        }
+
+        /// <summary>
+        /// Перегрузка оператора сложения
+        /// </summary>
+        /// <param name="collect"></param>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static bool operator +(TheBusesGenericCollection<T, U> collect, T? obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            return collect?._collection.Insert(obj) ?? false;
+        }
+
+        /// <summary>
+        /// Перегрузка оператора вычитания
+        /// </summary>
+        /// <param name="collect"></param>
+        /// <param name="pos"></param>
+        /// <returns></returns>
+        public static T? operator -(TheBusesGenericCollection<T, U> collect, int pos)
+        {
+            T? obj = collect._collection[pos];
+            if (obj != null)
+            {
+                collect._collection.Remove(pos);
+            }
+
+            return obj;
+        }
+
+        /// <summary>
+        /// Получение объекта IMoveableObject
+        /// </summary>
+        /// <param name="pos"></param>
+        /// <returns></returns>
+        public U? GetU(int pos)
+        {
+            return (U?)_collection[pos]?.GetMoveableObject;
+        }
+
+        /// <summary>
+        /// Вывод всего набора объектов
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowTheBuses()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawObjects(gr);
+            return bmp;
+        }
+
+        /// <summary>
+        /// Метод отрисовки фона
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBackground(Graphics g)
+        {
+            Pen pen = new(Color.Black, 3);
+            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, 0, i * _placeSizeWidth,
+                _pictureHeight / _placeSizeHeight * _placeSizeHeight);
+            }
+        }
+
+        /// <summary>
+        /// Метод прорисовки объектов
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawObjects(Graphics g)
+        {
+            int i = 0;
+            foreach (var bus in _collection.GetTheBuses())
+            {
+                if (bus != null)
+                {
+                    int inRow = _pictureWidth / _placeSizeWidth;
+                    bus.SetPosition((inRow - 1 - (i % inRow)) * _placeSizeWidth, i / inRow * _placeSizeHeight);
+                    bus.DrawTransport(g);
+                }
+                i++;
+            }
+        }
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/Generics/TheBusesGenericStorage.cs

@@ -0,0 +1,90 @@
+using PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.DrawningObjects;
+using PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.MovementStrategy;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.Generics
+{
+    /// <summary>
+    /// Класс для хранения коллекции
+    /// </summary>
+    internal class TheBusesGenericStorage
+    {
+        /// <summary>
+        /// Словарь (хранилище)
+        /// </summary>
+        readonly Dictionary<string, TheBusesGenericCollection<DrawningBus,
+        DrawningObjectBus>> _busStorages;
+
+        /// <summary>
+        /// Возвращение списка названий наборов
+        /// </summary>
+        public List<string> Keys => _busStorages.Keys.ToList();
+
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="pictureWidth"></param>
+        /// <param name="pictureHeight"></param>
+        public TheBusesGenericStorage(int pictureWidth, int pictureHeight)
+        {
+            _busStorages = new Dictionary<string, TheBusesGenericCollection<DrawningBus, DrawningObjectBus>>();
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+        }
+
+        /// <summary>
+        /// Добавление набора
+        /// </summary>
+        /// <param name="name">Название набора</param>
+        public void AddSet(string name)
+        {
+            _busStorages.Add(name, new TheBusesGenericCollection<DrawningBus, DrawningObjectBus>(_pictureWidth, _pictureHeight));
+        }
+
+        /// <summary>
+        /// Удаление набора
+        /// </summary>
+        /// <param name="name">Название набора</param>
+        public void DelSet(string name)
+        {
+            if (!_busStorages.ContainsKey(name))
+            {
+                return;
+            }
+
+            _busStorages.Remove(name);
+        }
+
+        /// <summary>
+        /// Доступ к набору
+        /// </summary>
+        /// <param name="ind"></param>
+        /// <returns></returns>
+        public TheBusesGenericCollection<DrawningBus, DrawningObjectBus>? this[string ind]
+        {
+            get
+            {
+                if (_busStorages.ContainsKey(ind))
+                {
+                    return _busStorages[ind];
+                }
+
+                return null;
+            }
+        }
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/MovementStrategy/AbstractStrategy.cs

@@ -0,0 +1,148 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.MovementStrategy
+{
+    /// <summary>
+    /// Класс-стратегия перемещения объекта
+    /// </summary>
+    public abstract class AbstractStrategy
+    {
+        /// <summary>
+        /// Перемещаемый объект
+        /// </summary>
+        private IMoveableObject? _moveableObject;
+
+        /// <summary>
+        /// Статус перемещения
+        /// </summary>
+        private Status _state = Status.NotInit;
+
+        /// <summary>
+        /// Ширина поля
+        /// </summary>
+        protected int FieldWidth { get; private set; }
+
+        /// <summary>
+        /// Высота поля
+        /// </summary>
+        protected int FieldHeight { get; private set; }
+
+        /// <summary>
+        /// Статус перемещения
+        /// </summary>
+        public Status GetStatus() { return _state; }
+
+        /// <summary>
+        /// Установка данных
+        /// </summary>
+        /// <param name="moveableObject">Перемещаемый объект</param>
+        /// <param name="width">Ширина поля</param>
+        /// <param name="height">Высота поля</param>
+        public void SetData(IMoveableObject moveableObject, int width, int height)
+        {
+            if (moveableObject == null)
+            {
+                _state = Status.NotInit;
+                return;
+            }
+            _state = Status.InProgress;
+            _moveableObject = moveableObject;
+            FieldWidth = width;
+            FieldHeight = height;
+        }
+
+        /// <summary>
+        /// Шаг перемещения
+        /// </summary>
+        public void MakeStep()
+        {
+            if (_state != Status.InProgress)
+            {
+                return;
+            }
+            if (IsTargetDestinaion())
+            {
+                _state = Status.Finish;
+                return;
+            }
+            MoveToTarget();
+        }
+
+        /// <summary>
+        /// Перемещение влево
+        /// </summary>
+        /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+        protected bool MoveLeft() => MoveTo(DirectionType.Left);
+
+        /// <summary>
+        /// Перемещение вправо
+        /// </summary>
+        /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+        protected bool MoveRight() => MoveTo(DirectionType.Right);
+
+        /// <summary>
+        /// Перемещение вверх
+        /// </summary>
+        /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+        protected bool MoveUp() => MoveTo(DirectionType.Up);
+
+        /// <summary>
+        /// Перемещение вниз
+        /// </summary>
+        /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+        protected bool MoveDown() => MoveTo(DirectionType.Down);
+
+        /// <summary>
+        /// Параметры объекта
+        /// </summary>
+        protected ObjectParameters? GetObjectParameters =>
+        _moveableObject?.GetObjectPosition;
+
+        /// <summary>
+        /// Шаг объекта
+        /// </summary>
+        /// <returns></returns>
+        protected int? GetStep()
+        {
+            if (_state != Status.InProgress)
+            {
+                return null;
+            }
+            return _moveableObject?.GetStep;
+        }
+
+        /// <summary>
+        /// Перемещение к цели
+        /// </summary>
+        protected abstract void MoveToTarget();
+
+        /// <summary>
+        /// Достигнута ли цель
+        /// </summary>
+        /// <returns></returns>
+        protected abstract bool IsTargetDestinaion();
+
+        /// <summary>
+        /// Попытка перемещения в требуемом направлении
+        /// </summary>
+        /// <param name="directionType">Направление</param>
+        /// <returns>Результат попытки (true - удалось переместиться, false - неудача)</returns>
+        private bool MoveTo(DirectionType directionType)
+        {
+            if (_state != Status.InProgress)
+            {
+                return false;
+            }
+            if (_moveableObject?.CheckCanMove(directionType) ?? false)
+            {
+                _moveableObject.MoveObject(directionType);
+                return true;
+            }
+            return false;
+        }
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/MovementStrategy/DrawningObjectBus.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.DrawningObjects;
+
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.MovementStrategy
+{
+    /// <summary>
+    /// Реализация интерфейса IDrawningObject для работы с объектом DrawningBus (паттерн Adapter)
+    /// </summary>
+    public class DrawningObjectBus : IMoveableObject
+    {
+        private readonly DrawningBus? _drawningBus = null;
+
+        public DrawningObjectBus(DrawningBus drawningBus)
+        {
+            _drawningBus = drawningBus;
+        }
+
+        public ObjectParameters? GetObjectPosition
+        {
+            get
+            {
+                if (_drawningBus == null || _drawningBus.EntityBus == null)
+                {
+                    return null;
+                }
+                return new ObjectParameters(_drawningBus.GetPosX,
+                _drawningBus.GetPosY, _drawningBus.GetWidth, _drawningBus.GetHeight);
+            }
+        }
+
+        public int GetStep => (int)(_drawningBus?.EntityBus?.Step ?? 0);
+
+        public bool CheckCanMove(DirectionType direction) =>
+        _drawningBus?.CanMove(direction) ?? false;
+
+        public void MoveObject(DirectionType direction) =>
+        _drawningBus?.MoveTransport(direction);
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/MovementStrategy/IMoveableObject.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.MovementStrategy
+{
+    /// <summary>
+    /// Интерфейс для работы с перемещаемым объектом
+    /// </summary>
+    public interface IMoveableObject
+    {
+        /// <summary>
+        /// Получение координаты X объекта
+        /// </summary>
+        ObjectParameters? GetObjectPosition { get; }
+
+        /// <summary>
+        /// Шаг объекта
+        /// </summary>
+        int GetStep { get; }
+
+        /// <summary>
+        /// Проверка, можно ли переместиться по нужному направлению
+        /// </summary>
+        /// <param name="direction"></param>
+        /// <returns></returns>
+        bool CheckCanMove(DirectionType direction);
+
+        /// <summary>
+        /// Изменение направления пермещения объекта
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        void MoveObject(DirectionType direction);
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/MovementStrategy/MoveToBorder.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.MovementStrategy
+{
+    /// <summary>
+    /// Стратегия перемещения объекта в правый нижний край экрана
+    /// </summary>
+    public class MoveToBorder : AbstractStrategy
+    {
+        protected override bool IsTargetDestinaion()
+        {
+            var objParams = GetObjectParameters;
+            if (objParams == null)
+            {
+                return false;
+            }
+
+            return objParams.RightBorder <= FieldWidth &&
+            objParams.RightBorder + GetStep() >= FieldWidth &&
+            objParams.DownBorder <= FieldHeight &&
+            objParams.DownBorder + GetStep() >= FieldHeight;
+        }
+
+        protected override void MoveToTarget()
+        {
+            var objParams = GetObjectParameters;
+            if (objParams == null)
+            {
+                return;
+            }
+            var diffX = objParams.RightBorder - FieldWidth;
+            if (Math.Abs(diffX) > GetStep())
+            {
+                if (diffX > 0)
+                {
+                    MoveLeft();
+                }
+                else
+                {
+                    MoveRight();
+                }
+            }
+            var diffY = objParams.DownBorder - FieldHeight;
+            if (Math.Abs(diffY) > GetStep())
+            {
+                if (diffY > 0)
+                {
+                    MoveUp();
+                }
+                else
+                {
+                    MoveDown();
+                }
+            }
+        }
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.MovementStrategy
+{
+    /// <summary>
+    /// Стратегия перемещения объекта в центр экрана
+    /// </summary>
+    public class MoveToCenter : AbstractStrategy
+    {
+        protected override bool IsTargetDestinaion()
+        {
+            var objParams = GetObjectParameters;
+            if (objParams == null)
+            {
+                return false;
+            }
+            return objParams.ObjectMiddleHorizontal <= FieldWidth / 2 &&
+            objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
+            objParams.ObjectMiddleVertical <= FieldHeight / 2 &&
+            objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
+        }
+
+        protected override void MoveToTarget()
+        {
+            var objParams = GetObjectParameters;
+            if (objParams == null)
+            {
+                return;
+            }
+            var diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
+            if (Math.Abs(diffX) > GetStep())
+            {
+                if (diffX > 0)
+                {
+                    MoveLeft();
+                }
+                else
+                {
+                    MoveRight();
+                }
+            }
+            var diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
+            if (Math.Abs(diffY) > GetStep())
+            {
+                if (diffY > 0)
+                {
+                    MoveUp();
+                }
+                else
+                {
+                    MoveDown();
+                }
+            }
+        }
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/MovementStrategy/ObjectParameters.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.MovementStrategy
+{
+    /// <summary>
+    /// Параметры-координаты объекта
+    /// </summary>
+    public class ObjectParameters
+    {
+        private readonly int _x;
+
+        private readonly int _y;
+
+        private readonly int _width;
+
+        private readonly int _height;
+
+        /// <summary>
+        /// Левая граница
+        /// </summary>
+        public int LeftBorder => _x;
+
+        /// <summary>
+        /// Верхняя граница
+        /// </summary>
+        public int TopBorder => _y;
+
+        /// <summary>
+        /// Правая граница
+        /// </summary>
+        public int RightBorder => _x + _width;
+
+        /// <summary>
+        /// Нижняя граница
+        /// </summary>
+        public int DownBorder => _y + _height;
+
+        /// <summary>
+        /// Середина объекта
+        /// </summary>
+        public int ObjectMiddleHorizontal => _x + _width / 2;
+
+        /// <summary>
+        /// Середина объекта
+        /// </summary>
+        public int ObjectMiddleVertical => _y + _height / 2;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+        /// <param name="width">Ширина</param>
+        /// <param name="height">Высота</param>
+        public ObjectParameters(int x, int y, int width, int height)
+        {
+            _x = x;
+            _y = y;
+            _width = width;
+            _height = height;
+        }
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/MovementStrategy/Status.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.MovementStrategy
+{
+    /// <summary>
+    /// Статус выполнения операции перемещения
+    /// </summary>
+    public enum Status
+    {
+        NotInit,
+        InProgress,
+        Finish
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base.csproj

@@ -9,4 +9,19 @@
     <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>

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/Program.cs

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

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/Properties/Resources.Designer.cs

@@ -0,0 +1,103 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Этот код создан программой.
+//     Исполняемая версия:4.0.30319.42000
+//
+//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     повторной генерации кода.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.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("PIbd_23_Ivanov_V.N._DoubleDeckerBus._Base.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 DownArrow {
+            get {
+                object obj = ResourceManager.GetObject("DownArrow", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap LeftArrow {
+            get {
+                object obj = ResourceManager.GetObject("LeftArrow", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap RightArrow {
+            get {
+                object obj = ResourceManager.GetObject("RightArrow", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap UpArrow {
+            get {
+                object obj = ResourceManager.GetObject("UpArrow", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}

PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/PIbd-23_Ivanov_V.N._DoubleDeckerBus._Base/Properties/Resources.resx

@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="DownArrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DownArrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="RightArrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\RightArrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="UpArrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\UpArrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="LeftArrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\LeftArrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>