Лаб 4

ProjectSportCar/ProjectSportCar/CollectionGenericObjects/AbstractCompany.cs

@@ -1,5 +1,12 @@
 using ProjectAiroplane.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
 namespace ProjectAiroplane.CollectionGenericObjects;
+
 /// <summary>
 /// Абстракция компании, хранящий коллекцию самолётов
 /// </summary>
@@ -27,8 +34,8 @@ public abstract class AbstractCompany
     protected ICollectionGenericObjects<Drawningplane>? _collection = null;
     /// <summary>
     /// Вычисление максимального количества элементов, который можно разместитьв окне
-    /// </summary>
-    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+/// </summary>
+private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
     /// <summary>
     /// Конструктор
     /// </summary>
@@ -41,7 +48,7 @@ public abstract class AbstractCompany
         _pictureWidth = picWidth;
         _pictureHeight = picHeight;
         _collection = collection;
-        _collection.MaxCount = GetMaxCount;
+        _collection.SetMaxCount = GetMaxCount;
     }
     /// <summary>
     /// Перегрузка оператора сложения для класса
@@ -98,4 +105,5 @@ public abstract class AbstractCompany
     /// Расстановка объектов
     /// </summary>
     protected abstract void SetObjectsPosition();
-}
+}
+

ProjectSportCar/ProjectSportCar/CollectionGenericObjects/CollectionType.cs

@@ -1,4 +1,10 @@
-namespace ProjectAiroplane.CollectionGenericObjects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectAiroplane.CollectionGenericObjects;
     
 /// <summary>
     /// Тип коллекции

ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -1,4 +1,10 @@
-namespace ProjectAiroplane.CollectionGenericObjects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectAiroplane.CollectionGenericObjects;
 /// <summary>
 /// Интерфейс описания действий для набора хранимых объектов
 /// </summary>
@@ -13,12 +19,7 @@ where T : class
     /// <summary>
     /// Установка максимального количества элементов
     /// </summary>
-
-    /// <summary>
-    /// Установка максимального количества элементов
-    /// </summary>
-    int MaxCount { get; set; }
-
+    int SetMaxCount { set; }
     /// <summary>
     /// Добавление объекта в коллекцию
     /// </summary>
@@ -44,14 +45,4 @@ where T : class
     /// <param name="position">Позиция</param>
     /// <returns>Объект</returns>
     T? Get(int position);
-
-    /// <summary>
-    /// получение типа коллекции
-    /// </summary>
-    CollectionType GetCollectionType { get; }
-    /// <summary>
-    /// получение объектов коллекции по одному
-    /// </summary>
-    /// <returns></returns>
-    IEnumerable<T?> GetItems();
 }

ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ListGenericObjects.cs

@@ -10,25 +10,8 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
     /// Максимально допустимое число объектов в списке
     /// </summary>
     private int _maxCount;
-    public int Count => _collection.Count;//свойство
-
-    public int MaxCount
-    {
-        get
-        {
-            return Count;
-        }
-        set
-        {
-            if (value > 0)
-            {
-                _maxCount = value;
-            }
-        }
-    }
-
-    public CollectionType GetCollectionType => CollectionType.List;
-
+    public int Count => _collection.Count;
+    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
     /// <summary>
     /// Конструктор
     /// </summary>
@@ -40,14 +23,14 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
     {
         // TODO проверка позиции
         if (position >= Count || position < 0) return null;
-        return _collection[position];// индексатор
+        return _collection[position];
     }
     public int Insert(T obj)
     {
         // TODO проверка, что не превышено максимальное количество элементов
         // TODO вставка в конец набора
         if (Count == _maxCount) return -1;
-        _collection.Add(obj);//метод
+        _collection.Add(obj);
         return Count;
     }
     public int Insert(T obj, int position)
@@ -57,7 +40,7 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
         // TODO вставка по позиции
         if (Count == _maxCount) return -1;
         if (position >= Count || position < 0) return -1;
-        _collection.Insert(position, obj);//метод
+        _collection.Insert(position, obj);
         return position;
     }
     public T Remove(int position)
@@ -66,15 +49,7 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
         // TODO удаление объекта из списка
         if (position >= Count || position < 0) return null;
         T obj = _collection[position];
-        _collection.RemoveAt(position);//метод
+        _collection.RemoveAt(position);
         return obj;
     }
-
-    public IEnumerable<T?> GetItems()
-    {
-        for (int i = 0; i < Count; i++)
-        {
-            yield return _collection[i];
-        }
-    }
 }

ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,4 +1,10 @@
-namespace ProjectAiroplane.CollectionGenericObjects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectAiroplane.CollectionGenericObjects;
 
 /// <summary>
 /// Параметризованный набор объектов
@@ -12,14 +18,8 @@ where T : class
     /// </summary>
     private T?[] _collection;
     public int Count => _collection.Length;
-
-    public int MaxCount
+    public int SetMaxCount
     {
-        get
-        {
-            return _collection.Length;
-        }
-
         set
         {
             if (value > 0)
@@ -35,9 +35,6 @@ where T : class
             }
         }
     }
-
-    public CollectionType GetCollectionType => CollectionType.Massive;
-
     /// <summary>
     /// Конструктор
     /// </summary>
@@ -103,7 +100,8 @@ where T : class
             }
         }
         return -1;
-    }
+}
+
     public T Remove(int position)
     {
         {
@@ -116,12 +114,4 @@ where T : class
             return obj;
         }
     }
-
-    public IEnumerable<T?> GetItems()
-    {
-        for (int i = 0; i < _collection.Length; i++)
-        {
-            yield return _collection[i];
-        }
-    }
 }

ProjectSportCar/ProjectSportCar/CollectionGenericObjects/PlaneSharingService.cs

@@ -1,10 +1,17 @@
 using ProjectAiroplane.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
 namespace ProjectAiroplane.CollectionGenericObjects;
 
 public class PlaneSharingService : AbstractCompany
 {
     public PlaneSharingService(int picWidth, int picHeight, ICollectionGenericObjects<Drawningplane> collection) : base(picWidth, picHeight, collection)
     {
+
     }
 
     /// <summary>
@@ -51,5 +58,6 @@ public class PlaneSharingService : AbstractCompany
                 return;
             }
         }
+
     }
 }

ProjectSportCar/ProjectSportCar/CollectionGenericObjects/StorageCollection.cs

