Мелкие правки

Доработка лабораторной работы
4 Лабораторная работа
2024-03-18 11:08:26 +04:00 · 2024-03-18 10:58:30 +04:00 · 2024-03-17 19:24:38 +04:00 · 2024-03-16 21:39:34 +04:00 · 2024-03-16 18:21:25 +04:00 · 2024-03-03 21:39:43 +04:00
27 changed files with 1930 additions and 169 deletions
--- a/Project_airbus/Project_airbus/CollectionGenericObjects/AbstractCompany.cs
+++ b/Project_airbus/Project_airbus/CollectionGenericObjects/AbstractCompany.cs
@@ -0,0 +1,113 @@
+using Project_airbus.Drawings;
+
+namespace Project_airbus.CollectionGenericObjects;
+public abstract class AbstractCompany
+{
+    /// <summary>
+    /// Размер места (ширина)
+    /// </summary>
+    protected readonly int _placeSizeWidth = 210;
+
+    /// <summary>
+    /// Размер места (высота)
+    /// </summary>
+    protected readonly int _placeSizeHeight = 80;
+
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    protected readonly int _pictureWidth;
+
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    protected readonly int _pictureHeight;
+
+    /// <summary>
+    /// Коллекция самолётов
+    /// </summary>
+    protected ICollectionGenericObjects<DrawingAirplan>? _collection = null;
+
+    /// <summary>
+    /// Вычисление максимального количества элементов, который можно разместить в окне
+    /// </summary>
+    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="picWidth">Ширина окна</param>
+    /// <param name="picHeight">Высота окна</param>
+    /// <param name="collection">Коллекция самолётов</param>
+    public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawingAirplan> collection)
+    {
+        _pictureWidth = picWidth;
+        _pictureHeight = picHeight;
+        _collection = collection;
+        _collection.SetMaxCount = GetMaxCount;
+    }
+
+    /// <summary>
+    /// Перегрузка оператора сложения для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="airplan">Добавляемый объект</param>
+    /// <returns></returns>
+    public static int operator +(AbstractCompany company, DrawingAirplan airplan)
+    {
+        return company._collection.Insert(airplan);
+    }
+
+    /// <summary>
+    /// Перегрузка оператора удаления для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="position">Номер удаляемого объекта</param>
+    /// <returns></returns>
+    public static DrawingAirplan operator -(AbstractCompany company, int position)
+    {
+        return company._collection.Remove(position);
+    }
+
+    /// <summary>
+    /// Получение случайного объекта из коллекции
+    /// </summary>
+    /// <returns></returns>
+    public DrawingAirplan? GetRandomObject()
+    {
+        Random rnd = new();
+        return _collection?.Get(rnd.Next(GetMaxCount));
+    }
+
+    /// <summary>
+    /// Вывод всей коллекции
+    /// </summary>
+    /// <returns></returns>
+    public Bitmap? Show()
+    {
+        Bitmap bitmap = new(_pictureWidth, _pictureHeight);
+        Graphics graphics = Graphics.FromImage(bitmap);
+        DrawBackgound(graphics);
+
+        SetObjectsPosition();
+        for (int i = 0; i < (_collection?.Count ?? 0); ++i)
+        {
+            DrawingAirplan? obj = _collection?.Get(i);
+            obj?.DrawTransport(graphics);
+        }
+
+        return bitmap;
+    }
+
+    /// <summary>
+    /// Вывод заднего фона
+    /// </summary>
+    /// <param name="g"></param>
+    protected abstract void DrawBackgound(Graphics g);
+
+    /// <summary>
+    /// Расстановка объектов
+    /// </summary>
+    protected abstract void SetObjectsPosition();
+}
+
--- a/Project_airbus/Project_airbus/CollectionGenericObjects/AirplanSharingService.cs
+++ b/Project_airbus/Project_airbus/CollectionGenericObjects/AirplanSharingService.cs
@@ -0,0 +1,64 @@
+using Project_airbus.Drawings;
+
+namespace Project_airbus.CollectionGenericObjects;
+
+/// <summary>
+/// Реализация абстрактной компании - каршеринг 
+/// </summary>
+public class AirplanSharingService : AbstractCompany
+{
+    /// <summary>
+	/// Конструктор
+	/// </summary>
+	/// <param name="picWidth"></param>
+	/// <param name="picHeight"></param>
+	/// <param name="collection"></param>
+    public AirplanSharingService(int picWidth, int picHeight, ICollectionGenericObjects<DrawingAirplan> collection) : base(picWidth, picHeight, collection)
+    {
+    }
+
+    protected override void DrawBackgound(Graphics g)
+    {
+        int width = _pictureWidth / _placeSizeWidth;
+        int height = _pictureHeight / _placeSizeHeight;
+        Pen pen = new(Color.Black, 2);
+        for (int i = 0; i < width; i++)
+        {
+            for (int j = 0; j < height + 1; ++j)
+            {
+                g.DrawLine(pen, i * _placeSizeWidth + 5, j * _placeSizeHeight, i * _placeSizeWidth + 5 + _placeSizeWidth - 45, j * _placeSizeHeight);
+                g.DrawLine(pen, i * _placeSizeWidth + 5, j * _placeSizeHeight, i * _placeSizeWidth + 5, j * _placeSizeHeight - _placeSizeHeight);
+            }
+        }
+    }
+        
+    protected override void SetObjectsPosition()
+    {
+        int width = _pictureWidth / _placeSizeWidth;
+        int height = _pictureHeight / _placeSizeHeight;
+
+        int AirplanWidth = 0;
+        int AirplanHeight = 0;
+
+        for (int i = 0; i < (_collection?.Count ?? 0); i++)
+        {
+            if (_collection?.Get(i) != null)
+            {
+                _collection.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
+                _collection.Get(i)?.SetPosition(_placeSizeWidth * AirplanWidth + 20, AirplanHeight * _placeSizeHeight + 20);
+            }
+
+            if (AirplanWidth < width - 1)
+                AirplanWidth++;
+            else
+            {
+                AirplanWidth = 0;
+                AirplanHeight++;
+            }
+            if (AirplanHeight > height)
+            {
+                return;
+            }
+        }
+    }
+}
--- a/Project_airbus/Project_airbus/CollectionGenericObjects/CollectionType.cs
+++ b/Project_airbus/Project_airbus/CollectionGenericObjects/CollectionType.cs
@@ -0,0 +1,22 @@
+namespace Project_airbus.CollectionGenericObjects;
+
+    /// <summary>
+    /// Тип коллекции
+    /// </summary>
+public enum CollectionType
+{
+    /// <summary>
+    /// Неопределено
+    /// </summary>
+    None = 0,
+
+    /// <summary>
+    /// Массив
+    /// </summary>
+    Massive = 1,
+
+    /// <summary>
+    /// Список
+    /// </summary>
+    List = 2
+}
--- a/Project_airbus/Project_airbus/CollectionGenericObjects/ICollectionGenericObjects.cs
+++ b/Project_airbus/Project_airbus/CollectionGenericObjects/ICollectionGenericObjects.cs
@@ -0,0 +1,48 @@
+namespace Project_airbus.CollectionGenericObjects;
+
+/// <summary>
+/// Интерфейс описания действий для набора хранимых объектов
+/// </summary>
+/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+public interface ICollectionGenericObjects<T>
+    where T : class
+{
+    /// <summary>
+    /// Количество объектов в коллекции
+    /// </summary>
+    int Count { get; }
+
+    /// <summary>
+    /// Установка максимального количества элементов
+    /// </summary>
+    int SetMaxCount { set; }
+
+    /// <summary>
+    /// Добавление объекта в коллекцию
+    /// </summary>
+    /// <param name="obj">Добавляемый объект</param>
+    /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
+    int Insert(T obj);
+
+    /// <summary>
+    /// Добавление объекта в коллекцию на конкретную позицию
+    /// </summary>
+    /// <param name="obj">Добавляемый объект</param>
+    /// <param name="position">Позиция</param>
+    /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
+    int Insert(T obj, int position);
+
+    /// <summary>
+    /// Удаление объекта из коллекции с конкретной позиции
+    /// </summary>
+    /// <param name="position">Позиция</param>
+    /// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
+    T? Remove(int position);
+
+    /// <summary>
+    /// Получение объекта по позиции
+    /// </summary>
+    /// <param name="position">Позиция</param>
+    /// <returns>Объект</returns>
+    T? Get(int position);
+}
--- a/Project_airbus/Project_airbus/CollectionGenericObjects/ListGenericObjects.cs
+++ b/Project_airbus/Project_airbus/CollectionGenericObjects/ListGenericObjects.cs
@@ -0,0 +1,60 @@
+namespace Project_airbus.CollectionGenericObjects;
+
+/// <summary>
+/// Параметризованный набор объектов
+/// </summary>
+/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+public class ListGenericObjects<T> : ICollectionGenericObjects<T>
+    where T : class
+{
+    /// <summary>
+    /// Список объектов, которые храним
+    /// </summary>
+    private readonly List<T?> _collection;
+
+    /// <summary>
+    /// Максимально допустимое число объектов в списке
+    /// </summary>
+    private int _maxCount;
+
+    public int Count => _collection.Count;
+
+    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
+
+    /// <summary>
+	/// Конструктор
+	/// </summary>
+	public ListGenericObjects()
+    {
+        _collection = new();
+    }
+
+    public T Get(int position)
+    {
+        if (position >= Count || position < 0) return null;
+        return _collection[position];
+    }
+
+    public int Insert(T obj)
+    {
+        if (Count == _maxCount) return -1;
+        _collection.Add(obj);
+        return Count;
+    }
+
+    public int Insert(T obj, int position)
+    {
+        if (Count == _maxCount) return -1;
+        if (position >= Count || position < 0) return -1;
+        _collection.Insert(position, obj);
+        return position;
+    }
+
+    public T Remove(int position)
+    {
+        if (position >= _collection.Count || position < 0) return null;
+        T obj = _collection[position];
+        _collection.RemoveAt(position);
+        return obj;
+    }
+}
--- a/Project_airbus/Project_airbus/CollectionGenericObjects/MassiveGenericObjects.cs
+++ b/Project_airbus/Project_airbus/CollectionGenericObjects/MassiveGenericObjects.cs
@@ -0,0 +1,103 @@
+namespace Project_airbus.CollectionGenericObjects;
+
+/// <summary>
+/// Параметризованный набор объектов
+/// </summary>
+/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
+    where T : class
+{
+    /// <summary>
+    /// Массив объектов, которые храним
+    /// </summary>
+    private T?[] _collection;
+
+    public int Count => _collection.Length;
+
+    public int SetMaxCount
+    {
+        set
+        {
+            if (value > 0)
+            {
+                if (_collection.Length > 0)
+                {
+                    Array.Resize(ref _collection, value);
+                }
+                else
+                {
+                    _collection = new T?[value];
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public MassiveGenericObjects()
+    {
+        _collection = Array.Empty<T?>();
+    }
+
+    public T? Get(int position)
+    {
+        if (position >= _collection.Length || position < 0) return null;
+        return _collection[position];
+    }
+
+    public int Insert(T obj)
+    {
+        int index = 0;
+        while (index < _collection.Length)
+        {
+            if (_collection[index] == null)
+            {
+                _collection[index] = obj;
+                return index;
+            }
+            index++;
+        }
+        return -1;
+    }
+
+    public int Insert(T obj, int position)
+    {
+        if (position >= _collection.Length || position < 0) return -1;
+
+        if (_collection[position] == null)
+        {
+            _collection[position] = obj;
+            return position;
+        }
+        int index = position + 1;
+        while (index < _collection.Length)
+        {
+            if (_collection[index] == null)
+            {
+                _collection[index] = obj;
+                return index;
+            }
+            index++;
+        }
+        index = position - 1;
+        while (index >= 0)
+        {
+            if (_collection[index] == null)
+            {
+                _collection[index] = obj;
+                return index;
+            }
+            index--;
+        }
+        return -1;
+    }
+
+    public T? Remove(int position)
+    {
+        if (position >= _collection.Length || position < 0) return null;
+        T? removeObj = _collection[position];
+        _collection[position] = null;
+        return removeObj;
+    }
+}
--- a/Project_airbus/Project_airbus/CollectionGenericObjects/StorageCollection.cs
+++ b/Project_airbus/Project_airbus/CollectionGenericObjects/StorageCollection.cs
@@ -0,0 +1,68 @@
+namespace Project_airbus.CollectionGenericObjects;
+
+/// <summary>
+/// Класс-хранилище коллекций
+/// </summary>
+/// <typeparam name="T"></typeparam>
+public class StorageCollection<T>
+    where T : class
+{
+    /// <summary>
+    /// Словарь (хранилище) с коллекциями
+    /// </summary>
+    readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
+
+    /// <summary>
+    /// Возвращение списка названий коллекций
+    /// </summary>
+    public List<string> Keys => _storages.Keys.ToList();
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public StorageCollection()
+    {
+        _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
+    }
+
+    /// <summary>
+    /// Добавление коллекции в хранилище
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    /// <param name="collectionType">тип коллекции</param>
+    public void AddCollection(string name, CollectionType collectionType)
+    {
+
+        if (_storages.ContainsKey(name)) return;
+        if (collectionType == CollectionType.None) return;
+        else if (collectionType == CollectionType.Massive)
+            _storages[name] = new MassiveGenericObjects<T>();
+        else if (collectionType == CollectionType.List)
+            _storages[name] = new ListGenericObjects<T>();
+    }
+
+    /// <summary>
+    /// Удаление коллекции
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    public void DelCollection(string name)
+    {
+        if (_storages.ContainsKey(name))
+            _storages.Remove(name);
+    }
+
+    /// <summary>
+    /// Доступ к коллекции
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    /// <returns></returns>
+    public ICollectionGenericObjects<T>? this[string name]
+    {
+        get
+        {
+            if (_storages.ContainsKey(name))
+                return _storages[name];
+            return null;
+        }
+    }
+}
--- a/Project_airbus/Project_airbus/Drawings/DirectionType.cs
+++ b/Project_airbus/Project_airbus/Drawings/DirectionType.cs
@@ -1,15 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Project_airbus;
+namespace Project_airbus.Drawings;
 /// <summary>
 /// Направление перемещения
 /// </summary>
 public enum DirectionType
 {
+    /// <summary>
+	/// Неизвестное направление
+	/// </summary>
+	Unknow = -1,
+
    /// <summary>
    /// Вверх
    /// </summary>
--- a/Project_airbus/Project_airbus/Drawings/DrawingAirbus.cs
+++ b/Project_airbus/Project_airbus/Drawings/DrawingAirbus.cs
@@ -0,0 +1,52 @@
+using Project_airbus.Entities;
+
+namespace Project_airbus.Drawings;
+
+/// <summary>
+/// Класс, отвечающий за прорисовку и перемещение  объекта-сущности
+/// </summary>
+public class DrawingAirbus : DrawingAirplan
+{
+    /// <summary>
+    /// Конструктор 
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес самолета</param>
+    /// <param name="bodyAirbus">Основной цвет</param>
+    /// <param name="additionalColor">Дополнительный цвет</param>
+    /// <param name="bodySection">Признак наличия отсека</param>
+    /// <param name="motor">Признак наличия дополнительных двигателей</param>
+    public DrawingAirbus(int speed, double weight, Color bodyAirbus, Color additionalColor, bool bodySection, bool motor) : base(130, 60)
+    {
+        EntityAirplan = new EntityAirbus(speed, weight, bodyAirbus, additionalColor, bodySection, motor);
+    }
+
+    public override void DrawTransport(Graphics g)
+    {
+        if (EntityAirplan == null || EntityAirplan is not EntityAirbus airbus || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+
+        Pen pen = new(Color.Black);
+        Brush additionalBrush = new SolidBrush(airbus.AdditionalColor);
+        base.DrawTransport(g);
+
+        //Дополнительный отсек сверху
+        if (airbus.BodySection)
+        {
+            g.DrawLine(pen, _startPosX.Value + 25, _startPosY.Value + 20, _startPosX.Value + 50, _startPosY.Value + 12);
+            g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 12, _startPosX.Value + 70, _startPosY.Value + 12);
+            g.DrawLine(pen, _startPosX.Value + 70, _startPosY.Value + 12, _startPosX.Value + 80, _startPosY.Value + 20);
+        }
+
+        // Двигатели под крылом
+        if (airbus.Motor)
+        {
+            g.FillRectangle(additionalBrush, _startPosX.Value + 31, _startPosY.Value + 32, 12, 4);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 45, _startPosY.Value + 32, 12, 4);
+        }
+    }
+
+}
+
--- a/Project_airbus/Project_airbus/Drawings/DrawingAirplan.cs
+++ b/Project_airbus/Project_airbus/Drawings/DrawingAirplan.cs
@@ -1,19 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Project_airbus.Entities;

-namespace Project_airbus;
-/// <summary>
-/// Класс, отвечающий за прорисовку и перемещение  объекта-сущности
-/// </summary>
-public class DrawingAirbus
+namespace Project_airbus.Drawings;
+
+public class DrawingAirplan
 {
    /// <summary>
    /// Класс-сущность
    /// </summary>
-    public EntityAirbus? EntityAirbus { get; private set; }
+    public EntityAirplan? EntityAirplan { get; protected set; }

    /// <summary>
    /// Ширина окна
@@ -26,42 +20,50 @@ public class DrawingAirbus
    private int? _pictureHeight;

    /// <summary>
-    /// Левая координата прорисовки самолета(аэробуса)
+    /// Левая координата прорисовки самолета
    /// </summary>
-    private int? _startPosX;
+    protected int? _startPosX;

    /// <summary>
-    /// Верхняя координата прорисовки самолета(аэробуса)
+    /// Верхняя координата прорисовки самолета
    /// </summary>
-    private int? _startPosY;
+    protected int? _startPosY;

    /// <summary>
-    /// Ширина прорисовки самолета(аэробуса)
+    /// Ширина прорисовки самолета
    /// </summary>
-    private readonly int _drawingAirbusWidth = 130;
+    private readonly int _drawingAirplanWidth = 130;

    /// <summary>
-    /// Высота прорисовки самолета(аэробуса)
+    /// Высота прорисовки самолета
    /// </summary>
-    private readonly int _drawingAirbusHeight = 60;
-
-
-
-
+    private readonly int _drawingAirplanHeight = 60;

    /// <summary>
-    /// Инициализация свойств
+	/// Координата X объекта
+	/// </summary>
+	public int? GetPosX => _startPosX;
+
+    /// <summary>
+    /// Координата Y объекта
    /// </summary>
-    /// <param name="speed">Скорость</param>
-    /// <param name="weight">Вес самолета</param>
-    /// <param name="bodyAirbus">Основной цвет</param>
-    /// <param name="additionalColor">Дополнительный цвет</param>
-    /// <param name="bodySection">Признак наличия отсека</param>
-    /// <param name="motor">Признак наличия дополнительных двигателей</param>
-    public void Init(int speed, double weight, Color bodyAirbus, Color additionalColor, bool bodySection, bool motor)
+    public int? GetPosY => _startPosY;
+
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    public int GetWidth => _drawingAirplanWidth;
+
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    public int GetHeight => _drawingAirplanHeight;
+
+    /// <summary>
+    /// Пустой конструктор
+    /// </summary>
+    private DrawingAirplan()
    {
-        EntityAirbus = new EntityAirbus();
-        EntityAirbus.Init(speed, weight, bodyAirbus, additionalColor, bodySection, motor);
        _pictureWidth = null;
        _pictureHeight = null;
        _startPosX = null;
@@ -69,6 +71,27 @@ public class DrawingAirbus

    }

+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес самолета</param>
+    /// <param name="bodyAirbus">Основной цвет</param>
+    public DrawingAirplan(int speed, double weight, Color bodyAirbus) : this()
+    {
+        EntityAirplan = new EntityAirplan(speed, weight, bodyAirbus);
+    }
+
+    /// <summary>
+    /// Конструктор для наследников
+    /// </summary>
+    /// <param name="drawingAirbusWidth">Ширина прорисовки самолета</param>
+    /// <param name="drawingAirbusHeight">Высота прорисовки самолета</param>
+    protected DrawingAirplan(int drawingAirbusWidth, int drawingAirbusHeight) : this()
+    {
+        _drawingAirplanWidth = drawingAirbusWidth;
+        _drawingAirplanHeight = drawingAirbusHeight;
+    }

    /// <summary>
    /// Установка границ поля
@@ -79,32 +102,31 @@ public class DrawingAirbus
    public bool SetPictureSize(int wigth, int height)
    {

-     if(wigth < _drawingAirbusWidth || height < _drawingAirbusHeight) { return false; };
-     _pictureWidth = wigth;
-     _pictureHeight = height;
-     if(_startPosX !=null || _startPosY != null)
+        if (wigth < _drawingAirplanWidth || height < _drawingAirplanHeight) { return false; };
+        _pictureWidth = wigth;
+        _pictureHeight = height;
+        if (_startPosX != null || _startPosY != null)
        {
-            if(_startPosX + _drawingAirbusWidth > _pictureWidth)
+            if (_startPosX + _drawingAirplanWidth > _pictureWidth)
            {
-                _startPosX = -_drawingAirbusWidth + _pictureWidth;
+                _startPosX = -_drawingAirplanWidth + _pictureWidth;
            }
-            else if(_startPosX < 0)
+            else if (_startPosX < 0)
            {
                _startPosX = 0;
            }
-            if(_startPosY + _drawingAirbusHeight > _pictureHeight)
+            if (_startPosY + _drawingAirplanHeight > _pictureHeight)
            {
-                _startPosY = - _drawingAirbusHeight + _pictureHeight;
+                _startPosY = -_drawingAirplanHeight + _pictureHeight;
            }
-            else if(_startPosY < 0)
+            else if (_startPosY < 0)
            {
                _startPosY = 0;
            }
        }
        return true;
-       
-    }

+    }

    /// <summary>
    /// Установка позиции
@@ -118,11 +140,11 @@ public class DrawingAirbus
            return;
        }

-        if (x+_drawingAirbusWidth > _pictureWidth)
+        if (x + _drawingAirplanWidth > _pictureWidth)
        {
-            _startPosX = _pictureWidth - _drawingAirbusWidth;
+            _startPosX = _pictureWidth - _drawingAirplanWidth;
        }
-        else if(x < 0)
+        else if (x < 0)
        {
            _startPosX = 0;
        }
@@ -131,11 +153,11 @@ public class DrawingAirbus
            _startPosX = x;
        }

-        if(y + _drawingAirbusHeight > _pictureHeight)
+        if (y + _drawingAirplanHeight > _pictureHeight)
        {
-            _startPosY = _pictureHeight - _drawingAirbusHeight;
+            _startPosY = _pictureHeight - _drawingAirplanHeight;
        }
-        else if(y < 0)
+        else if (y < 0)
        {
            _startPosY = 0;
        }
@@ -153,34 +175,34 @@ public class DrawingAirbus
    /// <returns>true - перемещение выполнено, false - перемещение невозможно</returns>
    public bool MoveTransport(DirectionType direction)
    {
-        if (EntityAirbus == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        if (EntityAirplan == null || !_startPosX.HasValue || !_startPosY.HasValue)
        {
            return false;
        }
        switch (direction)
        {
            case DirectionType.Left:
-                if (_startPosX.Value - EntityAirbus.step > 0)
+                if (_startPosX.Value - EntityAirplan.step > 0)
                {
-                    _startPosX -= (int)EntityAirbus.step;
+                    _startPosX -= (int)EntityAirplan.step;
                }
                return true;
            case DirectionType.Right:
-                if (_startPosX.Value + _drawingAirbusWidth + EntityAirbus.step < _pictureWidth)
+                if (_startPosX.Value + _drawingAirplanWidth + EntityAirplan.step < _pictureWidth)
                {
-                    _startPosX += (int)EntityAirbus.step;
+                    _startPosX += (int)EntityAirplan.step;
                }
                return true;
            case DirectionType.Down:
-                if (_startPosY.Value + _drawingAirbusHeight + EntityAirbus.step < _pictureHeight)
+                if (_startPosY.Value + _drawingAirplanHeight + EntityAirplan.step < _pictureHeight)
                {
-                    _startPosY += (int)EntityAirbus.step;
+                    _startPosY += (int)EntityAirplan.step;
                }
                return true;
            case DirectionType.Up: //вверх
-                if (_startPosY - EntityAirbus.step > 0)
+                if (_startPosY - EntityAirplan.step > 0)
                {
-                    _startPosY -= (int)EntityAirbus.step;
+                    _startPosY -= (int)EntityAirplan.step;
                }
                return true;
            default:
@@ -188,20 +210,17 @@ public class DrawingAirbus
        }
    }

-
    /// <summary>
    /// Прорисовка объекта
    /// </summary>
    /// <param name="g"></param>
-    public void DrawTransport(Graphics g)
+    public virtual void DrawTransport(Graphics g)
    {
-        if (EntityAirbus == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        if (EntityAirplan == null || !_startPosX.HasValue || !_startPosY.HasValue)
        {
            return;
        }
-        Pen pen = new(Color.Black);
-        Pen additionalpen = new(EntityAirbus.AdditionalColor);
-        Brush additionalBrush = new SolidBrush(EntityAirbus.AdditionalColor);
+        Pen pen = new Pen(EntityAirplan.BodyAirbus);

        //корпус
        g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 20, 100, 20);
@@ -230,23 +249,5 @@ public class DrawingAirbus
        //переднее шасси
        g.DrawLine(pen, _startPosX.Value + 90, _startPosY.Value + 40, _startPosX.Value + 90, _startPosY.Value + 45);
        g.FillEllipse(darkBrush, _startPosX.Value + 87, _startPosY.Value + 45, 6, 6);
-
-        //Дополнительный отсек сверху
-        if (EntityAirbus.BodySection)
-        {
-            g.DrawLine(additionalpen, _startPosX.Value + 25, _startPosY.Value + 20, _startPosX.Value + 50, _startPosY.Value + 12);
-            g.DrawLine(additionalpen, _startPosX.Value + 50, _startPosY.Value + 12, _startPosX.Value + 70, _startPosY.Value + 12);
-            g.DrawLine(additionalpen, _startPosX.Value + 70, _startPosY.Value + 12, _startPosX.Value + 80, _startPosY.Value + 20);
-        }
-
-        // Двигатели под крылом
-        if (EntityAirbus.Motor)
-        {
-            g.FillRectangle(additionalBrush, _startPosX.Value + 31, _startPosY.Value + 32, 12, 4);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 45, _startPosY.Value + 32, 12, 4);
-        }
-
    }
 }
-
-
--- a/Project_airbus/Project_airbus/Entities/EntityAirbus.cs
+++ b/Project_airbus/Project_airbus/Entities/EntityAirbus.cs
@@ -1,25 +1,10 @@
-namespace Project_airbus;
+namespace Project_airbus.Entities;

 /// <summary>
 /// Класс-сущность "Самолет(Aэробус)"
 /// </summary>
-public class EntityAirbus
+public class EntityAirbus : EntityAirplan
 {
-    /// <summary>
-    /// Скорость 
-    /// </summary>
-    public int Speed {  get; private set; }
-
-    /// <summary>
-    /// Вес самолета
-    /// </summary>
-    public double Weight { get; private set; }
-
-    /// <summary>
-    /// Основной цвет
-    /// </summary>
-    public Color BodyAirbus {  get; private set; }
-
    /// <summary>
    /// Дополнительный цвет(для опциональных элементов)
    /// </summary>
@@ -28,18 +13,13 @@ public class EntityAirbus
    /// <summary>
    /// Признак(опция) наличия отсека
    /// </summary>
-    public bool BodySection {  get; private set; }
+    public bool BodySection { get; private set; }

    /// <summary>
    /// ПРизнак(опция) наличия дополнительных двигателей
    /// </summary>
    public bool Motor { get; private set; }

-    /// <summary>
-    /// Шаг перемещения самолета(аэробуса)
-    /// </summary>
-    public double step => Speed * 100 / Weight;
-
    /// <summary>
    /// Инициализация полей объекта-класса самолета(аэробуса)
    /// </summary>
@@ -48,16 +28,11 @@ public class EntityAirbus
    /// <param name="bodyAirbus">Основной цвет</param>
    /// <param name="additionalColor">Дополнительный цвет</param>
    /// <param name="bodySection">ПРизнак наличия отсека</param>
-    /// <param name="motor">ПРизнак наличия дополнительных двигателей</param>
-    public void Init(int speed, double weight, Color bodyAirbus, Color additionalColor, bool bodySection, bool motor)
+    /// <param name="motor">Признак наличия дополнительных двигателей</param>
+    public EntityAirbus(int speed, double weight, Color bodyAirbus, Color additionalColor, bool bodySection, bool motor) :base(speed, weight, bodyAirbus)
    {
-        Speed = speed;
-        Weight = weight;
-        BodyAirbus = bodyAirbus;
        AdditionalColor = additionalColor;
        BodySection = bodySection;
        Motor = motor;
    }
-
-
 }
--- a/Project_airbus/Project_airbus/Entities/EntityAirplan.cs
+++ b/Project_airbus/Project_airbus/Entities/EntityAirplan.cs
@@ -0,0 +1,40 @@
+namespace Project_airbus.Entities;
+
+/// <summary>
+/// Класс-сущность "Самолёт"
+/// </summary>
+public class EntityAirplan
+{
+    /// <summary>
+    /// Скорость 
+    /// </summary>
+    public int Speed { get; private set; }
+
+    /// <summary>
+    /// Вес самолета
+    /// </summary>
+    public double Weight { get; private set; }
+
+    /// <summary>
+    /// Основной цвет
+    /// </summary>
+    public Color BodyAirbus { get; private set; }
+
+    /// <summary>
+    /// Шаг перемещения самолета(аэробуса)
+    /// </summary>
+    public double step => Speed * 100 / Weight;
+
+    /// <summary>
+    /// Конструктор сущности
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес самолета</param>
+    /// <param name="bodyAirbus">Основной цвет</param>
+    public EntityAirplan(int speed, double weight, Color bodyAirbus)
+    {
+        Speed = speed;
+        Weight = weight;
+        BodyAirbus = bodyAirbus;
+    }
+}
--- a/Project_airbus/Project_airbus/FormAirbus.Designer.cs
+++ b/Project_airbus/Project_airbus/FormAirbus.Designer.cs
@@ -30,11 +30,12 @@
        {
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormAirbus));
            pictureBoxAirbus = new PictureBox();
