лаб 2

Airbus.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.33530.505
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AirBus", "AirBus\AirBus.csproj", "{97F3FB83-880E-4D1D-B941-1FB2F9B5C747}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectAirbus", "AirBus\ProjectAirbus.csproj", "{97F3FB83-880E-4D1D-B941-1FB2F9B5C747}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Airbus/DrawningAirbus.cs

@@ -1,156 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http.Headers;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBus
-{
-    public class DrawningAirBus
-    {
-        public EntityAirBus? EntityAirBus { get; private set; }
-
-        // ширина и высота картинки
-        private int pictureWidht;
-        private int pictureHeight;
-
-        // стартовые точки
-        private int startPosX;
-        private int startPosY;
-
-        private readonly int airbusWidth = 100;
-        private readonly int airbusHeight = 37;
-
-        public bool Init(int speed, double weight, Color bodyColor, Color additionalColor, int width, int height)
-        {
-            pictureWidht = width;
-            pictureHeight = height;
-
-            EntityAirBus = new EntityAirBus();
-            EntityAirBus.Init(speed, weight, bodyColor, additionalColor);
-            return true;
-        }
-
-        //установка позиции
-        public void SetPosition(int x, int y)
-        {
-            if (x >= 0 && x + airbusWidth <= pictureWidht && y >= 0 && y + airbusHeight <= pictureHeight)
-            {
-                startPosX = x;
-                startPosY = y;
-            }
-        }
-
-        // изменение направления движения
-        public void MoveTransport(Direction direction)
-        {
-            if (EntityAirBus == null)
-            {
-                return;
-            }
-            switch (direction)
-            {
-                case Direction.Left:
-                    if (startPosX - EntityAirBus.Step > 0)
-                    {
-                        startPosX -= (int)EntityAirBus.Step;
-                    }
-                    break;
-                case Direction.Right:
-                    if (startPosX + EntityAirBus.Step <= pictureWidht)
-                    {
-                        startPosX += (int)EntityAirBus.Step;
-                    }
-                    break;
-                case Direction.Up:
-                    if (startPosY - EntityAirBus.Step > 0)
-                    {
-                        startPosY -= (int)EntityAirBus.Step;
-                    }
-                    break;
-                case Direction.Down:
-                    if (startPosY + EntityAirBus.Step <= pictureHeight)
-                    {
-                        startPosY += (int)EntityAirBus.Step;
-                    }
-                    break;
-            }
-        }
-
-        // РИСОВАНИЕ САМОЛЁТА
-        public void DrawTransport(Graphics g)
-        {
-            if ( startPosX < 0 || startPosY < 0 || EntityAirBus == null)
-            {
-                return;
-            }
-            Pen pen = new(Color.Black);
-            Brush additionalBrush = new SolidBrush(EntityAirBus.AdditionalColor);
-            Brush additionalBrush2 = new SolidBrush(Color.Black);
-
-            // нос
-            Point point1 = new Point(startPosX + 74, startPosY + 15);
-            Point point2 = new Point(startPosX + 88, startPosY + 22);
-            Point point3 = new Point(startPosX + 74, startPosY + 27);
-            Point[] PointsNose = { point1, point2, point3 };
-
-            g.DrawPolygon(pen, PointsNose);
-            g.FillPolygon(additionalBrush, PointsNose);
-
-            // хвост
-            Point point4 = new Point(startPosX + 4, startPosY + 17);
-            Point point5 = new Point(startPosX + 3, startPosY);
-            Point point6 = new Point(startPosX + 21, startPosY + 17);
-
-            Point[] PointsTail = { point4, point5, point6 };
-            g.DrawPolygon(pen, PointsTail);
-            g.FillPolygon(additionalBrush, PointsTail);
-
-            // тело
-            g.DrawRectangle(pen, startPosX + 2, startPosY + 14, 72, 14);
-            g.FillRectangle(additionalBrush, startPosX + 2, startPosY + 14, 72, 14);
-
-            //шасси
-            g.DrawEllipse(pen, startPosX + 21, startPosY + 30, 3, 3);
-            g.FillEllipse(additionalBrush, startPosX + 21, startPosY + 30, 3, 3);
-
-            g.DrawEllipse(pen, startPosX + 25, startPosY + 30, 3, 3);
-            g.FillEllipse(additionalBrush, startPosX + 25, startPosY + 30, 3, 3);
-
-            g.DrawEllipse(pen, startPosX + 70, startPosY + 30, 3, 3);
-            g.FillEllipse(additionalBrush, startPosX + 70, startPosY + 30, 3, 3);
-
-            // Крыло
-            g.DrawEllipse(pen, startPosX + 24, startPosY + 20, 31, 4);
-            g.FillEllipse(additionalBrush, startPosX + 24, startPosY + 20, 31, 4);
-
-
-            // у хвоста
-            g.DrawEllipse(pen, startPosX, startPosY + 14, 14, 5);
-            g.FillEllipse(additionalBrush, startPosX, startPosY + 14, 14, 5);
-
-        }
-
-        public void ChangeBorders(int width, int height)
-        {
-            pictureWidht = width;
-            pictureHeight = height;
-            if (pictureWidht <= airbusWidth || pictureHeight <= airbusWidth)
-            {
-                pictureWidht = null;
-                pictureHeight = null;
-                return;
-            }
-            if ( startPosX + airbusWidth > pictureWidht)
-            {
-                startPosX = pictureWidht.Value - airbusWidth;
-            }
-            if ( startPosY + airbusHeight > pictureHeight)
-            {
-                startPosY = pictureHeight.Value - airbusHeight;
-            }
-        }
-    }
-}

