Merge pull request 'Dolgov D. A. Lab Work 1' (#1) from LabWork01 into master

Reviewed-on: http://student.git.athene.tech/devil_1nc/PIbd-23_Dolgov_D.A._Plane._Base/pulls/1

ProjectPlane/ProjectPlane/AbstractMap.cs

@@ -1,164 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectPlane
-{
-    internal abstract class AbstractMap
-    {
-        private IDrawingObject _drawingObject = 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 drawingObject)
-        {
-            _width = width;
-            _height = height;
-            _drawingObject = drawingObject;
-            GenerateMap();
-            while (!SetObjectOnMap())
-            {
-                GenerateMap();
-            }
-            return DrawMapWithObject();
-        }
-        public Bitmap MoveObject(Direction direction)
-        {
-            int _objWidth = Convert.ToInt32(_drawingObject.GetCurrentPosition().Right / _size_x);
-            int _startX = Convert.ToInt32(_drawingObject.GetCurrentPosition().Left / _size_x);
-            int _startY = Convert.ToInt32(_drawingObject.GetCurrentPosition().Top / _size_y);
-            int _objHeight = Convert.ToInt32(_drawingObject.GetCurrentPosition().Bottom / _size_y);
-
-            bool isMoveable = true;
-            switch (direction)
-            {
-                case Direction.Right:
-                    for (int i = _startX; i <= _objWidth + Convert.ToInt32(_drawingObject.Step / _size_x); i++)
-                    {
-                        for (int j = _startY; j <= _objHeight; j++)
-                        {
-                            if (_map[i, j] == _barrier)
-                            {
-                                isMoveable = false;
-                                break;
-                            }
-                        }
-                    }
-                    break;
-
-                case Direction.Left:
-                    for (int i = _startX; i >= _startX - Convert.ToInt32(_drawingObject.Step / _size_x); i--)
-                    {
-                        for (int j = _startY; j <= _objHeight; j++)
-                        {
-                            if (_map[i, j] == _barrier)
-                            {
-                                isMoveable = false;
-                                break;
-                            }
-                        }
-                    }
-                    break;
-
-                case Direction.Up:
-                    for (int i = _startX; i <= _objWidth; i++)
-                    {
-                        for (int j = _startY; j >= _startY - Convert.ToInt32(_drawingObject.Step / _size_y); j--)
-                        {
-                            if (_map[i, j] == _barrier)
-                            {
-                                isMoveable = false;
-                                break;
-                            }
-                        }
-                    }
-                    break;
-
-                case Direction.Down:
-                    for (int i = _startX; i <= _objWidth; i++)
-                    {
-                        for (int j = _objHeight; j <= _objHeight + Convert.ToInt32(_drawingObject.Step / _size_y); j++)
-                        {
-                            if (_map[i, j] == _barrier)
-                            {
-                                isMoveable = false;
-                                break;
-                            }
-                        }
-                    }
-                    break;
-            }
-            
-            if (isMoveable)
-            {
-                _drawingObject.MoveObject(direction);
-            }
-            return DrawMapWithObject();
-        }
-        private bool SetObjectOnMap()
-        {
-            if (_drawingObject == null || _map == null)
-            {
-                return false;
-            }
-            int x = _random.Next(0, 10);
-            int y = _random.Next(0, 10);
-            _drawingObject.SetObject(x, y, _width, _height);
-
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    if (i * _size_x >= x && j * _size_y >= y &&
-                        i * _size_x <= x + _drawingObject.GetCurrentPosition().Right &&
-                        j * _size_y <= j + _drawingObject.GetCurrentPosition().Bottom)
-                    {
-                        if (_map[i, j] == _barrier)
-                        {
-                            return false;
-                        }
-                    }
-                }
-            }
-
-            return true;
-        }
-        private Bitmap DrawMapWithObject()
-        {
-            Bitmap bmp = new(_width, _height);
-            if (_drawingObject == 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);
-                    }
-                }
-            }
-            _drawingObject.DrawingObject(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);
-    }
-}

ProjectPlane/ProjectPlane/Direction.cs

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

ProjectPlane/ProjectPlane/DrawingObject.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectPlane
-{
-    internal class DrawingObject : IDrawingObject
-    {
-        private DrawingPlane _plane = null;
-
-        public DrawingObject(DrawingPlane plane)
-        {
-            _plane = plane;
-        }
-
-        public float Step => _plane?.Plane?.Step ?? 0;
-
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return _plane?.GetCurrentPosition() ?? default;
-        }
-
-        public void MoveObject(Direction direction)
-        {
-            _plane?.MoveTransport(direction);
-        }
-
-        public void SetObject(int x, int y, int width, int height)
-        {
-            _plane.SetPosition(x, y, width, height);
-        }
-
-        void IDrawingObject.DrawingObject(Graphics g)
-        {
-            _plane.DrawTransport(g);
-        }
-    }
-}

ProjectPlane/ProjectPlane/DrawingWarPlane.cs

