Финальное закрепление ветки

ProjectLiner/ProjectLiner/CollectionGenericObjects/AbstractCompany.cs

@@ -0,0 +1,118 @@
+using ProjectLiner.Drawnings;
+
+namespace ProjectLiner.CollectionGenericObjects
+{
+    /// <summary>
+    /// Абстракция компании, хранящий коллекцию лайнеров
+    /// </summary>
+    public abstract class AbstractCompany
+    {
+        /// <summary>
+        /// Размер места (ширина)
+        /// </summary>
+        protected readonly int _placeSizeWidth = 210;
+
+        /// <summary>
+        /// Размер места (высота)
+        /// </summary>
+        protected readonly int _placeSizeHeight = 110;
+
+        /// <summary>
+        /// Ширина окна
+        /// </summary>
+        protected readonly int _pictureWidth;
+
+        /// <summary>
+        /// Высота окна
+        /// </summary>
+        protected readonly int _pictureHeight;
+
+        /// <summary>
+        /// Коллекция лайнеров
+        /// </summary>
+        protected ICollectionGenericObjects<DrawningCommonLiner>? _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<DrawningCommonLiner> collection)
+        {
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _collection = collection;
+            _collection.SetMaxCount = GetMaxCount;
+        }
+
+        /// <summary>
+        /// Перегрузка оператора сложения для класса
+        /// </summary>
+        /// <param name="company">Компания</param>
+        /// <param name="Liner">Добавляемый объект</param>
+        /// <returns></returns>
+
+        public static int operator +(AbstractCompany company, DrawningCommonLiner airplan)
+        {
+            return company._collection.Insert(airplan);
+        }
+
+        /// <summary>
+        /// Перегрузка оператора удаления для класса
+        /// </summary>
+        /// <param name="company">Компания</param>
+        /// <param name="position">Номер удаляемого объекта</param>
+        /// <returns></returns>
+        public static DrawningCommonLiner operator -(AbstractCompany company, int position)
+        {
+            return company._collection.Remove(position);
+        }
+
+        /// <summary>
+        /// Получение случайного объекта из коллекции
+        /// </summary>
+        /// <returns></returns>
+        public DrawningCommonLiner? 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)
+            {
+                DrawningCommonLiner? 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();
+    }
+}

ProjectLiner/ProjectLiner/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -0,0 +1,49 @@
+namespace ProjectLiner.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);
+    }
+}

ProjectLiner/ProjectLiner/CollectionGenericObjects/LinerSharingService.cs

@@ -0,0 +1,64 @@
+using ProjectLiner.Drawnings;
+
+namespace ProjectLiner.CollectionGenericObjects;
+
+/// <summary>
+/// Реализация абстрактной компании - лайнер
+/// </summary>
+public class LinerSharingService : AbstractCompany
+{
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="picWidth">Ширина</param>
+    /// <param name="picHeight">Высота</param>
+    /// <param name="collection">Коллекция</param>
+    public LinerSharingService(int picWidth, int picHeight, ICollectionGenericObjects<DrawningCommonLiner> collection) : base(picWidth, picHeight, collection)
+    {
+    }
+
+    protected override void DrawBackgound(Graphics g)
+    {
+        Pen pen = new(Color.Black, 4);
+        for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
+        {
+            for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
+            {
+                g.DrawLine(pen, i * _placeSizeWidth, (int)(j * _placeSizeHeight * 1.3),
+                    i * _placeSizeWidth + _placeSizeWidth - 40, (int)(j * _placeSizeHeight * 1.3));
+            }
+            g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight);
+        }
+    }
+
+
+    protected override void SetObjectsPosition()
+    {
+        int width = _pictureWidth / _placeSizeWidth;
+        int height = _pictureHeight / _placeSizeHeight;
+
+        int curWidth = width - 1;
+        int curHeight = 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 * curWidth + 10, (int)(curHeight * _placeSizeHeight * 1.3));
+            }
+
+            if (curWidth > 0)
+                curWidth--;
+            else
+            {
+                curWidth = width - 1;
+                curHeight++;
+            }
+            if (curHeight > height)
+            {
+                return;
+            }
+        }
+    }
+}