Airbus/Drawnings/DrawningAirbus.cs

@@ -0,0 +1,156 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ProjectAirbus.Entities;
+
+namespace ProjectAirbus.Drawnings
+{
+    internal class DrawningAirbus
+    {
+        public EntityAirbus? EntityAirbus { get; protected set; }
+        private int _pictureWidth;
+        private int _pictureHeight;
+
+        protected int _startPosX;
+        protected int _startPosY;
+
+        protected readonly int _airbusWidth = 89;
+        protected readonly int _airbusHeight = 34;
+
+        // доработки для интерфейса
+        public int GetPosX => _startPosX;
+        public int GetPosY => _startPosY;
+        public int GetWidth => _airbusWidth;
+        public int GetHeight => _airbusHeight;
+
+        public DrawningAirbus(int speed, double weight, Color bodyColor, int
+        width, int height)
+        {
+            if (width < _airbusWidth || height < _airbusHeight)
+            {
+                return;
+            }
+            _pictureWidth = width;
+            _pictureHeight = height;
+            EntityAirbus = new EntityAirbus(speed, weight, bodyColor);
+        }
+        protected DrawningAirbus(int speed, double weight, Color bodyColor, int width, int height, int carWidth, int carHeight)
+        {
+            if (width < _airbusWidth || height < _airbusHeight)
+            {
+                return;
+            }
+            _pictureWidth = width;
+            _pictureHeight = height;
+            _airbusWidth = carWidth;
+            _airbusHeight = carHeight;
+            EntityAirbus = new EntityAirbus(speed, weight, bodyColor);
+        }
+
+        // доработка для интерфейса
+        // проверка, что может переместиться
+        public bool CanMove(DirectionType direction)
+        {
+            if (EntityAirbus == null)
+            {
+                return false;
+            }
+            return direction switch
+            {
+                DirectionType.Left => _startPosX - EntityAirbus.Step > 0,
+                DirectionType.Up => _startPosY - EntityAirbus.Step > 0,
+                DirectionType.Right => _startPosX + _airbusWidth + EntityAirbus.Step < _pictureWidth,
+                DirectionType.Down => _startPosY + _airbusHeight + EntityAirbus.Step < _pictureHeight,
+            };
+        }
+
+        public void SetPosition(int x, int y)
+        {
+            if (x >= _pictureWidth || y >= _pictureHeight)
+            {
+                x = _pictureWidth - _airbusWidth;
+                y = _pictureHeight - _airbusHeight;
+            }
+            _startPosX = x;
+            _startPosY = y;
+        }
+
+        public void MoveTransport(DirectionType direction)
+        {
+            if (!CanMove(direction) || EntityAirbus == null)
+            {
+                return;
+            }
+            switch (direction)
+            {
+                case DirectionType.Left:
+                    _startPosX -= (int)EntityAirbus.Step;
+                    break;
+                case DirectionType.Right:
+                    _startPosX += (int)EntityAirbus.Step;
+                    break;
+                case DirectionType.Up:
+                    _startPosY -= (int)EntityAirbus.Step;
+                    break;
+                case DirectionType.Down:
+                    _startPosY += (int)EntityAirbus.Step;
+                    break;
+            }
+        }
+
+        // прорисовка
+        public virtual void DrawTransport(Graphics g)
+        {
+            if (EntityAirbus == null)
+            {
+                return;
+            }
+            Pen pen = new(Color.Black);
+            Brush bodyBrush = new SolidBrush(EntityAirbus.BodyColor);
+            Brush brYellow = new SolidBrush(Color.Yellow);
+
+            // нос
+            Point point1 = new Point(_startPosX + 74, _startPosY + 15);
+            Point point2 = new Point(_startPosX + 88, _startPosY + 22);
+            Point point3 = new Point(_startPosX + 74, _startPosY + 27);
+            Point[] PointsNose = { point1, point2, point3 };
+
+            g.DrawPolygon(pen, PointsNose);
+            g.FillPolygon(brYellow, PointsNose);
+
+            // хвост
+            Point point4 = new Point(_startPosX + 4, _startPosY + 17);
+            Point point5 = new Point(_startPosX + 3, _startPosY);
+            Point point6 = new Point(_startPosX + 21, _startPosY + 17);
+
+            Point[] PointsTail = { point4, point5, point6 };
+            g.DrawPolygon(pen, PointsTail);
+            g.FillPolygon(brYellow, PointsTail);
+
+            // тело
+            g.DrawRectangle(pen, _startPosX + 2, _startPosY + 14, 72, 14);
+            g.FillRectangle(bodyBrush, _startPosX + 2, _startPosY + 14, 72, 14);
+
+            //шасси
+            g.DrawEllipse(pen, _startPosX + 21, _startPosY + 30, 3, 3);
+            g.FillEllipse(brYellow, _startPosX + 21, _startPosY + 30, 3, 3);
+
+            g.DrawEllipse(pen, _startPosX + 25, _startPosY + 30, 3, 3);
+            g.FillEllipse(brYellow, _startPosX + 25, _startPosY + 30, 3, 3);
+
+            g.DrawEllipse(pen, _startPosX + 70, _startPosY + 30, 3, 3);
+            g.FillEllipse(brYellow, _startPosX + 70, _startPosY + 30, 3, 3);
+
+            // Крыло
+            g.DrawEllipse(pen, _startPosX + 24, _startPosY + 20, 31, 4);
+            g.FillEllipse(brYellow, _startPosX + 24, _startPosY + 20, 31, 4);
+
+            // двигатель у хвоста
+            g.DrawEllipse(pen, _startPosX, _startPosY + 14, 14, 5);
+            g.FillEllipse(brYellow, _startPosX, _startPosY + 14, 14, 5);
+        }
+
+    }
+}