-            buttonCreateAirbus = new Button();
            buttonUp = new Button();
            buttonRight = new Button();
            buttonLeft = new Button();
            buttonDown = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
            ((System.ComponentModel.ISupportInitialize)pictureBoxAirbus).BeginInit();
            SuspendLayout();
            // 
@@ -48,17 +49,6 @@
            pictureBoxAirbus.TabIndex = 6;
            pictureBoxAirbus.TabStop = false;
            // 
-            // buttonCreateAirbus
-            // 
-            buttonCreateAirbus.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateAirbus.Location = new Point(12, 330);
-            buttonCreateAirbus.Name = "buttonCreateAirbus";
-            buttonCreateAirbus.Size = new Size(79, 43);
-            buttonCreateAirbus.TabIndex = 7;
-            buttonCreateAirbus.Text = "Создать";
-            buttonCreateAirbus.UseVisualStyleBackColor = true;
-            buttonCreateAirbus.Click += ButtonCreateAirbus_Click;
-            // 
            // buttonUp
            // 
            buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
@@ -111,16 +101,37 @@
            buttonDown.UseVisualStyleBackColor = true;
            buttonDown.Click += ButtonMove_CLick;
            // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(612, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(128, 28);
+            comboBoxStrategy.TabIndex = 13;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Location = new Point(647, 46);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(92, 30);
+            buttonStrategyStep.TabIndex = 14;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += ButtonStrategyStep_Click;
+            // 
            // FormAirbus
            // 
            AutoScaleDimensions = new SizeF(8F, 20F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(752, 385);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
            Controls.Add(buttonDown);
            Controls.Add(buttonLeft);
            Controls.Add(buttonRight);
            Controls.Add(buttonUp);
-            Controls.Add(buttonCreateAirbus);
            Controls.Add(pictureBoxAirbus);
            Name = "FormAirbus";
            Text = "Аэробус";
@@ -131,10 +142,11 @@

        #endregion
        private PictureBox pictureBoxAirbus;
-        private Button buttonCreateAirbus;
        private Button buttonUp;
        private Button buttonRight;
        private Button buttonLeft;
        private Button buttonDown;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
    }
 }
