Какой-то косяк, без малейшего понятия откуда это

2023-11-24 12:56:39 +04:00
20 changed files with 106 additions and 1472 deletions
--- a/Liner/AppSettings.json
+++ b/Liner/AppSettings.json
@@ -1,20 +0,0 @@
-{
-  "Serilog": {
-    "Using": [ "Serilog.Sinks.File" ],
-    "MinimumLevel": "Information",
-    "WriteTo": [
-      {
-        "Name": "File",
-        "Args": {
-          "path": "Logs/log_.log",
-          "rollingInterval": "Day",
-          "outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}"
-        }
-      }
-    ],
-    "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ],
-    "Properties": {
-      "Application": "Loco"
-    }
-  }
-}
--- a/Liner/Drawing/DrawingBigLiner.cs
+++ b/Liner/Drawing/DrawingBigLiner.cs
@@ -19,12 +19,12 @@ namespace Liner.Drawing
        /// <param name="deck">Признак наличия доп палубы</param>
        /// <param name="width">Ширина картинки</param>
        /// <param name="height">Высота картинки</param>
-        public DrawingBigLiner(int speed, double weight, Color bottomColor, Color bodyColor, bool swimmingPool, bool deck, int width, int height)
-            : base(speed,weight,bodyColor,width,height,100,80)
+        public DrawingBigLiner(int speed, double weight, Color bodyColor, Color bottomColor, bool swimmingPool, bool deck, int width, int height)
+            : base(speed,weight,bodyColor,bottomColor,width,height,100,80)
        {
            if(EntityLiner!= null)
            {
-                EntityLiner = new EntityBigLiner(speed, weight,bottomColor, bodyColor, deck, swimmingPool);
+                EntityLiner = new EntityBigLiner(speed, weight, bodyColor, bottomColor, deck, swimmingPool);
            }

        }
@@ -41,8 +41,8 @@ namespace Liner.Drawing
            }
            Pen pen = new(Color.Black);
            Brush poolBrush = new SolidBrush(Color.Blue);
-            Brush bottomBrush = new SolidBrush(liner.BottomColor);
-            Brush deckBrush = new SolidBrush(liner.BodyColor);
+            Brush bottomBrush = new SolidBrush(EntityLiner.BottomColor);
+            Brush deckBrush = new SolidBrush(EntityLiner.BodyColor);
            // палуба
            Point[] firstDeck = {new Point(_startPosX + 30, _startPosY), new Point(_startPosX + 30 + 60, _startPosY),
            new Point(_startPosX + 30 + 60, _startPosY + 20), new Point(_startPosX + 30, _startPosY + 20)};
@@ -76,12 +76,5 @@ namespace Liner.Drawing
            g.DrawPolygon(pen, bottom);//рисуем нижний корпус
            if (liner.SwimmingPool) { g.FillPolygon(poolBrush, pool); }//рисуем бассейн
        }
-        /// <summary>
-        /// установка цвета большого лайнера
-        /// </summary>
-        public void SetAddColor(Color color)
-        {
-            (EntityLiner as EntityBigLiner).BodyColor = color;
-        }
    }
 }
--- a/Liner/Drawing/DrawingLiner.cs
+++ b/Liner/Drawing/DrawingLiner.cs
@@ -63,32 +63,32 @@ namespace Liner.Drawing
        /// </summary>
        /// <param name="speed">Скорость</param>
        /// <param name="weight">Вес лайнера</param>
-        /// <param name="bottomColor">Основной цвет</param>
+        /// <param name="bodyColor">Основной цвет</param>
        /// <param name="width">Ширина картинки</param>
        /// <param name="height">Высота картинки</param>
-        public DrawingLiner(int speed, double weight, Color bottomColor, int width, int height)
+        public DrawingLiner(int speed, double weight, Color bodyColor, Color bottomColor, int width, int height)
        {
            _pictureWidth = width;
            _pictureHeight = height;
-            EntityLiner = new EntityLiner(speed, weight, bottomColor);
+            EntityLiner = new EntityLiner(speed, weight, bodyColor, bottomColor);
        }
        /// <summary>
        /// Конструктор
        /// </summary>
        /// <param name="speed">Скорость</param>
        /// <param name="weight">Вес лайнера</param>
-        /// <param name="bottomColor">Основной цвет</param>
+        /// <param name="bodyColor">Основной цвет</param>
        /// <param name="width">Ширина картинки</param>
        /// <param name="height">Высота картинки</param>
        /// <param name="linerWidth">Ширина прорисовки лайнера</param>
        /// <param name="linerHeight">Высота прорисовки лайнера</param>
-        protected DrawingLiner(int speed, double weight, Color bottomColor, int width, int height,int linerWidth,int linerHeight)
+        protected DrawingLiner(int speed, double weight, Color bodyColor, Color bottomColor, int width, int height,int linerWidth,int linerHeight)
        {
            _linerHeight = linerHeight;
            _linerWidth = linerWidth;
            _pictureWidth = width;
            _pictureHeight = height;
-            EntityLiner = new EntityLiner(speed, weight, bottomColor);
+            EntityLiner = new EntityLiner(speed, weight, bodyColor, bottomColor);
        }
        /// <summary>
        /// Установка позиции
@@ -114,7 +114,7 @@ namespace Liner.Drawing
            }
            Pen pen = new(Color.Black);
            Brush bottomBrush = new SolidBrush(EntityLiner.BottomColor);
-            Brush deckBrush = new SolidBrush(Color.Black);//черная палуба по умолчанию
+            Brush deckBrush = new SolidBrush(EntityLiner.BodyColor);
            // палуба
            Point[] firstDeck = {new Point(_startPosX + 30, _startPosY), new Point(_startPosX + 30 + 60, _startPosY),
            new Point(_startPosX + 30 + 60, _startPosY + 20), new Point(_startPosX + 30, _startPosY + 20)};
--- a/Liner/Drawing/ExtentionDrawingLiner.cs
+++ b/Liner/Drawing/ExtentionDrawingLiner.cs
@@ -1,69 +0,0 @@
-using Liner.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Liner.Drawing
-{
-    /// <summary>
-    /// Расширение для класса EntityLiner
-    /// </summary>
-    public static class ExtentionDrawningLiner
-    {
-        /// <summary>
-        /// Создание объекта из строки
-        /// </summary>
-        /// <param name="info">Строка с данными для создания объекта</param>
-        /// <param name="separatorForObject">Разделитель даннных</param>
-        /// <param name="width">Ширина</param>
-        /// <param name="height">Высота</param>
-        /// <returns>Объект</returns>
-        public static DrawingLiner? CreateDrawingLiner(this string info, char
-        separatorForObject, int width, int height)
-        {
-            string[] strs = info.Split(separatorForObject);
-            if (strs.Length == 3)
-            {
-                return new DrawingLiner(Convert.ToInt32(strs[0]),
-                Convert.ToInt32(strs[1]), Color.FromName(strs[2]), width, height);
-            }
-            if (strs.Length == 6)
-            {
-                return new DrawingBigLiner(Convert.ToInt32(strs[0]),
-                Convert.ToInt32(strs[1]),
-                Color.FromName(strs[2]),
-                Color.FromName(strs[3]),
-                Convert.ToBoolean(strs[4]),
-                Convert.ToBoolean(strs[5]),
-                width, height);
-            }
-            return null;
-        }
-        /// <summary>
-        /// Получение данных для сохранения в файл
-        /// </summary>
-        /// <param name="drawingLiner">Сохраняемый объект</param>
-        /// <param name="separatorForObject">Разделитель даннных</param>
-        /// <returns>Строка с данными по объекту</returns>
-        public static string GetDataForSave(this DrawingLiner drawingLiner,
-        char separatorForObject)
-        {
-            var liner = drawingLiner.EntityLiner;
-            if (liner == null)
-            {
-                return string.Empty;
-            }
-            var str =
-            $"{liner.Speed}{separatorForObject}{liner.Weight}{separatorForObject}{liner.BottomColor.Name}";
-            if (liner is not EntityBigLiner bigLiner)
-            {
-                return str;
-            }
-            return
-            $"{str}{separatorForObject}{bigLiner.BodyColor.Name}{separatorForObject}{bigLiner.SwimmingPool}{separatorForObject}" +
-            $"{bigLiner.Deck}";
-        }
-    }
-}
--- a/Liner/Entities/EntityBigLiner.cs
+++ b/Liner/Entities/EntityBigLiner.cs
@@ -17,10 +17,6 @@ namespace Liner.Entities
        /// </summary>
        public bool Deck { get; private set; }
        /// <summary>