Airbus/Drawnings/DrawningPlane.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ProjectAirbus.Entities;
+
+namespace ProjectAirbus.Drawnings
+{
+    internal class DrawningPlane : DrawningAirbus
+    {
+        public DrawningPlane(int speed, double weight, Color bodyColor, Color additionalColor,bool isCompartment, bool isAdditionalEngine, int width, int height) :
+            base (speed, weight, bodyColor, width, height, 110, 60)
+        {
+            if (EntityAirbus != null)
+            {
+                EntityAirbus = new EntityPlane(speed, weight, bodyColor, additionalColor, isCompartment, isAdditionalEngine);
+            }
+        }
+
+        public override void DrawTransport(Graphics g)
+        {
+           if (EntityAirbus is not EntityPlane superAirbus)
+            {
+                return;
+            }
+            Pen pen = new(Color.Black);
+            Brush bodyBrush = new SolidBrush(EntityAirbus.BodyColor);
+            Brush additionalBrush = new SolidBrush(superAirbus.AdditionalColor);
+
+            // доп отсек
+            if (superAirbus.IsCompartment)
+            {
+                g.DrawEllipse(pen, _startPosX + 51, _startPosY + 10, 24, 10);
+                g.FillEllipse(bodyBrush, _startPosX + 51, _startPosY + 10, 24, 10);
+            }
+
+            base.DrawTransport(g);
+
+            // доп двигатель
+            if (superAirbus.IsAdditionalEngine)
+            {
+                g.DrawEllipse(pen, _startPosX, _startPosY + 20, 11, 5);
+                g.FillEllipse(additionalBrush, _startPosX, _startPosY + 20, 11, 5);
+            }
+        }
+    }
+}

Airbus/Entities/DirectionType.cs

