From d50a0855a07789a61776c7ceb723efeeb94e45a2 Mon Sep 17 00:00:00 2001
From: kassslll <144980044+kassslll@users.noreply.github.com>
Date: Sun, 18 Feb 2024 08:02:04 +0400
Subject: [PATCH 01/11] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0?=
 =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=B0=201?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProjectLiner/ProjectLiner/DirectionType.cs    |  27 +++
 ProjectLiner/ProjectLiner/DrawningLiner.cs    | 205 ++++++++++++++++++
 ProjectLiner/ProjectLiner/EntityLiner.cs      |  68 ++++++
 ProjectLiner/ProjectLiner/Form1.Designer.cs   |  39 ----
 ProjectLiner/ProjectLiner/Form1.cs            |  10 -
 .../ProjectLiner/FormLiner.Designer.cs        | 133 ++++++++++++
 ProjectLiner/ProjectLiner/FormLiner.cs        |  91 ++++++++
 .../{Form1.resx => FormLiner.resx}            |  50 ++---
 ProjectLiner/ProjectLiner/Program.cs          |   2 +-
 ProjectLiner/ProjectLiner/ProjectLiner.csproj |  15 ++
 .../Properties/Resources.Designer.cs          | 103 +++++++++
 .../ProjectLiner/Properties/Resources.resx    | 133 ++++++++++++
 .../ProjectLiner/Resources/bottom.png         | Bin 0 -> 5805 bytes
 ProjectLiner/ProjectLiner/Resources/left.png  | Bin 0 -> 5248 bytes
 ProjectLiner/ProjectLiner/Resources/right.png | Bin 0 -> 5026 bytes
 ProjectLiner/ProjectLiner/Resources/top.png   | Bin 0 -> 5585 bytes
 16 files changed, 801 insertions(+), 75 deletions(-)
 create mode 100644 ProjectLiner/ProjectLiner/DirectionType.cs
 create mode 100644 ProjectLiner/ProjectLiner/DrawningLiner.cs
 create mode 100644 ProjectLiner/ProjectLiner/EntityLiner.cs
 delete mode 100644 ProjectLiner/ProjectLiner/Form1.Designer.cs
 delete mode 100644 ProjectLiner/ProjectLiner/Form1.cs
 create mode 100644 ProjectLiner/ProjectLiner/FormLiner.Designer.cs
 create mode 100644 ProjectLiner/ProjectLiner/FormLiner.cs
 rename ProjectLiner/ProjectLiner/{Form1.resx => FormLiner.resx} (93%)
 create mode 100644 ProjectLiner/ProjectLiner/Properties/Resources.Designer.cs
 create mode 100644 ProjectLiner/ProjectLiner/Properties/Resources.resx
 create mode 100644 ProjectLiner/ProjectLiner/Resources/bottom.png
 create mode 100644 ProjectLiner/ProjectLiner/Resources/left.png
 create mode 100644 ProjectLiner/ProjectLiner/Resources/right.png
 create mode 100644 ProjectLiner/ProjectLiner/Resources/top.png