@@ -1,73 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectPlane
-{
-    internal class DrawingWarPlane : DrawingPlane
-    {
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес автомобиля</param>
-        /// <param name="bodyColor">Цвет кузова</param>
-        /// <param name="dopColor">Дополнительный цвет</param>
-        /// <param name="bodyKit">Признак наличия обвеса</param>
-        /// <param name="wing">Признак наличия антикрыла</param>
-        /// <param name="sportLine">Признак наличия гоночной полосы</param>
-        public DrawingWarPlane(int speed, float weight, Color bodyColor, Color dopColor, bool isBomber, bool isFighter, bool superTurbine) :
-            base(speed, weight, bodyColor, 110, 60)
-        {
-            Plane = new EntityWarPlane(speed, weight, bodyColor, dopColor, isFighter, superTurbine);
-        }
-        public override void DrawTransport(Graphics g)
-        {
-
-            
-                if (Plane is not EntityWarPlane warplane)
-            {
-                return;
-            }
-
-            Pen pen = new(Color.Black);
-            Brush dopBrush = new SolidBrush(warplane.DopColor);
-            Brush Brush = new SolidBrush(warplane.BodyColor);
-            Brush brBlue = new SolidBrush(Color.LightBlue);
-            Brush brBlack = new SolidBrush(Color.Black);
-
-            if (warplane.SuperTurbine)
-            {
-                
-                g.FillRectangle(dopBrush, _startPosX, _startPosY + 20, 30, 22);
-                g.DrawLine(pen, _startPosX, _startPosY + 42, _startPosX + 30, _startPosY + 42);
-                g.DrawLine(pen, _startPosX, _startPosY + 20, _startPosX + 30, _startPosY + 20);
-            }
-
-            _startPosX += 10;
-            _startPosY += 5;
-            base.DrawTransport(g);
-            _startPosX -= 10;
-            _startPosY -= 5;
-
-            if (warplane.extraCell)
-            {
-                Point[] Nose = new Point[4];
-                Nose[0].X = Convert.ToInt32(_startPosX + 118); Nose[0].Y = Convert.ToInt32(_startPosY + 22);
-                Nose[1].X = Convert.ToInt32(_startPosX + 155); Nose[1].Y = Convert.ToInt32(_startPosY + 22);
-                Nose[2].X = Convert.ToInt32(_startPosX + 118); Nose[2].Y = Convert.ToInt32(_startPosY + 45);
-                Nose[3].X = Convert.ToInt32(_startPosX + 98); Nose[3].Y = Convert.ToInt32(_startPosY + 45);
-                g.FillPolygon(Brush, Nose);
-
-                Point[] NoseWin = new Point[3];
-                NoseWin[0].X = Convert.ToInt32(_startPosX + 120); NoseWin[0].Y = Convert.ToInt32(_startPosY + 24);
-                NoseWin[1].X = Convert.ToInt32(_startPosX + 148); NoseWin[1].Y = Convert.ToInt32(_startPosY + 24);
-                NoseWin[2].X = Convert.ToInt32(_startPosX + 132); NoseWin[2].Y = Convert.ToInt32(_startPosY + 34);
-                g.FillPolygon(brBlue, NoseWin);
-            }
-
-        }
-    }
-}

ProjectPlane/ProjectPlane/DrawningPlane.cs

