ProjectDumpTruck/ProjectDumpTruck/CollectionGenericObject/AbstractCompany.cs

@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ProjectDumpTruck.Drawnings;
+
+namespace ProjectDumpTruck.CollectionGenericObject;
+
+public abstract class AbstractCompany 
+{
+    /// <summary>
+    /// Размер места (ширина)
+    /// </summary>
+    protected readonly int _placeSizeWidth = 310;
+    /// <summary>
+    /// Размер места (высота)
+    /// </summary>
+    protected readonly int _placeSizeHeight = 125;
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    protected readonly int _pictureWidth;
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    protected readonly int _pictureHeight;
+    /// <summary>
+    /// Коллекция грузовиков
+    /// </summary>
+    protected ICollectionGenericObject<DrawningTruck>? _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,
+    ICollectionGenericObject<DrawningTruck> collection)
+    {
+        _pictureWidth = picWidth;
+        _pictureHeight = picHeight;
+        _collection = collection;
+        _collection.SetMaxCount = GetMaxCount;
+    }
+    /// <summary>
+    /// Перегрузка оператора сложения для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="truck">Добавляемый объект</param>
+    /// <returns></returns>
+    public static int operator +(AbstractCompany company, DrawningTruck truck)
+    {
+        return company._collection.Insert(truck);
+    }
+
+    /// <summary>
+    /// Перегрузка оператора удаления для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="position">Номер удаляемого объекта</param>
+    /// <returns></returns>
+    public static DrawningTruck? operator -(AbstractCompany company, int position)
+    {
+        return company._collection?.Remove(position-1);
+    }
+
+    /// <summary>
+    /// Получение случайного объекта из коллекции
+    /// </summary>
+    /// <returns></returns>
+    public DrawningTruck? 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);
+        DrawBackground(graphics);
+
+        SetObjectsPosition();
+        for (int i = 0; i < (_collection?.Count ?? 0); ++i)
+        {
+            DrawningTruck? obj = _collection?.Get(i);
+            obj?.DrawTransport(graphics);
+        }
+        return bitmap;
+    }
+
+    /// <summary>
+    /// Вывод заднего фона
+    /// </summary>
+    /// <param name="g"></param>
+    protected abstract void DrawBackground(Graphics g);
+
+    /// <summary>
+    /// Расстановка объектов
+    /// </summary>
+    protected abstract void SetObjectsPosition();
+
+}

ProjectDumpTruck/ProjectDumpTruck/CollectionGenericObject/Autopark.cs

@@ -0,0 +1,66 @@
+using ProjectDumpTruck.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectDumpTruck.CollectionGenericObject;
+
+public class Autopark : AbstractCompany
+{
+    public Autopark(int picWidth, int picHeight, ICollectionGenericObject<DrawningTruck> collection) : base(picWidth, picHeight, collection)
+    {
+    }
+
+    protected override void DrawBackground(Graphics g)
+    {
+        Pen pen = new(Color.Black, 2);
+        Pen Pen2 = new(Color.Black, 3);
+
+        for (int i = 0; i < _pictureHeight / _placeSizeHeight; i++)
+        {
+            int y = _placeSizeHeight;
+            y *= i;
+
+            for (int j = 0; j <= _pictureWidth / _placeSizeWidth; j++)
+            {
+                int x = _placeSizeWidth;
+                x *= j;
+
+                g.DrawLine(Pen2, x+10, y, x + _placeSizeWidth / 2, y);
+                g.DrawLine(Pen2, x+10, y + _placeSizeHeight - 10, x + _placeSizeWidth / 2, y + _placeSizeHeight - 10);
+                g.DrawLine(pen, x + 10, y, x+10, y + _placeSizeHeight - 10);
+            }
+        }
+    }
+
+    protected override void SetObjectsPosition()
+    {
+        int n = 0;
+        int m = 0;
+
+        for (int i = 0; i < (_collection?.Count ?? 0); i++)
+        {
+            if (_collection?.Get(i) != null)
+            {
+                int x = 20 + _placeSizeWidth * n;
+                int y = 10 + _placeSizeHeight * m;
+
+                _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
+                _collection?.Get(i)?.SetPosition(x, y);
+            }
+
+            if (n < _pictureWidth / _placeSizeWidth)
+                n++;
+            else
+            {
+                n = 0;
+                m++;
+            }
+        }
+    }
+
+   
+
+}

