Изменение форм и методов отрисовки фона и вывода объектов.

AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs

@@ -31,67 +31,62 @@ namespace AirplaneWithRadar
         }
         public Bitmap MoveObject(Direction direction)
         {
-            // TODO проверка, что объект может переместится в требуемом направлении
+            if (_drawingObject == null) return DrawMapWithObject();
-            
+            bool canMoveObject = true;
-            //if (direction == Direction.Right)
+            switch (direction)
-            //{
+            {
-            //    for (int i = (int)(_drawingObject.GetCurrentPosition().Right / _size_x + 1); i < _drawingObject.GetCurrentPosition().Right + _drawingObject.Step / _size_x + 1; i++)
+                case Direction.Left:
-            //    {
+                    if (!CheckBarriers(-1 * _drawingObject.Step, -1 * _drawingObject.Step, 0, 0))
-            //        for (int j = (int)(_drawingObject.GetCurrentPosition().Top / _size_y + 1 ); j < _drawingObject.GetCurrentPosition().Bottom / _size_y + 1; j++)
+                    {
-            //        {
+                        canMoveObject = false;
-            //            if (_map[i, j] == _barrier)
+                    }
-            //            {
+                    break;
-            //                break;
+                case Direction.Right:
-            //            }
+                    if (!CheckBarriers(_drawingObject.Step, _drawingObject.Step, 0, 0))
-            //        }
+                    {
-            //    }
+                        canMoveObject = false;
-            //}
+                    }
-            //if (direction == Direction.Up)
+                    break;
-            //{
+                case Direction.Up:
-            //    for (int i = (int)(_drawingObject.GetCurrentPosition().Top - _drawingObject.Step / _size_y); i < _drawingObject.GetCurrentPosition().Top / _size_y; i++)
+                    if (!CheckBarriers(0, 0, -1 * _drawingObject.Step, -1 * _drawingObject.Step))
-            //    {
+                    {
-            //        for (int j = (int)(_drawingObject.GetCurrentPosition().Left / _size_x); j < _drawingObject.GetCurrentPosition().Right / _size_x; j++)
+                        canMoveObject = false;
-            //        {
+                    }
-            //            if (_map[i, j] == _barrier)
+                    break;
-            //            {
+                case Direction.Down:
-            //                break;
+                    if (!CheckBarriers(0, 0, _drawingObject.Step, _drawingObject.Step))
-            //            }
+                    {
-            //        }
+                        canMoveObject = false;
-            //    }
+                    }
-            //}
+                    break;
-            //if (direction == Direction.Left)
+            }
-            //{
+            if (canMoveObject)
-            //    for (int i = (int)(_drawingObject.GetCurrentPosition().Left - _drawingObject.Step / _size_x); i < _drawingObject.GetCurrentPosition().Left / _size_x; i++)
-            //    {
-            //        for (int j = (int)(_drawingObject.GetCurrentPosition().Top / _size_y); j < _drawingObject.GetCurrentPosition().Bottom / _size_y; j++)
-            //        {
-            //            if (_map[i, j] == _barrier)
-            //            {
-            //                break;
-            //            }
-            //        }
-            //    }
-            //}
-            //if (direction == Direction.Down)
-            //{
-
-            //    for (int i = (int)(_drawingObject.GetCurrentPosition().Bottom / _size_y); i < _drawingObject.GetCurrentPosition().Bottom + _drawingObject.Step / _size_y; i++)
-            //    {
-            //        for (int j = (int)(_drawingObject.GetCurrentPosition().Left / _size_x); j < _drawingObject.GetCurrentPosition().Right / _size_x; j++)
-            //        {
-            //            if (_map[i, j] == _barrier)
-            //            {
-            //                break;
-            //            }
-            //        }
-            //    }
-            //}
-            if (true)
             {
                 _drawingObject.MoveObject(direction);
             }
             return DrawMapWithObject();
         }