ProjectLiner/ProjectLiner/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -0,0 +1,121 @@
+
+namespace ProjectLiner.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 < 0 || position >= Count)
+                return null;
+            return _collection[position];
+        }
+
+        public int Insert(T obj)
+        {
+            for (int i = 0; i < Count; i++)
+            {
+                if (_collection[i] == null)
+                {
+                    _collection[i] = obj;
+                    return i;
+                }
+            }
+            return -1;
+        }
+
+        public int Insert(T obj, int position)
+        {
+            if (position < 0 || position >= Count)
+            {
+                return -1;
+            }
+
+            if (_collection[position] != null)
+            {
+                bool pushed = false;
+                for (int index = position + 1; index < Count; index++)
+                {
+                    if (_collection[index] == null)
+                    {
+                        position = index;
+                        pushed = true;
+                        break;
+                    }
+                }
+
+                if (!pushed)
+                {
+                    for (int index = position - 1; index >= 0; index--)
+                    {
+                        if (_collection[index] == null)
+                        {
+                            position = index;
+                            pushed = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (!pushed)
+                {
+                    return position;
+                }
+            }
+
+            _collection[position] = obj;
+            return position;
+        }
+
+        public T? Remove(int position)
+        {
+            if (position < 0 || position >= Count)
+            {
+                return null;
+            }
+
+            if (_collection[position] == null) return null;
+
+            T? temp = _collection[position];
+            _collection[position] = null;
+            return temp;
+        }
+    }
+}

ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs

@@ -1,9 +1,5 @@
 using ProjectLiner.Entities;
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace ProjectLiner.Drawnings;
 /// <summary>

ProjectLiner/ProjectLiner/FormLiner.Designer.cs

@@ -29,12 +29,10 @@
         private void InitializeComponent()
         {
             pictureBoxLiner = new PictureBox();
-            buttonCreate = new Button();
             buttonDown = new Button();
             buttonUp = new Button();
             buttonLeft = new Button();
             buttonRight = new Button();
-            buttonCreateCommonLiner = new Button();
             comboBoxStrategy = new ComboBox();
             buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxLiner).BeginInit();
@@ -45,30 +43,21 @@
             pictureBoxLiner.BackColor = SystemColors.Control;
             pictureBoxLiner.Dock = DockStyle.Fill;
             pictureBoxLiner.Location = new Point(0, 0);
+            pictureBoxLiner.Margin = new Padding(5);
             pictureBoxLiner.Name = "pictureBoxLiner";
-            pictureBoxLiner.Size = new Size(948, 614);
+            pictureBoxLiner.Size = new Size(1465, 1007);
             pictureBoxLiner.TabIndex = 0;
             pictureBoxLiner.TabStop = false;
             // 
-            // buttonCreate
-            // 
-            buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreate.Location = new Point(12, 544);
-            buttonCreate.Name = "buttonCreate";
-            buttonCreate.Size = new Size(203, 58);
-            buttonCreate.TabIndex = 1;
-            buttonCreate.Text = "Создать Лайнер";
-            buttonCreate.UseVisualStyleBackColor = true;
-            buttonCreate.Click += buttonCreate_Click;
-            // 
             // buttonDown
             // 
             buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonDown.BackgroundImage = Properties.Resources.bottom;
             buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonDown.Location = new Point(830, 552);
+            buttonDown.Location = new Point(1283, 905);
+            buttonDown.Margin = new Padding(5);
             buttonDown.Name = "buttonDown";
-            buttonDown.Size = new Size(50, 50);
+            buttonDown.Size = new Size(77, 82);
             buttonDown.TabIndex = 2;
             buttonDown.UseVisualStyleBackColor = true;
             buttonDown.Click += ButtonMove_Click;
@@ -78,9 +67,10 @@
             buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonUp.BackgroundImage = Properties.Resources.top;
             buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonUp.Location = new Point(830, 496);
+            buttonUp.Location = new Point(1283, 813);
+            buttonUp.Margin = new Padding(5);
             buttonUp.Name = "buttonUp";
-            buttonUp.Size = new Size(50, 50);
+            buttonUp.Size = new Size(77, 82);
             buttonUp.TabIndex = 3;
             buttonUp.UseVisualStyleBackColor = true;
             buttonUp.Click += ButtonMove_Click;
@@ -90,9 +80,10 @@
             buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonLeft.BackgroundImage = Properties.Resources.left;
             buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonLeft.Location = new Point(774, 552);
+            buttonLeft.Location = new Point(1196, 905);
+            buttonLeft.Margin = new Padding(5);
             buttonLeft.Name = "buttonLeft";
-            buttonLeft.Size = new Size(50, 50);
+            buttonLeft.Size = new Size(77, 82);
             buttonLeft.TabIndex = 4;
             buttonLeft.UseVisualStyleBackColor = true;
             buttonLeft.Click += ButtonMove_Click;
@@ -102,39 +93,31 @@
             buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonRight.BackgroundImage = Properties.Resources.right;
             buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonRight.Location = new Point(886, 552);
+            buttonRight.Location = new Point(1369, 905);
+            buttonRight.Margin = new Padding(5);
             buttonRight.Name = "buttonRight";
-            buttonRight.Size = new Size(50, 50);
+            buttonRight.Size = new Size(77, 82);
             buttonRight.TabIndex = 5;
             buttonRight.UseVisualStyleBackColor = true;
             buttonRight.Click += ButtonMove_Click;
             // 
-            // buttonCreateCommonLiner
-            // 
-            buttonCreateCommonLiner.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateCommonLiner.Location = new Point(221, 544);
-            buttonCreateCommonLiner.Name = "buttonCreateCommonLiner";
-            buttonCreateCommonLiner.Size = new Size(240, 58);
-            buttonCreateCommonLiner.TabIndex = 6;
-            buttonCreateCommonLiner.Text = "Создать Обычный Лайнер";
-            buttonCreateCommonLiner.UseVisualStyleBackColor = true;
-            buttonCreateCommonLiner.Click += buttonCreateCommonLiner_Click;
-            // 
             // comboBoxStrategy
             // 
             comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxStrategy.FormattingEnabled = true;
             comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
-            comboBoxStrategy.Location = new Point(742, 12);
+            comboBoxStrategy.Location = new Point(1147, 20);
+            comboBoxStrategy.Margin = new Padding(5);
             comboBoxStrategy.Name = "comboBoxStrategy";
-            comboBoxStrategy.Size = new Size(194, 33);
+            comboBoxStrategy.Size = new Size(298, 49);
             comboBoxStrategy.TabIndex = 11;
             // 
             // buttonStrategyStep
             // 
-            buttonStrategyStep.Location = new Point(816, 51);
+            buttonStrategyStep.Location = new Point(1261, 84);
+            buttonStrategyStep.Margin = new Padding(5);
             buttonStrategyStep.Name = "buttonStrategyStep";
-            buttonStrategyStep.Size = new Size(120, 37);
+            buttonStrategyStep.Size = new Size(185, 61);
             buttonStrategyStep.TabIndex = 12;
             buttonStrategyStep.Text = "Шаг";
             buttonStrategyStep.UseVisualStyleBackColor = true;
@@ -142,18 +125,17 @@
             // 
             // FormLiner
             // 
-            AutoScaleDimensions = new SizeF(11F, 25F);
+            AutoScaleDimensions = new SizeF(17F, 41F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(948, 614);
+            ClientSize = new Size(1465, 1007);
             Controls.Add(buttonStrategyStep);
             Controls.Add(comboBoxStrategy);
-            Controls.Add(buttonCreateCommonLiner);
             Controls.Add(buttonRight);
             Controls.Add(buttonLeft);
             Controls.Add(buttonUp);
             Controls.Add(buttonDown);
-            Controls.Add(buttonCreate);
             Controls.Add(pictureBoxLiner);
+            Margin = new Padding(5);
             Name = "FormLiner";
             Text = "Лайнер";
             ((System.ComponentModel.ISupportInitialize)pictureBoxLiner).EndInit();
@@ -163,12 +145,10 @@
         #endregion
 
         private PictureBox pictureBoxLiner;
-        private Button buttonCreate;
         private Button buttonDown;
         private Button buttonUp;
         private Button buttonLeft;
         private Button buttonRight;
-        private Button buttonCreateCommonLiner;
         private ComboBox comboBoxStrategy;
         private Button buttonStrategyStep;
     }

ProjectLiner/ProjectLiner/FormLiner.cs

@@ -23,6 +23,23 @@ namespace ProjectLiner
             _strategy = null;
         }
 
