Merge pull request 'Morozov V.S. Lab work 1' (#1) from LabWork1 into master

Reviewed-on: http://student.git.athene.tech/VoldemarProger/Pibd-22_Morozov_V.S_AirplaneWithRadar_Base/pulls/1

AirPlaneWithRadar/AirPlaneWithRadar/AbstractMap.cs

@@ -1,149 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirPlaneWithRadar
-{
-    internal abstract class AbstractMap
-    {
-        private IDrawingObject _drawningObject = null;
-        protected int[,] _map = null;
-        protected int _width;
-        protected int _height;
-        protected float _size_x;
-        protected float _size_y;
-        protected readonly Random _random = new();
-        protected readonly int _freeRoad = 0;
-        protected readonly int _barrier = 1;
-
-        public Bitmap CreateMap(int width, int height, IDrawingObject drawningObject)
-        {
-            _width = width;
-            _height = height;
-            _drawningObject = drawningObject;
-            GenerateMap();
-            while (!SetObjectOnMap())
-            {
-                GenerateMap();
-            }
-            return DrawMapWithObject();
-        }
-        public Bitmap MoveObject(Direction direction)
-        {
-
-            switch (direction)
-            {
-                case Direction.Up:
-                    for (int i = 0; i < _map.GetLength(0); i++)
-                    {
-                        for (int j = 0; j < _map.GetLength(1); j++)
-                        {
-                            if (_map[i, j] == _barrier && ((_drawningObject.GetCurrentPosition().Left < i * _size_x && _drawningObject.GetCurrentPosition().Top > i * _size_x) ||
-                                (_drawningObject.GetCurrentPosition().Left < i * (_size_x + 1) && _drawningObject.GetCurrentPosition().Top > i * (_size_x + 1))) &&
-                                j * (_size_y + 1) < _drawningObject.GetCurrentPosition().Right && _drawningObject.GetCurrentPosition().Right - j * (_size_y + 1) <= _drawningObject.Step)
-                                return DrawMapWithObject();
-
-                        }
-                    }
-                    break;
-                case Direction.Down:
-                    for (int i = 0; i < _map.GetLength(0); i++)
-                    {
-                        for (int j = 0; j < _map.GetLength(1); j++)
-                        {
-                            if (_map[i, j] == _barrier && ((_drawningObject.GetCurrentPosition().Left < i * _size_x && _drawningObject.GetCurrentPosition().Top > i * _size_x) ||
-                                (_drawningObject.GetCurrentPosition().Left < i * (_size_x + 1) && _drawningObject.GetCurrentPosition().Top > i * (_size_x + 1))) &&
-                                j * _size_y > _drawningObject.GetCurrentPosition().Bottom && j * _size_y - _drawningObject.GetCurrentPosition().Bottom <= _drawningObject.Step)
-                                return DrawMapWithObject();
-
-                        }
-                    }
-                    break;
-                case Direction.Left:
-                    for (int i = 0; i < _map.GetLength(0); i++)
-                    {
-                        for (int j = 0; j < _map.GetLength(1); j++)
-                        {
-                            if (_map[i, j] == _barrier && ((_drawningObject.GetCurrentPosition().Right < j * _size_y && _drawningObject.GetCurrentPosition().Bottom > j * _size_y) ||
-                                (_drawningObject.GetCurrentPosition().Right < j * (_size_y + 1) && _drawningObject.GetCurrentPosition().Bottom > j * (_size_y + 1))) &&
-                                i * (_size_x + 1) < _drawningObject.GetCurrentPosition().Left && _drawningObject.GetCurrentPosition().Left - i * (_size_x + 1) <= _drawningObject.Step)
-                                return DrawMapWithObject();
-
-                        }
-                    }
-                    break;
-                case Direction.Right:
-                    for (int i = 0; i < _map.GetLength(0); i++)
-                    {
-                        for (int j = 0; j < _map.GetLength(1); j++)
-                        {
-                            if (_map[i, j] == _barrier && ((_drawningObject.GetCurrentPosition().Right < j * _size_y && _drawningObject.GetCurrentPosition().Bottom > j * _size_y) ||
-                                (_drawningObject.GetCurrentPosition().Right < j * (_size_y + 1) && _drawningObject.GetCurrentPosition().Bottom > j * (_size_y + 1))) &&
-                                i * (_size_x) > _drawningObject.GetCurrentPosition().Top && i * (_size_x) - _drawningObject.GetCurrentPosition().Top <= _drawningObject.Step)
-                                return DrawMapWithObject();
-
-                        }
-                    }
-                    break;
-            }
-            _drawningObject.MoveObject(direction);
-            return DrawMapWithObject();
-
-
-        }
-        private bool SetObjectOnMap()
-        {
-            if (_drawningObject == null || _map == null)
-            {
-                return false;
-            }
-            int x = _random.Next(0, 10);
-            int y = _random.Next(0, 10);
-            _drawningObject.SetObject(x, y, _width, _height);
-            if (_drawningObject is DrawingObjectPlane)
-            {
-                for (int i = 0; i < _map.GetLength(0); i++)
-                {
-                    for (int j = 0; j < _map.GetLength(1); j++)
-                    {
-                        if (_map[i, j] == _barrier && _drawningObject.GetCurrentPosition().Left < i * _size_x && _drawningObject.GetCurrentPosition().Right < j * _size_y && _drawningObject.GetCurrentPosition().Top > i * _size_x && _drawningObject.GetCurrentPosition().Bottom > j * _size_y)
-                            return false;
-                    }
-                }
-            }
-
-            return true;
-        }
-        private Bitmap DrawMapWithObject()
-        {
-            Bitmap bmp = new(_width, _height);
-            if (_drawningObject == null || _map == null)
-            {
-                return bmp;
-            }
-            Graphics gr = Graphics.FromImage(bmp);
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    if (_map[i, j] == _freeRoad)
-                    {
-                        DrawRoadPart(gr, i, j);
-                    }
-                    else if (_map[i, j] == _barrier)
-                    {
-                        DrawBarrierPart(gr, i, j);
-                    }
-                }
-            }
-            _drawningObject.DrawningObject(gr);
-            return bmp;
-        }
-
-        protected abstract void GenerateMap();
-        protected abstract void DrawRoadPart(Graphics g, int i, int j);
-        protected abstract void DrawBarrierPart(Graphics g, int i, int j);
-    }
-}