--- a/Project_airbus/Project_airbus/FormAirbus.cs
+++ b/Project_airbus/Project_airbus/FormAirbus.cs
@@ -1,12 +1,37 @@
-namespace Project_airbus
+using Project_airbus.Drawings;
+using Project_airbus.MovementStrategy;
+
+namespace Project_airbus
 {
+    /// <summary>
+    /// Форма работы с объектом "Аэробас"
+    /// </summary>
    public partial class FormAirbus : Form
    {
-
        /// <summary>
        /// Поле-объект для прорисовки поля
        /// </summary>
-        private DrawingAirbus? _drawingAirbus;
+        private DrawingAirplan? _drawingAirplan;
+
+        /// <summary>
+        /// Стратегия перемещения
+        /// </summary>
+        private AbstractStrategy? _strategy;
+
+        /// <summary>
+        /// Получение объекта 
+        /// </summary>
+        public DrawingAirplan SetAirplan
+        {
+            set
+            {
+                _drawingAirplan = value;
+                _drawingAirplan.SetPictureSize(pictureBoxAirbus.Width, pictureBoxAirbus.Height);
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+                Draw();
+            }
+        }

        /// <summary>
        /// Конструктор формы
@@ -14,6 +39,7 @@
        public FormAirbus()
        {
            InitializeComponent();
+            _strategy = null;
        }

        /// <summary>
@@ -21,40 +47,18 @@
        /// </summary>
        private void Draw()
        {
-            if (_drawingAirbus == null)
+            if (_drawingAirplan == null)
            {
                return;
            }

            Bitmap bmb = new(pictureBoxAirbus.Width, pictureBoxAirbus.Height);
            Graphics gr = Graphics.FromImage(bmb);
-            _drawingAirbus.DrawTransport(gr);
+            _drawingAirplan.DrawTransport(gr);
            pictureBoxAirbus.Image = bmb;

        }

-
-      
-        /// <summary>
-        ///  Обработка нажатия кнопки "Создать"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreateAirbus_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            _drawingAirbus = new DrawingAirbus();
-            _drawingAirbus.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)));
-            _drawingAirbus.SetPictureSize(pictureBoxAirbus.Width, pictureBoxAirbus.Height);
-            _drawingAirbus.SetPosition(random.Next(10, 100), random.Next(10, 100));
-
-            Draw();
-
-        }
-
        /// <summary>
        /// Перемещение объекта по форме (нажатие кнопок навигации)
        /// </summary>