-        /// Доп цвет
-        /// </summary>
-        public Color BodyColor { get; set; }
-        /// <summary>
        /// Конструктор с параметрами
        /// </summary>
        /// <param name="speed">Скорость</param>
@@ -29,11 +25,10 @@ namespace Liner.Entities
        /// <param name="bottomColor">Дополнительный цвет</param>
        /// <param name="deck">Признак наличия доп палубы</param>
        /// <param name="swimmingPool">Признак наличия бассейна</param>
-        public EntityBigLiner(int speed, double weight, Color bottomColor,Color bodyColor,bool deck, bool swimmingPool) : base(speed, weight, bottomColor)
+        public EntityBigLiner(int speed, double weight, Color bodyColor, Color bottomColor,bool deck, bool swimmingPool) : base(speed, weight, bodyColor,bottomColor)
        {
            Deck = deck;
            SwimmingPool = swimmingPool;
-            BodyColor = bodyColor;
        }
    }
 }
--- a/Liner/Entities/EntityLiner.cs
+++ b/Liner/Entities/EntityLiner.cs
@@ -20,7 +20,11 @@ namespace Liner.Entities
        /// <summary>
        /// Основной цвет
        /// </summary>
-        public Color BottomColor { get; set; }
+        public Color BodyColor { get; private set; }
+        /// <summary>
+        /// Доп цвет
+        /// </summary>
+        public Color BottomColor { get; private set; }
        /// <summary>
        /// Шаг
        /// </summary>
@@ -30,11 +34,13 @@ namespace Liner.Entities
        /// </summary>
        /// <param name="speed">Скорость</param>
        /// <param name="weight">Вес лайнера</param>
-        /// <param name="bottomColor">Основной цвет</param>
-        public EntityLiner(int speed, double weight, Color bottomColor)
+        /// <param name="bodyColor">Основной цвет</param>
+        /// <param name="bottomColor">Доп цвет</param>
+        public EntityLiner(int speed, double weight, Color bodyColor, Color bottomColor)
        {
            Speed = speed;
            Weight = weight;
+            BodyColor = bodyColor;
            BottomColor = bottomColor;
        }
    }