@@ -6,21 +6,21 @@ using System.Threading.Tasks;
 
 namespace ProjectPlane
 {
-    public class DrawingPlane
+    internal class DrawingPlane
     {
 
         /// <summary>
         /// Класс-сущность
         /// </summary>
-        public EntityPlane Plane { get; protected set; }
+        public EntityPlane Plane { get; private set; }
         /// <summary>
         /// Левая координата отрисовки самолета
         /// </summary>
-        protected float _startPosX;
+        private float _startPosX;
         /// <summary>
         /// Верхняя кооридната отрисовки самолета
-        /// </summary> 
-        protected float _startPosY;
+        /// </summary>
+        private float _startPosY;
         /// <summary>
         /// Ширина окна отрисовки
         /// </summary>
@@ -32,45 +32,30 @@ namespace ProjectPlane
         /// <summary>
         /// Ширина отрисовки самолета
         /// </summary>
-        private readonly int _planeWidth = 125;
+        private readonly int _planeWidth = 120;
         /// <summary>
         /// Высота отрисовки самолета
         /// </summary>
-        private readonly int _planeHeight = 45;
+        private readonly int _planeHeight = 80;
         /// <summary>
         /// Инициализация свойств
         /// </summary>
         /// <param name="speed">Скорость</param>
         /// <param name="weight">Вес самолета</param>
         /// <param name="bodyColor">Цвет корпуса</param>
-        public DrawingPlane(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight, Color bodyColor)
         {
-            Plane = new EntityPlane(speed, weight, bodyColor);
+            Plane = new EntityPlane();
+            Plane.Init(speed, weight, bodyColor);
         }
         /// <summary>
-        /// Инициализация свойств
+        /// Установка позиции самолета
         /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес самолета</param>
-        /// <param name="bodyColor">Цвет корпуса</param>
-        /// <param name="planeWidth">Ширина отрисовки самолета</param>
-        /// <param name="planeHeight">Высота отрисовки самолета</param>
-        protected DrawingPlane(int speed, float weight, Color bodyColor, int planeWidth, int planeHeight) 
-            : this(speed, weight, bodyColor)
-        {
-            _planeWidth = planeWidth;
-            _planeHeight = planeHeight;
-        }
-    /// <summary>
-    /// Установка позиции самолета
-    /// </summary>
-    /// <param name="x">Координата X</param>
-    /// <param name="y">Координата Y</param>
-    /// <param name="width">Ширина картинки</param>
-    /// <param name="height">Высота картинки</param>
-    /// 
-
-    public void SetPosition(int x, int y, int width, int height)
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+        public void SetPosition(int x, int y, int width, int height)
         {
             if (x < 0 || x + _planeWidth >= width)
             {
@@ -110,7 +95,6 @@ namespace ProjectPlane
                     {
                         _startPosX -= Plane.Step;
                     }
-                    else _startPosX = 0;
                     break;
                 //вверх
                 case Direction.Up:
@@ -119,13 +103,13 @@ namespace ProjectPlane
                         _startPosY -= Plane.Step;
                     }
                     break;
+  
                 //вниз
                 case Direction.Down:
                     if (_startPosY + _planeHeight + Plane.Step < _pictureHeight)
                     {
                         _startPosY += Plane.Step;
                     }
-                    else _startPosY = 0;
                     break;
             }
         }
@@ -133,7 +117,7 @@ namespace ProjectPlane
         /// Отрисовка самолета
         /// </summary>
         /// <param name="g"></param>
-        public virtual void DrawTransport(Graphics g)
+        public void DrawTransport(Graphics g)
         {
             if (_startPosX < 0 || _startPosY < 0
                 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
@@ -158,7 +142,7 @@ namespace ProjectPlane
             Triangle1[1].X = Convert.ToInt32(_startPosX + 125); Triangle1[1].Y = Convert.ToInt32(_startPosY + 30);
             Triangle1[2].X = Convert.ToInt32(_startPosX + 108); Triangle1[2].Y = Convert.ToInt32(_startPosY + 42);
             g.DrawPolygon(pen, Triangle1);
-
+            
             Point[] Triangle = new Point[3];
             Triangle[0].X = Convert.ToInt32(_startPosX + 5); Triangle[0].Y = Convert.ToInt32(_startPosY + 20);
             Triangle[1].X = Convert.ToInt32(_startPosX + 5); Triangle[1].Y = Convert.ToInt32(_startPosY);
@@ -166,6 +150,7 @@ namespace ProjectPlane
             g.DrawPolygon(pen, Triangle);
 
             ////корпус
+
             Brush br = new SolidBrush(Plane?.BodyColor ?? Color.Black);
 
             g.FillEllipse(br, _startPosX, _startPosY + 20, 20, 20);
@@ -185,6 +170,7 @@ namespace ProjectPlane
             g.FillPolygon(br, Triangle4);
 
             //  window
+
             Brush brBlue = new SolidBrush(Color.LightBlue);
             Brush brBlack = new SolidBrush(Color.Black);
 
@@ -200,7 +186,7 @@ namespace ProjectPlane
             g.FillRectangle(brBlack, _startPosX + 39, _startPosY + 45, 3, 3);
 
             g.DrawLine(pen, _startPosX + 102, _startPosY + 40, _startPosX + 102, _startPosY + 45);
-            g.FillRectangle(brBlack, _startPosX + 101, _startPosY + 45, 3, 3);
+            g.FillRectangle(brBlack, _startPosX + 101, _startPosY + 45, 3, 3);         
 
             g.FillRectangle(brBlack, _startPosX + 5, _startPosY + 18, 18, 7);
             g.FillEllipse(brBlack, _startPosX, _startPosY + 18, 7, 7);
@@ -209,7 +195,6 @@ namespace ProjectPlane
             g.FillRectangle(brBlack, _startPosX + 41, _startPosY + 28, 42, 4);
             g.FillEllipse(brBlack, _startPosX + 39, _startPosY + 28, 4, 4);
             g.FillEllipse(brBlack, _startPosX + 81, _startPosY + 28, 4, 4);
-
         }
         /// <summary>
         /// Смена границ формы отрисовки
@@ -235,9 +220,5 @@ namespace ProjectPlane
                 _startPosY = _pictureHeight.Value - _planeHeight;
             }
         }
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return (_startPosX, _startPosX + _planeWidth, _startPosY , _startPosY + _planeHeight);
-        }
     }
 }