+
+        /// <summary>
+        /// Стратегия перемещения
+        /// </summary>
+
+        public DrawningCommonLiner SetLiner
+        {
+            set
+            {
+                _drawningCommonLiner = value;
+                _drawningCommonLiner.SetPictureSize(pictureBoxLiner.Width, pictureBoxLiner.Height);
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+                Draw();
+            }
+        }
+
         /// <summary>
         /// Метод прорисовки лайнера
         /// </summary>
@@ -39,57 +56,6 @@ namespace ProjectLiner
             pictureBoxLiner.Image = bmp;
         }
 
-        /// <summary>
-        /// Создание объекта класса-перемещения
-        /// </summary>
-        /// <param name="type">Тип создаваемого объекта</param>
-        private void CreateObject(string type)
-        {
-            Random random = new();
-            switch (type)
-            {
-                case nameof(DrawningCommonLiner):
-                    _drawningCommonLiner = new DrawningCommonLiner(random.Next(100, 300), random.Next(1000, 3000),
-                        Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
-                    break;
-                case nameof(DrawningLiner):
-                    _drawningCommonLiner = new DrawningLiner(random.Next(100, 300), random.Next(1000, 3000),
-                        Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-                        Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-                        Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-                    break;
-                default:
-                    return;
-
-            }
-
-            _drawningCommonLiner.SetPictureSize(pictureBoxLiner.Width, pictureBoxLiner.Height);
-            _drawningCommonLiner.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            _strategy = null;
-            comboBoxStrategy.Enabled = true;
-            Draw();
-        }
-
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать Лайнер"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonCreate_Click(object sender, EventArgs e)
-        {
-            CreateObject(nameof(DrawningLiner));
-        }
-
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать Обычный Лайнер"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-
-        private void buttonCreateCommonLiner_Click(object sender, EventArgs e)
-        {
-            CreateObject(nameof(DrawningCommonLiner));
-        }
 
         /// <summary>
         /// Перемещение объекта по форме (нажатие кнопок навигации)

ProjectLiner/ProjectLiner/FormLinerCollection.Designer.cs

@@ -0,0 +1,173 @@
+namespace ProjectLiner
+{
+    partial class FormLinerCollection
+    {
+        /// <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();
+            buttonRefresh = new Button();
+            buttonGoToCheck = new Button();
+            buttonRemoveLiner = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
+            buttonAddCommonLiner = new Button();
+            buttonAddLiner = new Button();
+            comboBoxSelectorCompany = new ComboBox();
+            pictureBox = new PictureBox();
+            groupBoxTools.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(buttonRefresh);
+            groupBoxTools.Controls.Add(buttonGoToCheck);
+            groupBoxTools.Controls.Add(buttonRemoveLiner);
+            groupBoxTools.Controls.Add(maskedTextBoxPosition);
+            groupBoxTools.Controls.Add(buttonAddCommonLiner);
+            groupBoxTools.Controls.Add(buttonAddLiner);
+            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.Location = new Point(1053, 0);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Size = new Size(272, 845);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "Инструменты";
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(33, 683);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(217, 76);
+            buttonRefresh.TabIndex = 6;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += ButtonRefresh_Click;
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(33, 562);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(217, 76);
+            buttonGoToCheck.TabIndex = 5;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_Click;
+            // 
+            // buttonRemoveLiner
+            // 
+            buttonRemoveLiner.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemoveLiner.Location = new Point(33, 416);
+            buttonRemoveLiner.Name = "buttonRemoveLiner";
+            buttonRemoveLiner.Size = new Size(217, 76);
+            buttonRemoveLiner.TabIndex = 4;
+            buttonRemoveLiner.Text = "Удаление Лайнера";
+            buttonRemoveLiner.UseVisualStyleBackColor = true;
+            buttonRemoveLiner.Click += ButtonRemoveLiner_Click;
+            // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Location = new Point(33, 363);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(217, 47);
+            maskedTextBoxPosition.TabIndex = 3;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
+            // buttonAddCommonLiner
+            // 
+            buttonAddCommonLiner.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddCommonLiner.Location = new Point(33, 236);
+            buttonAddCommonLiner.Name = "buttonAddCommonLiner";
+            buttonAddCommonLiner.Size = new Size(217, 76);
+            buttonAddCommonLiner.TabIndex = 2;
+            buttonAddCommonLiner.Text = "Добавление Обычного Лайнера";
+            buttonAddCommonLiner.UseVisualStyleBackColor = true;
+            buttonAddCommonLiner.Click += ButtonAddCommonLiner_Click;
+            // 
+            // buttonAddLiner
+            // 
+            buttonAddLiner.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddLiner.Location = new Point(33, 126);
+            buttonAddLiner.Name = "buttonAddLiner";
+            buttonAddLiner.Size = new Size(217, 76);
+            buttonAddLiner.TabIndex = 1;
+            buttonAddLiner.Text = "Добавление Лайнера";
+            buttonAddLiner.UseVisualStyleBackColor = true;
+            buttonAddLiner.Click += ButtonAddLiner_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(18, 46);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(242, 49);
+            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(1053, 845);
+            pictureBox.TabIndex = 1;
+            pictureBox.TabStop = false;
+            // 
+            // FormLinerCollection
+            // 
+            AutoScaleDimensions = new SizeF(17F, 41F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1325, 845);
+            Controls.Add(pictureBox);
+            Controls.Add(groupBoxTools);
+            Name = "FormLinerCollection";
+            Text = "Коллекция автомобилей";
+            groupBoxTools.ResumeLayout(false);
+            groupBoxTools.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private Button buttonAddLiner;
+        private ComboBox comboBoxSelectorCompany;
+        private Button buttonAddCommonLiner;
+        private PictureBox pictureBox;
+        private Button buttonGoToCheck;
+        private Button buttonRemoveLiner;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonRefresh;
+    }
+}

ProjectLiner/ProjectLiner/FormLinerCollection.cs

@@ -0,0 +1,188 @@
+using ProjectLiner.CollectionGenericObjects;
+using ProjectLiner.Drawnings;
+using System.Windows.Forms;
+
+namespace ProjectLiner
+{
+    /// <summary>
+    /// Форма работы с компанией и ее коллекцией
+    /// </summary>
+    public partial class FormLinerCollection : Form
+    {
+        /// <summary>
+        /// Компания
+        /// </summary>
+        private AbstractCompany? _company = null;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormLinerCollection()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// Выбор компании
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            switch (comboBoxSelectorCompany.Text)
+            {
+                case "Хранилище":
+                    _company = new LinerSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningCommonLiner>());
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Создание объекта класса-перемещения
+        /// </summary>
+        /// <param name="type">Тип создаваемого объекта</param>
+        private void CreateObject(string type)
+        {
+            if (_company == null)
+            {
+                return;
+            }
+
+            Random random = new();
+            DrawningCommonLiner drawingLiner;
+            switch (type)
+            {
+                case nameof(DrawningCommonLiner):
+                    drawingLiner = new DrawningCommonLiner(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
+                    break;
+                case nameof(DrawningLiner):
+                    drawingLiner = new DrawningLiner(random.Next(100, 300), random.Next(1000, 3000), GetColor(random), GetColor(random),
+                        Convert.ToBoolean(random.Next(1, 2)), Convert.ToBoolean(random.Next(1, 2)), Convert.ToBoolean(random.Next(1, 2)));
+                    break;
+                default:
+                    return;
+            }
+
+            if (_company + drawingLiner != -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 ButtonAddCommonLiner_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningCommonLiner));
+
+        /// <summary>
+        /// Добавление лайнера
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddLiner_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningLiner));
+
+        /// <summary>
+        /// Удаление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRemoveLiner_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
+            {
+                return;
+            }
+
+            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+            {
+                return;
+            }
+
+            int pos = Convert.ToInt32(maskedTextBoxPosition.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;
+            }
+
+            DrawningCommonLiner? liner = null;
+            int counter = 100;
+            while (liner == null)
+            {
+                liner = _company.GetRandomObject();
+                counter--;
+                if (counter <= 0)
+                {
+                    break;
+                }
+            }
+
+            if (liner == null)
+            {
+                return;
+            }
+
+            FormLiner form = new()
+            {
+                SetLiner = liner
+            };
+            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();
+        }
+    }
+}

