Лабораторная работа 3.1(new)

ProectMilitaryAircraft/ProectMilitaryAircraft/AircraftDelegate.cs

@@ -1,10 +0,0 @@
-using ProectMilitaryAircraft.Draw;
-
-namespace ProectMilitaryAircraft;
-
-/// <summary>
-/// Делегат передачи объекта класса - прорисовки
-/// </summary>
-/// <param name="aircraft"></param>
-public delegate void  AircraftDelegate(DrawningAircraft aircraft);
-

ProectMilitaryAircraft/ProectMilitaryAircraft/CollectionGenericObjects/AircraftSharingService.cs

@@ -12,6 +12,7 @@ public class AircraftSharingService : AbstractCompany
     public AircraftSharingService(int picWidth, int picHeight, ICollectionGenericObjects<DrawningAircraft> collection) : base(picWidth, picHeight, collection)
     {
     }
+
     private int? _startPosX;
     private int? _startPosY;
     private int? ObjPositionX;
@@ -28,7 +29,6 @@ public class AircraftSharingService : AbstractCompany
         Pen pen = new(Color.Black);
         g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value, 2, 2);
     }
-
     protected override void DrawBackGround(Graphics g)
     {
         _startPosX = 0;

ProectMilitaryAircraft/ProectMilitaryAircraft/CollectionGenericObjects/CollectionType.cs

@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProectMilitaryAircraft.CollectionGenericObjects;
-
-
-/// <summary>
-/// Тип коллекции
-/// </summary>
-public enum CollectionType
-{
-    /// <summary>
-    /// Неопределено
-    /// </summary>
-    None = 0,
-
-    /// <summary>
-    /// Массив
-    /// </summary>
-    Massive = 1,
-
-    /// <summary>
-    /// Список
-    /// </summary>
-    List = 2
-}

ProectMilitaryAircraft/ProectMilitaryAircraft/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -1,6 +1,4 @@
-using ProectMilitaryAircraft.Draw;
-using ProectMilitaryAircraft.MovementStrategy;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

ProectMilitaryAircraft/ProectMilitaryAircraft/CollectionGenericObjects/ListgenericObjects.cs

@@ -1,78 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProectMilitaryAircraft.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; } } }
-
-    public CollectionType GetCollectionType => CollectionType.List;
-
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    public ListgenericObjects()
-    {
-        _collection = new();
-    }
-
-    public T? Get(int position)
-    {
-
-        if (position < 0 || position >= Count) return null;
-        return _collection[position];
-
-    }
-
-    public bool Insert(T obj)
-    {
-        if (Count != _maxCount)
-        {
-            _collection.Add(obj);
-            return true;
-        }
-        return false;
-    }
-
-    public bool Insert(T obj, int position)
-    {
-        if (position > 0 && position <= _maxCount && Count != _maxCount)
-        {
-            _collection.Insert(position, obj);
-            return true;
-        }
-        return false;
-    }
-
-    public bool Remove(int position)
-    {
-        if (_collection[position] != null)
-        {
-            _collection.RemoveAt(position);
-            return true;
-        }
-        return false;
-    }
-}

ProectMilitaryAircraft/ProectMilitaryAircraft/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -16,103 +16,71 @@ namespace ProectMilitaryAircraft.CollectionGenericObjects
         /// <summary>
         /// Массив объектов, которые храним
         /// </summary>
-        private T?[] _collection;
+        private T?[] _massive;
+        public int Count => _massive.Length;
 
-        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];
-                    }
-                }
-            }
-        }
+        public int SetMaxCount { set { if (value > 0) { _massive = new T?[value]; } } }
 
         /// <summary>
         /// Конструктор
         /// </summary>
         public MassiveGenericObjects()
         {
-            _collection = Array.Empty<T?>();
+            _massive = Array.Empty<T>();
         }
 
         public T? Get(int position)
         {
-            if (_collection[position] != null)
-            {
-                return _collection[position];
-            }
-            else
-            {
-                return null;
-            }
+            if (position < 0 || position >= Count) return null;
+            return _massive[position];
         }
 
         public bool Insert(T obj)
         {
-            for (int i = 0; i < _collection.Length; i++)
+            int index = 0;
+            while (_massive[index] != null)
             {
-                if (_collection[i] == null)
+                index++;
+                if (index == Count) { return true; } // false?
+            }
+
+            while (index != 0)
             {
-                    _collection[i] = obj;
-                    return true;
-                }
+                _massive[index] = _massive[index - 1];
+                index--;
             }
+            _massive[0] = obj;
             return false;
         }
 
         public bool Insert(T obj, int position)
         {
-            if (_collection[position] == null)
+            if (position < 0 || position >= Count)
             {
-                _collection[position] = obj;
-                return true;
-            }
-            if (_collection[position] != null)
-            {
-                for (int i = position; i < _collection.Length; i++)
-                {
-                    if (_collection[i] == null)
-                    {
-                        _collection[i] = obj;
-                        return true;
-                    }
-                    break;
-                }
-
-                for (int i = position; i <= 0; i--)
-                {
-                    if (_collection[i] == null)
-                    {
-                        _collection[i] = obj;
-                        return true;
-                    }
-                    break;
-                }
-            }
                 return false;
             }
+            if (_massive[position] == null)
+            {
+                _massive[position] = obj;
+                return true;
+            }
+            int index = position;
+            while (_massive[index] != null) index++;
+            if (index == Count) return false;
+            for (int i = index; i > position; i--)
+            {
+                _massive[i] = _massive[i - 1];
+            }
+            _massive[position] = obj;
+            return true;
+        }
 
         public bool Remove(int position)
         {
-            if (_collection[position] != null)
-            {
-                _collection[position] = null;
+            if (position < 0 || position >= Count) return false;
+            _massive[position] = null;
             return true;
         }
-            return false;
-        }
-
     }
 
 }

ProectMilitaryAircraft/ProectMilitaryAircraft/CollectionGenericObjects/StorageCollection.cs