@@ -4,9 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AirBus
+namespace ProjectAirbus.Entities
 {
-    public enum Direction
+    public enum DirectionType
     {
         Up = 1,
         Down = 2,

Airbus/Entities/EntityAirbus.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectAirbus.Entities
+{
+    internal class EntityAirbus
+    {
+        public int Speed { get; private set; }
+        public double Weight { get; private set; }
+        public Color BodyColor { get; private set; }
+
+        public double Step => (double)Speed * 100 / Weight;
+        public EntityAirbus(int speed, double weight, Color bodyColor)
+        {
+            Speed = speed;
+            Weight = weight;
+            BodyColor = bodyColor;
+        }
+    }
+}

Airbus/Entities/EntityPlane.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectAirbus.Entities
+{
+    internal class EntityPlane : EntityAirbus
+    {
+        public Color AdditionalColor { get; private set; }
+        public bool IsCompartment { get; private set; }
+        public bool IsAdditionalEngine { get; private set; }
+
+        public EntityPlane(int speed, double weight, Color bodyColor, Color additionalColor, bool isCompartment, bool isAdditionalEngine) :
+            base(speed, weight, bodyColor)
+        {
+            AdditionalColor = additionalColor;
+            IsCompartment = isCompartment;
+            IsAdditionalEngine = isAdditionalEngine;
+        }
+    }
+}

Airbus/EntityAirbus.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBus
-{
-    public class EntityAirBus
-    {
-        // Скорость
-        public int Speed { get; private set; }
-
-        // Вес
-        public double Weight { get; private set; }
-
-        // основной цвет
-        public Color BodyColor { get; private set; }
-
-        // доп. цвет
-        public Color AdditionalColor { get; private set; }
-
-        // наличие доп отсека для пассажиров
-        public bool IsCompartment { get; private set; }
-
-        // наличие доп двигателей
-        public bool IsAdditionalEngine { get; private set; }
-
-        // шаг перемещения
-        public double Step => (double)Speed * 100 / Weight;
-
-        public void Init (int speed, double weight, Color bodyColor, Color additionalColor, bool isCompartment, bool isAdditionalEngine)
-        {
-            Speed = speed;
-            Weight = weight;
-            BodyColor = bodyColor;
-            AdditionalColor = additionalColor;
-            IsCompartment = isCompartment;
-            IsAdditionalEngine = isAdditionalEngine;
-        }
-    }
-}

Airbus/FormAirbus.Designer.cs

@@ -1,4 +1,4 @@
-namespace Airbus
+namespace ProjectAirbus
 {
     partial class FormAirbus
     {
@@ -29,33 +29,36 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormAirbus));
-            pictureAirbus = new PictureBox();
+            pictureAirBus=new PictureBox();
             buttonUp=new Button();
             buttonLeft=new Button();
             buttonDown=new Button();
             buttonRight=new Button();
             buttonCreate=new Button();
-            ((System.ComponentModel.ISupportInitialize)pictureAirbus).BeginInit();
+            buttonCreateSuperAirbus=new Button();
+            buttonStep=new Button();
+            comboBoxStrategy=new ComboBox();
+            ((System.ComponentModel.ISupportInitialize)pictureAirBus).BeginInit();
             SuspendLayout();
             // 
-            // pictureAirbus
+            // pictureAirBus
             // 
-            pictureAirbus.Dock = DockStyle.Fill;
+            pictureAirBus.Dock=DockStyle.Fill;
-            pictureAirbus.Location = new Point(0, 0);
+            pictureAirBus.Location=new Point(0, 0);
-            pictureAirbus.Name = "pictureAirbus";
+            pictureAirBus.Name="pictureAirBus";
-            pictureAirbus.Size = new Size(800, 450);
+            pictureAirBus.Size=new Size(790, 410);
-            pictureAirbus.SizeMode = PictureBoxSizeMode.AutoSize;
+            pictureAirBus.SizeMode=PictureBoxSizeMode.AutoSize;
-            pictureAirbus.TabIndex = 0;
+            pictureAirBus.TabIndex=0;
-            pictureAirbus.TabStop = false;
+            pictureAirBus.TabStop=false;
             // 
             // buttonUp
             // 
             buttonUp.Anchor=AnchorStyles.Bottom|AnchorStyles.Right;
             buttonUp.BackgroundImage=(Image)resources.GetObject("buttonUp.BackgroundImage");
-            buttonUp.BackgroundImageLayout = ImageLayout.Zoom;
+            buttonUp.BackgroundImageLayout=ImageLayout.Stretch;
             buttonUp.FlatAppearance.BorderColor=Color.Black;
             buttonUp.FlatAppearance.BorderSize=7;
-            buttonUp.Location = new Point(679, 313);
+            buttonUp.Location=new Point(679, 309);
             buttonUp.Name="buttonUp";
             buttonUp.Size=new Size(48, 44);
             buttonUp.TabIndex=1;
@@ -65,25 +68,26 @@
             // buttonLeft
             // 
             buttonLeft.Anchor=AnchorStyles.Bottom|AnchorStyles.Right;
+            buttonLeft.BackColor=SystemColors.Control;
             buttonLeft.BackgroundImage=(Image)resources.GetObject("buttonLeft.BackgroundImage");
-            buttonLeft.BackgroundImageLayout = ImageLayout.Zoom;
+            buttonLeft.BackgroundImageLayout=ImageLayout.Stretch;
             buttonLeft.FlatAppearance.BorderColor=Color.Black;
             buttonLeft.FlatAppearance.BorderSize=7;
-            buttonLeft.Location = new Point(630, 358);
+            buttonLeft.Location=new Point(630, 354);
             buttonLeft.Name="buttonLeft";
             buttonLeft.Size=new Size(48, 44);
             buttonLeft.TabIndex=2;
-            buttonLeft.UseVisualStyleBackColor = true;
+            buttonLeft.UseVisualStyleBackColor=false;
             buttonLeft.Click+=buttonMove_Click;
             // 
             // buttonDown
             // 
             buttonDown.Anchor=AnchorStyles.Bottom|AnchorStyles.Right;
             buttonDown.BackgroundImage=(Image)resources.GetObject("buttonDown.BackgroundImage");
-            buttonDown.BackgroundImageLayout = ImageLayout.Zoom;
+            buttonDown.BackgroundImageLayout=ImageLayout.Stretch;
             buttonDown.FlatAppearance.BorderColor=Color.Black;
             buttonDown.FlatAppearance.BorderSize=7;
-            buttonDown.Location = new Point(679, 358);
+            buttonDown.Location=new Point(679, 354);
             buttonDown.Name="buttonDown";
             buttonDown.Size=new Size(48, 44);
             buttonDown.TabIndex=3;
@@ -94,10 +98,10 @@
             // 
             buttonRight.Anchor=AnchorStyles.Bottom|AnchorStyles.Right;
             buttonRight.BackgroundImage=(Image)resources.GetObject("buttonRight.BackgroundImage");
-            buttonRight.BackgroundImageLayout = ImageLayout.Zoom;
+            buttonRight.BackgroundImageLayout=ImageLayout.Stretch;
             buttonRight.FlatAppearance.BorderColor=Color.Black;
             buttonRight.FlatAppearance.BorderSize=7;
-            buttonRight.Location = new Point(728, 358);
+            buttonRight.Location=new Point(728, 354);
             buttonRight.Name="buttonRight";
             buttonRight.Size=new Size(48, 44);
             buttonRight.TabIndex=4;
@@ -107,39 +111,78 @@
             // buttonCreate
             // 
             buttonCreate.Anchor=AnchorStyles.Bottom|AnchorStyles.Left;
-            buttonCreate.Location = new Point(12, 387);
+            buttonCreate.Location=new Point(12, 347);
             buttonCreate.Name="buttonCreate";
-            buttonCreate.Size = new Size(81, 51);
+            buttonCreate.Size=new Size(128, 51);
             buttonCreate.TabIndex=5;
-            buttonCreate.Text = "Создать";
+            buttonCreate.Text="Создать самолёт";
             buttonCreate.UseVisualStyleBackColor=true;
             buttonCreate.Click+=buttonCreate_Click;
             // 
-            // FormAirbus
+            // buttonCreateSuperAirbus
+            // 
+            buttonCreateSuperAirbus.Anchor=AnchorStyles.Bottom|AnchorStyles.Left;
+            buttonCreateSuperAirbus.Location=new Point(146, 347);
+            buttonCreateSuperAirbus.Name="buttonCreateSuperAirbus";
+            buttonCreateSuperAirbus.Size=new Size(127, 51);
+            buttonCreateSuperAirbus.TabIndex=6;
+            buttonCreateSuperAirbus.Text="Создать суперсамолёт";
+            buttonCreateSuperAirbus.UseVisualStyleBackColor=true;
+            buttonCreateSuperAirbus.Click+=buttonCreateSuperAirbus_Click;
+            // 
+            // buttonStep
+            // 
+            buttonStep.Anchor=AnchorStyles.Top|AnchorStyles.Right;
+            buttonStep.Location=new Point(671, 51);
+            buttonStep.Name="buttonStep";
+            buttonStep.Size=new Size(105, 37);
+            buttonStep.TabIndex=7;
+            buttonStep.Text="Шаг";
+            buttonStep.UseVisualStyleBackColor=true;
+            buttonStep.Click+=buttonStep_Click;
+            // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.Anchor=AnchorStyles.Top|AnchorStyles.Right;
+            comboBoxStrategy.DropDownStyle=ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled=true;
+            comboBoxStrategy.Items.AddRange(new object[] { "1", "2" });
+            comboBoxStrategy.Location=new Point(622, 22);
+            comboBoxStrategy.Name="comboBoxStrategy";
+            comboBoxStrategy.Size=new Size(156, 23);
+            comboBoxStrategy.TabIndex=8;
+            // 
+            // Form1
             // 
             AutoScaleDimensions=new SizeF(7F, 15F);
             AutoScaleMode=AutoScaleMode.Font;
-            ClientSize = new Size(800, 450);
+            ClientSize=new Size(790, 410);
+            Controls.Add(comboBoxStrategy);
+            Controls.Add(buttonStep);
+            Controls.Add(buttonCreateSuperAirbus);
             Controls.Add(buttonCreate);
             Controls.Add(buttonRight);
             Controls.Add(buttonDown);
             Controls.Add(buttonLeft);
             Controls.Add(buttonUp);
-            Controls.Add(pictureAirbus);
+            Controls.Add(pictureAirBus);
-            Name = "FormAirbus";
+            Name="Form1";
             Text="FormAirbus";
-            ((System.ComponentModel.ISupportInitialize)pictureAirbus).EndInit();
+            ((System.ComponentModel.ISupportInitialize)pictureAirBus).EndInit();
             ResumeLayout(false);
             PerformLayout();
         }
 
         #endregion
 
-        private PictureBox pictureAirbus;
+        private PictureBox pictureAirBus;
         private Button buttonUp;
         private Button buttonLeft;
         private Button buttonDown;
         private Button buttonRight;
         private Button buttonCreate;
+        private Button buttonCreateSuperAirbus;
+        private Button buttonStep;
+        private ComboBox comboBoxStrategy;
     }
 }