AirPlaneWithRadar/AirPlaneWithRadar/Direction.cs

@@ -6,9 +6,8 @@ using System.Threading.Tasks;
 
 namespace AirPlaneWithRadar
 {
-    public enum Direction
+    internal enum Direction
     {
-        None =0,
         Up =1,
         Down =2,
         Left = 3,

AirPlaneWithRadar/AirPlaneWithRadar/DrawingObjectPlane.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirPlaneWithRadar
-{
-    internal class DrawingObjectPlane : IDrawingObject
-    {
-        private DrawingPlain _plain;
-
-        public DrawingObjectPlane(DrawingPlain plain)
-        {
-            _plain = plain;
-        }
-        public float Step => _plain?.Plain?.Step ?? 0;
-
-
-        public void DrawningObject(Graphics g)
-        {
-            _plain?.DrawTransoprt(g);
-        }
-
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return _plain?.GetCurrentPosition() ?? default;
-        }
-
-        public void MoveObject(Direction direction)
-        {
-            _plain?.MoveTransport(direction);
-        }
-
-        public void SetObject(int x, int y, int width, int height)
-        {
-           _plain.setPosition(x, y, width, height);
-        }
-    }
-}

AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs

@@ -7,26 +7,20 @@ using System.Threading.Tasks;
 
 namespace AirPlaneWithRadar
 {
-    public class DrawingPlain
+    internal class DrawingPlain
     {
-        public EntetyPlain Plain { get; protected set; }
-        protected float startPosX;
-        protected float startPosY;
+        public EntetyPlain Plain { get; private set; }
+        private float startPosX;
+        private float startPosY;
         private int? pictureWidth = null;
         private int? pictureHeight = null;
         protected readonly int plainWidth = 120;
-        protected readonly int plainHeight = 60;
-        public DrawingPlain(int speed, float weight, Color bodycolor)
+        protected readonly int plainHeight =70;
+        public void Init (int speed, float weight, Color bodycolor)
         {
-            Plain = new EntetyPlain(speed, weight, bodycolor);
+            Plain = new EntetyPlain ();
+            Plain.Init (speed, weight, bodycolor);
         }
-       protected DrawingPlain(int speed, float weight,Color bodyColor,int plainWidth,int plainHeight):
-            this(speed,weight, bodyColor)
-        {
-            this.plainWidth = plainWidth;
-            this.plainHeight = plainHeight;
-        }
-       
         public void setPosition(int x,int y,int width,int height)
         {
             if (x + plainWidth > width || y + plainHeight > height || plainHeight > height || plainWidth > width || x <0 || y<0)
@@ -64,7 +58,7 @@ namespace AirPlaneWithRadar
                     break;
             }
         }
-        public virtual void DrawTransoprt (Graphics g)
+        public void DrawTransoprt (Graphics g)
         {
             if(startPosX < 0 || startPosY < 0 || !pictureHeight.HasValue || !pictureWidth.HasValue)
             {
@@ -72,37 +66,27 @@ namespace AirPlaneWithRadar
             }
 
             Pen pen = new Pen(Color.Black);
-            
-
+          
             g.DrawRectangle(pen, startPosX, startPosY, 20, 30);
             g.DrawRectangle(pen, startPosX, startPosY + 30, 100, 30);
             g.DrawRectangle(pen, startPosX+100, startPosY + 40, 20, 15);
-            //koleso1
+            
             g.DrawRectangle(pen, startPosX + 30, startPosY + 60, 5, 10);
             g.DrawEllipse(pen, startPosX+28, startPosY+70, 9, 9);
-            //koleso2
+
             g.DrawRectangle(pen, startPosX + 80, startPosY + 60, 5, 10);
             g.DrawEllipse(pen, startPosX + 78, startPosY + 70, 9, 9);
 
-            
-            //Korpys
+           
             Brush br = new SolidBrush(Plain?.BodyColor ?? Color.Black);
             g.FillRectangle(br, startPosX+3, startPosY + 33, 94, 24);
             g.FillRectangle(br, startPosX+1, startPosY+1, 19, 29);
             
-
-            //krilya
             Brush brWings = new SolidBrush(Color.Black);
             g.FillRectangle(brWings, startPosX + 30, startPosY + 40, 40, 8);
-           
             
-            //cabina
             Brush brCabine = new SolidBrush(Color.Blue);
             g.FillRectangle(brCabine, startPosX + 101, startPosY + 41, 19, 14);
-           
-
-
-
 
         }
         public void ChangeBorders(int width, int height)
@@ -121,9 +105,5 @@ namespace AirPlaneWithRadar
             if(startPosY + plainHeight > pictureHeight)
                 startPosY = pictureHeight.Value - plainHeight;
         }
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return (startPosX, startPosY, startPosX + plainWidth, startPosY + plainHeight);
-        }
     }
 }