+
+        private bool CheckBarriers(float leftMove, float rightMove, float topMove, float bottomMove)
+        {
+            int left = Convert.ToInt32((_drawingObject.GetCurrentPosition().Left + leftMove) / _size_x);
+            int right = Convert.ToInt32((_drawingObject.GetCurrentPosition().Right + rightMove) / _size_x);
+            int top = Convert.ToInt32((_drawingObject.GetCurrentPosition().Top + topMove) / _size_y);
+            int bottom = Convert.ToInt32((_drawingObject.GetCurrentPosition().Bottom + bottomMove) / _size_y);
+            if (top < 0 || left < 0 || right >= _map.GetLength(1) || bottom >= _map.GetLength(0))
+            {
+                return false;
+            }
+            for (int i = top; i <= bottom; i++)
+            {
+                for (int j = left; j <= right; j++)
+                {
+                    if (_map[j, i] == 1) return false;
+                }
+            }
+            return true;
+        }
+
         private bool SetObjectOnMap()
         {
             if (_drawingObject == null || _map == null)
@@ -101,18 +96,13 @@ namespace AirplaneWithRadar
             int x = _random.Next(0, 10);
             int y = _random.Next(0, 10);
             _drawingObject.SetObject(x, y, _width, _height);
-            //for (int i = (int)(_drawingObject.GetCurrentPosition().Left/_size_x); i < _drawingObject.GetCurrentPosition().Right/_size_x; i++)
-            //{
-            //    for (int j = (int)(_drawingObject.GetCurrentPosition().Top/_size_y); j < _drawingObject.GetCurrentPosition().Bottom/_size_y; j++)
-            //    {
-            //        if (_map[i,j] == _barrier)
-            //        {
-            //            return false;
-            //        }
-            //    }
-            //}
             // TODO проверка, что объект не "накладывается" на закрытые участки
+            if (!CheckBarriers(0, 0, 0, 0))
+            {
+                return false;
+            }
             return true;
+
         }
         private Bitmap DrawMapWithObject()
         {

AirplaneWithRadar/AirplaneWithRadar/BlockMap.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AirplaneWithRadar
+{
+    internal class BlockMap : AbstractMap
+    {
+        /// <summary>
+        /// Цвет участка закрытого
+        /// </summary>
+        private readonly Brush barrierColor = new SolidBrush(Color.Beige);
+        /// <summary>
+        /// Цвет участка открытого
+        /// </summary>
+        private readonly Brush roadColor = new SolidBrush(Color.LightBlue);
+
+        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 + 1) * (_size_x + 1), (j + 1) * (_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 block = 0;
+            for (int i = 0; i < _map.GetLength(0); i++)
+            {
+                for (int j = 0; j < _map.GetLength(1); j++)
+                {
+                    _map[i, j] = _freeRoad;
+                }
+            }
+            int numberBlocks = _random.Next(10, 15);
+            while (block < numberBlocks)
+            {
+                int x = _random.Next(0, 80);
+                int y = _random.Next(0, 80);
+                int blockWidth = _random.Next(0, 19);
+                int blockHeight = _random.Next(0, 19);
+
+                bool isFree = true;
+                for (int i = x; i < x + blockWidth; i++)
+                {
+                    for (int j = y; j < y + blockHeight; j++)
+                    {
+                        if (_map[i, j] != _freeRoad)
+                        {
+                            isFree = false;
+                            break;
+                        }
+
+                    }
+                }
+                if (isFree)
+                {
+                    for (int i = x; i < x + blockWidth; i++)
+                    {
+                        for (int j = y; j < y + blockHeight; j++)
+                        {
+                            _map[i, j] = _barrier;
+                        }
+                    }
+                    block++;
+                }
+            }
+        }
+    }
+}

AirplaneWithRadar/AirplaneWithRadar/Direction.cs

@@ -9,7 +9,7 @@ namespace AirplaneWithRadar
     /// <summary>
     /// Направление перемещения
     /// </summary>