ProjectPlane/ProjectPlane/EntityPlane.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace ProjectPlane
 {
-    public class EntityPlane
+    internal class EntityPlane
     {
 
         /// <summary>
@@ -32,7 +32,7 @@ namespace ProjectPlane
         /// <param name="weight"></param>
         /// <param name="bodyColor"></param>
         /// <returns></returns>
-        public EntityPlane(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight, Color bodyColor)
         {
             Random rnd = new();
             Speed = speed <= 0 ? rnd.Next(350, 550) : speed;

ProjectPlane/ProjectPlane/EntityWarPlane.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectPlane
-{
-    /// <summary>
-    /// Класс-сущность "Военный самолет"
-    /// </summary>
-    internal class EntityWarPlane : EntityPlane
-    {
-        /// <summary>
-        /// Дополнительный цвет
-        /// </summary>
-        public Color DopColor { get; private set; }
-  
-        /// <summary>
-        /// доп отсек
-        /// </summary>
-        public bool extraCell { get; private set; }
-        /// <summary>
-        /// наличие супертурбины
-        /// </summary>
-        public bool SuperTurbine { get; private set; }
-
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес самолета</param>
-        /// <param name="bodyColor">Цвет корпуса</param>
-        /// <param name="dopColor">Дополнительный цвет</param>
-        /// <param name="cell">Признак наличия доп остсека>
-        /// 
-        public EntityWarPlane(int speed, float weight, Color bodyColor, Color dopColor, bool cell, bool superturbine) :
-            base(speed, weight, bodyColor)
-        {
-            DopColor = dopColor;
-            extraCell = cell;
-            SuperTurbine = superturbine;
-        }
-    }
-}

ProjectPlane/ProjectPlane/FormMapWithSetPlanes.Designer.cs

@@ -1,210 +0,0 @@
-namespace ProjectPlane
-{
-    partial class FormMapWithSetPlanes
-    {
-        /// <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.buttonRight = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
-            this.buttonRemovePlane = new System.Windows.Forms.Button();
-            this.buttonShowStorage = new System.Windows.Forms.Button();
-            this.buttonShowOnMap = new System.Windows.Forms.Button();
-            this.buttonAddPlane = 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.buttonRight);
-            this.groupBoxTools.Controls.Add(this.buttonDown);
-            this.groupBoxTools.Controls.Add(this.buttonLeft);
-            this.groupBoxTools.Controls.Add(this.buttonUp);
-            this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
-            this.groupBoxTools.Controls.Add(this.buttonRemovePlane);
-            this.groupBoxTools.Controls.Add(this.buttonShowStorage);
-            this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
-            this.groupBoxTools.Controls.Add(this.buttonAddPlane);
-            this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
-            this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(811, 0);
-            this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Size = new System.Drawing.Size(204, 554);
-            this.groupBoxTools.TabIndex = 0;
-            this.groupBoxTools.TabStop = false;
-            this.groupBoxTools.Text = "Tools";
-            // 
-            // buttonRight
-            // 
-            this.buttonRight.BackgroundImage = global::ProjectPlane.Properties.Resources.right;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(135, 495);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(48, 47);
-            this.buttonRight.TabIndex = 9;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonDown
-            // 
-            this.buttonDown.BackgroundImage = global::ProjectPlane.Properties.Resources.down;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(81, 495);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(48, 47);
-            this.buttonDown.TabIndex = 8;
-            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonLeft
-            // 
-            this.buttonLeft.BackgroundImage = global::ProjectPlane.Properties.Resources.left;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(27, 495);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(48, 47);
-            this.buttonLeft.TabIndex = 7;
-            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonUp
-            // 
-            this.buttonUp.BackgroundImage = global::ProjectPlane.Properties.Resources.up;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(81, 445);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(48, 47);
-            this.buttonUp.TabIndex = 6;
-            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // 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, 23);
-            this.maskedTextBoxPosition.TabIndex = 2;
-            this.maskedTextBoxPosition.ValidatingType = typeof(int);
-            // 
-            // buttonRemovePlane
-            // 
-            this.buttonRemovePlane.Location = new System.Drawing.Point(17, 195);
-            this.buttonRemovePlane.Name = "buttonRemovePlane";
-            this.buttonRemovePlane.Size = new System.Drawing.Size(175, 35);
-            this.buttonRemovePlane.TabIndex = 3;
-            this.buttonRemovePlane.Text = "Remove plane";
-            this.buttonRemovePlane.UseVisualStyleBackColor = true;
-            this.buttonRemovePlane.Click += new System.EventHandler(this.ButtonRemovePlane_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 = "Check storage";
-            this.buttonShowStorage.UseVisualStyleBackColor = true;
-            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_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 = "Show map";
-            this.buttonShowOnMap.UseVisualStyleBackColor = true;
-            this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
-            // 
-            // buttonAddPlane
-            // 
-            this.buttonAddPlane.Location = new System.Drawing.Point(17, 106);
-            this.buttonAddPlane.Name = "buttonAddPlane";
-            this.buttonAddPlane.Size = new System.Drawing.Size(175, 35);
-            this.buttonAddPlane.TabIndex = 1;
-            this.buttonAddPlane.Text = "Add plane";
-            this.buttonAddPlane.UseVisualStyleBackColor = true;
-            this.buttonAddPlane.Click += new System.EventHandler(this.ButtonAddPlane_Click);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Simple map",
-            "Sky map"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(17, 32);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 23);
-            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(811, 554);
-            this.pictureBox.TabIndex = 1;
-            this.pictureBox.TabStop = false;
-            // 
-            // FormMapWithSetPlanes
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1015, 554);
-            this.Controls.Add(this.pictureBox);
-            this.Controls.Add(this.groupBoxTools);
-            this.Name = "FormMapWithSetPlanes";
-            this.Text = "Map with object sets";
-            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 buttonAddPlane;
-        private Button buttonShowStorage;
-        private Button buttonRemovePlane;
-        private MaskedTextBox maskedTextBoxPosition;
-        private Button buttonUp;
-        private Button buttonRight;
-        private Button buttonDown;
-        private Button buttonLeft;
-    }
-}

ProjectPlane/ProjectPlane/FormMapWithSetPlanes.cs

@@ -1,165 +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 ProjectPlane
-{
-    public partial class FormMapWithSetPlanes : Form
-    {
-        /// <summary>
-        /// Объект от класса карты с набором объектов
-        /// </summary>
-        private MapWithSetPlanesGeneric<DrawingObject, AbstractMap> _mapPlanesCollectionGeneric;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        public FormMapWithSetPlanes()
-        {
-            InitializeComponent();
-        }
-
-        /// <summary>
-        /// "Обработка нажатия на кнопки движения"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            AbstractMap map = null;
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Simple map":
-                    map = new SimpleMap();
-                    break;
-                case "Sky map":
-                    map = new SkyMap();
-                    break;
-            }
-
-            if (map != null)
-            {
-                _mapPlanesCollectionGeneric = new MapWithSetPlanesGeneric<DrawingObject, AbstractMap>(
-                    pictureBox.Width, pictureBox.Height, map);
-            }
-            else
-            {
-                _mapPlanesCollectionGeneric = null;
-            }
-        }
-        /// <summary>
-        /// Добавление объекта
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonAddPlane_Click(object sender, EventArgs e)
-        {
-            if (_mapPlanesCollectionGeneric == null)
-            {
-                return;
-            }
-            FormPlane form = new();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                DrawingObject Plane = new(form.SelectedPlane);
-                if (_mapPlanesCollectionGeneric + Plane != -1)
-                {
-                    MessageBox.Show("Object added");
-                    pictureBox.Image = _mapPlanesCollectionGeneric.ShowSet();
-                }
-                else
-                {
-                    MessageBox.Show("Error with object adding");
-                }
-            }
-        }
-        /// <summary>
-        /// Удаление объекта
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonRemovePlane_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
-            {
-                return;
-            }
-            if (MessageBox.Show("Remove object?", "Removing", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapPlanesCollectionGeneric - pos is not null)
-            {
-                MessageBox.Show("Object removed");
-                pictureBox.Image = _mapPlanesCollectionGeneric.ShowSet();
-            }
-            else
-            {
-                MessageBox.Show("Error with object removing");
-            }
-        }
-        /// <summary>
-        /// Вывод набора
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonShowStorage_Click(object sender, EventArgs e)
-        {
-            if (_mapPlanesCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox.Image = _mapPlanesCollectionGeneric.ShowSet();
-        }
-        /// <summary>
-        /// Вывод карты
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonShowOnMap_Click(object sender, EventArgs e)
-        {
-            if (_mapPlanesCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox.Image = _mapPlanesCollectionGeneric.ShowOnMap();
-        }
-        /// <summary>
-        /// Перемещение
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            if (_mapPlanesCollectionGeneric == 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 = _mapPlanesCollectionGeneric.MoveObject(dir);
-        }
-    }
-}