AirPlaneWithRadar/AirPlaneWithRadar/DrawingRadarPlane.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
-
-namespace AirPlaneWithRadar
-{
-    internal class DrawingRadarPlane : DrawingPlain
-    {
-        public DrawingRadarPlane(int speed, float weight, Color bodyColor,Color dopColor, bool radar, bool oilBox) : base(speed, weight, bodyColor, 110, 60)
-        {
-            Plain = new RadioPlane(speed, weight, bodyColor, dopColor, radar, oilBox);
-        }
-        public override void DrawTransoprt(Graphics g)
-        {
-            if(Plain is not RadioPlane radioPlane)
-            {
-                return;
-            }
-            Pen pen = new(Color.Black);
-            Brush doBrush = new SolidBrush(radioPlane.DopColor);
-            base.DrawTransoprt(g);
-            if (radioPlane.OilBox)
-            {
-                g.DrawRectangle(pen, startPosX + 40, startPosY + 48, 20, 10);
-                g.FillRectangle(doBrush, startPosX + 40, startPosY + 48, 20, 10);
-
-                g.DrawRectangle(pen, startPosX , startPosY+15, 30, 10);
-                g.FillRectangle(doBrush, startPosX, startPosY + 15, 30, 10);
-            }
-            if (radioPlane.Radar)
-            {
-                g.FillRectangle(doBrush, startPosX + 55, startPosY + 20, 10, 10);
-                g.FillEllipse(doBrush, startPosX + 40, startPosY + 13, 40, 10);
-            }
-            
-        }
-    }
-}

AirPlaneWithRadar/AirPlaneWithRadar/EntetyPlain.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace AirPlaneWithRadar
 {
-    public class EntetyPlain
+    internal class EntetyPlain
 
     {
         public int Speed { get;private set; }
@@ -14,14 +14,13 @@ namespace AirPlaneWithRadar
         public Color BodyColor { get; private set; }
         public float Step => Speed * 100 / Weight;
 
-        public EntetyPlain(int speed, float weight, Color bodyColor)
+        public void Init (int speed, float weight, Color bodycolor)
         {
             Random rd = new Random();
-            Speed = speed <= 0 ? rd.Next(50, 150) : speed;
-            Weight = weight <= 0 ? rd.Next(40, 70) : weight;
-            BodyColor = bodyColor;
-        }
 
-        
+            Speed = speed <= 0 ? rd.Next(50,150):speed;
+            Weight = weight <= 0 ? rd.Next(40, 70) :weight;
+            BodyColor = bodycolor;
+        }
     }
 }

AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.Designer.cs