Airbus/FormAirbus.cs

@@ -1,42 +1,77 @@
-namespace Airbus
+using ProjectAirbus.Drawnings;
+using ProjectAirbus.MovementStrategy;
+using ProjectAirbus.Entities;
+
+namespace ProjectAirbus
 {
     public partial class FormAirbus : Form
     {
-
-        // поле-объект для прористовки самолёта
         private DrawningAirbus? _drawningAirbus;
+        private AbstractStrategy? _abstractStrategy;
+
         public FormAirbus()
         {
             InitializeComponent();
         }
 
-        // прорисовка самолёта
+        // прорисовка самолёта
         private void Draw()
         {
             if (_drawningAirbus == null)
             {
                 return;
             }
-            Bitmap bmp = new(pictureAirbus.Width, pictureAirbus.Height);
+            Bitmap bmp = new(pictureAirBus.Width, pictureAirBus.Height);
             Graphics g = Graphics.FromImage(bmp);
             _drawningAirbus.DrawTransport(g);
-            pictureAirbus.Image = bmp;
+            pictureAirBus.Image = bmp;
         }
 
-        // кнопка "Создать"
+        private void buttonDown_Click(object sender, EventArgs e)
+        {
+            buttonMove_Click(sender, e);
+        }
+
+        private void buttonUp_Click(object sender, EventArgs e)
+        {
+            buttonMove_Click(sender, e);
+        }
+
+        private void buttonRight_Click(object sender, EventArgs e)
+        {
+            buttonMove_Click(sender, e);
+        }
+
+        private void buttonLeft_Click(object sender, EventArgs e)
+        {
+            buttonMove_Click(sender, e);
+        }
+
+        // кнопка "Создать самолёт"
         private void buttonCreate_Click(object sender, EventArgs e)
         {
             Random random = new Random();
-            _drawningAirbus = new DrawningAirbus();
+            _drawningAirbus = new DrawningAirbus(random.Next(200, 400), random.Next(1000, 3000),
-            _drawningAirbus.Init(random.Next(100, 300), random.Next(1000, 3000),
+                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+                pictureAirBus.Width, pictureAirBus.Height);
+
+            _drawningAirbus.SetPosition(random.Next(10, 200), random.Next(10, 200));
+            Draw();
+
+        }
+
+        // кнопка "Создать суперсамолёт"
+        private void buttonCreateSuperAirbus_Click(object sender, EventArgs e)
+        {
+            Random random = new Random();
+            _drawningAirbus = new DrawningPlane(random.Next(200, 400), random.Next(1000, 3000),
                 Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
                 Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
                 Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)),
-                pictureAirbus.Width, pictureAirbus.Height);
+                pictureAirBus.Width, pictureAirBus.Height);
 
-            _drawningAirbus.SetPosition(random.Next(10,100), random.Next(10,100));
+            _drawningAirbus.SetPosition(random.Next(10, 200), random.Next(10, 200));
             Draw();
-
         }
 
         private void buttonMove_Click(object sender, EventArgs e)