diff --git a/ProjectLiner/ProjectLiner/DirectionType.cs b/ProjectLiner/ProjectLiner/DirectionType.cs
new file mode 100644
index 0000000..12c5fb2
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/DirectionType.cs
@@ -0,0 +1,27 @@
+namespace ProjectLiner;
+
+/// <summary>
+/// Направление перемещения
+/// </summary>
+public enum DirectionType
+{
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Up = 1,
+
+    /// <summary>
+    /// Вниз
+    /// </summary>
+    Down = 2,
+
+    /// <summary>
+    /// Влево
+    /// </summary>
+    Left = 3,
+
+    /// <summary>
+    /// Вправо
+    /// </summary>
+    Right = 4
+}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/DrawningLiner.cs b/ProjectLiner/ProjectLiner/DrawningLiner.cs
new file mode 100644
index 0000000..76d0856
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/DrawningLiner.cs
@@ -0,0 +1,205 @@
+namespace ProjectLiner;
+
+/// <summary>
+/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+/// </summary>
+public class DrawningLiner
+{
+    /// <summary>
+    /// Класс-сущность
+    /// </summary>
+    public EntityLiner? EntityLiner { get; private set; }
+
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    private int? _pictureWidth;
+
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    private int? _pictureHeight;
+
+    /// <summary>
+    /// Левая координата прорисовки лайнера
+    /// </summary>
+    private int? _startPosX;
+
+    /// <summary>
+    /// Верхняя кооридната прорисовки лайнера
+    /// </summary>
+    private int? _startPosY;
+
+    /// <summary>
+    /// Ширина прорисовки лайнера
+    /// </summary>
+    private readonly int _drawningLinerWidth = 180;
+
+    /// <summary>
+    /// Высота прорисовки лайнера
+    /// </summary>
+    private readonly int _drawningLinerHeight = 125;
+
+    /// <summary>
+    /// Инициализация свойств
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес</param>
+    /// <param name="bodyColor">Основной цвет</param>
+    /// <param name="additionalColor">Дополнительный цвет</param>
+    /// <param name="anchor">Признак наличия якоря</param>
+    /// <param name="boats">Признак наличия шлюпок</param>
+    /// <param name="pipe">Признак наличия трубы</param>
+    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool anchor, bool boats, bool pipe)
+    {
+        EntityLiner = new EntityLiner();
+        EntityLiner.Init(speed, weight, bodyColor, additionalColor, anchor, boats, pipe);
+        _pictureWidth = null;
+        _pictureHeight = null;
+        _startPosX = null;
+        _startPosY = null;
+    }
+
+    /// <summary>
+    /// Установка границ поля
+    /// </summary>
+    /// <param name="width">Ширина поля</param>
+    /// <param name="height">Высота поля</param>
+    /// <returns>true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
+    public bool SetPictureSize(int width, int height)
+    {
+        _pictureWidth = width;
+        _pictureHeight = height;
+        return true;
+    }
+
+    /// <summary>
+    /// Установка позиции
+    /// </summary>
+    /// <param name="x">Координата X</param>
+    /// <param name="y">Координата Y</param>
+    public void SetPosition(int x, int y)
+    {
+        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
+        {
+            return;
+        }
+
+        if (x < 0 || y < 0)
+        {
+            return;
+        }
+
+        _startPosX = x;
+        _startPosY = y;
+    }
+
+    /// <summary>
+	/// Изменение направления перемещения
+	/// </summary>
+	/// <param name="direction">Направление</param>
+	/// <returns>true - перемещене выполнено, false - перемещение невозможно</returns>
+	public bool MoveTransport(DirectionType direction)
+    {
+        if (EntityLiner == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return false;
+        }
+
+        switch (direction)
+        {
+            //влево
+            case DirectionType.Left:
+                if (_startPosX.Value - EntityLiner.Step > 0)
+                {
+                    _startPosX -= (int)EntityLiner.Step;
+                }
+                return true;
+            //вверх
+            case DirectionType.Up:
+                if (_startPosY.Value - EntityLiner.Step > 0)
+                {
+                    _startPosY -= (int)EntityLiner.Step;
+                }
+                return true;
+            // вправо
+            case DirectionType.Right:
+                if (_startPosX.Value + EntityLiner.Step < _pictureWidth-_drawningLinerWidth)
+                {
+                    _startPosX += (int)EntityLiner.Step;
+                }
+                return true;
+            //вниз
+            case DirectionType.Down:
+                if (_startPosY.Value + EntityLiner.Step < _pictureHeight-_drawningLinerHeight)
+                {
+                    _startPosY += (int)EntityLiner.Step;
+                }
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    /// <summary>
+    /// Прорисовка объекта
+    /// </summary>
+    /// <param name="g"></param>
+    public void DrawTransport(Graphics g)
+    {
+        if (EntityLiner == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+
+        Pen pen = new(Color.Black);
+        Brush additionalBrush = new SolidBrush(EntityLiner.AdditionalColor);
+        Brush br = new SolidBrush(EntityLiner.BodyColor);
+
+        // якорь
+        if (EntityLiner.Anchor)
+        {
+            g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 85, _startPosX.Value + 45, _startPosY.Value + 115);
+            g.DrawLine(pen, _startPosX.Value + 30, _startPosY.Value + 95, _startPosX.Value + 60, _startPosY.Value + 95);
+            g.DrawLine(pen, _startPosX.Value + 25, _startPosY.Value + 100, _startPosX.Value + 45, _startPosY.Value + 115);
+            g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 115, _startPosX.Value + 65, _startPosY.Value + 100);
+        }
+
+        // кузов лайнера
+        Point point1 = new Point(_startPosX.Value, _startPosY.Value + 80);
+        Point point2 = new Point(_startPosX.Value + 50, _startPosY.Value + 130);
+        Point point3 = new Point(_startPosX.Value + 135, _startPosY.Value + 130);
+        Point point4 = new Point(_startPosX.Value + 185, _startPosY.Value + 80);
+        Point[] curvePoints = { point1, point2, point3, point4 };
+        g.FillPolygon(br, curvePoints);
+
+
+        // борт лайнера
+        Point point5 = new Point(_startPosX.Value+40, _startPosY.Value + 40);
+        Point point6 = new Point(_startPosX.Value + 140, _startPosY.Value + 40);
+        Point point7 = new Point(_startPosX.Value + 140, _startPosY.Value + 80);
+        Point point8 = new Point(_startPosX.Value + 40, _startPosY.Value + 80);
+        Point[] curvePoints2 = { point5, point6, point7, point8 };
+        g.FillPolygon(additionalBrush, curvePoints2);
+
+        // шлюпки
+        if (EntityLiner.Boats)
+        {
+            g.FillEllipse(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 85, 30, 15);
+            g.FillEllipse(additionalBrush, _startPosX.Value + 95, _startPosY.Value + 85, 30, 15);
+            g.FillEllipse(additionalBrush, _startPosX.Value + 130, _startPosY.Value + 85, 30, 15);
+        }
+
+        // труба
+        if (EntityLiner.Pipe)
+        {
+
+            Point point9 = new Point(_startPosX.Value + 90, _startPosY.Value + 10);
+            Point point10 = new Point(_startPosX.Value + 90, _startPosY.Value + 40);
+            Point point11 = new Point(_startPosX.Value + 115, _startPosY.Value + 40);
+            Point point12 = new Point(_startPosX.Value + 115, _startPosY.Value + 10);
+            Point[] curvePoints3 = { point9, point10, point11, point12 };
+            g.FillPolygon(br, curvePoints3);
+        }
+    }
+}
diff --git a/ProjectLiner/ProjectLiner/EntityLiner.cs b/ProjectLiner/ProjectLiner/EntityLiner.cs
new file mode 100644
index 0000000..66d27c1
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/EntityLiner.cs
@@ -0,0 +1,68 @@
+namespace ProjectLiner;
+
+/// <summary>
+/// Класс-сущность "Лайнер"
+/// </summary>
+public class EntityLiner
+{
+    /// <summary>
+    /// Скорость
+    /// </summary>
+    public int Speed { get; private set; }
+
+    /// <summary>
+    /// Вес
+    /// </summary>
+    public double Weight { get; private set; }
+
+    /// <summary>
+    /// Основной цвет
+    /// </summary>
+    public Color BodyColor { get; private set; }
+
+    /// <summary>
+    /// Дополнительный цвет (для опциональных элементов)
+    /// </summary>
+    public Color AdditionalColor { get; private set; }
+
+    /// <summary>
+    /// Признак (опция) наличия якоря
+    /// </summary>
+    public bool Anchor { get; private set; }
+
+    /// <summary>
+    /// Признак (опция) наличия шлюпок
+    /// </summary>
+    public bool Boats { get; private set; }
+
+    /// <summary>
+    /// Признак (опция) наличия трубы
+    /// </summary>
+    public bool Pipe { get; private set; }
+
+    /// <summary>
+    /// Шаг перемещения автомобиля
+    /// </summary>
+    public double Step => Speed * 100 / Weight;
+
+    /// <summary>
+    /// Инициализация полей объекта-класса спортивного автомобиля
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес автомобиля</param>
+    /// <param name="bodyColor">Основной цвет</param>
+    /// <param name="additionalColor">Дополнительный цвет</param>
+    /// <param name="anchor">Признак наличия якоря</param>
+    /// <param name="boats">Признак наличия шлюпок</param>
+    /// <param name="pipe">Признак наличия трубы</param>
+    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool anchor, bool boats, bool pipe)
+    {
+        Speed = speed;
+        Weight = weight;
+        BodyColor = bodyColor;
+        AdditionalColor = additionalColor;
+        Anchor = anchor;
+        Boats = boats;
+        Pipe = pipe;
+    }
+}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/Form1.Designer.cs b/ProjectLiner/ProjectLiner/Form1.Designer.cs
deleted file mode 100644
index 054e711..0000000
--- a/ProjectLiner/ProjectLiner/Form1.Designer.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-namespace ProjectLiner
-{
-    partial class Form1
-    {
-        /// <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()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Text = "Form1";
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/Form1.cs b/ProjectLiner/ProjectLiner/Form1.cs
deleted file mode 100644
index 9b44028..0000000
--- a/ProjectLiner/ProjectLiner/Form1.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace ProjectLiner
-{
-    public partial class Form1 : Form
-    {
-        public Form1()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/FormLiner.Designer.cs b/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
new file mode 100644
index 0000000..e55a740
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
@@ -0,0 +1,133 @@
+namespace ProjectLiner
+{
+    partial class FormLiner
+    {
+        /// <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()
+        {
+            pictureBoxLiner = new PictureBox();
+            buttonCreate = new Button();
+            buttonDown = new Button();
+            buttonUp = new Button();
+            buttonLeft = new Button();
+            buttonRight = new Button();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxLiner).BeginInit();
+            SuspendLayout();
+            // 
+            // pictureBoxLiner
+            // 
+            pictureBoxLiner.Dock = DockStyle.Fill;
+            pictureBoxLiner.Location = new Point(0, 0);
+            pictureBoxLiner.Name = "pictureBoxLiner";
+            pictureBoxLiner.Size = new Size(948, 614);
+            pictureBoxLiner.TabIndex = 0;
+            pictureBoxLiner.TabStop = false;
+            // 
+            // buttonCreate
+            // 
+            buttonCreate.Location = new Point(12, 520);
+            buttonCreate.Name = "buttonCreate";
+            buttonCreate.Size = new Size(150, 82);
+            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.Name = "buttonDown";
+            buttonDown.Size = new Size(50, 50);
+            buttonDown.TabIndex = 2;
+            buttonDown.UseVisualStyleBackColor = true;
+            buttonDown.Click += ButtonMove_Click;
+            // 
+            // buttonUp
+            // 
+            buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonUp.BackgroundImage = Properties.Resources.top;
+            buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonUp.Location = new Point(830, 496);
+            buttonUp.Name = "buttonUp";
+            buttonUp.Size = new Size(50, 50);
+            buttonUp.TabIndex = 3;
+            buttonUp.UseVisualStyleBackColor = true;
+            buttonUp.Click += ButtonMove_Click;
+            // 
+            // buttonLeft
+            // 
+            buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonLeft.BackgroundImage = Properties.Resources.left;
+            buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonLeft.Location = new Point(774, 552);
+            buttonLeft.Name = "buttonLeft";
+            buttonLeft.Size = new Size(50, 50);
+            buttonLeft.TabIndex = 4;
+            buttonLeft.UseVisualStyleBackColor = true;
+            buttonLeft.Click += ButtonMove_Click;
+            // 
+            // buttonRight
+            // 
+            buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonRight.BackgroundImage = Properties.Resources.right;
+            buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonRight.Location = new Point(886, 552);
+            buttonRight.Name = "buttonRight";
+            buttonRight.Size = new Size(50, 50);
+            buttonRight.TabIndex = 5;
+            buttonRight.UseVisualStyleBackColor = true;
+            buttonRight.Click += ButtonMove_Click;
+            // 
+            // FormLiner
+            // 
+            AutoScaleDimensions = new SizeF(11F, 25F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(948, 614);
+            Controls.Add(buttonRight);
+            Controls.Add(buttonLeft);
+            Controls.Add(buttonUp);
+            Controls.Add(buttonDown);
+            Controls.Add(buttonCreate);
+            Controls.Add(pictureBoxLiner);
+            Name = "FormLiner";
+            Text = "Лайнер";
+            ((System.ComponentModel.ISupportInitialize)pictureBoxLiner).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private PictureBox pictureBoxLiner;
+        private Button buttonCreate;
+        private Button buttonDown;
+        private Button buttonUp;
+        private Button buttonLeft;
+        private Button buttonRight;
+    }
+}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/FormLiner.cs b/ProjectLiner/ProjectLiner/FormLiner.cs
new file mode 100644
index 0000000..e370c8b
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/FormLiner.cs
@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ProjectLiner
+{
+    public partial class FormLiner : Form
+    {
+        private DrawningLiner? _drawningLiner;
+        public FormLiner()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// Метод прорисовки лайнера
+        /// </summary>
+        private void Draw()
+        {
+            if (_drawningLiner == null)
+            {
+                return;
+            }
+
+            Bitmap bmp = new(pictureBoxLiner.Width, pictureBoxLiner.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _drawningLiner.DrawTransport(gr);
+            pictureBoxLiner.Image = bmp;
+        }
+
+        /// <summary>
+        /// Обработка нажатия кнопки "Создать"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonCreate_Click(object sender, EventArgs e)
+        {
+            Random random = new();
+            _drawningLiner = new DrawningLiner();
+            _drawningLiner.Init(random.Next(100, 300), random.Next(1000, 3000),
+                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+                Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+            _drawningLiner.SetPictureSize(pictureBoxLiner.Width, pictureBoxLiner.Height);
+            _drawningLiner.SetPosition(random.Next(10, 100), random.Next(10, 100));
+            Draw();
+        }
+
+        /// <summary>
+        /// Перемещение объекта по форме (нажатие кнопок навигации)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if (_drawningLiner == null)
+            {
+                return;
+            }
+
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            bool result = false;
+            switch (name)
+            {
+                case "buttonUp":
+                    result = _drawningLiner.MoveTransport(DirectionType.Up);
+                    break;
+                case "buttonDown":
+                    result = _drawningLiner.MoveTransport(DirectionType.Down);
+                    break;
+                case "buttonLeft":
+                    result = _drawningLiner.MoveTransport(DirectionType.Left);
+                    break;
+                case "buttonRight":
+                    result = _drawningLiner.MoveTransport(DirectionType.Right);
+                    break;
+            }
+
+            if (result)
+            {
+                Draw();
+            }
+        }
+    }
+}
diff --git a/ProjectLiner/ProjectLiner/Form1.resx b/ProjectLiner/ProjectLiner/FormLiner.resx
similarity index 93%
rename from ProjectLiner/ProjectLiner/Form1.resx
rename to ProjectLiner/ProjectLiner/FormLiner.resx
index 1af7de1..af32865 100644
--- a/ProjectLiner/ProjectLiner/Form1.resx
+++ b/ProjectLiner/ProjectLiner/FormLiner.resx
@@ -1,17 +1,17 @@
 <?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 
+
+    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>
@@ -26,36 +26,36 @@
         <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 
+
+    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 
+
+    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 
+
+    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 
+
+    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 
+    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 
+    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 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
diff --git a/ProjectLiner/ProjectLiner/Program.cs b/ProjectLiner/ProjectLiner/Program.cs
index 6a14f7d..b3dc92e 100644
--- a/ProjectLiner/ProjectLiner/Program.cs
+++ b/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 Form1());
+            Application.Run(new FormLiner());
         }
     }
 }
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/ProjectLiner.csproj b/ProjectLiner/ProjectLiner/ProjectLiner.csproj
index e1a0735..244387d 100644
--- a/ProjectLiner/ProjectLiner/ProjectLiner.csproj
+++ b/ProjectLiner/ProjectLiner/ProjectLiner.csproj
@@ -8,4 +8,19 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/Properties/Resources.Designer.cs b/ProjectLiner/ProjectLiner/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..478d0e0
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/Properties/Resources.Designer.cs
@@ -0,0 +1,103 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Этот код создан программой.
+//     Исполняемая версия:4.0.30319.42000
+//
+//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     повторной генерации кода.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace ProjectLiner.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
+    /// </summary>
+    // Этот класс создан автоматически классом StronglyTypedResourceBuilder
+    // с помощью такого средства, как ResGen или Visual Studio.
+    // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
+    // с параметром /str или перестройте свой проект VS.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ProjectLiner.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
+        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap bottom {
+            get {
+                object obj = ResourceManager.GetObject("bottom", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap left {
+            get {
+                object obj = ResourceManager.GetObject("left", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap right {
+            get {
+                object obj = ResourceManager.GetObject("right", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap top {
+            get {
+                object obj = ResourceManager.GetObject("top", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/ProjectLiner/ProjectLiner/Properties/Resources.resx b/ProjectLiner/ProjectLiner/Properties/Resources.resx
new file mode 100644
index 0000000..b1de66a
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/Properties/Resources.resx
@@ -0,0 +1,133 @@
+<?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>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="bottom" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bottom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="left" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="right" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="top" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\top.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/Resources/bottom.png b/ProjectLiner/ProjectLiner/Resources/bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..504bf06beab336162136cb7976b7d38001d1a10c
GIT binary patch
literal 5805
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
F{|2ctw@Cm1

literal 0
HcmV?d00001

diff --git a/ProjectLiner/ProjectLiner/Resources/left.png b/ProjectLiner/ProjectLiner/Resources/left.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ac2a79d973593260b03ad81d2b91f0d5d1797fd
GIT binary patch
literal 5248
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

literal 0
HcmV?d00001

diff --git a/ProjectLiner/ProjectLiner/Resources/right.png b/ProjectLiner/ProjectLiner/Resources/right.png
new file mode 100644
index 0000000000000000000000000000000000000000..f97b115950f804f40e403e50357cb7e3ced79620
GIT binary patch
literal 5026
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

literal 0
HcmV?d00001

diff --git a/ProjectLiner/ProjectLiner/Resources/top.png b/ProjectLiner/ProjectLiner/Resources/top.png
new file mode 100644
index 0000000000000000000000000000000000000000..cec057ecb68565cf008f8f38bf47876047aa3e7f
GIT binary patch
literal 5585
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
D(glX5

literal 0
HcmV?d00001


From 997c87a7927ef6231ea59bac2338b91c2ce1399a Mon Sep 17 00:00:00 2001
From: gettterot <kasslesson@gmail.com>
Date: Wed, 21 Feb 2024 16:33:40 +0400
Subject: [PATCH 02/11] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BB=20SetPosition=20=D0=B8=20SetPictureSize?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProjectLiner/ProjectLiner/DrawningLiner.cs    | 54 ++++++++++++++-----
 .../ProjectLiner/FormLiner.Designer.cs        |  2 +
 2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/ProjectLiner/ProjectLiner/DrawningLiner.cs b/ProjectLiner/ProjectLiner/DrawningLiner.cs
index 76d0856..d5023a3 100644
--- a/ProjectLiner/ProjectLiner/DrawningLiner.cs
+++ b/ProjectLiner/ProjectLiner/DrawningLiner.cs
@@ -33,7 +33,7 @@ public class DrawningLiner
     /// <summary>
     /// Ширина прорисовки лайнера
     /// </summary>
-    private readonly int _drawningLinerWidth = 180;
+    private readonly int _drawningLinerWidth = 150;
 
     /// <summary>
     /// Высота прорисовки лайнера
@@ -68,9 +68,29 @@ public class DrawningLiner
     /// <returns>true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
     public bool SetPictureSize(int width, int height)
     {
-        _pictureWidth = width;
-        _pictureHeight = height;
-        return true;
+        if (width > _drawningLinerWidth && height > _drawningLinerHeight)
+        {
+            _pictureWidth = width;
+            _pictureHeight = height;
+            if (_startPosX != null && _startPosY != null)
+            {
+                if (_startPosX.Value < 0) 
+                    _startPosX = 0;
+                if (_startPosY.Value < 0)
+                    _startPosY = 0;
+                if (_startPosX.Value + _drawningLinerWidth > _pictureWidth)
+                {
+                    _startPosX = _pictureWidth - _drawningLinerWidth;
+                }
+                if (_startPosY.Value + _drawningLinerHeight > _pictureHeight)
+                {
+                    _startPosY = _pictureHeight - _drawningLinerHeight;
+                }
+            }
+
+            return true;
+        }
+        return false;
     }
 
     /// <summary>
@@ -84,16 +104,22 @@ public class DrawningLiner
         {
             return;
         }
-
-        if (x < 0 || y < 0)
+        else
         {
-            return;
+            _startPosX = x;
+            _startPosY = y;
+
+            if (_startPosX.Value + _drawningLinerWidth > _pictureWidth)
+            {
+                _startPosX = _pictureWidth - _drawningLinerWidth;
+            }
+            if (_startPosY.Value + _drawningLinerHeight > _pictureHeight)
+            {
+                _startPosY = _pictureHeight - _drawningLinerHeight;
+            }
         }
 
-        _startPosX = x;
-        _startPosY = y;
     }
-
     /// <summary>
 	/// Изменение направления перемещения
 	/// </summary>
@@ -169,7 +195,7 @@ public class DrawningLiner
         Point point1 = new Point(_startPosX.Value, _startPosY.Value + 80);
         Point point2 = new Point(_startPosX.Value + 50, _startPosY.Value + 130);
         Point point3 = new Point(_startPosX.Value + 135, _startPosY.Value + 130);
-        Point point4 = new Point(_startPosX.Value + 185, _startPosY.Value + 80);
+        Point point4 = new Point(_startPosX.Value + 155, _startPosY.Value + 80);
         Point[] curvePoints = { point1, point2, point3, point4 };
         g.FillPolygon(br, curvePoints);
 
@@ -185,9 +211,9 @@ public class DrawningLiner
         // шлюпки
         if (EntityLiner.Boats)
         {
-            g.FillEllipse(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 85, 30, 15);
-            g.FillEllipse(additionalBrush, _startPosX.Value + 95, _startPosY.Value + 85, 30, 15);
-            g.FillEllipse(additionalBrush, _startPosX.Value + 130, _startPosY.Value + 85, 30, 15);
+            g.FillEllipse(additionalBrush, _startPosX.Value + 40, _startPosY.Value + 85, 30, 15);
+            g.FillEllipse(additionalBrush, _startPosX.Value + 75, _startPosY.Value + 85, 30, 15);
+            g.FillEllipse(additionalBrush, _startPosX.Value + 110, _startPosY.Value + 85, 30, 15);
         }
 
         // труба
diff --git a/ProjectLiner/ProjectLiner/FormLiner.Designer.cs b/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
index e55a740..94eb653 100644
--- a/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
+++ b/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
@@ -39,6 +39,7 @@
             // 
             // pictureBoxLiner
             // 
+            pictureBoxLiner.BackColor = SystemColors.Control;
             pictureBoxLiner.Dock = DockStyle.Fill;
             pictureBoxLiner.Location = new Point(0, 0);
             pictureBoxLiner.Name = "pictureBoxLiner";
@@ -48,6 +49,7 @@
             // 
             // buttonCreate
             // 
+            buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
             buttonCreate.Location = new Point(12, 520);
             buttonCreate.Name = "buttonCreate";
             buttonCreate.Size = new Size(150, 82);

From bd746e928870a62316697671aa6adaffda9ad5ca Mon Sep 17 00:00:00 2001
From: gettterot <kasslesson@gmail.com>
Date: Wed, 21 Feb 2024 16:54:00 +0400
Subject: [PATCH 03/11] =?UTF-8?q?=D0=A1=20=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=BC=20=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B2=D1=8B=D0=BC=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProjectLiner/ProjectLiner/DrawningLiner.cs | 10 ++++++----
 ProjectLiner/ProjectLiner/FormLiner.cs     |  6 ++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ProjectLiner/ProjectLiner/DrawningLiner.cs b/ProjectLiner/ProjectLiner/DrawningLiner.cs
index d5023a3..35d42b6 100644
--- a/ProjectLiner/ProjectLiner/DrawningLiner.cs
+++ b/ProjectLiner/ProjectLiner/DrawningLiner.cs
@@ -50,10 +50,9 @@ public class DrawningLiner
     /// <param name="anchor">Признак наличия якоря</param>
     /// <param name="boats">Признак наличия шлюпок</param>
     /// <param name="pipe">Признак наличия трубы</param>
-    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool anchor, bool boats, bool pipe)
+    public void Init(EntityLiner liner)
     {
-        EntityLiner = new EntityLiner();
-        EntityLiner.Init(speed, weight, bodyColor, additionalColor, anchor, boats, pipe);
+        EntityLiner = liner;
         _pictureWidth = null;
         _pictureHeight = null;
         _startPosX = null;
@@ -108,7 +107,10 @@ public class DrawningLiner
         {
             _startPosX = x;
             _startPosY = y;
-
+            if (_startPosX.Value < 0)
+                _startPosX = 0;
+            if (_startPosY.Value < 0)
+                _startPosY = 0;
             if (_startPosX.Value + _drawningLinerWidth > _pictureWidth)
             {
                 _startPosX = _pictureWidth - _drawningLinerWidth;
diff --git a/ProjectLiner/ProjectLiner/FormLiner.cs b/ProjectLiner/ProjectLiner/FormLiner.cs
index e370c8b..c72187d 100644
--- a/ProjectLiner/ProjectLiner/FormLiner.cs
+++ b/ProjectLiner/ProjectLiner/FormLiner.cs
@@ -42,11 +42,13 @@ namespace ProjectLiner
         private void buttonCreate_Click(object sender, EventArgs e)
         {
             Random random = new();
-            _drawningLiner = new DrawningLiner();
-            _drawningLiner.Init(random.Next(100, 300), random.Next(1000, 3000),
+            EntityLiner liner = new EntityLiner();
+            liner.Init(random.Next(100, 300), random.Next(1000, 3000),
                 Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
                 Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
                 Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+            _drawningLiner = new DrawningLiner();
+            _drawningLiner.Init(liner);
             _drawningLiner.SetPictureSize(pictureBoxLiner.Width, pictureBoxLiner.Height);
             _drawningLiner.SetPosition(random.Next(10, 100), random.Next(10, 100));
             Draw();

From 6c4691699b6863b562c036f4715849765ed5e854 Mon Sep 17 00:00:00 2001
From: gettterot <kasslesson@gmail.com>
Date: Wed, 6 Mar 2024 07:52:17 +0400
Subject: [PATCH 04/11] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=80=D0=BE=D0=B4=D0=B8=D1=82=D0=B5=D0=BB=D1=8C?=
 =?UTF-8?q?=D1=81=D0=BA=D0=BE=D0=B3=D0=BE=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?=
 =?UTF-8?q?=D0=B0=20=D0=B4=D0=BB=D1=8F=20entity=20liner?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{ => Drawnings}/DirectionType.cs          |   2 +-
 .../DrawningCommonLiner.cs}                   | 130 ++++++++----------
 .../ProjectLiner/Drawnings/DrawningLiner.cs   |  72 ++++++++++
 .../Entities/EntityCommonLiner.cs             |  50 +++++++
 .../{ => Entities}/EntityLiner.cs             |  31 +----
 .../ProjectLiner/FormLiner.Designer.cs        |  20 ++-
 ProjectLiner/ProjectLiner/FormLiner.cs        |  73 +++++++---
 7 files changed, 258 insertions(+), 120 deletions(-)
 rename ProjectLiner/ProjectLiner/{ => Drawnings}/DirectionType.cs (91%)
 rename ProjectLiner/ProjectLiner/{DrawningLiner.cs => Drawnings/DrawningCommonLiner.cs} (60%)
 create mode 100644 ProjectLiner/ProjectLiner/Drawnings/DrawningLiner.cs
 create mode 100644 ProjectLiner/ProjectLiner/Entities/EntityCommonLiner.cs
 rename ProjectLiner/ProjectLiner/{ => Entities}/EntityLiner.cs (58%)

diff --git a/ProjectLiner/ProjectLiner/DirectionType.cs b/ProjectLiner/ProjectLiner/Drawnings/DirectionType.cs
similarity index 91%
rename from ProjectLiner/ProjectLiner/DirectionType.cs
rename to ProjectLiner/ProjectLiner/Drawnings/DirectionType.cs
index 12c5fb2..cc78a5a 100644
--- a/ProjectLiner/ProjectLiner/DirectionType.cs
+++ b/ProjectLiner/ProjectLiner/Drawnings/DirectionType.cs
@@ -1,4 +1,4 @@
-namespace ProjectLiner;
+namespace ProjectLiner.Drawnings;
 
 /// <summary>
 /// Направление перемещения
diff --git a/ProjectLiner/ProjectLiner/DrawningLiner.cs b/ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs
similarity index 60%
rename from ProjectLiner/ProjectLiner/DrawningLiner.cs
rename to ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs
index 35d42b6..2bc1885 100644
--- a/ProjectLiner/ProjectLiner/DrawningLiner.cs
+++ b/ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs
@@ -1,14 +1,17 @@
-namespace ProjectLiner;
+using ProjectLiner.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
-/// <summary>
-/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
-/// </summary>
-public class DrawningLiner
+namespace ProjectLiner.Drawnings;
+public class DrawningCommonLiner
 {
     /// <summary>
     /// Класс-сущность
     /// </summary>
-    public EntityLiner? EntityLiner { get; private set; }
+    public EntityCommonLiner? EntityCommonLiner { get; protected set; }
 
     /// <summary>
     /// Ширина окна
@@ -23,12 +26,12 @@ public class DrawningLiner
     /// <summary>
     /// Левая координата прорисовки лайнера
     /// </summary>
-    private int? _startPosX;
+    protected int? _startPosX;
 
     /// <summary>
     /// Верхняя кооридната прорисовки лайнера
     /// </summary>
-    private int? _startPosY;
+    protected int? _startPosY;
 
     /// <summary>
     /// Ширина прорисовки лайнера
@@ -38,27 +41,44 @@ public class DrawningLiner
     /// <summary>
     /// Высота прорисовки лайнера
     /// </summary>
-    private readonly int _drawningLinerHeight = 125;
+    private readonly int _drawningLinerHeight = 90;
 
     /// <summary>
-    /// Инициализация свойств
+    /// Пустой конструктор
     /// </summary>
-    /// <param name="speed">Скорость</param>
-    /// <param name="weight">Вес</param>
-    /// <param name="bodyColor">Основной цвет</param>
-    /// <param name="additionalColor">Дополнительный цвет</param>
-    /// <param name="anchor">Признак наличия якоря</param>
-    /// <param name="boats">Признак наличия шлюпок</param>
-    /// <param name="pipe">Признак наличия трубы</param>
-    public void Init(EntityLiner liner)
+
+    public DrawningCommonLiner()
     {
-        EntityLiner = liner;
         _pictureWidth = null;
         _pictureHeight = null;
         _startPosX = null;
         _startPosY = null;
     }
 
+    /// <summary>
+    /// конструктор
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес</param>
+    /// <param name="bodyColor">Основной цвет</param>
+
+    public DrawningCommonLiner(int speed, double weight, Color bodycolor) : this()
+    {
+        EntityCommonLiner = new EntityCommonLiner(speed, weight, bodycolor);
+    }
+
+    /// <summary>
+    /// конструктор для наследников
+    /// </summary>
+    /// <param name="drawningLinerHeight">Высота</param>
+    /// <param name="drawningLinerWight">Длина</param>
+
+    protected DrawningCommonLiner(int drawningLinerWight, int drawningLinerHeight) : this()
+    {
+        _drawningLinerHeight = drawningLinerHeight;
+        _drawningLinerWidth = drawningLinerWight;
+    }
+
     /// <summary>
     /// Установка границ поля
     /// </summary>
@@ -73,7 +93,7 @@ public class DrawningLiner
             _pictureHeight = height;
             if (_startPosX != null && _startPosY != null)
             {
-                if (_startPosX.Value < 0) 
+                if (_startPosX.Value < 0)
                     _startPosX = 0;
                 if (_startPosY.Value < 0)
                     _startPosY = 0;
@@ -129,7 +149,7 @@ public class DrawningLiner
 	/// <returns>true - перемещене выполнено, false - перемещение невозможно</returns>
 	public bool MoveTransport(DirectionType direction)
     {
-        if (EntityLiner == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        if (EntityCommonLiner == null || !_startPosX.HasValue || !_startPosY.HasValue)
         {
             return false;
         }
@@ -138,30 +158,30 @@ public class DrawningLiner
         {
             //влево
             case DirectionType.Left:
-                if (_startPosX.Value - EntityLiner.Step > 0)
+                if (_startPosX.Value - EntityCommonLiner.Step > 0)
                 {
-                    _startPosX -= (int)EntityLiner.Step;
+                    _startPosX -= (int)EntityCommonLiner.Step;
                 }
                 return true;
             //вверх
             case DirectionType.Up:
-                if (_startPosY.Value - EntityLiner.Step > 0)
+                if (_startPosY.Value - EntityCommonLiner.Step > 0)
                 {
-                    _startPosY -= (int)EntityLiner.Step;
+                    _startPosY -= (int)EntityCommonLiner.Step;
                 }
                 return true;
             // вправо
             case DirectionType.Right:
-                if (_startPosX.Value + EntityLiner.Step < _pictureWidth-_drawningLinerWidth)
+                if (_startPosX.Value + EntityCommonLiner.Step < _pictureWidth - _drawningLinerWidth)
                 {
-                    _startPosX += (int)EntityLiner.Step;
+                    _startPosX += (int)EntityCommonLiner.Step;
                 }
                 return true;
             //вниз
             case DirectionType.Down:
-                if (_startPosY.Value + EntityLiner.Step < _pictureHeight-_drawningLinerHeight)
+                if (_startPosY.Value + EntityCommonLiner.Step < _pictureHeight - _drawningLinerHeight)
                 {
-                    _startPosY += (int)EntityLiner.Step;
+                    _startPosY += (int)EntityCommonLiner.Step;
                 }
                 return true;
             default:
@@ -173,61 +193,33 @@ public class DrawningLiner
     /// Прорисовка объекта
     /// </summary>
     /// <param name="g"></param>
-    public void DrawTransport(Graphics g)
+    public virtual void DrawTransport(Graphics g)
     {
-        if (EntityLiner == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        if (EntityCommonLiner == null || !_startPosX.HasValue || !_startPosY.HasValue)
         {
             return;
         }
 
         Pen pen = new(Color.Black);
-        Brush additionalBrush = new SolidBrush(EntityLiner.AdditionalColor);
-        Brush br = new SolidBrush(EntityLiner.BodyColor);
+        Brush br = new SolidBrush(EntityCommonLiner.BodyColor);
 
-        // якорь
-        if (EntityLiner.Anchor)
-        {
-            g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 85, _startPosX.Value + 45, _startPosY.Value + 115);
-            g.DrawLine(pen, _startPosX.Value + 30, _startPosY.Value + 95, _startPosX.Value + 60, _startPosY.Value + 95);
-            g.DrawLine(pen, _startPosX.Value + 25, _startPosY.Value + 100, _startPosX.Value + 45, _startPosY.Value + 115);
-            g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 115, _startPosX.Value + 65, _startPosY.Value + 100);
-        }
 
         // кузов лайнера
-        Point point1 = new Point(_startPosX.Value, _startPosY.Value + 80);
-        Point point2 = new Point(_startPosX.Value + 50, _startPosY.Value + 130);
-        Point point3 = new Point(_startPosX.Value + 135, _startPosY.Value + 130);
-        Point point4 = new Point(_startPosX.Value + 155, _startPosY.Value + 80);
+        Point point1 = new Point(_startPosX.Value, _startPosY.Value + 40);
+        Point point2 = new Point(_startPosX.Value + 50, _startPosY.Value + 90);
+        Point point3 = new Point(_startPosX.Value + 135, _startPosY.Value + 90);
+        Point point4 = new Point(_startPosX.Value + 155, _startPosY.Value + 40);
         Point[] curvePoints = { point1, point2, point3, point4 };
         g.FillPolygon(br, curvePoints);
 
 
         // борт лайнера
-        Point point5 = new Point(_startPosX.Value+40, _startPosY.Value + 40);
-        Point point6 = new Point(_startPosX.Value + 140, _startPosY.Value + 40);
-        Point point7 = new Point(_startPosX.Value + 140, _startPosY.Value + 80);
-        Point point8 = new Point(_startPosX.Value + 40, _startPosY.Value + 80);
+        Point point5 = new Point(_startPosX.Value + 40, _startPosY.Value);
+        Point point6 = new Point(_startPosX.Value + 140, _startPosY.Value);
+        Point point7 = new Point(_startPosX.Value + 140, _startPosY.Value + 40);
+        Point point8 = new Point(_startPosX.Value + 40, _startPosY.Value + 40);
         Point[] curvePoints2 = { point5, point6, point7, point8 };
-        g.FillPolygon(additionalBrush, curvePoints2);
+        g.FillPolygon(br, curvePoints2);
 
-        // шлюпки
-        if (EntityLiner.Boats)
-        {
-            g.FillEllipse(additionalBrush, _startPosX.Value + 40, _startPosY.Value + 85, 30, 15);
-            g.FillEllipse(additionalBrush, _startPosX.Value + 75, _startPosY.Value + 85, 30, 15);
-            g.FillEllipse(additionalBrush, _startPosX.Value + 110, _startPosY.Value + 85, 30, 15);
-        }
-
-        // труба
-        if (EntityLiner.Pipe)
-        {
-
-            Point point9 = new Point(_startPosX.Value + 90, _startPosY.Value + 10);
-            Point point10 = new Point(_startPosX.Value + 90, _startPosY.Value + 40);
-            Point point11 = new Point(_startPosX.Value + 115, _startPosY.Value + 40);
-            Point point12 = new Point(_startPosX.Value + 115, _startPosY.Value + 10);
-            Point[] curvePoints3 = { point9, point10, point11, point12 };
-            g.FillPolygon(br, curvePoints3);
-        }
     }
 }
diff --git a/ProjectLiner/ProjectLiner/Drawnings/DrawningLiner.cs b/ProjectLiner/ProjectLiner/Drawnings/DrawningLiner.cs
new file mode 100644
index 0000000..a2ce841
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/Drawnings/DrawningLiner.cs
@@ -0,0 +1,72 @@
+using ProjectLiner.Entities;
+
+namespace ProjectLiner.Drawnings;
+
+/// <summary>
+/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+/// </summary>
+public class DrawningLiner : DrawningCommonLiner
+{ 
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес</param>
+    /// <param name="bodyColor">Основной цвет</param>
+    /// <param name="additionalColor">Дополнительный цвет</param>
+    /// <param name="anchor">Признак наличия якоря</param>
+    /// <param name="boats">Признак наличия шлюпок</param>
+    /// <param name="pipe">Признак наличия трубы</param>
+    public DrawningLiner(int speed, double weight, Color bodycolor, Color additionalColor, bool anchor, bool boats, bool pipe) : base(150, 125)
+    {
+        EntityCommonLiner = new EntityLiner(speed, weight, bodycolor, additionalColor, anchor, boats, pipe);
+
+    }
+
+    public override void DrawTransport(Graphics g)
+    {
+        if (EntityCommonLiner == null || EntityCommonLiner is not EntityLiner liner || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+
+        Pen pen = new(Color.Black);
+        Brush additionalBrush = new SolidBrush(liner.AdditionalColor);
+        Brush br = new SolidBrush(liner.BodyColor);
+
+        _startPosY += 40;
+        base.DrawTransport(g);
+        _startPosY -= 40;
+
+
+        // якорь
+        if (liner.Anchor)
+        {
+            g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 85, _startPosX.Value + 45, _startPosY.Value + 115);
+            g.DrawLine(pen, _startPosX.Value + 30, _startPosY.Value + 95, _startPosX.Value + 60, _startPosY.Value + 95);
+            g.DrawLine(pen, _startPosX.Value + 25, _startPosY.Value + 100, _startPosX.Value + 45, _startPosY.Value + 115);
+            g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 115, _startPosX.Value + 65, _startPosY.Value + 100);
+        }
+
+        // шлюпки
+        if (liner.Boats)
+        {
+            g.FillEllipse(additionalBrush, _startPosX.Value + 40, _startPosY.Value + 85, 30, 15);
+            g.FillEllipse(additionalBrush, _startPosX.Value + 75, _startPosY.Value + 85, 30, 15);
+            g.FillEllipse(additionalBrush, _startPosX.Value + 110, _startPosY.Value + 85, 30, 15);
+        }
+
+        // труба
+        if (liner.Pipe)
+        {
+
+            Point point9 = new Point(_startPosX.Value + 90, _startPosY.Value + 10);
+            Point point10 = new Point(_startPosX.Value + 90, _startPosY.Value + 40);
+            Point point11 = new Point(_startPosX.Value + 115, _startPosY.Value + 40);
+            Point point12 = new Point(_startPosX.Value + 115, _startPosY.Value + 10);
+            Point[] curvePoints3 = { point9, point10, point11, point12 };
+            g.FillPolygon(br, curvePoints3);
+        }
+    }
+
+}
diff --git a/ProjectLiner/ProjectLiner/Entities/EntityCommonLiner.cs b/ProjectLiner/ProjectLiner/Entities/EntityCommonLiner.cs
new file mode 100644
index 0000000..bb99401
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/Entities/EntityCommonLiner.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+/// <summary>
+/// Класс-сущность обычного "Лайнера"
+/// </summary>
+
+namespace ProjectLiner.Entities
+{
+    public class EntityCommonLiner
+    {
+        /// <summary>
+        /// Скорость
+        /// </summary>
+        public int Speed { get; private set; }
+
+        /// <summary>
+        /// Вес
+        /// </summary>
+        public double Weight { get; private set; }
+
+        /// <summary>
+        /// Основной цвет
+        /// </summary>
+        public Color BodyColor { get; private set; }
+
+        /// <summary>
+        /// Шаг перемещения автомобиля
+        /// </summary>
+        public double Step => Speed * 100 / Weight;
+
+        /// <summary>
+        /// Конструктор лайнера
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автомобиля</param>
+        /// <param name="bodyColor">Основной цвет</param>
+
+        public EntityCommonLiner(int speed, double weight, Color bodyColor)
+        {
+            Speed = speed;
+            Weight = weight;
+            BodyColor = bodyColor;
+
+        }
+    }
+}
diff --git a/ProjectLiner/ProjectLiner/EntityLiner.cs b/ProjectLiner/ProjectLiner/Entities/EntityLiner.cs
similarity index 58%
rename from ProjectLiner/ProjectLiner/EntityLiner.cs
rename to ProjectLiner/ProjectLiner/Entities/EntityLiner.cs
index 66d27c1..18a65d3 100644
--- a/ProjectLiner/ProjectLiner/EntityLiner.cs
+++ b/ProjectLiner/ProjectLiner/Entities/EntityLiner.cs
@@ -1,24 +1,10 @@
-namespace ProjectLiner;
+namespace ProjectLiner.Entities;
 
 /// <summary>
 /// Класс-сущность "Лайнер"
 /// </summary>
-public class EntityLiner
+public class EntityLiner: EntityCommonLiner
 {
-    /// <summary>
-    /// Скорость
-    /// </summary>
-    public int Speed { get; private set; }
-
-    /// <summary>
-    /// Вес
-    /// </summary>
-    public double Weight { get; private set; }
-
-    /// <summary>
-    /// Основной цвет
-    /// </summary>
-    public Color BodyColor { get; private set; }
 
     /// <summary>
     /// Дополнительный цвет (для опциональных элементов)
@@ -40,26 +26,17 @@ public class EntityLiner
     /// </summary>
     public bool Pipe { get; private set; }
 
-    /// <summary>
-    /// Шаг перемещения автомобиля
-    /// </summary>
-    public double Step => Speed * 100 / Weight;
 
     /// <summary>
     /// Инициализация полей объекта-класса спортивного автомобиля
     /// </summary>
-    /// <param name="speed">Скорость</param>
-    /// <param name="weight">Вес автомобиля</param>
-    /// <param name="bodyColor">Основной цвет</param>
     /// <param name="additionalColor">Дополнительный цвет</param>
     /// <param name="anchor">Признак наличия якоря</param>
     /// <param name="boats">Признак наличия шлюпок</param>
     /// <param name="pipe">Признак наличия трубы</param>
-    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool anchor, bool boats, bool pipe)
+    public EntityLiner(int speed, double weight, Color bodyColor, Color additionalColor, bool anchor, bool boats, bool pipe) : base(speed, weight, bodyColor)
     {
-        Speed = speed;
-        Weight = weight;
-        BodyColor = bodyColor;
+        new EntityCommonLiner(speed, weight, bodyColor);
         AdditionalColor = additionalColor;
         Anchor = anchor;
         Boats = boats;
diff --git a/ProjectLiner/ProjectLiner/FormLiner.Designer.cs b/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
index 94eb653..2806d52 100644
--- a/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
+++ b/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
@@ -34,6 +34,7 @@
             buttonUp = new Button();
             buttonLeft = new Button();
             buttonRight = new Button();
+            buttonCreateCommonLiner = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxLiner).BeginInit();
             SuspendLayout();
             // 
@@ -50,11 +51,11 @@
             // buttonCreate
             // 
             buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreate.Location = new Point(12, 520);
+            buttonCreate.Location = new Point(12, 544);
             buttonCreate.Name = "buttonCreate";
-            buttonCreate.Size = new Size(150, 82);
+            buttonCreate.Size = new Size(203, 58);
             buttonCreate.TabIndex = 1;
-            buttonCreate.Text = "Создать";
+            buttonCreate.Text = "Создать Лайнер";
             buttonCreate.UseVisualStyleBackColor = true;
             buttonCreate.Click += buttonCreate_Click;
             // 
@@ -106,11 +107,23 @@
             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;
+            // 
             // FormLiner
             // 
             AutoScaleDimensions = new SizeF(11F, 25F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(948, 614);
+            Controls.Add(buttonCreateCommonLiner);
             Controls.Add(buttonRight);
             Controls.Add(buttonLeft);
             Controls.Add(buttonUp);
@@ -131,5 +144,6 @@
         private Button buttonUp;
         private Button buttonLeft;
         private Button buttonRight;
+        private Button buttonCreateCommonLiner;
     }
 }
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/FormLiner.cs b/ProjectLiner/ProjectLiner/FormLiner.cs
index c72187d..8597fce 100644
--- a/ProjectLiner/ProjectLiner/FormLiner.cs
+++ b/ProjectLiner/ProjectLiner/FormLiner.cs
@@ -7,12 +7,13 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using ProjectLiner.Drawnings;
 
 namespace ProjectLiner
 {
     public partial class FormLiner : Form
     {
-        private DrawningLiner? _drawningLiner;
+        private DrawningCommonLiner? _drawningCommonLiner;
         public FormLiner()
         {
             InitializeComponent();
@@ -23,35 +24,66 @@ namespace ProjectLiner
         /// </summary>
         private void Draw()
         {
-            if (_drawningLiner == null)
+            if (_drawningCommonLiner == null)
             {
                 return;
             }
 
             Bitmap bmp = new(pictureBoxLiner.Width, pictureBoxLiner.Height);
             Graphics gr = Graphics.FromImage(bmp);
-            _drawningLiner.DrawTransport(gr);
+            _drawningCommonLiner.DrawTransport(gr);
             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));
+
+            Draw();
+        }
+
+        /// <summary>
+        /// Обработка нажатия кнопки "Создать Лайнер"
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void buttonCreate_Click(object sender, EventArgs e)
         {
-            Random random = new();
-            EntityLiner liner = new EntityLiner();
-            liner.Init(random.Next(100, 300), random.Next(1000, 3000),
-                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-                Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-            _drawningLiner = new DrawningLiner();
-            _drawningLiner.Init(liner);
-            _drawningLiner.SetPictureSize(pictureBoxLiner.Width, pictureBoxLiner.Height);
-            _drawningLiner.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            Draw();
+            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>
@@ -61,7 +93,7 @@ namespace ProjectLiner
         /// <param name="e"></param>
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            if (_drawningLiner == null)
+            if (_drawningCommonLiner == null)
             {
                 return;
             }
@@ -71,16 +103,16 @@ namespace ProjectLiner
             switch (name)
             {
                 case "buttonUp":
-                    result = _drawningLiner.MoveTransport(DirectionType.Up);
+                    result = _drawningCommonLiner.MoveTransport(DirectionType.Up);
                     break;
                 case "buttonDown":
-                    result = _drawningLiner.MoveTransport(DirectionType.Down);
+                    result = _drawningCommonLiner.MoveTransport(DirectionType.Down);
                     break;
                 case "buttonLeft":
-                    result = _drawningLiner.MoveTransport(DirectionType.Left);
+                    result = _drawningCommonLiner.MoveTransport(DirectionType.Left);
                     break;
                 case "buttonRight":
-                    result = _drawningLiner.MoveTransport(DirectionType.Right);
+                    result = _drawningCommonLiner.MoveTransport(DirectionType.Right);
                     break;
             }
 
@@ -89,5 +121,6 @@ namespace ProjectLiner
                 Draw();
             }
         }
+
     }
 }

From ecfe3f3131795c7eb4b6f126e3e20de3b27862a8 Mon Sep 17 00:00:00 2001
From: gettterot <kasslesson@gmail.com>
Date: Wed, 6 Mar 2024 09:38:21 +0400
Subject: [PATCH 05/11] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D1=82=D0=B5=D0=B3?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BD=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=89=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=20=D1=86=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=82=D1=80=D1=83=20=D0=B8=20=D0=BA=20=D0=BA=D1=80=D0=B0?=
 =?UTF-8?q?=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLiner/Drawnings/DirectionType.cs   |   5 +
 .../Drawnings/DrawningCommonLiner.cs          |  20 +++
 .../ProjectLiner/Drawnings/DrawningLiner.cs   |   4 +-
 .../ProjectLiner/FormLiner.Designer.cs        |  26 ++++
 ProjectLiner/ProjectLiner/FormLiner.cs        |  49 +++++-
 .../MovementStrategy/AbstractStrategy.cs      | 145 ++++++++++++++++++
 .../MovementStrategy/IMoveableObjectcs.cs     |  30 ++++
 .../MovementStrategy/MoveToBorder.cs          |  58 +++++++
 .../MovementStrategy/MoveToCenter.cs          |  60 ++++++++
 .../MovementStrategy/MoveableLiner.cs         |  69 +++++++++
 .../MovementStrategy/MovementDirection.cs     |  30 ++++
 .../MovementStrategy/ObjectParameters.cs      |  78 ++++++++++
 .../MovementStrategy/StrategyStatus.cs        |  27 ++++
 13 files changed, 598 insertions(+), 3 deletions(-)
 create mode 100644 ProjectLiner/ProjectLiner/MovementStrategy/AbstractStrategy.cs
 create mode 100644 ProjectLiner/ProjectLiner/MovementStrategy/IMoveableObjectcs.cs
 create mode 100644 ProjectLiner/ProjectLiner/MovementStrategy/MoveToBorder.cs
 create mode 100644 ProjectLiner/ProjectLiner/MovementStrategy/MoveToCenter.cs
 create mode 100644 ProjectLiner/ProjectLiner/MovementStrategy/MoveableLiner.cs
 create mode 100644 ProjectLiner/ProjectLiner/MovementStrategy/MovementDirection.cs
 create mode 100644 ProjectLiner/ProjectLiner/MovementStrategy/ObjectParameters.cs
 create mode 100644 ProjectLiner/ProjectLiner/MovementStrategy/StrategyStatus.cs

diff --git a/ProjectLiner/ProjectLiner/Drawnings/DirectionType.cs b/ProjectLiner/ProjectLiner/Drawnings/DirectionType.cs
index cc78a5a..bca182c 100644
--- a/ProjectLiner/ProjectLiner/Drawnings/DirectionType.cs
+++ b/ProjectLiner/ProjectLiner/Drawnings/DirectionType.cs
@@ -5,6 +5,11 @@
 /// </summary>
 public enum DirectionType
 {
+    /// <summary>
+    /// Неизвестное направление
+    /// </summary>
+    Unknow = -1,
+
     /// <summary>
     /// Вверх
     /// </summary>
diff --git a/ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs b/ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs
index 2bc1885..f3e6fe6 100644
--- a/ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs
+++ b/ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs
@@ -43,6 +43,26 @@ public class DrawningCommonLiner
     /// </summary>
     private readonly int _drawningLinerHeight = 90;
 
+    /// <summary>
+    /// Координата X объекта
+    /// </summary>
+    public int? GetPosX => _startPosX;
+
+    /// <summary>
+    /// Координата Y объекта
+    /// </summary>
+    public int? GetPosY => _startPosY;
+
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    public int GetWidth => _drawningLinerWidth;
+
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    public int GetHeight => _drawningLinerHeight;
+
     /// <summary>
     /// Пустой конструктор
     /// </summary>
diff --git a/ProjectLiner/ProjectLiner/Drawnings/DrawningLiner.cs b/ProjectLiner/ProjectLiner/Drawnings/DrawningLiner.cs
index a2ce841..46a4021 100644
--- a/ProjectLiner/ProjectLiner/Drawnings/DrawningLiner.cs
+++ b/ProjectLiner/ProjectLiner/Drawnings/DrawningLiner.cs
@@ -12,7 +12,7 @@ public class DrawningLiner : DrawningCommonLiner
     /// </summary>
     /// <param name="speed">Скорость</param>
     /// <param name="weight">Вес</param>
-    /// <param name="bodyColor">Основной цвет</param>
+    /// <param name="bodycolor">Основной цвет</param>
     /// <param name="additionalColor">Дополнительный цвет</param>
     /// <param name="anchor">Признак наличия якоря</param>
     /// <param name="boats">Признак наличия шлюпок</param>
@@ -65,7 +65,7 @@ public class DrawningLiner : DrawningCommonLiner
             Point point11 = new Point(_startPosX.Value + 115, _startPosY.Value + 40);
             Point point12 = new Point(_startPosX.Value + 115, _startPosY.Value + 10);
             Point[] curvePoints3 = { point9, point10, point11, point12 };
-            g.FillPolygon(br, curvePoints3);
+            g.FillPolygon(additionalBrush, curvePoints3);
         }
     }
 
diff --git a/ProjectLiner/ProjectLiner/FormLiner.Designer.cs b/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
index 2806d52..c21ee63 100644
--- a/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
+++ b/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
@@ -35,6 +35,8 @@
             buttonLeft = new Button();
             buttonRight = new Button();
             buttonCreateCommonLiner = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxLiner).BeginInit();
             SuspendLayout();
             // 
@@ -118,11 +120,33 @@
             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.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(194, 33);
+            comboBoxStrategy.TabIndex = 11;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Location = new Point(816, 51);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(120, 37);
+            buttonStrategyStep.TabIndex = 12;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += buttonStrategyStep_Click;
+            // 
             // FormLiner
             // 
             AutoScaleDimensions = new SizeF(11F, 25F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(948, 614);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
             Controls.Add(buttonCreateCommonLiner);
             Controls.Add(buttonRight);
             Controls.Add(buttonLeft);
@@ -145,5 +169,7 @@
         private Button buttonLeft;
         private Button buttonRight;
         private Button buttonCreateCommonLiner;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
     }
 }
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/FormLiner.cs b/ProjectLiner/ProjectLiner/FormLiner.cs
index 8597fce..aa13498 100644
--- a/ProjectLiner/ProjectLiner/FormLiner.cs
+++ b/ProjectLiner/ProjectLiner/FormLiner.cs
@@ -8,15 +8,19 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using ProjectLiner.Drawnings;
+using ProjectLiner.MovementStrategy;
 
 namespace ProjectLiner
 {
     public partial class FormLiner : Form
     {
         private DrawningCommonLiner? _drawningCommonLiner;
+
+        private AbstractStrategy? _strategy;
         public FormLiner()
         {
             InitializeComponent();
+            _strategy = null;
         }
 
         /// <summary>
@@ -61,7 +65,8 @@ namespace ProjectLiner
 
             _drawningCommonLiner.SetPictureSize(pictureBoxLiner.Width, pictureBoxLiner.Height);
             _drawningCommonLiner.SetPosition(random.Next(10, 100), random.Next(10, 100));
-
+            _strategy = null;
+            comboBoxStrategy.Enabled = true;
             Draw();
         }
 
@@ -122,5 +127,47 @@ namespace ProjectLiner
             }
         }
 
+        /// <summary>
+        /// Обработка нажатия кнопки "Шаг"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonStrategyStep_Click(object sender, EventArgs e)
+        {
+            if (_drawningCommonLiner == null)
+            {
+                return;
+            }
+
+            if (comboBoxStrategy.Enabled)
+            {
+                _strategy = comboBoxStrategy.SelectedIndex switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_strategy == null)
+                {
+                    return;
+                }
+                _strategy.SetData(new MoveableLiner(_drawningCommonLiner), pictureBoxLiner.Width, pictureBoxLiner.Height);
+            }
+
+            if (_strategy == null)
+            {
+                return;
+            }
+
+            comboBoxStrategy.Enabled = false;
+            _strategy.MakeStep();
+            Draw();
+
+            if (_strategy.GetStatus() == StrategyStatus.Finish)
+            {
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+            }
+        }
     }
 }
diff --git a/ProjectLiner/ProjectLiner/MovementStrategy/AbstractStrategy.cs b/ProjectLiner/ProjectLiner/MovementStrategy/AbstractStrategy.cs
new file mode 100644
index 0000000..ca37c66
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/MovementStrategy/AbstractStrategy.cs
@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectLiner.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>
+    /// <returns></returns>
+    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 (IsTargetDestination())
+        {
+            _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 IsTargetDestination();
+
+    /// <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;
+    }
+}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/MovementStrategy/IMoveableObjectcs.cs b/ProjectLiner/ProjectLiner/MovementStrategy/IMoveableObjectcs.cs
new file mode 100644
index 0000000..a5ace3f
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/MovementStrategy/IMoveableObjectcs.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectLiner.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);
+}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/MovementStrategy/MoveToBorder.cs b/ProjectLiner/ProjectLiner/MovementStrategy/MoveToBorder.cs
new file mode 100644
index 0000000..37eced3
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/MovementStrategy/MoveToBorder.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectLiner.MovementStrategy;
+
+/// <summary>
+/// Стратегия перемещения объекта к правой нижней границы
+/// </summary>
+public class MoveToBorder : AbstractStrategy
+{
+    protected override bool IsTargetDestination()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return false;
+        }
+
+        return objParams.RightBorder <= FieldWidth && objParams.RightBorder + GetStep() >= FieldWidth &&
+        objParams.DownBorder <= FieldHeight && objParams.DownBorder + GetStep() >= FieldHeight;
+    }
+
+    protected override void MoveToTarget()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return;
+        }
+        int diffX = objParams.RightBorder - FieldWidth;
+        if (Math.Abs(diffX) > GetStep())
+        {
+            if (diffX > 0)
+            {
+                MoveLeft();
+            }
+            else
+            {
+                MoveRight();
+            }
+        }
+        int diffY = objParams.DownBorder - FieldHeight;
+        if (Math.Abs(diffY) > GetStep())
+        {
+            if (diffY > 0)
+            {
+                MoveUp();
+            }
+            else
+            {
+                MoveDown();
+            }
+        }
+    }
+}
diff --git a/ProjectLiner/ProjectLiner/MovementStrategy/MoveToCenter.cs b/ProjectLiner/ProjectLiner/MovementStrategy/MoveToCenter.cs
new file mode 100644
index 0000000..afe820c
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/MovementStrategy/MoveToCenter.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectLiner.MovementStrategy;
+
+/// <summary>
+/// Стратегия перемещения объекта в центр экрана
+/// </summary>
+public class MoveToCenter : AbstractStrategy
+{
+    protected override bool IsTargetDestination()
+    {
+        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();
+            }
+        }
+    }
+}
diff --git a/ProjectLiner/ProjectLiner/MovementStrategy/MoveableLiner.cs b/ProjectLiner/ProjectLiner/MovementStrategy/MoveableLiner.cs
new file mode 100644
index 0000000..c87517a
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/MovementStrategy/MoveableLiner.cs
@@ -0,0 +1,69 @@
+using ProjectLiner.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectLiner.MovementStrategy;
+
+/// <summary>
+/// Класс-реализация IMoveableObject с использованием DrawningCommonLiner
+/// </summary>
+public class MoveableLiner : IMoveableObject
+{
+    /// <summary>
+    /// Поле-объект класса DrawningCommonLiner или его наследника
+    /// </summary>
+    private readonly DrawningCommonLiner? _CommonLiner = null;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="CommonLiner">Объект класса DrawningCommonLiner</param>
+    public MoveableLiner(DrawningCommonLiner CommonLiner)
+    {
+        _CommonLiner = CommonLiner;
+    }
+
+    public ObjectParameters? GetObjectPosition
+    {
+        get
+        {
+            if (_CommonLiner == null || _CommonLiner.EntityCommonLiner == null || !_CommonLiner.GetPosX.HasValue || !_CommonLiner.GetPosY.HasValue)
+            {
+                return null;
+            }
+            return new ObjectParameters(_CommonLiner.GetPosX.Value, _CommonLiner.GetPosY.Value, _CommonLiner.GetWidth, _CommonLiner.GetHeight);
+        }
+    }
+
+    public int GetStep => (int)(_CommonLiner?.EntityCommonLiner?.Step ?? 0);
+
+    public bool TryMoveObject(MovementDirection direction)
+    {
+        if (_CommonLiner == null || _CommonLiner.EntityCommonLiner == null)
+        {
+            return false;
+        }
+
+        return _CommonLiner.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,
+        };
+    }
+}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/MovementStrategy/MovementDirection.cs b/ProjectLiner/ProjectLiner/MovementStrategy/MovementDirection.cs
new file mode 100644
index 0000000..3981ef6
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/MovementStrategy/MovementDirection.cs
@@ -0,0 +1,30 @@
+namespace ProjectLiner.MovementStrategy;
+
+
+
+/// <summary>
+/// Направление перемещения
+/// </summary>
+public enum MovementDirection
+{
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Up = 1,
+
+    /// <summary>
+    /// Вниз
+    /// </summary>
+    Down = 2,
+
+    /// <summary>
+    /// Влево
+    /// </summary>
+    Left = 3,
+
+    /// <summary>
+    /// Вправо
+    /// </summary>
+    Right = 4
+}
+
diff --git a/ProjectLiner/ProjectLiner/MovementStrategy/ObjectParameters.cs b/ProjectLiner/ProjectLiner/MovementStrategy/ObjectParameters.cs
new file mode 100644
index 0000000..251aa9a
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/MovementStrategy/ObjectParameters.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectLiner.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;
+    }
+}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/MovementStrategy/StrategyStatus.cs b/ProjectLiner/ProjectLiner/MovementStrategy/StrategyStatus.cs
new file mode 100644
index 0000000..b221f83
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/MovementStrategy/StrategyStatus.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectLiner.MovementStrategy;
+/// <summary>
+/// Статус выполнения операции перемещения
+/// </summary>
+public enum StrategyStatus
+{
+    /// <summary>
+    /// Все готово к началу
+    /// </summary>
+    NotInit,
+
+    /// <summary>
+    /// Выполняется
+    /// </summary>
+    InProgress,
+
+    /// <summary>
+    /// Завершено
+    /// </summary>
+    Finish
+}
\ No newline at end of file

