ProjectAccordionBus/ProjectAccordionBus/DirectionType.cs

@@ -4,18 +4,13 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ProjectAccordionBus.Drawnings;
+namespace ProjectAccordionBus;
 
 /// <summary>
 /// Направление перемещения
 /// </summary>
 public enum DirectionType
 {
-    /// <summary>
-    /// Неизвестное направление
-    /// </summary>
-    Unknow = -1,
-
     /// <summary>
     /// Вверх
     /// </summary>

ProjectAccordionBus/ProjectAccordionBus/DrawningAccordionBus.cs

@@ -0,0 +1,206 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectAccordionBus;
+
+public class DrawningAccordionBus
+{
+    public EntityAccordionBus? EntityAccordionBus { get; private set; }
+
+    private int? _pictureWidth;
+
+    private int? _pictureHeight;
+
+    private int? _startPosX;
+
+    private int? _startPosY;
+
+    private int _drawningAccordionBusWidth = 60;
+
+    private readonly int _drawningAccordionBusHeight = 50;
+
+    public void Init(EntityAccordionBus entity)
+    {
+        EntityAccordionBus = entity;
+        _pictureWidth = null;
+        _pictureHeight = null;
+        _startPosX = null;
+        _startPosY = null;
+    }
+
+    public bool SetPictureSize(int width, int height)
+    {
+        if (_drawningAccordionBusWidth <= width && _drawningAccordionBusHeight <= height)
+        {
+            _pictureWidth = width;
+            _pictureHeight = height;
+            if (_startPosX.HasValue && _startPosY.HasValue)
+            {
+                if (_startPosX + _drawningAccordionBusWidth > width)
+                {
+                    _startPosX = width - _drawningAccordionBusWidth;
+                }
+                if (_startPosY + _drawningAccordionBusHeight > height)
+                {
+                    _startPosY = height - _drawningAccordionBusHeight;
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public void SetPosition(int x, int y)
+    {
+        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
+        {
+            return;
+        }
+        _startPosX = x;
+        _startPosY = y;
+        if (x < 0)
+        {
+            _startPosX = 0;
+        }
+
+        if (y < 0)
+        {
+            _startPosY = 0;
+        }
+
+        if (x + _drawningAccordionBusWidth > _pictureWidth) {
+            _startPosX = _pictureWidth - _drawningAccordionBusWidth;
+        }
+
+        if (y + _drawningAccordionBusHeight > _pictureHeight)
+        {
+            _startPosY = _pictureHeight - _drawningAccordionBusHeight;
+        }
+    }
+
+    public bool MoveTransport(DirectionType direction)
+    {
+        if (EntityAccordionBus == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return false;
+        }
+        switch (direction)
+        {
+            //влево
+            case DirectionType.Left:
+                if (_startPosX.Value - EntityAccordionBus.Step > 0)
+                {
+                    _startPosX -= (int)EntityAccordionBus.Step;
+                }
+                return true;
+            //вверх
+            case DirectionType.Up:
+                if (_startPosY.Value - EntityAccordionBus.Step > 0)
+                {
+                    _startPosY -= (int)EntityAccordionBus.Step;
+                }
+                return true;
+            // вправо
+            case DirectionType.Right:
+                if (_startPosX.Value + _drawningAccordionBusWidth + EntityAccordionBus.Step < _pictureWidth.Value)
+                {
+                    _startPosX += (int)EntityAccordionBus.Step;
+                }
+                return true;
+            //вниз
+            case DirectionType.Down:
+                if (_startPosY.Value + _drawningAccordionBusHeight + EntityAccordionBus.Step < _pictureHeight.Value)
+                {
+                    _startPosY += (int)EntityAccordionBus.Step;
+                }
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    public void DrawTransport(Graphics g)
+    {
+        if (EntityAccordionBus == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+
+        Pen pen = new(Color.Black);
+        Brush additionalBrush = new SolidBrush(EntityAccordionBus.AdditionalColor);
+        Brush bodyBrush = new SolidBrush(EntityAccordionBus.BodyColor);
+
+        // границы автобуса
+        g.FillRectangle(bodyBrush, _startPosX.Value + 10, _startPosY.Value + 10, 50, 30);
+        
+
+        g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 10, 50, 30);
+
+        // окна
+        Brush brushBlue = new SolidBrush(Color.Blue);
+        g.FillEllipse(brushBlue, _startPosX.Value + 15, _startPosY.Value + 15, 5, 10);
+        g.FillEllipse(brushBlue, _startPosX.Value + 50, _startPosY.Value + 15, 5, 10);
+        g.FillEllipse(brushBlue, _startPosX.Value + 40, _startPosY.Value + 15, 5, 10);
+
+        g.DrawEllipse(pen, _startPosX.Value + 15, _startPosY.Value + 15, 5, 10);
+        g.DrawEllipse(pen, _startPosX.Value + 50, _startPosY.Value + 15, 5, 10);
+        g.DrawEllipse(pen, _startPosX.Value + 40, _startPosY.Value + 15, 5, 10);
+
+        
+
+
+        // крылья
+        if (EntityAccordionBus.Compartment)
+        {
+            _drawningAccordionBusWidth = 130;
+            // отсек
+            g.FillRectangle(bodyBrush, _startPosX.Value + 70, _startPosY.Value + 10, 50, 30);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 15, 10, 20);
+
+            g.DrawRectangle(pen, _startPosX.Value + 70, _startPosY.Value + 10, 50, 30);
+            g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 15, 10, 20);
+
+            // колеса
+            g.FillEllipse(additionalBrush, _startPosX.Value + 75, _startPosY.Value + 35, 10, 10);
+            g.FillEllipse(additionalBrush, _startPosX.Value + 105, _startPosY.Value + 35, 10, 10);
+
+            g.DrawEllipse(pen, _startPosX.Value + 75, _startPosY.Value + 35, 10, 10);
+            g.DrawEllipse(pen, _startPosX.Value + 105, _startPosY.Value + 35, 10, 10);
+
+            if (EntityAccordionBus.Entrance)
+            {
+                g.FillRectangle(additionalBrush, _startPosX.Value + 88, _startPosY.Value + 20, 10, 20);
+
+                g.DrawRectangle(pen, _startPosX.Value + 88, _startPosY.Value + 20, 10, 20);
+            }
+
+            if (EntityAccordionBus.Windows)
+            {
+                g.FillEllipse(brushBlue, _startPosX.Value + 75, _startPosY.Value + 15, 5, 10);
+                g.FillEllipse(brushBlue, _startPosX.Value + 110, _startPosY.Value + 15, 5, 10);
+                g.FillEllipse(brushBlue, _startPosX.Value + 100, _startPosY.Value + 15, 5, 10);
+
+                g.DrawEllipse(pen, _startPosX.Value + 75, _startPosY.Value + 15, 5, 10);
+                g.DrawEllipse(pen, _startPosX.Value + 110, _startPosY.Value + 15, 5, 10);
+                g.DrawEllipse(pen, _startPosX.Value + 100, _startPosY.Value + 15, 5, 10);
+            }
+
+        }
+
+        // двери
+        g.FillRectangle(additionalBrush, _startPosX.Value + 28, _startPosY.Value + 20, 10, 20);
+
+        g.DrawRectangle(pen, _startPosX.Value + 28, _startPosY.Value + 20, 10, 20);
+
+        // колеса
+        g.FillEllipse(additionalBrush, _startPosX.Value + 15, _startPosY.Value + 35, 10, 10);
+        g.FillEllipse(additionalBrush, _startPosX.Value + 45, _startPosY.Value + 35, 10, 10);
+
+        g.DrawEllipse(pen, _startPosX.Value + 15, _startPosY.Value + 35, 10, 10);
+        g.DrawEllipse(pen, _startPosX.Value + 45, _startPosY.Value + 35, 10, 10);
+    }
+}
+

ProjectAccordionBus/ProjectAccordionBus/Drawnings/DrawningAccordionBus.cs

@@ -1,62 +0,0 @@
-using ProjectAccordionBus.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
-
-namespace ProjectAccordionBus.Drawnings;
-
-public class DrawningAccordionBus : DrawningBus
-{
-    public DrawningAccordionBus(int speed, double weight, Color bodyColor, Color additionalColor, bool compartment, bool entrance, bool windows) : base(110, 40)
-    {
-        EntityBus = new EntityAccordionBus(speed, weight, bodyColor, additionalColor, compartment, entrance, windows);
-    }
-
-    public override void DrawTransport(Graphics g)
-    {
-        if (EntityBus == null || EntityBus is not EntityAccordionBus accordionBus || !_startPosX.HasValue || !_startPosY.HasValue)
-        {
-            return;
-        }
-        Pen pen = new(Color.Black);
-        Brush additionalBrush = new SolidBrush(accordionBus.AdditionalColor);
-
-        base.DrawTransport(g);
-
-        Brush brushBlue = new SolidBrush(Color.Blue);
-        // отсек
-        g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value, 50, 30);
-        g.FillRectangle(additionalBrush, _startPosX.Value + 50, _startPosY.Value + 5, 10, 20);
-
-        g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value, 50, 30);
-        g.DrawRectangle(pen, _startPosX.Value + 50, _startPosY.Value + 5, 10, 20);
-
-        // колеса
-        g.FillEllipse(additionalBrush, _startPosX.Value + 65, _startPosY.Value + 25, 10, 10);
-        g.FillEllipse(additionalBrush, _startPosX.Value + 95, _startPosY.Value + 25, 10, 10);
-
-        g.DrawEllipse(pen, _startPosX.Value + 65, _startPosY.Value + 25, 10, 10);
-        g.DrawEllipse(pen, _startPosX.Value + 95, _startPosY.Value + 25, 10, 10);
-
-        if (accordionBus.Entrance)
-        {
-            g.FillRectangle(additionalBrush, _startPosX.Value + 78, _startPosY.Value + 10, 10, 20);
-
-            g.DrawRectangle(pen, _startPosX.Value + 78, _startPosY.Value + 10, 10, 20);
-        }
-
-        if (accordionBus.Windows)
-        {
-            g.FillEllipse(brushBlue, _startPosX.Value + 65, _startPosY.Value + 5, 5, 10);
-            g.FillEllipse(brushBlue, _startPosX.Value + 100, _startPosY.Value + 5, 5, 10);
-            g.FillEllipse(brushBlue, _startPosX.Value + 90, _startPosY.Value + 5, 5, 10);
-
-            g.DrawEllipse(pen, _startPosX.Value + 65, _startPosY.Value + 5, 5, 10);
-            g.DrawEllipse(pen, _startPosX.Value + 100, _startPosY.Value + 5, 5, 10);
-            g.DrawEllipse(pen, _startPosX.Value + 90, _startPosY.Value + 5, 5, 10);
-        }
-    }
-}

ProjectAccordionBus/ProjectAccordionBus/Drawnings/DrawningBus.cs

@@ -1,217 +0,0 @@
-using ProjectAccordionBus.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectAccordionBus.Drawnings;
-public class DrawningBus
-{
-    /// <summary>
-    /// Класс-сущность
-    /// </summary>
-    public EntityBus? EntityBus { get; protected set; }
-
-    /// <summary>
-    /// Ширина окна
-    /// </summary>
-    private int? _pictureWidth;
-
-    /// <summary>
-    /// Высота окна
-    /// </summary>
-    private int? _pictureHeight;
-
-    /// <summary>
-    /// Левая координата прорисовки транспорта
-    /// </summary>
-    protected int? _startPosX;
-
-    /// <summary>
-    /// Верхняя координата прорисовки транспорта
-    /// </summary>
-    protected int? _startPosY;
-
-    /// <summary>
-    /// Ширина прорисовки транспорта
-    /// </summary>
-    private readonly int _drawningBusWidth = 50;
-
-    /// <summary>
-    /// Высота прорисовки транспорта
-    /// </summary>
-    private readonly int _drawningBusHeight = 35;
-
-    /// <summary>
-    /// Координата X объекта
-    /// </summary>
-    public int? GetPosX => _startPosX;
-
-    /// <summary>
-    /// Координата Y объекта
-    /// </summary>
-    public int? GetPosY => _startPosY;
-
-    /// <summary>
-    /// Ширина объекта
-    /// </summary>
-    public int GetWidth => _drawningBusWidth;
-
-    /// <summary>
-    /// Высота объекта
-    /// </summary>
-    public int GetHight => _drawningBusHeight;
-
-    // Пустой конструктор
-    private DrawningBus()
-    {
-        _pictureWidth = null;
-        _pictureHeight = null;
-        _startPosX = null;
-        _startPosY = null;
-    }
-
-    // Конструктор
-    public DrawningBus(int speed, double weight, Color bodyColor) : this()
-    {
-        EntityBus = new EntityBus(speed, weight, bodyColor);
-    }
-
-    // Конструктор
-    protected DrawningBus(int drawningBusWidth, int drawningBusHeight) : this()
-    {
-        _drawningBusWidth = drawningBusWidth;
-        _drawningBusHeight = drawningBusHeight;
-    }
-
-    public bool SetPictureSize(int width, int height)
-    {
-        if (_drawningBusWidth <= width && _drawningBusHeight <= height)
-        {
-            _pictureWidth = width;
-            _pictureHeight = height;
-            if (_startPosX.HasValue && _startPosY.HasValue)
-            {
-                if (_startPosX + _drawningBusWidth > width)
-                {
-                    _startPosX = width - _drawningBusWidth;
-                }
-                if (_startPosY + _drawningBusHeight > height)
-                {
-                    _startPosY = height - _drawningBusHeight;
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-
-    public void SetPosition(int x, int y)
-    {
-        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
-        {
-            return;
-        }
-        _startPosX = x;
-        _startPosY = y;
-        if (x < 0)
-        {
-            _startPosX = 0;
-        }
-
-        if (y < 0)
-        {
-            _startPosY = 0;
-        }
-
-        if (x + _drawningBusWidth > _pictureWidth)
-        {
-            _startPosX = _pictureWidth - _drawningBusWidth;
-        }
-
-        if (y + _drawningBusHeight > _pictureHeight)
-        {
-            _startPosY = _pictureHeight - _drawningBusHeight;
-        }
-    }
-
-    public bool MoveTransport(DirectionType direction)
-    {
-        if (EntityBus == null || !_startPosX.HasValue || !_startPosY.HasValue)
-        {
-            return false;
-        }
-        switch (direction)
-        {
-            //влево
-            case DirectionType.Left:
-                if (_startPosX.Value - EntityBus.Step > 0)
-                {
-                    _startPosX -= (int)EntityBus.Step;
-                }
-                return true;
-            //вверх
-            case DirectionType.Up:
-                if (_startPosY.Value - EntityBus.Step > 0)
-                {
-                    _startPosY -= (int)EntityBus.Step;
-                }
-                return true;
-            // вправо
-            case DirectionType.Right:
-                if (_startPosX.Value + _drawningBusWidth + EntityBus.Step < _pictureWidth.Value)
-                {
-                    _startPosX += (int)EntityBus.Step;
-                }
-                return true;
-            //вниз
-            case DirectionType.Down:
-                if (_startPosY.Value + _drawningBusHeight + EntityBus.Step < _pictureHeight.Value)
-                {
-                    _startPosY += (int)EntityBus.Step;
-                }
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    public virtual void DrawTransport(Graphics g)
-    {
-        if (EntityBus == null || !_startPosX.HasValue || !_startPosY.HasValue)
-        {
-            return;
-        }
-
-        Pen pen = new(Color.Black);
-        Brush bodyBrush = new SolidBrush(EntityBus.BodyColor);
-
-        // границы автобуса
-        g.FillRectangle(bodyBrush, _startPosX.Value, _startPosY.Value, 50, 30);
-        g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value, 50, 30);
-
-        // окна
-        Brush brushBlue = new SolidBrush(Color.Blue);
-        g.FillEllipse(brushBlue, _startPosX.Value + 5, _startPosY.Value + 5, 5, 10);
-        g.FillEllipse(brushBlue, _startPosX.Value + 40, _startPosY.Value + 5, 5, 10);
-        g.FillEllipse(brushBlue, _startPosX.Value + 30, _startPosY.Value + 5, 5, 10);
-
-        g.DrawEllipse(pen, _startPosX.Value + 5, _startPosY.Value + 5, 5, 10);
-        g.DrawEllipse(pen, _startPosX.Value + 40, _startPosY.Value + 5, 5, 10);
-        g.DrawEllipse(pen, _startPosX.Value + 30, _startPosY.Value + 5, 5, 10);
-
-        // двери
-        g.FillRectangle(bodyBrush, _startPosX.Value + 18, _startPosY.Value + 10, 10, 20);
-
-        g.DrawRectangle(pen, _startPosX.Value + 18, _startPosY.Value + 10, 10, 20);
-
-        // колеса
-        g.FillEllipse(bodyBrush, _startPosX.Value + 5, _startPosY.Value + 25, 10, 10);
-        g.FillEllipse(bodyBrush, _startPosX.Value + 35, _startPosY.Value + 25, 10, 10);
-
-        g.DrawEllipse(pen, _startPosX.Value + 5, _startPosY.Value + 25, 10, 10);
-        g.DrawEllipse(pen, _startPosX.Value + 35, _startPosY.Value + 25, 10, 10);
-    }
-}
-

ProjectAccordionBus/ProjectAccordionBus/Entities/EntityBus.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
-
-namespace ProjectAccordionBus.Entities;
-public class EntityBus
-{
-    public int Speed { get; private set; }
-
-    public double Weight { get; private set; }
-
-    public Color BodyColor { get; private set; }
-
-    public double Step => Speed * 50 / 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;
-    }
-}

ProjectAccordionBus/ProjectAccordionBus/EntityAccordionBus.cs

@@ -4,12 +4,20 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ProjectAccordionBus.Entities;
+namespace ProjectAccordionBus;
 
-public class EntityAccordionBus : EntityBus
+public class EntityAccordionBus
 {
+    public int Speed { get; private set; }
+
+    public double Weight { get; private set; }
+
+    public Color BodyColor { get; private set; }
+
     public Color AdditionalColor { get; private set; }
 
+    public double Step => Speed * 50 / Weight;
+
     public bool Compartment { get; private set; }
 
     public bool Entrance { get; private set; }
@@ -17,18 +25,24 @@ public class EntityAccordionBus : EntityBus
     public bool Windows { get; private set; }
 
     /// <summary>
-    /// Инициализация полей объекта-класса accordion bus
+    /// Инициализация полей объекта-класса спортивного автомобиля
     /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес автомобиля</param>
+    /// <param name="bodyColor">Основной цвет</param>
     /// <param name="additionalColor">Дополнительный цвет</param>
     /// <param name="compartment">Признак наличия доп. отсека с гармошкой</param>
     /// <param name="entrance">Признак наличия входа у доп. отсека</param>
     /// <param name="windows">Признак наличия окон у доп. отсека</param>
 
-    public EntityAccordionBus(int Speed, double Weight, Color bodyColor, Color additionalColor, bool compartment, bool entrance, bool windows) : base(Speed, Weight, bodyColor)
+    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool compartment, bool entrance, bool windows)
     {
+        Speed = speed;
+        Weight = weight;
+        BodyColor = bodyColor;
         AdditionalColor = additionalColor;
         Compartment = compartment; // отсек
-        Entrance = entrance;
+        Entrance = entrance; // крылья
         Windows = windows;
     }
 

ProjectAccordionBus/ProjectAccordionBus/FormAccordionBus.Designer.cs

@@ -35,9 +35,6 @@
             buttonDown = new Button();
             buttonUp = new Button();
             buttonRight = new Button();
-            buttonCreateBus = new Button();
-            comboBoxStrategy = new ComboBox();
-            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxAccordionBus).BeginInit();
             SuspendLayout();
             // 
@@ -56,9 +53,9 @@
             buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
             buttonCreate.Location = new Point(12, 351);
             buttonCreate.Name = "buttonCreate";
-            buttonCreate.Size = new Size(188, 23);
+            buttonCreate.Size = new Size(75, 23);
             buttonCreate.TabIndex = 1;
-            buttonCreate.Text = "Создать автобус-гармошку";
+            buttonCreate.Text = "Создать";
             buttonCreate.UseVisualStyleBackColor = true;
             buttonCreate.Click += ButtonCreate_Click;
             // 
@@ -110,46 +107,11 @@
             buttonRight.UseVisualStyleBackColor = true;
             buttonRight.Click += ButtonMove_Click;
             // 
-            // buttonCreateBus
-            // 
-            buttonCreateBus.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateBus.Location = new Point(218, 351);
-            buttonCreateBus.Name = "buttonCreateBus";
-            buttonCreateBus.Size = new Size(138, 23);
-            buttonCreateBus.TabIndex = 6;
-            buttonCreateBus.Text = "Создать автобус";
-            buttonCreateBus.UseVisualStyleBackColor = true;
-            buttonCreateBus.Click += buttonCreateBus_Click;
-            // 
-            // comboBoxStrategy
-            // 
-            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
-            comboBoxStrategy.FormattingEnabled = true;
-            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
-            comboBoxStrategy.Location = new Point(595, 12);
-            comboBoxStrategy.Name = "comboBoxStrategy";
-            comboBoxStrategy.Size = new Size(121, 23);
-            comboBoxStrategy.TabIndex = 7;
-            comboBoxStrategy.SelectedIndexChanged += comboBoxStrategy_SelectedIndexChanged;
-            // 
-            // buttonStrategyStep
-            // 
-            buttonStrategyStep.Location = new Point(641, 41);
-            buttonStrategyStep.Name = "buttonStrategyStep";
-            buttonStrategyStep.Size = new Size(75, 23);
-            buttonStrategyStep.TabIndex = 8;
-            buttonStrategyStep.Text = "Шаг";
-            buttonStrategyStep.UseVisualStyleBackColor = true;
-            buttonStrategyStep.Click += buttonStrategyStep_Click;
-            // 
             // FormAccordionBus
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(728, 386);
-            Controls.Add(buttonStrategyStep);
-            Controls.Add(comboBoxStrategy);
-            Controls.Add(buttonCreateBus);
             Controls.Add(buttonRight);
             Controls.Add(buttonUp);
             Controls.Add(buttonDown);
@@ -175,8 +137,5 @@
         private Button buttonDown;
         private Button buttonUp;
         private Button buttonRight;
-        private Button buttonCreateBus;
-        private ComboBox comboBoxStrategy;
-        private Button buttonStrategyStep;
     }
 }

ProjectAccordionBus/ProjectAccordionBus/FormAccordionBus.cs

@@ -1,7 +1,4 @@
-using ProjectAccordionBus.Drawnings;
+using System;
-using ProjectAccordionBus.Entities;
-using ProjectAccordionBus.MovementStrategy;
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -13,142 +10,78 @@ using System.Windows.Forms;
 
 namespace ProjectAccordionBus;
 public partial class FormAccordionBus : Form
-{
-
-    private DrawningBus? _drawningBus;
-
-    private AbstractStrategy? _strategy;
-
-
-    public FormAccordionBus()
     {
-        InitializeComponent();
-        _strategy = null;
-    }
 
-    private void Draw()
+        private DrawningAccordionBus? _drawningAccordionBus;
-    {
+
-        if (_drawningBus == null)
+        private EntityAccordionBus? _entity;
+    
+
+        public FormAccordionBus()
         {
-            return;
+            InitializeComponent();
         }
 
-        Bitmap bmp = new(pictureBoxAccordionBus.Width, pictureBoxAccordionBus.Height);
+        private void Draw()
-        Graphics gr = Graphics.FromImage(bmp);
-        _drawningBus.DrawTransport(gr);
-        pictureBoxAccordionBus.Image = bmp;
-    }
-
-    private void CreateObject(string type)
-    {
-        Random random = new();
-        switch (type)
         {
-            case nameof(DrawningBus):
+            if (_drawningAccordionBus == null)
-                _drawningBus = new DrawningBus(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(DrawningAccordionBus):
-                _drawningBus = new DrawningAccordionBus(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)));
-                break;
-            default:
-                return;
-        }
-
-        _drawningBus.SetPictureSize(pictureBoxAccordionBus.Width, pictureBoxAccordionBus.Height);
-        _drawningBus.SetPosition(random.Next(10, 100), random.Next(10, 100));
-        _strategy = null;
-        comboBoxStrategy.Enabled = true;
-        Draw();
-    }
-
-    private void ButtonCreate_Click(object sender, EventArgs e)
-    {
-        CreateObject(nameof(DrawningAccordionBus));
-    }
-
-    private void buttonCreateBus_Click(object sender, EventArgs e)
-    {
-        CreateObject(nameof(DrawningBus));
-    }
-
-    private void ButtonMove_Click(object sender, EventArgs e)
-    {
-        if (_drawningBus == null)
-        {
-            return;
-        }
-
-        string name = ((Button)sender)?.Name ?? string.Empty;
-        bool result = false;
-        switch (name)
-        {
-            case "buttonUp":
-                result = _drawningBus.MoveTransport(DirectionType.Up);
-                break;
-            case "buttonDown":
-                result = _drawningBus.MoveTransport(DirectionType.Down);
-                break;
-            case "buttonLeft":
-                result = _drawningBus.MoveTransport(DirectionType.Left);
-                break;
-            case "buttonRight":
-                result = _drawningBus.MoveTransport(DirectionType.Right);
-                break;
-        }
-
-        if (result)
-        {
-            Draw();
-        }
-    }
-
-    private void buttonStrategyStep_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(new MoveableBus(_drawningBus), pictureBoxAccordionBus.Width, pictureBoxAccordionBus.Height);
+
+            Bitmap bmp = new(pictureBoxAccordionBus.Width, pictureBoxAccordionBus.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _drawningAccordionBus.DrawTransport(gr);
+            pictureBoxAccordionBus.Image = bmp;
         }
 
-        if (_strategy == null)
+        private void ButtonCreate_Click(object sender, EventArgs e)
         {
-            return;
+            Random random = new();
+            _drawningAccordionBus = new DrawningAccordionBus();
+            _entity = new EntityAccordionBus();
+            _entity.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)));
+            _drawningAccordionBus.Init(_entity);
+            _drawningAccordionBus.SetPictureSize(pictureBoxAccordionBus.Width, pictureBoxAccordionBus.Height);
+            _drawningAccordionBus.SetPosition(random.Next(10, 100), random.Next(10, 100));
+
+            Draw();
         }
 
-        comboBoxStrategy.Enabled = false;
+        private void ButtonMove_Click(object sender, EventArgs e)
-        _strategy.MakeStep();
-        Draw();
-
-        if (_strategy.GetStatus() == StrategyStatus.Finish)
         {
-            comboBoxStrategy.Enabled = true;
+            if (_drawningAccordionBus == null)
-            _strategy = null;
+            {
+                return;
+            }
+
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            bool result = false;
+            switch (name)
+            {
+                case "buttonUp":
+                    result = _drawningAccordionBus.MoveTransport(DirectionType.Up);
+                    break;
+                case "buttonDown":
+                    result = _drawningAccordionBus.MoveTransport(DirectionType.Down);
+                    break;
+                case "buttonLeft":
+                    result = _drawningAccordionBus.MoveTransport(DirectionType.Left);
+                    break;
+                case "buttonRight":
+                    result = _drawningAccordionBus.MoveTransport(DirectionType.Right);
+                    break;
+            }
+
+            if (result)
+            {
+                Draw();
+            }
         }
     }
 