--- a/Liner/Exceptions/LinerNotFoundException.cs
+++ b/Liner/Exceptions/LinerNotFoundException.cs
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Liner.Exceptions
-{
-    [Serializable]
-    internal class LinerNotFoundException : ApplicationException
-    {
-        public LinerNotFoundException(int i) : base($"Не найден объект по позиции {i}") { }
-        public LinerNotFoundException() : base() { }
-        public LinerNotFoundException(string message) : base(message) { }
-        public LinerNotFoundException(string message, Exception exception) :
-        base(message, exception) { }
-        protected LinerNotFoundException(SerializationInfo info,
-        StreamingContext contex) : base(info, contex) { }
-    }
-}
--- a/Liner/Exceptions/StorageOverflowException.cs
+++ b/Liner/Exceptions/StorageOverflowException.cs
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Liner.Exceptions
-{
-    [Serializable]
-    internal class StorageOverflowException : ApplicationException
-    {
-        public StorageOverflowException(int count) : base($"В наборе превышено допустимое количество: {count}") { }
-        public StorageOverflowException() : base() { }
-        public StorageOverflowException(string message) : base(message) { }
-        public StorageOverflowException(string message, Exception exception)
-        : base(message, exception) { }
-        protected StorageOverflowException(SerializationInfo info,
-        StreamingContext contex) : base(info, contex) { }
-    }
-}
--- a/Liner/FormLinerCollection.Designer.cs
+++ b/Liner/FormLinerCollection.Designer.cs
@@ -29,212 +29,86 @@
        private void InitializeComponent()
        {
            groupBoxTools = new GroupBox();
-            Storages = new GroupBox();
-            listBoxStorages = new ListBox();
-            buttonDeleteSet = new Button();
-            textBoxStorageName = new TextBox();
-            buttonAddStorage = new Button();
            buttonRefreshCollection = new Button();
            buttonDeleteLiner = new Button();
            textBoxNumber = new TextBox();
            buttonAddLiner = new Button();
            pictureBoxCollection = new PictureBox();
-            FileMenuStrip = new MenuStrip();
-            FileToolStripMenuItem = new ToolStripMenuItem();
-            SaveToolStripMenuItem = new ToolStripMenuItem();
-            LoadToolStripMenuItem = new ToolStripMenuItem();
-            openFileDialog = new OpenFileDialog();
-            saveFileDialog = new SaveFileDialog();
            groupBoxTools.SuspendLayout();
-            Storages.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit();
-            FileMenuStrip.SuspendLayout();
            SuspendLayout();
            // 
            // groupBoxTools
            // 
-            groupBoxTools.Controls.Add(Storages);
            groupBoxTools.Controls.Add(buttonRefreshCollection);
            groupBoxTools.Controls.Add(buttonDeleteLiner);
            groupBoxTools.Controls.Add(textBoxNumber);
            groupBoxTools.Controls.Add(buttonAddLiner);
-            groupBoxTools.Location = new Point(845, 0);
-            groupBoxTools.Margin = new Padding(3, 4, 3, 4);
+            groupBoxTools.Location = new Point(739, 0);
            groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Padding = new Padding(3, 4, 3, 4);
-            groupBoxTools.Size = new Size(241, 753);
+            groupBoxTools.Size = new Size(211, 565);
            groupBoxTools.TabIndex = 0;
            groupBoxTools.TabStop = false;
            groupBoxTools.Text = "Tools";
            // 
-            // Storages
-            // 
-            Storages.Controls.Add(listBoxStorages);
-            Storages.Controls.Add(buttonDeleteSet);
-            Storages.Controls.Add(textBoxStorageName);
-            Storages.Controls.Add(buttonAddStorage);
-            Storages.Location = new Point(8, 29);
-            Storages.Margin = new Padding(3, 4, 3, 4);
-            Storages.Name = "Storages";
-            Storages.Padding = new Padding(3, 4, 3, 4);
-            Storages.Size = new Size(229, 364);
-            Storages.TabIndex = 4;
-            Storages.TabStop = false;
-            Storages.Text = "Sets";
-            // 
-            // listBoxStorages
-            // 
-            listBoxStorages.FormattingEnabled = true;
-            listBoxStorages.ItemHeight = 20;
-            listBoxStorages.Location = new Point(7, 151);
-            listBoxStorages.Margin = new Padding(3, 4, 3, 4);
-            listBoxStorages.Name = "listBoxStorages";
-            listBoxStorages.Size = new Size(213, 144);
-            listBoxStorages.TabIndex = 4;
-            listBoxStorages.SelectedIndexChanged += ListBoxObjects_SelectedIndexChanged;
-            // 
-            // buttonDeleteSet
-            // 
-            buttonDeleteSet.Location = new Point(11, 304);
-            buttonDeleteSet.Margin = new Padding(3, 4, 3, 4);
-            buttonDeleteSet.Name = "buttonDeleteSet";
-            buttonDeleteSet.Size = new Size(210, 40);
-            buttonDeleteSet.TabIndex = 3;
-            buttonDeleteSet.Text = "Delete Set";
-            buttonDeleteSet.UseVisualStyleBackColor = true;
-            buttonDeleteSet.Click += ButtonRemoveObject_Click;
-            // 
-            // textBoxStorageName
-            // 
-            textBoxStorageName.Location = new Point(39, 52);
-            textBoxStorageName.Margin = new Padding(3, 4, 3, 4);
-            textBoxStorageName.Name = "textBoxStorageName";
-            textBoxStorageName.Size = new Size(158, 27);
-            textBoxStorageName.TabIndex = 2;
-            // 
-            // buttonAddStorage
-            // 
-            buttonAddStorage.Location = new Point(11, 91);
-            buttonAddStorage.Margin = new Padding(3, 4, 3, 4);
-            buttonAddStorage.Name = "buttonAddStorage";
-            buttonAddStorage.Size = new Size(210, 40);
-            buttonAddStorage.TabIndex = 1;
-            buttonAddStorage.Text = "Add Set";
-            buttonAddStorage.UseVisualStyleBackColor = true;
-            buttonAddStorage.Click += ButtonAddObject_Click;
-            // 
            // buttonRefreshCollection
            // 
-            buttonRefreshCollection.Location = new Point(13, 668);
-            buttonRefreshCollection.Margin = new Padding(3, 4, 3, 4);
+            buttonRefreshCollection.Location = new Point(11, 258);
            buttonRefreshCollection.Name = "buttonRefreshCollection";
-            buttonRefreshCollection.Size = new Size(222, 53);
+            buttonRefreshCollection.Size = new Size(194, 40);
            buttonRefreshCollection.TabIndex = 3;
            buttonRefreshCollection.Text = "Refresh Collection";
            buttonRefreshCollection.UseVisualStyleBackColor = true;
-            buttonRefreshCollection.Click += ButtonRefreshCollection_Click;
+            buttonRefreshCollection.Click += buttonRefreshCollection_Click;
            // 
            // buttonDeleteLiner
            // 
-            buttonDeleteLiner.Location = new Point(13, 544);
-            buttonDeleteLiner.Margin = new Padding(3, 4, 3, 4);
+            buttonDeleteLiner.Location = new Point(11, 117);
            buttonDeleteLiner.Name = "buttonDeleteLiner";
-            buttonDeleteLiner.Size = new Size(222, 53);
+            buttonDeleteLiner.Size = new Size(194, 40);
            buttonDeleteLiner.TabIndex = 2;
            buttonDeleteLiner.Text = "Delete Liner";
            buttonDeleteLiner.UseVisualStyleBackColor = true;
-            buttonDeleteLiner.Click += ButtonRemoveLiner_Click;
+            buttonDeleteLiner.Click += buttonRemoveLiner_Click;
            // 
            // textBoxNumber
            // 
-            textBoxNumber.Location = new Point(47, 491);
-            textBoxNumber.Margin = new Padding(3, 4, 3, 4);
+            textBoxNumber.Location = new Point(41, 77);
            textBoxNumber.Name = "textBoxNumber";
-            textBoxNumber.Size = new Size(158, 27);
+            textBoxNumber.Size = new Size(139, 23);
            textBoxNumber.TabIndex = 1;
            // 
            // buttonAddLiner
            // 
-            buttonAddLiner.Location = new Point(13, 417);
-            buttonAddLiner.Margin = new Padding(3, 4, 3, 4);
+            buttonAddLiner.Location = new Point(11, 22);
            buttonAddLiner.Name = "buttonAddLiner";
-            buttonAddLiner.Size = new Size(222, 53);
+            buttonAddLiner.Size = new Size(194, 40);
            buttonAddLiner.TabIndex = 0;
            buttonAddLiner.Text = "Add Liner";
            buttonAddLiner.UseVisualStyleBackColor = true;
-            buttonAddLiner.Click += ButtonAddLiner_Click;
+            buttonAddLiner.Click += buttonAddLiner_Click;
            // 
            // pictureBoxCollection
            // 
-            pictureBoxCollection.Location = new Point(2, 36);
-            pictureBoxCollection.Margin = new Padding(3, 4, 3, 4);
+            pictureBoxCollection.Location = new Point(2, 0);
            pictureBoxCollection.Name = "pictureBoxCollection";
-            pictureBoxCollection.Size = new Size(835, 717);
+            pictureBoxCollection.Size = new Size(731, 565);
            pictureBoxCollection.TabIndex = 1;
            pictureBoxCollection.TabStop = false;
            // 
-            // FileMenuStrip
-            // 
-            FileMenuStrip.ImageScalingSize = new Size(20, 20);
-            FileMenuStrip.Items.AddRange(new ToolStripItem[] { FileToolStripMenuItem });
-            FileMenuStrip.Location = new Point(0, 0);
-            FileMenuStrip.Name = "FileMenuStrip";
-            FileMenuStrip.Padding = new Padding(7, 3, 0, 3);
-            FileMenuStrip.Size = new Size(1087, 30);
-            FileMenuStrip.TabIndex = 2;
-            FileMenuStrip.Text = "FileMenuStrip";
-            // 
-            // FileToolStripMenuItem
-            // 
-            FileToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { SaveToolStripMenuItem, LoadToolStripMenuItem });
-            FileToolStripMenuItem.Name = "FileToolStripMenuItem";
-            FileToolStripMenuItem.Size = new Size(49, 24);
-            FileToolStripMenuItem.Text = "FILE";
-            // 
-            // SaveToolStripMenuItem
-            // 
-            SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
-            SaveToolStripMenuItem.Size = new Size(130, 26);
-            SaveToolStripMenuItem.Text = "SAVE";
-            SaveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
-            // 
-            // LoadToolStripMenuItem
-            // 
-            LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
-            LoadToolStripMenuItem.Size = new Size(130, 26);
-            LoadToolStripMenuItem.Text = "LOAD";
-            LoadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
-            // 
-            // openFileDialog
-            // 
-            openFileDialog.Filter = "txt file | *.txt";
-            // 
-            // saveFileDialog
-            // 
-            saveFileDialog.FileName = "saveFile";
-            saveFileDialog.Filter = "txt file | *.txt";
-            // 
            // FormLinerCollection
            // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleDimensions = new SizeF(7F, 15F);
            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1087, 757);
-            Controls.Add(FileMenuStrip);
+            ClientSize = new Size(951, 568);
            Controls.Add(pictureBoxCollection);
            Controls.Add(groupBoxTools);
-            MainMenuStrip = FileMenuStrip;
-            Margin = new Padding(3, 4, 3, 4);
            Name = "FormLinerCollection";
            Text = "Liner Collection";
            groupBoxTools.ResumeLayout(false);
            groupBoxTools.PerformLayout();
-            Storages.ResumeLayout(false);
-            Storages.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).EndInit();
-            FileMenuStrip.ResumeLayout(false);
-            FileMenuStrip.PerformLayout();
            ResumeLayout(false);
-            PerformLayout();
        }

        #endregion
@@ -245,16 +119,5 @@
        private Button buttonRefreshCollection;
        private Button buttonDeleteLiner;
        private PictureBox pictureBoxCollection;
-        private GroupBox Storages;
-        private ListBox listBoxStorages;
-        private Button buttonDeleteSet;
-        private TextBox textBoxStorageName;
-        private Button buttonAddStorage;
-        private MenuStrip FileMenuStrip;
-        private ToolStripMenuItem FileToolStripMenuItem;
-        private ToolStripMenuItem SaveToolStripMenuItem;
-        private ToolStripMenuItem LoadToolStripMenuItem;
-        private OpenFileDialog openFileDialog;
-        private SaveFileDialog saveFileDialog;
    }
 }