@@ -62,7 +66,7 @@
        /// <param name="e"></param>
        private void ButtonMove_CLick(object sender, EventArgs e)
        {
-            if (_drawingAirbus == null)
+            if (_drawingAirplan == null)
            {
                return;
            }
@@ -71,20 +75,65 @@
            switch (name)
            {
                case "buttonUp":
-                    result = _drawingAirbus.MoveTransport(DirectionType.Up);
+                    result = _drawingAirplan.MoveTransport(DirectionType.Up);
                    break;
                case "buttonDown":
-                    result = _drawingAirbus.MoveTransport(DirectionType.Down);
+                    result = _drawingAirplan.MoveTransport(DirectionType.Down);
                    break;
                case "buttonRight":
-                    result = _drawingAirbus.MoveTransport(DirectionType.Right);
+                    result = _drawingAirplan.MoveTransport(DirectionType.Right);
                    break;
                case "buttonLeft":
-                    result = _drawingAirbus.MoveTransport(DirectionType.Left);
+                    result = _drawingAirplan.MoveTransport(DirectionType.Left);
                    break;
            }
            Draw();

        }
+
+        /// <summary>
+        /// Обработка нажатия кнопки "Шаг"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonStrategyStep_Click(object sender, EventArgs e)
+        {
+            if (_drawingAirplan == null)
+            {
+                return;
+            }
+
+            if (comboBoxStrategy.Enabled)
+            {
+                _strategy = comboBoxStrategy.SelectedIndex switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_strategy == null)
+                {
+                    return;
+                }
+                _strategy.SetData(new MoveableAirplan(_drawingAirplan), pictureBoxAirbus.Width, pictureBoxAirbus.Height);
+            }
+
+            if (_strategy == null)
+            {
+                return;
+            }
+
+            comboBoxStrategy.Enabled = false;
+            _strategy.MakeStep();
+            Draw();
+
+            if (_strategy.GetStatus() == StrategyStatus.Finish)
+            {
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+            }
+        }
    }
