TrolleybusProject/TrolleybusProject.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34024.191
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrolleybusProject", "TrolleybusProject\TrolleybusProject.csproj", "{212BCE90-1598-4573-A91D-8498ED312A2B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrolleybusProject", "TrolleybusProject\TrolleybusProject.csproj", "{212BCE90-1598-4573-A91D-8498ED312A2B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

TrolleybusProject/TrolleybusProject/DirectionType.cs

@@ -4,10 +4,10 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace TrolleybusProject.Drawnings;
+namespace TrolleybusProject;
 
 public enum DirectionType
-{    Unknow=-1,
+{
     /// <summary>
     /// Вверх
     /// </summary>

TrolleybusProject/TrolleybusProject/DrawningTrolleybus.cs

@@ -0,0 +1,345 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TrolleybusProject;
+
+public class DrawningTrolleybus
+{
+    /// <summary>
+    /// Класс-сущность
+    /// </summary>
+    public EntityTrolleybus? EntityTrolleybus { get; private set; }
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    private int? _pictureWidth;
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    private int? _pictureHeight;
+    /// <summary>
+    /// Левая координата прорисовки троллейбуса
+    /// </summary>
+    private int? _startPosX;
+    /// <summary>
+    /// Верхняя кооридната прорисовки троллейбуса
+    /// </summary>
+    private int? _startPosY;
+
+    /// <summary>
+    /// Ширина прорисовки троллейбуса
+    /// </summary>
+    public readonly int _drawningTrolleybusWidth = 150;
+    /// <summary>
+    /// Высота прорисовки троллейбуса
+    /// </summary>
+    public readonly int _drawningTrolleybusHeight = 86;
+    /// <summary>
+    /// Инициализация свойств
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес</param>
+    /// <param name="bodyColor">Основной цвет</param>
+    /// <param name="additionalColor">Дополнительный цвет</param>
+    /// <param name="roga">Признак наличия рогов</param>
+    /// <param name="doors">Признак наличия дверей</param>
+    /// <param name="otsek">Признак наличия отсека</param>
+    public void Init(int speed, double weight, Color bodyColor, Color
+    additionalColor, bool doors, bool roga, bool otsek)
+    {
+        EntityTrolleybus = new EntityTrolleybus();
+        EntityTrolleybus.Init(speed, weight, bodyColor, additionalColor,
+        doors, roga, otsek);
+        _pictureWidth = null;
+        _pictureHeight = null;
+        _startPosX = null;
+        _startPosY = null;
+    }
+    /// <summary>
+    /// Установка границ поля
+    /// </summary>
+    /// <param name="width">Ширина поля</param>
+    /// <param name="height">Высота поля</param>
+    /// <returns>true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
+    public bool SetPictureSize(int width, int height)
+    {
+        if (width> _drawningTrolleybusWidth || height > _drawningTrolleybusHeight)
+        {
+            _pictureWidth = width;
+            _pictureHeight = height;
+
+
+
+            if (_startPosY.HasValue && _startPosX.HasValue)
+            {
+                if (_startPosX + _drawningTrolleybusWidth > width)
+                {
+
+                    _startPosX = width - _drawningTrolleybusWidth;
+
+
+                }
+                if (_startPosY + _drawningTrolleybusHeight > height)
+                {
+
+                    _startPosY = height - _drawningTrolleybusHeight;
+
+
+                }
+                if (_startPosX < 0)
+                {
+                    _startPosX = 0;
+                }
+                if (_startPosY < 0)
+                {
+                    _startPosY = 0;
+                }
+
+
+
+            }
+
+
+
+            return true;
+        }
+
+
+
+       
+
+
+        return false;
+    }
+    /// <summary>
+    /// Установка позиции
+    /// </summary>
+    /// <param name="x">Координата X</param>
+    /// <param name="y">Координата Y</param>
+    public void SetPosition(int x, int y)
+    {
+        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
+        {
+            return;
+        }
+
+
+        _startPosX = x;
+        _startPosY = y;
+
+
+
+        if (_startPosX < 0)
+        { _startPosX = 0; }
+        if (_startPosY < 0)
+        { _startPosY = 0; }
+
+        if (x + _drawningTrolleybusWidth > _pictureWidth)
+        {
+
+            _startPosX = _pictureWidth - _drawningTrolleybusWidth;
+
+
+        }
+        if (y + _drawningTrolleybusHeight > _pictureHeight)
+        {
+
+            _startPosY = _pictureHeight - _drawningTrolleybusHeight;
+
+
+        }
+
+   
+    }
+    /// <summary>
+    /// Изменение направления перемещения
+    /// </summary>
+    /// <param name="direction">Направление</param>
+    /// <returns>true - перемещене выполнено, false - перемещение невозможно</returns>
+    public bool MoveTransport(DirectionType direction)
+    {
+        if (EntityTrolleybus == null || !_startPosX.HasValue ||
+        !_startPosY.HasValue)
+        {
+            return false;
+        }
+        switch (direction)
+        {
+            //влево
+            case DirectionType.Left:
+                if (_startPosX.Value - EntityTrolleybus.Step > 0)
+                {
+                    _startPosX -= (int)EntityTrolleybus.Step;
+                }
+                return true;
+            //вверх
+            case DirectionType.Up:
+                if (_startPosY.Value - EntityTrolleybus.Step > 0)
+                {
+                    _startPosY -= (int)EntityTrolleybus.Step;
+                }
+                return true;
+            // вправо
+            case DirectionType.Right:
+                if (_startPosX.Value + EntityTrolleybus.Step < _pictureWidth - _drawningTrolleybusWidth)
+                {
+                    _startPosX += (int)EntityTrolleybus.Step;
+                }
+                return true;
+
+            //вниз
+            case DirectionType.Down:
+                if (_startPosY.Value + EntityTrolleybus.Step < _pictureHeight - _drawningTrolleybusHeight)
+                {
+                    _startPosY += (int)EntityTrolleybus.Step;
+                }
+                return true;
+            default:
+                return false;
+        }
+    }
+    /// <summary>
+    /// Прорисовка объекта
+    /// </summary>
+    /// <param name="g"></param>
+    public void DrawTransport(Graphics g)
+    {
+        if (EntityTrolleybus == null || !_startPosX.HasValue ||
+        !_startPosY.HasValue)
+        {
+            return;
+        }
+        Pen pen = new(Color.Black);
+        Brush additionalBrush = new
+        SolidBrush(EntityTrolleybus.AdditionalColor);
+        Brush brushBodyColor = new SolidBrush(EntityTrolleybus.BodyColor);
+        Pen addpen = new(EntityTrolleybus.AdditionalColor);
+        //троллейбус границы
+        g.DrawEllipse(pen, _startPosX.Value + 27, _startPosY.Value +
+            64, 20, 20);
+        g.DrawEllipse(pen, _startPosX.Value + 109, _startPosY.Value +
+            64, 20, 20);
+
+
+        g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value +
+          30, 140, 41);
+
+
+        //троллейбус
+        g.FillRectangle(brushBodyColor, _startPosX.Value + 10, _startPosY.Value +
+         30, 140, 41);
+        g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value +
+        30, 140, 41);
+
+
+
+
+        //дверь
+        g.DrawRectangle(pen, _startPosX.Value + 57, _startPosY.Value +
+         40, 24, 31);
+
+
+        //окна
+
+        Brush brBlue = new SolidBrush(Color.LightBlue);
+
+        g.FillEllipse(brBlue, _startPosX.Value + 13, _startPosY.Value +
+          34, 15, 20);
+
+        g.FillEllipse(brBlue, _startPosX.Value + 38, _startPosY.Value +
+          34, 15, 20);
+
+
+        g.FillEllipse(brBlue, _startPosX.Value + 85, _startPosY.Value +
+          34, 15, 20);
+        g.FillEllipse(brBlue, _startPosX.Value + 102, _startPosY.Value +
+          34, 15, 20);
+        g.FillEllipse(brBlue, _startPosX.Value + 118, _startPosY.Value +
+          34, 15, 20);
+        g.FillEllipse(brBlue, _startPosX.Value + 134, _startPosY.Value +
+         34, 15, 20);
+
+
+
+
+
+
+
+
+
+        g.DrawEllipse(pen, _startPosX.Value + 13, _startPosY.Value +
+          34, 15, 20);
+
+        g.DrawEllipse(pen, _startPosX.Value + 38, _startPosY.Value +
+          34, 15, 20);
+
+
+        g.DrawEllipse(pen, _startPosX.Value + 85, _startPosY.Value +
+          34, 15, 20);
+        g.DrawEllipse(pen, _startPosX.Value + 102, _startPosY.Value +
+          34, 15, 20);
+        g.DrawEllipse(pen, _startPosX.Value + 118, _startPosY.Value +
+          34, 15, 20);
+        g.DrawEllipse(pen, _startPosX.Value + 134, _startPosY.Value +
+         34, 15, 20);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        //рога
+
+        if (EntityTrolleybus.Roga)
+        {
+            g.DrawLine(addpen, _startPosX.Value + 42, _startPosY.Value + 7,
+           _startPosX.Value + 124, _startPosY.Value + 29);
+            g.DrawLine(addpen, _startPosX.Value + 62, _startPosY.Value + 2,
+          _startPosX.Value + 124, _startPosY.Value + 29);
+
+
+        }
+        //отсек для батареек
+
+        if (EntityTrolleybus.Otsek)
+        {
+            g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value +
+         48, 5, 20);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 5, _startPosY.Value +
+        48, 5, 20);
+
+            g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value +
+        48, 5, 20);
+        }
+
+        //двойная дверь
+
+        if (EntityTrolleybus.Doors)
+        {
+            g.DrawLine(addpen, _startPosX.Value + 66, _startPosY.Value + 40,
+           _startPosX.Value + 66, _startPosY.Value + 70);
+
+
+
+        }
+
+    }
+}
+
+
+
+

