Финальный сброс к созданию проекта

Сброс к созданию проекта
Работа с формой
2023-10-12 21:39:45 +04:00 · 2023-10-12 21:35:52 +04:00 · 2023-10-12 20:56:21 +04:00 · 2023-10-12 20:17:45 +04:00 · 2023-10-12 19:35:03 +04:00
25 changed files with 7 additions and 1713 deletions
--- a/RPP_FirstLaba_Tractor/RPP_Firsov_Kirill_Tractor_basis.sln
+++ b/RPP_FirstLaba_Tractor/RPP_Firsov_Kirill_Tractor_basis.sln
@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32602.215
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectTractor", "RPP_FirstLaba_Tractor\ProjectTractor.csproj", "{EF413F48-FFBF-4510-BA11-FAEBE7C0142A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RPP_FirstLaba_Tractor", "RPP_FirstLaba_Tractor\RPP_FirstLaba_Tractor.csproj", "{EF413F48-FFBF-4510-BA11-FAEBE7C0142A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/AbstractStrategy.cs
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/AbstractStrategy.cs
@ -1,135 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ProjectTractor.DrawningObjects;
-
-namespace ProjectTractor.MovementStrategy
-{
-    /// <summary>
-    /// Класс-стратегия перемещения объекта
-    /// </summary>
-    public abstract class AbstractStrategy
-    {
-        /// <summary>
-        /// Перемещаемый объект
-        /// </summary>
-        private IMoveableObject? _moveableObject;
-        /// <summary>
-        /// Статус перемещения
-        /// </summary>
-        private Status _state = Status.NotInit;
-        /// <summary>
-        /// Ширина поля
-        /// </summary>
-        protected int FieldWidth { get; private set; }
-        /// <summary>
-        /// Высота поля
-        /// </summary>
-        protected int FieldHeight { get; private set; }
-        /// <summary>
-        /// Статус перемещения
-        /// </summary>
-        public Status GetStatus() { return _state; }
-        /// <summary>
-        /// Установка данных
-        /// </summary>
-        /// <param name="moveableObject">Перемещаемый объект</param>
-        /// <param name="width">Ширина поля</param>
-        /// <param name="height">Высота поля</param>
-        public void SetData(IMoveableObject moveableObject, int width, int
-        height)
-        {
-            if (moveableObject == null)
-            {
-                _state = Status.NotInit;
-                return;
-            }
-            _state = Status.InProgress;
-            _moveableObject = moveableObject;
-            FieldWidth = width;
-            FieldHeight = height;
-        }
-        /// <summary>
-        /// Шаг перемещения
-        /// </summary>
-        public void MakeStep()
-        {
-            if (_state != Status.InProgress)
-            {
-                return;
-            }
-            if (IsTargetDestinaion())
-            {
-                _state = Status.Finish;
-                return;
-            }
-            MoveToTarget();
-        }
-        /// <summary>
-        /// Перемещение влево
-        /// </summary>
-        /// <returns>Результат перемещения (true - удалось переместиться, false -неудача)</returns>
-         protected bool MoveLeft() => MoveTo(DirectionType.Left);
-        /// <summary>
-        /// Перемещение вправо
-        /// </summary>
-        /// <returns>Результат перемещения (true - удалось переместиться,false - неудача)</returns>
-        protected bool MoveRight() => MoveTo(DirectionType.Right);
-        /// <summary>
-        /// Перемещение вверх
-        /// </summary>
-        /// <returns>Результат перемещения (true - удалось переместиться,false - неудача)</returns>
-        protected bool MoveUp() => MoveTo(DirectionType.Up);
-        /// <summary>
-        /// Перемещение вниз
-        /// </summary>
-        /// <returns>Результат перемещения (true - удалось переместиться,false - неудача)</returns>
-        protected bool MoveDown() => MoveTo(DirectionType.Down);
-        /// <summary>
-        /// Параметры объекта
-        /// </summary>
-        protected ObjectParameters? GetObjectParameters =>
-       _moveableObject?.GetObjectPosition;
-        /// <summary>
-        /// Шаг объекта
-        /// </summary>
-        /// <returns></returns>
-        protected int? GetStep()
-        {
-            if (_state != Status.InProgress)
-            {
-                return null;
-            }
-            return _moveableObject?.GetStep;
-        }
-        /// <summary>
-        /// Перемещение к цели
-        /// </summary>
-        protected abstract void MoveToTarget();
-        /// <summary>
-        /// Достигнута ли цель
-        /// </summary>
-        /// <returns></returns>
-        protected abstract bool IsTargetDestinaion();
-        /// <summary>
-        /// Попытка перемещения в требуемом направлении
-        /// </summary>
-        /// <param name="directionType">Направление</param>
-        /// <returns>Результат попытки (true - удалось переместиться, false -неудача)</returns>
-        private bool MoveTo(DirectionType directionType)
-        {
-            if (_state != Status.InProgress)
-            {
-                return false;
-            }
-            if (_moveableObject?.CheckCanMove(directionType) ?? false)
-            {
-                _moveableObject.MoveObject(directionType);
-                return true;
-            }
-            return false;
-        }
-    }
-}
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DirectionType.cs
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DirectionType.cs
@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectTractor
-{
-	public enum DirectionType
-	{
-		/// <summary>
-		/// /// Вверх
-		/// /// </summary>
-		Up = 1,
-		/// <summary>
-		/// Вниз
-		/// </summary>
-		Down = 2,
-		/// <summary>
-		/// Влево
-		/// </summary>
-		Left = 3,
-		/// <summary>
-		/// Вправо
-		/// </summary>
-		Right = 4
-
-	}
-}
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningBulldoser.cs
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningBulldoser.cs
@ -1,99 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ProjectTractor.Entities;
-
-namespace ProjectTractor.DrawningObjects
-{
-    /// <summary>
-    /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
-    /// </summary>
-    public class DrawningBulldoser : DrawningTractor
-    {
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес</param>
-        /// <param name="bodyColor">Основной цвет</param>
-        /// <param name="additionalColor">Дополнительный цвет</param>
-        /// <param name="wheelsOrnament">Признак наличия орнамента на колесах</param>
-        /// <param name="blade">Признак наличия отвала</param>
-        /// <param name="width">Ширина картинки</param>
-        /// <param name="height">Высота картинки</param>
-        public DrawningBulldoser(int speed, double weight, Color bodyColor, Color
-       additionalColor, bool wheelsOrnament, bool blade, int width, int height) :
-        base(speed, weight, bodyColor, width, height, 110, 60)
-        {
-            if (EntityTractor != null)
-            {
-                EntityTractor = new EntityBulldoser(speed, weight, bodyColor,
-                additionalColor, wheelsOrnament, blade);
-            }
-        }
-        public override void DrawTransport(Graphics g)
-        {
-            if (EntityTractor is not EntityBulldoser bulldoser)
-            {
-                return;
-            }
-            Pen pen = new(Color.Black);
-            Brush additionalBrush = new
-            SolidBrush(bulldoser.AdditionalColor);
-            
-            base.DrawTransport(g);
-            // орнамент на колесах
-            if (bulldoser.WheelsOrnament)
-            {
-                g.FillEllipse(additionalBrush, _startPosX + 2, _startPosY + 47, 11, 11);
-                g.FillEllipse(additionalBrush, _startPosX + 67, _startPosY + 47, 11, 11);
-                g.FillEllipse(additionalBrush, _startPosX + 37, _startPosY + 57, 6, 6);
-                g.FillEllipse(additionalBrush, _startPosX + 22, _startPosY + 57, 6, 6);
-                g.FillEllipse(additionalBrush, _startPosX + 52, _startPosY + 57, 6, 6);
-                g.FillEllipse(additionalBrush, _startPosX + 27, _startPosY + 42, 6, 6);
-                g.FillEllipse(additionalBrush, _startPosX + 47, _startPosY + 42, 6, 6);
-                g.DrawLine(pen, _startPosX + 7, _startPosY + 47, _startPosX + 7, _startPosY + 58);
-                g.DrawLine(pen, _startPosX + 2, _startPosY + 53, _startPosX + 13, _startPosY + 53);
-
-                g.DrawLine(pen, _startPosX + 73, _startPosY + 47, _startPosX + 73, _startPosY + 58);
-                g.DrawLine(pen, _startPosX + 67, _startPosY + 53, _startPosX + 78, _startPosY + 53);
-
-                g.DrawLine(pen, _startPosX + 40, _startPosY + 57, _startPosX + 40, _startPosY + 62);
-                g.DrawLine(pen, _startPosX + 37, _startPosY + 60, _startPosX + 43, _startPosY + 60);
-
-                g.DrawLine(pen, _startPosX + 25, _startPosY + 57, _startPosX + 25, _startPosY + 62);
-                g.DrawLine(pen, _startPosX + 22, _startPosY + 60, _startPosX + 28, _startPosY + 60);
-
-                g.DrawLine(pen, _startPosX + 55, _startPosY + 57, _startPosX + 55, _startPosY + 62);
-                g.DrawLine(pen, _startPosX + 52, _startPosY + 60, _startPosX + 58, _startPosY + 60);
-
-                g.DrawLine(pen, _startPosX + 30, _startPosY + 42, _startPosX + 30, _startPosY + 48);
-                g.DrawLine(pen, _startPosX + 27, _startPosY + 45, _startPosX + 33, _startPosY + 45);
-
-                g.DrawLine(pen, _startPosX + 50, _startPosY + 42, _startPosX + 50, _startPosY + 48);
-                g.DrawLine(pen, _startPosX + 47, _startPosY + 45, _startPosX + 53, _startPosY + 45);
-            }
-            // отвал
-            if (bulldoser.Blade)
-            {
-                g.FillRectangle(additionalBrush, _startPosX + 82, _startPosY + 30, 10, 40);
-                g.FillRectangle(additionalBrush, _startPosX + 82, _startPosY + 60, 40, 10);
-
-                for (int i = 0; i < 15; i++)
-                {
-                    g.FillRectangle(additionalBrush, _startPosX + 82, _startPosY + 60 - i * 2, 40 - i * 2, 10);
-                }
-
-                g.FillRectangle(additionalBrush, _startPosX + 50, _startPosY + 25, 10, 10);
-
-                for (int i = 0; i < 16; i++)
-                {
-                    g.FillRectangle(additionalBrush, _startPosX + 50 + i * 2, _startPosY + 25 + i, 10, 10);
-                }
-            }
-        }
-
-    }
-}
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningObjectTractor.cs
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningObjectTractor.cs
@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ProjectTractor.DrawningObjects;
-
-namespace ProjectTractor.MovementStrategy
-{
-    /// <summary>
-    /// Реализация интерфейса IDrawningObject для работы с объектом DrawningTractor(паттерн Adapter)
-    /// </summary>
-    public class DrawningObjectTractor : IMoveableObject
-    {
-        private readonly DrawningTractor? _drawningTractor = null;
-        public DrawningObjectTractor(DrawningTractor drawningTractor)
-        {
-            _drawningTractor = drawningTractor;
-        }
-        public ObjectParameters? GetObjectPosition
-        {
-            get
-            {
-                if (_drawningTractor == null || _drawningTractor.EntityTractor ==
-                null)
-                {
-                    return null;
-                }
-                return new ObjectParameters(_drawningTractor.GetPosX,
-                _drawningTractor.GetPosY, _drawningTractor.GetWidth, _drawningTractor.GetHeight);
-            }
-        }
-        public int GetStep => (int)(_drawningTractor?.EntityTractor?.Step ?? 0);
-        public bool CheckCanMove(DirectionType direction) =>
-        _drawningTractor?.CanMove(direction) ?? false;
-        public void MoveObject(DirectionType direction) =>
-        _drawningTractor?.MoveTransport(direction);
-        
-        public void getData()
-        {
-
-        }
-    }
-
-}
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningTractor.cs
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningTractor.cs
@ -1,236 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ProjectTractor.Entities;
-using ProjectTractor.MovementStrategy;
-
-namespace ProjectTractor.DrawningObjects { 
-
-/// <summary>
-/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
-/// </summary>
-    public class DrawningTractor 
-{
-    /// <summary>
-    /// Класс-сущность
-    /// </summary>
-    public EntityTractor? EntityTractor { 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>
-    protected readonly int _tractorWidth = 75;
-    /// <summary>
-    /// Высота прорисовки автомобиля
-    /// </summary>
-    protected readonly int _tractorHeight = 60;
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    /// <param name="speed">Скорость</param>
-    /// <param name="weight">Вес</param>
-    /// <param name="bodyColor">Основной цвет</param>
-    /// <param name="width">Ширина картинки</param>
-    /// <param name="height">Высота картинки</param>
-    public DrawningTractor(int speed, double weight, Color bodyColor, int
-    width, int height)
-    {        
-        if (width <= _tractorWidth || height <= _tractorHeight)
-             return;
-        _pictureWidth = width;
-        _pictureHeight = height;
-        EntityTractor = new EntityTractor(speed, weight, bodyColor);
-    }
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    /// <param name="speed">Скорость</param>
-    /// <param name="weight">Вес</param>
-    /// <param name="bodyColor">Основной цвет</param>
-    /// <param name="width">Ширина картинки</param>
-    /// <param name="height">Высота картинки</param>
-    /// <param name="tractorWidth">Ширина прорисовки автомобиля</param>
-    /// <param name="tractorHeight">Высота прорисовки автомобиля</param>
-    protected DrawningTractor(int speed, double weight, Color bodyColor, int
-    width, int height, int tractorWidth, int tractorHeight)
-    {
-        if (width <= _tractorWidth || height <= _tractorHeight)
-            return;
-        _pictureWidth = width;
-        _pictureHeight = height;
-        _tractorWidth = tractorWidth;
-        _tractorHeight = tractorHeight;
-        EntityTractor = new EntityTractor(speed, weight, bodyColor);
-    }
-
-        /// <summary>
-        /// Получение объекта IMoveableObject из объекта DrawningTractor
-        /// </summary>
-        public IMoveableObject GetMoveableObject => new
-        DrawningObjectTractor(this);
-
-
-        /// <summary>
-        /// Координата X объекта
-        /// </summary>
-        public int GetPosX => _startPosX;
-        /// <summary>
-        /// Координата Y объекта
-        /// </summary>
-        public int GetPosY => _startPosY;
-        /// <summary>
-        /// Ширина объекта
-        /// </summary>
-        public int GetWidth => _tractorWidth;
-        /// <summary>
-        /// Высота объекта
-        /// </summary>
-        public int GetHeight => _tractorHeight;
-        /// <summary>
-        /// Проверка, что объект может переместится по указанному направлению
-        /// </summary>
-        /// <param name="direction">Направление</param>
-        /// <returns>true - можно переместится по указанномнаправлению</returns>
-        public bool CanMove(DirectionType direction)
-        {
-            if (EntityTractor == null)
-            {
-                return false;
-            }
-            return direction switch
-            {
-                //влево
-                DirectionType.Left => _startPosX - EntityTractor.Step > 0,
-                //вверх
-                DirectionType.Up => _startPosY - EntityTractor.Step > 0,
-                // вправо
-                DirectionType.Right => _startPosX + EntityTractor.Step + _tractorWidth < _pictureWidth,
-                // вниз
-                DirectionType.Down => _startPosY + EntityTractor.Step + _tractorHeight < _pictureHeight,
-                _ => false,
-            };
-        }
-        /// <summary>
-        /// Изменение направления перемещения
-        /// </summary>
-        /// <param name="direction">Направление</param>
-        public void MoveTransport(DirectionType direction)
-        {
-            if (!CanMove(direction) || EntityTractor == null)
-            {
-                return;
-            }
-            switch (direction)
-            {
-                //влево
-                case DirectionType.Left:
-                    _startPosX -= (int)EntityTractor.Step;
-                    break;
-                //вверх
-                case DirectionType.Up:
-                    _startPosY -= (int)EntityTractor.Step;
-                    break;
-                // вправо
-                case DirectionType.Right:
-                    _startPosX += (int)EntityTractor.Step;
-                    break;
-                //вниз
-                case DirectionType.Down:
-                    _startPosY += (int)EntityTractor.Step;
-                    break;
-            }
-        }
-
-
-        /// <summary>
-        /// Установка позиции
-        /// </summary>
-        /// <param name="x">Координата X</param>
-        /// <param name="y">Координата Y</param>
-        public void SetPosition(int x, int y)
-    {
-            if (EntityTractor == null)
-                return;
-            _startPosX = x;
-            _startPosY = y;
-            if (x + _tractorWidth >= _pictureWidth || y + _tractorHeight >= _pictureHeight)
-            {
-                _startPosX = 1;
-                _startPosY = (_tractorHeight + _tractorHeight) / 2;
-            }
-        }
-
-    /// <summary>
-    /// Прорисовка объекта
-    /// </summary>
-    /// <param name="g"></param>
-    public virtual void DrawTransport(Graphics g)
-    {
-            if (EntityTractor == null)
-            {
-                return;
-            }
-            Pen pen = new(Color.Black);
-            Brush brGray = new SolidBrush(Color.Gray);
-            Brush brBlack = new SolidBrush(Color.Black);
-            Brush additionalBrush = new
-            SolidBrush(EntityTractor.BodyColor);
-
-            //Гусеницы         
-            g.FillEllipse(brGray, _startPosX, _startPosY + 41, 25, 25);
-            g.FillEllipse(brGray, _startPosX + 55, _startPosY + 41, 25, 25);
-            g.FillRectangle(brGray, _startPosX + 13, _startPosY + 41, 54, 25);
-            //колеса
-            g.FillEllipse(brBlack, _startPosX, _startPosY + 45, 15, 15);
-            g.FillEllipse(brBlack, _startPosX + 65, _startPosY + 45, 15, 15);
-            g.FillEllipse(brBlack, _startPosX + 35, _startPosY + 55, 10, 10);
-            g.FillEllipse(brBlack, _startPosX + 20, _startPosY + 55, 10, 10);
-            g.FillEllipse(brBlack, _startPosX + 50, _startPosY + 55, 10, 10);
-            g.FillEllipse(brBlack, _startPosX + 25, _startPosY + 40, 10, 10);
-            g.FillEllipse(brBlack, _startPosX + 45, _startPosY + 40, 10, 10);
-            //кузов
-            g.FillRectangle(additionalBrush, _startPosX, _startPosY + 20, 80, 20);
-            g.FillRectangle(additionalBrush, _startPosX + 60, _startPosY, 10, 20);
-            g.FillRectangle(additionalBrush, _startPosX, _startPosY, 40, 20);
-
-            //Окно
-            Brush brBlue = new SolidBrush(Color.Blue);
-            g.FillRectangle(brBlue, _startPosX + 10, _startPosY + 3, 25, 15);
-
-            //Колеса
-            g.FillEllipse(additionalBrush, _startPosX + 2, _startPosY + 47, 11, 11);
-            g.FillEllipse(additionalBrush, _startPosX + 67, _startPosY + 47, 11, 11);
-            g.FillEllipse(additionalBrush, _startPosX + 37, _startPosY + 57, 6, 6);
-            g.FillEllipse(additionalBrush, _startPosX + 22, _startPosY + 57, 6, 6);
-            g.FillEllipse(additionalBrush, _startPosX + 52, _startPosY + 57, 6, 6);
-            g.FillEllipse(additionalBrush, _startPosX + 27, _startPosY + 42, 6, 6);
-            g.FillEllipse(additionalBrush, _startPosX + 47, _startPosY + 42, 6, 6);
-
-            //границы трактора
-            g.DrawRectangle(pen, _startPosX, _startPosY + 20, 80, 20);
-            g.DrawRectangle(pen, _startPosX + 60, _startPosY, 10, 20);
-            g.DrawRectangle(pen, _startPosX, _startPosY, 40, 20);
-        }
-}
-}
-
-
-
-
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityBulldoser.cs
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityBulldoser.cs
@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectTractor.Entities
-{
-    /// <summary>
-    /// Класс-сущность "Спортивный автомобиль"
-    /// </summary>
-    public class EntityBulldoser : EntityTractor
-    {
-        /// <summary>
-        /// Дополнительный цвет (для опциональных элементов)
-        /// </summary>
-        public Color AdditionalColor { get; private set; }
-        /// <summary>
-        /// Признак (опция) наличия обвеса
-        /// </summary>
-        public bool WheelsOrnament { get; private set; }
-        /// <summary>
-        /// Признак (опция) наличия антикрыла
-        /// </summary>
-        public bool Blade { get; private set; }
-
-        /// <summary>
-        /// Инициализация полей объекта-класса спортивного автомобиля
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес автомобиля</param>
-        /// <param name="bodyColor">Основной цвет</param>
-        /// <param name="additionalColor">Дополнительный цвет</param>
-        /// <param name="wheelsOrnament">Признак наличия обвеса</param>
-        /// <param name="blade">Признак наличия отвала</param>
-
-        public EntityBulldoser(int speed, double weight, Color bodyColor, Color
-       additionalColor, bool wheelsOrnament, bool blade) : base(speed, weight, bodyColor)
-        {
-            AdditionalColor = additionalColor;
-            WheelsOrnament = wheelsOrnament;
-            Blade = blade;
-        }
-    }
-
-}
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityTractor.cs
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityTractor.cs
@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectTractor.Entities
-{
-    /// <summary>
-    /// Класс-сущность "Автомобиль"
-    /// </summary>
-    public class EntityTractor
-    {
-        /// <summary>
-        /// Скорость
-        /// </summary>
-        public int Speed { get; private set; }
-        /// <summary>
-        /// Вес
-        /// </summary>
-        public double Weight { get; private set; }
-        /// <summary>
-        /// Основной цвет
-        /// </summary>
-        public Color BodyColor { get; private set; }
-        /// <summary>
-        /// Шаг перемещения автомобиля
-        /// </summary>
-        public double Step => (double)Speed * 100 / Weight;
-        /// <summary>
-        /// Конструктор с параметрами
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес автомобиля</param>
-        /// <param name="bodyColor">Основной цвет</param>
-        public EntityTractor(int speed, double weight, Color bodyColor)
-        {
-            Speed = speed;
-            Weight = weight;
-            BodyColor = bodyColor;
-        }
-
-    }
-}
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractor.cs
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractor.cs
@ -1,377 +1,9 @@
-
-using ProjectTractor.MovementStrategy;
-using ProjectTractor.DrawningObjects;
-
-namespace ProjectTractor
+namespace RPP_FirstLaba_Tractor
 {

-    /// <summary>
-    /// Ôîðìà ðàáîòû ñ îáúåêòîì "Ñïîðòèâíûé àâòîìîáèëü"
-    /// </summary>
    public partial class FormTractor : Form
    {
-        private PictureBox pictureBoxTractor;
-        private Button buttonCreateTractor;
-        private Button buttonTop;
-        private Button buttonLeft;
-        private Button buttonDown;
-        private Button buttonCreateBulldoserTractor;
-        private Button buttonStep;
-        private ComboBox comboBoxStrategy;
-        private Button buttonRight;
+       

-        /// <summary>
-        /// Ïîëå-îáúåêò äëÿ ïðîðèñîâêè îáúåêòà
-        /// </summary>
-        private DrawningTractor? _drawningTractor;
-        private Button ButtonSelectTractor;
-
-        /// <summary>
-        /// Ñòðàòåãèÿ ïåðåìåùåíèÿ
-        /// </summary>
-        private AbstractStrategy? _strategy;
-        /// <summary>
-        /// Âûáðàííûé àâòîìîáèëü
-        /// </summary>
-        public DrawningTractor? SelectedTractor { get; private set; }
-        /// <summary>
-        /// Èíèöèàëèçàöèÿ ôîðìû
-        /// </summary>
-        public FormTractor()
-        {
-            InitializeComponent();
-            _strategy = null;
-            SelectedTractor = null;
-        }
-        /// <summary>
-        /// Ìåòîä ïðîðèñîâêè ìàøèíû
-        /// </summary>
-        private void Draw()
-        {
-            if (_drawningTractor == null)
-            {
-                return;
-            }
-            Bitmap bmp = new(pictureBoxTractor.Width,
-            pictureBoxTractor.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _drawningTractor.DrawTransport(gr);
-            pictureBoxTractor.Image = bmp;
-        }
-        /// <summary>
-        /// Èçìåíåíèå ðàçìåðîâ ôîðìû
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            if (_drawningTractor == null)
-            {
-                return;
-            }
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            switch (name)
-            {
-                case "buttonUp":
-                    _drawningTractor.MoveTransport(DirectionType.Up);
-                    break;
-                case "buttonDown":
-                    _drawningTractor.MoveTransport(DirectionType.Down);
-                    break;
-                case "buttonLeft":
-                    _drawningTractor.MoveTransport(DirectionType.Left);
-                    break;
-                case "buttonRight":
-                    _drawningTractor.MoveTransport(DirectionType.Right);
-                    break;
-            }
-            Draw();
-        }
-        /// <summary>
-        /// Ñîçäàíèå ïðîñòîãî àâòîìîáèëÿ
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            _drawningTractor = new DrawningTractor(random.Next(100, 300),
-            random.Next(1000, 3000), color,
-            pictureBoxTractor.Width, pictureBoxTractor.Height);
-            _drawningTractor.SetPosition(random.Next(10, 100), random.Next(10,
-            100));
-            Draw();
-        }
-        /// <summary>
-        /// Øàã ñòðàòåãèè ïåðåìåùåíèÿ
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonStartegyStep_Click(object sender, EventArgs e)
-        {
-            if (_drawningTractor == null)
-            {
-                return;
-            }
-            if (comboBoxStrategy.Enabled)
-            {
-                _strategy = comboBoxStrategy.SelectedIndex switch
-                {
-                    0 => new MoveToCenter(),
-                    1 => new MoveToBorder(),
-                    _ => null,
-                };
-                if (_strategy == null)
-                {
-                    return;
-                }
-                _strategy.SetData(_drawningTractor.GetMoveableObject,
-                pictureBoxTractor.Width, pictureBoxTractor.Height);
-            }
-            if (_strategy == null)
-            {
-                return;
-            }
-            comboBoxStrategy.Enabled = false;
-            _strategy.MakeStep();
-            Draw();
-            if (_strategy.GetStatus() == Status.Finish)
-            {
-                comboBoxStrategy.Enabled = true;
-                _strategy = null;
-            }
-        }
-        /// <summary>
-        /// Âûáîð àâòîìîáèëÿ
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonSelectTractor_Click(object sender, EventArgs e)
-        {
-            SelectedTractor = _drawningTractor;
-            DialogResult = DialogResult.OK;
-        }
-
-        private void InitializeComponent()
-        {
-            this.pictureBoxTractor = new System.Windows.Forms.PictureBox();
-            this.buttonCreateTractor = new System.Windows.Forms.Button();
-            this.buttonTop = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonCreateBulldoserTractor = new System.Windows.Forms.Button();
-            this.buttonStep = new System.Windows.Forms.Button();
-            this.comboBoxStrategy = new System.Windows.Forms.ComboBox();
-            this.ButtonSelectTractor = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTractor)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // pictureBoxTractor
-            // 
-            this.pictureBoxTractor.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxTractor.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxTractor.Name = "pictureBoxTractor";
-            this.pictureBoxTractor.Size = new System.Drawing.Size(882, 453);
-            this.pictureBoxTractor.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBoxTractor.TabIndex = 0;
-            this.pictureBoxTractor.TabStop = false;
-            // 
-            // buttonCreateTractor
-            // 
-            this.buttonCreateTractor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreateTractor.Location = new System.Drawing.Point(12, 403);
-            this.buttonCreateTractor.Name = "buttonCreateTractor";
-            this.buttonCreateTractor.Size = new System.Drawing.Size(246, 29);
-            this.buttonCreateTractor.TabIndex = 1;
-            this.buttonCreateTractor.Text = "Ñîçäàòü òðàêòîð";
-            this.buttonCreateTractor.UseVisualStyleBackColor = true;
-            this.buttonCreateTractor.Click += new System.EventHandler(this.ButtonCreate_Click);
-            // 
-            // buttonTop
-            // 
-            this.buttonTop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonTop.BackgroundImage = global::ProjectTractor.Properties.Resources.arrowUp;
-            this.buttonTop.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonTop.Location = new System.Drawing.Point(804, 375);
-            this.buttonTop.Name = "buttonTop";
-            this.buttonTop.Size = new System.Drawing.Size(30, 30);
-            this.buttonTop.TabIndex = 2;
-            this.buttonTop.UseVisualStyleBackColor = true;
-            this.buttonTop.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonLeft
-            // 
-            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonLeft.BackgroundImage = global::ProjectTractor.Properties.Resources.arrowLeft;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(768, 411);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
-            this.buttonLeft.TabIndex = 3;
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonDown
-            // 
-            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonDown.BackgroundImage = global::ProjectTractor.Properties.Resources.arrowDown;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(804, 411);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 30);
-            this.buttonDown.TabIndex = 4;
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonRight
-            // 
-            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonRight.BackgroundImage = global::ProjectTractor.Properties.Resources.arrowRight;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(840, 411);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 30);
-            this.buttonRight.TabIndex = 5;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonCreateBulldoserTractor
-            // 
-            this.buttonCreateBulldoserTractor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreateBulldoserTractor.Location = new System.Drawing.Point(264, 403);
-            this.buttonCreateBulldoserTractor.Name = "buttonCreateBulldoserTractor";
-            this.buttonCreateBulldoserTractor.Size = new System.Drawing.Size(199, 29);
-            this.buttonCreateBulldoserTractor.TabIndex = 6;
-            this.buttonCreateBulldoserTractor.Text = "Ñîçäàòü áóëüäîçåð";
-            this.buttonCreateBulldoserTractor.UseVisualStyleBackColor = true;
-            this.buttonCreateBulldoserTractor.Click += new System.EventHandler(this.buttonCreateBulldoserTractor_Click);
-            // 
-            // buttonStep
-            // 
-            this.buttonStep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonStep.Location = new System.Drawing.Point(776, 46);
-            this.buttonStep.Name = "buttonStep";
-            this.buttonStep.Size = new System.Drawing.Size(94, 29);
-            this.buttonStep.TabIndex = 7;
-            this.buttonStep.Text = "Øàã";
-            this.buttonStep.UseVisualStyleBackColor = true;
-            this.buttonStep.Click += new System.EventHandler(this.buttonStep_Click);
-            // 
-            // comboBoxStrategy
-            // 
-            this.comboBoxStrategy.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.comboBoxStrategy.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxStrategy.FormattingEnabled = true;
-            this.comboBoxStrategy.Items.AddRange(new object[] {
-            "Öåíòð ",
-            "Ïðàâûé íèæíèé"});
-            this.comboBoxStrategy.Location = new System.Drawing.Point(719, 12);
-            this.comboBoxStrategy.Name = "comboBoxStrategy";
-            this.comboBoxStrategy.Size = new System.Drawing.Size(151, 28);
-            this.comboBoxStrategy.TabIndex = 8;
-            // 
-            // ButtonSelectTractor
-            // 
-            this.ButtonSelectTractor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.ButtonSelectTractor.Location = new System.Drawing.Point(469, 403);
-            this.ButtonSelectTractor.Name = "ButtonSelectTractor";
-            this.ButtonSelectTractor.Size = new System.Drawing.Size(199, 29);
-            this.ButtonSelectTractor.TabIndex = 9;
-            this.ButtonSelectTractor.Text = "Âûáðàòü òðàêòîð";
-            this.ButtonSelectTractor.UseVisualStyleBackColor = true;
-            this.ButtonSelectTractor.Click += new System.EventHandler(this.ButtonSelectTractor_Click);
-            // 
-            // FormTractor
-            // 
-            this.ClientSize = new System.Drawing.Size(882, 453);
-            this.Controls.Add(this.ButtonSelectTractor);
-            this.Controls.Add(this.comboBoxStrategy);
-            this.Controls.Add(this.buttonStep);
-            this.Controls.Add(this.buttonCreateBulldoserTractor);
-            this.Controls.Add(this.buttonRight);
-            this.Controls.Add(this.buttonDown);
-            this.Controls.Add(this.buttonLeft);
-            this.Controls.Add(this.buttonTop);
-            this.Controls.Add(this.buttonCreateTractor);
-            this.Controls.Add(this.pictureBoxTractor);
-            this.Name = "FormTractor";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTractor)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        private void buttonCreateBulldoserTractor_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            Color color = Color.FromArgb(random.Next(0, 256),
-            random.Next(0, 256), random.Next(0, 256));
-            ColorDialog dialogColor = new();
-            if (dialogColor.ShowDialog() == DialogResult.OK)
-            {
-                color = dialogColor.Color;
-            }
-            Color dopColor = Color.FromArgb(random.Next(0, 256),
-            random.Next(0, 256), random.Next(0, 256));
-            ColorDialog dialogDopColor = new();
-            if (dialogDopColor.ShowDialog() == DialogResult.OK)
-            {
-                dopColor = dialogDopColor.Color;
-            }
-            _drawningTractor = new DrawningBulldoser(random.Next(100, 300),
-            random.Next(1000, 3000),
-            color,
-            dopColor,
-            Convert.ToBoolean(random.Next(0, 2)),
-            Convert.ToBoolean(random.Next(0, 2)),
-            pictureBoxTractor.Width,
-            pictureBoxTractor.Height);
-            _drawningTractor.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            Draw();
-        }
-
-        private void buttonStep_Click(object sender, EventArgs e)
-        {
-            if (_drawningTractor == null)
-            {
-                return;
-            }
-            if (comboBoxStrategy.Enabled)
-            {
-                _strategy = comboBoxStrategy.SelectedIndex
-                switch
-                {
-                    0 => new MoveToCenter(),
-                    1 => new MoveToBorder(),
-                    _ => null,
-                };
-                if (_strategy == null)
-                {
-                    return;
-                }
-                _strategy.SetData(new
-                DrawningObjectTractor(_drawningTractor), pictureBoxTractor.Width,
-                pictureBoxTractor.Height);
-                comboBoxStrategy.Enabled = false;
-            }
-            if (_strategy == null)
-            {
-                return;
-            }
-            _strategy.MakeStep();
-            Draw();
-            if (_strategy.GetStatus() == Status.Finish)
-            {
-                comboBoxStrategy.Enabled = true;
-                _strategy = null;
-            }
-        }
    }
 }
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractorCollection.cs
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractorCollection.cs
@ -1,181 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using ProjectTractor.DrawningObjects;
-using ProjectTractor.Generics;
-using ProjectTractor.MovementStrategy;
-
-namespace ProjectTractor
-{
-    public partial class FormTractorCollection : Form
-    { 
-
-        /// <summary>
-        /// Набор объектов
-        /// </summary>
-        private readonly TractorsGenericCollection<DrawningTractor,
-        DrawningObjectTractor> _tractors;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        public FormTractorCollection()
-        {
-            InitializeComponent();
-            _tractors = new TractorsGenericCollection<DrawningTractor,
-            DrawningObjectTractor>(pictureBoxCollection.Width, pictureBoxCollection.Height);
-        }
-
-        private void ButtonAddTractor_Click(object sender, EventArgs e)
-        {
-            FormTractor form = new();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                if (_tractors + form.SelectedTractor)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBoxCollection.Image = _tractors.ShowTractors();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            }
-        }
-
-        /// <summary>
-        /// Удаление объекта из набора
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonRemoveTractor_Click(object sender, EventArgs e)
-        {
-            if (MessageBox.Show("Удалить объект?", "Удаление",
-            MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            int pos = Convert.ToInt32(maskedTextBoxNumber.Text);
-            if (_tractors - pos)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBoxCollection.Image = _tractors.ShowTractors();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-        }
-        /// <summary>
-        /// Обновление рисунка по набору
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonRefreshCollection_Click(object sender, EventArgs
-        e)
-        {
-            pictureBoxCollection.Image = _tractors.ShowTractors();
-        }
-
-        private void InitializeComponent()
-        {
-            this.pictureBoxCollection = new System.Windows.Forms.PictureBox();
-            this.groupBox = new System.Windows.Forms.GroupBox();
-            this.ButtonRefreshCollection = new System.Windows.Forms.Button();
-            this.ButtonRemoveTractor = new System.Windows.Forms.Button();
-            this.ButtonAddTractor = new System.Windows.Forms.Button();
-            this.maskedTextBoxNumber = new System.Windows.Forms.MaskedTextBox();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).BeginInit();
-            this.groupBox.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // pictureBoxCollection
-            // 
-            this.pictureBoxCollection.Dock = System.Windows.Forms.DockStyle.Left;
-            this.pictureBoxCollection.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxCollection.Name = "pictureBoxCollection";
-            this.pictureBoxCollection.Size = new System.Drawing.Size(620, 437);
-            this.pictureBoxCollection.TabIndex = 1;
-            this.pictureBoxCollection.TabStop = false;
-            // 
-            // groupBox
-            // 
-            this.groupBox.Controls.Add(this.ButtonRefreshCollection);
-            this.groupBox.Controls.Add(this.ButtonRemoveTractor);
-            this.groupBox.Controls.Add(this.ButtonAddTractor);
-            this.groupBox.Controls.Add(this.maskedTextBoxNumber);
-            this.groupBox.Location = new System.Drawing.Point(626, 12);
-            this.groupBox.Name = "groupBox";
-            this.groupBox.Size = new System.Drawing.Size(255, 413);
-            this.groupBox.TabIndex = 2;
-            this.groupBox.TabStop = false;
-            this.groupBox.Text = "Инструменты";
-            // 
-            // ButtonRefreshCollection
-            // 
-            this.ButtonRefreshCollection.Location = new System.Drawing.Point(20, 331);
-            this.ButtonRefreshCollection.Name = "ButtonRefreshCollection";
-            this.ButtonRefreshCollection.Size = new System.Drawing.Size(211, 35);
-            this.ButtonRefreshCollection.TabIndex = 8;
-            this.ButtonRefreshCollection.Text = "Обновить коллекцию";
-            this.ButtonRefreshCollection.UseVisualStyleBackColor = true;
-            this.ButtonRefreshCollection.Click += new System.EventHandler(this.ButtonRefreshCollection_Click);
-            // 
-            // ButtonRemoveTractor
-            // 
-            this.ButtonRemoveTractor.Location = new System.Drawing.Point(28, 156);
-            this.ButtonRemoveTractor.Name = "ButtonRemoveTractor";
-            this.ButtonRemoveTractor.Size = new System.Drawing.Size(203, 33);
-            this.ButtonRemoveTractor.TabIndex = 7;
-            this.ButtonRemoveTractor.Text = "Удалить трактор";
-            this.ButtonRemoveTractor.UseVisualStyleBackColor = true;
-            this.ButtonRemoveTractor.Click += new System.EventHandler(this.ButtonRemoveTractor_Click);
-            // 
-            // ButtonAddTractor
-            // 
-            this.ButtonAddTractor.Location = new System.Drawing.Point(28, 46);
-            this.ButtonAddTractor.Name = "ButtonAddTractor";
-            this.ButtonAddTractor.Size = new System.Drawing.Size(203, 34);
-            this.ButtonAddTractor.TabIndex = 6;
-            this.ButtonAddTractor.Text = "Добавить трактор";
-            this.ButtonAddTractor.UseVisualStyleBackColor = true;
-            this.ButtonAddTractor.Click += new System.EventHandler(this.ButtonAddTractor_Click);
-            // 
-            // maskedTextBoxNumber
-            // 
-            this.maskedTextBoxNumber.Location = new System.Drawing.Point(28, 113);
-            this.maskedTextBoxNumber.Name = "maskedTextBoxNumber";
-            this.maskedTextBoxNumber.Size = new System.Drawing.Size(203, 27);
-            this.maskedTextBoxNumber.TabIndex = 5;
-            // 
-            // FormTractorCollection
-            // 
-            this.ClientSize = new System.Drawing.Size(893, 437);
-            this.Controls.Add(this.groupBox);
-            this.Controls.Add(this.pictureBoxCollection);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            this.MinimizeBox = false;
-            this.Name = "FormTractorCollection";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "Набор тракторов";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).EndInit();
-            this.groupBox.ResumeLayout(false);
-            this.groupBox.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        private GroupBox groupBox;
-        private Button ButtonRefreshCollection;
-        private Button ButtonRemoveTractor;
-        private Button ButtonAddTractor;
-        private MaskedTextBox maskedTextBoxNumber;
-        private PictureBox pictureBoxCollection;
-
-    }
-}
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractorCollection.resx
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractorCollection.resx
@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/IMoveableObject.cs
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/IMoveableObject.cs
@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectTractor.MovementStrategy
-{
-    /// <summary>
-    /// Интерфейс для работы с перемещаемым объектом
-    /// </summary>
-    public interface IMoveableObject
-    {
-        /// <summary>
-        /// Получение координаты X объекта
-        /// </summary>
-        ObjectParameters? GetObjectPosition { get; }
-        /// <summary>
-        /// Шаг объекта
-        /// </summary>
-        int GetStep { get; }
-        /// <summary>
-        /// Проверка, можно ли переместиться по нужному направлению
-        /// </summary>
-        /// <param name="direction"></param>
-        /// <returns></returns>
-        bool CheckCanMove(DirectionType direction);
-        /// <summary>
-        /// Изменение направления пермещения объекта
-        /// </summary>
-        /// <param name="direction">Направление</param>
-        void MoveObject(DirectionType direction);
-
-
-    }
-
-}
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToBorder.cs
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToBorder.cs
@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectTractor.MovementStrategy
-{
-    /// <summary>
-    /// Стратегия перемещения объекта в центр экрана
-    /// </summary>
-    public class MoveToBorder : AbstractStrategy
-    {
-        protected override bool IsTargetDestinaion()
-        {
-            var objParams = GetObjectParameters;
-            if (objParams == null)
-            {
-                return false;
-            }
-            return objParams.RightBorder <= FieldWidth
-                && objParams.RightBorder + GetStep() >= FieldWidth
-                && objParams.DownBorder + GetStep() >= FieldHeight;
-        }
-        protected override void MoveToTarget()
-        {
-            var objParams = GetObjectParameters;
-            if (objParams == null)
-            {
-                return;
-            }
-            var diffX = objParams.RightBorder - (FieldWidth - 1);
-            if (Math.Abs(diffX) > GetStep())
-            {
-                if (diffX < 0)
-                {
-                    MoveRight();
-                }
-            }
-            var diffY = objParams.DownBorder - (FieldHeight - 1);
-            if (Math.Abs(diffY) > GetStep())
-            {
-                if (diffY < 0)
-                {
-                    MoveDown();
-                }
-            }
-        }
-    }
-}
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToCenter.cs
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToCenter.cs
@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectTractor.MovementStrategy
-{
-    /// <summary>
-    /// Стратегия перемещения объекта в центр экрана
-    /// </summary>
-    public class MoveToCenter : AbstractStrategy
-    {
-        protected override bool IsTargetDestinaion()
-        {
-            var objParams = GetObjectParameters;
-            if (objParams == null)
-            {
-                return false;
-            }
-            return objParams.ObjectMiddleHorizontal <= FieldWidth / 2 &&
-            objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
-            objParams.ObjectMiddleVertical <= FieldHeight / 2 &&
-            objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
-        }
-        protected override void MoveToTarget()
-        {
-            var objParams = GetObjectParameters;
-            if (objParams == null)
-            {
-                return;
-            }
-            var diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
-            if (Math.Abs(diffX) > GetStep())
-            {
-                if (diffX > 0)
-                {
-                    MoveLeft();
-                }
-                else
-                {
-                    MoveRight();
-                }
-            }
-            var diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
-            if (Math.Abs(diffY) > GetStep())
-            {
-                if (diffY > 0)
-                {
-                    MoveUp();
-                }
-                else
-                {
-                    MoveDown();
-                }
-            }
-        }
-    }
-}
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/ObjectParameters.cs
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/ObjectParameters.cs
@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectTractor.MovementStrategy
-{
-    /// <summary>
-    /// Параметры-координаты объекта
-    /// </summary>
-    public class ObjectParameters
-    {
-        private readonly int _x;
-        private readonly int _y;
-        private readonly int _width;
-        private readonly int _height;
-        /// <summary>
-        /// Левая граница
-        /// </summary>
-        public int LeftBorder => _x;
-        /// <summary>
-        /// Верхняя граница
-        /// </summary>
-        public int TopBorder => _y;
-        /// <summary>
-        /// Правая граница
-        /// </summary>
-        public int RightBorder => _x + _width;
-        /// <summary>
-        /// Нижняя граница
-        /// </summary>
-        public int DownBorder => _y + _height;
-        /// <summary>
-        /// Середина объекта
-        /// </summary>
-        public int ObjectMiddleHorizontal => _x + _width / 2;
-        /// <summary>
-        /// Середина объекта
-        /// </summary>
-        public int ObjectMiddleVertical => _y + _height / 2;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="x">Координата X</param>
-        /// <param name="y">Координата Y</param>
-        /// <param name="width">Ширина</param>
-        /// <param name="height">Высота</param>
-        public ObjectParameters(int x, int y, int width, int height)
-        {
-            _x = x;
-            _y = y;
-            _width = width;
-            _height = height;
-        }
-    }
-
-}
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Program.cs
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Program.cs
@ -1,4 +1,4 @@
-namespace ProjectTractor
+namespace RPP_FirstLaba_Tractor
 {
    internal static class Program
    {
@ -11,7 +11,7 @@ namespace ProjectTractor
            // To customize application configuration such as set high DPI settings or default font,
            // see https://aka.ms/applicationconfiguration.
            ApplicationConfiguration.Initialize();
-            Application.Run(new FormTractorCollection());
+            Application.Run(new FormTractor());
        }
    }
 }
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Properties/Resources.Designer.cs
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Properties/Resources.Designer.cs
@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------