--- a/Liner/FormLinerCollection.cs
+++ b/Liner/FormLinerCollection.cs
@@ -10,9 +10,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using Microsoft.Extensions.Logging;
-using Liner.Exceptions;
-using System.Xml.Linq;
+
 namespace Liner
 {
    /// <summary>
@@ -23,254 +21,68 @@ namespace Liner
        /// <summary>
        /// Набор объектов
        /// </summary>
-        private readonly LinersGenericStorage _storage;
-        /// <summary>
-        /// Логер
-        /// </summary>
-        private readonly ILogger _logger;
+        private readonly LinerGenericCollection<DrawingLiner, DrawingObjectLiner> _liners;
        /// <summary>
        /// Конструктор
        /// </summary>
-        public FormLinerCollection(ILogger<FormLinerCollection> logger)
+        public FormLinerCollection()
        {
            InitializeComponent();
-            _storage = new LinersGenericStorage(pictureBoxCollection.Width, pictureBoxCollection.Height);
-            _logger = logger;
+            _liners = new LinerGenericCollection<DrawingLiner,
+            DrawingObjectLiner>(pictureBoxCollection.Width, pictureBoxCollection.Height);
        }
        /// <summary>
        /// Добавление объекта в набор
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
-        private void ButtonAddLiner_Click(object sender, EventArgs e)
+        private void buttonAddLiner_Click(object sender, EventArgs e)
        {
-            if (listBoxStorages.SelectedIndex == -1)
+            MainScreen form = new();
+            if (form.ShowDialog() == DialogResult.OK)
            {
-                _logger.LogWarning($"Добавление лайнера не удалось (индекс вне границ)");
-                return;
-            }
-            var formLinerConfig = new FormLinerConfig();
-            formLinerConfig.AddEvent(AddLiner);
-            formLinerConfig.Show();
-        }
-
-        private void AddLiner(DrawingLiner liner)
-        {
-            if (listBoxStorages.SelectedIndex == -1)
-            {
-                _logger.LogWarning($"Добавление лайнера не удалось (индекс вне границ)");
-                return;
-            }
-            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
-            if (obj == null)
-            {
-                _logger.LogWarning($"Добавление лайнера не удалось (нет хранилища)");
-                return;
-            }
-            try
-            {
-                if ((obj + liner) != -1)
+                if (_liners + form.SelectedLiner != -1)
                {
                    MessageBox.Show("Объект добавлен");
-                    _logger.LogInformation($"Добавление лайнера успешно {listBoxStorages.SelectedItem.ToString()}");
-                    pictureBoxCollection.Image = obj.ShowLiners();
+                    pictureBoxCollection.Image = _liners.ShowLiners();
                }
                else
                {
                    MessageBox.Show("Не удалось добавить объект");
                }
            }
-            catch (ApplicationException ex)
-            {
-                _logger.LogWarning($"Добавление лайнера в {listBoxStorages.SelectedItem.ToString()} не удалось (переполнение коллекции)");
-                MessageBox.Show(ex.Message);
-            }
        }
        /// <summary>
        /// Удаление объекта из набора
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
-        private void ButtonRemoveLiner_Click(object sender, EventArgs e)
+        private void buttonRemoveLiner_Click(object sender, EventArgs e)
        {
-            int pos = 0; //фикс недосмотра
-            if (listBoxStorages.SelectedIndex == -1)
-            {
-                _logger.LogWarning($"Удаление лайнера не удалось (индекс вне границ)");
-                return;
-            }
-            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
-            if (obj == null)
-            {
-                _logger.LogWarning($"Удаление лайнера не удалось (нет хранилища)");
-                return;
-            }
            if (MessageBox.Show("Удалить объект?", "Удаление",
            MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
            {
-                _logger.LogWarning($"Удаление лайнера не удалось (выбран вариант 'Нет')");
                return;
            }
-            if (textBoxNumber.Text != "") //улучшил проверку
+            int pos = Convert.ToInt32(textBoxNumber.Text);
+            if (_liners - pos)
            {
-                if(!int.TryParse(textBoxNumber.Text, out pos))
-                {
-                    _logger.LogWarning($"Удаление лайнера не удалось (неверный формат)");
-                    return;
-                }
-            }
-            else
-            {
-                _logger.LogWarning($"Удаление лайнера не удалось (пустое поле ввода)");
-                MessageBox.Show("Не удалось удалить объект");
-                return;
-            }
-            try
-            {
-                if (obj - pos)
-                {
-                    _logger.LogInformation($"Удаление лайнера успешно {listBoxStorages.SelectedItem.ToString()} {pos}");
                MessageBox.Show("Объект удален");
-                    pictureBoxCollection.Image = obj.ShowLiners();
+                pictureBoxCollection.Image = _liners.ShowLiners();
            }
            else
            {
-                    _logger.LogWarning($"Удаление лайнера не удалось(обьект не найден)");
                MessageBox.Show("Не удалось удалить объект");
            }
        }
-            catch (LinerNotFoundException ex)
-            {
-                _logger.LogWarning($"Удаление лайнера не удалось {ex.Message}");
-                MessageBox.Show(ex.Message);
-            }
-        }
-        /// <summary>
-        /// Добавление набора в коллекцию
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonAddObject_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxStorageName.Text))
-            {
-                _logger.LogWarning($"Обновление набора не удалось (не все данные заполнены)");
-                MessageBox.Show("Не все данные заполнены", "Ошибка",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _storage.AddSet(textBoxStorageName.Text);
-            _logger.LogInformation($"Добавлен набор: {textBoxStorageName.Text} ");
-            ReloadObjects();
-        }
-        /// <summary>
-        /// Выбор набора
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ListBoxObjects_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            pictureBoxCollection.Image =
-            _storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowLiners();
-        }
-        /// <summary>
-        /// Удаление набора
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonRemoveObject_Click(object sender, EventArgs e)
-        {
-            if (listBoxStorages.SelectedIndex == -1)
-            {
-                _logger.LogWarning($"Удаление набора не удалось (индекс вне границ)");
-                return;
-            }
-            if (MessageBox.Show($"Удалить объект {listBoxStorages.SelectedItem}?", "Удаление",
-                MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-            {
-                string name = listBoxStorages.SelectedItem.ToString() ?? string.Empty;
-                _storage.DelSet(name);
-                _logger.LogInformation($"Удаление набора успешно: {name}");
-                ReloadObjects();
-            }
-        }
        /// <summary>
        /// Обновление рисунка по набору
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
-        private void ButtonRefreshCollection_Click(object sender, EventArgs e)
+        private void buttonRefreshCollection_Click(object sender, EventArgs e)
        {
-            if (listBoxStorages.SelectedIndex == -1)
-            {
-                _logger.LogWarning($"Обновление объектов не удалось (индекс вне границ)");
-                return;
-            }
-            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
-            if (obj == null)
-            {
-                _logger.LogWarning($"Обновление объектов не удалось (нет хранилища)");
-                return;
-            }
-            _logger.LogInformation($"Обновление объектов успешно");
-            pictureBoxCollection.Image = obj.ShowLiners();
-        }
-        /// <summary>
-        /// Заполнение listBoxObjects
-        /// </summary>
-        private void ReloadObjects()
-        {
-            int index = listBoxStorages.SelectedIndex;
-            listBoxStorages.Items.Clear();
-            for (int i = 0; i < _storage.Keys.Count; i++)
-            {
-                listBoxStorages.Items.Add(_storage.Keys[i]);
-            }
-            if (listBoxStorages.Items.Count > 0 && (index == -1 || index >= listBoxStorages.Items.Count))
-            {
-                listBoxStorages.SelectedIndex = 0;
-            }
-            else if (listBoxStorages.Items.Count > 0 && index > -1 && index < listBoxStorages.Items.Count)
-            {
-                listBoxStorages.SelectedIndex = index;
-            }
-        }
-        private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (saveFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _storage.SaveData(saveFileDialog.FileName);
-                    _logger.LogInformation($"Cохранение успешно");
-                    MessageBox.Show("Сохранение прошло успешно",
-                    "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                catch(Exception ex)
-                {
-                    MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    _logger.LogWarning($"Сохранение не удалось {ex.Message}");
-                }
-            }
-        }
-        private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (openFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                try 
-                {
-                    _storage.LoadData(openFileDialog.FileName);
-                    _logger.LogInformation($"Загрузка успешна");
-                    MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    ReloadObjects();
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат",
-                    MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    _logger.LogWarning($"Загрузка не удалась {ex.Message}");
-                }
-            }
+            pictureBoxCollection.Image = _liners.ShowLiners();
        }
    }
 }
--- a/Liner/FormLinerCollection.resx
+++ b/Liner/FormLinerCollection.resx
@@ -18,7 +18,7 @@
    <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="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>
@@ -117,13 +117,4 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="FileMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>144, 17</value>
-  </metadata>
-  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>284, 17</value>
-  </metadata>
 </root>