TrolleybusProject/TrolleybusProject/Drawnings/DrawningBus.cs

@@ -1,353 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TrolleybusProject.Entities;
-
-namespace TrolleybusProject.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>
-    public readonly int _drawningBusWidth = 150;
-    /// <summary>
-    /// Высота прорисовки троллейбуса
-    /// </summary>
-    public readonly int _drawningBusHeight = 86;
-
-
-    /// <summary>
-    /// Координата X объекта
-    /// </summary>
-    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 DrawningBus()
-    {
-        _pictureWidth = null;
-        _pictureHeight = null;
-        _startPosX = null;
-        _startPosY = null;
-    }
-
-
-
-
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    /// <param name="speed">Скорость</param>
-    /// <param name="weight">Вес</param>
-    /// <param name="bodyColor">Основной цвет</param>
- 
-    public DrawningBus(int speed, double weight, Color bodyColor):this()
-    {
-        EntityBus = new EntityBus(speed, weight, bodyColor);
-
-    }
-
-
-    /// <summary>
-    /// Конструктор для наследников 
-    /// </summary>
-    /// <param name="drawningBusWidth">Ширина прорисовки автобуса</param>
-    /// <param name="drawningBusHeight">Высота прорисовки автобуса</param>
-
-
-    protected DrawningBus(int drawningBusWidth, int drawningBusHeight) : this()
-    {
-        _drawningBusWidth= drawningBusWidth;
-        _drawningBusHeight = drawningBusHeight;
-
-    }
-
-
-
-
-
-
-    /// <summary>
-    /// Установка границ поля
-    /// </summary>
-    /// <param name="width">Ширина поля</param>
-    /// <param name="height">Высота поля</param>
-    /// <returns>true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
-    public bool SetPictureSize(int width, int height)
-    {
-        if (width > _drawningBusWidth || height > _drawningBusHeight)
-        {
-            _pictureWidth = width;
-            _pictureHeight = height;
-
-
-
-            if (_startPosY.HasValue && _startPosX.HasValue)
-            {
-                if (_startPosX + _drawningBusWidth > width)
-                {
-
-                    _startPosX = width - _drawningBusWidth;
-
-
-                }
-                if (_startPosY + _drawningBusHeight > height)
-                {
-
-                    _startPosY = height - _drawningBusHeight;
-
-
-                }
-                if (_startPosX < 0)
-                {
-                    _startPosX = 0;
-                }
-                if (_startPosY < 0)
-                {
-                    _startPosY = 0;
-                }
-
-
-
-            }
-
-
-
-            return true;
-        }
-
-
-
-
-
-
-        return false;
-    }
-    /// <summary>
-    /// Установка позиции
-    /// </summary>
-    /// <param name="x">Координата X</param>
-    /// <param name="y">Координата Y</param>
-    public void SetPosition(int x, int y)
-    {
-        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
-        {
-            return;
-        }
-
-
-        _startPosX = x;
-        _startPosY = y;
-
-
-
-        if (_startPosX < 0)
-        { _startPosX = 0; }
-        if (_startPosY < 0)
-        { _startPosY = 0; }
-
-        if (x + _drawningBusWidth > _pictureWidth)
-        {
-
-            _startPosX = _pictureWidth - _drawningBusWidth;
-
-
-        }
-        if (y + _drawningBusHeight > _pictureHeight)
-        {
-
-            _startPosY = _pictureHeight - _drawningBusHeight;
-
-
-        }
-
-
-    }
-    /// <summary>
-    /// Изменение направления перемещения
-    /// </summary>
-    /// <param name="direction">Направление</param>
-    /// <returns>true - перемещене выполнено, false - перемещение невозможно</returns>
-    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 + EntityBus.Step < _pictureWidth - _drawningBusWidth)
-                {
-                    _startPosX += (int)EntityBus.Step;
-                }
-                return true;
-
-            //вниз
-            case DirectionType.Down:
-                if (_startPosY.Value + EntityBus.Step < _pictureHeight - _drawningBusHeight)
-                {
-                    _startPosY += (int)EntityBus.Step;
-                }
-                return true;
-            default:
-                return false;
-        }
-    }
-    /// <summary>
-    /// Прорисовка объекта
-    /// </summary>
-    /// <param name="g"></param>
-    public virtual void DrawTransport(Graphics g)
-    {
-        if (EntityBus == null || !_startPosX.HasValue ||
-        !_startPosY.HasValue)
-        {
-            return;
-        }
-        Pen pen = new(Color.Black);
-
-
-        Brush brushBodyColor = new SolidBrush(EntityBus.BodyColor);
-
-        //троллейбус границы
-        g.DrawEllipse(pen, _startPosX.Value + 22, _startPosY.Value +
-            42, 20, 20);
-        g.DrawEllipse(pen, _startPosX.Value + 104, _startPosY.Value +
-           42, 20, 20);
-
-
-        g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value +
-          8, 140, 41);
-
-
-        //троллейбус
-        g.FillRectangle(brushBodyColor, _startPosX.Value + 5, _startPosY.Value +
-        8, 140, 41);
-        g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value +
-        8, 140, 41);
-
-
-
-
-        //дверь
-        g.DrawRectangle(pen, _startPosX.Value + 52, _startPosY.Value +
-          18, 24, 31);
-
-
-        //окна
-
-        Brush brBlue = new SolidBrush(Color.LightBlue);
-
-        g.FillEllipse(brBlue, _startPosX.Value + 8, _startPosY.Value +
-         12, 15, 20);
-
-        g.FillEllipse(brBlue, _startPosX.Value + 33, _startPosY.Value +
-          12, 15, 20);
-
-
-        g.FillEllipse(brBlue, _startPosX.Value + 80, _startPosY.Value +
-         12, 15, 20);
-        g.FillEllipse(brBlue, _startPosX.Value + 97, _startPosY.Value +
-          12, 15, 20);
-        g.FillEllipse(brBlue, _startPosX.Value + 113, _startPosY.Value +
-          12, 15, 20);
-        g.FillEllipse(brBlue, _startPosX.Value + 129, _startPosY.Value +
-         12, 15, 20);
-
-
-
-
-
-
-
-
-
-        g.DrawEllipse(pen, _startPosX.Value + 8, _startPosY.Value +
-          12, 15, 20);
-
-        g.DrawEllipse(pen, _startPosX.Value + 33, _startPosY.Value +
-          12, 15, 20);
-
-
-        g.DrawEllipse(pen, _startPosX.Value + 80, _startPosY.Value +
-        12, 15, 20);
-        g.DrawEllipse(pen, _startPosX.Value + 97, _startPosY.Value +
-         12, 15, 20);
-        g.DrawEllipse(pen, _startPosX.Value + 113, _startPosY.Value +
-          12, 15, 20);
-        g.DrawEllipse(pen, _startPosX.Value + 129, _startPosY.Value +
-         12, 15, 20);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    }
-}