@@ -1,60 +0,0 @@
-using ProectMilitaryAircraft.MovementStrategy;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProectMilitaryAircraft.CollectionGenericObjects;
-
-public class StorageCollection<T>
-    where T : class
-{
-    readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
-
-    public List<string> Keys => _storages.Keys.ToList();
-
-    public StorageCollection()
-    {
-        _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
-    }
-
-    public void AddCollection (string name, CollectionType collectionType)
-    {
-        if (name != null && !_storages.ContainsKey(name))
-        {
-
-            if (collectionType == CollectionType.Massive)
-            {
-                _storages.Add(name, new MassiveGenericObjects<T>());
-            }
-            if (collectionType == CollectionType.List)
-            {
-                _storages.Add(name, new ListgenericObjects<T>());
-            }
-
-        }
-    }   
-
-    public void DelCollection (string name) 
-    {
-        if (!_storages.ContainsKey(name))
-        {
-            return;
-        }
-
-        _storages.Remove(name);
-    }
-
-    public ICollectionGenericObjects<T>? this[string name]
-    {
-        get
-        {
-            if (_storages.ContainsKey(name))
-            {
-                return _storages[name];
-            }
-            return null;
-        }
-    }
-}

ProectMilitaryAircraft/ProectMilitaryAircraft/Draw/DrawningAircraft.cs

@@ -190,6 +190,7 @@ public class DrawningAircraft
                 {
                     _startPosY += (int)EntityAircraft.Step;
                 }
+
                 return true;
             default:
                 return false;

ProectMilitaryAircraft/ProectMilitaryAircraft/Entities/EntityAircraft.cs

@@ -12,11 +12,6 @@ namespace ProectMilitaryAircraft.Entities;
 /// </summary>
 public class EntityAircraft
 {
-    public void SetBodyColor(Color color)
-    {
-        BodyColor = color;
-    }
-   
     /// <summary>
     /// Скорость
     /// </summary>
@@ -29,7 +24,7 @@ public class EntityAircraft
     /// Основной цвет
     /// </summary>
     public Color BodyColor { get; private set; }
-    public double Step => (double)Speed * 100 / Weight;
+    public double Step => Speed * 100 / Weight;
 
     /// <summary>
     /// Конструктор сущности
@@ -43,6 +38,5 @@ public class EntityAircraft
         Speed = speed;
         Weight = weight;
         BodyColor = bodyColor;
-
     }
 }

ProectMilitaryAircraft/ProectMilitaryAircraft/Entities/EntityMilitaryAircraft.cs