@@ -1,13 +1,10 @@
-using ProjectAiroplane.Drawnings;
-using System.Text;
-
-namespace ProjectAiroplane.CollectionGenericObjects;
+namespace ProjectAiroplane.CollectionGenericObjects;
 /// <summary>
 /// класс-хранилище
 /// </summary>
 /// <typeparam name="T"></typeparam>
 public class StorageCollection<T>
-    where T : Drawningplane
+    where T : class
 {
     /// <summary>
     /// Словарь (хранилище) с коллекциями
@@ -53,7 +50,7 @@ public class StorageCollection<T>
     }
 
     /// <summary>
-    /// Доступ к коллекции 
+    /// Доступ к коллекции
     /// </summary>
     /// <param name="name">Название коллекции</param>
     /// <returns></returns>
@@ -67,148 +64,4 @@ public class StorageCollection<T>
             return null;
         }
     }
-
-    /// <summary>
-    /// Ключевое слово, с которого должен начинаться файл
-    /// </summary>
-    private readonly string _collectionKey = "CollectionsStorage";
-    /// <summary>
-    /// Разделитель для записи ключа и значения элемента словаря
-    /// </summary>
-    private readonly string _separatorForKeyValue = "|";
-    /// <summary>
-    /// Разделитель для записей коллекции данных в файл
-    /// </summary>
-    private readonly string _separatorItems = ";";
-    /// <summary>
-    /// Сохранение информации по автомобилям в хранилище в файл
-    /// </summary>
-    /// <param name="filename">Путь и имя файла</param>
-    /// <returns>true - сохранение прошло успешно, false - ошибка при 
-    ///сохранении данных</returns>
-
-    public bool SaveData(string filename)
-    {
-        if (_storages.Count == 0)
-        {
-            return false;
-        }
-        if (File.Exists(filename))
-        {
-            File.Delete(filename);
-        }
-        using (StreamWriter writer = new StreamWriter(filename))
-        {
-            writer.Write(_collectionKey);
-            foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
-            {
-                StringBuilder sb = new();
-                sb.Append(Environment.NewLine);
-                // не сохраняем пустые коллекции
-                if (value.Value.Count == 0)
-                {
-                    continue;
-                }
-                sb.Append(value.Key);
-                sb.Append(_separatorForKeyValue);
-                sb.Append(value.Value.GetCollectionType);
-                sb.Append(_separatorForKeyValue);
-                sb.Append(value.Value.MaxCount);
-                sb.Append(_separatorForKeyValue);
-
-                foreach (T? item in value.Value.GetItems())
-                {
-                    string data = item?.GetDataForSave() ?? string.Empty;///////////////////////
-                    if (string.IsNullOrEmpty(data))
-                    {
-                        continue;
-                    }
-                    sb.Append(data);
-                    sb.Append(_separatorItems);
-                }
-                writer.Write(sb);
-            }
-
-        }
-        return true;
-    }
-    /// <summary>
-    /// Загрузка информации по автомобилям в хранилище из файла
-    /// </summary>
-    /// <param name="filename">Путь и имя файла</param>/// <returns>true - загрузка прошла успешно, false - ошибка при загрузке 
-    ///данных</returns>
-    public bool LoadData(string filename)
-    {
-        if (!File.Exists(filename))
-        {
-            return false;
-        }
-        using (StreamReader fs = File.OpenText(filename))
-        {
-            string str = fs.ReadLine();
-            if (str == null || str.Length == 0)
-            {
-                return false;
-            }
-            if (!str.StartsWith(_collectionKey))
-            {
-                return false;
-            }
-            _storages.Clear();
-            string strs = "";
-            while ((strs = fs.ReadLine()) != null)
-            {
-                //
-                if (strs == null)
-                {
-                    return false;
-                }
-                string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
-                if (record.Length != 4)
-                {
-                    continue;
-                }
-                CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
-                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);//////////////////CreateCollection
-                if (collection == null)
-                {
-                    return false;
-                }
-                collection.MaxCount = Convert.ToInt32(record[2]);
-                string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
-                foreach (string elem in set)
-                {
-                    if (elem?.CreateDrawningplane() is T airoplane)//////////////////////////////////////////////////////////////////CreateDrawningplane()
-                    {
-                        if (collection.Insert(airoplane) == -1)
-                        {
-                            return false;
-                        }
-                    }
-                }
-
-                _storages.Add(record[0], collection);
-
-            }
-
-            return true;
-
-        }
-
-    }
-
-    /// <summary>
-    /// Создание коллекции по типу
-    /// </summary>
-    /// <param name="collectionType"></param>
-    /// <returns></returns>
-    private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
-    {
-        return collectionType switch
-        {
-            CollectionType.Massive => new MassiveGenericObjects<T>(),
-            CollectionType.List => new ListGenericObjects<T>(),
-            _ => null,
-        };
-    }
 }

ProjectSportCar/ProjectSportCar/Drawnings/DrawningAiroplane.cs

@@ -15,20 +15,15 @@ public class DrawningAiroplane : Drawningplane
     /// <param name="additionalColor">Дополнительный цвет</param>
     /// <param name="toplivbak">Признак наличия бака</param>
     /// <param name="radar">Признак наличия радара</param>
-
-    public DrawningAiroplane(int speed, double weight, Color bodyColor, Color additionalColor, bool toplivbak, bool radar) : base(170, 85)
+    
+    public DrawningAiroplane(int speed, double weight, Color bodyColor, Color additionalColor, bool toplivbak, bool radar) : base(170,85) 
     {
         Entityplane = new EntityAiroplane(speed, weight, bodyColor, additionalColor, toplivbak, radar);
     }
 
-    public DrawningAiroplane(EntityAiroplane airoplane) : base(170, 85)
-    {
-        Entityplane = new EntityAiroplane(airoplane.Speed, airoplane.Weight, airoplane.BodyColor, airoplane.AdditionalColor, airoplane.Toplivbak, airoplane.Radar);
-    }
-
     public override void DrawTransport(Graphics g)
     {
-        if (Entityplane == null || Entityplane is not EntityAiroplane airoplane || !_startPosX.HasValue || !_startPosY.HasValue)
+        if (Entityplane == null || Entityplane is not EntityAiroplane airoplane|| !_startPosX.HasValue || !_startPosY.HasValue)
         {
             return;
         }
@@ -38,13 +33,14 @@ public class DrawningAiroplane : Drawningplane
         Brush additionalBrush = new SolidBrush(airoplane.AdditionalColor);
         if (airoplane.Toplivbak)
         {
-            g.FillRectangle(additionalBrush, _startPosX.Value + 65, _startPosY.Value + 20, 30, 15);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 65,_startPosY.Value + 20, 30, 15);
         }
