Лабораторная работа 2

lab_0/Drawnings/DirectionType.cs

@@ -1,13 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace ProjectBus. Drawnings;
 
-namespace ProjectBus;
+/// <summary>
+/// Направление перемещения
+/// </summary>
 
 public enum DirectionType
 {
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Unknow = -1,
+
     /// <summary>
     /// Вверх
     /// </summary>

lab_0/Drawnings/DrawningBus.cs

@@ -0,0 +1,89 @@
+using ProjectBus.Entities;
+using System.Drawing;
+
+namespace ProjectBus.Drawnings;
+
+/// <summary>
+/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+/// </summary>
+public class DrawningBus : DrawningSimpleBus
+{
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес</param>
+    /// <param name="bodyColor">Основной цвет</param>
+    /// <param name="additionalColor">Дополнительный цвет</param>
+    /// <param name="additionalCompartment">Признак наличия дополнительного отсека</param>
+    /// <param name="accordion"">Признак наличия гармошки</param>
+    public DrawningBus(int speed, double weight, Color bodyColor, Color additionalColor, bool additionalCompartment, bool accordion) : base(310,52)
+    {
+        EntitySimpleBus = new EntityBus(speed, weight, bodyColor, additionalColor, additionalCompartment, accordion);
+    }
+
+    public override void DrawTransport(Graphics g)
+    {
+        if (EntitySimpleBus == null || EntitySimpleBus is not EntityBus bus || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+
+        Pen pen = new(Color.Black);
+        Brush additionalBrush= new SolidBrush(bus.AdditionalColor);
+
+        //доп отсек
+        if (bus.AdditionalCompartment)
+        {
+            //корпус
+            g.DrawRectangle(pen, _startPosX.Value + 204, _startPosY.Value - 1, 105, 50);
+            g.DrawRectangle(pen, _startPosX.Value + 205, _startPosY.Value, 105, 50);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 205, _startPosY.Value, 105, 50);
+
+
+            //окна
+            g.FillEllipse(additionalBrush, _startPosX.Value + 247, _startPosY.Value + 6, 16, 25);
+            g.FillEllipse(additionalBrush, _startPosX.Value + 275, _startPosY.Value + 6, 16, 25);
+            g.DrawEllipse(pen, _startPosX.Value + 247, _startPosY.Value + 6, 16, 25);
+            g.DrawEllipse(pen, _startPosX.Value + 275, _startPosY.Value + 6, 16, 25);
+
+
+            //дверь
+            g.FillRectangle(additionalBrush, _startPosX.Value + 215, _startPosY.Value + 10, 20, 40);
+            g.DrawRectangle(pen, _startPosX.Value + 215, _startPosY.Value + 10, 20, 40);
+
+            //колеса
+            g.FillEllipse(additionalBrush, _startPosX.Value + 250, _startPosY.Value + 40, 20, 20);
+            g.DrawEllipse(pen, _startPosX.Value + 250, _startPosY.Value + 40, 20, 20);
+        }
+
+        base.DrawTransport(g);
+
+
+        //гармошка
+        if (bus.Accordion)
+        {
+            Brush brGray = new SolidBrush(Color.LightGray);
+
+            g.FillRectangle(brGray, _startPosX.Value + 175, _startPosY.Value + 4, 30, 42);
+            g.FillRectangle(brGray, _startPosX.Value + 180, _startPosY.Value + 4, 5, 42);
+            g.FillRectangle(brGray, _startPosX.Value + 185, _startPosY.Value + 4, 5, 42);
+            g.FillRectangle(brGray, _startPosX.Value + 190, _startPosY.Value + 4, 5, 42);
+            g.FillRectangle(brGray, _startPosX.Value + 195, _startPosY.Value + 4, 5, 42);
+
+            g.DrawRectangle(pen, _startPosX.Value + 175, _startPosY.Value + 4, 30, 42);
+            g.DrawRectangle(pen, _startPosX.Value + 180, _startPosY.Value + 4, 5, 42);
+            g.DrawRectangle(pen, _startPosX.Value + 185, _startPosY.Value + 4, 5, 42);
+            g.DrawRectangle(pen, _startPosX.Value + 190, _startPosY.Value + 4, 5, 42);
+            g.DrawRectangle(pen, _startPosX.Value + 195, _startPosY.Value + 4, 5, 42);
+        }
+    }
+}
+
+
+
+
+
+
+
+

lab_0/Drawnings/DrawningSimpleBus.cs

@@ -1,15 +1,14 @@
-namespace ProjectBus;
+using ProjectBus.Drawnings;
+using ProjectBus.Entities;
 
-/// <summary>
-/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
-/// </summary>
+namespace ProjectBus.Drawnings;
 
-public class DrawingBus
+public class DrawningSimpleBus
 {
     /// <summary>
     /// Класс-сущность
     /// </summary>
-    public EntityBus? EntityBus { get; private set; }
+    public EntitySimpleBus? EntitySimpleBus { get; protected set; }
 
     /// <summary>
     /// Ширина окна
@@ -24,16 +23,15 @@ public class DrawingBus
     /// <summary>
     /// Левая координата прорисовки автобуса
     /// </summary>
-    private int? _startPosX;
+    protected int? _startPosX;
 
     /// <summary>
     /// Верхняя кооридната прорисовки автобуса
     /// </summary>
-    private int? _startPosY;
-    
+    protected int? _startPosY;
 
     /// <summary>
-    /// /// Ширина прорисовки автобуса
+    /// Ширина прорисовки автобуса
     /// /// </summary> 
     private readonly int _drawningBusWidth = 310;
 
@@ -43,22 +41,54 @@ public class DrawingBus
     private readonly int _drawningBusHeight = 52;
 
     /// <summary>
-    /// Инициализация свойств
+    /// Координата X объекта
     /// </summary>
-    /// <param name="speed">Скорость</param>
-    /// <param name="weight">Вес</param>
-    /// <param name="bodyColor">Основной цвет</param>
-    /// <param name="additionalColor">Дополнительный цвет</param>
-    /// <param name="additionalCompartment">Признак наличия дополнительного отсека</param>
-    /// <param name="accordion"">Признак наличия гармошки</param>
-    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool additionalCompartment, bool accordion, bool v)
+    public int? GetPosX => _startPosX;
+    /// <summary>
+    /// Координата Y объекта
+    /// </summary>
+    public int? GetPosY => _startPosY;
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    public int GetWidth => _drawningBusWidth;
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    public int GetHeight => _drawningBusHeight;
+
+    /// <summary>
+    /// Пустой конструктор
+    /// </summary>
+    private DrawningSimpleBus()
     {
-        EntityBus = new EntityBus();
-        EntityBus.Init(speed, weight, bodyColor, additionalColor, additionalCompartment, accordion);
         _pictureWidth = null;
         _pictureHeight = null;
         _startPosX = null;
         _startPosY = null;
+
+    }
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес</param>
+    /// <param name="bodyColor">Основной цвет</param>
+    public DrawningSimpleBus(int speed, double weight, Color bodyColor) : this()
+    {
+        EntitySimpleBus = new EntitySimpleBus(speed, weight, bodyColor);
+    }
+
+    /// <summary>
+    /// Конструктор для наследников
+    /// </summary>
+    /// <param name="drawningBusWidth">Ширина прорисовки автобуса</param>
+    /// <param name="drawningBusHeight">Высота прорисовки автобуса</param>
+    protected DrawningSimpleBus(int drawningBusWidth, int drawningBusHeight) : this() 
+    {
+        _drawningBusWidth = drawningBusWidth;
+        _drawningBusHeight= drawningBusHeight;
     }
 
     /// <summary>
@@ -67,16 +97,6 @@ public class DrawingBus
     /// <param name="width">Ширина поля</param>
     /// <param name="height">Высота поля</param>
     /// <returns>true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
-    //public bool SetPictureSize(int width, int height)
-    //{
-    //    // TODO проверка, что объект "влезает" в размеры поля
-    //    // если влезает, сохраняем границы и корректируем позицию объекта,  если она была уже установлена
-
-    //    _pictureWidth = width;
-    //    _pictureHeight = height;
-
-    //    return true;
-    //}
     public bool SetPictureSize(int width, int height)
     {
         if (width >= _drawningBusWidth && height >= _drawningBusWidth)
@@ -148,7 +168,7 @@ public class DrawingBus
     /// <returns>true - перемещене выполнено, false - перемещение невозможно</returns>
     public bool MoveTransport(DirectionType direction)
     {
-        if (EntityBus == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        if (EntitySimpleBus == null || !_startPosX.HasValue || !_startPosY.HasValue)
         {
             return false;
         }
@@ -157,30 +177,30 @@ public class DrawingBus
         {
             //влево
             case DirectionType.Left:
-                if (_startPosX.Value - EntityBus.Step > 0)
+                if (_startPosX.Value - EntitySimpleBus.Step > 0)
                 {
-                    _startPosX -= (int)EntityBus.Step;
+                    _startPosX -= (int)EntitySimpleBus.Step;
                 }
                 return true;
             //вверх
             case DirectionType.Up:
-                if (_startPosY.Value - EntityBus.Step > 0)
+                if (_startPosY.Value - EntitySimpleBus.Step > 0)
                 {
-                    _startPosY -= (int)EntityBus.Step;
+                    _startPosY -= (int)EntitySimpleBus.Step;
                 }
                 return true;
             // вправо
             case DirectionType.Right:
-                if (_startPosX.Value + EntityBus.Step <_pictureWidth - _drawningBusWidth)
+                if (_startPosX.Value + EntitySimpleBus.Step <_pictureWidth - _drawningBusWidth)
                 {
-                    _startPosX += (int)EntityBus.Step;
+                    _startPosX += (int)EntitySimpleBus.Step;
                 }
                 return true;
             //вниз
             case DirectionType.Down:
-                if (_startPosY.Value + EntityBus.Step < _pictureHeight - _drawningBusHeight)
+                if (_startPosY.Value + EntitySimpleBus.Step < _pictureHeight - _drawningBusHeight)
                 {
-                    _startPosY += (int)EntityBus.Step;
+                    _startPosY += (int)EntitySimpleBus.Step;
                 }
                 return true;
             default:
@@ -192,15 +212,15 @@ public class DrawingBus
     /// Прорисовка объекта
     /// </summary>
     /// <param name="g"></param>
-    public void DrawTransport(Graphics g)
+    public virtual void DrawTransport(Graphics g) 
     {
-        if (EntityBus == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        if (EntitySimpleBus == null || !_startPosX.HasValue || !_startPosY.HasValue)
         {
             return;
         }
 
+
         Pen pen = new(Color.Black);
-        Brush additionalBrush = new SolidBrush(EntityBus.AdditionalColor);
 
         //корпус автобуса
 
@@ -209,7 +229,8 @@ public class DrawingBus
         g.DrawRectangle(pen, _startPosX.Value + 0, _startPosY.Value, 175, 50);
         g.DrawRectangle(pen, _startPosX.Value + 0, _startPosY.Value - 1, 175, 50);
 
-        g.FillRectangle(additionalBrush, _startPosX.Value + 0, _startPosY.Value, 175, 50);
+        Brush br1 = new SolidBrush(EntitySimpleBus.BodyColor);
+        g.FillRectangle(br1, _startPosX.Value + 0, _startPosY.Value, 175, 50);
 
         //окна
 
@@ -231,10 +252,10 @@ public class DrawingBus
 
         //дверь
 
-        Brush br = new SolidBrush(EntityBus.BodyColor);
+        Brush br2 = new SolidBrush(EntitySimpleBus.BodyColor);
         g.DrawRectangle(pen, _startPosX.Value + 49, _startPosY.Value + 9, 20, 40);
         g.DrawRectangle(pen, _startPosX.Value + 50, _startPosY.Value + 10, 20, 40);
-        g.FillRectangle(br, _startPosX.Value + 50, _startPosY.Value + 10, 20, 40);
+        g.FillRectangle(br2, _startPosX.Value + 50, _startPosY.Value + 10, 20, 40);
 
 
 
@@ -247,60 +268,7 @@ public class DrawingBus
         g.DrawEllipse(pen, _startPosX.Value + 115, _startPosY.Value + 40, 20, 20);
 
 
-        //доп отсек
-        if (EntityBus.AdditionalCompartment)
-        {
-            //корпус
-            g.DrawRectangle(pen, _startPosX.Value + 204, _startPosY.Value - 1, 105, 50);
-            g.DrawRectangle(pen, _startPosX.Value + 205, _startPosY.Value, 105, 50);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 205, _startPosY.Value, 105, 50);
-
-
-            //окна
-            g.FillEllipse(brBlue, _startPosX.Value + 247, _startPosY.Value + 6, 16, 25);
-            g.FillEllipse(brBlue, _startPosX.Value + 275, _startPosY.Value + 6, 16, 25);
-            g.DrawEllipse(pen, _startPosX.Value + 247, _startPosY.Value + 6, 16, 25);
-            g.DrawEllipse(pen, _startPosX.Value + 275, _startPosY.Value + 6, 16, 25);
-
-
-
-            //дверь
-            g.FillRectangle(br, _startPosX.Value + 215, _startPosY.Value + 10, 20, 40);
-            g.DrawRectangle(pen, _startPosX.Value + 215, _startPosY.Value + 10, 20, 40);
-            //колеса
-
-
-            g.FillEllipse(brGrey, _startPosX.Value + 250, _startPosY.Value + 40, 20, 20);
-            g.DrawEllipse(pen, _startPosX.Value + 250, _startPosY.Value + 40, 20, 20);
-
-
-        }
-
-        //гармошка
-        if (EntityBus.Accordion)
-        {
-            Brush brGray = new SolidBrush(Color.LightGray);
-
-            g.FillRectangle(brGray, _startPosX.Value + 175, _startPosY.Value + 4, 30, 42);
-            g.FillRectangle(brGray, _startPosX.Value + 180, _startPosY.Value + 4, 5, 42);
-            g.FillRectangle(brGray, _startPosX.Value + 185, _startPosY.Value + 4, 5, 42);
-            g.FillRectangle(brGray, _startPosX.Value + 190, _startPosY.Value + 4, 5, 42);
-            g.FillRectangle(brGray, _startPosX.Value + 195, _startPosY.Value + 4, 5, 42);
-
-            g.DrawRectangle(pen, _startPosX.Value + 175, _startPosY.Value + 4, 30, 42);
-            g.DrawRectangle(pen, _startPosX.Value + 180, _startPosY.Value + 4, 5, 42);
-            g.DrawRectangle(pen, _startPosX.Value + 185, _startPosY.Value + 4, 5, 42);
-            g.DrawRectangle(pen, _startPosX.Value + 190, _startPosY.Value + 4, 5, 42);
-            g.DrawRectangle(pen, _startPosX.Value + 195, _startPosY.Value + 4, 5, 42);
-
-        }
     }
-}
-
-
-
-
-
-
+    }
 
 

lab_0/Entities/EntityBus.cs

@@ -1,45 +1,27 @@
-namespace ProjectBus;
+namespace ProjectBus.Entities;
 
 /// <summary>
 /// Класс-сущность "Автобус"
 /// </summary>
-public class EntityBus
+public class EntityBus : EntitySimpleBus
 {
-    /// <summary>
-    /// Скорость
-    /// </summary>
-    public int Speed { get; set; }
-
-    /// <summary>
-    /// Вес
-    /// </summary>
-    public double Weight { get; set; }
-
-    /// <summary>
-    /// Основной цвет
-    /// </summary>
-    public Color BodyColor { get; private set; }
-
     /// <summary>
     /// Дополнительный цвет (для опциональных элементов)
     /// </summary>
+    /// 
     public Color AdditionalColor { get; private set; }
+    public Color BodyColor { get; private set; }
 
     /// <summary>
-    /// Признак (опция) наличия контейнеров
+    /// Признак (опция) наличия дополнительного отсека
     /// </summary>
     public bool AdditionalCompartment { get; private set; }
 
     /// <summary>
-    /// Признак (опция) наличия крана для разгрузки
+    /// Признак (опция) наличия гармошки
     /// </summary>
     public bool Accordion { get; private set; }
 
-    /// <summary>
-    /// Шаг перемещения автобуса
-    /// </summary>
-    public double Step => Speed * 100 / Weight;
-
     /// <summary>
     /// Инициализация полей объекта-класса спортивного автомобиля
     /// </summary>
@@ -49,12 +31,10 @@ public class EntityBus
     /// <param name="additionalColor">Дополнительный цвет</param>
     /// <param name="additionalCompartment">Признак наличия дополнительного отсека</param>
     /// <param name="accordion">Признак наличия гармошки</param>
-    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool additionalCompartment, bool accordion)
+    public EntityBus(int speed, double weight, Color bodyColor, Color additionalColor, bool additionalCompartment, bool accordion) : base(speed, weight, bodyColor)
     {
-        Speed = speed;
-        Weight = weight;
-        BodyColor = bodyColor;
         AdditionalColor = additionalColor;
+        BodyColor = bodyColor;
         AdditionalCompartment = additionalCompartment;
         Accordion = accordion;
     }

lab_0/Entities/EntitySimpleBus.cs

@@ -0,0 +1,42 @@
+namespace ProjectBus.Entities;
+
+/// <summary>
+/// Класс-сущность "Автобус"
+/// </summary>
+
+public class EntitySimpleBus
+{
+    /// <summary>
+    /// Скорость
+    /// </summary>
+    public int Speed { get; set; }
+
+    /// <summary>
+    /// Вес
+    /// </summary>
+    public double Weight { get; set; }
+
+    /// <summary>
+    /// Основной цвет
+    /// </summary>
+    public Color BodyColor { get; private set; }
+
+
+    /// <summary>
+    /// Шаг перемещения автомобиля
+    /// </summary>
+    public double Step => Speed * 100 / Weight;
+
+    /// <summary>
+    /// Конструктор сущности
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес автобуса</param>
+    /// <param name="bodyColor">Основной цвет</param>
+    public EntitySimpleBus(int speed, double weight, Color bodyColor)
+    {
+        Speed = speed;
+        Weight = weight;
+        BodyColor = bodyColor;
+    }
+}

lab_0/FormBus.Designer.cs

@@ -34,6 +34,9 @@
             buttonRight = new Button();
             buttonUp = new Button();
             buttonDown = new Button();
+            buttonCreateSimpleBus = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxBus).BeginInit();
             SuspendLayout();
             // 
@@ -42,18 +45,18 @@
             pictureBoxBus.Dock = DockStyle.Fill;
             pictureBoxBus.Location = new Point(0, 0);
             pictureBoxBus.Name = "pictureBoxBus";
-            pictureBoxBus.Size = new Size(800, 450);
+            pictureBoxBus.Size = new Size(1155, 557);
             pictureBoxBus.TabIndex = 7;
             pictureBoxBus.TabStop = false;
             // 
             // buttonCreate
             // 
             buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreate.Location = new Point(12, 392);
+            buttonCreate.Location = new Point(12, 501);
             buttonCreate.Name = "buttonCreate";
-            buttonCreate.Size = new Size(150, 46);
+            buttonCreate.Size = new Size(410, 46);
             buttonCreate.TabIndex = 2;
-            buttonCreate.Text = "Создать";
+            buttonCreate.Text = "Создать автобус с доп.отсеком";
             buttonCreate.UseVisualStyleBackColor = true;
             buttonCreate.Click += ButtonCreate_Click;
             // 
@@ -62,7 +65,7 @@
             buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonLeft.BackgroundImage = Properties.Resources.arrowLeft;
             buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonLeft.Location = new Point(626, 388);
+            buttonLeft.Location = new Point(981, 495);
             buttonLeft.Name = "buttonLeft";
             buttonLeft.Size = new Size(50, 50);
             buttonLeft.TabIndex = 3;
@@ -74,7 +77,7 @@
             buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonRight.BackgroundImage = Properties.Resources.arrowRight;
             buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonRight.Location = new Point(738, 390);
+            buttonRight.Location = new Point(1093, 497);
             buttonRight.Name = "buttonRight";
             buttonRight.Size = new Size(50, 50);
             buttonRight.TabIndex = 4;
@@ -86,7 +89,7 @@
             buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonUp.BackgroundImage = Properties.Resources.arrowUp;
             buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonUp.Location = new Point(682, 332);
+            buttonUp.Location = new Point(1037, 439);
             buttonUp.Name = "buttonUp";
             buttonUp.Size = new Size(50, 50);
             buttonUp.TabIndex = 5;
@@ -98,18 +101,52 @@
             buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonDown.BackgroundImage = Properties.Resources.arrowDown;
             buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonDown.Location = new Point(682, 388);
+            buttonDown.Location = new Point(1037, 495);
             buttonDown.Name = "buttonDown";
             buttonDown.Size = new Size(50, 50);
             buttonDown.TabIndex = 6;
             buttonDown.UseVisualStyleBackColor = true;
             buttonDown.Click += ButtonMove_Click;
             // 
+            // buttonCreateSimpleBus
+            // 
+            buttonCreateSimpleBus.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreateSimpleBus.Location = new Point(428, 501);
+            buttonCreateSimpleBus.Name = "buttonCreateSimpleBus";
+            buttonCreateSimpleBus.Size = new Size(431, 46);
+            buttonCreateSimpleBus.TabIndex = 8;
+            buttonCreateSimpleBus.Text = "Создать обычный автобус";
+            buttonCreateSimpleBus.UseVisualStyleBackColor = true;
+            buttonCreateSimpleBus.Click += buttonCreateSimpleBus_Click;
+            // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(901, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(242, 40);
+            comboBoxStrategy.TabIndex = 9;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Location = new Point(993, 58);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(150, 46);
+            buttonStrategyStep.TabIndex = 10;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += buttonStrategyStep_Click;
+            // 
             // FormBus
             // 
             AutoScaleDimensions = new SizeF(13F, 32F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(800, 450);
+            ClientSize = new Size(1155, 557);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
+            Controls.Add(buttonCreateSimpleBus);
             Controls.Add(buttonDown);
             Controls.Add(buttonUp);
             Controls.Add(buttonRight);
@@ -129,5 +166,8 @@
         private Button buttonRight;
         private Button buttonUp;
         private Button buttonDown;
+        private Button buttonCreateSimpleBus;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
     }
 }

lab_0/FormBus.cs

@@ -1,4 +1,6 @@
-using System;
+using ProjectBus.Drawnings;
+using ProjectBus.MovementStrategy;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -8,81 +10,172 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace ProjectBus
+namespace ProjectBus;
+/// <summary>
+/// форма работы с объектом "Автобус"
+/// </summary>
+public partial class FormBus : Form
 {
-    public partial class FormBus : Form
+    /// <summary>
+    /// поле-объект для прорисовки объекта
+    /// </summary>
+    private DrawningSimpleBus? _drawningSimpleBus;
+
+    /// <summary>
+    /// Стратегия перемещения
+    /// </summary>
+    private AbstractStrategy? _strategy;
+
+
+    /// <summary>
+    /// конструктор формы
+    /// </summary>
+    public FormBus()
     {
-        private DrawingBus? _drawingBus;
+        InitializeComponent();
+        _strategy = null;
+    }
 
-        public FormBus()
+    /// <summary>
+    /// метод прорисовки машины
+    /// </summary>
+    private void Draw()
+    {
+        if (_drawningSimpleBus == null)
         {
-            InitializeComponent();
+            return;
         }
 
-        private void Draw()
+        Bitmap bmp = new(pictureBoxBus.Width, pictureBoxBus.Height);
+        Graphics gr = Graphics.FromImage(bmp);
+        _drawningSimpleBus.DrawTransport(gr);
+        pictureBoxBus.Image = bmp;
+    }
+
+    /// <summary>
+    /// Создание объекта класса-перемещения
+    /// </summary>
+    /// <param name="type">Тип создаваемого объекта</param>  
+    private void CreateObject(string type)
+    {
+        Random random = new();
+        switch (type)
         {
-            if (_drawingBus == null)
-            {
+            case nameof(DrawningSimpleBus):
+                _drawningSimpleBus = new DrawningSimpleBus(random.Next(100, 300), random.Next(1000, 3000),
+                    Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
+                break;
+            case nameof(DrawningBus):
+                _drawningSimpleBus = new DrawningBus(random.Next(100, 300), random.Next(1000, 3000),
+                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+                Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+                break;
+            default:
                 return;
-            }
-
-            Bitmap bmp = new(pictureBoxBus.Width, pictureBoxBus.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _drawingBus.DrawTransport(gr);
-            pictureBoxBus.Image = bmp;
         }
 
+        _drawningSimpleBus.SetPictureSize(pictureBoxBus.Width, pictureBoxBus.Height);
+        _drawningSimpleBus.SetPosition(random.Next(10, 100), random.Next(10, 100));
+        _strategy = null;
+        comboBoxStrategy.Enabled = true;
 
-        private void ButtonCreate_Click(object sender, EventArgs e)
+        Draw();
+    }
+
+    /// <summary>
+    /// Обработка нажатия кнопки "Создать автобус с доп отсеком"
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonCreate_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBus));
+
+    /// <summary>
+    /// Обработка нажатия кнопки "Создать обычный автобус"
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonCreateSimpleBus_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningSimpleBus));
+
+
+
+    private void ButtonMove_Click(object sender, EventArgs e)
+    {
+        if (_drawningSimpleBus == null)
         {
-            Random random = new();
-            _drawingBus = new DrawingBus();
-            _drawingBus.Init(random.Next(100, 300), random.Next(1000, 3000),
-                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-                Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-            _drawingBus.SetPictureSize(pictureBoxBus.Width, pictureBoxBus.Height);
-            _drawingBus.SetPosition(random.Next(10, 100), random.Next(10, 100));
+            return;
+        }
 
+        string name = ((Button)sender)?.Name ?? string.Empty;
+        bool result = false;
+        switch (name)
+        {
+            case "buttonUp":
+                result =
+                _drawningSimpleBus.MoveTransport(DirectionType.Up);
+                break;
+            case "buttonDown":
+                result =
+                _drawningSimpleBus.MoveTransport(DirectionType.Down);
+                break;
+            case "buttonLeft":
+                result =
+                _drawningSimpleBus.MoveTransport(DirectionType.Left);
+                break;
+            case "buttonRight":
+                result =
+                _drawningSimpleBus.MoveTransport(DirectionType.Right);
+                break;
+        }
+
+        if (result)
+        {
             Draw();
+        }
+    }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonStrategyStep_Click(object sender, EventArgs e)
+    {
+        if (_drawningSimpleBus == null)
+        {
+            return;
         }
 
-        private void ButtonMove_Click(object sender, EventArgs e)
+        if (comboBoxStrategy.Enabled)
         {
-            if (_drawingBus == null)
+            _strategy = comboBoxStrategy.SelectedIndex switch
+            {
+                0 => new MoveToCenter(),
+                1 => new MoveToBorder(),
+                _ => null,
+            };
+            if (_strategy == null)
             {
                 return;
             }
+            _strategy.SetData(new MoveableSimpleBus(_drawningSimpleBus), pictureBoxBus.Width, pictureBoxBus.Height);
+        }
 
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            bool result = false;
-            switch (name)
-            {
-                case "buttonUp":
-                    result =
-                    _drawingBus.MoveTransport(DirectionType.Up);
-                    break;
-                case "buttonDown":
-                    result =
-                    _drawingBus.MoveTransport(DirectionType.Down);
-                    break;
-                case "buttonLeft":
-                    result =
-                    _drawingBus.MoveTransport(DirectionType.Left);
-                    break;
-                case "buttonRight":
-                    result =
-                    _drawingBus.MoveTransport(DirectionType.Right);
-                    break;
-            }
+        if (_strategy == null)
+        {
+            return;
+        }
 
-            if (result)
-            {
-                Draw();
-            }
+        comboBoxStrategy.Enabled = false;
+        _strategy.MakeStep();
+        Draw();
 
+        if (_strategy.GetStatus() == StrategyStatus.Finish)
+        {
+            comboBoxStrategy.Enabled = true;
+            _strategy = null;
         }
     }
 }
 
+

lab_0/MovementStrategy/AbstractStrategy.cs

@@ -0,0 +1,139 @@
+namespace ProjectBus.MovementStrategy;
+
+/// <summary>
+/// Класс-стратегия перемещения объекта
+/// </summary>
+public abstract class AbstractStrategy
+{
+    /// <summary>
+    /// Перемещаемый объект
+    /// </summary>
+    private IMoveableObject? _moveableObject;
+
+    /// <summary>
+    /// Статус перемещения
+    /// </summary>
+    private StrategyStatus _state = StrategyStatus.NotInit;
+
+    /// <summary>
+    /// Ширина поля
+    /// </summary>
+    protected int FieldWidth { get; private set; }
+
+    /// <summary>
+    /// Высота поля
+    /// </summary>
+    protected int FieldHeight { get; private set; }
+
+    /// <summary>
+    /// Статус перемещения
+    /// </summary>
+    public StrategyStatus 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 = StrategyStatus.NotInit;
+            return;
+        }
+
+        _state = StrategyStatus.InProgress;
+        _moveableObject = moveableObject;
+        FieldWidth = width;
+        FieldHeight = height;
+    }
+
+    /// <summary>
+    /// Шаг перемещения
+    /// </summary>
+    public void MakeStep()
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return;
+        }
+
+        if (IsTargetDestinaion())
+        {
+            _state = StrategyStatus.Finish;
+            return;
+        }
+
+        MoveToTarget();
+    }
+
+    /// <summary>
+    /// Перемещение влево
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+    protected bool MoveLeft() => MoveTo(MovementDirection.Left);
+
+    /// <summary>
+    /// Перемещение вправо
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+    protected bool MoveRight() => MoveTo(MovementDirection.Right);
+
+    /// <summary>
+    /// Перемещение вверх
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+    protected bool MoveUp() => MoveTo(MovementDirection.Up);
+
+    /// <summary>
+    /// Перемещение вниз
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+    protected bool MoveDown() => MoveTo(MovementDirection.Down);
+
+    /// <summary>
+    /// Параметры объекта
+    /// </summary>
+    protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition;
+
+    /// <summary>
+    /// Шаг объекта
+    /// </summary>
+    /// <returns></returns>
+    protected int? GetStep()
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return null;
+        }
+        return _moveableObject?.GetStep;
+    }
+
+    /// <summary>
+    /// Перемещение к цели
+    /// </summary>
+    protected abstract void MoveToTarget();
+
+    /// <summary>
+    /// Достигнута ли цель
+    /// </summary>
+    /// <returns></returns>
+    protected abstract bool IsTargetDestinaion();
+
+    /// <summary>
+    /// Попытка перемещения в требуемом направлении
+    /// </summary>
+    /// <param name="movementDirection">Направление</param>
+    /// <returns>Результат попытки (true - удалось переместиться, false - неудача)</returns>
+    private bool MoveTo(MovementDirection movementDirection)
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return false;
+        }
+
+        return _moveableObject?.TryMoveObject(movementDirection) ?? false;
+    }
+}