-namespace ProjectTractor.Properties {
+namespace RPP_FirstLaba_Tractor.Properties {
    using System;
    
    
@ -39,7 +39,7 @@ namespace ProjectTractor.Properties {
        internal static global::System.Resources.ResourceManager ResourceManager {
            get {
                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ProjectTractor.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("RPP_FirstLaba_Tractor.Properties.Resources", typeof(Resources).Assembly);
                    resourceMan = temp;
                }
                return resourceMan;
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor.csproj
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor.csproj
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/SetGeneric.cs
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/SetGeneric.cs
@ -1,97 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectTractor.Generics
-{
-    internal class SetGeneric<T>
-        where T : class
-    {
-        /// <summary>
-        /// Массив объектов, которые храним
-        /// </summary>
-        private readonly T?[] _places;
-        /// <summary>
-        /// Количество объектов в массиве
-        /// </summary>
-        public int Count => _places.Length;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="count"></param>
-        public SetGeneric(int count)
-        {
-            _places = new T?[count];
-        }
-        /// <summary>
-        /// Добавление объекта в набор
-        /// </summary>
-        /// <param name="tractor">Добавляемый трактор</param>
-        /// <returns></returns>
-        public bool Insert(T tractor)
-        {
-            if (_places[0] == null)
-            {
-                _places[0] = tractor;
-            }
-            else
-            {
-                return Insert(tractor, 0);
-            }
-            return true;
-        }
-        /// <summary>
-        /// Добавление объекта в набор на конкретную позицию
-        /// </summary>
-        /// <param name="tractor">Добавляемый трактор</param>
-        /// <param name="position">Позиция</param>
-        /// <returns></returns>
-        public bool Insert(T tractor, int position)
-        {
-
-            if (!(position >= 0 && position < Count))
-                return false;
-            if (_places[position] != null)
-            {
-                int ind = position;
-                while (ind < Count && _places[ind] != null)
-                    ind++;
-                if (ind == Count)
-                    return false;
-                for (int i = ind - 1; i >= position; i--)
-                    _places[i + 1] = _places[i];
-            }
-            _places[position] = tractor;
-            return true;
-        }
-        /// <summary>
-        /// Удаление объекта из набора с конкретной позиции
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public bool Remove(int position)
-        {
-            if (!(position >= 0 && position < Count))
-            {
-                return false;
-            }
-            _places[position] = null;
-            return true;
-        }
-        /// <summary>
-        /// Получение объекта из набора по позиции
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public T? Get(int position)
-        {
-            if (!(position >= 0 && position < Count))
-            {
-                return null;
-            }
-            return _places[position];
-        }
-    }
-}
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Status.cs
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Status.cs
@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectTractor.MovementStrategy
-{
-    /// <summary>
-    /// Статус выполнения операции перемещения
-    /// </summary>
-    public enum Status
-    {
-        NotInit,
-        InProgress,
-        Finish
-    }
-
-}
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/TractorsGenericCollection.cs
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/TractorsGenericCollection.cs
@ -1,143 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ProjectTractor.DrawningObjects;
-using ProjectTractor.MovementStrategy;
-
-namespace ProjectTractor.Generics
-{
-    /// <summary>
-    /// Параметризованный класс для набора объектов DrawningTractor
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <typeparam name="U"></typeparam>
-    internal class TractorsGenericCollection<T, U>
-    where T : DrawningTractor
-    where U : IMoveableObject
-    {
-        /// <summary>
-        /// Ширина окна прорисовки
-        /// </summary>
-        private readonly int _pictureWidth;
-        /// <summary>
-        /// Высота окна прорисовки
-        /// </summary>
-        private readonly int _pictureHeight;
-        /// <summary>
-        /// Размер занимаемого объектом места (ширина)
-        /// </summary>
-        private readonly int _placeSizeWidth = 210;
-        /// <summary>
-        /// Размер занимаемого объектом места (высота)
-        /// </summary>
-        private readonly int _placeSizeHeight = 90;
-        /// <summary>
-        /// Набор объектов
-        /// </summary>
-        private readonly SetGeneric<T> _collection;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="picWidth"></param>
-        /// <param name="picHeight"></param>
-        public TractorsGenericCollection(int picWidth, int picHeight)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-            _collection = new SetGeneric<T>(width * height);
-        }
-        /// <summary>
-        /// Перегрузка оператора сложения
-        /// </summary>
-        /// <param name="collect"></param>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        public static bool operator +(TractorsGenericCollection<T, U> collect, T?
-        obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-            return collect?._collection.Insert(obj) ?? false;
-        }
-        /// <summary>
-        /// Перегрузка оператора вычитания
-        /// </summary>
-        /// <param name="collect"></param>
-        /// <param name="pos"></param>
-        /// <returns></returns>
-        public static bool operator -(TractorsGenericCollection<T, U> collect, int pos)
-        {
-            T? obj = collect._collection.Get(pos);
-            if (obj != null)
-            {
-                collect._collection.Remove(pos);
-            }
-            return true;
-        }
-        /// <summary>
-        /// Получение объекта IMoveableObject
-        /// </summary>
-        /// <param name="pos"></param>
-        /// <returns></returns>
-        public U? GetU(int pos)
-        {
-            return (U?)_collection.Get(pos)?.GetMoveableObject;
-        }
-        /// <summary>
-        /// Вывод всего набора объектов
-        /// </summary>
-        /// <returns></returns>
-        public Bitmap ShowTractors()
-        {
-            Bitmap bmp = new(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawObjects(gr);
-            return bmp;
-        }
-        /// <summary>
-        /// Метод отрисовки фона
-        /// </summary>
-        /// <param name="g"></param>
-        private void DrawBackground(Graphics g)
-        {
-            Pen pen = new(Color.Black, 3);
-            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
-            {
-                for (int j = 0; j < _pictureHeight / _placeSizeHeight +
-                1; ++j)
-                {//линия рамзетки места
-                    g.DrawLine(pen, i * _placeSizeWidth, j *
-                    _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j *
-                    _placeSizeHeight);
-                }
-                g.DrawLine(pen, i * _placeSizeWidth, 0, i *
-                _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight);
-            }
-        }
-        /// Метод прорисовки объектов
-        /// </summary>
-        /// <param name="g"></param>
-        private void DrawObjects(Graphics g)
-        {
-            for (int i = 0; i < _collection.Count; i++)
-            {
-
-                DrawningTractor? tractor = _collection.Get(i);
-                if (tractor != null)
-                {
-                    int countRows = _pictureWidth / _placeSizeWidth;
-                    tractor.SetPosition(_pictureWidth - _placeSizeWidth*2 - (i % countRows * _placeSizeWidth) + 20, _pictureHeight - i / countRows * _placeSizeHeight - 150);
-                    tractor.DrawTransport(g);
-                }
-            }
-        }
-    }
-}
-
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/arrowDown.png
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/arrowDown.png
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/arrowLeft.png
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/arrowLeft.png
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/arrowRight.png
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/arrowRight.png
--- a/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/arrowUp.png
+++ b/RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/arrowUp.png
Author	SHA1	Message	Date
KirillFirsof	ff4209df64	Финальный сброс к созданию проекта	2023-10-12 21:39:45 +04:00
KirillFirsof	a80f433f27	Сброс к созданию проекта	2023-10-12 21:35:52 +04:00
KirillFirsof	d0f8f3c1b8	Работа с формой	2023-10-12 20:56:21 +04:00
KirillFirsof	7945a89bf1	Создание формы	2023-10-12 20:17:45 +04:00
KirillFirsof	5e18d0afbe	Создание классов	2023-10-12 19:35:03 +04:00