From f1f6698e1fee6a2d006a12400df5b08df8cb7ae5 Mon Sep 17 00:00:00 2001
From: gettterot <kasslesson@gmail.com>
Date: Wed, 6 Mar 2024 09:45:25 +0400
Subject: [PATCH 06/11] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B0=D1=80=D0=B8=D1=8F=20=D0=B2=20DrawningCommonLiner?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs b/ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs
index f3e6fe6..b47fb35 100644
--- a/ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs
+++ b/ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs
@@ -6,6 +6,9 @@ using System.Text;
 using System.Threading.Tasks;
 
 namespace ProjectLiner.Drawnings;
+/// <summary>
+/// Класс, отвечающий за прорисовку и перемещение обычного объекта-сущности
+/// </summary>
 public class DrawningCommonLiner
 {
     /// <summary>
@@ -36,7 +39,7 @@ public class DrawningCommonLiner
     /// <summary>
     /// Ширина прорисовки лайнера
     /// </summary>
-    private readonly int _drawningLinerWidth = 150;
+    private readonly int _drawningLinerWidth = 155;
 
     /// <summary>
     /// Высота прорисовки лайнера

From fb4cc240a19c23c1fc6d7ca4efc589d6059815e5 Mon Sep 17 00:00:00 2001
From: gettterot <kasslesson@gmail.com>
Date: Fri, 15 Mar 2024 09:36:48 +0400
Subject: [PATCH 07/11] Adding abstract class

---
 .../MovementStrategy/IMoveableObjectcs.cs         | 10 ++++++++++
 .../MovementStrategy/MoveableLiner.cs             | 15 ++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ProjectLiner/ProjectLiner/MovementStrategy/IMoveableObjectcs.cs b/ProjectLiner/ProjectLiner/MovementStrategy/IMoveableObjectcs.cs
index a5ace3f..e2b5686 100644
--- a/ProjectLiner/ProjectLiner/MovementStrategy/IMoveableObjectcs.cs
+++ b/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);
 }
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/MovementStrategy/MoveableLiner.cs b/ProjectLiner/ProjectLiner/MovementStrategy/MoveableLiner.cs
index c87517a..b067010 100644
--- a/ProjectLiner/ProjectLiner/MovementStrategy/MoveableLiner.cs
+++ b/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;
+    }
 }