@@ -4,11 +4,6 @@
 /// </summary>
 public class EntityMilitaryAircraft : EntityAircraft
 {
-
-    public void SAdditionalColor(Color color)
-    {
-        AdditionalColor = color;
-    }
     /// <summary>
     /// Доп. цвет 
     /// </summary>

ProectMilitaryAircraft/ProectMilitaryAircraft/FormAircraftCollection.Designer.cs

@@ -29,34 +29,26 @@
         private void InitializeComponent()
         {
             groupBoxTools = new GroupBox();
-            panelCompanyTools = new Panel();
-            buttonAddAircraft = new Button();
             buttonRefresh = new Button();
-            maskedTextBox = new MaskedTextBox();
             buttonGoToCheck = new Button();
             buttonRemoveAircraft = 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();
+            maskedTextBox = new MaskedTextBox();
+            buttonAddMilitaryAircraft = new Button();
+            buttonAddAircraft = new Button();
             comboBoxSelectorCompany = new ComboBox();
             pictureBox = new PictureBox();
             groupBoxTools.SuspendLayout();
-            panelCompanyTools.SuspendLayout();
-            panelStorage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
             SuspendLayout();
             // 
             // groupBoxTools
             // 
-            groupBoxTools.Controls.Add(panelCompanyTools);
-            groupBoxTools.Controls.Add(buttonCreateCompany);
-            groupBoxTools.Controls.Add(panelStorage);
+            groupBoxTools.Controls.Add(buttonRefresh);
+            groupBoxTools.Controls.Add(buttonGoToCheck);
+            groupBoxTools.Controls.Add(buttonRemoveAircraft);
+            groupBoxTools.Controls.Add(maskedTextBox);
+            groupBoxTools.Controls.Add(buttonAddMilitaryAircraft);
+            groupBoxTools.Controls.Add(buttonAddAircraft);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Dock = DockStyle.Right;
             groupBoxTools.Location = new Point(607, 0);
@@ -66,56 +58,23 @@
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = " Инструменты";
             // 
-            // panelCompanyTools
-            // 
-            panelCompanyTools.Controls.Add(buttonAddAircraft);
-            panelCompanyTools.Controls.Add(buttonRefresh);
-            panelCompanyTools.Controls.Add(maskedTextBox);
-            panelCompanyTools.Controls.Add(buttonGoToCheck);
-            panelCompanyTools.Controls.Add(buttonRemoveAircraft);
-            panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(6, 280);
-            panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(182, 283);
-            panelCompanyTools.TabIndex = 8;
-            // 
-            // buttonAddAircraft
-            // 
-            buttonAddAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddAircraft.Location = new Point(4, 3);
-            buttonAddAircraft.Name = "buttonAddAircraft";
-            buttonAddAircraft.Size = new Size(178, 36);
-            buttonAddAircraft.TabIndex = 1;
-            buttonAddAircraft.Text = "Добавление самолета";
-            buttonAddAircraft.UseVisualStyleBackColor = true;
-            buttonAddAircraft.Click += ButtonAddAircraft_Click;
-            // 
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(4, 229);
+            buttonRefresh.Location = new Point(6, 450);
             buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(178, 45);
+            buttonRefresh.Size = new Size(182, 45);
             buttonRefresh.TabIndex = 5;
             buttonRefresh.Text = "Обновить";
             buttonRefresh.UseVisualStyleBackColor = true;
             buttonRefresh.Click += ButtonRefresh_Click;
             // 
-            // maskedTextBox
-            // 
-            maskedTextBox.Location = new Point(4, 98);
-            maskedTextBox.Mask = "00";
-            maskedTextBox.Name = "maskedTextBox";
-            maskedTextBox.Size = new Size(178, 23);
-            maskedTextBox.TabIndex = 3;
-            maskedTextBox.ValidatingType = typeof(int);
-            // 
             // buttonGoToCheck
             // 
             buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(4, 178);
+            buttonGoToCheck.Location = new Point(6, 299);
             buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(178, 45);
+            buttonGoToCheck.Size = new Size(182, 45);
             buttonGoToCheck.TabIndex = 4;
             buttonGoToCheck.Text = "Передать на тесты";
             buttonGoToCheck.UseVisualStyleBackColor = true;
@@ -124,105 +83,44 @@
             // buttonRemoveAircraft
             // 
             buttonRemoveAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRemoveAircraft.Location = new Point(4, 127);
+            buttonRemoveAircraft.Location = new Point(6, 208);
             buttonRemoveAircraft.Name = "buttonRemoveAircraft";
-            buttonRemoveAircraft.Size = new Size(178, 45);
+            buttonRemoveAircraft.Size = new Size(182, 45);
             buttonRemoveAircraft.TabIndex = 3;
             buttonRemoveAircraft.Text = " Удалить самолет";
             buttonRemoveAircraft.UseVisualStyleBackColor = true;
             buttonRemoveAircraft.Click += ButtonRemoveAircraft_Click;
             // 
-            // buttonCreateCompany
+            // maskedTextBox
             // 
-            buttonCreateCompany.Location = new Point(6, 251);
-            buttonCreateCompany.Name = "buttonCreateCompany";
-            buttonCreateCompany.Size = new Size(182, 23);
-            buttonCreateCompany.TabIndex = 7;
-            buttonCreateCompany.Text = "Создать компанию";
-            buttonCreateCompany.UseVisualStyleBackColor = true;
-            buttonCreateCompany.Click += ButtonCreateCompany_Click;
+            maskedTextBox.Location = new Point(6, 179);
+            maskedTextBox.Mask = "00";
+            maskedTextBox.Name = "maskedTextBox";
+            maskedTextBox.Size = new Size(182, 23);
+            maskedTextBox.TabIndex = 3;
+            maskedTextBox.ValidatingType = typeof(int);
             // 
-            // panelStorage
+            // buttonAddMilitaryAircraft
             // 
-            panelStorage.Controls.Add(buttonCollectionDel);
-            panelStorage.Controls.Add(listBoxCollection);
-            panelStorage.Controls.Add(buttonCollectionAdd);
-            panelStorage.Controls.Add(radioButtonList);
-            panelStorage.Controls.Add(radioButtonMassive);
-            panelStorage.Controls.Add(textBoxCollectionName);
-            panelStorage.Controls.Add(labelCollectionName);
-            panelStorage.Dock = DockStyle.Top;
-            panelStorage.Location = new Point(3, 19);
-            panelStorage.Name = "panelStorage";
-            panelStorage.Size = new Size(188, 186);
-            panelStorage.TabIndex = 6;
+            buttonAddMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddMilitaryAircraft.Location = new Point(6, 112);
+            buttonAddMilitaryAircraft.Name = "buttonAddMilitaryAircraft";
+            buttonAddMilitaryAircraft.Size = new Size(182, 45);
+            buttonAddMilitaryAircraft.TabIndex = 2;
+            buttonAddMilitaryAircraft.Text = "Добавление военного самолета";
+            buttonAddMilitaryAircraft.UseVisualStyleBackColor = true;
+            buttonAddMilitaryAircraft.Click += ButtonAddMilitaryAircraft_Click;
             // 
-            // buttonCollectionDel
+            // buttonAddAircraft
             // 
-            buttonCollectionDel.Location = new Point(3, 156);
-            buttonCollectionDel.Name = "buttonCollectionDel";
-            buttonCollectionDel.Size = new Size(182, 21);
-            buttonCollectionDel.TabIndex = 6;
-            buttonCollectionDel.Text = "Удалить коллекцию";
-            buttonCollectionDel.UseVisualStyleBackColor = true;
-            buttonCollectionDel.Click += ButtonCollectionDel_Click;
-            // 
-            // listBoxCollection
-            // 
-            listBoxCollection.FormattingEnabled = true;
-            listBoxCollection.ItemHeight = 15;
-            listBoxCollection.Location = new Point(3, 101);
-            listBoxCollection.Name = "listBoxCollection";
-            listBoxCollection.Size = new Size(182, 49);
-            listBoxCollection.TabIndex = 5;
-            // 
-            // buttonCollectionAdd
-            // 
-            buttonCollectionAdd.Location = new Point(3, 72);
-            buttonCollectionAdd.Name = "buttonCollectionAdd";
-            buttonCollectionAdd.Size = new Size(182, 23);
-            buttonCollectionAdd.TabIndex = 4;
-            buttonCollectionAdd.Text = "Добавить коллекцию";
-            buttonCollectionAdd.UseVisualStyleBackColor = true;
-            buttonCollectionAdd.Click += ButtonCollectionAdd_Click;
-            // 
-            // radioButtonList
-            // 
-            radioButtonList.AutoSize = true;
-            radioButtonList.Location = new Point(119, 47);
-            radioButtonList.Name = "radioButtonList";
-            radioButtonList.Size = new Size(66, 19);
-            radioButtonList.TabIndex = 3;
-            radioButtonList.TabStop = true;
-            radioButtonList.Text = "Список";
-            radioButtonList.UseVisualStyleBackColor = true;
-            // 
-            // radioButtonMassive
-            // 
-            radioButtonMassive.AutoSize = true;
-            radioButtonMassive.Location = new Point(3, 47);
-            radioButtonMassive.Name = "radioButtonMassive";
-            radioButtonMassive.Size = new Size(67, 19);
-            radioButtonMassive.TabIndex = 2;
-            radioButtonMassive.TabStop = true;
-            radioButtonMassive.Text = "Массив";
-            radioButtonMassive.UseVisualStyleBackColor = true;
-            // 
-            // textBoxCollectionName
-            // 
-            textBoxCollectionName.Location = new Point(3, 18);
-            textBoxCollectionName.Name = "textBoxCollectionName";
-            textBoxCollectionName.Size = new Size(182, 23);
-            textBoxCollectionName.TabIndex = 1;
-            // 
-            // labelCollectionName
-            // 
-            labelCollectionName.AutoSize = true;
-            labelCollectionName.Location = new Point(29, 0);
-            labelCollectionName.Name = "labelCollectionName";
-            labelCollectionName.Size = new Size(125, 15);
-            labelCollectionName.TabIndex = 0;
-            labelCollectionName.Text = "Название коллекции:";
+            buttonAddAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddAircraft.Location = new Point(6, 70);
+            buttonAddAircraft.Name = "buttonAddAircraft";
+            buttonAddAircraft.Size = new Size(182, 36);
+            buttonAddAircraft.TabIndex = 1;
+            buttonAddAircraft.Text = "Добавление самолета";
+            buttonAddAircraft.UseVisualStyleBackColor = true;
+            buttonAddAircraft.Click += ButtonAddAircraft_Click;
             // 
             // comboBoxSelectorCompany
             // 
@@ -230,7 +128,7 @@
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(6, 211);
+            comboBoxSelectorCompany.Location = new Point(6, 22);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
             comboBoxSelectorCompany.Size = new Size(182, 23);
             comboBoxSelectorCompany.TabIndex = 0;
@@ -255,10 +153,7 @@
             Name = "FormAircraftCollection";
             Text = "Коллекция самолетов";
             groupBoxTools.ResumeLayout(false);
-            panelCompanyTools.ResumeLayout(false);
-            panelCompanyTools.PerformLayout();
-            panelStorage.ResumeLayout(false);
-            panelStorage.PerformLayout();
+            groupBoxTools.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
             ResumeLayout(false);
         }
@@ -267,21 +162,12 @@
 
         private GroupBox groupBoxTools;
         private ComboBox comboBoxSelectorCompany;
+        private Button buttonAddMilitaryAircraft;
         private Button buttonAddAircraft;
         private Button buttonRefresh;
         private Button buttonGoToCheck;
         private Button buttonRemoveAircraft;
         private MaskedTextBox maskedTextBox;
         private PictureBox pictureBox;
-        private Panel panelStorage;
-        private TextBox textBoxCollectionName;
-        private Label labelCollectionName;
-        private RadioButton radioButtonMassive;
-        private RadioButton radioButtonList;
-        private Button buttonCollectionAdd;
-        private ListBox listBoxCollection;
-        private Button buttonCreateCompany;
-        private Button buttonCollectionDel;
-        private Panel panelCompanyTools;
     }
 }