+
 }
+
--- a/Project_airbus/Project_airbus/FormAirplanCollection.Designer.cs
+++ b/Project_airbus/Project_airbus/FormAirplanCollection.Designer.cs
@@ -0,0 +1,296 @@
+namespace Project_airbus
+{
+    partial class FormAirplanCollection
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            groupBoxTools = new GroupBox();
+            buttonCreateToCompany = new Button();
+            panelStorage = new Panel();
+            buttonCollectionDel = new Button();
+            listBoxCollection = new ListBox();
+            buttonCollectionAdd = new Button();
+            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            textBoxCollectionName = new TextBox();
+            labelCollectionName = new Label();
+            buttonRefresh = new Button();
+            buttonGoToCheck = new Button();
+            ButtonDelAirplan = new Button();
+            maskedTextBox = new MaskedTextBox();
+            buttonAddAirbus = new Button();
+            buttonAddAirplan = new Button();
+            comboBoxSelectorCompany = new ComboBox();
+            pictureBox = new PictureBox();
+            panelCompanyTools = new Panel();
+            groupBoxTools.SuspendLayout();
+            panelStorage.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            panelCompanyTools.SuspendLayout();
+            SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(panelCompanyTools);
+            groupBoxTools.Controls.Add(buttonCreateToCompany);
+            groupBoxTools.Controls.Add(panelStorage);
+            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.Location = new Point(925, 0);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Size = new Size(210, 707);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "Инструменты";
+            // 
+            // buttonCreateToCompany
+            // 
+            buttonCreateToCompany.Location = new Point(6, 368);
+            buttonCreateToCompany.Name = "buttonCreateToCompany";
+            buttonCreateToCompany.Size = new Size(192, 26);
+            buttonCreateToCompany.TabIndex = 8;
+            buttonCreateToCompany.Text = "Создать компанию";
+            buttonCreateToCompany.UseVisualStyleBackColor = true;
+            buttonCreateToCompany.Click += buttonCreateToCompany_Click;
+            // 
+            // panelStorage
+            // 
+            panelStorage.Controls.Add(buttonCollectionDel);
+            panelStorage.Controls.Add(listBoxCollection);
+            panelStorage.Controls.Add(buttonCollectionAdd);
+            panelStorage.Controls.Add(radioButtonList);
+            panelStorage.Controls.Add(radioButtonMassive);
+            panelStorage.Controls.Add(textBoxCollectionName);
+            panelStorage.Controls.Add(labelCollectionName);
+            panelStorage.Dock = DockStyle.Top;
+            panelStorage.Location = new Point(3, 23);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(204, 267);
+            panelStorage.TabIndex = 7;
+            // 
+            // buttonCollectionDel
+            // 
+            buttonCollectionDel.Location = new Point(0, 211);
+            buttonCollectionDel.Name = "buttonCollectionDel";
+            buttonCollectionDel.Size = new Size(207, 26);
+            buttonCollectionDel.TabIndex = 6;
+            buttonCollectionDel.Text = "Удалить коллекцию";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += buttonCollectionDel_Click;
+            // 
+            // listBoxCollection
+            // 
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.ItemHeight = 20;
+            listBoxCollection.Location = new Point(3, 141);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(201, 64);
+            listBoxCollection.TabIndex = 5;
+            // 
+            // buttonCollectionAdd
+            // 
+            buttonCollectionAdd.Location = new Point(-3, 109);
+            buttonCollectionAdd.Name = "buttonCollectionAdd";
+            buttonCollectionAdd.Size = new Size(207, 26);
+            buttonCollectionAdd.TabIndex = 4;
+            buttonCollectionAdd.Text = "Добавить коллекцию";
+            buttonCollectionAdd.UseVisualStyleBackColor = true;
+            buttonCollectionAdd.Click += buttonCollectionAdd_Click;
+            // 
+            // radioButtonList
+            // 
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(115, 79);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(80, 24);
+            radioButtonList.TabIndex = 3;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonMassive
+            // 
+            radioButtonMassive.AutoSize = true;
+            radioButtonMassive.Location = new Point(18, 79);
+            radioButtonMassive.Name = "radioButtonMassive";
+            radioButtonMassive.Size = new Size(82, 24);
+            radioButtonMassive.TabIndex = 2;
+            radioButtonMassive.TabStop = true;
+            radioButtonMassive.Text = "Массив";
+            radioButtonMassive.UseVisualStyleBackColor = true;
+            // 
+            // textBoxCollectionName
+            // 
+            textBoxCollectionName.Location = new Point(3, 36);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(198, 27);
+            textBoxCollectionName.TabIndex = 1;
+            // 
+            // labelCollectionName
+            // 
+            labelCollectionName.AutoSize = true;
+            labelCollectionName.Location = new Point(28, 13);
+            labelCollectionName.Name = "labelCollectionName";
+            labelCollectionName.Size = new Size(155, 20);
+            labelCollectionName.TabIndex = 0;
+            labelCollectionName.Text = "Название коллекции";
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Location = new Point(3, 253);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(195, 46);
+            buttonRefresh.TabIndex = 6;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += buttonRefresh_Click;
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Location = new Point(3, 201);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(195, 46);
+            buttonGoToCheck.TabIndex = 5;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += buttonGoToCheck_Click;
+            // 
+            // ButtonDelAirplan
+            // 
+            ButtonDelAirplan.Location = new Point(3, 149);
+            ButtonDelAirplan.Name = "ButtonDelAirplan";
+            ButtonDelAirplan.Size = new Size(195, 46);
+            ButtonDelAirplan.TabIndex = 4;
+            ButtonDelAirplan.Text = "Удалить самолёт";
+            ButtonDelAirplan.UseVisualStyleBackColor = true;
+            ButtonDelAirplan.Click += buttonDelAirplan_Click;
+            // 
+            // maskedTextBox
+            // 
+            maskedTextBox.Location = new Point(3, 116);
+            maskedTextBox.Mask = "00";
+            maskedTextBox.Name = "maskedTextBox";
+            maskedTextBox.Size = new Size(192, 27);
+            maskedTextBox.TabIndex = 3;
+            maskedTextBox.ValidatingType = typeof(int);
+            // 
+            // buttonAddAirbus
+            // 
+            buttonAddAirbus.Location = new Point(3, 63);
+            buttonAddAirbus.Name = "buttonAddAirbus";
+            buttonAddAirbus.Size = new Size(192, 47);
+            buttonAddAirbus.TabIndex = 2;
+            buttonAddAirbus.Text = "Добавление аэробаса";
+            buttonAddAirbus.UseVisualStyleBackColor = true;
+            buttonAddAirbus.Click += buttonAddAirbus_Click;
+            // 
+            // buttonAddAirplan
+            // 
+            buttonAddAirplan.Location = new Point(3, 6);
+            buttonAddAirplan.Name = "buttonAddAirplan";
+            buttonAddAirplan.Size = new Size(192, 51);
+            buttonAddAirplan.TabIndex = 1;
+            buttonAddAirplan.Text = "Добавление самолёта";
+            buttonAddAirplan.UseVisualStyleBackColor = true;
+            buttonAddAirplan.Click += buttonAddAirplan_Click;
+            // 
+            // comboBoxSelectorCompany
+            // 
+            comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxSelectorCompany.FormattingEnabled = true;
+            comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
+            comboBoxSelectorCompany.Location = new Point(6, 334);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(140, 28);
+            comboBoxSelectorCompany.TabIndex = 0;
+            comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
+            // 
+            // pictureBox
+            // 
+            pictureBox.Dock = DockStyle.Fill;
+            pictureBox.Location = new Point(0, 0);
+            pictureBox.Name = "pictureBox";
+            pictureBox.Size = new Size(925, 707);
+            pictureBox.TabIndex = 1;
+            pictureBox.TabStop = false;
+            // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(buttonAddAirplan);
+            panelCompanyTools.Controls.Add(buttonAddAirbus);
+            panelCompanyTools.Controls.Add(maskedTextBox);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(ButtonDelAirplan);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Enabled = false;
+            panelCompanyTools.Location = new Point(3, 400);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(207, 307);
+            panelCompanyTools.TabIndex = 9;
+            // 
+            // FormAirplanCollection
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1135, 707);
+            Controls.Add(pictureBox);
+            Controls.Add(groupBoxTools);
+            Name = "FormAirplanCollection";
+            Text = "Коллекция самолётов";
+            groupBoxTools.ResumeLayout(false);
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private Button buttonAddAirbus;
+        private Button buttonAddAirplan;
+        private ComboBox comboBoxSelectorCompany;
+        private Button ButtonDelAirplan;
+        private MaskedTextBox maskedTextBox;
+        private PictureBox pictureBox;
+        private Button buttonRefresh;
+        private Button buttonGoToCheck;
+        private Panel panelStorage;
+        private TextBox textBoxCollectionName;
+        private Label labelCollectionName;
+        private RadioButton radioButtonMassive;
+        private Button buttonCollectionDel;
+        private ListBox listBoxCollection;
+        private Button buttonCollectionAdd;
+        private RadioButton radioButtonList;
+        private Button buttonCreateToCompany;
+        private Panel panelCompanyTools;
+    }
+}
--- a/Project_airbus/Project_airbus/FormAirplanCollection.cs
+++ b/Project_airbus/Project_airbus/FormAirplanCollection.cs
@@ -0,0 +1,282 @@
+using Project_airbus.CollectionGenericObjects;
+using Project_airbus.Drawings;
+
+namespace Project_airbus;
+
+/// <summary>
+/// Форма работы с компанией и ее коллекцией
+/// </summary>
+public partial class FormAirplanCollection : Form
+{
+    /// <summary>
+	/// Хранилише коллекций
+	/// </summary>
+	private readonly StorageCollection<DrawingAirplan> _storageCollection;
+
+    /// <summary>
+    /// Компания
+    /// </summary>
+    private AbstractCompany? _company = null;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormAirplanCollection()
+    {
+        InitializeComponent();
+        _storageCollection = new();
+    }
+
+    /// <summary>
+    /// Выбор компании
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        panelCompanyTools.Enabled = false;
+    }
+
+    /// <summary>
+    /// Добавление обычного самолёта
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonAddAirplan_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingAirplan));
+
+    /// <summary>
+    /// Добавление аэробаса
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonAddAirbus_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingAirbus));
+
+    /// <summary>
+    /// Создание объекта класса-перемещения
+    /// </summary>
+    /// <param name="type">Тип создаваемого объекта</param>
+    private void CreateObject(string type)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        Random random = new();
+        DrawingAirplan drawingAirplan;
+        switch (type)
+        {
+            case nameof(DrawingAirplan):
+                drawingAirplan = new DrawingAirplan(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
+                break;
+            case nameof(DrawingAirbus):
+                drawingAirplan = new DrawingAirbus(random.Next(100, 300), random.Next(1000, 3000), GetColor(random), GetColor(random),
+                    Convert.ToBoolean(random.Next(1, 2)), Convert.ToBoolean(random.Next(1, 2)));
+                break;
+            default:
+                return;
+        }
+
+        if (_company + drawingAirplan != -1)
+        {
+            MessageBox.Show("Объект добавлен");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось добавить объект");
+        }
+    }
+
+    /// <summary>
+    /// Получение цвета
+    /// </summary>
+    /// <param name="random">Генератор случайных чисел</param>
+    /// <returns></returns>
+    private static Color GetColor(Random random)
+    {
+        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;
+        }
+
+        return color;
+    }
+
+    /// <summary>
+    /// Удаление объекта
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonDelAirplan_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null)
+        {
+            return;
+        }
+
+        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+        {
+            return;
+        }
+
+        int pos = Convert.ToInt32(maskedTextBox.Text);
+        if (_company - pos != null)
+        {
+            MessageBox.Show("Объект удален");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось удалить объект");
+        }
+    }
+
+    /// <summary>
+    /// Передача объекта в другую форму
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonGoToCheck_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        DrawingAirplan? airplan = null;
+        int counter = 100;
+        while (airplan == null)
+        {
+            airplan = _company.GetRandomObject();
+            counter--;
+            if (counter <= 0)
+            {
+                break;
+            }
+        }
+
+        if (airplan == null)
+        {
+            return;
+        }
+
+        FormAirbus form = new()
+        {
+            SetAirplan = airplan
+        };
+        form.ShowDialog();
+    }
+
+    /// <summary>
+    /// Перерисовка коллекции
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonRefresh_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        pictureBox.Image = _company.Show();
+    }
+
+    /// <summary>
+    /// Добавление коллекции
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonCollectionAdd_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+        {
+            MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            return;
+        }
+
+        CollectionType collectionType = CollectionType.None;
+        if (radioButtonMassive.Checked)
+        {
+            collectionType = CollectionType.Massive;
+        }
+        else if (radioButtonList.Checked)
+        {
+            collectionType = CollectionType.List;
+        }
+
+        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+        RerfreshListBoxItems();
+
+    }
+
+    /// <summary>
+	/// Обновление списка в listBoxCollection
+	/// </summary>
+	private void RerfreshListBoxItems()
+    {
+        listBoxCollection.Items.Clear();
+        for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
+        {
+            string? colName = _storageCollection.Keys?[i];
+            if (!string.IsNullOrEmpty(colName))
+            {
+                listBoxCollection.Items.Add(colName);
+            }
+        }
+
+    }
+
+    /// <summary>
+	/// Удаление коллекции
+	/// </summary>
+    private void buttonCollectionDel_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+
+        if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+        {
+            return;
+        }
+        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+        RerfreshListBoxItems();
+    }
+
+    /// <summary>
+    /// Создание компании
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonCreateToCompany_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+
+        ICollectionGenericObjects<DrawingAirplan>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+        if (collection == null)
+        {
+            MessageBox.Show("Коллекция не проинициализирована");
+            return;
+        }
+
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new AirplanSharingService(pictureBox.Width, pictureBox.Height, collection);
+                break;
+        }
+
+        panelCompanyTools.Enabled = true;
+        RerfreshListBoxItems();
+    }
+}
--- a/Project_airbus/Project_airbus/FormAirplanCollection.resx
+++ b/Project_airbus/Project_airbus/FormAirplanCollection.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/Project_airbus/Project_airbus/MovementStrategy/AbstractStrategy.cs
+++ b/Project_airbus/Project_airbus/MovementStrategy/AbstractStrategy.cs
@@ -0,0 +1,139 @@
+namespace Project_airbus.MovementStrategy;
+
+/// <summary>
+/// Класс-стратегия перемещения объекта
+/// </summary>
+public abstract class AbstractStrategy
+{
+    /// <summary>
+    /// Перемещаемый объект
+    /// </summary>
+    private IMoveableObject? _moveableObject;
+
+    /// <summary>
+    /// Статус перемещения
+    /// </summary>
+    private StrategyStatus _state = StrategyStatus.NotInit;
+
+    /// <summary>
+    /// Ширина поля
+    /// </summary>
+    protected int FieldWidth { get; private set; }
+
+    /// <summary>
+    /// Высота поля
+    /// </summary>
+    protected int FieldHeight { get; private set; }
+
+    /// <summary>
+    /// Статус перемещения
+    /// </summary>
+    public StrategyStatus GetStatus() { return _state; }
+
+    /// <summary>
+    /// Установка данных
+    /// </summary>
+    /// <param name="moveableObject">Перемещаемый объект</param>
+    /// <param name="width">Ширина поля</param>
+    /// <param name="height">Высота поля</param>
+    public void SetData(IMoveableObject moveableObject, int width, int height)
+    {
+        if (moveableObject == null)
+        {
+            _state = StrategyStatus.NotInit;
+            return;
+        }
+
+        _state = StrategyStatus.InProgress;
+        _moveableObject = moveableObject;
+        FieldWidth = width;
+        FieldHeight = height;
+    }
+
+    /// <summary>
+    /// Шаг перемещения
+    /// </summary>
+    public void MakeStep()
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return;
+        }
+
+        if (IsTargetDestinaion())
+        {
+            _state = StrategyStatus.Finish;
+            return;
+        }
+
+        MoveToTarget();
+    }
+
+    /// <summary>
+    /// Перемещение влево
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+    protected bool MoveLeft() => MoveTo(MovementDirection.Left);
+
+    /// <summary>
+    /// Перемещение вправо
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+    protected bool MoveRight() => MoveTo(MovementDirection.Right);
+
+    /// <summary>
+    /// Перемещение вверх
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+    protected bool MoveUp() => MoveTo(MovementDirection.Up);
+
+    /// <summary>
+    /// Перемещение вниз
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+    protected bool MoveDown() => MoveTo(MovementDirection.Down);
+
+    /// <summary>
+    /// Параметры объекта
+    /// </summary>
+    protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition;
+
+    /// <summary>
+    /// Шаг объекта
+    /// </summary>
+    /// <returns></returns>
+    protected int? GetStep()
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return null;
+        }
+        return _moveableObject?.GetStep;
+    }
+
+    /// <summary>
+    /// Перемещение к цели
+    /// </summary>
+    protected abstract void MoveToTarget();
+
+    /// <summary>
+    /// Достигнута ли цель
+    /// </summary>
+    /// <returns></returns>
+    protected abstract bool IsTargetDestinaion();
+
+    /// <summary>
+    /// Попытка перемещения в требуемом направлении
+    /// </summary>
+    /// <param name="movementDirection">Направление</param>
+    /// <returns>Результат попытки (true - удалось переместиться, false - неудача)</returns>
+    private bool MoveTo(MovementDirection movementDirection)
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return false;
+        }
+
+        return _moveableObject?.TryMoveObject(movementDirection) ?? false;
+    }
+}
--- a/Project_airbus/Project_airbus/MovementStrategy/IMoveableObject.cs
+++ b/Project_airbus/Project_airbus/MovementStrategy/IMoveableObject.cs
@@ -0,0 +1,24 @@
+namespace Project_airbus.MovementStrategy;
+
+/// <summary>
+/// Интерфейс для работы с перемещаемым объектом
+/// </summary>
+public interface IMoveableObject
+{
+    /// <summary>
+    /// Получение координаты объекта
+    /// </summary>
+    ObjectParameters? GetObjectPosition { get; }
+
+    /// <summary>
+    /// Шаг объекта
+    /// </summary>
+    int GetStep { get; }
+
+    /// <summary>
+    /// Попытка переместить объект в указанном направлении
+    /// </summary>
+    /// <param name="direction">Направление</param>
+    /// <returns>true - объект перемещен, false - перемещение невозможно</returns>
+    bool TryMoveObject(MovementDirection direction);
+}
--- a/Project_airbus/Project_airbus/MovementStrategy/MoveToBorder.cs
+++ b/Project_airbus/Project_airbus/MovementStrategy/MoveToBorder.cs
@@ -0,0 +1,55 @@
+namespace Project_airbus.MovementStrategy;
+
+/// <summary>
+/// Стратегия перемещения к краю экрана
+/// </summary>
+public class MoveToBorder : AbstractStrategy
+{
+    protected override bool IsTargetDestinaion()
+    {
+        var objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return false;
+        }
+        return objParams.RightBorder <= FieldWidth &&
+        objParams.RightBorder + GetStep() >= FieldWidth &&
+        objParams.DownBorder <= FieldHeight &&
+        objParams.DownBorder + GetStep() >= FieldHeight;
+    }
+
+    protected override void MoveToTarget()
+    {
+        {
+            var objParams = GetObjectParameters;
+            if (objParams == null)
+            {
+                return;
+            }
+            var diffX = objParams.ObjectMiddleHorizontal - FieldWidth;
+            if (Math.Abs(diffX) > GetStep())
+            {
+                if (diffX > 0)
+                {
+                    MoveLeft();
+                }
+                else
+                {
+                    MoveRight();
+                }
+            }
+            var diffY = objParams.ObjectMiddleVertical - FieldHeight;
+            if (Math.Abs(diffY) > GetStep())
+            {
+                if (diffY > 0)
+                {
+                    MoveUp();
+                }
+                else
+                {
+                    MoveDown();
+                }
+            }
+        }
+    }
+}
--- a/Project_airbus/Project_airbus/MovementStrategy/MoveToCenter.cs
+++ b/Project_airbus/Project_airbus/MovementStrategy/MoveToCenter.cs
@@ -0,0 +1,54 @@
+namespace Project_airbus.MovementStrategy;
+
+/// <summary>
+/// Стратегия перемещения объекта в центр экрана
+/// </summary>
+public class MoveToCenter : AbstractStrategy
+{
+    protected override bool IsTargetDestinaion()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return false;
+        }
+
+        return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2 && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
+            objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2 && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
+    }
+
+    protected override void MoveToTarget()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return;
+        }
+
+        int diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
+        if (Math.Abs(diffX) > GetStep())
+        {
+            if (diffX > 0)
+            {
+                MoveLeft();
+            }
+            else
+            {
+                MoveRight();
+            }
+        }
+
+        int diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
+        if (Math.Abs(diffY) > GetStep())
+        {
+            if (diffY > 0)
+            {
+                MoveUp();
+            }
+            else
+            {
+                MoveDown();
+            }
+        }
+    }
+}
--- a/Project_airbus/Project_airbus/MovementStrategy/MoveableAirplan.cs
+++ b/Project_airbus/Project_airbus/MovementStrategy/MoveableAirplan.cs
@@ -0,0 +1,64 @@
+using Project_airbus.Drawings;
+
+namespace Project_airbus.MovementStrategy;
+
+/// <summary>
+/// Класс-реализация IMoveableObject с использованием DrawningAirplan
+/// </summary>
+public class MoveableAirplan : IMoveableObject
+{
+    /// <summary>
+    /// Поле-объект класса DrawningAirplan или его наследника
+    /// </summary>
+    private readonly DrawingAirplan? _airplan = null;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="airplan">Объект класса DrawningAirplan</param>
+    public MoveableAirplan(DrawingAirplan airplan)
+    {
+        _airplan = airplan;
+    }
+
+    public ObjectParameters? GetObjectPosition
+    {
+        get
+        {
+            if (_airplan == null || _airplan.EntityAirplan == null || !_airplan.GetPosX.HasValue || !_airplan.GetPosY.HasValue)
+            {
+                return null;
+            }
+            return new ObjectParameters(_airplan.GetPosX.Value, _airplan.GetPosY.Value, _airplan.GetWidth, _airplan.GetHeight);
+        }
+    }
+
+    public int GetStep => (int)(_airplan?.EntityAirplan?.step ?? 0);
+
+    public bool TryMoveObject(MovementDirection direction)
+    {
+        if (_airplan == null || _airplan.EntityAirplan == null)
+        {
+            return false;
+        }
+
+        return _airplan.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,
+        };
+    }
+}
--- a/Project_airbus/Project_airbus/MovementStrategy/MovementDirection.cs
+++ b/Project_airbus/Project_airbus/MovementStrategy/MovementDirection.cs
@@ -0,0 +1,27 @@
+namespace Project_airbus.MovementStrategy;
+
+/// <summary>
+/// Направление перемещения
+/// </summary>
+public enum MovementDirection
+{
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Up = 1,
+
+    /// <summary>
+    /// Вниз
+    /// </summary>
+    Down = 2,
+
+    /// <summary>
+    /// Влево
+    /// </summary>
+    Left = 3,
+
+    /// <summary>
+    /// Вправо
+    /// </summary>
+    Right = 4
+}
--- a/Project_airbus/Project_airbus/MovementStrategy/ObjectParameters.cs
+++ b/Project_airbus/Project_airbus/MovementStrategy/ObjectParameters.cs
@@ -0,0 +1,72 @@
+namespace Project_airbus.MovementStrategy;
+
+/// <summary>
+/// Параметры-координаты объекта
+/// </summary>
+public class ObjectParameters
+{
+    /// <summary>
+    /// Координата X
+    /// </summary>
+    private readonly int _x;
+
+    /// <summary>
+    /// Координата Y
+    /// </summary>
+    private readonly int _y;
+
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    private readonly int _width;
+
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    private readonly int _height;
+
+    /// <summary>
+    /// Левая граница
+    /// </summary>
+    public int LeftBorder => _x;
+
+    /// <summary>
+    /// Верхняя граница
+    /// </summary>
+    public int TopBorder => _y;
+
+    /// <summary>
+    /// Правая граница
+    /// </summary>
+    public int RightBorder => _x + _width;
+
+    /// <summary>
+    /// Нижняя граница
+    /// </summary>
+    public int DownBorder => _y + _height;
+
+    /// <summary>
+    /// Середина объекта
+    /// </summary>
+    public int ObjectMiddleHorizontal => _x + _width / 2;
+
+    /// <summary>
+    /// Середина объекта
+    /// </summary>
+    public int ObjectMiddleVertical => _y + _height / 2;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="x">Координата X</param>
+    /// <param name="y">Координата Y</param>
+    /// <param name="width">Ширина объекта</param>
+    /// <param name="height">Высота объекта</param>
+    public ObjectParameters(int x, int y, int width, int height)
+    {
+        _x = x;
+        _y = y;
+        _width = width;
+        _height = height;
+    }
+}
--- a/Project_airbus/Project_airbus/MovementStrategy/StrategyStatus.cs
+++ b/Project_airbus/Project_airbus/MovementStrategy/StrategyStatus.cs
@@ -0,0 +1,22 @@
+namespace Project_airbus.MovementStrategy;
+
+/// <summary>
+/// Статус выполнения операции перемещения
+/// </summary>
+public enum StrategyStatus
+{
+    /// <summary>
+    /// Все готово к началу
+    /// </summary>
+    NotInit,
+
+    /// <summary>
+    /// Выполняется
+    /// </summary>
+    InProgress,
+
+    /// <summary>
+    /// Завершено
+    /// </summary>
+    Finish
+}
--- a/Project_airbus/Project_airbus/Program.cs
+++ b/Project_airbus/Project_airbus/Program.cs
@@ -11,7 +11,7 @@ namespace Project_airbus
            // To customize application configuration such as set high DPI settings or default font,
            // see https://aka.ms/applicationconfiguration.
            ApplicationConfiguration.Initialize();
-            Application.Run(new FormAirbus());
+            Application.Run(new FormAirplanCollection());
        }
    }
 }
--- a/Project_airbus/Project_airbus/Project_airbus.csproj
+++ b/Project_airbus/Project_airbus/Project_airbus.csproj
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
    <Nullable>enable</Nullable>
    <UseWindowsForms>true</UseWindowsForms>
    <ImplicitUsings>enable</ImplicitUsings>
Author	SHA1	Message	Date
Evgehil	33559a2fa7	Мелкие правки	2024-03-18 11:08:26 +04:00
Evgehil	97f0854999	Доработка лабораторной работы	2024-03-18 10:58:30 +04:00
Evgehil	2fa4300a97	4 Лабораторная работа	2024-03-17 19:24:38 +04:00
Evgehil	83ecb3cee3	Компания	2024-03-16 21:39:34 +04:00
Evgehil	11d6bcda7f	Добавление коллекции	2024-03-16 18:21:25 +04:00
Evgehil	7a8cf90158	Добавление стратегии	2024-03-03 21:39:43 +04:00