lab_0/MovementStrategy/IMoveableObject.cs

@@ -0,0 +1,24 @@
+namespace ProjectBus.MovementStrategy;
+
+/// <summary>
+/// Интерфейс для работы с перемещаемым объектом
+/// </summary>
+public interface IMoveableObject
+{
+    /// <summary>
+    /// Получение координаты объекта
+    /// </summary>
+    ObjectParameters? GetObjectPosition { get; }
+
+    /// <summary>
+    /// Шаг объекта
+    /// </summary>
+    int GetStep { get; }
+
+    /// <summary>
+    /// Попытка переместить объект в указанном направлении
+    /// </summary>
+    /// <param name="direction">Направление</param>
+    /// <returns>true - объект перемещен, false - перемещение невозможно</returns>
+    bool TryMoveObject(MovementDirection direction);
+}

lab_0/MovementStrategy/MoveToBorder.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectBus.MovementStrategy;
+public class MoveToBorder : AbstractStrategy
+{
+
+
+    protected override bool IsTargetDestinaion()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return false;
+        }
+        return objParams.RightBorder - GetStep() <= FieldWidth
+        && objParams.RightBorder + GetStep() >= FieldWidth &&
+        objParams.DownBorder - GetStep() <= FieldHeight
+        && objParams.DownBorder + GetStep() >= FieldHeight;
+    }
+
+    protected override void MoveToTarget()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return;
+        }
+        int diffX = objParams.ObjectMiddleHorizontal - FieldWidth;
+        if (Math.Abs(diffX) > GetStep())
+        {
+            if (diffX > 0)
+            {
+                MoveLeft();
+            }
+            else
+            {
+                MoveRight();
+            }
+        }
+        int diffY = objParams.ObjectMiddleVertical - FieldHeight;
+        if (Math.Abs(diffY) > GetStep())
+        {
+            if (diffY > 0)
+            {
+                MoveUp();
+            }
+            else
+            {
+                MoveDown();
+            }
+        }
+    }
+}