@@ -49,15 +84,52 @@ namespace Airbus
             switch (name)
             {
                 case "buttonUp":
-                    _drawningAirbus.MoveTransport(Direction.Up); break;
+                    _drawningAirbus.MoveTransport(DirectionType.Up); break;
                 case "buttonDown":
-                    _drawningAirbus.MoveTransport(Direction.Down); break;
+                    _drawningAirbus.MoveTransport(DirectionType.Down); break;
                 case "buttonLeft":
-                    _drawningAirbus.MoveTransport(Direction.Left); break;
+                    _drawningAirbus.MoveTransport(DirectionType.Left); break;
                 case "buttonRight":
-                    _drawningAirbus.MoveTransport(Direction.Right); break;
+                    _drawningAirbus.MoveTransport(DirectionType.Right); break;
             }
             Draw();
         }
+
+        // Кнопка "Шаг"
+        private void buttonStep_Click(object sender, EventArgs e)
+        {
+            if (_drawningAirbus == null)
+            {
+                return;
+            }
+            if (comboBoxStrategy.Enabled)
+            {
+                _abstractStrategy = comboBoxStrategy.SelectedIndex
+                switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_abstractStrategy == null)
+                {
+                    return;
+                }
+                _abstractStrategy.SetData(new DrawningObjectAirbus(_drawningAirbus), pictureAirBus.Width, pictureAirBus.Height);
+                comboBoxStrategy.Enabled = false;
+            }
+            if (_abstractStrategy == null)
+            {
+                return;
+            }
+            _abstractStrategy.MakeStep();
+            Draw();
+            if (_abstractStrategy.GetStatus() == Status.Finish)
+            {
+                comboBoxStrategy.Enabled = true;
+                _abstractStrategy = null;
+            }
+        }
+
     }
 }

Airbus/FormAirbus.resx

@@ -133,18 +133,18 @@
         AgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkj
         M1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5
         eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm
-        5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A/fyv5Wv2qP8Agvj+2F4U/al+J2kaT8cda0zSdH8X6vp1
+        5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A/fyv5Wv2qf8Agvj+2F4V/al+JukaT8cNZ0zSdH8X6vp1
-        jZwaJpPl2tvBfTRRRrutSxCoijLEk4ySTk1/VLX8Tv7Y3H7Y3xg/7HvXv/TlcUAfsj/wbMf8FWP2hv22
+        jZwaJpPl2tvBfTRRRrutSxCoijLEk4ySTk1/VLX8Tv7Y3H7Y3xg/7HvXv/TlcUAfsh/wbN/8FV/2hv22
-        P2/PFXgv4r/E7UvG3hm1+H99rcFldaZp9v5N5DqOmQpKHgt434juZlK7tp3AkEqpH7o1/NX/AMGev/KU
+        f2+/FXgz4rfE7UPGvhm18AXutwWV1pmn2/k3kOo6ZCkoeC3jfiO5mUru2ncCQSqkfulX81f/AAZ6/wDK
-        7xj/ANkq1T/076LX9KlAH4G/8HMnwL/aQ/Y8+Nsnxv8Ah/8AGf41W/wj8cXMUF/ZaZ411O2t/B2p7Qix
+        U7xj/wBkq1T/ANO+i1/SpQB+Bf8Awcw/Az9pD9j742SfG74f/Gf41W/wj8cXMUF/ZaZ411O2t/B2p7Qi
-        CKKZVjtbjbmNgNqS74yV3wh/xQ1TU7rXNUur6+urm+vr6Z7m5ubmVpprmV2LPI7sSzOzEsWYkkkkkk1/
+        xCKKZVjtbjbmNgNqS74yV3wh/wAU9U1O61zVLq+vrq6vr6+me5ubm5laaa5ldizyO7EszsxLFmJJJJJJ
-        b18afgx4X/aJ+FHiDwN420Wz8ReE/FNlJp+qadcg+XcwuMEZUhlYcFXQh0YKylWAI/kc/wCCtH/BMbxR
+        Nf26/Gn4M+F/2iPhR4g8DeNtFs/EXhTxRZSafqmnXIPl3MLjBGVIZWHBV0IdGCspVgCP5IP+CtH/AATH
-        /wAEr/2rL7wTqv27U/B+riTUPB3iCZBt1qwDAFXZQE+1QFljmQBcEpIFVJo8gHgfwx+MfjD4G+IpdZ8D
+        8Uf8EsP2rL7wTqn27U/B+riTUPB3iCZBt1qwDAFXZQE+1QFljmQBcEpIFVJo8gHgfwx+MnjD4G+IpNZ8
-        +LvFngvWbi2aykvvDur3OmXk0DujtAZLd0dkZ442KZILIhwSox/VB/wQU/Y1+MH7Ln7KE2vfHT4i/Ebx
+        D+LvFngvWLi2aykvvDur3OmXk0DujtAZLd0dkZ442KZILIhwSox/U9/wQW/Y3+MH7Ln7KE2vfHT4jfEX
-        j8QviObfU7jRfE2v3eqR+ELZFfyLSMXEjlLllkL3DLtG7y48HyBI/wCcP/Brr/wRkb4n+J9L/af+Jmmx
+        xh8QviMbfU7jRvE+v3eqReELZFfyLSMXEjlLllkL3DLtG7y48HyBI/5w/wDBrx/wRlb4neJtL/ae+Jmm
-        t4b0K6Mnw/0q5i3f2lexNg6u6kY8qB1It+paZWl+URRNJ/QJQAV4r+3V/wAE+fhb/wAFHfhLZ+C/itoM
+        xt4b0K7Mnw/0q5i3f2lexNg6s6kY8qB1It+paZWl+URRNJ/QNQAV4l+3X/wT5+Fv/BRv4T2fgv4raDJr
-        mtaPp2pQ6raSW909pd2k0Zw3lzRkOqyRl4nAPKSNjDBWUooA9c8MeGdN8E+G9P0bRtPsdJ0fSbaOysbG
+        Wj6fqUOq2j2909pdWk0Zw3lzRkOqyRl4nAPKSNjDBWUooA9a8MeHdN8F+G9P0bR9PsdJ0fSbWKzsbGyg
-        ygW3trKCNQkcUUagKiIqhVVQAAAAABV6iigD/9k=
+        W3trKBFCRxRRqAqIiqFVVAAAAAAFadFFAH//2Q==
 </value>
   </data>
   <data name="buttonRight.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

Airbus/MovementStrategy/AbstractStrategy.cs

@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ProjectAirbus.Drawnings;
+using ProjectAirbus.Entities;
+
+namespace ProjectAirbus.MovementStrategy
+{
+    internal abstract class AbstractStrategy
+    { 
+        // объект
+        private IMoveableObject? _moveableObject;
+        // статус
+        private Status _state = Status.NotInit;
+        // границы окна
+        protected int FieldWidth { get; private set; }
+        protected int FieldHeight { get; private set; }
+        public Status GetStatus() { return _state; }
+
+        // Изменить статус, установить поля
+        public void SetData(IMoveableObject moveableObject, int width, int height)
+        {
+            if (moveableObject == null)
+            {
+                _state = Status.NotInit;
+                return;
+            }
+            _state = Status.InProgress;
+            _moveableObject = moveableObject;
+            FieldWidth = width;
+            FieldHeight = height;
+        }
+
+        // сделать шаг
+        public void MakeStep()
+        {
+            if (_state != Status.InProgress)
+            { 
+                return;
+            }
+            if (IsTargetDestination())
+            {
+                _state = Status.Finish;
+                return;
+            }
+            MoveToTarget();
+        }
+
+        // перемещения
+        protected bool MoveLeft() => MoveTo(DirectionType.Left);
+        protected bool MoveRight() => MoveTo(DirectionType.Right);
+        protected bool MoveUp() => MoveTo(DirectionType.Up);
+        protected bool MoveDown() => MoveTo(DirectionType.Down);
+
+        // параметры
+        protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition;
+        // шаг
+        protected int? GetStep()
+        {
+            if (_state != Status.InProgress)
+            {
+                return null;
+            }
+            return _moveableObject?.GetStep;
+        }
+        // перемещение
+        protected abstract void MoveToTarget();
+
+        // достигнута ли цель
+        protected abstract bool IsTargetDestination();
+
+        // попытка перемещения по направлению
+        private bool MoveTo(DirectionType directionType)
+        {
+            if (_state != Status.InProgress)
+            {
+                return false;
+            }
+            if (_moveableObject?.CheckCanMove(directionType) ?? false)
+            {
+                _moveableObject.MoveObject(directionType);
+                return true;
+            }
+            return false;
+        }
+    }
+}