-
+       
         //Радар
         if (airoplane.Radar)
         {
-            g.FillEllipse(additionalBrush, _startPosX.Value + 135, _startPosY.Value + 45, 10, 10);
+            Brush brGreen = new SolidBrush(Color.LightGreen);
+            g.FillEllipse(brGreen, _startPosX.Value + 135, _startPosY.Value + 45, 10, 10);
             g.DrawEllipse(pen, _startPosX.Value + 135, _startPosY.Value + 45, 10, 10);
         }
 

ProjectSportCar/ProjectSportCar/Drawnings/Drawningplane.cs

@@ -1,5 +1,8 @@
 using ProjectAiroplane.Entities;
+
+
 namespace ProjectAiroplane.Drawnings;
+
 public class Drawningplane
 {
     /// <summary>
@@ -30,7 +33,7 @@ public class Drawningplane
     /// Высота прорисовки 
     /// </summary>
     private readonly int _drawningplaneHeight = 80;
-
+    
     // <summary>
     /// Координата X объекта
     /// </summary>
@@ -73,12 +76,6 @@ public class Drawningplane
         Entityplane = new Entityplane(speed, weight, bodyColor);
     }
 
-    public Drawningplane(Entityplane airoplane) : this()
-    {
-        Entityplane = new Entityplane(airoplane.Speed, airoplane.Weight, airoplane.BodyColor);
-    }
-
-
     /// <summary>
     /// Конструктор для наследников
     /// </summary>
@@ -239,7 +236,7 @@ public class Drawningplane
         Brush bodybrush = new SolidBrush(Entityplane.BodyColor);
         g.DrawEllipse(pen, _startPosX.Value + 10 - f, _startPosY.Value + 30 - f, 40, 10);
         g.FillEllipse(bodybrush, _startPosX.Value + 10 - f, _startPosY.Value + 30 - f, 40, 10);
-
+       
         //низ самолета
         g.DrawLine(pen, _startPosX.Value + 16 - f, _startPosY.Value + 65 - f, _startPosX.Value + 135 - f, _startPosY.Value + 65 - f);
 

ProjectSportCar/ProjectSportCar/Drawnings/ExtentionDrawningPlane.cs

@@ -1,50 +0,0 @@
-using ProjectAiroplane.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectAiroplane.Drawnings;
-
-public static class ExtentionDrawningPlane
-{
-    /// <summary>
-    /// Разделитель для записи информации по объекту в файл
-    /// </summary>
-    private static readonly string _separatorForObject = ":";
-    /// <summary>
-    /// Создание объекта из строки
-    /// </summary>
-    /// <param name="info">Строка с данными для создания объекта</param>
-    /// <returns>Объект</returns>
-    public static Drawningplane? CreateDrawningplane(this string info)
-    {
-        string[] strs = info.Split(_separatorForObject);
-        Entityplane? airoplane = EntityAiroplane.CreateEntityAiroplane(strs);
-        if (airoplane != null)
-        {
-            return new DrawningAiroplane((EntityAiroplane)airoplane);
-        }
-        airoplane = Entityplane.CreateEntityplane(strs);
-        if (airoplane != null)
-        {
-            return new Drawningplane(airoplane);
-        }
-        return null;
-    }
-    /// <summary>
-    /// Получение данных для сохранения в файл
-    /// </summary>
-    /// <param name="drawningplane">Сохраняемый объект</param>
-    /// <returns>Строка с данными по объекту</returns>
-    public static string GetDataForSave(this Drawningplane drawningplane)
-    {
-        string[]? array = drawningplane?.Entityplane?.GetStringRepresentation();
-        if (array == null)
-        {
-            return string.Empty;
-        }
-        return string.Join(_separatorForObject, array);
-    }
-}

ProjectSportCar/ProjectSportCar/Entities/EntityAiroplane.cs

@@ -1,6 +1,4 @@
-using System.Net.Sockets;
-
-namespace ProjectAiroplane.Entities;
+namespace ProjectAiroplane.Entities;
 public class EntityAiroplane : Entityplane
 {
     /// <summary>
@@ -15,7 +13,7 @@ public class EntityAiroplane : Entityplane
     /// Признак (опция) наличия радара
     /// </summary>
     public bool Radar { get; private set; }
-
+  
     /// <summary>
     /// Инициализация полей класса 
     /// </summary>
@@ -25,44 +23,13 @@ public class EntityAiroplane : Entityplane
     /// <param name="additionalColor"></Дополнительный цвет>
     /// <param name="toplivbak"></ Признак наличия бака>
     /// <param name="radar"></Признак (опция) наличия радара>
-
+    
     public EntityAiroplane(int speed, double weight, Color bodyColor, Color additionalColor, bool toplivbak, bool radar) : base(speed, weight, bodyColor)
     {
         AdditionalColor = additionalColor;
         Toplivbak = toplivbak;
         Radar = radar;
     }
-
-    /// <summary>
-    /// установка доп. цвета
-    /// </summary>
-    /// <param name="color"></param>
-    public void setAdditionalColor(Color color)
-    {
-        AdditionalColor = color;
-    }
-
-    /// <summary>
-    /// Получение строк со значениями свойств объекта класса-сущности
-    /// </summary>
-    /// <returns></returns>
-    public override string[] GetStringRepresentation()
-    {
-        return new[] { nameof(EntityAiroplane), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name, Toplivbak.ToString(), Radar.ToString() };
-    }
-    /// <summary>
-    /// Создание объекта из массива строк
-    /// </summary>
-    /// <param name="strs"></param>
-    /// <returns></returns>
-    public static EntityAiroplane? CreateEntityAiroplane(string[] strs)
-    {
-        if (strs.Length != 7 || strs[0] != nameof(EntityAiroplane))
-        {
-            return null;
-        }
-        return new EntityAiroplane(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]), Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]));
-    }
 }
 
 

ProjectSportCar/ProjectSportCar/Entities/Entityplane.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement;
@@ -29,16 +28,6 @@ public class Entityplane
     /// Шаг перемещения самолета
     /// </summary>
     public double Step => Speed * 100 / Weight;
-
-    /// <summary>
-    /// Основной цвет
-    /// </summary>
-    /// <param name="color"></param>
-    public void setBodyColor(Color color)
-    {
-        BodyColor = color;
-    }
-
     /// <summary>
     /// Конструктор сущности
     /// </summary>
@@ -53,27 +42,5 @@ public class Entityplane
         BodyColor = bodyColor;
     }
 