lab_0/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectBus.MovementStrategy;
+
+public class MoveToCenter : AbstractStrategy
+{
+    protected override bool IsTargetDestinaion()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return false;
+        }
+        return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2
+        && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
+        objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2
+        && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
+    }
+    protected override void MoveToTarget()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return;
+        }
+        int diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
+        if (Math.Abs(diffX) > GetStep())
+        {
+            if (diffX > 0)
+            {
+                MoveLeft();
+            }
+            else
+            {
+                MoveRight();
+            }
+        }
+        int diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
+        if (Math.Abs(diffY) > GetStep())
+        {
+            if (diffY > 0)
+            {
+                MoveUp();
+            }
+            else
+            {
+                MoveDown();
+            }
+        }
+    }
+}

lab_0/MovementStrategy/MoveableSimpleBus.cs

@@ -0,0 +1,66 @@
+using ProjectBus.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectBus.MovementStrategy;
+
+/// <summary>
+/// Класс-реализация IMoveableObject с использованием DrawingSimpleBus
+/// </summary>
+
+public class MoveableSimpleBus : IMoveableObject
+{
+    // <summary>
+    /// Поле-объект класса DrawningTrans или его наследника
+    /// </summary>
+    private readonly DrawningSimpleBus? _simplebus = null;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="simplebus">Объект класса DrawningSimpleBus</param>
+    public MoveableSimpleBus(DrawningSimpleBus simplebus)
+    {
+        _simplebus = simplebus;
+    }
+
+    public ObjectParameters? GetObjectPosition
+    {
+        get
+        {
+            if (_simplebus == null || _simplebus.EntitySimpleBus == null || !_simplebus.GetPosX.HasValue || !_simplebus.GetPosY.HasValue)
+            {
+                return null;
+            }
+            return new ObjectParameters(_simplebus.GetPosX.Value, _simplebus.GetPosY.Value, _simplebus.GetWidth, _simplebus.GetHeight);
+        }
+    }
+    public int GetStep => (int)(_simplebus?.EntitySimpleBus ?.Step ?? 0);
+    public bool TryMoveObject(MovementDirection direction)
+    {
+        if (_simplebus == null || _simplebus.EntitySimpleBus == null)
+        {
+            return false;
+        }
+        return _simplebus.MoveTransport(GetDirectionType(direction));
+    }
+    /// <summary>
+    /// Конвертация из MovementDirection в DirectionType
+    /// </summary>
+    /// <param name="direction">MovementDirection</param>
+    /// <returns>DirectionType</returns>
+    private static DirectionType GetDirectionType(MovementDirection direction)
+    {
+        return direction switch
+        {
+            MovementDirection.Left => DirectionType.Left,
+            MovementDirection.Right => DirectionType.Right,
+            MovementDirection.Up => DirectionType.Up,
+            MovementDirection.Down => DirectionType.Down,
+            _ => DirectionType.Unknow,
+        };
+    }
+}