-    internal enum Direction
+    public enum Direction
     {
         None = 0,
         Up = 1,

AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs

@@ -9,7 +9,7 @@ namespace AirplaneWithRadar
     /// <summary>
     /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
     /// </summary>
-    internal class DrawingAirplane
+    public class DrawingAirplane
     {
         /// <summary>
         /// Класс-сущность

AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs

@@ -10,7 +10,7 @@ namespace AirplaneWithRadar
     /// <summary>
     /// Класс-сущность "Самолет"
     /// </summary>
-    internal class EntityAirplane
+    public class EntityAirplane
     {
         /// <summary>
         /// Скорость

AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.Designer.cs

@@ -39,6 +39,7 @@
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonCreateModif = new System.Windows.Forms.Button();
+            this.buttonSelectAirplane = new System.Windows.Forms.Button();
             this.statusStrip.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).BeginInit();
             this.SuspendLayout();
@@ -153,11 +154,22 @@
             this.buttonCreateModif.UseVisualStyleBackColor = true;
             this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
             // 
+            // buttonSelectAirplane
+            // 
+            this.buttonSelectAirplane.Location = new System.Drawing.Point(529, 372);
+            this.buttonSelectAirplane.Name = "buttonSelectAirplane";
+            this.buttonSelectAirplane.Size = new System.Drawing.Size(112, 34);
+            this.buttonSelectAirplane.TabIndex = 8;
+            this.buttonSelectAirplane.Text = "Выбрать";
+            this.buttonSelectAirplane.UseVisualStyleBackColor = true;
+            this.buttonSelectAirplane.Click += new System.EventHandler(this.ButtonSelectAirplane_Click);
+            // 
             // FormAirplaneWithRadar
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.buttonSelectAirplane);
             this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonDown);
@@ -189,5 +201,6 @@
         private Button buttonDown;
         private Button buttonRight;
         private Button buttonCreateModif;
+        private Button buttonSelectAirplane;
     }
 }

AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs

@@ -4,6 +4,8 @@ namespace AirplaneWithRadar
     {
         private DrawingAirplane _airplane;
 
+        public DrawingAirplane SelectedAirplane { get; private set; }
+
         public FormAirplaneWithRadar()
         {
             InitializeComponent();
@@ -91,5 +93,17 @@ namespace AirplaneWithRadar
             SetData();
             Draw();
         }
+
+        private void ButtonSelectAirplane_Click(object sender, EventArgs e)
+        {
+            SelectedAirplane = _airplane;
+            DialogResult = DialogResult.OK;
+
+        }
+
+        private void FormAirplaneWithRadar_Load_1(object sender, EventArgs e)
+        {
+
+        }
     }
 }

AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs

@@ -1,208 +0,0 @@
-namespace AirplaneWithRadar
-{
-    partial class FormMap
-    {
-        /// <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.statusStrip = new System.Windows.Forms.StatusStrip();
-            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
-            this.pictureBoxAirplane = new System.Windows.Forms.PictureBox();
-            this.buttonCreate = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonCreateModif = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            this.statusStrip.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // statusStrip
-            // 
-            this.statusStrip.ImageScalingSize = new System.Drawing.Size(24, 24);
-            this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripStatusLabelSpeed,
-            this.toolStripStatusLabelWeight,
-            this.toolStripStatusLabelBodyColor});
-            this.statusStrip.Location = new System.Drawing.Point(0, 418);
-            this.statusStrip.Name = "statusStrip";
-            this.statusStrip.Size = new System.Drawing.Size(800, 32);
-            this.statusStrip.TabIndex = 0;
-            // 
-            // toolStripStatusLabelSpeed
-            // 
-            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(93, 25);
-            this.toolStripStatusLabelSpeed.Text = "Скорость:";
-            // 
-            // toolStripStatusLabelWeight
-            // 
-            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(43, 25);
-            this.toolStripStatusLabelWeight.Text = "Вес:";
-            // 
-            // toolStripStatusLabelBodyColor
-            // 
-            this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
-            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(55, 25);
-            this.toolStripStatusLabelBodyColor.Text = "Цвет:";
-            // 
-            // pictureBoxAirplane
-            // 
-            this.pictureBoxAirplane.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxAirplane.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxAirplane.Name = "pictureBoxAirplane";
-            this.pictureBoxAirplane.Size = new System.Drawing.Size(800, 450);
-            this.pictureBoxAirplane.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBoxAirplane.TabIndex = 1;
-            this.pictureBoxAirplane.TabStop = false;
-            // 
-            // buttonCreate
-            // 
-            this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreate.Location = new System.Drawing.Point(12, 372);
-            this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(112, 34);
-            this.buttonCreate.TabIndex = 2;
-            this.buttonCreate.Text = "Создать";
-            this.buttonCreate.UseVisualStyleBackColor = true;
-            this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_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(711, 340);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 30);
-            this.buttonUp.TabIndex = 3;
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.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(675, 376);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
-            this.buttonLeft.TabIndex = 4;
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_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(711, 376);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 30);
-            this.buttonDown.TabIndex = 5;
-            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(747, 376);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 30);
-            this.buttonRight.TabIndex = 6;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonCreateModif
-            // 
-            this.buttonCreateModif.Location = new System.Drawing.Point(130, 372);
-            this.buttonCreateModif.Name = "buttonCreateModif";
-            this.buttonCreateModif.Size = new System.Drawing.Size(140, 34);
-            this.buttonCreateModif.TabIndex = 7;
-            this.buttonCreateModif.Text = "Модификация";
-            this.buttonCreateModif.UseVisualStyleBackColor = true;
-            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Собственная карта"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(182, 33);
-            this.comboBoxSelectorMap.TabIndex = 8;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // FormMap
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.comboBoxSelectorMap);
-            this.Controls.Add(this.statusStrip);
-            this.Controls.Add(this.buttonCreateModif);
-            this.Controls.Add(this.buttonRight);
-            this.Controls.Add(this.buttonDown);
-            this.Controls.Add(this.buttonLeft);
-            this.Controls.Add(this.buttonUp);
-            this.Controls.Add(this.buttonCreate);
-            this.Controls.Add(this.pictureBoxAirplane);
-            this.Name = "FormMap";
-            this.Text = "Карта";
-            this.statusStrip.ResumeLayout(false);
-            this.statusStrip.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private StatusStrip statusStrip;
-        private ToolStripStatusLabel toolStripStatusLabelSpeed;
-        private ToolStripStatusLabel toolStripStatusLabelWeight;
-        private ToolStripStatusLabel toolStripStatusLabelBodyColor;
-        private PictureBox pictureBoxAirplane;
-        private Button buttonCreate;
-        private Button buttonUp;
-        private Button buttonLeft;
-        private Button buttonDown;
-        private Button buttonRight;
-        private Button buttonCreateModif;
-        private ComboBox comboBoxSelectorMap;
-    }
-}

AirplaneWithRadar/AirplaneWithRadar/FormMap.cs

@@ -1,102 +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 FormMap : Form
-    {
-        private AbstractMap _abstractMap;
-        public FormMap()
-        {
-            InitializeComponent();
-            _abstractMap = new SimpleMap();
-        }
-        /// <summary>
-        /// Заполнение информации по объекту
-        /// </summary>
-        /// <param name="car"></param>
-        private void SetData(DrawingAirplane airplane)
-        {
-            toolStripStatusLabelSpeed.Text = $"Скорость: {airplane.Airplane.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {airplane.Airplane.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Цвет:{airplane.Airplane.BodyColor.Name}";
-            pictureBoxAirplane.Image = _abstractMap.CreateMap(pictureBoxAirplane.Width,pictureBoxAirplane.Height,new DrawingObjectAirplane(airplane));
-        }
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var airplane = new DrawingAirplane(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            SetData(airplane);
-
-        }
-
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            //получаем имя кнопки
-            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;
-            }
-            pictureBoxAirplane.Image = _abstractMap?.MoveObject(dir);
-
-        }
-
-        /// <summary>
-        /// Обработка нажатия кнопки "Модификация"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreateModif_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var airplane = new DrawingAirplaneWithRadar(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
-            Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
-            SetData(airplane);
-
-        }
-
-
-        private void FormMap_Load(object sender, EventArgs e)
-        {
-
-        }
-
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Простая карта":
-                    _abstractMap = new SimpleMap();
-                    break;
-                case "Собственная карта":
-                    _abstractMap = new MyMap();
-                    break;
-            }
-        }
-    }
-}

AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.Designer.cs

@@ -0,0 +1,212 @@
+namespace AirplaneWithRadar
+{
+    partial class FormMapWithSetAirplanes
+    {
+        /// <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.groupBox = 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.buttonShowOnMap = new System.Windows.Forms.Button();
+            this.buttonShowStorage = new System.Windows.Forms.Button();
+            this.buttonRemoveAirplane = new System.Windows.Forms.Button();
+            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+            this.buttonAddAirplane = new System.Windows.Forms.Button();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.groupBox.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBox
+            // 
+            this.groupBox.Controls.Add(this.buttonRight);
+            this.groupBox.Controls.Add(this.buttonDown);
+            this.groupBox.Controls.Add(this.buttonLeft);
+            this.groupBox.Controls.Add(this.buttonUp);
+            this.groupBox.Controls.Add(this.buttonShowOnMap);
+            this.groupBox.Controls.Add(this.buttonShowStorage);
+            this.groupBox.Controls.Add(this.buttonRemoveAirplane);
+            this.groupBox.Controls.Add(this.maskedTextBoxPosition);
+            this.groupBox.Controls.Add(this.buttonAddAirplane);
+            this.groupBox.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBox.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBox.Location = new System.Drawing.Point(723, 0);
+            this.groupBox.Name = "groupBox";
+            this.groupBox.Size = new System.Drawing.Size(257, 526);
+            this.groupBox.TabIndex = 0;
+            this.groupBox.TabStop = false;
+            this.groupBox.Text = "Инструменты";
+            // 
+            // buttonRight
+            // 
+            this.buttonRight.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.right;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(160, 433);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            this.buttonRight.TabIndex = 10;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.down;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(124, 433);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.TabIndex = 9;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonLeft
+            // 
+            this.buttonLeft.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.left;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(88, 433);
+            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.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.up;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(124, 397);
+            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(23, 319);
+            this.buttonShowOnMap.Name = "buttonShowOnMap";
+            this.buttonShowOnMap.Size = new System.Drawing.Size(222, 34);
+            this.buttonShowOnMap.TabIndex = 6;
+            this.buttonShowOnMap.Text = "Посмотреть карту";
+            this.buttonShowOnMap.UseVisualStyleBackColor = true;
+            this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
+            // 
+            // buttonShowStorage
+            // 
+            this.buttonShowStorage.Location = new System.Drawing.Point(23, 251);
+            this.buttonShowStorage.Name = "buttonShowStorage";
+            this.buttonShowStorage.Size = new System.Drawing.Size(222, 37);
+            this.buttonShowStorage.TabIndex = 5;
+            this.buttonShowStorage.Text = "Посмотреть хранилище";
+            this.buttonShowStorage.UseVisualStyleBackColor = true;
+            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+            // 
+            // buttonRemoveAirplane
+            // 
+            this.buttonRemoveAirplane.Location = new System.Drawing.Point(23, 186);
+            this.buttonRemoveAirplane.Name = "buttonRemoveAirplane";
+            this.buttonRemoveAirplane.Size = new System.Drawing.Size(222, 34);
+            this.buttonRemoveAirplane.TabIndex = 4;
+            this.buttonRemoveAirplane.Text = "Удалить самолет";
+            this.buttonRemoveAirplane.UseVisualStyleBackColor = true;
+            this.buttonRemoveAirplane.Click += new System.EventHandler(this.ButtonRemoveAirplane_Click);
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(23, 149);
+            this.maskedTextBoxPosition.Mask = "00";
+            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(222, 31);
+            this.maskedTextBoxPosition.TabIndex = 3;
+            // 
+            // buttonAddAirplane
+            // 
+            this.buttonAddAirplane.Location = new System.Drawing.Point(23, 94);
+            this.buttonAddAirplane.Name = "buttonAddAirplane";
+            this.buttonAddAirplane.Size = new System.Drawing.Size(222, 34);
+            this.buttonAddAirplane.TabIndex = 2;
+            this.buttonAddAirplane.Text = "Добавить самолет";
+            this.buttonAddAirplane.UseVisualStyleBackColor = true;
+            this.buttonAddAirplane.Click += new System.EventHandler(this.ButtonAddAirplane_Click);
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Карта с линиями",
+            "Карта с блоками"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(23, 44);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(222, 33);
+            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(723, 526);
+            this.pictureBox.TabIndex = 1;
+            this.pictureBox.TabStop = false;
+            // 
+            // FormMapWithSetAirplanes
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(980, 526);
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.groupBox);
+            this.Name = "FormMapWithSetAirplanes";
+            this.Text = "FormMapWithSetAirplanes";
+            this.groupBox.ResumeLayout(false);
+            this.groupBox.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBox;
+        private Button buttonRight;
+        private Button buttonDown;
+        private Button buttonLeft;
+        private Button buttonUp;
+        private Button buttonShowOnMap;
+        private Button buttonShowStorage;
+        private Button buttonRemoveAirplane;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonAddAirplane;
+        private ComboBox comboBoxSelectorMap;
+        private PictureBox pictureBox;
+    }
+}

AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.cs

@@ -0,0 +1,166 @@
+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;
+using static System.Windows.Forms.DataFormats;
+
+namespace AirplaneWithRadar
+{
+    public partial class FormMapWithSetAirplanes : Form
+    {
+        /// <summary>
+        /// Объект от класса карты с набором объектов
+        /// </summary>
+        private MapWithSetAirplanesGeneric<DrawingObjectAirplane, AbstractMap> _mapAirplanesCollectionGeneric;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormMapWithSetAirplanes()
+        {
+            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 "Простая карта":
+                    map = new SimpleMap();
+                    break;
+                case "Карта с линиями":
+                    map = new LineMap();
+                    break;
+                case "Карта с блоками":
+                    map = new BlockMap();
+                    break;
+            }
+            if (map != null)
+            {
+                _mapAirplanesCollectionGeneric = new MapWithSetAirplanesGeneric<DrawingObjectAirplane, AbstractMap>(pictureBox.Width, pictureBox.Height, map);
+            }
+            else
+            {
+                _mapAirplanesCollectionGeneric = null;
+            }
+        }
+        /// <summary>
+        /// Добавление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddAirplane_Click(object sender, EventArgs e)
+        {
+            if (_mapAirplanesCollectionGeneric == null)
+            {
+                return;
+            }
+            FormAirplaneWithRadar form = new();
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                DrawingObjectAirplane airplane = new(form.SelectedAirplane);
+                if (_mapAirplanesCollectionGeneric + airplane != -1)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBox.Image = _mapAirplanesCollectionGeneric.ShowSet();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+        }
+        /// <summary>
+        /// Удаление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRemoveAirplane_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 (_mapAirplanesCollectionGeneric - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _mapAirplanesCollectionGeneric.ShowSet();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+        /// <summary>
+        /// Вывод набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowStorage_Click(object sender, EventArgs e)
+        {
+            if (_mapAirplanesCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapAirplanesCollectionGeneric.ShowSet();
+        }
+        /// <summary>
+        /// Вывод карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowOnMap_Click(object sender, EventArgs e)
+        {
+            if (_mapAirplanesCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapAirplanesCollectionGeneric.ShowOnMap();
+        }
+        /// <summary>
+        /// Перемещение
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if (_mapAirplanesCollectionGeneric == 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 = _mapAirplanesCollectionGeneric.MoveObject(dir);
+        }
+    }
+}

AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.resx

@@ -57,7 +57,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>

AirplaneWithRadar/AirplaneWithRadar/LineMap.cs

@@ -9,7 +9,7 @@ namespace AirplaneWithRadar
     /// <summary>
     /// Собственная реализация абсрактного класса AbstractMap
     /// </summary>
-    internal class MyMap : AbstractMap
+    internal class LineMap : AbstractMap
     {
         /// <summary>
         /// Цвет участка закрытого
@@ -57,34 +57,9 @@ namespace AirplaneWithRadar
                         counter++;
                     }
                 }