\ No newline at end of file

From 359c50745bfc19c79681f2cac128f312eae3bf2c Mon Sep 17 00:00:00 2001
From: gettterot <kasslesson@gmail.com>
Date: Tue, 19 Mar 2024 10:26:26 +0400
Subject: [PATCH 08/11] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AbstractCompany.cs                        | 118 +++++++++++
 .../ICollectionGenericObjects.cs              |  49 +++++
 .../LinerSharingService.cs                    |  74 +++++++
 .../MassiveGenericObjects.cs                  | 111 +++++++++++
 .../ProjectLiner/FormLiner.Designer.cs        |  66 +++---
 ProjectLiner/ProjectLiner/FormLiner.cs        |  68 ++-----
 .../FormLinerCollection.Designer.cs           | 173 ++++++++++++++++
 .../ProjectLiner/FormLinerCollection.cs       | 188 ++++++++++++++++++
 .../ProjectLiner/FormLinerCollection.resx     | 120 +++++++++++
 ProjectLiner/ProjectLiner/Program.cs          |   2 +-
 10 files changed, 874 insertions(+), 95 deletions(-)
 create mode 100644 ProjectLiner/ProjectLiner/CollectionGenericObjects/AbstractCompany.cs
 create mode 100644 ProjectLiner/ProjectLiner/CollectionGenericObjects/ICollectionGenericObjects.cs
 create mode 100644 ProjectLiner/ProjectLiner/CollectionGenericObjects/LinerSharingService.cs
 create mode 100644 ProjectLiner/ProjectLiner/CollectionGenericObjects/MassiveGenericObjects.cs
 create mode 100644 ProjectLiner/ProjectLiner/FormLinerCollection.Designer.cs
 create mode 100644 ProjectLiner/ProjectLiner/FormLinerCollection.cs
 create mode 100644 ProjectLiner/ProjectLiner/FormLinerCollection.resx