ProectMilitaryAircraft/ProectMilitaryAircraft/FormAircraftCollection.cs

@@ -18,11 +18,6 @@ namespace ProectMilitaryAircraft;
 /// </summary>
 public partial class FormAircraftCollection : Form
 {
-    /// <summary>
-    /// Хранилище коллекций
-    /// </summary>
-    private readonly StorageCollection<DrawningAircraft> _storageCollection;
-
     /// <summary>
     /// Компания
     /// </summary>
@@ -35,7 +30,6 @@ public partial class FormAircraftCollection : Form
     public FormAircraftCollection()
     {
         InitializeComponent();
-        _storageCollection = new(); 
     }
     /// <summary>
     /// Выбор компании
@@ -44,48 +38,79 @@ public partial class FormAircraftCollection : Form
     /// <param name="e"></param>
     private void ComboBoxSelectorCompany_SelectedValueChanged(object sender, EventArgs e)
     {
-       panelCompanyTools.Enabled = false;
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new AircraftSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningAircraft>());
+                break;
+        }
     }
 
     /// <summary>
-    /// Добавление самолета
+    /// Создание объекта класса-перемещения
     /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonAddAircraft_Click(object sender, EventArgs e)
+    /// <param name="type">Тип создаваемого объекта</param>
+    private void CreateObj(string type)
     {
-        if (listBoxCollection.SelectedIndex == -1) return;
-        var obj = _storageCollection[listBoxCollection.SelectedItem?.ToString() ?? string.Empty];
-        if (obj == null) return;
-
-        FormAircraftConfig form = new();
-        form.Show();
-        form.AddEvent(SetAircraft);
-    }
-
-    /// <summary>
-    /// Добавление самолета в коллекцмю
-    /// </summary>
-    /// <param name="aircraft"></param>
-    private void SetAircraft(DrawningAircraft aircraft)
-    {
-        if (_company == null || aircraft == null)
+        if (_company == null)
         {
             return;
         }
-
-        if (_company + aircraft)
+        Random rnd = new();
+        DrawningAircraft drawningAircraft;
+        switch (type)
         {
-            MessageBox.Show("Объект добавлен");
-            pictureBox.Image = _company.Show();
+            case nameof(DrawningAircraft):
+                drawningAircraft = new DrawningAircraft(rnd.Next(100, 300), rnd.Next(1000, 3000), GetColor(rnd), pictureBox.Width, pictureBox.Height);
+
+                break;
+
+            case nameof(DrawningMilitaryAircraft):
+                drawningAircraft = new DrawningMilitaryAircraft(rnd.Next(100, 300), rnd.Next(1000, 3000),
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+                Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), pictureBox.Width, pictureBox.Height);
+                break;
+            default:
+                return;
+        }
+        if (_company + drawningAircraft)
+        {
+            MessageBox.Show("Не удалось добаить объект");
           
         }
         else
         {
-            MessageBox.Show("не удалось добавить объект");
+            MessageBox.Show("Объект добавлен");
+            pictureBox.Image = _company.Show();
         }
     }
 
+    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 ButtonAddAircraft_Click(object sender, EventArgs e) => CreateObj(nameof(DrawningAircraft));
+
+    /// <summary>
+    /// Добавление военного самолета
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddMilitaryAircraft_Click(object sender, EventArgs e) => CreateObj(nameof(DrawningMilitaryAircraft));
+
     /// <summary>
     /// Удаление самолета
     /// </summary>
@@ -161,96 +186,4 @@ public partial class FormAircraftCollection : Form
         }
         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);
-        RefreshListBoxItems();
-    }
-
-    /// <summary>
-    /// /
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonCollectionDel_Click(object sender, EventArgs e)
-    {
-        if (listBoxCollection.SelectedIndex == -1)
-        {
-            return;
-        }
-        if (MessageBox.Show($"Удалить объект{listBoxCollection.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo,
-            MessageBoxIcon.Question) == DialogResult.Yes)
-        {
-            _storageCollection.DelCollection(listBoxCollection.SelectedItem?.ToString()
-            ?? string.Empty);
-            RefreshListBoxItems();
-        }
-
-    }
-
-    private void RefreshListBoxItems()
-    {
-        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.SelectedItems == null)
-        {
-            MessageBox.Show("Коллекция не выбрана");
-            return;
-        }
-
-        ICollectionGenericObjects<DrawningAircraft>? collection = _storageCollection[listBoxCollection.SelectedItem?.ToString()?? string.Empty];
-        if (collection == null)
-        {
-            MessageBox.Show("Коллкция не проиницилизирована");
-            return;
-        }
-
-        switch (comboBoxSelectorCompany.Text)
-        {
-            case "Хранилище":
-                _company = new AircraftSharingService(pictureBox.Width, pictureBox.Height, collection);
-                pictureBox.Image = _company.Show();
-                break;
-        }
-
-        panelCompanyTools.Enabled = true;
-        RefreshListBoxItems();
-    }
 }