TrolleybusProject/TrolleybusProject/Drawnings/DrawningTrolleybus.cs

@@ -1,115 +0,0 @@
-using TrolleybusProject.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 TrolleybusProject.Drawnings;
-
-public class DrawningTrolleybus:DrawningBus
-{
-    /// <summary>
-    /// Клнструктор
-    /// </summary>
-    /// <param name="speed">Скорость</param>
-    /// <param name="weight">Вес</param>
-    /// <param name="bodyColor">Основной цвет</param>
-    /// <param name="additionalColor">Дополнительный цвет</param>
-    /// <param name="roga">Признак наличия рогов</param>
-    /// <param name="doors">Признак наличия дверей</param>
-    /// <param name="otsek">Признак наличия отсека</param>
-    public DrawningTrolleybus(int speed, double weight, Color bodyColor, Color
-    additionalColor, bool doors, bool roga, bool otsek):base(150,86)
-    {
-        EntityBus = new EntityTrolleybus(speed, weight, bodyColor, additionalColor,
-        doors, roga, otsek);
-
-
-    }
-
-    public override void DrawTransport(Graphics g)
-    {
-        if (EntityBus == null || EntityBus is not  EntityTrolleybus trolleybus|| !_startPosX.HasValue ||
-        !_startPosY.HasValue)
-        {
-            return;
-        }
-
-
-
-        Pen pen = new(Color.Black);
-        Brush additionalBrush = new SolidBrush(trolleybus.AdditionalColor);
-        Pen addpen = new(trolleybus.AdditionalColor);
-
-
-
-        _startPosX += 5;
-        _startPosY += 22;
-
-        base.DrawTransport(g);
-        _startPosX -= 5;
-        _startPosY -= 22;
-
-
-
-        if (trolleybus.Otsek)
-        {
-            
-            g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value +
-             48, 5, 20);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 5, _startPosY.Value +
-            48, 5, 20);
-
-            g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value +
-            48, 5, 20);
-            }
-
-        //двойная дверь
-
-
-
-        
-
-
-        if (trolleybus.Doors)
-        {
-            g.DrawLine(addpen, _startPosX.Value + 66, _startPosY.Value + 40,
-           _startPosX.Value + 66, _startPosY.Value + 70);
-
-
-
-        }
-
-
-
-
-        //рога
-
-        if (trolleybus.Roga)
-        {
-            g.DrawLine(addpen, _startPosX.Value + 42, _startPosY.Value + 7,
-           _startPosX.Value + 124, _startPosY.Value + 29);
-            g.DrawLine(addpen, _startPosX.Value + 62, _startPosY.Value + 2,
-          _startPosX.Value + 124, _startPosY.Value + 29);
-
-
-        }
-       
-
-    }
-
-
-
-
-
-}
-    
-    
-
-
-
-
-