--- a/Liner/FormLinerConfig.Designer.cs
+++ b/Liner/FormLinerConfig.Designer.cs
@@ -1,356 +0,0 @@
-namespace Liner
-{
-    partial class FormLinerConfig
-    {
-        /// <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()
-        {
-            groupBoxParametrs = new GroupBox();
-            labelModifiedObject = new Label();
-            labelSimpleObject = new Label();
-            groupBoxColors = new GroupBox();
-            panelPurple = new Panel();
-            panelBlack = new Panel();
-            panelGray = new Panel();
-            panelWhite = new Panel();
-            panelYellow = new Panel();
-            panelBlue = new Panel();
-            panelGreen = new Panel();
-            panelRed = new Panel();
-            checkBoxDeck = new CheckBox();
-            checkBoxPool = new CheckBox();
-            numericUpDownWeight = new NumericUpDown();
-            numericUpDownSpeed = new NumericUpDown();
-            TextWeight = new Label();
-            TextSpeed = new Label();
-            panelObject = new Panel();
-            pictureBoxObject = new PictureBox();
-            labelAddColor = new Label();
-            labelMainColor = new Label();
-            buttonOk = new Button();
-            buttonCancel = new Button();
-            groupBoxParametrs.SuspendLayout();
-            groupBoxColors.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
-            panelObject.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
-            SuspendLayout();
-            // 
-            // groupBoxParametrs
-            // 
-            groupBoxParametrs.Controls.Add(labelModifiedObject);
-            groupBoxParametrs.Controls.Add(labelSimpleObject);
-            groupBoxParametrs.Controls.Add(groupBoxColors);
-            groupBoxParametrs.Controls.Add(checkBoxDeck);
-            groupBoxParametrs.Controls.Add(checkBoxPool);
-            groupBoxParametrs.Controls.Add(numericUpDownWeight);
-            groupBoxParametrs.Controls.Add(numericUpDownSpeed);
-            groupBoxParametrs.Controls.Add(TextWeight);
-            groupBoxParametrs.Controls.Add(TextSpeed);
-            groupBoxParametrs.Location = new Point(12, 12);
-            groupBoxParametrs.Name = "groupBoxParametrs";
-            groupBoxParametrs.Size = new Size(588, 307);
-            groupBoxParametrs.TabIndex = 0;
-            groupBoxParametrs.TabStop = false;
-            groupBoxParametrs.Text = "Parametrs";
-            // 
-            // labelModifiedObject
-            // 
-            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
-            labelModifiedObject.Location = new Point(419, 241);
-            labelModifiedObject.Name = "labelModifiedObject";
-            labelModifiedObject.Size = new Size(120, 50);
-            labelModifiedObject.TabIndex = 8;
-            labelModifiedObject.Text = "Big";
-            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
-            labelModifiedObject.MouseDown += LabelObject_MouseDown;
-            // 
-            // labelSimpleObject
-            // 
-            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
-            labelSimpleObject.Location = new Point(278, 241);
-            labelSimpleObject.Name = "labelSimpleObject";
-            labelSimpleObject.Size = new Size(120, 50);
-            labelSimpleObject.TabIndex = 7;
-            labelSimpleObject.Text = "Small";
-            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
-            labelSimpleObject.MouseDown += LabelObject_MouseDown;
-            // 
-            // groupBoxColors
-            // 
-            groupBoxColors.Controls.Add(panelPurple);
-            groupBoxColors.Controls.Add(panelBlack);
-            groupBoxColors.Controls.Add(panelGray);
-            groupBoxColors.Controls.Add(panelWhite);
-            groupBoxColors.Controls.Add(panelYellow);
-            groupBoxColors.Controls.Add(panelBlue);
-            groupBoxColors.Controls.Add(panelGreen);
-            groupBoxColors.Controls.Add(panelRed);
-            groupBoxColors.Location = new Point(244, 22);
-            groupBoxColors.Name = "groupBoxColors";
-            groupBoxColors.Size = new Size(338, 200);
-            groupBoxColors.TabIndex = 6;
-            groupBoxColors.TabStop = false;
-            groupBoxColors.Text = "Colors";
-            // 
-            // panelPurple
-            // 
-            panelPurple.BackColor = Color.Purple;
-            panelPurple.Location = new Point(248, 110);
-            panelPurple.Name = "panelPurple";
-            panelPurple.Size = new Size(57, 49);
-            panelPurple.TabIndex = 1;
-            // 
-            // panelBlack
-            // 
-            panelBlack.BackColor = Color.Black;
-            panelBlack.Location = new Point(175, 110);
-            panelBlack.Name = "panelBlack";
-            panelBlack.Size = new Size(57, 49);
-            panelBlack.TabIndex = 1;
-            // 
-            // panelGray
-            // 
-            panelGray.BackColor = Color.Gray;
-            panelGray.Location = new Point(97, 110);
-            panelGray.Name = "panelGray";
-            panelGray.Size = new Size(57, 49);
-            panelGray.TabIndex = 5;
-            // 
-            // panelWhite
-            // 
-            panelWhite.BackColor = Color.White;
-            panelWhite.Location = new Point(18, 110);
-            panelWhite.Name = "panelWhite";
-            panelWhite.Size = new Size(57, 49);
-            panelWhite.TabIndex = 4;
-            // 
-            // panelYellow
-            // 
-            panelYellow.BackColor = Color.Yellow;
-            panelYellow.Location = new Point(248, 22);
-            panelYellow.Name = "panelYellow";
-            panelYellow.Size = new Size(57, 49);
-            panelYellow.TabIndex = 3;
-            // 
-            // panelBlue
-            // 
-            panelBlue.BackColor = Color.Blue;
-            panelBlue.Location = new Point(175, 22);
-            panelBlue.Name = "panelBlue";
-            panelBlue.Size = new Size(57, 49);
-            panelBlue.TabIndex = 2;
-            // 
-            // panelGreen
-            // 
-            panelGreen.BackColor = Color.Green;
-            panelGreen.Location = new Point(97, 22);
-            panelGreen.Name = "panelGreen";
-            panelGreen.Size = new Size(57, 49);
-            panelGreen.TabIndex = 1;
-            // 
-            // panelRed
-            // 
-            panelRed.BackColor = Color.Red;
-            panelRed.Location = new Point(18, 22);
-            panelRed.Name = "panelRed";
-            panelRed.Size = new Size(57, 49);
-            panelRed.TabIndex = 0;
-            // 
-            // checkBoxDeck
-            // 
-            checkBoxDeck.AutoSize = true;
-            checkBoxDeck.Location = new Point(17, 162);
-            checkBoxDeck.Name = "checkBoxDeck";
-            checkBoxDeck.Size = new Size(110, 19);
-            checkBoxDeck.TabIndex = 5;
-            checkBoxDeck.Text = "Additional Deck";
-            checkBoxDeck.UseVisualStyleBackColor = true;
-            // 
-            // checkBoxPool
-            // 
-            checkBoxPool.AutoSize = true;
-            checkBoxPool.Location = new Point(17, 137);
-            checkBoxPool.Name = "checkBoxPool";
-            checkBoxPool.Size = new Size(110, 19);
-            checkBoxPool.TabIndex = 4;
-            checkBoxPool.Text = "Swimming pool";
-            checkBoxPool.UseVisualStyleBackColor = true;
-            // 
-            // numericUpDownWeight
-            // 
-            numericUpDownWeight.Location = new Point(81, 70);
-            numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
-            numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
-            numericUpDownWeight.Name = "numericUpDownWeight";
-            numericUpDownWeight.Size = new Size(70, 23);
-            numericUpDownWeight.TabIndex = 3;
-            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
-            // 
-            // numericUpDownSpeed
-            // 
-            numericUpDownSpeed.Location = new Point(81, 41);
-            numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
-            numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
-            numericUpDownSpeed.Name = "numericUpDownSpeed";
-            numericUpDownSpeed.Size = new Size(70, 23);
-            numericUpDownSpeed.TabIndex = 2;
-            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
-            // 
-            // TextWeight
-            // 
-            TextWeight.AutoSize = true;
-            TextWeight.Location = new Point(17, 73);
-            TextWeight.Name = "TextWeight";
-            TextWeight.Size = new Size(48, 15);
-            TextWeight.TabIndex = 1;
-            TextWeight.Text = "Weight:";
-            // 
-            // TextSpeed
-            // 
-            TextSpeed.AutoSize = true;
-            TextSpeed.Location = new Point(17, 43);
-            TextSpeed.Name = "TextSpeed";
-            TextSpeed.Size = new Size(42, 15);
-            TextSpeed.TabIndex = 0;
-            TextSpeed.Text = "Speed:";
-            // 
-            // panelObject
-            // 
-            panelObject.AllowDrop = true;
-            panelObject.Controls.Add(pictureBoxObject);
-            panelObject.Location = new Point(626, 56);
-            panelObject.Name = "panelObject";
-            panelObject.Size = new Size(325, 224);
-            panelObject.TabIndex = 1;
-            panelObject.DragDrop += PanelObject_DragDrop;
-            panelObject.DragEnter += PanelObject_DragEnter;
-            // 
-            // pictureBoxObject
-            // 
-            pictureBoxObject.Location = new Point(20, 6);
-            pictureBoxObject.Name = "pictureBoxObject";
-            pictureBoxObject.Size = new Size(292, 218);
-            pictureBoxObject.TabIndex = 11;
-            pictureBoxObject.TabStop = false;
-            // 
-            // labelAddColor
-            // 
-            labelAddColor.AllowDrop = true;
-            labelAddColor.BorderStyle = BorderStyle.FixedSingle;
-            labelAddColor.Location = new Point(801, 7);
-            labelAddColor.Name = "labelAddColor";
-            labelAddColor.Size = new Size(150, 46);
-            labelAddColor.TabIndex = 10;
-            labelAddColor.Text = "Additional Color";
-            labelAddColor.TextAlign = ContentAlignment.MiddleCenter;
-            labelAddColor.DragDrop += LabelColor_DragDrop;
-            labelAddColor.DragEnter += LabelColor_DragEnter;
-            // 
-            // labelMainColor
-            // 
-            labelMainColor.AllowDrop = true;
-            labelMainColor.BorderStyle = BorderStyle.FixedSingle;
-            labelMainColor.Location = new Point(626, 7);
-            labelMainColor.Name = "labelMainColor";
-            labelMainColor.Size = new Size(150, 46);
-            labelMainColor.TabIndex = 9;
-            labelMainColor.Text = "Main Color";
-            labelMainColor.TextAlign = ContentAlignment.MiddleCenter;
-            labelMainColor.DragDrop += LabelColor_DragDrop;
-            labelMainColor.DragEnter += LabelColor_DragEnter;
-            // 
-            // buttonOk
-            // 
-            buttonOk.Location = new Point(626, 290);
-            buttonOk.Name = "buttonOk";
-            buttonOk.Size = new Size(135, 29);
-            buttonOk.TabIndex = 2;
-            buttonOk.Text = "Add";
-            buttonOk.UseVisualStyleBackColor = true;
-            buttonOk.Click += ButtonOk_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(816, 290);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(135, 29);
-            buttonCancel.TabIndex = 3;
-            buttonCancel.Text = "Cancel";
-            buttonCancel.UseVisualStyleBackColor = true;
-            // 
-            // FormLinerConfig
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(985, 331);
-            Controls.Add(buttonCancel);
-            Controls.Add(labelAddColor);
-            Controls.Add(buttonOk);
-            Controls.Add(panelObject);
-            Controls.Add(labelMainColor);
-            Controls.Add(groupBoxParametrs);
-            Name = "FormLinerConfig";
-            Text = "FormLinerConfig";
-            groupBoxParametrs.ResumeLayout(false);
-            groupBoxParametrs.PerformLayout();
-            groupBoxColors.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
-            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
-            panelObject.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private GroupBox groupBoxParametrs;
-        private NumericUpDown numericUpDownWeight;
-        private NumericUpDown numericUpDownSpeed;
-        private Label TextWeight;
-        private Label TextSpeed;
-        private GroupBox groupBoxColors;
-        private Panel panelBlue;
-        private Panel panelGreen;
-        private Panel panelRed;
-        private CheckBox checkBoxDeck;
-        private CheckBox checkBoxPool;
-        private Panel panelPurple;
-        private Panel panelBlack;
-        private Panel panelGray;
-        private Panel panelWhite;
-        private Panel panelYellow;
-        private Label labelSimpleObject;
-        private Label labelModifiedObject;
-        private Panel panelObject;
-        private PictureBox pictureBoxObject;
-        private Label labelAddColor;
-        private Label labelMainColor;
-        private Button buttonOk;
-        private Button buttonCancel;
-    }
-}
--- a/Liner/FormLinerConfig.cs
+++ b/Liner/FormLinerConfig.cs
@@ -1,170 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Reflection.Metadata.Ecma335;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using Liner.Drawing;
-using Liner.Entities;
-
-namespace Liner
-{
-    /// <summary>
-    /// Форма создания объекта
-    /// </summary>
-    public partial class FormLinerConfig : Form
-    {
-        /// <summary>
-        /// Переменная-выбранная машина
-        /// </summary>
-        DrawingLiner? _liner = null;
-        /// <summary>
-        /// Событие
-        /// </summary>
-        private event Action<DrawingLiner>? EventAddLiner;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        public FormLinerConfig()
-        {
-            InitializeComponent();
-            panelBlack.MouseDown += PanelColor_MouseDown;
-            panelPurple.MouseDown += PanelColor_MouseDown;
-            panelGray.MouseDown += PanelColor_MouseDown;
-            panelGreen.MouseDown += PanelColor_MouseDown;
-            panelRed.MouseDown += PanelColor_MouseDown;
-            panelWhite.MouseDown += PanelColor_MouseDown;
-            panelYellow.MouseDown += PanelColor_MouseDown;
-            panelBlue.MouseDown += PanelColor_MouseDown;
-            buttonCancel.Click += (s, a) => Close();
-        }
-        /// <summary>
-        /// Отрисовать лайнер
-        /// </summary>
-        private void DrawLiner()
-        {
-            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _liner?.SetPosition(15, 15);
-            _liner?.DrawTransport(gr);
-            pictureBoxObject.Image = bmp;
-        }
-        /// <summary>
-        /// Добавление события
-        /// </summary>
-        /// <param name="ev">Привязанный метод</param>
-        public void AddEvent(Action<DrawingLiner> ev)
-        {
-            if (EventAddLiner == null)
-            {
-                EventAddLiner = ev;
-            }
-            else
-            {
-                EventAddLiner += ev;
-            }
-        }
-        /// <summary>
-        /// Передаем информацию при нажатии на Label
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void LabelObject_MouseDown(object sender, MouseEventArgs e)
-        {
-            (sender as Label)?.DoDragDrop((sender as Label)?.Name, DragDropEffects.Move | DragDropEffects.Copy);
-        }
-        /// <summary>
-        /// Проверка получаемой информации (ее типа на соответствие требуемому)
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void PanelObject_DragEnter(object sender, DragEventArgs e)
-        {
-            if (e.Data?.GetDataPresent(DataFormats.Text) ?? false)
-            {
-                e.Effect = DragDropEffects.Copy;
-            }
-            else
-            {
-                e.Effect = DragDropEffects.None;
-            }
-        }
-        /// <summary>
-        /// Передаем информацию при нажатии на Panel с цветом
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void PanelColor_MouseDown(object sender, MouseEventArgs e)
-        {
-            (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
-        }
-        /// <summary>
-        /// Действия при приеме перетаскиваемой информации
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void PanelObject_DragDrop(object sender, DragEventArgs e)
-        {
-            switch (e.Data?.GetData(DataFormats.Text).ToString())
-            {
-                case "labelSimpleObject":
-                    _liner = new DrawingLiner((int)numericUpDownSpeed.Value,
-                    (int)numericUpDownWeight.Value, Color.White, pictureBoxObject.Width,
-                    pictureBoxObject.Height);
-                    break;
-                case "labelModifiedObject":
-                    _liner = new DrawingBigLiner((int)numericUpDownSpeed.Value,
-                    (int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxPool.Checked,
-                    checkBoxDeck.Checked, pictureBoxObject.Width, pictureBoxObject.Height);
-                    break;
-            }
-            
-            DrawLiner();
-        }
-        private void LabelColor_DragEnter(object sender, DragEventArgs e)
-        {
-            if (e.Data?.GetDataPresent(typeof(Color)) ?? false)
-            {
-                e.Effect = DragDropEffects.Copy;
-            }
-            else
-            {
-                e.Effect = DragDropEffects.None;
-            }
-        }
-        private void LabelColor_DragDrop(object sender, DragEventArgs e)
-        {
-            if (_liner == null)
-            {
-                return;
-            }
-            switch (((Label)sender).Name)
-            {
-                case "labelMainColor":
-                    _liner.EntityLiner.BottomColor = (Color)e.Data.GetData(typeof(Color));
-                    break;
-                case "labelAddColor":
-                    if (!(_liner is DrawingBigLiner))
-                        return;
-                    (_liner as DrawingBigLiner).SetAddColor((Color)e.Data.GetData(typeof(Color)));
-                    break;
-            }
-            DrawLiner();
-        }
-        /// <summary>
-        /// Добавление лайнера
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonOk_Click(object sender, EventArgs e)
-        {
-            EventAddLiner?.Invoke(_liner);
-            Close();
-        }
-        
-    }
-}
--- a/Liner/FormLinerConfig.resx
+++ b/Liner/FormLinerConfig.resx
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing"">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
--- a/Liner/Generics/LinerGenericCollection.cs
+++ b/Liner/Generics/LinerGenericCollection.cs
@@ -50,11 +50,7 @@ namespace Liner.Generics
            _pictureHeight = picHeight;
            _collection = new SetGeneric<T>(width * height);
        }
-        /// </summary>
-        /// Получение объектов коллекции
        /// <summary>
-        public IEnumerable<T?> GetLiners => _collection.GetLiners();
-        
        /// Перегрузка оператора сложения
        /// </summary>
        /// <param name="collect"></param>
@@ -76,7 +72,8 @@ namespace Liner.Generics
        /// <returns></returns>
        public static bool operator -(LinerGenericCollection<T, U> collect, int pos)
        {
-            if (collect._collection[pos] != null)
+            T? obj = collect._collection.Get(pos);
+            if (obj != null)
            {
                collect._collection.Remove(pos);
                return true;
@@ -90,7 +87,7 @@ namespace Liner.Generics
        /// <returns></returns>
        public U? GetU(int pos)
        {
-            return (U?)_collection[pos]?.GetMoveableObject;
+            return (U?)_collection.Get(pos)?.GetMoveableObject;
        }
        /// <summary>
        /// Вывод всего набора объектов
@@ -100,8 +97,8 @@ namespace Liner.Generics
        {
            Bitmap bmp = new(_pictureWidth, _pictureHeight);
            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
            DrawObjects(gr);
+            DrawBackground(gr);
            return bmp;
        }
        /// <summary>
@@ -127,12 +124,12 @@ namespace Liner.Generics
        {
            int iX = ((_pictureWidth / _placeSizeWidth) - 1) * _placeSizeWidth;
            int iY = 0;
-            foreach (var liner in _collection.GetLiners())
+            for (int i = 0; i < _collection.Count; i++)
            {
-                liner?.SetPosition(iX, iY);
-                liner?.DrawTransport(g);
+                _collection.Get(i)?.SetPosition(iX,iY);
+                _collection.Get(i)?.DrawTransport(g);
                iX -= _placeSizeWidth;
-                if (iX < 0)
+                if(iX < 0)
                {
                    iX = ((_pictureWidth / _placeSizeWidth) - 1) * _placeSizeWidth;
                    iY += _placeSizeHeight;
--- a/Liner/Generics/LinersGenericStorage.cs
+++ b/Liner/Generics/LinersGenericStorage.cs
@@ -1,175 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Liner.Drawing;
-using Liner.MovingStrategies;
-namespace Liner.Generics
-{
-    /// <summary>
-    /// Класс для хранения коллекции
-    /// </summary>
-    public class LinersGenericStorage
-    {
-        
-        /// <summary>
-        /// Словарь (хранилище)
-        /// </summary>
-        readonly Dictionary<string, LinerGenericCollection<DrawingLiner, DrawingObjectLiner>> _linerStorages;
-        /// <summary>
-        /// Возвращение списка названий наборов
-        /// </summary>
-        public List<string> Keys => _linerStorages.Keys.ToList();
-        /// <summary>
-        /// Ширина окна отрисовки
-        /// </summary>
-        private readonly int _pictureWidth;
-        /// <summary>
-        /// Высота окна отрисовки
-        /// </summary>
-        private readonly int _pictureHeight;
-        /// <summary>
-        /// Разделитель для записи ключа и значения элемента словаря
-        /// </summary>
-        private static readonly char _separatorForKeyValue = '|';
-        /// <summary>
-        /// Разделитель для записей коллекции данных в файл
-        /// </summary>
-        private readonly char _separatorRecords = ';';
-        /// <summary>
-        /// Разделитель для записи информации по объекту в файл
-        /// </summary>
-        private static readonly char _separatorForObject = ':';
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="pictureWidth"></param>
-        /// <param name="pictureHeight"></param>
-        public LinersGenericStorage(int pictureWidth, int pictureHeight)
-        {
-            _linerStorages = new Dictionary<string, LinerGenericCollection<DrawingLiner, DrawingObjectLiner>>();
-            _pictureWidth = pictureWidth;
-            _pictureHeight = pictureHeight;
-        }
-        /// <summary>
-        /// Добавление набора
-        /// </summary>
-        /// <param name="name">Название набора</param>
-        public void AddSet(string name)
-        {
-            if(_linerStorages.ContainsKey(name))
-            {
-                return;
-            }
-            _linerStorages.Add(name, new LinerGenericCollection<DrawingLiner, DrawingObjectLiner>(_pictureWidth,_pictureHeight));
-        }
-        /// <summary>
-        /// Удаление набора
-        /// </summary>
-        /// <param name="name">Название набора</param>
-        public void DelSet(string name)
-        {
-            if (_linerStorages.ContainsKey(name))
-            {
-                _linerStorages.Remove(name);
-            }
-        }
-        /// <summary>
-        /// Доступ к набору
-        /// </summary>
-        /// <param name="ind"></param>
-        /// <returns></returns>
-        public LinerGenericCollection<DrawingLiner, DrawingObjectLiner>? this[string ind]
-        {
-            get
-            {
-                if (_linerStorages.ContainsKey(ind)) { return _linerStorages[ind]; }    
-                return null;
-            }
-        }
-        /// <summary>
-        /// Сохранение информации по лайнерам в хранилище в файл
-        /// </summary>
-        /// <param name="filename">Путь и имя файла</param>
-        public void SaveData(string filename)
-        {
-            if (File.Exists(filename))
-            {
-                File.Delete(filename);
-            }
-            StringBuilder data = new();
-            foreach (KeyValuePair<string,
-            LinerGenericCollection<DrawingLiner, DrawingObjectLiner>> record in _linerStorages)
-            {
-                StringBuilder records = new();
-                foreach (DrawingLiner? elem in record.Value.GetLiners)
-                {
-                    records.Append($"{elem?.GetDataForSave(_separatorForObject)}{_separatorRecords}");
-                }
-                data.AppendLine($"{record.Key}{_separatorForKeyValue}{records}");
-            }
-            if (data.Length == 0)
-            {
-                throw new InvalidOperationException("Невалиданя операция, нет данных для сохранения");
-            }
-            string dataStr = data.ToString();
-            using (StreamWriter writer = new StreamWriter(filename))
-            {
-                writer.WriteLine("LinerStorage");
-                writer.WriteLine(dataStr);
-            }
-        }
-        /// <summary>
-        /// Загрузка информации по автомобилям в хранилище из файла
-        /// </summary>
-        /// <param name="filename">Путь и имя файла</param>
-        public void LoadData(string filename)
-        {
-            if (!File.Exists(filename))
-            {
-                throw new FileNotFoundException("Файл не найден");
-            }
-            using (StreamReader reader = new StreamReader(filename))
-            {
-                string checker = reader.ReadLine();
-                if (checker == null)
-                {
-                    throw new NullReferenceException("Нет данных для загрузки");
-                }
-                if (!checker.StartsWith("LinerStorage"))
-                {
-                    throw new FormatException("Неверный формат данных");
-                }
-                _linerStorages.Clear();
-                string strs;
-                while ((strs = reader.ReadLine()) != null) //переделал ужасную логику
-                {
-                    if (strs == null)
-                        break;
-                    if (strs == string.Empty)
-                        break;
-                    string name = strs.Split('|')[0];
-                    LinerGenericCollection<DrawingLiner, DrawingObjectLiner> collection = new(_pictureWidth, _pictureHeight);
-                    foreach (string data in strs.Split('|')[1].Split(';').Reverse())
-                    {
-                        DrawingLiner? liner =
-                        data?.CreateDrawingLiner(_separatorForObject, _pictureWidth, _pictureHeight);
-                        if (liner != null)
-                        {
-                            try
-                            {
-                                int? tmp = collection + liner;
-                            }
-                            catch (ApplicationException ex)
-                            {
-                                throw new ApplicationException($"Ошибка добавления в коллекцию: {ex.Message}");
-                            }
-                        }
-                    }
-                    _linerStorages.Add(name, collection);
-                }
-            }
-        }
-    }
-}
--- a/Liner/Generics/SetGeneric.cs
+++ b/Liner/Generics/SetGeneric.cs
@@ -1,5 +1,4 @@
-using Liner.Exceptions;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -17,23 +16,18 @@ namespace Liner.Generics
        /// <summary>
        /// Массив объектов, которые храним
        /// </summary>
-        private readonly List<T?> _places;
+        private readonly T?[] _places;
        /// <summary>
        /// Количество объектов в массиве
        /// </summary>
-        public int Count => _places.Capacity;
-        /// <summary>
-        /// Максимальное количество объектов в списке
-        /// </summary>
-        private readonly int _maxCount;
+        public int Count => _places.Length;
        /// <summary>
        /// Конструктор
        /// </summary>
        /// <param name="count"></param>
        public SetGeneric(int count)
        {
-            _maxCount = count;
-            _places = new List<T?>(count);
+            _places = new T?[count];
        }
        /// <summary>
        /// Добавление объекта в набор
@@ -42,13 +36,22 @@ namespace Liner.Generics
        /// <returns></returns>
        public int Insert(T liner)
        {
-            if (_places.Count >= _maxCount)
+            int nulli = 0;
+            while (_places[nulli] != null)
            {
-                throw new StorageOverflowException(_places.Count);
+                nulli++;
+                if(nulli == _places.Length)
+                {
+                    return -1; // нет пустого места
                }
-            _places.Insert(0, liner);
+            }
+            //сдвиг
+            for(int i = nulli; i > 0; i--)
+            {
+                _places[i] = _places[i - 1];
+            }
+            _places[0] = liner;
            return 0;
-            
        }
        /// <summary>
        /// Добавление объекта в набор на конкретную позицию
@@ -58,15 +61,23 @@ namespace Liner.Generics
        /// <returns></returns>
        public int Insert(T liner, int position)
        {
-            if(_places.Count >= _maxCount)
+            if (position < 0 || position > _places.Length)
            {
-                throw new StorageOverflowException(_places.Count);
+                return -1;
            }
-            if(position < 0 || position > _places.Count)
+            if (_places[position] != null)
            {
-                throw new LinerNotFoundException(position);
+                int nulli = position;
+                while (_places[nulli] != null)
+                {
+                    nulli++;
+                    if (nulli == _places.Length)
+                    {
+                        return -1; // нет пустого места
                    }
-            _places.Insert(position, liner);
+                }
+            }
+            _places[position] = liner;
            return position;
        }
        /// <summary>
@@ -76,54 +87,25 @@ namespace Liner.Generics
        /// <returns></returns>
        public bool Remove(int position)
        {
-            if(_places.Count > position && position >= 0)
+            if (position < 0 || position > _places.Length)
            {
-                _places.RemoveAt(position);
-                return true;
+                return false;
            }
-            throw new LinerNotFoundException(position);
+            _places[position] = null;
+            return true;
        }
        /// <summary>
        /// Получение объекта из набора по позиции
        /// </summary>
        /// <param name="position"></param>
        /// <returns></returns>
-        public T? this[int position]
+        public T? Get(int position)
        {
-            get
+            if (position < 0 || position > _places.Length)
            {
-                if (_places.Count > position && position >= 0)
-                {
-                    return _places[position];
-                }
                return null;
            }
-            set
-            {
-                try
-                {
-                    Insert(value, position);
-                }
-                catch
-                {
-                    return;
-                }
-            }
-        }
-        /// <summary>
-        /// Проход по списку
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<T?> GetLiners(int? maxLiners = null)
-        {
-            for (int i = 0; i < _places.Count; ++i)
-            {
-                yield return _places[i];
-                if (maxLiners.HasValue && i == maxLiners.Value)
-                {
-                    yield break;
-                }
-            }
+            return _places[position];
        }
    }
 }
--- a/Liner/Liner.csproj
+++ b/Liner/Liner.csproj
@@ -14,23 +14,6 @@
    <None Remove="MovingStrategy\**" />
  </ItemGroup>

-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.EventSource" Version="8.0.0" />
-    <PackageReference Include="NLog" Version="5.2.7" />
-    <PackageReference Include="Serilog" Version="3.1.1" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-  </ItemGroup>
-
  <ItemGroup>
    <Compile Update="Properties\Resources.Designer.cs">
      <DesignTime>True</DesignTime>
--- a/Liner/MainScreen.cs
+++ b/Liner/MainScreen.cs
@@ -50,12 +50,8 @@ namespace Liner
            Color mainColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
            Color addColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                addColor = dialog.Color;
-            }
            _drawingLiner = new DrawingLiner(random.Next(100, 300),
-            random.Next(1000, 3000), mainColor,
+            random.Next(1000, 3000), mainColor, addColor,
            pictureBoxLiner.Width, pictureBoxLiner.Height);
            _drawingLiner.SetPosition(random.Next(10, 100), random.Next(10, 100));
            Draw();
@@ -96,10 +92,6 @@ namespace Liner
            {
                addColor = dialog.Color;
            }
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                mainColor = dialog.Color;
-            }
            _drawingLiner = new DrawingBigLiner(random.Next(100, 300),
            random.Next(1000, 3000), mainColor, addColor,
            Convert.ToBoolean(random.Next(0, 2)),
--- a/Liner/Program.cs
+++ b/Liner/Program.cs
@@ -1,10 +1,3 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Serilog;
-using System;
-using System.IO;
-using System.Windows.Forms;
 namespace Liner
 {
    internal static class Program
@@ -18,28 +11,7 @@ namespace Liner
            // To customize application configuration such as set high DPI settings or default font,
            // see https://aka.ms/applicationconfiguration.
            ApplicationConfiguration.Initialize();
-            var services = new ServiceCollection();
-            ConfigureServices(services);
-            ApplicationConfiguration.Initialize();
-            using (ServiceProvider serviceProvider = services.BuildServiceProvider())
-            {
-                Application.Run(serviceProvider.GetRequiredService<FormLinerCollection>());
-            }
-        }
-        private static void ConfigureServices(ServiceCollection services)
-        {
-            services.AddSingleton<FormLinerCollection>().AddLogging(option =>
-            {
-                string[] path = Directory.GetCurrentDirectory().Split('\\');
-                string pathNeed = "";
-                for (int i = 0; i < path.Length - 3; i++)
-                {
-                    pathNeed += path[i] + "\\";
-                }
-                var configuration = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory()).AddJsonFile(path: $"{pathNeed}AppSettings.json", optional: false, reloadOnChange: true).Build();
-                var logger = new LoggerConfiguration().ReadFrom.Configuration(configuration).CreateLogger();
-                option.AddSerilog(logger);
-            });
+            Application.Run(new FormLinerCollection());
        }
    }
 }