@@ -1,216 +0,0 @@
-namespace AirPlaneWithRadar
-{
-    partial class FormMapWithSetPlains
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.groupBoxTools = new System.Windows.Forms.GroupBox();
-            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
-            this.buttonRemovePlain = new System.Windows.Forms.Button();
-            this.buttonShowStorage = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonShowOnMap = new System.Windows.Forms.Button();
-            this.buttonAddPlain = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            this.pictureBox = new System.Windows.Forms.PictureBox();
-            this.groupBoxTools.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // groupBoxTools
-            // 
-            this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
-            this.groupBoxTools.Controls.Add(this.buttonRemovePlain);
-            this.groupBoxTools.Controls.Add(this.buttonShowStorage);
-            this.groupBoxTools.Controls.Add(this.buttonDown);
-            this.groupBoxTools.Controls.Add(this.buttonRight);
-            this.groupBoxTools.Controls.Add(this.buttonLeft);
-            this.groupBoxTools.Controls.Add(this.buttonUp);
-            this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
-            this.groupBoxTools.Controls.Add(this.buttonAddPlain);
-            this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
-            this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(1057, 0);
-            this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Size = new System.Drawing.Size(204, 668);
-            this.groupBoxTools.TabIndex = 0;
-            this.groupBoxTools.TabStop = false;
-            this.groupBoxTools.Text = "Инструменты";
-            // 
-            // maskedTextBoxPosition
-            // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(17, 166);
-            this.maskedTextBoxPosition.Mask = "00";
-            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            this.maskedTextBoxPosition.Size = new System.Drawing.Size(175, 27);
-            this.maskedTextBoxPosition.TabIndex = 2;
-            this.maskedTextBoxPosition.ValidatingType = typeof(int);
-            // 
-            // buttonRemovePlain
-            // 
-            this.buttonRemovePlain.Location = new System.Drawing.Point(17, 195);
-            this.buttonRemovePlain.Name = "buttonRemovePlain";
-            this.buttonRemovePlain.Size = new System.Drawing.Size(175, 35);
-            this.buttonRemovePlain.TabIndex = 3;
-            this.buttonRemovePlain.Text = "Удалить самолет";
-            this.buttonRemovePlain.UseVisualStyleBackColor = true;
-            this.buttonRemovePlain.Click += new System.EventHandler(this.ButtonRemovePlain_Click);
-            // 
-            // buttonShowStorage
-            // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(17, 287);
-            this.buttonShowStorage.Name = "buttonShowStorage";
-            this.buttonShowStorage.Size = new System.Drawing.Size(175, 35);
-            this.buttonShowStorage.TabIndex = 4;
-            this.buttonShowStorage.Text = "Посмотреть хранилище";
-            this.buttonShowStorage.UseVisualStyleBackColor = true;
-            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
-            // 
-            // buttonDown
-            // 
-            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonDown.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.down;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(91, 618);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 30);
-            this.buttonDown.TabIndex = 10;
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonRight
-            // 
-            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonRight.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.right;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(127, 618);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 30);
-            this.buttonRight.TabIndex = 9;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonLeft
-            // 
-            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonLeft.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.left;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(55, 618);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
-            this.buttonLeft.TabIndex = 8;
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonUp
-            // 
-            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonUp.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.up;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(91, 582);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 30);
-            this.buttonUp.TabIndex = 7;
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonShowOnMap
-            // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(17, 391);
-            this.buttonShowOnMap.Name = "buttonShowOnMap";
-            this.buttonShowOnMap.Size = new System.Drawing.Size(175, 35);
-            this.buttonShowOnMap.TabIndex = 5;
-            this.buttonShowOnMap.Text = "Посмотреть карту";
-            this.buttonShowOnMap.UseVisualStyleBackColor = true;
-            this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
-            // 
-            // buttonAddPlain
-            // 
-            this.buttonAddPlain.Location = new System.Drawing.Point(17, 106);
-            this.buttonAddPlain.Name = "buttonAddPlain";
-            this.buttonAddPlain.Size = new System.Drawing.Size(175, 35);
-            this.buttonAddPlain.TabIndex = 1;
-            this.buttonAddPlain.Text = "Добавить самолет";
-            this.buttonAddPlain.UseVisualStyleBackColor = true;
-            this.buttonAddPlain.Click += new System.EventHandler(this.ButtonAddPlain_Click);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Пользовательская карта №1",
-            "Пользовательская карта №2"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(17, 32);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 28);
-            this.comboBoxSelectorMap.TabIndex = 0;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // pictureBox
-            // 
-            this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(1057, 668);
-            this.pictureBox.TabIndex = 1;
-            this.pictureBox.TabStop = false;
-            // 
-            // FormMapWithSetPlains
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1261, 668);
-            this.Controls.Add(this.pictureBox);
-            this.Controls.Add(this.groupBoxTools);
-            this.Name = "FormMapWithSetPlains";
-            this.Text = "Карта с набором объектов";
-            this.groupBoxTools.ResumeLayout(false);
-            this.groupBoxTools.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-            this.ResumeLayout(false);
-        }
-
-        #endregion
-        private GroupBox groupBoxTools;
-        private PictureBox pictureBox;
-        private ComboBox comboBoxSelectorMap;
-        private Button buttonShowOnMap;
-        private Button buttonAddPlain;
-        private Button buttonDown;
-        private Button buttonRight;
-        private Button buttonLeft;
-        private Button buttonUp;
-        private Button buttonShowStorage;
-        private Button buttonRemovePlain;
-        private MaskedTextBox maskedTextBoxPosition;
-    }
-}

AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs

@@ -1,135 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace AirPlaneWithRadar
-{
-    public partial class FormMapWithSetPlains : Form
-    {
-        private MapWithSetPlainGeneric<DrawingObjectPlane, AbstractMap> _mapPlainsCollectionGeneric;
-        public FormMapWithSetPlains()
-        {
-            InitializeComponent();
-        }
-
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            AbstractMap map = null;
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Простая карта":
-                    map = new SimpleMap();
-                    break;
-                case "Пользовательская карта №1":
-                    map = new UserMap_BigBox();
-                    break;
-                case "Пользовательская карта №2":
-                    map = new UserMap_Colums();
-                    break;
-            }
-            if (map != null)
-            {
-                _mapPlainsCollectionGeneric = new MapWithSetPlainGeneric<DrawingObjectPlane, AbstractMap>(
-                    pictureBox.Width, pictureBox.Height, map);
-            }
-            else
-            {
-                _mapPlainsCollectionGeneric = null;
-            }
-        }
-        private void ButtonAddPlain_Click(object sender, EventArgs e)
-        {
-
-            if (_mapPlainsCollectionGeneric == null)
-            {
-                return;
-            }
-
-            FormPlain form = new();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                DrawingObjectPlane plain = new(form.SelectedPlain);
-
-                if ((_mapPlainsCollectionGeneric + plain) >= 0)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapPlainsCollectionGeneric.ShowSet();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            }
-        }
-        private void ButtonRemovePlain_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
-            {
-                return;
-            }
-            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if ((_mapPlainsCollectionGeneric - (pos - 1)) != null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapPlainsCollectionGeneric.ShowSet();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-        }
-        private void ButtonShowStorage_Click(object sender, EventArgs e)
-        {
-            if (_mapPlainsCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox.Image = _mapPlainsCollectionGeneric.ShowSet();
-        }
-        private void ButtonShowOnMap_Click(object sender, EventArgs e)
-        {
-            if (_mapPlainsCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox.Image = _mapPlainsCollectionGeneric.ShowOnMap();
-        }
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            if (_mapPlainsCollectionGeneric == null)
-            {
-                return;
-            }
-
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            Direction dir = Direction.None;
-            switch (name)
-            {
-                case "buttonUp":
-                    dir = Direction.Up;
-                    break;
-                case "buttonDown":
-                    dir = Direction.Down;
-                    break;
-                case "buttonLeft":
-                    dir = Direction.Left;
-                    break;
-                case "buttonRight":
-                    dir = Direction.Right;
-                    break;
-            }
-            pictureBox.Image = _mapPlainsCollectionGeneric.MoveObject(dir);
-        }
-
-    }
-}

AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.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>

AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.Designer.cs

@@ -38,8 +38,6 @@
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.ButtonCreate = new System.Windows.Forms.Button();
-            this.buttonCreateModif = new System.Windows.Forms.Button();
-            this.buttonSelect = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlain)).BeginInit();
             this.statusStrip.SuspendLayout();
             this.SuspendLayout();
@@ -90,7 +88,7 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.up;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(452, 222);
+            this.buttonUp.Location = new System.Drawing.Point(383, 223);
             this.buttonUp.Name = "buttonUp";
             this.buttonUp.Size = new System.Drawing.Size(30, 30);
             this.buttonUp.TabIndex = 3;
@@ -103,7 +101,7 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.left;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(416, 258);
+            this.buttonLeft.Location = new System.Drawing.Point(347, 259);
             this.buttonLeft.Name = "buttonLeft";
             this.buttonLeft.Size = new System.Drawing.Size(30, 30);
             this.buttonLeft.TabIndex = 4;
@@ -116,7 +114,7 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.down;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(452, 258);
+            this.buttonDown.Location = new System.Drawing.Point(383, 259);
             this.buttonDown.Name = "buttonDown";
             this.buttonDown.Size = new System.Drawing.Size(30, 30);
             this.buttonDown.TabIndex = 5;