-    /// <summary>
-    /// Получение строк со значениями свойств объекта класса-сущности
-    /// </summary>
-    /// <returns></returns>
-    public virtual string[] GetStringRepresentation()
-    {
-        return new[] { nameof(Entityplane), Speed.ToString(), Weight.ToString(), BodyColor.Name };
-    }
-
-    /// <summary>
-    /// Создание объекта из массива строк
-    /// </summary>
-    /// <param name="strs"></param>
-    /// <returns></returns>
-    public static Entityplane? CreateEntityplane(string[] strs)
-    {
-        if (strs.Length != 4 || strs[0] != nameof(Entityplane))
-        {
-            return null;
-        }
-        return new Entityplane(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]));
-    }
 }
 

ProjectSportCar/ProjectSportCar/FormAiroplane.Designer.cs

@@ -131,6 +131,7 @@
             Controls.Add(pictureBoxAiroplane);
             Name = "FormAiroplane";
             Text = "Самолет с радаром";
+            Load += FormAiroplane_Load;
             ((System.ComponentModel.ISupportInitialize)pictureBoxAiroplane).EndInit();
             ResumeLayout(false);
         }

ProjectSportCar/ProjectSportCar/FormAiroplane.cs

@@ -108,6 +108,11 @@ namespace ProjectAiroplane
                 _strategy = null;
             }
         }
+
+        private void FormAiroplane_Load(object sender, EventArgs e)
+        {
+
+        }
     }
 }
 

ProjectSportCar/ProjectSportCar/FormPlanConfig.Designer.cs