ProectMilitaryAircraft/ProectMilitaryAircraft/FormAircraftConfig.Designer.cs

@@ -1,371 +0,0 @@
-namespace ProectMilitaryAircraft
-{
-    partial class FormAircraftConfig
-    {
-        /// <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()
-        {
-            groupBoxConfig = new GroupBox();
-            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();
-            checkBoxSymbolism = new CheckBox();
-            checkBoxRokets = new CheckBox();
-            checkBoxPin = new CheckBox();
-            numericUpDownWeight = new NumericUpDown();
-            labelWeight = new Label();
-            numericUpDownSpeed = new NumericUpDown();
-            labelSpeed = new Label();
-            labelModifiedObject = new Label();
-            labelSimpleObject = new Label();
-            pictureBoxObject = new PictureBox();
-            buttonAdd = new Button();
-            buttonCancel = new Button();
-            panelObject = new Panel();
-            labelAdditionalColor = new Label();
-            labelBodyColor = new Label();
-            groupBoxConfig.SuspendLayout();
-            groupBoxColors.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
-            panelObject.SuspendLayout();
-            SuspendLayout();
-            // 
-            // groupBoxConfig
-            // 
-            groupBoxConfig.Controls.Add(groupBoxColors);
-            groupBoxConfig.Controls.Add(checkBoxSymbolism);
-            groupBoxConfig.Controls.Add(checkBoxRokets);
-            groupBoxConfig.Controls.Add(checkBoxPin);
-            groupBoxConfig.Controls.Add(numericUpDownWeight);
-            groupBoxConfig.Controls.Add(labelWeight);
-            groupBoxConfig.Controls.Add(numericUpDownSpeed);
-            groupBoxConfig.Controls.Add(labelSpeed);
-            groupBoxConfig.Controls.Add(labelModifiedObject);
-            groupBoxConfig.Controls.Add(labelSimpleObject);
-            groupBoxConfig.Dock = DockStyle.Left;
-            groupBoxConfig.Location = new Point(0, 0);
-            groupBoxConfig.Name = "groupBoxConfig";
-            groupBoxConfig.Size = new Size(496, 314);
-            groupBoxConfig.TabIndex = 0;
-            groupBoxConfig.TabStop = false;
-            groupBoxConfig.Text = "Параметры";
-            // 
-            // 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(308, 32);
-            groupBoxColors.Name = "groupBoxColors";
-            groupBoxColors.Size = new Size(154, 89);
-            groupBoxColors.TabIndex = 9;
-            groupBoxColors.TabStop = false;
-            groupBoxColors.Text = "Цвета";
-            // 
-            // panelPurple
-            // 
-            panelPurple.BackColor = Color.Purple;
-            panelPurple.Location = new Point(114, 55);
-            panelPurple.Name = "panelPurple";
-            panelPurple.Size = new Size(30, 27);
-            panelPurple.TabIndex = 1;
-            // 
-            // panelBlack
-            // 
-            panelBlack.BackColor = Color.Black;
-            panelBlack.Location = new Point(78, 55);
-            panelBlack.Name = "panelBlack";
-            panelBlack.Size = new Size(30, 27);
-            panelBlack.TabIndex = 1;
-            // 
-            // panelGray
-            // 
-            panelGray.BackColor = Color.Gray;
-            panelGray.Location = new Point(42, 55);
-            panelGray.Name = "panelGray";
-            panelGray.Size = new Size(30, 27);
-            panelGray.TabIndex = 1;
-            // 
-            // panelWhite
-            // 
-            panelWhite.BackColor = Color.White;
-            panelWhite.Location = new Point(6, 55);
-            panelWhite.Name = "panelWhite";
-            panelWhite.Size = new Size(30, 27);
-            panelWhite.TabIndex = 1;
-            // 
-            // panelYellow
-            // 
-            panelYellow.BackColor = Color.Yellow;
-            panelYellow.Location = new Point(114, 22);
-            panelYellow.Name = "panelYellow";
-            panelYellow.Size = new Size(30, 27);
-            panelYellow.TabIndex = 1;
-            // 
-            // panelBlue
-            // 
-            panelBlue.BackColor = Color.Blue;
-            panelBlue.Location = new Point(78, 22);
-            panelBlue.Name = "panelBlue";
-            panelBlue.Size = new Size(30, 27);
-            panelBlue.TabIndex = 1;
-            // 
-            // panelGreen
-            // 
-            panelGreen.BackColor = Color.Green;
-            panelGreen.Location = new Point(42, 22);
-            panelGreen.Name = "panelGreen";
-            panelGreen.Size = new Size(30, 27);
-            panelGreen.TabIndex = 1;
-            // 
-            // panelRed
-            // 
-            panelRed.BackColor = Color.Red;
-            panelRed.Location = new Point(6, 22);
-            panelRed.Name = "panelRed";
-            panelRed.Size = new Size(30, 27);
-            panelRed.TabIndex = 0;
-            // 
-            // checkBoxSymbolism
-            // 
-            checkBoxSymbolism.AutoSize = true;
-            checkBoxSymbolism.Location = new Point(6, 155);
-            checkBoxSymbolism.Name = "checkBoxSymbolism";
-            checkBoxSymbolism.Size = new Size(200, 19);
-            checkBoxSymbolism.TabIndex = 8;
-            checkBoxSymbolism.Text = "Признак наличия \"Символики\"";
-            checkBoxSymbolism.UseVisualStyleBackColor = true;
-            // 
-            // checkBoxRokets
-            // 
-            checkBoxRokets.AutoSize = true;
-            checkBoxRokets.Location = new Point(6, 130);
-            checkBoxRokets.Name = "checkBoxRokets";
-            checkBoxRokets.Size = new Size(166, 19);
-            checkBoxRokets.TabIndex = 7;
-            checkBoxRokets.Text = "Признак наличия \"Ракет\"";
-            checkBoxRokets.UseVisualStyleBackColor = true;
-            // 
-            // checkBoxPin
-            // 
-            checkBoxPin.AutoSize = true;
-            checkBoxPin.Location = new Point(6, 105);
-            checkBoxPin.Name = "checkBoxPin";
-            checkBoxPin.Size = new Size(274, 19);
-            checkBoxPin.TabIndex = 6;
-            checkBoxPin.Text = "Признак наличия \"Штырь на носу самолета\"";
-            checkBoxPin.UseVisualStyleBackColor = true;
-            // 
-            // numericUpDownWeight
-            // 
-            numericUpDownWeight.Location = new Point(74, 58);
-            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(83, 23);
-            numericUpDownWeight.TabIndex = 5;
-            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
-            // 
-            // labelWeight
-            // 
-            labelWeight.AutoSize = true;
-            labelWeight.Location = new Point(6, 60);
-            labelWeight.Name = "labelWeight";
-            labelWeight.Size = new Size(29, 15);
-            labelWeight.TabIndex = 4;
-            labelWeight.Text = "Вес:";
-            // 
-            // numericUpDownSpeed
-            // 
-            numericUpDownSpeed.Location = new Point(74, 32);
-            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(83, 23);
-            numericUpDownSpeed.TabIndex = 3;
-            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
-            // 
-            // labelSpeed
-            // 
-            labelSpeed.AutoSize = true;
-            labelSpeed.Location = new Point(6, 34);
-            labelSpeed.Name = "labelSpeed";
-            labelSpeed.Size = new Size(62, 15);
-            labelSpeed.TabIndex = 2;
-            labelSpeed.Text = "Скорость:";
-            // 
-            // labelModifiedObject
-            // 
-            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
-            labelModifiedObject.Location = new Point(382, 146);
-            labelModifiedObject.Name = "labelModifiedObject";
-            labelModifiedObject.Size = new Size(100, 34);
-            labelModifiedObject.TabIndex = 1;
-            labelModifiedObject.Text = "Продвинутый";
-            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
-            labelModifiedObject.MouseDown += LabelObject_MouseDown;
-            // 
-            // labelSimpleObject
-            // 
-            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
-            labelSimpleObject.Location = new Point(276, 146);
-            labelSimpleObject.Name = "labelSimpleObject";
-            labelSimpleObject.Size = new Size(100, 34);
-            labelSimpleObject.TabIndex = 0;
-            labelSimpleObject.Text = "Простой";
-            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
-            labelSimpleObject.MouseDown += LabelObject_MouseDown;
-            // 
-            // pictureBoxObject
-            // 
-            pictureBoxObject.BorderStyle = BorderStyle.FixedSingle;
-            pictureBoxObject.Location = new Point(3, 63);
-            pictureBoxObject.Name = "pictureBoxObject";
-            pictureBoxObject.Size = new Size(224, 164);
-            pictureBoxObject.TabIndex = 1;
-            pictureBoxObject.TabStop = false;
-            // 
-            // buttonAdd
-            // 
-            buttonAdd.Location = new Point(505, 240);
-            buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(75, 23);
-            buttonAdd.TabIndex = 2;
-            buttonAdd.Text = "Добавить";
-            buttonAdd.UseVisualStyleBackColor = true;
-            buttonAdd.Click += ButtonAdd_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(605, 240);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(75, 23);
-            buttonCancel.TabIndex = 3;
-            buttonCancel.Text = "Отменить";
-            buttonCancel.UseVisualStyleBackColor = true;
-            // 
-            // panelObject
-            // 
-            panelObject.AllowDrop = true;
-            panelObject.Controls.Add(labelAdditionalColor);
-            panelObject.Controls.Add(labelBodyColor);
-            panelObject.Controls.Add(pictureBoxObject);
-            panelObject.Location = new Point(502, 4);
-            panelObject.Name = "panelObject";
-            panelObject.Size = new Size(230, 230);
-            panelObject.TabIndex = 4;
-            panelObject.DragDrop += PanelObject_DragDrop;
-            panelObject.DragEnter += PanelObject_DragEnter;
-            // 
-            // labelAdditionalColor
-            // 
-            labelAdditionalColor.AllowDrop = true;
-            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
-            labelAdditionalColor.Location = new Point(145, 0);
-            labelAdditionalColor.Name = "labelAdditionalColor";
-            labelAdditionalColor.Size = new Size(85, 46);
-            labelAdditionalColor.TabIndex = 3;
-            labelAdditionalColor.Text = "Доп. цвет";
-            labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
-            labelAdditionalColor.DragDrop += LabelColor_DragDrop;
-            labelAdditionalColor.DragEnter += LabelColor_DragEnter;
-            // 
-            // labelBodyColor
-            // 
-            labelBodyColor.AllowDrop = true;
-            labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
-            labelBodyColor.Location = new Point(0, 0);
-            labelBodyColor.Name = "labelBodyColor";
-            labelBodyColor.Size = new Size(88, 46);
-            labelBodyColor.TabIndex = 2;
-            labelBodyColor.Text = "Цвет";
-            labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
-            labelBodyColor.DragDrop += LabelColor_DragDrop;
-            labelBodyColor.DragEnter += LabelColor_DragEnter;
-            // 
-            // FormAircraftConfig
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(810, 314);
-            Controls.Add(panelObject);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonAdd);
-            Controls.Add(groupBoxConfig);
-            Name = "FormAircraftConfig";
-            Text = "Созданиие объекта";
-            groupBoxConfig.ResumeLayout(false);
-            groupBoxConfig.PerformLayout();
-            groupBoxColors.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
-            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
-            panelObject.ResumeLayout(false);
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private GroupBox groupBoxConfig;
-        private Label labelModifiedObject;
-        private Label labelSimpleObject;
-        private NumericUpDown numericUpDownWeight;
-        private Label labelWeight;
-        private NumericUpDown numericUpDownSpeed;
-        private Label labelSpeed;
-        private CheckBox checkBoxPin;
-        private CheckBox checkBoxSymbolism;
-        private CheckBox checkBoxRokets;
-        private GroupBox groupBoxColors;
-        private Panel panelPurple;
-        private Panel panelBlack;
-        private Panel panelGray;
-        private Panel panelWhite;
-        private Panel panelYellow;
-        private Panel panelBlue;
-        private Panel panelGreen;
-        private Panel panelRed;
-        private PictureBox pictureBoxObject;
-        private Button buttonAdd;
-        private Button buttonCancel;
-        private Panel panelObject;
-        private Label labelAdditionalColor;
-        private Label labelBodyColor;
-    }
-}