-                j++;
+                j += 3;
             }
-            //for (int i = 0; i < _map.GetLength(0); ++i)
+            
-            //{
-            //    int startX = _random.Next(0, 90);
-            //    int x = _random.Next(0, 100 - startX - 10);
-            //    counter = x;
-            //    while (counter > 0)
-            //    {
-            //        for (int j = 0; j < _map.GetLength(1); ++j)
-            //        {
-            //            _map[i, j] = _barrier;
-            //            counter--;
-            //        }
-            //    }
-                
-            //}
-            //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/MapWithSetAirplanesGeneric.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -26,11 +27,11 @@ namespace AirplaneWithRadar
         /// <summary>
         /// Размер занимаемого объектом места (ширина)
         /// </summary>
-        private readonly int _placeSizeWidth = 210;
+        private readonly int _placeSizeWidth = 314;
         /// <summary>
         /// Размер занимаемого объектом места (высота)
         /// </summary>
-        private readonly int _placeSizeHeight = 90;
+        private readonly int _placeSizeHeight = 128;
         /// <summary>
         /// Набор объектов
         /// </summary>
@@ -60,7 +61,7 @@ namespace AirplaneWithRadar
         /// <param name="map"></param>
         /// <param name="airplanes"></param>
         /// <returns></returns>
-        public static bool operator +(MapWithSetAirplanesGeneric<T, U> map, T airplane)
+        public static int operator +(MapWithSetAirplanesGeneric<T, U> map, T airplane)
         {
             return map._setAirplanes.Insert(airplane);
         }
@@ -70,7 +71,7 @@ namespace AirplaneWithRadar
         /// <param name="map"></param>
         /// <param name="position"></param>
         /// <returns></returns>
-        public static bool operator -(MapWithSetAirplanesGeneric<T, U> map, int position)
+        public static T operator -(MapWithSetAirplanesGeneric<T, U> map, int position)
         {
             return map._setAirplanes.Remove(position);
         }