-    private void comboBoxStrategy_SelectedIndexChanged(object sender, EventArgs e)
-    {
-
-    }
-}
-
 
 

ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/AbstractStrategy.cs

@@ -1,126 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectAccordionBus.MovementStrategy;
-
-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>
-    /// <returns></returns>
-    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;
-    }
-
-    public void MakeStep()
-    {
-        if (_state != StrategyStatus.InProgress)
-        {
-            return;
-        }
-
-        if (IsTargetDestination())
-        {
-            _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;
-
-    protected int? GetStep()
-    {
-        if (_state != StrategyStatus.InProgress)
-        {
-            return null;
-        }
-        return _moveableObject?.GetStep;
-    }
-
-    /// <summary>
-    /// Перемещение к цели
-    /// </summary>
-    protected abstract void MoveToTarget();
-
-    protected abstract bool IsTargetDestination();
-
-    protected bool MoveTo(MovementDirection movementDirection)
-    {
-        if (_state != StrategyStatus.InProgress)
-        {
-            return false;
-        }
-
-        return _moveableObject?.TryMoveObject(movementDirection) ?? false;
-    }
-}

ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/IMoveableObject.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectAccordionBus.MovementStrategy;
-public interface IMoveableObject
-{
-    /// <summary>
-    /// Получение координаты объекта
-    /// </summary>
-    ObjectParameters? GetObjectPosition { get; }
-
-    /// <summary>
-    /// Шаг объекта
-    /// </summary>
-    int GetStep { get; }
-
-    /// <summary>
-    /// Попытка переместить объект в указанном направлении
-    /// </summary>
-    /// <param name="direction"></param>
-    /// <returns></returns>
-    bool TryMoveObject(MovementDirection direction);
-}

ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/MoveToBorder.cs

@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectAccordionBus.MovementStrategy;
-
-public class MoveToBorder : AbstractStrategy
-{
-    protected override bool IsTargetDestination()
-    {
-        ObjectParameters? 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()
-    {
-        ObjectParameters? objParams = GetObjectParameters;
-        if (objParams == null)
-        {
-            return;
-        }
-
-        int diffX = objParams.RightBorder - FieldWidth;
-        if (Math.Abs(diffX) > GetStep())
-        {
-            if (diffX > 0)
-            {
-                MoveLeft();
-            }
-            else
-            {
-                MoveRight();
-            }
-        }
-
-        int diffY = objParams.DownBorder - FieldHeight;
-        if (Math.Abs(diffY) > GetStep())
-        {
-            if (diffY > 0)
-            {
-                MoveUp();
-            }
-            else
-            {
-                MoveDown();
-            }
-        }
-    }
-}

ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/MoveToCenter.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectAccordionBus.MovementStrategy;
-
-public class MoveToCenter : AbstractStrategy
-{
-    protected override bool IsTargetDestination()
-    {
-        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();
-            }
-        }
-    }
-}

ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/MoveableBus.cs