@@ -129,7 +127,7 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::AirPlaneWithRadar.Properties.Resources.right;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(488, 258);
+            this.buttonRight.Location = new System.Drawing.Point(419, 259);
             this.buttonRight.Name = "buttonRight";
             this.buttonRight.Size = new System.Drawing.Size(30, 30);
             this.buttonRight.TabIndex = 6;
@@ -148,33 +146,11 @@
             this.ButtonCreate.UseVisualStyleBackColor = true;
             this.ButtonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
             // 
-            // buttonCreateModif
-            // 
-            this.buttonCreateModif.Location = new System.Drawing.Point(125, 259);
-            this.buttonCreateModif.Name = "buttonCreateModif";
-            this.buttonCreateModif.Size = new System.Drawing.Size(134, 29);
-            this.buttonCreateModif.TabIndex = 8;
-            this.buttonCreateModif.Text = "Модификация";
-            this.buttonCreateModif.UseVisualStyleBackColor = true;
-            this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click);
-            // 
-            // buttonSelect
-            // 
-            this.buttonSelect.Location = new System.Drawing.Point(275, 260);
-            this.buttonSelect.Name = "buttonSelect";
-            this.buttonSelect.Size = new System.Drawing.Size(94, 29);
-            this.buttonSelect.TabIndex = 9;
-            this.buttonSelect.Text = "Выбрать";
-            this.buttonSelect.UseVisualStyleBackColor = true;
-            this.buttonSelect.Click += new System.EventHandler(this.buttonSelect_Click);
-            // 
             // FormPlain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(535, 318);
-            this.Controls.Add(this.buttonSelect);
-            this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.ButtonCreate);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonDown);
@@ -204,7 +180,5 @@
         private Button buttonRight;
         public ToolStripStatusLabel toolStripStatusLabelSpeed;
         private Button ButtonCreate;
-        private Button buttonCreateModif;
-        private Button buttonSelect;
     }
 }

AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs

@@ -4,13 +4,13 @@ namespace AirPlaneWithRadar
     public partial class FormPlain : Form
     {
         private DrawingPlain _plain;
-        public DrawingPlain SelectedPlain { get; private set; }
+        
         public FormPlain()
         {
             InitializeComponent();
-
+           
         }
-
+        
         private void Draw()
         {
             Bitmap bmp = new(pictureBoxPlain.Width, pictureBoxPlain.Height);
@@ -18,25 +18,17 @@ namespace AirPlaneWithRadar
             _plain?.DrawTransoprt(gr);
             pictureBoxPlain.Image = bmp;
         }
-        private void SetData()
+
+        private void ButtonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
+            _plain = new DrawingPlain();
+            
+            _plain.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
             _plain.setPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxPlain.Width, pictureBoxPlain.Height);
             toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_plain.Plain.Speed}";
             toolStripStatusLabelWeight.Text = $"Âåñ: {_plain.Plain.Weight}";
             toolStripStatusLabelColor.Text = $"Öâåò: {_plain.Plain.BodyColor.Name}";
-        }
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            _plain = new DrawingPlain(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
-            SetData();
             Draw();
         }
         private void ButtonMove_Click(object sender, EventArgs e)
@@ -66,34 +58,7 @@ namespace AirPlaneWithRadar
             Draw();
         }
 
-        private void buttonCreateModif_Click(object sender, EventArgs e)
-        {
-
-            Random rnd = new();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-            ColorDialog dialogDop = new();
-            if (dialogDop.ShowDialog() == DialogResult.OK)
-            {
-                dopColor = dialogDop.Color;
-            }
-            _plain = new DrawingRadarPlane(rnd.Next(100, 300), rnd.Next(1000, 2000),
-                color,
-                dopColor,
-               Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
-            SetData();
-            Draw();
-        }
-        private void buttonSelect_Click(object sender, EventArgs e)
-        {
-            SelectedPlain = _plain;
-            DialogResult = DialogResult.OK;
-        }
+        
     }
   }
 