ProectMilitaryAircraft/ProectMilitaryAircraft/FormAircraftConfig.cs

@@ -1,166 +0,0 @@
-using ProectMilitaryAircraft.Draw;
-using ProectMilitaryAircraft.Entities;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace ProectMilitaryAircraft;
-
-/// <summary>
-/// Форма конфигурации объекта
-/// </summary>
-public partial class FormAircraftConfig : Form
-{
-    /// <summary>
-    /// Объект - прорисовка самолета
-    /// </summary>
-    private DrawningAircraft? _aircraft;
-
-
-    /// <summary>
-    /// Событие для передачи объекта
-    /// </summary>
-    private event AircraftDelegate? _aircraftDelegate;
-
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    public FormAircraftConfig()
-    {
-        InitializeComponent();
-        panelRed.MouseDown += Panel_MouseDown;
-        panelGreen.MouseDown += Panel_MouseDown;
-        panelYellow.MouseDown += Panel_MouseDown;
-        panelWhite.MouseDown += Panel_MouseDown;
-        panelGray.MouseDown += Panel_MouseDown;
-        panelBlack.MouseDown += Panel_MouseDown;
-        panelBlue.MouseDown += Panel_MouseDown;
-        panelPurple.MouseDown += Panel_MouseDown;
-        buttonCancel.Click += (sender, e) => Close();
-    }
-
-    /// <summary>
-    /// Привязка внешнего метода к событию 
-    /// </summary>
-    /// <param name="aircraftDelegate"></param>
-    public void AddEvent(AircraftDelegate aircraftDelegate)
-    {
-        _aircraftDelegate += aircraftDelegate;
-    }
-
-    /// <summary>
-    /// Отрисовка объекта
-    /// </summary>
-    private void DrawObject()
-    {
-        Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
-        Graphics gr = Graphics.FromImage(bmp);
-        _aircraft?.SetpictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
-        _aircraft?.SetPosition(5, 5);
-        _aircraft?.DrawTransport(gr);
-        pictureBoxObject.Image = bmp;
-    }
-
-    /// <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 ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy);
-    }
-
-    /// <summary>
-    /// Проверка получаемой инф. (ее типа на соотв. требуемому)
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void PanelObject_DragEnter(object sender, DragEventArgs e)
-    {
-        e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
-    }
-
-    /// <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":
-                _aircraft = new DrawningAircraft((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, pictureBoxObject.Width, pictureBoxObject.Height);
-                break;
-            case "labelModifiedObject":
-                _aircraft = new DrawningMilitaryAircraft((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxPin.Checked, checkBoxRokets.Checked, checkBoxSymbolism.Checked, pictureBoxObject.Width, pictureBoxObject.Height);
-                break;
-        }
-        DrawObject();
-    }
-
-    /// <summary>
-    /// Передаем информацию принажатии на Panel
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void Panel_MouseDown(object? sender, MouseEventArgs e)
-    {
-        (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
-    }
-
-
-    //todo прописать логику смены цветов для продвинутого объекта
-
-
-    /// <summary>
-    /// Передача объекта
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonAdd_Click(object sender, EventArgs e)
-    {
-        if (_aircraft != null)
-        {
-            _aircraftDelegate?.Invoke(_aircraft);
-            Close();
-        }
-    }
-    private void LabelColor_DragDrop(object sender, DragEventArgs e)
-    {
-        if (_aircraft == null) return;
-        switch (((Label)sender).Name)
-        {
-            case "labelBodyColor":
-                _aircraft.EntityAircraft?.SetBodyColor((Color)e.Data.GetData(typeof(Color)));
-                break;
-            case "labelAdditionalColor":
-                if (_aircraft == null) return;
-                (_aircraft.EntityAircraft as EntityMilitaryAircraft)?.SAdditionalColor((Color)e.Data.GetData(typeof(Color)));
-                break;
-        }
-        DrawObject();
-    }
-
-    private void LabelColor_DragEnter(object sender, DragEventArgs e)
-    {
-        if (e.Data?.GetDataPresent(typeof(Color)) ?? false)
-        {
-            e.Effect = DragDropEffects.Copy;
-        }
-        else
-        {
-            e.Effect = DragDropEffects.None;
-        }
-    }
-
-}
-