TrolleybusProject/TrolleybusProject/Entities/EntityBus.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Net.Sockets;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
-
-
-
-
-
-
-
-
-namespace TrolleybusProject.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 => Speed * 100 / Weight;
-    
-
-
-    ///Конструктор сущности 
-    /// <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;
-      
-    }
-}

TrolleybusProject/TrolleybusProject/EntityTrolleybus.cs

@@ -4,13 +4,26 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
+namespace TrolleybusProject;
 
-namespace TrolleybusProject.Entities;
-
-public class EntityTrolleybus: EntityBus
-
+public class EntityTrolleybus
 {
 
+    /// <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 Color AdditionalColor { get; private set; }
     /// <summary>
     /// Признак (опция) наличие рогов
@@ -25,15 +38,10 @@ public class EntityTrolleybus: EntityBus
     /// Признак (опция) наличия двойной двери
     /// </summary>
     public bool Doors { get; private set; }
-
     /// <summary>
     /// Шаг перемещения троллейбуса
     /// </summary>
- 
-
-
-
-
+    public double Step => Speed * 100 / Weight;
     /// <summary>
     /// Инициализация полей объекта-класса троллейбуса
     /// </summary>
@@ -44,9 +52,12 @@ public class EntityTrolleybus: EntityBus
     /// <param name="roga">Признак наличия рогов</param>
     /// <param name="otsek">Признак наличия отсека</param>
     /// <param name="doors">Признак наличия двойной двери</param>
-    public EntityTrolleybus(int speed, double weight, Color bodyColor, Color
-    additionalColor, bool roga, bool otsek, bool doors):base(speed,weight,bodyColor)
+    public void Init(int speed, double weight, Color bodyColor, Color
+    additionalColor, bool roga, bool otsek, bool doors)
     {
+        Speed = speed;
+        Weight = weight;
+        BodyColor = bodyColor;
         AdditionalColor = additionalColor;
         Roga = roga;
         Otsek = otsek;

TrolleybusProject/TrolleybusProject/FormTrolleybus.Designer.cs

@@ -34,9 +34,6 @@
             buttonRight = new Button();
             buttonUp = new Button();
             buttonDown = new Button();
-            buttonCreateBus = new Button();
-            comboBoxStrategy = new ComboBox();
-            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxTrolleybus).BeginInit();
             SuspendLayout();
             // 
@@ -54,9 +51,9 @@
             buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
             buttonCreate.Location = new Point(21, 515);
             buttonCreate.Name = "buttonCreate";
-            buttonCreate.Size = new Size(188, 34);
+            buttonCreate.Size = new Size(112, 34);
             buttonCreate.TabIndex = 1;
-            buttonCreate.Text = "Создать Троллейбус";
+            buttonCreate.Text = "Создать";
             buttonCreate.UseVisualStyleBackColor = true;
             buttonCreate.Click += buttonCreate_Click;
             // 
@@ -108,45 +105,11 @@
             buttonDown.UseVisualStyleBackColor = true;
             buttonDown.Click += buttonMove_Click;
             // 
-            // buttonCreateBus
-            // 
-            buttonCreateBus.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateBus.Location = new Point(249, 515);
-            buttonCreateBus.Name = "buttonCreateBus";
-            buttonCreateBus.Size = new Size(188, 34);
-            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(1079, 29);
-            comboBoxStrategy.Name = "comboBoxStrategy";
-            comboBoxStrategy.Size = new Size(182, 33);
-            comboBoxStrategy.TabIndex = 7;
-            // 
-            // buttonStrategyStep
-            // 
-            buttonStrategyStep.Location = new Point(1149, 68);
-            buttonStrategyStep.Name = "buttonStrategyStep";
-            buttonStrategyStep.Size = new Size(112, 34);
-            buttonStrategyStep.TabIndex = 8;
-            buttonStrategyStep.Text = "Шаг";
-            buttonStrategyStep.UseVisualStyleBackColor = true;
-            buttonStrategyStep.Click += buttonStrategyStep_Click;
-            // 
             // FormTrolleybus
             // 
             AutoScaleDimensions = new SizeF(10F, 25F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(1273, 561);
-            Controls.Add(buttonStrategyStep);
-            Controls.Add(comboBoxStrategy);
-            Controls.Add(buttonCreateBus);
             Controls.Add(buttonDown);
             Controls.Add(buttonUp);
             Controls.Add(buttonRight);
@@ -167,8 +130,5 @@
         private Button buttonRight;
         private Button buttonUp;
         private Button buttonDown;
-        private Button buttonCreateBus;
-        private ComboBox comboBoxStrategy;
-        private Button buttonStrategyStep;
     }
 }