ProjectLiner/ProjectLiner/FormLinerCollection.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>

ProjectLiner/ProjectLiner/MovementStrategy/IMoveableObjectcs.cs

@@ -16,6 +16,8 @@ public interface IMoveableObject
     /// </summary>
     ObjectParameters? GetObjectPosition { get; }
 
+    int AnotherStep { set; }
+
     /// <summary>
     /// Шаг объекта
     /// </summary>
@@ -27,4 +29,12 @@ public interface IMoveableObject
     /// <param name="direction">Направление</param>
     /// <returns>true - объект перемещен, false - перемещение невозможно</returns>
     bool TryMoveObject(MovementDirection direction);
+
+
+    /// <summary>
+    /// ненужный метод
+    /// </summary>
+    /// <param name="value">Первое число</param>
+
+    void MegaTurboStep(int value);
 }

ProjectLiner/ProjectLiner/MovementStrategy/MoveableLiner.cs

@@ -1,4 +1,5 @@
 using ProjectLiner.Drawnings;
+using ProjectLiner.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -40,13 +41,20 @@ public class MoveableLiner : IMoveableObject
 
     public int GetStep => (int)(_CommonLiner?.EntityCommonLiner?.Step ?? 0);
 
+    public int AnotherStep
+    {
+        set
+        {
+            AnotherStep = value;
+        }
+    }
+
     public bool TryMoveObject(MovementDirection direction)
     {
         if (_CommonLiner == null || _CommonLiner.EntityCommonLiner == null)
         {
             return false;
         }
-
         return _CommonLiner.MoveTransport(GetDirectionType(direction));
     }
 
@@ -66,4 +74,9 @@ public class MoveableLiner : IMoveableObject
             _ => DirectionType.Unknow,
         };
     }
+
+    public void MegaTurboStep(int value)
+    {
+        AnotherStep = value;
+    }
 }

ProjectLiner/ProjectLiner/Program.cs

@@ -11,7 +11,7 @@ namespace ProjectLiner
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormLiner());
+            Application.Run(new FormLinerCollection());
         }
     }
 }