From d1bfd8cebe0b0fe83020930c136038f81358fa29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3=20=D0=9A=D1=83=D0=B4=D1=80=D0=B8?= =?UTF-8?q?=D0=BD=D1=81=D0=BA=D0=B8=D0=B9?= Date: Sun, 10 Mar 2024 15:11:14 +0400 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=80=D0=BE=D0=B4=D0=B8=D1=82=D0=B5=D0=BB?= =?UTF-8?q?=D0=B5=D0=B9=20=D0=B8=20=D0=B2=D0=B2=D0=BE=D0=B4=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D0=BE=D1=80=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => Drawings}/DirectionType.cs | 2 +- .../Drawings/DrawningContainerShip.cs | 67 ++++++++++ .../DrawningShip.cs} | 124 ++++++++---------- .../Entities/EntityContainerShip.cs | 39 ++++++ .../Entities/EntityShip.cs | 40 ++++++ .../EntityContainerShip.cs | 62 --------- .../FormContainerShip.Designer.cs | 18 ++- .../ProjectContainerShip/FormContainerShip.cs | 63 ++++++--- 8 files changed, 258 insertions(+), 157 deletions(-) rename ProjectContainerShip/ProjectContainerShip/{ => Drawings}/DirectionType.cs (87%) create mode 100644 ProjectContainerShip/ProjectContainerShip/Drawings/DrawningContainerShip.cs rename ProjectContainerShip/ProjectContainerShip/{DrawningContainerShip.cs => Drawings/DrawningShip.cs} (60%) create mode 100644 ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs create mode 100644 ProjectContainerShip/ProjectContainerShip/Entities/EntityShip.cs delete mode 100644 ProjectContainerShip/ProjectContainerShip/EntityContainerShip.cs diff --git a/ProjectContainerShip/ProjectContainerShip/DirectionType.cs b/ProjectContainerShip/ProjectContainerShip/Drawings/DirectionType.cs similarity index 87% rename from ProjectContainerShip/ProjectContainerShip/DirectionType.cs rename to ProjectContainerShip/ProjectContainerShip/Drawings/DirectionType.cs index 0759eab..735683f 100644 --- a/ProjectContainerShip/ProjectContainerShip/DirectionType.cs +++ b/ProjectContainerShip/ProjectContainerShip/Drawings/DirectionType.cs @@ -1,4 +1,4 @@ -namespace ProjectContainerShip; +namespace ProjectContainerShip.Drawings; public enum DirectionType { diff --git a/ProjectContainerShip/ProjectContainerShip/Drawings/DrawningContainerShip.cs b/ProjectContainerShip/ProjectContainerShip/Drawings/DrawningContainerShip.cs new file mode 100644 index 0000000..80d6e61 --- /dev/null +++ b/ProjectContainerShip/ProjectContainerShip/Drawings/DrawningContainerShip.cs @@ -0,0 +1,67 @@ +using ProjectContainerShip.Entities; + +namespace ProjectContainerShip.Drawings; + +public class DrawningContainerShip : DrawningShip +{ + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия крана + /// Признак наличия контейнеров + public DrawningContainerShip(int speed, double weight, Color bodycolor, Color additionalcolor, bool crane, bool container) : base(120,40) + { + EntityShip = new EntityContainerShip(speed, weight, bodycolor, additionalcolor, crane, container); + } + + public override void DrawTransport(Graphics g) + { + if (EntityShip == null || EntityShip is not EntityContainerShip containerShip || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + Brush additionalBrush = new SolidBrush(containerShip.AdditionalColor); + + if (containerShip.Container) + + { + // Верхний маленький контейнер + Point[] container = + { + new Point((int)_startPosX + 30, (int)_startPosY + 10), + new Point((int)_startPosX + 30, (int)_startPosY ), + new Point((int)_startPosX + 55, (int)_startPosY), + new Point((int)_startPosX + 55, (int)_startPosY + 10) + }; + + g.FillPolygon(additionalBrush, container); + g.DrawPolygon(pen, container); + + //Контейнер под маленьким контейнером + g.FillRectangle(additionalBrush, (int)_startPosX + 20, (int)_startPosY + 10, 27, 10); + g.DrawRectangle(pen, (int)_startPosX + 20, (int)_startPosY + 10, 27, 10); + + } + + base.DrawTransport(g); + + if (containerShip.Crane) + { + g.DrawLine(pen, (int)_startPosX + 70, (int)_startPosY + 10, (int)_startPosX + 70, (int)_startPosY); + g.DrawLine(pen, (int)_startPosX + 70, (int)_startPosY, (int)_startPosX + 110, (int)_startPosY); + g.DrawLine(pen, (int)_startPosX + 70, (int)_startPosY, (int)_startPosX + 110, (int)_startPosY + 5); + g.DrawLine(pen, (int)_startPosX + 110, (int)_startPosY, (int)_startPosX + 110, (int)_startPosY + 30); + + //Хваталка контейнера + g.DrawLine(pen, (int)(_startPosX + 100), (int)(_startPosY + 30), (int)_startPosX + 120, (int)(_startPosY + 30)); + g.DrawLine(pen, (int)(_startPosX + 100), (int)(_startPosY + 30), (int)_startPosX + 100, (int)(_startPosY + 35)); + g.DrawLine(pen, (int)(_startPosX + 120), (int)(_startPosY + 30), (int)_startPosX + 120, (int)(_startPosY + 35)); + } + } +} diff --git a/ProjectContainerShip/ProjectContainerShip/DrawningContainerShip.cs b/ProjectContainerShip/ProjectContainerShip/Drawings/DrawningShip.cs similarity index 60% rename from ProjectContainerShip/ProjectContainerShip/DrawningContainerShip.cs rename to ProjectContainerShip/ProjectContainerShip/Drawings/DrawningShip.cs index 6ce9893..af340f2 100644 --- a/ProjectContainerShip/ProjectContainerShip/DrawningContainerShip.cs +++ b/ProjectContainerShip/ProjectContainerShip/Drawings/DrawningShip.cs @@ -1,11 +1,18 @@ -namespace ProjectContainerShip; +using ProjectContainerShip.Entities; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -public class DrawningContainerShip +namespace ProjectContainerShip.Drawings; + +public class DrawningShip { /// /// Класс-сущность /// - public EntityContainerShip? EntityContainerShip { get; private set; } + public EntityShip? EntityShip { get; protected set; } /// /// Ширина окна @@ -20,42 +27,56 @@ public class DrawningContainerShip /// /// Левая координата прорисовки контейнеровоза /// - private int? _startPosX; + protected int? _startPosX; /// /// Верхняя координата прорисовки контейнеровоза /// - private int? _startPosY; + protected int? _startPosY; /// /// Ширина прорисовки контейнеровоза /// - private readonly int _drawningContainerShipWidth = 120; + private readonly int _drawningContainerShipWidth = 100; /// /// Высота прорисовки контейнеровоза /// - private readonly int _drawningContainerShipHeight = 40; + private readonly int _drawningContainerShipHeight = 30; /// - /// Инициализация свойств + /// Пустой конструктор /// - /// Скорость - /// Вес - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия крана - /// Признак наличия контейнеров - public void Init(int speed, double weight, Color bodycolor, Color additionalcolor, bool crane, bool container) + private DrawningShip() { - EntityContainerShip = new EntityContainerShip(); - EntityContainerShip.Init(speed,weight,bodycolor,additionalcolor,crane,container); _pictureWidth = null; _pictureHeight = null; _startPosX = null; _startPosY = null; } + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + public DrawningShip(int speed, double weight, Color bodycolor) : this() + { + EntityShip = new EntityShip(speed, weight, bodycolor); + } + + /// + /// Конструктор для наследников + /// + /// Ширина прорисовки корабля + /// Высота прорисовки корабля + protected DrawningShip(int drawningContainerShipWidth, int drawningContainerShipHeight) : this() + { + _drawningContainerShipWidth = drawningContainerShipWidth; + _drawningContainerShipHeight = drawningContainerShipHeight; + } + /// /// Установка границ поля /// @@ -64,7 +85,7 @@ public class DrawningContainerShip /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах public bool SetPictureSize(int width, int height) { - if (_drawningContainerShipWidth > width || _drawningContainerShipHeight> height) + if (_drawningContainerShipWidth > width || _drawningContainerShipHeight > height) { return false; } @@ -98,7 +119,7 @@ public class DrawningContainerShip { return; } - + if (x + _drawningContainerShipWidth > _pictureWidth) { _startPosX = _pictureWidth - _drawningContainerShipWidth; @@ -121,7 +142,7 @@ public class DrawningContainerShip /// true - перемещене выполнено, false - перемещение невозможно public bool MoveTransport(DirectionType direction) { - if (EntityContainerShip == null || !_startPosX.HasValue || !_startPosY.HasValue) + if (EntityShip == null || !_startPosX.HasValue || !_startPosY.HasValue) { return false; } @@ -130,30 +151,30 @@ public class DrawningContainerShip { //влево case DirectionType.Left: - if (_startPosX.Value - EntityContainerShip.Step > 0) + if (_startPosX.Value - EntityShip.Step > 0) { - _startPosX -= (int)EntityContainerShip.Step; + _startPosX -= (int)EntityShip.Step; } return true; //вверх case DirectionType.Up: - if (_startPosY.Value - EntityContainerShip.Step > 0) + if (_startPosY.Value - EntityShip.Step > 0) { - _startPosY -= (int)EntityContainerShip.Step; + _startPosY -= (int)EntityShip.Step; } return true; // вправо case DirectionType.Right: - if (_startPosX.Value + _drawningContainerShipWidth + EntityContainerShip.Step < _pictureWidth) + if (_startPosX.Value + _drawningContainerShipWidth + EntityShip.Step < _pictureWidth) { - _startPosX += (int)EntityContainerShip.Step; + _startPosX += (int)EntityShip.Step; } return true; //вниз case DirectionType.Down: - if (_startPosY.Value + _drawningContainerShipHeight + EntityContainerShip.Step < _pictureHeight) + if (_startPosY.Value + _drawningContainerShipHeight + EntityShip.Step < _pictureHeight) { - _startPosY += (int)EntityContainerShip.Step; + _startPosY += (int)EntityShip.Step; } return true; default: @@ -165,15 +186,14 @@ public class DrawningContainerShip /// Прорисовка объекта /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { - if (EntityContainerShip == null || !_startPosX.HasValue || !_startPosY.HasValue) + if (EntityShip == null || !_startPosX.HasValue || !_startPosY.HasValue) { return; } Pen pen = new(Color.Black); - Brush additionalBrush = new SolidBrush(EntityContainerShip.AdditionalColor); //Корпус контейнеровоза g.DrawPolygon(pen, new Point[] @@ -184,8 +204,7 @@ public class DrawningContainerShip } ); - - Brush br = new SolidBrush(EntityContainerShip.BodyColor); + Brush br = new SolidBrush(EntityShip.BodyColor); g.FillPolygon(br, new Point[] { new Point((int)_startPosX+10,(int)_startPosY+20),new Point((int)_startPosX+100,(int)_startPosY+20), @@ -200,44 +219,7 @@ public class DrawningContainerShip g.DrawLine(pen, (int)_startPosX + 26, (int)_startPosY + 31, (int)_startPosX + 30, (int)_startPosY + 31); //Длинный контейнер справа - g.DrawRectangle(pen,(int)_startPosX+40,(int)_startPosY+10,57,10); + g.DrawRectangle(pen, (int)_startPosX + 40, (int)_startPosY + 10, 57, 10); g.FillRectangle(br, (int)_startPosX + 40, (int)_startPosY + 10, 57, 10); - - //Кран - if (EntityContainerShip.Crane) - { - g.DrawLine(pen, (int)_startPosX + 70, (int)_startPosY + 10, (int)_startPosX + 70, (int)_startPosY); - g.DrawLine(pen, (int)_startPosX + 70, (int)_startPosY, (int)_startPosX + 110, (int)_startPosY); - g.DrawLine(pen, (int)_startPosX + 70, (int)_startPosY, (int)_startPosX + 110, (int)_startPosY + 5); - g.DrawLine(pen, (int)_startPosX + 110, (int)_startPosY, (int)_startPosX + 110, (int)_startPosY + 30); - - //Хваталка контейнера - g.DrawLine(pen,(int)(_startPosX + 100),(int)(_startPosY + 30), (int)_startPosX + 120, (int)(_startPosY + 30)); - g.DrawLine(pen, (int)(_startPosX + 100), (int)(_startPosY + 30), (int)_startPosX + 100, (int)(_startPosY + 35)); - g.DrawLine(pen, (int)(_startPosX + 120), (int)(_startPosY + 30), (int)_startPosX + 120, (int)(_startPosY + 35)); - } - - //Контейнер - if (EntityContainerShip.Container) - - { - // Верхний маленький контейнер - Point[] container = - { - new Point((int)_startPosX + 30, (int)_startPosY + 10), - new Point((int)_startPosX + 30, (int)_startPosY ), - new Point((int)_startPosX + 55, (int)_startPosY), - new Point((int)_startPosX + 55, (int)_startPosY + 10) - }; - - g.FillPolygon(additionalBrush, container); - g.DrawPolygon(pen, container); - - //Контейнер под маленьким контейнером - g.FillRectangle(additionalBrush, (int)_startPosX + 20, (int)_startPosY + 10, 27, 10); - g.DrawRectangle(pen, (int)_startPosX + 20, (int)_startPosY + 10, 27, 10); - - } } - } diff --git a/ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs b/ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs new file mode 100644 index 0000000..00fb2b8 --- /dev/null +++ b/ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs @@ -0,0 +1,39 @@ +namespace ProjectContainerShip.Entities; + +/// +/// Класс-сущность Контейнеровоз +/// +public class EntityContainerShip : EntityShip +{ + /// + /// Дополнительный цвет (для опциональных элементов) + /// + public Color AdditionalColor { get; private set; } + + /// + /// Признак (опция) наличия крана + /// + public bool Crane { get; private set; } + + /// + /// Признак (опция) наличия контейнеров + /// + public bool Container { get; private set; } + + /// + /// + /// + /// Скорость + /// Вес контейнеровоза + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия крана + /// Признак наличия контейнеров + public EntityContainerShip(int speed, double weight, Color bodyColor, Color additionalColor, bool crane, bool container) : base(speed,weight,bodyColor) + { + AdditionalColor = additionalColor; + Crane = crane; + Container = container; + } + +} diff --git a/ProjectContainerShip/ProjectContainerShip/Entities/EntityShip.cs b/ProjectContainerShip/ProjectContainerShip/Entities/EntityShip.cs new file mode 100644 index 0000000..f231d27 --- /dev/null +++ b/ProjectContainerShip/ProjectContainerShip/Entities/EntityShip.cs @@ -0,0 +1,40 @@ +namespace ProjectContainerShip.Entities; + +/// +/// Класс-сущность "Корабль" +/// +public class EntityShip +{ + /// + /// Скорость + /// + public int Speed { get; private set; } + + /// + /// Вес + /// + public double Weight { get; private set; } + + /// + /// Основной цвет + /// + public Color BodyColor { get; private set; } + + /// + /// Шаг перемещения грузового судна + /// + public double Step => Speed * 100 / Weight; + + /// + /// Конструктор сущности + /// + /// Скорость + /// Вес контейнеровоза + /// Основной цвет + public EntityShip(int speed, double weight, Color bodyColor) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + } +} diff --git a/ProjectContainerShip/ProjectContainerShip/EntityContainerShip.cs b/ProjectContainerShip/ProjectContainerShip/EntityContainerShip.cs deleted file mode 100644 index 2e6654b..0000000 --- a/ProjectContainerShip/ProjectContainerShip/EntityContainerShip.cs +++ /dev/null @@ -1,62 +0,0 @@ -namespace ProjectContainerShip; - - /// - /// Класс-сущность Контейнеровоз - /// - public class EntityContainerShip - { - /// - /// Скорость - /// - 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 Crane { get; private set; } - - /// - /// Признак (опция) наличия контейнеров - /// - public bool Container { get; private set; } - - /// - /// Шаг перемещения грузового судна - /// - public double Step => Speed * 100 / Weight; - - /// - /// - /// - /// Скорость - /// Вес контейнеровоза - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия крана - /// Признак наличия контейнеров - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool crane, bool container) - { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; - AdditionalColor = additionalColor; - Crane = crane; - Container = container; - } - - } diff --git a/ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs b/ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs index e38cb64..80ca97c 100644 --- a/ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs +++ b/ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs @@ -34,6 +34,7 @@ buttonRight = new Button(); buttonDown = new Button(); buttonUp = new Button(); + buttonCreateShip = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxContainerShip).BeginInit(); SuspendLayout(); // @@ -51,9 +52,9 @@ buttonCreateContainerShip.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; buttonCreateContainerShip.Location = new Point(12, 457); buttonCreateContainerShip.Name = "buttonCreateContainerShip"; - buttonCreateContainerShip.Size = new Size(150, 46); + buttonCreateContainerShip.Size = new Size(316, 46); buttonCreateContainerShip.TabIndex = 1; - buttonCreateContainerShip.Text = "Создать"; + buttonCreateContainerShip.Text = "Создать контейнеровоз"; buttonCreateContainerShip.UseVisualStyleBackColor = true; buttonCreateContainerShip.Click += ButtonCreateContainerShip_Click; // @@ -105,11 +106,23 @@ buttonUp.UseVisualStyleBackColor = true; buttonUp.Click += ButtonMove_Click; // + // buttonCreateShip + // + buttonCreateShip.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateShip.Location = new Point(358, 457); + buttonCreateShip.Name = "buttonCreateShip"; + buttonCreateShip.Size = new Size(316, 46); + buttonCreateShip.TabIndex = 6; + buttonCreateShip.Text = "Создать корабль"; + buttonCreateShip.UseVisualStyleBackColor = true; + buttonCreateShip.Click += ButtonCreateShip_Click; + // // FormContainerShip // AutoScaleDimensions = new SizeF(13F, 32F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(1256, 529); + Controls.Add(buttonCreateShip); Controls.Add(buttonUp); Controls.Add(buttonDown); Controls.Add(buttonRight); @@ -132,5 +145,6 @@ private Button buttonRight; private Button buttonDown; private Button buttonUp; + private Button buttonCreateShip; } } \ No newline at end of file diff --git a/ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs b/ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs index 2d7fbba..5992cab 100644 --- a/ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs +++ b/ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs @@ -1,4 +1,5 @@ using System; +using ProjectContainerShip.Drawings; namespace ProjectContainerShip; @@ -10,7 +11,7 @@ public partial class FormContainerShip : Form /// /// Поле-объект для прорисовки объекта /// - private DrawningContainerShip? _drawningContainerShip; + private DrawningShip? _drawningShip; /// /// Конструктор формы @@ -25,34 +26,54 @@ public partial class FormContainerShip : Form /// private void Draw() { - if (_drawningContainerShip == null) + if (_drawningShip == null) { return; } Bitmap bmp = new(pictureBoxContainerShip.Width, pictureBoxContainerShip.Height); Graphics gr = Graphics.FromImage(bmp); - _drawningContainerShip.DrawTransport(gr); + _drawningShip.DrawTransport(gr); pictureBoxContainerShip.Image = bmp; } + private void CreateObject(string type) + { + Random random = new(); + switch (type) + { + case nameof(DrawningShip): + _drawningShip = new DrawningShip(random.Next(100, 300), random.Next(1000, 3000), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256))); + break; + case nameof(DrawningContainerShip): + _drawningShip = new DrawningContainerShip(random.Next(100, 300), random.Next(1000, 3000), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), + Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); + break; + default: + return; + } + + _drawningShip.SetPictureSize(pictureBoxContainerShip.Width, pictureBoxContainerShip.Height); + _drawningShip.SetPosition(random.Next(10, 100), random.Next(10, 100)); + Draw(); + } + /// - /// Обработка нажатия кнопки "Создать" + /// Обработка нажатия кнопки "Создать контейнеровоз" /// /// /// - private void ButtonCreateContainerShip_Click(object sender, EventArgs e) - { - Random random = new(); - _drawningContainerShip = new DrawningContainerShip(); - _drawningContainerShip.Init(random.Next(100, 300), random.Next(1000, 3000), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), - Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); - _drawningContainerShip.SetPictureSize(pictureBoxContainerShip.Width, pictureBoxContainerShip.Height); - _drawningContainerShip.SetPosition(random.Next(10, 100), random.Next(10, 100)); - Draw(); - } + private void ButtonCreateContainerShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningContainerShip)); + + /// + /// Обработка нажатия кнопки "Создать корабль" + /// + /// + /// + private void ButtonCreateShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningShip)); /// /// Перемещение объекта по форме (нажатие кнопок навигации) @@ -61,7 +82,7 @@ public partial class FormContainerShip : Form /// private void ButtonMove_Click(object sender, EventArgs e) { - if (_drawningContainerShip == null) + if (_drawningShip == null) { return; } @@ -71,16 +92,16 @@ public partial class FormContainerShip : Form switch (name) { case "buttonUp": - result = _drawningContainerShip.MoveTransport(DirectionType.Up); + result = _drawningShip.MoveTransport(DirectionType.Up); break; case "buttonDown": - result = _drawningContainerShip.MoveTransport(DirectionType.Down); + result = _drawningShip.MoveTransport(DirectionType.Down); break; case "buttonLeft": - result = _drawningContainerShip.MoveTransport(DirectionType.Left); + result = _drawningShip.MoveTransport(DirectionType.Left); break; case "buttonRight": - result = _drawningContainerShip.MoveTransport(DirectionType.Right); + result = _drawningShip.MoveTransport(DirectionType.Right); break; }