diff --git a/ProjectLiner/ProjectLiner/CollectionGenericObjects/AbstractCompany.cs b/ProjectLiner/ProjectLiner/CollectionGenericObjects/AbstractCompany.cs
new file mode 100644
index 0000000..1eb7aa1
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/CollectionGenericObjects/AbstractCompany.cs
@@ -0,0 +1,118 @@
+using ProjectLiner.CollectionGenericObjects;
+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 bool operator +(AbstractCompany company, DrawningCommonLiner Liner)
+        {
+            return company._collection?.Insert(Liner) ?? false;
+        }
+
+        /// <summary>
+        /// Перегрузка оператора удаления для класса
+        /// </summary>
+        /// <param name="company">Компания</param>
+        /// <param name="position">Номер удаляемого объекта</param>
+        /// <returns></returns>
+        public static bool operator -(AbstractCompany company, int position)
+        {
+            return company._collection?.Remove(position) ?? false;
+        }
+
+        /// <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();
+    }
+}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectLiner/ProjectLiner/CollectionGenericObjects/ICollectionGenericObjects.cs
new file mode 100644
index 0000000..9e2ed2f
--- /dev/null
+++ b/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>
+        bool Insert(T obj);
+
+        /// <summary>
+        /// Добавление объекта в коллекцию на конкретную позицию
+        /// </summary>
+        /// <param name="obj">Добавляемый объект</param>
+        /// <param name="position">Позиция</param>
+        /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
+        bool Insert(T obj, int position);
+
+        /// <summary>
+        /// Удаление объекта из коллекции с конкретной позиции
+        /// </summary>
+        /// <param name="position">Позиция</param>
+        /// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
+        bool Remove(int position);
+
+        /// <summary>
+        /// Получение объекта по позиции
+        /// </summary>
+        /// <param name="position">Позиция</param>
+        /// <returns>Объект</returns>
+        T? Get(int position);
+    }
+}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/CollectionGenericObjects/LinerSharingService.cs b/ProjectLiner/ProjectLiner/CollectionGenericObjects/LinerSharingService.cs
new file mode 100644
index 0000000..0501fa8
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/CollectionGenericObjects/LinerSharingService.cs
@@ -0,0 +1,74 @@
+
+using ProjectLiner.Drawnings;
+using ProjectLiner.CollectionGenericObjects;
+
+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<DrawningLiner> collection) : base(picWidth, picHeight, collection)
+    {
+    }
+
+    protected override void DrawBackgound(Graphics g)
+    {
+
+        int count_width = _pictureWidth / _placeSizeWidth; // кол-во мест в ширину
+        int count_height = _pictureHeight / _placeSizeHeight;
+        Pen pen = new(Color.Black, 3);
+        for (int i = 0; i < count_width; i++)
+        {
+            for (int j = 0; j < count_height + 1; ++j)
+            {
+                g.DrawLine(pen, i * _placeSizeWidth + 10, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth - 50, j * _placeSizeHeight); // вертикаль
+                g.DrawLine(pen, i * _placeSizeWidth + 10, j * _placeSizeHeight, i * _placeSizeWidth + 10, j * _placeSizeHeight + _placeSizeHeight);
+            }
+        }
+    }
+
+    protected override void SetObjectsPosition()
+    {
+
+        int width = _pictureWidth / _placeSizeWidth;
+        int height = _pictureHeight / _placeSizeHeight;
+        int positionWidth = 0;
+        int positionHeight = height - 1;
+
+        if (_collection?.Count != null)
+        {
+            for (int i = 0; i < (_collection.Count); i++)
+            {
+                if (_collection.Get(i) != null)
+                {
+                    _collection.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
+                    _collection.Get(i).SetPosition(_placeSizeWidth * positionWidth + 25, positionHeight * _placeSizeHeight + 10);
+                }
+
+                if (positionWidth < width - 1)
+                {
+                    positionWidth++;
+                }
+
+                else
+                {
+                    positionWidth = 0;
+                    positionHeight--;
+                }
+                if (positionHeight < 0)
+                {
+                    return;
+                }
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectLiner/ProjectLiner/CollectionGenericObjects/MassiveGenericObjects.cs
new file mode 100644
index 0000000..9865dd0
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/CollectionGenericObjects/MassiveGenericObjects.cs
@@ -0,0 +1,111 @@
+using ProjectLiner.CollectionGenericObjects;
+
+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 bool Insert(T obj)
+        {
+            for (int i = 0; i < Count; i++)
+            {
+                if (_collection[i] == null)
+                {
+                    _collection[i] = obj;
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public bool Insert(T obj, int position)
+        {
+            if (position < 0 || position >= Count)
+                return false;
+
+            if (_collection[position] == null)
+            {
+                _collection[position] = obj;
+                return true;
+            }
+
+            int temp = position + 1;
+            while (temp < Count)
+            {
+                if (_collection[temp] == null)
+                {
+                    _collection[temp] = obj;
+                    return true;
+                }
+                temp++;
+            }
+
+            temp = position - 1;
+            while (temp > 0)
+            {
+                if (_collection[temp] == null)
+                {
+                    _collection[temp] = obj;
+                    return true;
+                }
+                temp--;
+            }
+
+            return false;
+        }
+
+        public bool Remove(int position)
+        {
+            if (position < 0 || position >= Count)
+                return false;
+
+            _collection[position] = null;
+
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/FormLiner.Designer.cs b/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
index c21ee63..7dc1072 100644
--- a/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
+++ b/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, 5, 5, 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, 5, 5, 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, 5, 5, 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, 5, 5, 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, 5, 5, 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, 5, 5, 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, 5, 5, 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, 5, 5, 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;
     }
diff --git a/ProjectLiner/ProjectLiner/FormLiner.cs b/ProjectLiner/ProjectLiner/FormLiner.cs
index aa13498..683457a 100644
--- a/ProjectLiner/ProjectLiner/FormLiner.cs
+++ b/ProjectLiner/ProjectLiner/FormLiner.cs
@@ -23,6 +23,23 @@ namespace ProjectLiner
             _strategy = null;
         }
 
+
+        /// <summary>
+        /// Стратегия перемещения
+        /// </summary>
+
+        public DrawningLiner 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>
         /// Перемещение объекта по форме (нажатие кнопок навигации)
diff --git a/ProjectLiner/ProjectLiner/FormLinerCollection.Designer.cs b/ProjectLiner/ProjectLiner/FormLinerCollection.Designer.cs
new file mode 100644
index 0000000..1aeb63b
--- /dev/null
+++ b/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;
+    }
+}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/FormLinerCollection.cs b/ProjectLiner/ProjectLiner/FormLinerCollection.cs
new file mode 100644
index 0000000..38bb839
--- /dev/null
+++ b/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<DrawningLiner>());
+                    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)
+            {
+                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)
+            {
+                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 = (DrawningLiner)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();
+        }
+    }
+}
diff --git a/ProjectLiner/ProjectLiner/FormLinerCollection.resx b/ProjectLiner/ProjectLiner/FormLinerCollection.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/Program.cs b/ProjectLiner/ProjectLiner/Program.cs
index b3dc92e..e3f64ca 100644
--- a/ProjectLiner/ProjectLiner/Program.cs
+++ b/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());
         }
     }
 }