@@ -128,10 +129,10 @@ namespace AirplaneWithRadar
                 {
                     for (; j > i; j--)
                     {
-                        var car = _setAirplanes.Get(j);
+                        var airplane = _setAirplanes.Get(j);
-                        if (car != null)
+                        if (airplane != null)
                         {
-                            _setAirplanes.Insert(car, i);
+                            _setAirplanes.Insert(airplane, i);
                             _setAirplanes.Remove(j);
                             break;
                         }
@@ -147,29 +148,49 @@ namespace AirplaneWithRadar
         /// Метод отрисовки фона
         /// </summary>
         /// <param name="g"></param>
-        private void DrawBackground(Graphics g)
+        private void DrawHangar(Graphics g, int x, int y, int width, int height)
         {
             Pen pen = new(Color.Black, 3);
+            g.DrawLine(pen, x, y, x + width, y);
+            g.DrawLine(pen, x, y, x, y + height + 20);
+            g.DrawLine(pen, x, y + height + 20, x + width, y + height + 20);
+        }
+        /// <summary>
+        /// Метод отрисовки фона
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBackground(Graphics g)
+        {
+            Pen pen = new(Color.White, 3);
+            g.FillRectangle(Brushes.Gray, 0, 0, _pictureWidth, _pictureHeight);
+
             for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
             {
-                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
+                for (int j = 0; j < _pictureHeight / _placeSizeHeight; j++)
-                {//линия рамзетки места
+                {
-                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
+                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth * 3/4, j * _placeSizeHeight);
                 }
                 g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+
             }
         }
+
         /// <summary>
         /// Метод прорисовки объектов
         /// </summary>
         /// <param name="g"></param>
         private void DrawAirplanes(Graphics g)
         {
+
+            int numInRow = _pictureWidth / _placeSizeWidth;
+            int maxLeft = (numInRow - 1) * _placeSizeWidth;
             for (int i = 0; i < _setAirplanes.Count; i++)
             {
-                // TODO установка позиции
+                var airplane = _setAirplanes.Get(i);
-                _setAirplanes.Get(i)?.DrawingObject(g);
+                airplane?.SetObject(maxLeft - i % numInRow * _placeSizeWidth + 5, i / numInRow * _placeSizeHeight + 10, _pictureWidth, _pictureHeight);
+                airplane?.DrawingObject(g);
             }
         }
+        
     }
 }

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 FormMap());
+            Application.Run(new FormMapWithSetAirplanes());
         }
     }
 }

AirplaneWithRadar/AirplaneWithRadar/SetAirplanesGeneric.cs

@@ -34,10 +34,10 @@ namespace AirplaneWithRadar
         /// </summary>
         /// <param name="airplane">Добавляемый автомобиль</param>
         /// <returns></returns>
-        public bool Insert(T airplane)
+        public int Insert(T airplane)
         {
             // TODO вставка в начало набора
-            return true;
+            return Insert(airplane, 0);
         }
         /// <summary>
         /// Добавление объекта в набор на конкретную позицию
@@ -45,25 +45,54 @@ namespace AirplaneWithRadar
         /// <param name="airplane">Добавляемый автомобиль</param>
         /// <param name="position">Позиция</param>
         /// <returns></returns>
-        public bool Insert(T airplane, int position)
+        public int Insert(T airplane, int position)
         {
             // TODO проверка позиции
             // TODO проверка, что элемент массива по этой позиции пустой, если нет, то проверка, что после вставляемого элемента в массиве есть пустой элемент
             // сдвиг всех объектов, находящихся справа от позиции до первого пустого элемента
             // TODO вставка по позиции
+            if (position >= _places.Length)
+            {
+                return -1;
+            }
+            if (_places[position] != null)
+            {
+                int indexNull = -1;
+                for (int i = position; i < _places.Length; i++)
+                {
+                    if (_places[i] == null)
+                    {
+                        indexNull = i;
+                        break;
+                    }
+                }
+                if (indexNull == -1) return -1;
+                for (int i = indexNull; i > position; i--)
+                {
+                    T tmp = _places[i];
+                    _places[i] = _places[i - 1];
+                    _places[i - 1] = tmp;
+                }
+            }
             _places[position] = airplane;
-            return true;
+            return position;
         }
         /// <summary>
         /// Удаление объекта из набора с конкретной позиции
         /// </summary>
         /// <param name="position"></param>
         /// <returns></returns>
-        public bool Remove(int position)
+        public T Remove(int position)
         {
             // TODO проверка позиции
             // TODO удаление объекта из массива, присовив элементу массива значение null
-            return true;
+            if (position >= _places.Length)
+            {
+                return null;
+            }
+            T removedObject = _places[position];
+            _places[position] = null;
+            return removedObject;
         }
         /// <summary>
         /// Получение объекта из набора по позиции
@@ -73,6 +102,10 @@ namespace AirplaneWithRadar
         public T Get(int position)
         {
             // TODO проверка позиции
+            if (position >= _places.Length)
+            {
+                return null;
+            }
             return _places[position];
         }
     }