ProjectDumpTruck/ProjectDumpTruck/CollectionGenericObject/ICollectionGenericObject.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectDumpTruck.CollectionGenericObject;
+
+public interface ICollectionGenericObject<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);
+
+}

ProjectDumpTruck/ProjectDumpTruck/CollectionGenericObject/MassiveGenericObjects.cs

@@ -0,0 +1,118 @@
+    using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection.Metadata.Ecma335;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectDumpTruck.CollectionGenericObject;
+
+public class MassiveGenericObjects<T> : ICollectionGenericObject<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)
+    {
+        // TODO проверка позиции
+        if (position < 0 || position >= Count)
+        {
+            return null;
+        }
+        return _collection[position];
+    }
+
+    public int Insert(T obj)
+    {
+        // TODO вставка в свободное место набора
+        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)
+        {
+            _collection[position] = obj;
+            return position;
+        }
+
+        for (int i = position + 1; i < Count; i++)
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return i;
+            }
+        }
+
+        for (int i = position - 1; i >= 0; i--)
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return i;
+            }
+        }
+
+        return -1;
+    }
+    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;
+    }
+}

ProjectDumpTruck/ProjectDumpTruck/FormDumpTruck.Designer.cs

@@ -28,35 +28,22 @@
         /// </summary>
         private void InitializeComponent()
         {
-            buttonCreateDumpTruck = new Button();
             buttonLeft = new Button();
             buttonRight = new Button();
             buttonUp = new Button();
             buttonDown = new Button();
-            buttonCreateTruck = new Button();
             comboBoxStrategy = new ComboBox();
             buttonStrategyStep = new Button();
-            pictureBoxDumpTruck1 = new PictureBox();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxDumpTruck1).BeginInit();
+            pictureBoxDumpTruck = new PictureBox();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxDumpTruck).BeginInit();
             SuspendLayout();
             // 
-            // buttonCreateDumpTruck
-            // 
-            buttonCreateDumpTruck.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateDumpTruck.Location = new Point(12, 486);
-            buttonCreateDumpTruck.Name = "buttonCreateDumpTruck";
-            buttonCreateDumpTruck.Size = new Size(188, 29);
-            buttonCreateDumpTruck.TabIndex = 1;
-            buttonCreateDumpTruck.Text = "Создать самосвал";
-            buttonCreateDumpTruck.UseVisualStyleBackColor = true;
-            buttonCreateDumpTruck.Click += ButtonCreateDumpTruck_Click;
-            // 
             // buttonLeft
             // 
             buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonLeft.BackgroundImage = Properties.Resources.влево;
             buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonLeft.Location = new Point(852, 469);
+            buttonLeft.Location = new Point(850, 469);
             buttonLeft.Name = "buttonLeft";
             buttonLeft.Size = new Size(40, 40);
             buttonLeft.TabIndex = 2;
@@ -68,7 +55,7 @@
             buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonRight.BackgroundImage = Properties.Resources.вправо;
             buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonRight.Location = new Point(944, 469);
+            buttonRight.Location = new Point(942, 469);
             buttonRight.Name = "buttonRight";
             buttonRight.Size = new Size(40, 40);
             buttonRight.TabIndex = 3;
@@ -80,7 +67,7 @@
             buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonUp.BackgroundImage = Properties.Resources.вверх;
             buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonUp.Location = new Point(898, 423);
+            buttonUp.Location = new Point(896, 423);
             buttonUp.Name = "buttonUp";
             buttonUp.Size = new Size(40, 40);
             buttonUp.TabIndex = 4;
@@ -92,37 +79,27 @@
             buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonDown.BackgroundImage = Properties.Resources.вниз;
             buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonDown.Location = new Point(898, 469);
+            buttonDown.Location = new Point(896, 469);
             buttonDown.Name = "buttonDown";
             buttonDown.Size = new Size(40, 40);
             buttonDown.TabIndex = 5;
             buttonDown.UseVisualStyleBackColor = true;
             buttonDown.Click += ButtonMove_Click;
             // 