\ No newline at end of file

From dac8a3ec17177b0c4414f7b6c2a347da9f021789 Mon Sep 17 00:00:00 2001
From: gettterot <kasslesson@gmail.com>
Date: Wed, 20 Mar 2024 08:23:41 +0400
Subject: [PATCH 09/11] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D1=81=20=D0=BE=D1=82=D1=80=D0=B8=D1=81=D0=BE=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B9=20sharing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AbstractCompany.cs                        |  3 +-
 .../LinerSharingService.cs                    | 64 ++++++++-----------
 .../MassiveGenericObjects.cs                  |  3 +-
 .../Drawnings/DrawningCommonLiner.cs          |  6 +-
 .../ProjectLiner/FormLiner.Designer.cs        | 16 ++---
 ProjectLiner/ProjectLiner/FormLiner.cs        |  2 +-
 .../ProjectLiner/FormLinerCollection.cs       |  4 +-
 7 files changed, 41 insertions(+), 57 deletions(-)

diff --git a/ProjectLiner/ProjectLiner/CollectionGenericObjects/AbstractCompany.cs b/ProjectLiner/ProjectLiner/CollectionGenericObjects/AbstractCompany.cs
index 1eb7aa1..0e550fc 100644
--- a/ProjectLiner/ProjectLiner/CollectionGenericObjects/AbstractCompany.cs
+++ b/ProjectLiner/ProjectLiner/CollectionGenericObjects/AbstractCompany.cs
@@ -1,5 +1,4 @@
-using ProjectLiner.CollectionGenericObjects;
-using ProjectLiner.Drawnings;
+using ProjectLiner.Drawnings;
 
 namespace ProjectLiner.CollectionGenericObjects
 {
diff --git a/ProjectLiner/ProjectLiner/CollectionGenericObjects/LinerSharingService.cs b/ProjectLiner/ProjectLiner/CollectionGenericObjects/LinerSharingService.cs
index 0501fa8..ad2d528 100644
--- a/ProjectLiner/ProjectLiner/CollectionGenericObjects/LinerSharingService.cs
+++ b/ProjectLiner/ProjectLiner/CollectionGenericObjects/LinerSharingService.cs
@@ -1,6 +1,4 @@
-
-using ProjectLiner.Drawnings;
-using ProjectLiner.CollectionGenericObjects;
+using ProjectLiner.Drawnings;
 
 namespace ProjectLiner.CollectionGenericObjects;
 
@@ -15,60 +13,52 @@ public class LinerSharingService : AbstractCompany
     /// <param name="picWidth">Ширина</param>
     /// <param name="picHeight">Высота</param>
     /// <param name="collection">Коллекция</param>
-    public LinerSharingService(int picWidth, int picHeight, ICollectionGenericObjects<DrawningLiner> collection) : base(picWidth, picHeight, collection)
+    public LinerSharingService(int picWidth, int picHeight, ICollectionGenericObjects<DrawningCommonLiner> collection) : base(picWidth, picHeight, collection)
     {
     }
 
     protected override void DrawBackgound(Graphics g)
     {
-
-        int count_width = _pictureWidth / _placeSizeWidth; // кол-во мест в ширину
-        int count_height = _pictureHeight / _placeSizeHeight;
-        Pen pen = new(Color.Black, 3);
-        for (int i = 0; i < count_width; i++)
+        Pen pen = new(Color.Black, 4);
+        for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
         {
-            for (int j = 0; j < count_height + 1; ++j)
+            for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
             {
-                g.DrawLine(pen, i * _placeSizeWidth + 10, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth - 50, j * _placeSizeHeight); // вертикаль
-                g.DrawLine(pen, i * _placeSizeWidth + 10, j * _placeSizeHeight, i * _placeSizeWidth + 10, j * _placeSizeHeight + _placeSizeHeight);
+                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 positionWidth = 0;
-        int positionHeight = height - 1;
 
-        if (_collection?.Count != null)
+        int curWidth = width - 1;
+        int curHeight = 0;
+
+        for (int i = 0; i < (_collection?.Count ?? 0); i++)
         {
-            for (int i = 0; i < (_collection.Count); i++)
+            if (_collection?.Get(i) != null)
             {
-                if (_collection.Get(i) != null)
-                {
-                    _collection.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
-                    _collection.Get(i).SetPosition(_placeSizeWidth * positionWidth + 25, positionHeight * _placeSizeHeight + 10);
-                }
+                _collection.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
+                _collection.Get(i)?.SetPosition(_placeSizeWidth * curWidth + 10, (int)(curHeight * _placeSizeHeight * 1.3));
+            }
 
-                if (positionWidth < width - 1)
-                {
-                    positionWidth++;
-                }
-
-                else
-                {
-                    positionWidth = 0;
-                    positionHeight--;
-                }
-                if (positionHeight < 0)
-                {
-                    return;
-                }
+            if (curWidth > 0)
+                curWidth--;
+            else
+            {
+                curWidth = width - 1;
+                curHeight++;
+            }
+            if (curHeight > height)
+            {
+                return;
             }
         }
-
     }
 }
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectLiner/ProjectLiner/CollectionGenericObjects/MassiveGenericObjects.cs
index 9865dd0..9ed2684 100644
--- a/ProjectLiner/ProjectLiner/CollectionGenericObjects/MassiveGenericObjects.cs
+++ b/ProjectLiner/ProjectLiner/CollectionGenericObjects/MassiveGenericObjects.cs
@@ -1,5 +1,4 @@
-using ProjectLiner.CollectionGenericObjects;
-
+
 namespace ProjectLiner.CollectionGenericObjects
 {
     /// <summary>
diff --git a/ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs b/ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs
index b47fb35..ef854f9 100644
--- a/ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs
+++ b/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>
diff --git a/ProjectLiner/ProjectLiner/FormLiner.Designer.cs b/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
index 7dc1072..8b9984b 100644
--- a/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
+++ b/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
@@ -43,7 +43,7 @@
             pictureBoxLiner.BackColor = SystemColors.Control;
             pictureBoxLiner.Dock = DockStyle.Fill;
             pictureBoxLiner.Location = new Point(0, 0);
-            pictureBoxLiner.Margin = new Padding(5, 5, 5, 5);
+            pictureBoxLiner.Margin = new Padding(5);
             pictureBoxLiner.Name = "pictureBoxLiner";
             pictureBoxLiner.Size = new Size(1465, 1007);
             pictureBoxLiner.TabIndex = 0;
@@ -55,7 +55,7 @@
             buttonDown.BackgroundImage = Properties.Resources.bottom;
             buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
             buttonDown.Location = new Point(1283, 905);
-            buttonDown.Margin = new Padding(5, 5, 5, 5);
+            buttonDown.Margin = new Padding(5);
             buttonDown.Name = "buttonDown";
             buttonDown.Size = new Size(77, 82);
             buttonDown.TabIndex = 2;
@@ -68,7 +68,7 @@
             buttonUp.BackgroundImage = Properties.Resources.top;
             buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
             buttonUp.Location = new Point(1283, 813);
-            buttonUp.Margin = new Padding(5, 5, 5, 5);
+            buttonUp.Margin = new Padding(5);
             buttonUp.Name = "buttonUp";
             buttonUp.Size = new Size(77, 82);
             buttonUp.TabIndex = 3;
@@ -81,7 +81,7 @@
             buttonLeft.BackgroundImage = Properties.Resources.left;
             buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
             buttonLeft.Location = new Point(1196, 905);
-            buttonLeft.Margin = new Padding(5, 5, 5, 5);
+            buttonLeft.Margin = new Padding(5);
             buttonLeft.Name = "buttonLeft";
             buttonLeft.Size = new Size(77, 82);
             buttonLeft.TabIndex = 4;
@@ -94,7 +94,7 @@
             buttonRight.BackgroundImage = Properties.Resources.right;
             buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
             buttonRight.Location = new Point(1369, 905);
-            buttonRight.Margin = new Padding(5, 5, 5, 5);
+            buttonRight.Margin = new Padding(5);
             buttonRight.Name = "buttonRight";
             buttonRight.Size = new Size(77, 82);
             buttonRight.TabIndex = 5;
@@ -107,7 +107,7 @@
             comboBoxStrategy.FormattingEnabled = true;
             comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
             comboBoxStrategy.Location = new Point(1147, 20);
-            comboBoxStrategy.Margin = new Padding(5, 5, 5, 5);
+            comboBoxStrategy.Margin = new Padding(5);
             comboBoxStrategy.Name = "comboBoxStrategy";
             comboBoxStrategy.Size = new Size(298, 49);
             comboBoxStrategy.TabIndex = 11;
@@ -115,7 +115,7 @@
             // buttonStrategyStep
             // 
             buttonStrategyStep.Location = new Point(1261, 84);
-            buttonStrategyStep.Margin = new Padding(5, 5, 5, 5);
+            buttonStrategyStep.Margin = new Padding(5);
             buttonStrategyStep.Name = "buttonStrategyStep";
             buttonStrategyStep.Size = new Size(185, 61);
             buttonStrategyStep.TabIndex = 12;
@@ -135,7 +135,7 @@
             Controls.Add(buttonUp);
             Controls.Add(buttonDown);
             Controls.Add(pictureBoxLiner);
-            Margin = new Padding(5, 5, 5, 5);
+            Margin = new Padding(5);
             Name = "FormLiner";
             Text = "Лайнер";
             ((System.ComponentModel.ISupportInitialize)pictureBoxLiner).EndInit();
diff --git a/ProjectLiner/ProjectLiner/FormLiner.cs b/ProjectLiner/ProjectLiner/FormLiner.cs
index 683457a..fbbb11d 100644
--- a/ProjectLiner/ProjectLiner/FormLiner.cs
+++ b/ProjectLiner/ProjectLiner/FormLiner.cs
@@ -28,7 +28,7 @@ namespace ProjectLiner
         /// Стратегия перемещения
         /// </summary>
 
-        public DrawningLiner SetLiner
+        public DrawningCommonLiner SetLiner
         {
             set
             {
diff --git a/ProjectLiner/ProjectLiner/FormLinerCollection.cs b/ProjectLiner/ProjectLiner/FormLinerCollection.cs
index 38bb839..56b4370 100644
--- a/ProjectLiner/ProjectLiner/FormLinerCollection.cs
+++ b/ProjectLiner/ProjectLiner/FormLinerCollection.cs
@@ -32,7 +32,7 @@ namespace ProjectLiner
             switch (comboBoxSelectorCompany.Text)
             {
                 case "Хранилище":
-                    _company = new LinerSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningLiner>());
+                    _company = new LinerSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningCommonLiner>());
                     break;
             }
         }
@@ -165,7 +165,7 @@ namespace ProjectLiner
 
             FormLiner form = new()
             {
-                SetLiner = (DrawningLiner)liner
+                SetLiner = liner
             };
             form.ShowDialog();
         }

From 9aec819091d6c5544d4a97e63a53877b8fc5bd63 Mon Sep 17 00:00:00 2001
From: gettterot <kasslesson@gmail.com>
Date: Sun, 24 Mar 2024 16:26:53 +0400
Subject: [PATCH 10/11] =?UTF-8?q?=D0=A4=D0=B8=D0=BD=D0=B0=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B5=20=D0=B7=D0=B0=D0=BA=D1=80=D0=B5=D0=BF=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B5=D1=82=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AbstractCompany.cs                        |  9 +--
 .../ICollectionGenericObjects.cs              |  6 +-
 .../MassiveGenericObjects.cs                  | 69 +++++++++++--------
 .../ProjectLiner/FormLinerCollection.cs       |  4 +-
 4 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/ProjectLiner/ProjectLiner/CollectionGenericObjects/AbstractCompany.cs b/ProjectLiner/ProjectLiner/CollectionGenericObjects/AbstractCompany.cs
index 0e550fc..5076923 100644
--- a/ProjectLiner/ProjectLiner/CollectionGenericObjects/AbstractCompany.cs
+++ b/ProjectLiner/ProjectLiner/CollectionGenericObjects/AbstractCompany.cs
@@ -57,9 +57,10 @@ namespace ProjectLiner.CollectionGenericObjects
         /// <param name="company">Компания</param>
         /// <param name="Liner">Добавляемый объект</param>
         /// <returns></returns>
-        public static bool operator +(AbstractCompany company, DrawningCommonLiner Liner)
+
+        public static int operator +(AbstractCompany company, DrawningCommonLiner airplan)
         {
-            return company._collection?.Insert(Liner) ?? false;
+            return company._collection.Insert(airplan);
         }
 
         /// <summary>
@@ -68,9 +69,9 @@ namespace ProjectLiner.CollectionGenericObjects
         /// <param name="company">Компания</param>
         /// <param name="position">Номер удаляемого объекта</param>
         /// <returns></returns>
-        public static bool operator -(AbstractCompany company, int position)
+        public static DrawningCommonLiner operator -(AbstractCompany company, int position)
         {
-            return company._collection?.Remove(position) ?? false;
+            return company._collection.Remove(position);
         }
 
         /// <summary>
diff --git a/ProjectLiner/ProjectLiner/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectLiner/ProjectLiner/CollectionGenericObjects/ICollectionGenericObjects.cs
index 9e2ed2f..776e2ad 100644
--- a/ProjectLiner/ProjectLiner/CollectionGenericObjects/ICollectionGenericObjects.cs
+++ b/ProjectLiner/ProjectLiner/CollectionGenericObjects/ICollectionGenericObjects.cs
@@ -22,7 +22,7 @@
         /// </summary>
         /// <param name="obj">Добавляемый объект</param>
         /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-        bool Insert(T obj);
+        int Insert(T obj);
 
         /// <summary>
         /// Добавление объекта в коллекцию на конкретную позицию
@@ -30,14 +30,14 @@
         /// <param name="obj">Добавляемый объект</param>
         /// <param name="position">Позиция</param>
         /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-        bool Insert(T obj, int position);
+        int Insert(T obj, int position);
 
         /// <summary>
         /// Удаление объекта из коллекции с конкретной позиции
         /// </summary>
         /// <param name="position">Позиция</param>
         /// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
-        bool Remove(int position);
+        T? Remove(int position);
 
         /// <summary>
         /// Получение объекта по позиции
diff --git a/ProjectLiner/ProjectLiner/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectLiner/ProjectLiner/CollectionGenericObjects/MassiveGenericObjects.cs
index 9ed2684..f668f85 100644
--- a/ProjectLiner/ProjectLiner/CollectionGenericObjects/MassiveGenericObjects.cs
+++ b/ProjectLiner/ProjectLiner/CollectionGenericObjects/MassiveGenericObjects.cs
@@ -12,7 +12,7 @@ namespace ProjectLiner.CollectionGenericObjects
         /// Массив объектов, которые храним
         /// </summary>
         private T?[] _collection;
-
+        
         public int Count => _collection.Length;
 
         public int SetMaxCount
@@ -48,63 +48,74 @@ namespace ProjectLiner.CollectionGenericObjects
             return _collection[position];
         }
 