ProectMilitaryAircraft/ProectMilitaryAircraft/FormAircraftConfig.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>

ProectMilitaryAircraft/ProectMilitaryAircraft/FormMilitaryAircraft.Designer.cs

@@ -43,7 +43,7 @@
             pictureBoxMilitaryAircraft.Dock = DockStyle.Fill;
             pictureBoxMilitaryAircraft.Location = new Point(0, 0);
             pictureBoxMilitaryAircraft.Name = "pictureBoxMilitaryAircraft";
-            pictureBoxMilitaryAircraft.Size = new Size(953, 651);
+            pictureBoxMilitaryAircraft.Size = new Size(893, 612);
             pictureBoxMilitaryAircraft.TabIndex = 0;
             pictureBoxMilitaryAircraft.TabStop = false;
             // 
@@ -54,7 +54,7 @@
             buttonLeft.BackgroundImage = Properties.Resources.Left;
             buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
             buttonLeft.ForeColor = SystemColors.ControlLightLight;
-            buttonLeft.Location = new Point(824, 610);
+            buttonLeft.Location = new Point(764, 571);
             buttonLeft.Name = "buttonLeft";
             buttonLeft.Size = new Size(35, 35);
             buttonLeft.TabIndex = 2;
@@ -68,7 +68,7 @@
             buttonUp.BackgroundImage = Properties.Resources.Up;
             buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
             buttonUp.ForeColor = SystemColors.ControlLightLight;
-            buttonUp.Location = new Point(865, 569);
+            buttonUp.Location = new Point(805, 530);
             buttonUp.Name = "buttonUp";
             buttonUp.Size = new Size(35, 35);
             buttonUp.TabIndex = 3;
@@ -82,7 +82,7 @@
             buttonRight.BackgroundImage = Properties.Resources.Right;
             buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
             buttonRight.ForeColor = SystemColors.ControlLightLight;