@@ -1,359 +0,0 @@
-namespace ProjectAiroplane
-{
-    partial class FormPlanConfig
-    {
-        /// <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();
-            panelYellow = new Panel();
-            panelBlack = new Panel();
-            panelGray = new Panel();
-            panelBlue = new Panel();
-            panelWhite = new Panel();
-            panelGreen = new Panel();
-            panelRed = new Panel();
-            checkBoxRadar = new CheckBox();
-            checkBoxToplivbak = new CheckBox();
-            numericUpDownWeght = 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)numericUpDownWeght).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
-            panelObject.SuspendLayout();
-            SuspendLayout();
-            // 
-            // groupBoxConfig
-            // 
-            groupBoxConfig.Controls.Add(groupBoxColors);
-            groupBoxConfig.Controls.Add(checkBoxRadar);
-            groupBoxConfig.Controls.Add(checkBoxToplivbak);
-            groupBoxConfig.Controls.Add(numericUpDownWeght);
-            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(542, 253);
-            groupBoxConfig.TabIndex = 0;
-            groupBoxConfig.TabStop = false;
-            groupBoxConfig.Text = "Параметры";
-            // 
-            // groupBoxColors
-            // 
-            groupBoxColors.Controls.Add(panelPurple);
-            groupBoxColors.Controls.Add(panelYellow);
-            groupBoxColors.Controls.Add(panelBlack);
-            groupBoxColors.Controls.Add(panelGray);
-            groupBoxColors.Controls.Add(panelBlue);
-            groupBoxColors.Controls.Add(panelWhite);
-            groupBoxColors.Controls.Add(panelGreen);
-            groupBoxColors.Controls.Add(panelRed);
-            groupBoxColors.Location = new Point(241, 12);
-            groupBoxColors.Name = "groupBoxColors";
-            groupBoxColors.Size = new Size(270, 138);
-            groupBoxColors.TabIndex = 8;
-            groupBoxColors.TabStop = false;
-            groupBoxColors.Text = "Цвета";
-            // 
-            // panelPurple
-            // 
-            panelPurple.BackColor = Color.Purple;
-            panelPurple.Location = new Point(210, 81);
-            panelPurple.Name = "panelPurple";
-            panelPurple.Size = new Size(45, 45);
-            panelPurple.TabIndex = 3;
-            // 
-            // panelYellow
-            // 
-            panelYellow.BackColor = Color.Yellow;
-            panelYellow.Location = new Point(210, 26);
-            panelYellow.Name = "panelYellow";
-            panelYellow.Size = new Size(45, 45);
-            panelYellow.TabIndex = 1;
-            // 
-            // panelBlack
-            // 
-            panelBlack.BackColor = Color.Black;
-            panelBlack.Location = new Point(144, 81);
-            panelBlack.Name = "panelBlack";
-            panelBlack.Size = new Size(45, 45);
-            panelBlack.TabIndex = 4;
-            // 
-            // panelGray
-            // 
-            panelGray.BackColor = Color.Gray;
-            panelGray.Location = new Point(72, 81);
-            panelGray.Name = "panelGray";
-            panelGray.Size = new Size(45, 45);
-            panelGray.TabIndex = 5;
-            // 
-            // panelBlue
-            // 
-            panelBlue.BackColor = Color.Blue;
-            panelBlue.Location = new Point(144, 26);
-            panelBlue.Name = "panelBlue";
-            panelBlue.Size = new Size(45, 45);
-            panelBlue.TabIndex = 1;
-            // 
-            // panelWhite
-            // 
-            panelWhite.BackColor = Color.White;
-            panelWhite.Location = new Point(6, 81);
-            panelWhite.Name = "panelWhite";
-            panelWhite.Size = new Size(45, 45);
-            panelWhite.TabIndex = 2;
-            // 
-            // panelGreen
-            // 
-            panelGreen.BackColor = Color.Green;
-            panelGreen.Location = new Point(72, 26);
-            panelGreen.Name = "panelGreen";
-            panelGreen.Size = new Size(45, 45);
-            panelGreen.TabIndex = 1;
-            panelGreen.MouseDown += Panel_MouseDown;
-            // 
-            // panelRed
-            // 
-            panelRed.BackColor = Color.Red;
-            panelRed.Location = new Point(6, 26);
-            panelRed.Name = "panelRed";
-            panelRed.Size = new Size(45, 45);
-            panelRed.TabIndex = 0;
-            panelRed.MouseDown += Panel_MouseDown;
-            // 
-            // checkBoxRadar
-            // 
-            checkBoxRadar.AutoSize = true;
-            checkBoxRadar.Location = new Point(12, 172);
-            checkBoxRadar.Name = "checkBoxRadar";
-            checkBoxRadar.Size = new Size(208, 24);
-            checkBoxRadar.TabIndex = 7;
-            checkBoxRadar.Text = "Признак наличия радара";
-            checkBoxRadar.UseVisualStyleBackColor = true;
-            // 
-            // checkBoxToplivbak
-            // 
-            checkBoxToplivbak.AutoSize = true;
-            checkBoxToplivbak.Location = new Point(14, 126);
-            checkBoxToplivbak.Name = "checkBoxToplivbak";
-            checkBoxToplivbak.Size = new Size(190, 24);
-            checkBoxToplivbak.TabIndex = 6;
-            checkBoxToplivbak.Text = "Признак наличия бака";
-            checkBoxToplivbak.UseVisualStyleBackColor = true;
-            // 
-            // numericUpDownWeght
-            // 
-            numericUpDownWeght.Location = new Point(96, 74);
-            numericUpDownWeght.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
-            numericUpDownWeght.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
-            numericUpDownWeght.Name = "numericUpDownWeght";
-            numericUpDownWeght.Size = new Size(104, 27);
-            numericUpDownWeght.TabIndex = 5;
-            numericUpDownWeght.Value = new decimal(new int[] { 100, 0, 0, 0 });
-            // 
-            // labelWeight
-            // 
-            labelWeight.AutoSize = true;
-            labelWeight.Location = new Point(14, 76);
-            labelWeight.Name = "labelWeight";
-            labelWeight.Size = new Size(36, 20);
-            labelWeight.TabIndex = 4;
-            labelWeight.Text = "Вес:";
-            // 
-            // numericUpDownSpeed
-            // 
-            numericUpDownSpeed.Location = new Point(96, 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(104, 27);
-            numericUpDownSpeed.TabIndex = 3;
-            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
-            // 
-            // labelSpeed
-            // 
-            labelSpeed.AutoSize = true;
-            labelSpeed.Location = new Point(14, 41);
-            labelSpeed.Name = "labelSpeed";
-            labelSpeed.Size = new Size(76, 20);
-            labelSpeed.TabIndex = 2;
-            labelSpeed.Text = "Скорость:";
-            // 
-            // labelModifiedObject
-            // 
-            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
-            labelModifiedObject.Location = new Point(385, 172);
-            labelModifiedObject.Name = "labelModifiedObject";
-            labelModifiedObject.Size = new Size(126, 44);
-            labelModifiedObject.TabIndex = 1;
-            labelModifiedObject.Text = "Продвинутый";
-            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
-            labelModifiedObject.MouseDown += LabelObject_MouseDown;
-            // 
-            // labelSimpleObject
-            // 
-            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
-            labelSimpleObject.Location = new Point(241, 172);
-            labelSimpleObject.Name = "labelSimpleObject";
-            labelSimpleObject.Size = new Size(126, 44);
-            labelSimpleObject.TabIndex = 0;
-            labelSimpleObject.Text = "Простой";
-            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
-            labelSimpleObject.MouseDown += LabelObject_MouseDown;
-            // 
-            // pictureBoxObject
-            // 
-            pictureBoxObject.Location = new Point(14, 57);
-            pictureBoxObject.Name = "pictureBoxObject";
-            pictureBoxObject.Size = new Size(236, 133);
-            pictureBoxObject.TabIndex = 1;
-            pictureBoxObject.TabStop = false;
-            // 
-            // buttonAdd
-            // 
-            buttonAdd.Location = new Point(571, 211);
-            buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(98, 38);
-            buttonAdd.TabIndex = 2;
-            buttonAdd.Text = "Добавить";
-            buttonAdd.UseVisualStyleBackColor = true;
-            buttonAdd.Click += ButtonAdd_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(709, 211);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(98, 38);
-            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(557, 12);
-            panelObject.Name = "panelObject";
-            panelObject.Size = new Size(264, 193);
-            panelObject.TabIndex = 4;
-            panelObject.DragDrop += PanelObject_DragDrop;
-            panelObject.DragEnter += PanelObject_DragEnter;
-            // 
-            // labelAdditionalColor
-            // 
-            labelAdditionalColor.AllowDrop = true;
-            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
-            labelAdditionalColor.Location = new Point(152, 18);
-            labelAdditionalColor.Name = "labelAdditionalColor";
-            labelAdditionalColor.Size = new Size(98, 31);
-            labelAdditionalColor.TabIndex = 3;
-            labelAdditionalColor.Text = "Доп. цвет";
-            labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
-            labelAdditionalColor.DragDrop += LabelAdditionalColor_DragDrop;
-            labelAdditionalColor.DragEnter += LabelAdditionalColor_DragEnter;
-            // 
-            // labelBodyColor
-            // 
-            labelBodyColor.AllowDrop = true;
-            labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
-            labelBodyColor.Location = new Point(14, 18);
-            labelBodyColor.Name = "labelBodyColor";
-            labelBodyColor.Size = new Size(98, 31);
-            labelBodyColor.TabIndex = 2;
-            labelBodyColor.Text = "Цвет";
-            labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
-            labelBodyColor.DragDrop += LabelBodyColor_DragDrop;
-            labelBodyColor.DragEnter += LabelBodyColor_DragEnter;
-            // 
-            // FormPlanConfig
-            // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(835, 253);
-            Controls.Add(panelObject);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonAdd);
-            Controls.Add(groupBoxConfig);
-            Name = "FormPlanConfig";
-            Text = "Создание объекта";
-            groupBoxConfig.ResumeLayout(false);
-            groupBoxConfig.PerformLayout();
-            groupBoxColors.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)numericUpDownWeght).EndInit();
-            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
-            panelObject.ResumeLayout(false);
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private GroupBox groupBoxConfig;
-        private Label labelSimpleObject;
-        private Label labelSpeed;
-        private Label labelModifiedObject;
-        private NumericUpDown numericUpDownWeght;
-        private Label labelWeight;
-        private NumericUpDown numericUpDownSpeed;
-        private CheckBox checkBoxToplivbak;
-        private CheckBox checkBoxRadar;
-        private GroupBox groupBoxColors;
-        private Panel panelRed;
-        private Panel panelYellow;
-        private Panel panelBlue;
-        private Panel panelGreen;
-        private Panel panelPurple;
-        private Panel panelBlack;
-        private Panel panelGray;
-        private Panel panelWhite;
-        private PictureBox pictureBoxObject;
-        private Button buttonAdd;
-        private Button buttonCancel;
-        private Panel panelObject;
-        private Label labelBodyColor;
-        private Label labelAdditionalColor;
-    }
-}

ProjectSportCar/ProjectSportCar/FormPlanConfig.cs