@@ -1,61 +0,0 @@
-using ProjectAccordionBus.Drawnings;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectAccordionBus.MovementStrategy;
-
-public class MoveableBus : IMoveableObject
-{
-    /// <summary>
-    /// Поле-объект класса DrawningBus или его наследника
-    /// </summary>
-    private readonly DrawningBus? _bus = null;
-
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    /// <param name="bus">Объект класса DrawningBus</param>
-    public MoveableBus(DrawningBus bus)
-    {
-        _bus = bus;
-    }
-
-    public ObjectParameters? GetObjectPosition
-    {
-        get
-        {
-            if (_bus == null || _bus.EntityBus == null || !_bus.GetPosX.HasValue || !_bus.GetPosY.HasValue)
-            {
-                return null;
-            }
-            return new ObjectParameters(_bus.GetPosX.Value, _bus.GetPosY.Value, _bus.GetWidth, _bus.GetHight);
-        }
-    }
-
-    public int GetStep => (int)(_bus?.EntityBus?.Step ?? 0);
-
-    public bool TryMoveObject(MovementDirection direction)
-    {
-        if (_bus == null || _bus.EntityBus == null)
-        {
-            return false;
-        }
-
-        return _bus.MoveTransport(GetDirectionType(direction));
-    }
-
-    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,
-        };
-    }
-}

ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/MovementDirection.cs

@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectAccordionBus.MovementStrategy;
-public enum MovementDirection
-{
-    /// <summary>
-    /// Вверх
-    /// </summary>
-    Up = 1,
-
-    /// <summary>
-    /// Вниз
-    /// </summary>
-    Down = 2,
-
-    /// <summary>
-    /// Влево
-    /// </summary>
-    Left = 3,
-
-    /// <summary>
-    /// Вправо
-    /// </summary>
-    Right = 4
-}

ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/ObjectParameters.cs

@@ -1,67 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectAccordionBus.MovementStrategy;
-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;
-
-    public ObjectParameters(int x, int y, int width, int height)
-    {
-        _x = x;
-        _y = y;
-        _width = width;
-        _height = height;
-    }
-}

ProjectAccordionBus/ProjectAccordionBus/MovementStrategy/StrategyStatus.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectAccordionBus.MovementStrategy;
-public enum StrategyStatus
-{
-    /// <summary>
-    /// Все готово к началу
-    NotInit,
-
-    /// <summary>
-    /// Выполняется
-    /// </summary>
-    InProgress,
-
-    /// <summary>
-    /// Завершено
-    /// </summary>
-    Finish
-}
-