ProjectPlane/ProjectPlane/FormMapWithSetPlanes.resx

@@ -1,60 +0,0 @@
-<root>
-  <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>

ProjectPlane/ProjectPlane/FormPlane.Designer.cs

@@ -19,10 +19,7 @@
             }
             base.Dispose(disposing);
         }
-        private void statusStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
-        {
 
-        }
         #region Windows Form Designer generated code
 
         /// <summary>
@@ -41,8 +38,6 @@
             this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
-            this.buttonCreateModif = new System.Windows.Forms.Button();
-            this.buttonSelectPlane = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlane)).BeginInit();
             this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -118,7 +113,6 @@
             this.statusStrip1.Size = new System.Drawing.Size(800, 22);
             this.statusStrip1.TabIndex = 9;
             this.statusStrip1.Text = "statusStrip1";
-            this.statusStrip1.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.statusStrip1_ItemClicked);
             // 
             // toolStripStatusLabelSpeed
             // 
@@ -138,34 +132,11 @@
             this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17);
             this.toolStripStatusLabelBodyColor.Text = "Color";
             // 
-            // buttonCreateModif
-            // 
-            this.buttonCreateModif.BackColor = System.Drawing.SystemColors.ControlLight;
-            this.buttonCreateModif.Location = new System.Drawing.Point(138, 376);
-            this.buttonCreateModif.Name = "buttonCreateModif";
-            this.buttonCreateModif.Size = new System.Drawing.Size(115, 47);
-            this.buttonCreateModif.TabIndex = 10;
-            this.buttonCreateModif.Text = "Modificate";
-            this.buttonCreateModif.UseVisualStyleBackColor = false;
-            this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click);
-            // 
-            // buttonSelectPlane
-            // 
-            this.buttonSelectPlane.Location = new System.Drawing.Point(541, 388);
-            this.buttonSelectPlane.Name = "buttonSelectPlane";
-            this.buttonSelectPlane.Size = new System.Drawing.Size(75, 23);
-            this.buttonSelectPlane.TabIndex = 11;
-            this.buttonSelectPlane.Text = "Select";
-            this.buttonSelectPlane.UseVisualStyleBackColor = true;
-            this.buttonSelectPlane.Click += new System.EventHandler(this.buttonSelectPlane_Click);
-            // 
             // FormPlane
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.buttonSelectPlane);
-            this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonCreate);
             this.Controls.Add(this.buttonLeft);
             this.Controls.Add(this.buttonDown);