-            buttonRight.Location = new Point(906, 610);
+            buttonRight.Location = new Point(846, 571);
             buttonRight.Name = "buttonRight";
             buttonRight.Size = new Size(35, 35);
             buttonRight.TabIndex = 4;
@@ -96,7 +96,7 @@
             buttonDown.BackgroundImage = Properties.Resources.Down;
             buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
             buttonDown.ForeColor = SystemColors.ControlLightLight;
-            buttonDown.Location = new Point(865, 610);
+            buttonDown.Location = new Point(805, 571);
             buttonDown.Name = "buttonDown";
             buttonDown.Size = new Size(35, 35);
             buttonDown.TabIndex = 5;
@@ -109,7 +109,7 @@
             comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxStrategy.FormattingEnabled = true;
             comboBoxStrategy.Items.AddRange(new object[] { "К ценру", "К краю" });
-            comboBoxStrategy.Location = new Point(823, 12);
+            comboBoxStrategy.Location = new Point(763, 12);
             comboBoxStrategy.Name = "comboBoxStrategy";
             comboBoxStrategy.Size = new Size(121, 23);
             comboBoxStrategy.TabIndex = 7;
@@ -117,7 +117,7 @@
             // buttonStrategyStep
             // 
             buttonStrategyStep.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonStrategyStep.Location = new Point(870, 41);
+            buttonStrategyStep.Location = new Point(810, 41);
             buttonStrategyStep.Name = "buttonStrategyStep";
             buttonStrategyStep.Size = new Size(75, 23);
             buttonStrategyStep.TabIndex = 8;
@@ -129,7 +129,7 @@
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(953, 651);
+            ClientSize = new Size(893, 612);
             Controls.Add(buttonStrategyStep);
             Controls.Add(comboBoxStrategy);
             Controls.Add(buttonDown);

ProectMilitaryAircraft/ProectMilitaryAircraft/FormMilitaryAircraft.cs

@@ -60,47 +60,6 @@ namespace ProectMilitaryAircraft
             pictureBoxMilitaryAircraft.Image = bmp;
         }
 
-        private void CreateObj(string type)
-        {
-            Random rnd = new();
-            switch (type)
-            {
-                case nameof(DrawningAircraft):
-                    _DrawningAircraft = new DrawningAircraft(rnd.Next(100, 300), rnd.Next(1000, 3000),
-                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), pictureBoxMilitaryAircraft.Width, pictureBoxMilitaryAircraft.Height);
-
-                    break;
-
-                case nameof(DrawningMilitaryAircraft):
-                    _DrawningAircraft = new DrawningMilitaryAircraft(rnd.Next(100, 300), rnd.Next(1000, 3000),
-                    Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
-                    Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
-                    Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), pictureBoxMilitaryAircraft.Width, pictureBoxMilitaryAircraft.Height);
-                    break;
-                default:
-                    return;
-            }
-            _DrawningAircraft.SetpictureSize(pictureBoxMilitaryAircraft.Width, pictureBoxMilitaryAircraft.Height);
-            _DrawningAircraft.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100));
-            _AbstractStrategy = null;
-            comboBoxStrategy.Enabled = true;
-            Draw();
-        }
-
-        /// <summary>
-        /// Обработка кнопки нажатия "Создать ваенный самолет"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreateMA_Click(object sender, EventArgs e) => CreateObj(nameof(DrawningMilitaryAircraft));
-
-        /// <summary>
-        /// Обработка кнопки нажатия "Создать самолет"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreateA_Click(object sender, EventArgs e) => CreateObj(nameof(DrawningAircraft));
-
         private void ButtonMove_Click(object sender, EventArgs e)
         {
             if (_DrawningAircraft == null)

ProectMilitaryAircraft/ProectMilitaryAircraft/MovementStrategy/MoveToBorder.cs

@@ -10,48 +10,37 @@ public class MoveToBorder : AbstractStrategys
 {
     protected override bool IsTrgetDestansion()
     {
-        var objParams = GetObjectParameters;
+        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; 
+        return objParams.RightBorder + GetStep() >= FieldWidth && objParams.DownBorder + GetStep() >= FieldHeight;
     }
 
     protected override void MoveToTarget()
     {
-        var objParams = GetObjectParameters;
+        ObjectParameters? objParams = GetObjectParameters;
         if (objParams == null)
         {
             return;
         }
-        var diffX = objParams.RightBorder - FieldWidth;
+        int diffX = objParams.RightBorder - FieldWidth;
         if (Math.Abs(diffX) > GetStep())
         {
-            if (diffX > 0)
-            {
-                MoveLeft();
-            }
-            else
+            if (diffX < 0)
             {
                 MoveRight();
             }
-        }
-        var diffY = objParams.DownBorder - FieldHeight;
+
+            int diffY = objParams.DownBorder - FieldHeight;
             if (Math.Abs(diffY) > GetStep())
             {
-            if (diffY > 0)
-            {
-                MoveUp();
-            }
-            else
+                if (diffY < 0)
                 {
                     MoveDown();
                 }
             }
         }
     }
+}

ProectMilitaryAircraft/ProectMilitaryAircraft/MovementStrategy/MoveToCenter.cs

@@ -23,18 +23,33 @@ public class MoveToCenter : AbstractStrategys
     protected override void MoveToTarget()
     {
         ObjectParameters? objParams = GetObjectParameters;
-        if(objParams == null) { return;}
-
-        int diffx = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
-        if (Math.Abs(diffx) > GetStep())
+        if (objParams == null)
         {
-            if (diffx > 0) { MoveLeft(); } else { MoveRight(); }
+            return;
         }
-
-        int diffy = objParams.ObjectMiddleVertical - FieldHeight / 2;
-        if (Math.Abs(diffy) > GetStep())
+        int diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
+        if (Math.Abs(diffX) > GetStep())
         {
-            if (diffy > 0) { MoveUp(); } else { MoveDown(); }
+            if (diffX > 0)
+            {
+                MoveLeft();
+            }
+            else
+            {
+                MoveRight();
+            }
+        }
+        int diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
+        if (Math.Abs(diffY) > GetStep())
+        {
+            if (diffY > 0)
+            {
+                MoveUp();
+            }
+            else
+            {
+                MoveDown();
+            }
         }
     }
 }