TrolleybusProject/TrolleybusProject/FormTrolleybus.cs

@@ -7,100 +7,40 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using TrolleybusProject.Drawnings;
-using TrolleybusProject.MovementStrategy;
 
 namespace TrolleybusProject
 {
     public partial class FormTrolleybus : Form
     {
-        private DrawningBus? _drawningBus;
-
-        private AbstractractStrategy? _strategy;
+        private DrawningTrolleybus? _drawningTrolleybus;
         public FormTrolleybus()
         {
             InitializeComponent();
-            _strategy = null;
         }
 
-
-
-
-        /// <summary>
-        /// Метод прорисовки машины
-        /// </summary>
-        private void Draw()
-        {
-            if (_drawningBus == null)
-            {
-                return;
-            }
-            Bitmap bmp = new(pictureBoxTrolleybus.Width,
-            pictureBoxTrolleybus.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _drawningBus.DrawTransport(gr);
-            pictureBoxTrolleybus.Image = bmp;
-        }
-
-
-
-        /// <summary>
-        /// Создание объекта класса-перемещения
-        /// </summary>
-        /// <param name="type">Тип создаваемого объекта</param>
-        private void CreateObject(string type)
-        {
-            Random random = new();
-            switch (type)
-            {
-                case nameof(DrawningBus):
-                    _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(DrawningTrolleybus):
-                    _drawningBus = new DrawningTrolleybus(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(pictureBoxTrolleybus.Width,
-            pictureBoxTrolleybus.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(DrawningTrolleybus));
+            Random random = new();
+            _drawningTrolleybus = new DrawningTrolleybus();
+            _drawningTrolleybus.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)));
+
+            _drawningTrolleybus.SetPictureSize(pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height);
+
+            _drawningTrolleybus.SetPosition(random.Next(10, 100), random.Next(10, 100));
+
+            Bitmap bmp = new(pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _drawningTrolleybus.DrawTransport(gr);
+            pictureBoxTrolleybus.Image = bmp;
+
         }
 
-
-
-
-
-
         private void buttonMove_Click(object sender, EventArgs e)
         {
-            if (_drawningBus == null)
+            if (_drawningTrolleybus == null)
             {
                 return;
             }
@@ -109,22 +49,25 @@ namespace TrolleybusProject
             switch (name)
             {
                 case "buttonUp":
-                    result = _drawningBus.MoveTransport(DirectionType.Up);
+                    result = _drawningTrolleybus.MoveTransport(DirectionType.Up);
                     break;
                 case "buttonDown":
-                    result = _drawningBus.MoveTransport(DirectionType.Down);
+                    result = _drawningTrolleybus.MoveTransport(DirectionType.Down);
                     break;
                 case "buttonLeft":
-                    result = _drawningBus.MoveTransport(DirectionType.Left);
+                    result = _drawningTrolleybus.MoveTransport(DirectionType.Left);
                     break;
                 case "buttonRight":
-                    result = _drawningBus.MoveTransport(DirectionType.Right);
+                    result = _drawningTrolleybus.MoveTransport(DirectionType.Right);
                     break;
 
             }
             if (result)
             {
-                Draw();
+                Bitmap bmp = new(pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height);
+                Graphics gr = Graphics.FromImage(bmp);
+                _drawningTrolleybus.DrawTransport(gr);
+                pictureBoxTrolleybus.Image = bmp;
 
 
             }
@@ -135,51 +78,5 @@ namespace TrolleybusProject
 
 
 
-
-        private void buttonCreateBus_Click(object sender, EventArgs e)
-        {
-            CreateObject(nameof(DrawningBus));
-
-        }
-
-
-
-
-
-        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),
-                pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height);
-            }
-            if (_strategy == null)
-            {
-                return;
-            }
-            comboBoxStrategy.Enabled = false;
-            _strategy.MakeStep();
-            Draw();
-            if (_strategy.GetStatus() == StrategyStatus.Finish)
-            {
-                comboBoxStrategy.Enabled = true;
-                _strategy = null;
-            }
-        }
-
     }