@@ -175,6 +146,7 @@
             this.Controls.Add(this.pictureBoxPlane);
             this.Name = "FormPlane";
             this.Text = "Plane";
+            this.SizeChanged += new System.EventHandler(this.PictureBoxCar_Resize);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlane)).EndInit();
             this.statusStrip1.ResumeLayout(false);
             this.statusStrip1.PerformLayout();
@@ -196,7 +168,5 @@
         private ToolStripStatusLabel toolStripStatusLabelSpeed;
         private ToolStripStatusLabel toolStripStatusLabelWeight;
         private ToolStripStatusLabel toolStripStatusLabelBodyColor;
-        private Button buttonCreateModif;
-        private Button buttonSelectPlane;
     }
 }

ProjectPlane/ProjectPlane/FormPlane.cs

@@ -4,7 +4,6 @@
     {
         private DrawingPlane _plane;
 
-        public DrawingPlane SelectedPlane { get; private set; }
 
         public FormPlane()
         {
@@ -20,17 +19,8 @@
             _plane?.DrawTransport(gr);
             pictureBoxPlane.Image = bmp;
         }
-        private void SetData()
-        {
-            Random rand = new();
-            _plane.SetPosition(rand.Next(5, 100), rand.Next(40, 100),
-                pictureBoxPlane.Width, pictureBoxPlane.Height);
-            toolStripStatusLabelSpeed.Text = $"Speed: {_plane.Plane.Speed}";
-            toolStripStatusLabelWeight.Text = $"Weiht: {_plane.Plane.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Color: {_plane.Plane.BodyColor.Name}";
-        }
         /// <summary>
-        /// "Обработка нажатия на кнопки движения"
+        /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ñîçäàòü"
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -58,51 +48,20 @@
         private void buttonCreate_Click(object sender, EventArgs e)
         {
             Random rand = new Random();
-            Color color = Color.FromArgb(rand.Next(0, 256), rand.Next(0, 256), rand.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            _plane = new DrawingPlane(rand.Next(200, 500), rand.Next(2000, 3000), color);          
-            SetData();
+            _plane = new DrawingPlane();
+            _plane.Init(rand.Next(200, 500), rand.Next(2000, 3000),
+                Color.FromArgb(rand.Next(0, 256), rand.Next(0, 256), rand.Next(0, 256)));
+            _plane.SetPosition(rand.Next(5, 100), rand.Next(40, 100),
+                pictureBoxPlane.Width, pictureBoxPlane.Height);
+            toolStripStatusLabelSpeed.Text = $"Speed: {_plane.Plane.Speed}";
+            toolStripStatusLabelWeight.Text = $"Weiht: {_plane.Plane.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Color: {_plane.Plane.BodyColor.Name}";
             Draw();
         }
-        private void PictureBoxplane_Resize(object sender, EventArgs e)
+        private void PictureBoxCar_Resize(object sender, EventArgs e)
         {
             _plane?.ChangeBorders(pictureBoxPlane.Width, pictureBoxPlane.Height);
             Draw();
         }
-        /// <summary>
-        /// Обработка нажатия кнопки "Модификация"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        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;
-            }
-            _plane = new DrawingWarPlane(rnd.Next(100, 300), rnd.Next(1000, 2000), color, dopColor,
-                Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
-            SetData();
-            Draw();
-        }
-
-        private void buttonSelectPlane_Click(object sender, EventArgs e)
-        {
-            SelectedPlane = _plane;
-            DialogResult = DialogResult.OK;
-        }
     }
 }

ProjectPlane/ProjectPlane/IDrawingObject.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectPlane
-{
-    internal interface IDrawingObject
-    {
-		/// <summary>
-		/// Шаг перемещения объекта
-		/// </summary>
-		public float Step { get; }
-		/// <summary>
-		/// Установка позиции объекта
-		/// </summary>
-		/// <param name="x">Координата X</param>
-		/// <param name="y">Координата Y</param>
-		/// <param name="width">Ширина полотна</param>
-		/// <param name="height">Высота полотна</param>
-		void SetObject(int x, int y, int width, int height);
-		/// <summary>
-		/// Изменение направления пермещения объекта
-		/// </summary>
-		/// <param name="direction">Направление</param>
-		/// <returns></returns>
-		void MoveObject(Direction direction);
-		/// <summary>
-		/// Отрисовка объекта
-		/// </summary>
-		/// <param name="g"></param>
-		void DrawingObject(Graphics g);
-		/// <summary>
-		/// Получение текущей позиции объекта
-		/// </summary>
-		/// <returns></returns>
-		(float Left, float Right, float Top, float Bottom) GetCurrentPosition();
-	}
-}