Airbus/MovementStrategy/DrawningObjectAirbus.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ProjectAirbus.Drawnings;
+using ProjectAirbus.Entities;
+
+namespace ProjectAirbus.MovementStrategy
+{
+    internal class DrawningObjectAirbus : IMoveableObject
+    {
+        private readonly DrawningAirbus? _drawningAirbus = null;
+
+        public DrawningObjectAirbus(DrawningAirbus drawningAirbus)
+        {
+            _drawningAirbus = drawningAirbus;
+        }
+
+        public ObjectParameters? GetObjectPosition
+        {
+            get
+            {
+                if (_drawningAirbus == null || _drawningAirbus.EntityAirbus == null)
+                {
+                    return null;
+                }
+                return new ObjectParameters(_drawningAirbus.GetPosX, _drawningAirbus.GetPosY, _drawningAirbus.GetWidth, _drawningAirbus.GetHeight);
+            }
+        }
+
+        public int GetStep => (int)(_drawningAirbus?.EntityAirbus?.Step ?? 0);
+
+
+        public bool CheckCanMove(DirectionType direction) => _drawningAirbus?.CanMove(direction) ?? false;
+
+        public void MoveObject(DirectionType direction) => _drawningAirbus?.MoveTransport(direction);
+    }
+}

Airbus/MovementStrategy/IMoveableObject.cs

@@ -0,0 +1,15 @@
+using ProjectAirbus.Drawnings;
+using ProjectAirbus.Entities;
+
+namespace ProjectAirbus.MovementStrategy
+{
+    internal interface IMoveableObject
+    {
+        ObjectParameters? GetObjectPosition { get; }
+
+        int GetStep { get; }
+        bool CheckCanMove(DirectionType direction);
+        void MoveObject(DirectionType direction);
+
+    }
+}

Airbus/MovementStrategy/MoveToBorder.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectAirbus.MovementStrategy
+{
+    internal class MoveToBorder : AbstractStrategy
+    {
+
+        // достигнута ли цель
+        protected override bool IsTargetDestination()
+        {
+            var objParams = GetObjectParameters;
+            if (objParams == null)
+            {
+                return false;
+            }
+            return objParams.RightBorder <= FieldWidth &&
+                objParams.RightBorder + GetStep() >= FieldWidth &&
+                objParams.DownBorder <= FieldHeight &&
+                objParams.DownBorder + GetStep() >= FieldHeight;
+        }
+
+        // движение к цели
+        protected override void MoveToTarget()
+        {
+            var objParams = GetObjectParameters;
+            if (objParams == null)
+            {
+                return;
+            }
+            var diffX = FieldWidth;
+            if (Math.Abs(diffX) > GetStep())
+            {
+                if (diffX < 0)
+                {
+                    MoveLeft();
+                }
+                else
+                {
+                    MoveRight();
+                }
+            }
+
+            var diffY = FieldHeight;
+            if (Math.Abs(diffY) > GetStep())
+            {
+                if (diffY < 0)
+                {
+                    MoveUp();
+                }
+                else
+                {
+                    MoveDown();
+                }
+            }
+        }
+    }
+}

Airbus/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectAirbus.MovementStrategy
+{
+    internal class MoveToCenter : AbstractStrategy
+    {
+        // достигнута ли цель
+        protected override bool IsTargetDestination()
+        {
+            var objParams = GetObjectParameters;
+            if (objParams == null)
+            { 
+                return false;
+            }
+            return objParams.ObjectMiddleHorizontal <= FieldWidth / 2 &&
+                objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
+                objParams.ObjectMiddleVertical <= FieldHeight / 2 &&
+                objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
+        }
+
+        protected override void MoveToTarget()
+        {
+            var objParams = GetObjectParameters;
+            if (objParams == null)
+            {
+                return;
+            }
+            var diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
+            if (Math.Abs(diffX) > GetStep())
+            {
+                if (diffX > 0)
+                {
+                    MoveLeft();
+                }
+                else
+                {
+                    MoveRight();
+                }
+            }
+
+            var diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
+            if (Math.Abs(diffY) > GetStep())
+            {
+                if (diffY > 0)
+                {
+                    MoveUp();
+                }
+                else
+                {
+                    MoveDown();
+                }
+            }
+        }
+    }
+}

Airbus/MovementStrategy/ObjectParameters.cs

@@ -0,0 +1,27 @@
+namespace ProjectAirbus.MovementStrategy
+{
+    internal class ObjectParameters
+    {
+        private readonly int _x;
+        private readonly int _y;
+        private readonly int _width;
+        private readonly int _height;
+
+        // границы
+        public int LeftBorder => _x;
+        public int TopBorder => _y;
+        public int RightBorder => _x + _width;
+        public int DownBorder => _y + _height;
+        // середина
+        public int ObjectMiddleHorizontal => _x + _width / 2;
+        public int ObjectMiddleVertical => _y + _height / 2;
+
+        public ObjectParameters(int x, int y, int width, int height)
+        {
+            _x = x;
+            _y = y;
+            _width = width;
+            _height = height;
+        }
+    }
+}

Airbus/MovementStrategy/Status.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectAirbus.MovementStrategy
+{
+    internal enum Status
+    {
+        NotInit,
+        InProgress,
+        Finish
+    }
+}

Airbus/Program.cs

@@ -1,4 +1,4 @@
-namespace AirBus
+namespace ProjectAirbus
 {
     internal static class Program
     {
@@ -11,7 +11,7 @@ namespace AirBus
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormAirBus());
+            Application.Run(new FormAirbus());
         }
     }
 }

Airbus/Properties/Resources.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AirBus.Properties {
+namespace ProjectAirbus.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace AirBus.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AirBus.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ProjectAirbus.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;