lab_0/MovementStrategy/MovementDirection.cs

@@ -0,0 +1,28 @@
+namespace ProjectBus.MovementStrategy;
+
+/// <summary>
+/// Направление перемещения
+/// </summary>
+public enum MovementDirection
+{
+    /// <summary>
+    /// Неизвестное направление
+    /// </summary>
+    Unknow = -1,
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Up = 1,
+    /// <summary>
+    /// Вниз
+    /// </summary>
+    Down = 2,
+    /// <summary>
+    /// Влево
+    /// </summary>
+    Left = 3,
+    /// <summary>
+    /// Вправо
+    /// </summary>
+    Right = 4
+}

lab_0/MovementStrategy/ObjectParameters.cs

@@ -0,0 +1,72 @@
+namespace ProjectBus.MovementStrategy;
+
+/// <summary>
+/// Параметры-координаты объекта
+/// </summary>
+public class ObjectParameters
+{
+    /// <summary>
+    /// Координата X
+    /// </summary>
+    private readonly int _x;
+
+    /// <summary>
+    /// Координата Y
+    /// </summary>
+    private readonly int _y;
+
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    private readonly int _width;
+
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    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;
+    }
+}

lab_0/MovementStrategy/StrategyStatus.cs

@@ -0,0 +1,22 @@
+namespace ProjectBus.MovementStrategy;
+
+/// <summary>
+/// Статус выполнения операции перемещения
+/// </summary>
+public enum StrategyStatus
+{ 
+    /// <summary>
+    /// Все готово к началу
+    /// </summary>
+    NotInit,
+
+    /// <summary>
+    /// Выполняется
+    /// </summary>
+    InProgress,
+
+    /// <summary>
+    /// Завершено
+    /// </summary>
+    Finish
+}