-            // buttonCreateTruck
-            // 
-            buttonCreateTruck.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateTruck.Location = new Point(206, 486);
-            buttonCreateTruck.Name = "buttonCreateTruck";
-            buttonCreateTruck.Size = new Size(188, 29);
-            buttonCreateTruck.TabIndex = 6;
-            buttonCreateTruck.Text = "Создать грузовик";
-            buttonCreateTruck.UseVisualStyleBackColor = true;
-            buttonCreateTruck.Click += ButtonCreateTruck_Click;
-            // 
             // comboBoxStrategy
             // 
             comboBoxStrategy.Anchor = AnchorStyles.Top | AnchorStyles.Right;
             comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxStrategy.FormattingEnabled = true;
             comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
-            comboBoxStrategy.Location = new Point(833, 21);
+            comboBoxStrategy.Location = new Point(831, 21);
             comboBoxStrategy.Name = "comboBoxStrategy";
             comboBoxStrategy.Size = new Size(151, 28);
             comboBoxStrategy.TabIndex = 7;
             // 
             // buttonStrategyStep
             // 
+            buttonStrategyStep.Anchor = AnchorStyles.Top | AnchorStyles.Right;
             buttonStrategyStep.Location = new Point(890, 55);
             buttonStrategyStep.Name = "buttonStrategyStep";
             buttonStrategyStep.Size = new Size(94, 29);
@@ -131,46 +108,40 @@
             buttonStrategyStep.UseVisualStyleBackColor = true;
             buttonStrategyStep.Click += ButtonStrategyStep_Click;
             // 
-            // pictureBoxDumpTruck1
+            // pictureBoxDumpTruck
             // 
-            pictureBoxDumpTruck1.Dock = DockStyle.Fill;
-            pictureBoxDumpTruck1.Location = new Point(0, 0);
-            pictureBoxDumpTruck1.Name = "pictureBoxDumpTruck1";
-            pictureBoxDumpTruck1.Size = new Size(1006, 527);
-            pictureBoxDumpTruck1.TabIndex = 10;
-            pictureBoxDumpTruck1.TabStop = false;
+            pictureBoxDumpTruck.Dock = DockStyle.Fill;
+            pictureBoxDumpTruck.Location = new Point(0, 0);
+            pictureBoxDumpTruck.Name = "pictureBoxDumpTruck";
+            pictureBoxDumpTruck.Size = new Size(1004, 527);
+            pictureBoxDumpTruck.TabIndex = 10;
+            pictureBoxDumpTruck.TabStop = false;
             // 
             // FormDumpTruck
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1006, 527);
+            ClientSize = new Size(1004, 527);
             Controls.Add(buttonStrategyStep);
             Controls.Add(comboBoxStrategy);
-            Controls.Add(buttonCreateTruck);
             Controls.Add(buttonDown);
             Controls.Add(buttonUp);
             Controls.Add(buttonRight);
             Controls.Add(buttonLeft);
-            Controls.Add(buttonCreateDumpTruck);
-            Controls.Add(pictureBoxDumpTruck1);
+            Controls.Add(pictureBoxDumpTruck);
             Name = "FormDumpTruck";
             Text = "Самосвал";
-            ((System.ComponentModel.ISupportInitialize)pictureBoxDumpTruck1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxDumpTruck).EndInit();
             ResumeLayout(false);
         }
 
         #endregion
-
-        private PictureBox pictureBoxDumpTruck;
-        private Button buttonCreateDumpTruck;
         private Button buttonLeft;
         private Button buttonRight;
         private Button buttonUp;
         private Button buttonDown;
-        private Button buttonCreateTruck;
         private ComboBox comboBoxStrategy;
         private Button buttonStrategyStep;
-        private PictureBox pictureBoxDumpTruck1;
+        private PictureBox pictureBoxDumpTruck;
     }
 }

ProjectDumpTruck/ProjectDumpTruck/FormDumpTruck.cs

@@ -2,140 +2,104 @@
 using ProjectDumpTruck.Drawnings;
 using ProjectDumpTruck.MovementStrategy;
 