@@ -1,173 +0,0 @@
-using ProjectAiroplane.Drawnings;
-using ProjectAiroplane.Entities;
-
-namespace ProjectAiroplane;
-/// <summary>
-/// Форма конфигурации объекта
-/// </summary>
-public partial class FormPlanConfig : Form
-{
-    /// <summary>
-    /// Объект - прорисовка самолёта
-    /// </summary>
-    private Drawningplane _plane = null;
-
-    private event Action<Drawningplane>? PlaneDelegate;
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    public FormPlanConfig()
-    {
-        InitializeComponent();
-        panelRed.MouseDown += Panel_MouseDown;
-        panelGreen.MouseDown += Panel_MouseDown;
-        panelBlue.MouseDown += Panel_MouseDown;
-        panelYellow.MouseDown += Panel_MouseDown;
-        panelWhite.MouseDown += Panel_MouseDown;
-        panelGray.MouseDown += Panel_MouseDown;
-        panelBlack.MouseDown += Panel_MouseDown;
-        panelPurple.MouseDown += Panel_MouseDown;
-        // TODO buttonCancel.Click привязать анонимный метод через lambda закрытием формы
-        buttonCancel.Click += (sender, e) => Close();
-    }
-
-    /// <summary>
-    /// Привязка внешнего метода к событию вопрос 2..............................................................................
-    /// </summary>
-    public void AddEvent(Action<Drawningplane> planeDelegate)
-    {
-        PlaneDelegate += planeDelegate;
-    }
-
-    private void DrawObject()
-    {
-        Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
-        Graphics gr = Graphics.FromImage(bmp);
-        _plane?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
-        _plane?.SetPosition(5, 5);
-        _plane?.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":
-                _plane = new Drawningplane((int)numericUpDownSpeed.Value, (double)numericUpDownWeght.Value, Color.White);
-                break;
-            case "labelModifiedObject":
-                _plane = new DrawningAiroplane((int)numericUpDownSpeed.Value, (double)numericUpDownWeght.Value, Color.White,
-                    Color.Black, checkBoxToplivbak.Checked, checkBoxRadar.Checked);
-                break;
-        }
-        labelBodyColor.BackColor = Color.Empty;
-        labelAdditionalColor.BackColor = Color.Empty;
-        DrawObject();
-    }
-
-    private void Panel_MouseDown(object sender, MouseEventArgs e)
-    {
-        // TODO отправка цвета в Drag&Drop
-        (sender as Control)?.DoDragDrop((sender as Control)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
-    }
-
-    // TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта)
-    /// <summary>
-    /// Проверка получаемой информации по основному цвету
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void LabelBodyColor_DragEnter(object sender, DragEventArgs e)
-    {
-        if (e.Data.GetDataPresent(typeof(Color)))
-        {
-            e.Effect = DragDropEffects.Copy;
-        }
-        else
-        {
-            e.Effect = DragDropEffects.None;
-        }
-    }
-
-    /// <summary>
-    /// действия при приеме перетаскиваемого основного цвета
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void LabelBodyColor_DragDrop(object sender, DragEventArgs e)
-    {
-        if (_plane != null)
-        {
-            _plane.Entityplane.setBodyColor((Color)e.Data.GetData(typeof(Color)));
-            DrawObject();
-        }
-    }
-
-    /// <summary>
-    /// Передача объекта 
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonAdd_Click(object sender, EventArgs e)// кнопку нажимаем и новый объект передается в форму 2 вопрос............
-    {
-        if (_plane != null)
-        {
-            PlaneDelegate?.Invoke(_plane); //Вызов события, с помощью инвок, 
-            Close();
-        }
-    }
-
-    /// <summary>
-    /// действия при перетаскивании доп. цвета
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e)
-    {
-        if (_plane.Entityplane is EntityAiroplane _airoplaneplane)
-        {
-            _airoplaneplane.setAdditionalColor((Color)e.Data.GetData(typeof(Color)));
-        }
-        DrawObject();
-    }
-
-    private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e)
-    {
-        if (_plane != null && _plane is DrawningAiroplane)
-        {
-            if (e.Data?.GetDataPresent(typeof(Color)) ?? false)
-            {
-                e.Effect = DragDropEffects.Copy;
-            }
-            else
-            {
-                e.Effect = DragDropEffects.None;
-            }
-        }
-    }
-}

ProjectSportCar/ProjectSportCar/FormPlanConfig.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>

ProjectSportCar/ProjectSportCar/FormPlaneCollection.Designer.cs