ProjectPlane/ProjectPlane/MapWithSetPlanesGeneric.cs

@@ -1,191 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectPlane
-{
-    internal class MapWithSetPlanesGeneric <T, U>
-        where T : class, IDrawingObject
-        where U : AbstractMap
-    {
-        /// <summary>
-        /// Ширина окна отрисовки
-        /// </summary>
-        private readonly int _pictureWidth;
-        /// <summary>
-        /// Высота окна отрисовки
-        /// </summary>
-        private readonly int _pictureHeight;
-        /// <summary>
-        /// Размер занимаемого объектом места (ширина)
-        /// </summary>
-        private readonly int _placeSizeWidth = 210;
-        /// <summary>
-        /// Размер занимаемого объектом места (высота)
-        /// </summary>
-        private readonly int _placeSizeHeight = 90;
-        /// <summary>
-        /// Набор объектов
-        /// </summary>
-        private readonly SetPlanesGeneric<T> _setPlanes;
-        /// <summary>
-        /// Карта
-        /// </summary>
-        private readonly U _map;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="picWidth"></param>
-        /// <param name="picHeight"></param>
-        /// <param name="map"></param>
-        public MapWithSetPlanesGeneric(int picWidth, int picHeight, U map)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _setPlanes = new SetPlanesGeneric<T>(width * height);
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-            _map = map;
-        }
-        /// <summary>
-        /// Перегрузка оператора сложения
-        /// </summary>
-        /// <param name="map"></param>
-        /// <param name="plane"></param>
-        /// <returns></returns>
-        public static int operator +(MapWithSetPlanesGeneric<T, U> map, T plane)
-        {
-            return map._setPlanes.Insert(plane);
-        }
-        /// <summary>
-        /// Перегрузка оператора вычитания
-        /// </summary>
-        /// <param name="map"></param>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public static T operator -(MapWithSetPlanesGeneric<T, U> map, int position)
-        {
-            return map._setPlanes.Remove(position);
-        }
-
-        /// <summary>
-        /// Вывод всего набора объектов
-        /// </summary>
-        /// <returns></returns>
-        public Bitmap ShowSet()
-        {
-            Bitmap bmp = new(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawPlanes(gr);
-            return bmp;
-        }
-        /// <summary>
-        /// Просмотр объекта на карте
-        /// </summary>
-        /// <returns></returns>
-        public Bitmap ShowOnMap()
-        {
-            Shaking();
-            for (int i = 0; i < _setPlanes.Count; i++)
-            {
-                var plane = _setPlanes.Get(i);
-                if (plane != null)
-                {
-                    return _map.CreateMap(_pictureWidth, _pictureHeight, plane);
-                }
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-        /// <summary>
-        /// Перемещение объекта по крате
-        /// </summary>
-        /// <param name="direction"></param>
-        /// <returns></returns>
-        public Bitmap MoveObject(Direction direction)
-        {
-            if (_map != null)
-            {
-                return _map.MoveObject(direction);
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-        /// <summary>
-        /// "Взбалтываем" набор, чтобы все элементы оказались в начале
-        /// </summary>
-        private void Shaking()
-        {
-            int j = _setPlanes.Count - 1;
-            for (int i = 0; i < _setPlanes.Count; i++)
-            {
-                if (_setPlanes.Get(i) == null)
-                {
-                    for (; j > i; j--)
-                    {
-                        var plane = _setPlanes.Get(j);
-                        if (plane != null)
-                        {
-                            _setPlanes.Insert(plane, i);
-                            _setPlanes.Remove(j);
-                            break;
-                        }
-                    }
-                    if (j <= i)
-                    {
-                        return;
-                    }
-                }
-            }
-        }
-        /// <summary>
-        /// Метод отрисовки фона
-        /// </summary>
-        /// <param name="g"></param>
-        private void DrawBackground(Graphics g)
-        {
-            Pen pen = new(Color.Black, 3);
-            Pen pen2 = new(Color.Yellow, 8);
-            Brush grBrush = new SolidBrush(Color.Gray);
-            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, j * _placeSizeHeight);
-                    g.FillRectangle(grBrush, i * _placeSizeWidth, j * _placeSizeHeight, _placeSizeWidth, _placeSizeHeight);
-                    g.DrawLine(pen2, i * _placeSizeWidth, j * _placeSizeHeight + _placeSizeHeight / 2, i * _placeSizeWidth + _placeSizeWidth, j * _placeSizeHeight + _placeSizeHeight / 2);
-
-                }
-                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
-            }
-        }
-        /// <summary>
-        /// Метод прорисовки объектов
-        /// </summary>
-        /// <param name="g"></param>
-        private void DrawPlanes(Graphics g)
-        {
-            int width = _pictureWidth / _placeSizeWidth - 1;
-            int height = _pictureHeight / _placeSizeHeight - 1;
-
-            for (int i = 0; i < _setPlanes.Count; i++)
-            {
-                _setPlanes.Get(i)?.SetObject((width) * _placeSizeWidth + 10, (height) * _placeSizeHeight + 15, _pictureWidth, _pictureHeight);
-                _setPlanes.Get(i)?.DrawingObject(g);
-
-                if (width <= 0)
-                {
-                    width = _pictureWidth / _placeSizeWidth - 1;
-                    height--;
-                }
-                else
-                {
-                    width--;
-
-                }
-            }
-
-        }
-    }
-}

ProjectPlane/ProjectPlane/Program.cs

@@ -9,7 +9,7 @@ namespace ProjectPlane
         static void Main()
         {
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormMapWithSetPlanes());
+            Application.Run(new FormPlane());
         }
     }
 }