-namespace ProjectDumpTruck
+namespace ProjectDumpTruck;
+
+public partial class FormDumpTruck : Form
+
 {
-    public partial class FormDumpTruck : Form
+    private DrawningTruck? _drawningTruck;
 
+    /// <summary>
+    /// Стратегия перемещения
+    /// </summary>
+    private AbstractStrategy? _strategy;
+
+    public DrawningTruck SetTruck
     {
-        private DrawningTruck? _drawningTruck;
-
-        /// <summary>
-        /// Стратегия перемещения
-        /// </summary>
-        private AbstractStrategy? _strategy;
-
-        public FormDumpTruck()
+        set
         {
-            InitializeComponent();
+            _drawningTruck = value;
+            _drawningTruck.SetPictureSize(pictureBoxDumpTruck.Width, pictureBoxDumpTruck.Height);
+            comboBoxStrategy.Enabled = true;
             _strategy = null;
-        }
-
-        private void Draw()
-        {
-            if (_drawningTruck == null) return;
-
-            Bitmap bmp = new(pictureBoxDumpTruck1.Width,
-            pictureBoxDumpTruck1.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _drawningTruck.DrawTransport(gr);
-            pictureBoxDumpTruck1.Image = bmp;
-
-        }
-
-        /// <summary>
-        /// Создание объекта класса-перемещения
-        /// </summary>
-        /// <param name="type"></param>
-        private void CreateObject(string type)
-        {
-
-            Random random = new();
-            switch (type)
-            {
-                case nameof(DrawningTruck):
-                    _drawningTruck = new DrawningTruck(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(DrawningDumpTruck):
-                    _drawningTruck = new DrawningDumpTruck(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)));
-                    break;
-
-                default:
-                    return;
-            }
-            _drawningTruck.SetPictureSize(pictureBoxDumpTruck1.Width, pictureBoxDumpTruck1.Height);
-            _drawningTruck.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            _strategy = null;
-            //comboBoxStrategy.Enabled = true;
             Draw();
+        }
+    }
 
+    public FormDumpTruck()
+    {
+        InitializeComponent();
+        _strategy = null;
+    }
+
+    private void Draw()
+    {
+        if (_drawningTruck == null) return;
+
+        Bitmap bmp = new(pictureBoxDumpTruck.Width,
+        pictureBoxDumpTruck.Height);
+        Graphics gr = Graphics.FromImage(bmp);
+        _drawningTruck.DrawTransport(gr);
+        pictureBoxDumpTruck.Image = bmp;
+
+    }
+
+    private void ButtonMove_Click(object sender, EventArgs e)
+    {
+        if (_drawningTruck == null) return;
+
+        string name = ((Button)sender)?.Name ?? string.Empty;
+        bool result = false;
+        switch (name)
+        {
+            case "buttonLeft":
+                result = _drawningTruck.MoveTransport(DirectionType.Left); break;
+            case "buttonDown":
+                result = _drawningTruck.MoveTransport(DirectionType.Down); break;
+            case "buttonUp":
+                result = _drawningTruck.MoveTransport(DirectionType.Up); break;
+            case "buttonRight":
+                result = _drawningTruck.MoveTransport(DirectionType.Right); break;
         }
 
-        /// <summary>
-        /// Обработка нажатия кнокпки "Создать самосвал"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreateDumpTruck_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningDumpTruck));
+        if (result) Draw();
 
-        /// <summary>
-        /// Обработка нажатия кнокпки "Создать грузовик"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreateTruck_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTruck));
+    }
 
-        private void ButtonMove_Click(object sender, EventArgs e)
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonStrategyStep_Click(object sender, EventArgs e)
+    {
+
+        if (_drawningTruck == null) return;
+
+        if (comboBoxStrategy.Enabled)
         {
-            if (_drawningTruck == null) return;
-
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            bool result = false;
-            switch (name)
+            _strategy = comboBoxStrategy.SelectedIndex switch
             {
-                case "buttonLeft":
-                    result = _drawningTruck.MoveTransport(DirectionType.Left); break;
-                case "buttonDown":
-                    result = _drawningTruck.MoveTransport(DirectionType.Down); break;
-                case "buttonUp":
-                    result = _drawningTruck.MoveTransport(DirectionType.Up); break;
-                case "buttonRight":
-                    result = _drawningTruck.MoveTransport(DirectionType.Right); break;
-            }
-
-            if (result) Draw();
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonStrategyStep_Click(object sender, EventArgs e)
-        {
-
-            if (_drawningTruck == null) return;
-
-            if (comboBoxStrategy.Enabled)
-            {
-                _strategy = comboBoxStrategy.SelectedIndex switch
-                {
-                    0 => new MoveToCenter(),
-                    1 => new MoveToBorder(),
-                    _ => null,
-                };
-
-                if (_strategy == null) return;
-
-                _strategy.SetData(new MoveableTruck(_drawningTruck), pictureBoxDumpTruck1.Width, pictureBoxDumpTruck1.Height);
-            }
+                0 => new MoveToCenter(),
+                1 => new MoveToBorder(),
+                _ => null,
+            };
 
             if (_strategy == null) return;
 
-            comboBoxStrategy.Enabled = false;
-            _strategy.MakeStep();
-            Draw();
+            _strategy.SetData(new MoveableTruck(_drawningTruck), pictureBoxDumpTruck.Width, pictureBoxDumpTruck.Height);
+        }
 
-            if (_strategy.GetStatus() == StrategyStatus.Finish)
-            {
-                comboBoxStrategy.Enabled = true;
-                _strategy = null;
-            }
+        if (_strategy == null) return;
+
+        comboBoxStrategy.Enabled = false;
+        _strategy.MakeStep();
+        Draw();
+
+        if (_strategy.GetStatus() == StrategyStatus.Finish)
+        {
+            comboBoxStrategy.Enabled = true;
+            _strategy = null;
         }
     }
 }