@@ -29,12 +29,6 @@
         private void InitializeComponent()
         {
             groupBoxTools = new GroupBox();
-            panelCompanyTools = new Panel();
-            buttonAddPlane = new Button();
-            buttonGoToCheck = new Button();
-            buttonDelPlane = new Button();
-            maskedTextBox1 = new MaskedTextBox();
-            buttonReFresh = new Button();
             buttonCreateCompany = new Button();
             panelStorage = new Panel();
             buttonCollectionDel = new Button();
@@ -44,19 +38,19 @@
             radioButtonMassive = new RadioButton();
             textBoxCollectionName = new TextBox();
             labelCollectionName = new Label();
+            buttonReFresh = new Button();
+            buttonGoToCheck = new Button();
+            buttonDelPlane = new Button();
+            maskedTextBox1 = new MaskedTextBox();
+            buttonAddAiroplane = new Button();
+            buttonAddPlane = new Button();
             comboBoxSelectorCompany = new ComboBox();
             pictureBox = new PictureBox();
-            menuStrip1 = new MenuStrip();
-            файлToolStripMenuItem = new ToolStripMenuItem();
-            saveToolStripMenuItem = new ToolStripMenuItem();
-            loadToolStripMenuItem = new ToolStripMenuItem();
-            openFileDialog = new OpenFileDialog();
-            saveFileDialog = new SaveFileDialog();
+            panelCompanyTools = new Panel();
             groupBoxTools.SuspendLayout();
-            panelCompanyTools.SuspendLayout();
             panelStorage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
-            menuStrip1.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
             SuspendLayout();
             // 
             // groupBoxTools
@@ -66,75 +60,13 @@
             groupBoxTools.Controls.Add(panelStorage);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(859, 28);
+            groupBoxTools.Location = new Point(859, 0);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(277, 652);
+            groupBoxTools.Size = new Size(277, 680);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
             // 
-            // panelCompanyTools
-            // 
-            panelCompanyTools.Controls.Add(buttonAddPlane);
-            panelCompanyTools.Controls.Add(buttonGoToCheck);
-            panelCompanyTools.Controls.Add(buttonDelPlane);
-            panelCompanyTools.Controls.Add(maskedTextBox1);
-            panelCompanyTools.Controls.Add(buttonReFresh);
-            panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(9, 380);
-            panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(268, 322);
-            panelCompanyTools.TabIndex = 9;
-            // 
-            // buttonAddPlane
-            // 
-            buttonAddPlane.Location = new Point(7, 14);
-            buttonAddPlane.Name = "buttonAddPlane";
-            buttonAddPlane.Size = new Size(252, 40);
-            buttonAddPlane.TabIndex = 1;
-            buttonAddPlane.Text = "Добавление самолёта";
-            buttonAddPlane.UseVisualStyleBackColor = true;
-            buttonAddPlane.Click += ButtonAddPlane_Click;
-            // 
-            // buttonGoToCheck
-            // 
-            buttonGoToCheck.Location = new Point(4, 168);
-            buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(254, 42);
-            buttonGoToCheck.TabIndex = 5;
-            buttonGoToCheck.Text = "Передать на тест";
-            buttonGoToCheck.UseVisualStyleBackColor = true;
-            buttonGoToCheck.Click += ButtonGoToCheck_Click;
-            // 
-            // buttonDelPlane
-            // 
-            buttonDelPlane.Location = new Point(4, 119);
-            buttonDelPlane.Name = "buttonDelPlane";
-            buttonDelPlane.Size = new Size(254, 43);
-            buttonDelPlane.TabIndex = 4;
-            buttonDelPlane.Text = "Удалить самолёт";
-            buttonDelPlane.UseVisualStyleBackColor = true;
-            buttonDelPlane.Click += ButtonDelPlane_Click;
-            // 
-            // maskedTextBox1
-            // 
-            maskedTextBox1.Location = new Point(7, 74);
-            maskedTextBox1.Mask = "00";
-            maskedTextBox1.Name = "maskedTextBox1";
-            maskedTextBox1.Size = new Size(252, 27);
-            maskedTextBox1.TabIndex = 3;
-            maskedTextBox1.ValidatingType = typeof(int);
-            // 
-            // buttonReFresh
-            // 
-            buttonReFresh.Location = new Point(4, 220);
-            buttonReFresh.Name = "buttonReFresh";
-            buttonReFresh.Size = new Size(252, 40);
-            buttonReFresh.TabIndex = 6;
-            buttonReFresh.Text = "Обновить";
-            buttonReFresh.UseVisualStyleBackColor = true;
-            buttonReFresh.Click += ButtonReFresh_Click;
-            // 
             // buttonCreateCompany
             // 
             buttonCreateCompany.Location = new Point(13, 346);
@@ -227,6 +159,64 @@
             labelCollectionName.TabIndex = 0;
             labelCollectionName.Text = "Название коллекции:";
             // 
+            // buttonReFresh
+            // 
+            buttonReFresh.Location = new Point(7, 237);
+            buttonReFresh.Name = "buttonReFresh";
+            buttonReFresh.Size = new Size(252, 40);
+            buttonReFresh.TabIndex = 6;
+            buttonReFresh.Text = "Обновить";
+            buttonReFresh.UseVisualStyleBackColor = true;
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Location = new Point(7, 189);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(254, 42);
+            buttonGoToCheck.TabIndex = 5;
+            buttonGoToCheck.Text = "Передать на тест";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_Click;
+            // 
+            // buttonDelPlane
+            // 
+            buttonDelPlane.Location = new Point(7, 140);
+            buttonDelPlane.Name = "buttonDelPlane";
+            buttonDelPlane.Size = new Size(254, 43);
+            buttonDelPlane.TabIndex = 4;
+            buttonDelPlane.Text = "Удалить самолёт";
+            buttonDelPlane.UseVisualStyleBackColor = true;
+            buttonDelPlane.Click += ButtonDelPlane_Click;
+            // 
+            // maskedTextBox1
+            // 
+            maskedTextBox1.Location = new Point(7, 107);
+            maskedTextBox1.Mask = "00";
+            maskedTextBox1.Name = "maskedTextBox1";
+            maskedTextBox1.Size = new Size(252, 27);
+            maskedTextBox1.TabIndex = 3;
+            maskedTextBox1.ValidatingType = typeof(int);
+            // 
+            // buttonAddAiroplane
+            // 
+            buttonAddAiroplane.Location = new Point(7, 60);
+            buttonAddAiroplane.Name = "buttonAddAiroplane";
+            buttonAddAiroplane.Size = new Size(252, 41);
+            buttonAddAiroplane.TabIndex = 2;
+            buttonAddAiroplane.Text = "Добавление самолёта с радаром";
+            buttonAddAiroplane.UseVisualStyleBackColor = true;
+            buttonAddAiroplane.Click += ButtonAddAiroplane_Click;
+            // 
+            // buttonAddPlane
+            // 
+            buttonAddPlane.Location = new Point(7, 14);
+            buttonAddPlane.Name = "buttonAddPlane";
+            buttonAddPlane.Size = new Size(252, 40);
+            buttonAddPlane.TabIndex = 1;
+            buttonAddPlane.Text = "Добавление самолёта";
+            buttonAddPlane.UseVisualStyleBackColor = true;
+            buttonAddPlane.Click += ButtonAddPlane_Click;
+            // 
             // comboBoxSelectorCompany
             // 
             comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
@@ -242,52 +232,25 @@
             // pictureBox
             // 
             pictureBox.Dock = DockStyle.Fill;
-            pictureBox.Location = new Point(0, 28);
+            pictureBox.Location = new Point(0, 0);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(859, 652);
+            pictureBox.Size = new Size(859, 680);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             // 
-            // menuStrip1
+            // panelCompanyTools
             // 
-            menuStrip1.ImageScalingSize = new Size(20, 20);
-            menuStrip1.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
-            menuStrip1.Location = new Point(0, 0);
-            menuStrip1.Name = "menuStrip1";
-            menuStrip1.Size = new Size(1136, 28);
-            menuStrip1.TabIndex = 2;
-            menuStrip1.Text = "menuStrip1";
-            // 
-            // файлToolStripMenuItem
-            // 
-            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
-            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
-            файлToolStripMenuItem.Size = new Size(59, 24);
-            файлToolStripMenuItem.Text = "Файл";
-            // 
-            // saveToolStripMenuItem
-            // 
-            saveToolStripMenuItem.Name = "saveToolStripMenuItem";
-            saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
-            saveToolStripMenuItem.Size = new Size(227, 26);
-            saveToolStripMenuItem.Text = "Сохранение";
-            saveToolStripMenuItem.Click += saveToolStripMenuItem_Click_1;
-            // 
-            // loadToolStripMenuItem
-            // 
-            loadToolStripMenuItem.Name = "loadToolStripMenuItem";
-            loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
-            loadToolStripMenuItem.Size = new Size(227, 26);
-            loadToolStripMenuItem.Text = "Загрузка";
-            loadToolStripMenuItem.Click += loadToolStripMenuItem_Click_1;
-            // 
-            // openFileDialog
-            // 
-            openFileDialog.Filter = "txt file | *.txt";
-            // 
-            // saveFileDialog
-            // 
-            saveFileDialog.Filter = "txt file | *.txt";
+            panelCompanyTools.Controls.Add(buttonAddPlane);
+            panelCompanyTools.Controls.Add(buttonAddAiroplane);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Controls.Add(buttonDelPlane);
+            panelCompanyTools.Controls.Add(maskedTextBox1);
+            panelCompanyTools.Controls.Add(buttonReFresh);
+            panelCompanyTools.Enabled = false;
+            panelCompanyTools.Location = new Point(9, 380);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(268, 322);
+            panelCompanyTools.TabIndex = 9;
             // 
             // FormPlaneCollection
             // 
@@ -296,26 +259,23 @@
             ClientSize = new Size(1136, 680);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
-            Controls.Add(menuStrip1);
-            MainMenuStrip = menuStrip1;
             Name = "FormPlaneCollection";
             Text = "Коллекция самолётов";
             groupBoxTools.ResumeLayout(false);
-            panelCompanyTools.ResumeLayout(false);
-            panelCompanyTools.PerformLayout();
             panelStorage.ResumeLayout(false);
             panelStorage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
-            menuStrip1.ResumeLayout(false);
-            menuStrip1.PerformLayout();
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
             ResumeLayout(false);
-            PerformLayout();
         }
 
         #endregion
 
         private GroupBox groupBoxTools;
         private ComboBox comboBoxSelectorCompany;