-}
+}

TrolleybusProject/TrolleybusProject/MovementStrategy/AbstractractStrategy.cs

@@ -1,127 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TrolleybusProject.MovementStrategy;
-
-public abstract class AbstractractStrategy
-{
-    /// <summary>
-    /// Перемещаемый объект
-    /// </summary>
-    private IMoveableObjectcs? _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(IMoveableObjectcs 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;
-    }
-
-
-
-}

TrolleybusProject/TrolleybusProject/MovementStrategy/IMoveableObjectcs.cs

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

TrolleybusProject/TrolleybusProject/MovementStrategy/MoveToBorder.cs

@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TrolleybusProject.MovementStrategy;
-
-public class MoveToBorder: AbstractractStrategy
-{
-    protected override bool IsTargetDestinaion()
-    {
-        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();
-            }
-        }
-    }
-}

TrolleybusProject/TrolleybusProject/MovementStrategy/MoveToCenter.cs

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

TrolleybusProject/TrolleybusProject/MovementStrategy/MoveableBus.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TrolleybusProject.Drawnings;
-
-namespace TrolleybusProject.MovementStrategy;
-
-public class MoveableBus : IMoveableObjectcs
-{
-    /// <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.GetHeight);
-        }
-    }
-    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));
-    }
-    /// <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,
-        };
-    }
-}
-
-
-
-
-
-
-
-
-
-

TrolleybusProject/TrolleybusProject/MovementStrategy/MovementDirection.cs

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

TrolleybusProject/TrolleybusProject/MovementStrategy/ObjectParameters.cs

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

TrolleybusProject/TrolleybusProject/MovementStrategy/StrategyStatus.cs

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