ProjectDumpTruck/ProjectDumpTruck/FormTruckCollection.Designer.cs

@@ -0,0 +1,167 @@
+namespace ProjectDumpTruck
+{
+    partial class FormTruckCollection
+    {
+        /// <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();
+            buttonAddTruck = new Button();
+            buttonRefresh = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
+            buttonGoToCheck = new Button();
+            comboBoxSelectorCompany = new ComboBox();
+            buttonRemoveTruck = new Button();
+            buttonAddDumpTruck = new Button();
+            pictureBox = new PictureBox();
+            groupBoxTools.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(buttonAddTruck);
+            groupBoxTools.Controls.Add(buttonRefresh);
+            groupBoxTools.Controls.Add(maskedTextBoxPosition);
+            groupBoxTools.Controls.Add(buttonGoToCheck);
+            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Controls.Add(buttonRemoveTruck);
+            groupBoxTools.Controls.Add(buttonAddDumpTruck);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.Location = new Point(888, 0);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Size = new Size(238, 688);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "Инструменты";
+            // 
+            // buttonAddTruck
+            // 
+            buttonAddTruck.Location = new Point(6, 140);
+            buttonAddTruck.Name = "buttonAddTruck";
+            buttonAddTruck.Size = new Size(226, 42);
+            buttonAddTruck.TabIndex = 0;
+            buttonAddTruck.Text = "Добваление грузовика";
+            buttonAddTruck.Click += ButtonAddTruck_Click;
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Location = new Point(6, 634);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(226, 48);
+            buttonRefresh.TabIndex = 6;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += ButtonRefresh_Click;
+            // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Location = new Point(6, 269);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(226, 27);
+            maskedTextBoxPosition.TabIndex = 3;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Location = new Point(6, 438);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(226, 48);
+            buttonGoToCheck.TabIndex = 5;
+            buttonGoToCheck.Text = "Передать на тест";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_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, 26);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(226, 28);
+            comboBoxSelectorCompany.TabIndex = 9;
+            comboBoxSelectorCompany.SelectedIndexChanged += СomboBoxSelectorCompany_SelectedIndexChanged_1;
+            // 
+            // buttonRemoveTruck
+            // 
+            buttonRemoveTruck.Location = new Point(6, 302);
+            buttonRemoveTruck.Name = "buttonRemoveTruck";
+            buttonRemoveTruck.Size = new Size(226, 48);
+            buttonRemoveTruck.TabIndex = 4;
+            buttonRemoveTruck.Text = "Удалить грузовик";
+            buttonRemoveTruck.UseVisualStyleBackColor = true;
+            buttonRemoveTruck.Click += ButtonRemoveTruck_Click;
+            // 
+            // buttonAddDumpTruck
+            // 
+            buttonAddDumpTruck.Location = new Point(6, 188);
+            buttonAddDumpTruck.Name = "buttonAddDumpTruck";
+            buttonAddDumpTruck.Size = new Size(226, 48);
+            buttonAddDumpTruck.TabIndex = 2;
+            buttonAddDumpTruck.Text = "Добавление самосвала";
+            buttonAddDumpTruck.UseVisualStyleBackColor = true;
+            buttonAddDumpTruck.Click += ButtonAddDumpTruck_Click;
+            // 
+            // pictureBox
+            // 
+            pictureBox.Dock = DockStyle.Fill;
+            pictureBox.Location = new Point(0, 0);
+            pictureBox.Name = "pictureBox";
+            pictureBox.Size = new Size(888, 688);
+            pictureBox.TabIndex = 1;
+            pictureBox.TabStop = false;
+            // 
+            // FormTruckCollection
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1126, 688);
+            Controls.Add(pictureBox);
+            Controls.Add(groupBoxTools);
+            Name = "FormTruckCollection";
+            Text = "Коллекция грузовиков";
+            groupBoxTools.ResumeLayout(false);
+            groupBoxTools.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private Button buttonAddDumpTruck;
+        private Button buttonGoToCheck;
+        private Button buttonRemoveTruck;
+        private MaskedTextBox maskedTextBoxPosition;
+        private PictureBox pictureBox;
+        private Button buttonRefresh;
+        private ComboBox comboBoxSelectorCompany;
+        private Button buttonAddTruck;
+    }
+}