AirPlaneWithRadar/AirPlaneWithRadar/IDrawingObject.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirPlaneWithRadar
-{
-    internal interface IDrawingObject
-    {
-        public float Step { get; }
-        void SetObject(int x, int y, int width, int height);
-        void MoveObject(Direction direction);
-
-        void DrawningObject(Graphics g);
-      
-        (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
-    }
-}

AirPlaneWithRadar/AirPlaneWithRadar/MapWithSetPlainGeneric.cs

@@ -1,159 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirPlaneWithRadar
-{
-    internal class MapWithSetPlainGeneric
-    <T, U>
-        where T : class, IDrawingObject
-        where U : AbstractMap
-    {
-        private readonly int _pictureWidth;
-
-        private readonly int _pictureHeight;
-
-        private readonly int _placeSizeWidth = 180;
-
-        private readonly int _placeSizeHeight = 120;
-
-        private readonly SetPlaneGeneric<T> _setPlains;
-
-        private readonly U _map;
-
-        public MapWithSetPlainGeneric(int picWidth, int picHeight, U map)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _setPlains = new SetPlaneGeneric<T>(width * height);
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-            _map = map;
-        }
-
-        public static int operator +(MapWithSetPlainGeneric<T, U> map, T plain)
-        {
-            return map._setPlains.Insert(plain);
-        }
-
-        public static T operator -(MapWithSetPlainGeneric<T, U> map, int position)
-        {
-            return map._setPlains.Remove(position);
-        }
-
-        public Bitmap ShowSet()
-        {
-            Bitmap bmp = new(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawPlains(gr);
-            return bmp;
-        }
-
-        public Bitmap ShowOnMap()
-        {
-            Shaking();
-            for (int i = 0; i < _setPlains.Count; i++)
-            {
-                var plain = _setPlains.Get(i);
-                if (plain != null)
-                {
-                    return _map.CreateMap(_pictureWidth, _pictureHeight, plain);
-                }
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-
-        public Bitmap MoveObject(Direction direction)
-        {
-            if (_map != null)
-            {
-                return _map.MoveObject(direction);
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-
-        private void Shaking()
-        {
-            int j = _setPlains.Count - 1;
-            for (int i = 0; i < _setPlains.Count; i++)
-            {
-                if (_setPlains.Get(i) == null)
-                {
-                    for (; j > i; j--)
-                    {
-                        var plain = _setPlains.Get(j);
-                        if (plain != null)
-                        {
-                            _setPlains.Insert(plain, i);
-                            _setPlains.Remove(j);
-                            break;
-                        }
-                    }
-                    if (j <= i)
-                    {
-                        return;
-                    }
-                }
-            }
-        }
-
-        private void DrawBackground(Graphics g)
-        {
-            Brush BrushRazmetka = new SolidBrush(Color.DarkGray);
-            g.FillRectangle(BrushRazmetka, 0, 0, _pictureWidth, _pictureHeight);
-            Pen pen = new(Color.White, 5);
-            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
-            {
-                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
-                {
-
-                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
-                }
-                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
-            }
-        }
-        private void DrawPlains(Graphics g)
-        {
-            int CountWidth = _pictureWidth / _placeSizeWidth;
-
-            int x = _pictureWidth - _placeSizeWidth - _placeSizeWidth / 2 - _placeSizeWidth / 4;
-            int y = _placeSizeHeight / 4;
-
-            for (int k = 0; k < _setPlains.Count; k++)
-            {
-                if (_setPlains.Get(k) != null)
-                {
-                    if ((k + 1) % CountWidth != 0 || k == 0)
-                    {
-                        _setPlains.Get(k)?.SetObject(x, y, _pictureWidth, _pictureHeight);
-                        _setPlains.Get(k)?.DrawningObject(g);
-                        x -= _placeSizeWidth;
-                    }
-                    else
-                    {
-
-                        _setPlains.Get(k)?.SetObject(x, y, _pictureWidth, _pictureHeight);
-                        _setPlains.Get(k)?.DrawningObject(g);
-                        x = _pictureWidth - _placeSizeWidth - _placeSizeWidth / 2 - _placeSizeWidth / 4;
-                        y += _placeSizeHeight;
-
-                    }
-                }
-                if (_setPlains.Get(k) == null)
-                {
-                    if ((k + 1) % CountWidth != 0 || k == 0)
-                        x -= _placeSizeWidth;
-                    else
-                    {
-                        x = _pictureWidth - _placeSizeWidth - _placeSizeWidth / 2 - _placeSizeWidth / 4;
-                        y += _placeSizeHeight;
-                    }
-                }
-            }
-
-        }
-    }
-}

AirPlaneWithRadar/AirPlaneWithRadar/Program.cs

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

AirPlaneWithRadar/AirPlaneWithRadar/RadioPlane.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirPlaneWithRadar
-{
-    internal class RadioPlane : EntetyPlain
-    {
-        public Color DopColor { get; set; }
-        public bool Radar { get; set; }
-        public bool OilBox { get; set; }
-        public RadioPlane(int speed, float weight, Color bodyColor, Color dopColor, bool radar, bool oilBox) : base(speed, weight, bodyColor)
-        {
-            DopColor = dopColor;
-            Radar = radar;
-            OilBox = oilBox;
-        }
-    }
-}

AirPlaneWithRadar/AirPlaneWithRadar/SetPlaneGeneric.cs

@@ -1,83 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirPlaneWithRadar
-{
-    internal class SetPlaneGeneric<T>
-     where T : class
-
-    {
-        private readonly T[] _places;
-        public int Count => _places.Length;
-        public SetPlaneGeneric(int count)
-        {
-            _places = new T[count];
-        }
-        public int Insert(T plain)
-        {
-            int i;
-            for (i = 0; i < Count; i++)
-            {
-                if (_places[i] == null)
-                {
-                    for (int j = i; j >= 1; j--)
-                    {
-                        _places[j] = _places[j - 1];
-                    }
-                    _places[0] = plain;
-                    return i;
-                }
-            }
-
-            return -1;
-        }
-        public int Insert(T plain, int position)
-        {
-            if (position > Count || position < 0)
-                return -1;
-            if (_places[position] == null)
-            {
-                _places[position] = plain;
-                return position;
-            }
-            else
-            {
-                for (int i = position; i < Count; i++)
-                {
-                    if (_places[i] == null)
-                    {
-                        for (int j = i; j >= position + 1; j--)
-                        {
-                            _places[j] = _places[j - 1];
-                        }
-                        _places[position] = plain;
-                        return position;
-                    }
-                }
-            }
-            return -1;
-
-        }
-        public T Remove(int position)
-        {
-            T mid;
-            if (_places[position] != null && position < _places.Length)
-            {
-                mid = _places[position];
-                _places[position] = null;
-                return mid;
-
-            }
-            else
-                return null;
-        }
-        public T Get(int position)
-        {
-            return _places[position];
-        }
-
-    }
-}

AirPlaneWithRadar/AirPlaneWithRadar/SimpleMap.cs

@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirPlaneWithRadar
-{
-    internal class SimpleMap : AbstractMap
-    {
-        Brush barrierColor = new SolidBrush(Color.DarkGray);
-        Brush roadColor = new SolidBrush(Color.Blue);
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-           g.FillRectangle(barrierColor,i*_size_x,j*_size_y,i*(_size_x+1),j*(_size_y+1));
-        }
-
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-        }
-
-        protected override void GenerateMap()
-        {
-            _map = new int[100, 100];
-            _size_x = (float)_width / _map.GetLength(0);
-            _size_y = (float)_height / _map.GetLength(1);
-            int counter = 0;
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            }
-            while (counter < 50)
-            {
-                int x = _random.Next(0, 100);
-                int y = _random.Next(0, 100);
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-                    counter++;
-                }
-            }
-        }
-    }
-}

AirPlaneWithRadar/AirPlaneWithRadar/UserMap_BigBox.cs

@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirPlaneWithRadar
-{
-    internal class UserMap_BigBox : AbstractMap
-    {
-        Brush barrierColor = new SolidBrush(Color.DarkGray);
-        Brush roadColor = new SolidBrush(Color.Aqua);
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-        }
-
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-        }
-
-        protected override void GenerateMap()
-        {
-            _map = new int[100, 100];
-            _size_x = (float)_width / _map.GetLength(0);
-            _size_y = (float)_height / _map.GetLength(1);
-            int sizeKub = 5;
-            int counter = 0;
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            } while (counter < 10)
-            {
-                Random rand = new Random();
-                int i = rand.Next(0, 100);
-                int j = rand.Next(0, 100);
-                if (i > _map.GetLength(0) - sizeKub || j > _map.GetLength(0) - sizeKub)
-                    continue;
-                for (int iKub = i; iKub < i + sizeKub; iKub++)
-                {
-                    for (int jKub = j; jKub < j + sizeKub; jKub++)
-                    {
-                        _map[iKub, jKub] = _barrier;
-                    }
-                }
-                counter++;
-            }
-
-        }
-    }
-}

AirPlaneWithRadar/AirPlaneWithRadar/UserMap_Colums.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirPlaneWithRadar
-{
-    internal class UserMap_Colums : AbstractMap
-    {
-        Brush barrierColor = new SolidBrush(Color.DarkGray);
-        Brush roadColor = new SolidBrush(Color.Aqua);
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-        }
-
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-        }
-
-        protected override void GenerateMap()
-        {
-            _map = new int[100, 100];
-            _size_x = (float)_width / _map.GetLength(0);
-            _size_y = (float)_height / _map.GetLength(1);
-            int sizeHole = 30;
-            int counter = 0;
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            } while (counter < 3)
-            {
-                Random rand = new Random();
-                int iWall = rand.Next(0, 100);
-                int jWall = rand.Next(0, 100);
-                if (iWall > _map.GetLength(0) - sizeHole)
-                    continue;
-                for (int i = 0; i < _map.GetLength(0); i++)
-                {
-
-                    if (i < iWall || i > iWall + sizeHole)
-                        _map[jWall, i] = _barrier;
-
-                }
-                counter++;
-            }
-        }
-    }
-}