ProjectPlane/ProjectPlane/SetPlanesGeneric.cs

@@ -1,104 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectPlane
-{
-    internal class SetPlanesGeneric<T> where T : class
-    {
-		/// <summary>
-		/// Массив объектов, которые храним
-		/// </summary>
-		private readonly T[] _places;
-		/// <summary>
-		/// Количество объектов в массиве
-		/// </summary>
-		public int Count => _places.Length;
-		/// <summary>
-		/// Конструктор
-		/// </summary>
-		/// <param name="count"></param>
-		public SetPlanesGeneric(int count)
-		{
-			_places = new T[count];
-		}
-		/// <summary>
-		/// Добавление объекта в набор
-		/// </summary>
-		/// <param name="plane">Добавляемый самолет</param>
-		/// <returns></returns>
-		public int Insert(T plane)
-		{
-			return Insert(plane, 0);
-		}
-		/// <summary>
-		/// Добавление объекта в набор на конкретную позицию
-		/// </summary>
-		/// <param name="plane">Добавляемый самолет</param>
-		/// <param name="position">Позиция</param>
-		/// <returns></returns>
-		public int Insert(T plane, int position)
-		{
-			bool isNull = false;
-			int nullElem = 0;
-			if (position < 0 || position >= Count)
-            {
-				return -1;
-            }
-			if (_places[position] == null)
-            {
-				_places[position] = plane;
-				return position;
-            }
-			for (int i = position + 1; i < Count; i ++)
-            {
-				if (_places[i] == null)
-				{
-					isNull = true;
-					nullElem = i;
-					break;
-				}
-            }
-			if (!isNull)
-			{
-				return -1;
-			}
-			for (int i = nullElem; i > position; i--)
-			{
-				_places[i] = _places[i - 1];
-			}		
-			_places[position] = plane;
-			return position;
-		}
-		/// <summary>
-		/// Удаление объекта из набора с конкретной позиции
-		/// </summary>
-		/// <param name="position"></param>
-		/// <returns></returns>
-		public T Remove(int position)
-		{
-			if (position < 0 || position >= Count)
-			{
-				return null;
-			}
-			T temp = _places[position];
-			_places[position] = null;
-			return temp;
-		}
-		/// <summary>
-		/// Получение объекта из набора по позиции
-		/// </summary>
-		/// <param name="position"></param>
-		/// <returns></returns>
-		public T Get(int position)
-		{
-			if (position < 0 || position >= Count)
-			{
-				return null;
-			}
-			return _places[position];
-		}
-	}
-}

ProjectPlane/ProjectPlane/SimpleMap.cs

@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectPlane
-{
-    internal class SimpleMap : AbstractMap
-    {
-        /// <summary>
-        /// Цвет участка закрытого
-        /// </summary>
-        private readonly Brush barrierColor = new SolidBrush(Color.Black);
-        /// <summary>
-        /// Цвет участка открытого
-        /// </summary>
-        private readonly Brush roadColor = new SolidBrush(Color.Gray);
-
-        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++;
-                }
-            }
-        }
-    }   
-}

ProjectPlane/ProjectPlane/SkyMap.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectPlane
-{
-    internal class SkyMap : AbstractMap
-    {
-        /// <summary>
-        /// Цвет участка закрытого
-        /// </summary>
-        private readonly Brush barrierColor = new SolidBrush(Color.Black);
-        /// <summary>
-        /// Цвет участка открытого
-        /// </summary>
-        private readonly Brush skyColor = new SolidBrush(Color.AliceBlue);
-
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            Point[] Triangle = new Point[3];
-            Triangle[0].X = i * (int)_size_x; Triangle[0].Y = j * (int)_size_y;
-            Triangle[1].X = i * (int)_size_x + 8; Triangle[1].Y = j * (int)_size_y - 5;
-            Triangle[2].X = i * (int)_size_x + 8; Triangle[2].Y = j * (int)_size_y + 5;
-            g.FillPolygon(barrierColor, Triangle);
-        }
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(skyColor, 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 < 30)
-            {
-                int x = _random.Next(0, 100);
-                int y = _random.Next(0, 100);
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-                    counter++;
-                }
-            }
-        }
-    }
-}