ProjectDumpTruck/ProjectDumpTruck/FormTruckCollection.cs

@@ -0,0 +1,198 @@
+using ProjectDumpTruck.CollectionGenericObject;
+using ProjectDumpTruck.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Resources;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.TrackBar;
+
+namespace ProjectDumpTruck;
+
+/// <summary>
+/// Форма работы с компанией и ее коллекцией
+/// </summary>
+public partial class FormTruckCollection : Form
+{
+    /// <summary>
+    /// Компания
+    /// </summary>
+    private AbstractCompany? _company = null;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormTruckCollection()
+    {
+        InitializeComponent();
+    }
+
+    /// <summary>
+    /// Выбор компании
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void СomboBoxSelectorCompany_SelectedIndexChanged_1(object sender, EventArgs e)
+    {
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new Autopark(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningTruck>());
+                break;
+        }
+    }
+
+    /// <summary>
+    /// Создание объекта класса-перемещения
+    /// </summary>
+    /// <param name="type">Тип создаваемого объекта</param>
+    private void CreateObject(string type)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+        Random random = new();
+        DrawningTruck drawningTruck;
+        switch (type)
+        {
+            case nameof(DrawningTruck):
+                drawningTruck = new DrawningTruck(random.Next(100, 300),
+                random.Next(1000, 3000), GetColor(random));
+                break;
+            case nameof(DrawningDumpTruck):
+                drawningTruck = new DrawningDumpTruck(random.Next(100, 300), random.Next(1000, 3000),
+                GetColor(random), GetColor(random),Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+                break;
+            default:
+                return;
+        }
+        if (_company + drawningTruck != -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 ButtonAddTruck_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTruck));
+
+    /// <summary>
+    /// Добавление самосвала
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddDumpTruck_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningDumpTruck));
+
+    /// <summary>
+    /// Удаление объекта
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonRemoveTruck_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;
+        }
+
+        DrawningTruck? truck = null;
+        int counter = 100;
+        while (truck == null)
+        {
+            truck = _company.GetRandomObject();
+            counter--;
+            if (counter <= 0)
+            {
+                break;
+            }
+        }
+
+        if (truck == null)
+        {
+            return;
+        }
+
+        FormDumpTruck form = new()
+        {
+            SetTruck = truck
+        };
+        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();
+    }
+
+    
+    
+}
+

ProjectDumpTruck/ProjectDumpTruck/FormTruckCollection.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>

ProjectDumpTruck/ProjectDumpTruck/Program.cs

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