-        public bool Insert(T obj)
+        public int Insert(T obj)
         {
             for (int i = 0; i < Count; i++)
             {
                 if (_collection[i] == null)
                 {
                     _collection[i] = obj;
-                    return true;
+                    return i;
                 }
             }
-            return false;
+            return -1;
         }
 
-        public bool Insert(T obj, int position)
+        public int Insert(T obj, int position)
         {
             if (position < 0 || position >= Count)
-                return false;
-
-            if (_collection[position] == null)
             {
-                _collection[position] = obj;
-                return true;
+                return -1;
             }
 
-            int temp = position + 1;
-            while (temp < Count)
+            if (_collection[position] != null)
             {
-                if (_collection[temp] == null)
+                bool pushed = false;
+                for (int index = position + 1; index < Count; index++)
                 {
-                    _collection[temp] = obj;
-                    return true;
+                    if (_collection[index] == null)
+                    {
+                        position = index;
+                        pushed = true;
+                        break;
+                    }
                 }
-                temp++;
-            }
 
-            temp = position - 1;
-            while (temp > 0)
-            {
-                if (_collection[temp] == null)
+                if (!pushed)
                 {
-                    _collection[temp] = obj;
-                    return true;
+                    for (int index = position - 1; index >= 0; index--)
+                    {
+                        if (_collection[index] == null)
+                        {
+                            position = index;
+                            pushed = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (!pushed)
+                {
+                    return position;
                 }
-                temp--;
             }
 
-            return false;
+            _collection[position] = obj;
+            return position;
         }
 
-        public bool Remove(int position)
+        public T? Remove(int position)
         {
             if (position < 0 || position >= Count)
-                return false;
+            {
+                return null;
+            }
 
+            if (_collection[position] == null) return null;
+
+            T? temp = _collection[position];
             _collection[position] = null;
-
-            return true;
+            return temp;
         }
     }
 }
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/FormLinerCollection.cs b/ProjectLiner/ProjectLiner/FormLinerCollection.cs
index 56b4370..3e759f4 100644
--- a/ProjectLiner/ProjectLiner/FormLinerCollection.cs
+++ b/ProjectLiner/ProjectLiner/FormLinerCollection.cs
@@ -63,7 +63,7 @@ namespace ProjectLiner
                     return;
             }
 
-            if (_company + drawingLiner)
+            if (_company + drawingLiner != -1)
             {
                 MessageBox.Show("Объект добавлен");
                 pictureBox.Image = _company.Show();
@@ -123,7 +123,7 @@ namespace ProjectLiner
             }
 
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_company - pos)
+            if (_company - pos != null)
             {
                 MessageBox.Show("Объект удален");
                 pictureBox.Image = _company.Show();

From 10ce368f63784e829f1c73b07a5a920f6ba2b020 Mon Sep 17 00:00:00 2001
From: gettterot <kasslesson@gmail.com>
Date: Wed, 3 Apr 2024 08:28:54 +0400
Subject: [PATCH 11/11] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20?=
 =?UTF-8?q?=D1=81=D0=BF=D0=BE=D1=81=D0=BE=D0=B1=20=D1=85=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=B2=20"=D0=A1=D0=B5=D1=80=D0=B2=D0=B8=D1=81?=
 =?UTF-8?q?=D0=B5"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AbstractCompany.cs                        |   2 +-
 .../CollectionType.cs                         |  24 +
 .../ListGenericObjects.cs                     |  52 +++
 .../MassiveGenericObjects.cs                  |  56 +--
 .../StorageCollection.cs                      |  68 +++
 .../FormLinerCollection.Designer.cs           | 305 ++++++++++---
 .../ProjectLiner/FormLinerCollection.cs       | 416 ++++++++++--------
 7 files changed, 641 insertions(+), 282 deletions(-)
 create mode 100644 ProjectLiner/ProjectLiner/CollectionGenericObjects/CollectionType.cs
 create mode 100644 ProjectLiner/ProjectLiner/CollectionGenericObjects/ListGenericObjects.cs
 create mode 100644 ProjectLiner/ProjectLiner/CollectionGenericObjects/StorageCollection.cs

diff --git a/ProjectLiner/ProjectLiner/CollectionGenericObjects/AbstractCompany.cs b/ProjectLiner/ProjectLiner/CollectionGenericObjects/AbstractCompany.cs
index 5076923..b5cc584 100644
--- a/ProjectLiner/ProjectLiner/CollectionGenericObjects/AbstractCompany.cs
+++ b/ProjectLiner/ProjectLiner/CollectionGenericObjects/AbstractCompany.cs
@@ -71,7 +71,7 @@ namespace ProjectLiner.CollectionGenericObjects
         /// <returns></returns>
         public static DrawningCommonLiner operator -(AbstractCompany company, int position)
         {
-            return company._collection.Remove(position);
+            return company._collection.Remove(position) ;
         }
 
         /// <summary>
diff --git a/ProjectLiner/ProjectLiner/CollectionGenericObjects/CollectionType.cs b/ProjectLiner/ProjectLiner/CollectionGenericObjects/CollectionType.cs
new file mode 100644
index 0000000..d5b8c2c
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/CollectionGenericObjects/CollectionType.cs
@@ -0,0 +1,24 @@
+
+namespace ProjectLiner.CollectionGenericObjects;
+
+
+/// <summary>
+/// Тип коллекции
+/// </summary>
+public enum CollectionType
+{
+    /// <summary>
+    /// Неопределено
+    /// </summary>
+    None = 0,
+
+    /// <summary>
+    /// Массив
+    /// </summary>
+    Massive = 1,
+
+    /// <summary>
+    /// Список
+    /// </summary>
+    List = 2,
+}
diff --git a/ProjectLiner/ProjectLiner/CollectionGenericObjects/ListGenericObjects.cs b/ProjectLiner/ProjectLiner/CollectionGenericObjects/ListGenericObjects.cs
new file mode 100644
index 0000000..dc81bc1
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/CollectionGenericObjects/ListGenericObjects.cs
@@ -0,0 +1,52 @@
+using ProjectLiner.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 + 1 > _maxCount) return -1;
+        _collection.Add(obj);
+        return Count;
+    }
+    public int Insert(T obj, int position)
+    {
+        if (Count + 1 > _maxCount) return -1;
+        if (position < 0 || position > Count) return -1;
+        _collection.Insert(position, obj);
+        return 1;
+    }
+    public T? Remove(int position)
+    {
+        if (position < 0 || position > Count) return null;
+        T? temp = _collection[position];
+        _collection.RemoveAt(position);
+        return temp;
+    }
+}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectLiner/ProjectLiner/CollectionGenericObjects/MassiveGenericObjects.cs
index f668f85..661b751 100644
--- a/ProjectLiner/ProjectLiner/CollectionGenericObjects/MassiveGenericObjects.cs
+++ b/ProjectLiner/ProjectLiner/CollectionGenericObjects/MassiveGenericObjects.cs
@@ -63,45 +63,33 @@ namespace ProjectLiner.CollectionGenericObjects
 
         public int Insert(T obj, int position)
         {
-            if (position < 0 || position >= Count)
+            if (position >= Count || position < 0) return -1;
+            if (_collection[position] == null)
             {
-                return -1;
+                _collection[position] = obj;
+                return position;
             }
-
-            if (_collection[position] != null)
+            int temp = position + 1;
+            while (temp < Count)
             {
-                bool pushed = false;
-                for (int index = position + 1; index < Count; index++)
+                if (_collection[temp] == null)
                 {
-                    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[temp] = obj;
+                    return temp;
                 }
+                ++temp;
             }
-
-            _collection[position] = obj;
-            return position;
+            temp = position - 1;
+            while (temp >= 0)
+            {
+                if (_collection[temp] == null)
+                {
+                    _collection[temp] = obj;
+                    return temp;
+                }
+                --temp;
+            }
+            return -1;
         }
 
         public T? Remove(int position)
@@ -111,7 +99,7 @@ namespace ProjectLiner.CollectionGenericObjects
                 return null;
             }
 
-            if (_collection[position] == null) return null;
+            //if (_collection[position] == null) return null;
 
             T? temp = _collection[position];
             _collection[position] = null;