+        private Button buttonAddAiroplane;
+        private Button buttonAddPlane;
         private PictureBox pictureBox;
         private Button buttonDelPlane;
         private MaskedTextBox maskedTextBox1;
@@ -331,12 +291,5 @@
         private RadioButton radioButtonList;
         private Button buttonCreateCompany;
         private Panel panelCompanyTools;
-        private Button buttonAddPlane;
-        private MenuStrip menuStrip1;
-        private ToolStripMenuItem файлToolStripMenuItem;
-        private ToolStripMenuItem saveToolStripMenuItem;
-        private ToolStripMenuItem loadToolStripMenuItem;
-        private OpenFileDialog openFileDialog;
-        private SaveFileDialog saveFileDialog;
     }
 }

ProjectSportCar/ProjectSportCar/FormPlaneCollection.cs

@@ -32,35 +32,49 @@ public partial class FormPlaneCollection : Form
     ///
     private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
     {
-        panelCompanyTools.Enabled = false;
+       panelCompanyTools.Enabled = false;
     }
     /// <summary>
-    /// Добавление самолёта
+    /// Добавление обычного самолёта
     /// </summary>
     /// <param name="sender"></param>
     /// <param name="e"></param>
-    private void ButtonAddPlane_Click(object sender, EventArgs e)
-    {
-        FormPlanConfig form = new();
-        // TODO передать метод
-
-        form.Show();
-        form.AddEvent(SetPlane);
-
-    }
-
+    private void ButtonAddPlane_Click(object sender, EventArgs e) => CreateObject(nameof(Drawningplane));
     /// <summary>
-    /// Добавление самолёта в коллекцию
+    /// Добавление самолёта с радаром
     /// </summary>
-    /// <param name="excavator"></param>
-    private void SetPlane(Drawningplane? plane)
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddAiroplane_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAiroplane));
+    /// <summary>
+    /// Создание объекта класса-перемещения
+    /// </summary>
+    /// <param name="type">Тип создаваемого объекта</param>
+    private void CreateObject(string type)
     {
-        if (_company == null || plane == null)
+        if (_company == null)
         {
             return;
         }
-
-        if (_company + plane != -1)
+        Random random = new();
+        Drawningplane drawningPlane;
+        switch (type)
+        {
+            case nameof(Drawningplane):
+                drawningPlane = new Drawningplane(random.Next(100, 300),
+                random.Next(1000, 3000), GetColor(random));
+                break;
+            case nameof(DrawningAiroplane):
+                // TODO вызов диалогового окна для выбора цвета
+                drawningPlane = new DrawningAiroplane(random.Next(100, 300), random.Next(1000, 3000),
+                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+                Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+                break;
+            default:
+                return;
+        }
+        if (_company + drawningPlane != -1)
         {
             MessageBox.Show("Объект добавлен");
             pictureBox.Image = _company.Show();
@@ -70,7 +84,21 @@ public partial class FormPlaneCollection : Form
             MessageBox.Show("Не удалось добавить объект");
         }
     }
-
+    /// <summary>
+    /// Получение цвета
+    /// </summary>
+    /// <param name="random">Генератор случайных чисел</param>
+    /// <returns></returns>
+    private static Color GetColor(Random random)
+    {
+        Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+        ColorDialog dialog = new();
+        if (dialog.ShowDialog() == DialogResult.OK)
+        {
+            color = dialog.Color;
+        }
+        return color;
+    }
     /// <summary>
     /// Удаление объекта
     /// </summary>
@@ -238,37 +266,4 @@ public partial class FormPlaneCollection : Form
         RerfreshListBoxItems();
 
     }
-
-    private void saveToolStripMenuItem_Click_1(object sender, EventArgs e)
-    {
-        if (saveFileDialog.ShowDialog() == DialogResult.OK)
-        {
-            if (_storageCollection.SaveData(saveFileDialog.FileName))
-            {
-                MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            }
-            else
-            {
-                MessageBox.Show("Не сохранилось", "Результат",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-    }
-
-    private void loadToolStripMenuItem_Click_1(object sender, EventArgs e)
-    {
-        if (openFileDialog.ShowDialog() == DialogResult.OK)
-        {
-            if (_storageCollection.LoadData(openFileDialog.FileName))
-            {
-                MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                RerfreshListBoxItems();
-            }
-            else
-            {
-                MessageBox.Show("Не загрузилось", "Результат",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-    }
 }

ProjectSportCar/ProjectSportCar/FormPlaneCollection.resx

@@ -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="menuStrip1.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>153, 17</value>
-  </metadata>
-  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>323, 17</value>
-  </metadata>
 </root>