diff --git a/ProjectLiner/ProjectLiner/CollectionGenericObjects/StorageCollection.cs b/ProjectLiner/ProjectLiner/CollectionGenericObjects/StorageCollection.cs
new file mode 100644
index 0000000..6e2ed1a
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/CollectionGenericObjects/StorageCollection.cs
@@ -0,0 +1,68 @@
+using ProjectLiner.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 (name == null || _storages.ContainsKey(name)) { return; }
+        switch (collectionType)
+
+        {
+            case CollectionType.None:
+                return;
+            case CollectionType.Massive:
+                _storages[name] = new MassiveGenericObjects<T>();
+                return;
+            case CollectionType.List:
+                _storages[name] = new ListGenericObjects<T>();
+                return;
+        }
+    }
+    /// <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 (name == null || !_storages.ContainsKey(name)) { return null; }
+            return _storages[name];
+        }
+    }
+}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/FormLinerCollection.Designer.cs b/ProjectLiner/ProjectLiner/FormLinerCollection.Designer.cs
index 1aeb63b..50e79a9 100644
--- a/ProjectLiner/ProjectLiner/FormLinerCollection.Designer.cs
+++ b/ProjectLiner/ProjectLiner/FormLinerCollection.Designer.cs
@@ -29,98 +29,149 @@
         private void InitializeComponent()
         {
             groupBoxTools = new GroupBox();
-            buttonRefresh = new Button();
-            buttonGoToCheck = new Button();
-            buttonRemoveLiner = new Button();
-            maskedTextBoxPosition = new MaskedTextBox();
-            buttonAddCommonLiner = new Button();
-            buttonAddLiner = new Button();
+            buttonCreateCompany = 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();
             comboBoxSelectorCompany = new ComboBox();
             pictureBox = new PictureBox();
+            panelCompanyTools = new Panel();
+            button1 = new Button();
+            button2 = new Button();
+            maskedTextBox1 = new MaskedTextBox();
+            button3 = new Button();
+            button4 = new Button();
+            button5 = new Button();
             groupBoxTools.SuspendLayout();
+            panelStorage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            panelCompanyTools.SuspendLayout();
             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(buttonCreateCompany);
+            groupBoxTools.Controls.Add(panelStorage);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(1053, 0);
+            groupBoxTools.Location = new Point(681, 0);
+            groupBoxTools.Margin = new Padding(2);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(272, 845);
+            groupBoxTools.Padding = new Padding(2);
+            groupBoxTools.Size = new Size(176, 648);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
             // 
-            // buttonRefresh
+            // buttonCreateCompany
             // 
-            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;
+            buttonCreateCompany.Font = new Font("Segoe UI", 9.75F, FontStyle.Regular, GraphicsUnit.Point);
+            buttonCreateCompany.Location = new Point(5, 317);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(166, 23);
+            buttonCreateCompany.TabIndex = 8;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += ButtonCreateCompany_Click;
             // 
-            // buttonGoToCheck
+            // panelStorage
             // 
-            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;
+            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(2, 28);
+            panelStorage.Margin = new Padding(2);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(172, 247);
+            panelStorage.TabIndex = 7;
             // 
-            // buttonRemoveLiner
+            // buttonCollectionDel
             // 
-            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;
+            buttonCollectionDel.Font = new Font("Segoe UI", 9.75F, FontStyle.Regular, GraphicsUnit.Point);
+            buttonCollectionDel.Location = new Point(3, 212);
+            buttonCollectionDel.Name = "buttonCollectionDel";
+            buttonCollectionDel.Size = new Size(166, 23);
+            buttonCollectionDel.TabIndex = 6;
+            buttonCollectionDel.Text = "Удалить Коллекцию";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += ButtonCollectionDel_Click;
             // 
-            // maskedTextBoxPosition
+            // listBoxCollection
             // 
-            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);
+            listBoxCollection.Font = new Font("Segoe UI", 9.75F, FontStyle.Regular, GraphicsUnit.Point);
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.ItemHeight = 17;
+            listBoxCollection.Location = new Point(3, 110);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(166, 89);
+            listBoxCollection.TabIndex = 5;
             // 
-            // buttonAddCommonLiner
+            // buttonCollectionAdd
             // 
-            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;
+            buttonCollectionAdd.Font = new Font("Segoe UI", 7.948052F, FontStyle.Regular, GraphicsUnit.Point);
+            buttonCollectionAdd.Location = new Point(2, 82);
+            buttonCollectionAdd.Margin = new Padding(2);
+            buttonCollectionAdd.Name = "buttonCollectionAdd";
+            buttonCollectionAdd.Size = new Size(170, 23);
+            buttonCollectionAdd.TabIndex = 4;
+            buttonCollectionAdd.Text = "Добавить коллекцию";
+            buttonCollectionAdd.UseVisualStyleBackColor = true;
+            buttonCollectionAdd.Click += ButtonCollectionAdd_Click;
             // 
-            // buttonAddLiner
+            // radioButtonList
             // 
-            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;
+            radioButtonList.AutoSize = true;
+            radioButtonList.Font = new Font("Segoe UI", 9.818182F, FontStyle.Regular, GraphicsUnit.Point);
+            radioButtonList.Location = new Point(89, 58);
+            radioButtonList.Margin = new Padding(2);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(73, 23);
+            radioButtonList.TabIndex = 3;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonMassive
+            // 
+            radioButtonMassive.AutoSize = true;
+            radioButtonMassive.Font = new Font("Segoe UI", 9.818182F, FontStyle.Regular, GraphicsUnit.Point);
+            radioButtonMassive.Location = new Point(2, 58);
+            radioButtonMassive.Margin = new Padding(2);
+            radioButtonMassive.Name = "radioButtonMassive";
+            radioButtonMassive.Size = new Size(71, 23);
+            radioButtonMassive.TabIndex = 2;
+            radioButtonMassive.TabStop = true;
+            radioButtonMassive.Text = "массив";
+            radioButtonMassive.UseVisualStyleBackColor = true;
+            // 
+            // textBoxCollectionName
+            // 
+            textBoxCollectionName.Location = new Point(0, 26);
+            textBoxCollectionName.Margin = new Padding(2);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(172, 33);
+            textBoxCollectionName.TabIndex = 1;
+            // 
+            // labelCollectionName
+            // 
+            labelCollectionName.AutoSize = true;
+            labelCollectionName.Font = new Font("Segoe UI", 9.818182F, FontStyle.Regular, GraphicsUnit.Point);
+            labelCollectionName.Location = new Point(14, 5);
+            labelCollectionName.Margin = new Padding(2, 0, 2, 0);
+            labelCollectionName.Name = "labelCollectionName";
+            labelCollectionName.Size = new Size(140, 19);
+            labelCollectionName.TabIndex = 0;
+            labelCollectionName.Text = "Название коллекции";
             // 
             // comboBoxSelectorCompany
             // 
@@ -128,33 +179,125 @@
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(18, 46);
+            comboBoxSelectorCompany.Location = new Point(13, 279);
+            comboBoxSelectorCompany.Margin = new Padding(2);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
-            comboBoxSelectorCompany.Size = new Size(242, 49);
+            comboBoxSelectorCompany.Size = new Size(158, 33);
             comboBoxSelectorCompany.TabIndex = 0;
             comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
             // 
             // pictureBox
             // 
-            pictureBox.Dock = DockStyle.Fill;
+            pictureBox.Dock = DockStyle.Bottom;
+            pictureBox.Enabled = false;
             pictureBox.Location = new Point(0, 0);
+            pictureBox.Margin = new Padding(2);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(1053, 845);
+            pictureBox.Size = new Size(681, 648);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.BackColor = SystemColors.Window;
+            panelCompanyTools.Controls.Add(button1);
+            panelCompanyTools.Controls.Add(button2);
+            panelCompanyTools.Controls.Add(maskedTextBox1);
+            panelCompanyTools.Controls.Add(button5);
+            panelCompanyTools.Controls.Add(button3);
+            panelCompanyTools.Controls.Add(button4);
+            panelCompanyTools.Location = new Point(681, 346);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(176, 302);
+            panelCompanyTools.TabIndex = 9;
+            // 
+            // button1
+            // 
+            button1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            button1.Location = new Point(4, 2);
+            button1.Margin = new Padding(2);
+            button1.Name = "button1";
+            button1.Size = new Size(140, 46);
+            button1.TabIndex = 1;
+            button1.Text = "Добавление Лайнера";
+            button1.UseVisualStyleBackColor = true;
+            button1.Click += ButtonAddLiner_Click;
+            // 
+            // button2
+            // 
+            button2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            button2.Location = new Point(2, 52);
+            button2.Margin = new Padding(2);
+            button2.Name = "button2";
+            button2.Size = new Size(140, 46);
+            button2.TabIndex = 2;
+            button2.Text = "Добавление Обычного Лайнера";
+            button2.UseVisualStyleBackColor = true;
+            button2.Click += ButtonAddCommonLiner_Click;
+            // 
+            // maskedTextBox1
+            // 
+            maskedTextBox1.Location = new Point(2, 102);
+            maskedTextBox1.Margin = new Padding(2);
+            maskedTextBox1.Mask = "00";
+            maskedTextBox1.Name = "maskedTextBox1";
+            maskedTextBox1.Size = new Size(142, 33);
+            maskedTextBox1.TabIndex = 3;
+            maskedTextBox1.ValidatingType = typeof(int);
+            // 
+            // button3
+            // 
+            button3.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            button3.Location = new Point(2, 134);
+            button3.Margin = new Padding(2);
+            button3.Name = "button3";
+            button3.Size = new Size(140, 46);
+            button3.TabIndex = 4;
+            button3.Text = "Удаление Лайнера";
+            button3.UseVisualStyleBackColor = true;
+            button3.Click += ButtonRemoveLiner_Click;
+            // 
+            // button4
+            // 
+            button4.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            button4.Location = new Point(2, 184);
+            button4.Margin = new Padding(2);
+            button4.Name = "button4";
+            button4.Size = new Size(140, 46);
+            button4.TabIndex = 5;
+            button4.Text = "Передать на тесты";
+            button4.UseVisualStyleBackColor = true;
+            button4.Click += ButtonGoToCheck_Click;
+            // 
+            // button5
+            // 
+            button5.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            button5.Location = new Point(2, 234);
+            button5.Margin = new Padding(2);
+            button5.Name = "button5";
+            button5.Size = new Size(140, 46);
+            button5.TabIndex = 6;
+            button5.Text = "Обновить";
+            button5.UseVisualStyleBackColor = true;
+            button5.Click += ButtonRefresh_Click;
+            // 
             // FormLinerCollection
             // 
-            AutoScaleDimensions = new SizeF(17F, 41F);
+            AutoScaleDimensions = new SizeF(11F, 25F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1325, 845);
+            ClientSize = new Size(857, 648);
+            Controls.Add(panelCompanyTools);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
+            Margin = new Padding(2);
             Name = "FormLinerCollection";
             Text = "Коллекция автомобилей";
             groupBoxTools.ResumeLayout(false);
-            groupBoxTools.PerformLayout();
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
             ResumeLayout(false);
         }
 
@@ -169,5 +312,21 @@
         private Button buttonRemoveLiner;
         private MaskedTextBox maskedTextBoxPosition;
         private Button buttonRefresh;
+        private Panel panelStorage;
+        private Label labelCollectionName;
+        private RadioButton radioButtonMassive;
+        private TextBox textBoxCollectionName;
+        private Button buttonCollectionAdd;
+        private RadioButton radioButtonList;
+        private Button buttonCollectionDel;
+        private ListBox listBoxCollection;
+        private Button buttonCreateCompany;
+        private Panel panelCompanyTools;
+        private Button button1;
+        private Button button2;
+        private MaskedTextBox maskedTextBox1;
+        private Button button5;
+        private Button button3;
+        private Button button4;
     }
 }
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/FormLinerCollection.cs b/ProjectLiner/ProjectLiner/FormLinerCollection.cs
index 3e759f4..67b99b3 100644
--- a/ProjectLiner/ProjectLiner/FormLinerCollection.cs
+++ b/ProjectLiner/ProjectLiner/FormLinerCollection.cs
@@ -1,188 +1,256 @@
-using ProjectLiner.CollectionGenericObjects;
+
+using ProjectLiner.CollectionGenericObjects;
 using ProjectLiner.Drawnings;
-using System.Windows.Forms;
 
-namespace ProjectLiner
+namespace ProjectLiner;
+/// <summary>
+/// Форма работы с компанией и ее коллекцией
+/// </summary>
+public partial class FormLinerCollection : Form
 {
     /// <summary>
-    /// Форма работы с компанией и ее коллекцией
+    /// Хранилише коллекций
     /// </summary>
-    public partial class FormLinerCollection : Form
+    private readonly StorageCollection<DrawningCommonLiner> _storageCollection;
+    /// <summary>
+    /// Компания
+    /// </summary>
+    private AbstractCompany? _company = null;
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormLinerCollection()
     {
-        /// <summary>
-        /// Компания
-        /// </summary>
-        private AbstractCompany? _company = null;
-
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        public FormLinerCollection()
+        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 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="type"></param>
+    private void CreateObject(string type)
+    {
+        if (_company == null)
         {
-            InitializeComponent();
+            return;
         }
-
-        /// <summary>
-        /// Выбор компании
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+        Random random = new();
+        DrawningCommonLiner drawningCommonLiner;
+        switch (type)
         {
-            switch (comboBoxSelectorCompany.Text)
-            {
-                case "Хранилище":
-                    _company = new LinerSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningCommonLiner>());
-                    break;
-            }
+            case nameof(DrawningCommonLiner):
+                drawningCommonLiner = new DrawningCommonLiner(random.Next(100, 300),
+                random.Next(1000, 3000), GetColor(random));
+                break;
+            case nameof(DrawningLiner):
+                drawningCommonLiner = new DrawningLiner(random.Next(100, 300), random.Next(1000, 3000),
+                GetColor(random), GetColor(random),
+                Convert.ToBoolean(random.Next(0, 2)),
+                Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+                break;
+            default:
+                return;
         }
-
-        /// <summary>
-        /// Создание объекта класса-перемещения
-        /// </summary>
-        /// <param name="type">Тип создаваемого объекта</param>
-        private void CreateObject(string type)
+        if (_company + drawningCommonLiner != -1)
         {
-            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;
-            }
-
+            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 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 FormLiner();
+        form.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();
+
+    }
+    /// <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>
+    /// Удаление коллекции
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    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>
+    /// Обновление списка в 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>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonCreateCompany_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+        ICollectionGenericObjects<DrawningCommonLiner>? collection =
+        _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+        if (collection == null)
+        {
+            MessageBox.Show("Коллекция не проинициализирована");
+            return;
+        }
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new LinerSharingService(pictureBox.Width, pictureBox.Height, collection);
+                break;
+        }
+        panelCompanyTools.Enabled = true;
+        RerfreshListBoxItems();
+    }
+}
\ No newline at end of file