1 часть, добавление родителей

ProjectCatamaran/ProjectCatamaran/DrawingCatamaran.cs

@@ -1,246 +0,0 @@
-namespace ProjectCatamaran;
-
-/// <summary>
-/// Класс, отвечающий за прорисовку и перемещения объекта-сущности
-/// </summary>
-public class DrawingCatamaran
-{
-    /// <summary>
-    /// Класс сущность
-    /// </summary>
-    public EntityCatamaran? EntityCatamaran { get; private set; }
-
-    /// <summary>
-    /// Ширина окна
-    /// </summary>
-    private int? _pictureWidth;
-
-    /// <summary>
-    /// Высота окна
-    /// </summary>
-    private int? _pictureHeight;
-
-    /// <summary>
-    /// Левая координата прорисовки автомобиля
-    /// </summary>
-    private int? _startPosX;
-
-    /// <summary>
-    /// Верхняя координата прорисовки автомобиля
-    /// </summary>
-    private int? _startPosY;
-
-    /// <summary>
-    /// Ширина прорисовки автомобиля
-    /// </summary>
-    private readonly int _drawingCatamaranWidth = 110;
-
-    /// <summary>
-    /// Высота прорисовки автомобиля
-    /// </summary>
-    private readonly int _drawingCatamaranHeight = 54;
-
-/// <summary>
-/// Инициализация свойств
-/// </summary>
-/// <param name="speed">скорость</param>
-/// <param name="weight">вес</param>
-/// <param name="bodyColor">основной цвет</param>
-/// <param name="additionalColor">дополнительный цвет</param>
-/// <param name="floats">наличие поплавков</param>
-/// <param name="sail">наличие паруса</param>
-    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool floats, bool sail)
-    {
-        EntityCatamaran = new EntityCatamaran();
-        EntityCatamaran.Init(speed, weight, bodyColor, additionalColor, floats, sail);
-        _startPosX = null;
-        _startPosY = null;
-        _pictureHeight = null;
-        _pictureWidth = null;
-    }
-
-    /// <summary>
-    /// Установка границ поля
-    /// </summary>
-    /// <param name="width">Ширина поля</param>
-    /// <param name="height">Высота поля</param>
-    /// <returns>true - границы заливки, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
-    public bool SetPictureSize(int width, int height)
-    {
-        // TODO проверка что объект влезает в размеры поля
-        // если влезает, сохраняем границы и корректируем позицию объекта, если она уже была установлена
-       
-        if (_drawingCatamaranHeight > height || _drawingCatamaranWidth > width)
-            return false;
-        _pictureHeight = height;
-        _pictureWidth = width;
-        if (_startPosX.HasValue && _startPosY.HasValue)
-        {
-            if (_startPosX + _drawingCatamaranWidth > _pictureWidth)
-                _startPosX = _pictureWidth - _drawingCatamaranWidth;
-            
-            if (_startPosY + _drawingCatamaranHeight > _pictureHeight)
-                _startPosY = _pictureHeight - _drawingCatamaranHeight;
-            
-        }
-
-        return true;
-
-
-
-    }
-
-    /// <summary>
-    /// Установка позиции
-    /// </summary>
-    /// <param name="x">Координата X</param>
-    /// <param name="y">Координата Y</param>
-    public void SetPosition(int x, int y)
-    {
-        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
-            return;
-
-        _startPosX = x;
-        _startPosY = y;
-
-        if (_drawingCatamaranWidth + x > _pictureWidth || x < 0)
-        {
-            _startPosX = 0;
-        }
-        if (_drawingCatamaranHeight + y > _pictureHeight || y < 0)
-        {
-            _startPosY = 0;
-        }
-
-
-
-        return;
-
-    }
-
-    /// <summary>
-	/// Изменение направления перемещения
-	/// </summary>
-	/// <param name="direction">Направление</param>
-	/// <returns>true - перемещене выполнено, false - перемещение невозможно</returns>
-    public bool MoveTransport(DirectionType direction)
-    {
-        if (EntityCatamaran == null || !_startPosX.HasValue || !_startPosY.HasValue)
-        { 
-            return false;
-        }
-
-        switch (direction)
-        {
-            case DirectionType.Left:
-                if (_startPosX.Value - EntityCatamaran.Step > 0)
-                {
-                    _startPosX -= (int)EntityCatamaran.Step;
-                }
-                return true;
-            case DirectionType.Right:
-                if (_startPosX + EntityCatamaran.Step + _drawingCatamaranWidth < _pictureWidth)
-                {
-                    _startPosX += (int)EntityCatamaran.Step;
-                }
-                return true;
-            case DirectionType.Up:
-                if (_startPosY - EntityCatamaran.Step > 0)
-                {
-                    _startPosY -= (int)EntityCatamaran.Step;
-                }
-                return true;
-            case DirectionType.Down:
-                if (_startPosY + EntityCatamaran.Step + _drawingCatamaranHeight < _pictureHeight)
-                {
-                    _startPosY += (int)EntityCatamaran.Step;
-                }
-                return true;
-            default:
-                return false;
-
-        }
-    }
-    /// <summary>
-    /// Метод отрисовки поплавка
-    /// </summary>
-    /// <param name="y0"></param>
-    /// <param name="additionalBrush"></param>
-    /// <param name="g"></param>
-    private void DrawFloater(int y0, Brush additionalBrush, Graphics g)
-    {
-        Point[] Floater = new Point[]
-           {
-            new Point(_startPosX.Value + 10, _startPosY.Value + y0 + 6),
-            new Point(_startPosX.Value + 90, _startPosY.Value + y0 + 6),
-            new Point(_startPosX.Value + 110, _startPosY.Value + y0 + 3),
-            new Point(_startPosX.Value + 90, _startPosY.Value + y0),
-            new Point(_startPosX.Value + 10, _startPosY.Value + y0),
-
-           };
-        g.FillPolygon(additionalBrush, Floater);
-        g.DrawPolygon(Pens.Black, Floater);
-    }
-    /// <summary>
-    /// Прорисовка объекта
-    /// </summary>
-    /// <param name="g"></param>
-
-    public void DrawTransport(Graphics g)
-    {
-        if (EntityCatamaran == null || !_startPosX.HasValue || !_startPosY.HasValue)
-        {
-            return;
-        }
-
-        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
-            return;
-        Pen pen = new(Color.Black);
-        Brush BodyBrush = new SolidBrush(EntityCatamaran.BodyColor);
-        Brush additionalBrush = new SolidBrush(EntityCatamaran.AdditionalColor);       
-        Pen additionalPen = new(EntityCatamaran.AdditionalColor, 2);
-
-        // границы катамарана 
-        Point[] catamaranBorders = new Point[]
-        {
-            new Point(_startPosX.Value + 10, _startPosY.Value + 10),
-            new Point(_startPosX.Value + 80, _startPosY.Value + 10),
-            new Point(_startPosX.Value + 107, _startPosY.Value + 30),
-            new Point(_startPosX.Value + 80, _startPosY.Value + 45),
-            new Point(_startPosX.Value + 10, _startPosY.Value + 45),
-
-        };
-        g.DrawPolygon(pen, catamaranBorders);        
-        g.FillPolygon(BodyBrush, catamaranBorders);
-
-        g.DrawEllipse(pen, _startPosX.Value + 17, _startPosY.Value + 14, 65, 27);
-        g.FillEllipse(Brushes.White, _startPosX.Value + 17, _startPosY.Value + 14, 65, 27);
-
-        if(EntityCatamaran.Floaters)
-        {
-            g.DrawLine(pen, _startPosX.Value + 20, _startPosY.Value + 10, _startPosX.Value + 20, _startPosY.Value + 7);
-            g.DrawLine(pen, _startPosX.Value + 80, _startPosY.Value + 10, _startPosX.Value + 80, _startPosY.Value + 7);
-            g.DrawLine(pen, _startPosX.Value + 20, _startPosY.Value + 45, _startPosX.Value + 20, _startPosY.Value + 48);
-            g.DrawLine(pen, _startPosX.Value + 80, _startPosY.Value + 45, _startPosX.Value + 80, _startPosY.Value + 48);
-           
-            DrawFloater(1, additionalBrush, g);
-            DrawFloater(48, additionalBrush, g);            
-        }
-
-        if (EntityCatamaran.Sail)
-        {
-            Point[] Sail = new Point[]
-            {
-            new Point(_startPosX.Value + 50, _startPosY.Value + 35),            
-            new Point(_startPosX.Value + 35, _startPosY.Value + 29),
-            new Point(_startPosX.Value + 35, _startPosY.Value + 14),
-            new Point(_startPosX.Value + 50, _startPosY.Value + 8),
-            new Point(_startPosX.Value + 50, _startPosY.Value + 33),
-            };
-            g.FillPolygon(additionalBrush, Sail);
-            g.DrawPolygon(pen, Sail);
-        }
-
-
-    }
-}

ProjectCatamaran/ProjectCatamaran/Drawnings/DirectionType.cs

@@ -1,4 +1,4 @@
-namespace ProjectCatamaran;
+namespace ProjectCatamaran.Drawnings;
 /// <summary>
 /// Направление перемещения
 /// </summary>

ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs

@@ -0,0 +1,215 @@
+using ProjectCatamaran.Drawnings;
+using ProjectCatamaran.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+ 
+
+public class DrawningBoat
+{
+    /// <summary>
+    /// Класс сущность
+    /// </summary>
+    public EntityBoat? EntityBoat { get; protected set; }
+
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    private int? _pictureWidth;
+
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    private int? _pictureHeight;
+
+    /// <summary>
+    /// Левая координата прорисовки автомобиля
+    /// </summary>
+    protected int? _startPosX;
+
+    /// <summary>
+    /// Верхняя координата прорисовки автомобиля
+    /// </summary>
+    protected int? _startPosY;
+
+    /// <summary>
+    /// Ширина прорисовки автомобиля
+    /// </summary>
+    private readonly int _drawingCatamaranWidth = 97;
+
+    /// <summary>
+    /// Высота прорисовки автомобиля
+    /// </summary>
+    private readonly int _drawingCatamaranHeight = 35;
+    /// <summary>
+    /// Пустой конструктор
+    /// </summary>
+    private DrawningBoat()
+    {
+        _startPosX = null;
+        _startPosY = null;
+        _pictureHeight = null;
+        _pictureWidth = null;
+    }
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="speed">скорость</param>
+    /// <param name="weight">вес</param>
+    /// <param name="bodyColor">основной цвет</param>
+    public DrawningBoat(int speed, double weight, Color bodyColor) : this()
+    {
+        EntityBoat = new EntityBoat(speed, weight, bodyColor);      
+       
+    }
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="drawingCatamaranWidth">Ширина прорисовки автомобиля</param>
+    /// <param name="drawingCatamaranHeight">Высота прорисовки автомобиля</param>
+    public DrawningBoat(int drawingCatamaranWidth, int drawingCatamaranHeight) : this()
+    {
+        _drawingCatamaranHeight = drawingCatamaranHeight;
+        _drawingCatamaranWidth = drawingCatamaranWidth;                  
+    }
+
+    /// <summary>
+    /// Установка границ поля
+    /// </summary>
+    /// <param name="width">Ширина поля</param>
+    /// <param name="height">Высота поля</param>
+    /// <returns>true - границы заливки, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
+    public bool SetPictureSize(int width, int height)
+    {
+        // TODO проверка что объект влезает в размеры поля
+        // если влезает, сохраняем границы и корректируем позицию объекта, если она уже была установлена
+
+        if (_drawingCatamaranHeight > height || _drawingCatamaranWidth > width)
+            return false;
+        _pictureHeight = height;
+        _pictureWidth = width;
+        if (_startPosX.HasValue && _startPosY.HasValue)
+        {
+            if (_startPosX + _drawingCatamaranWidth > _pictureWidth)
+                _startPosX = _pictureWidth - _drawingCatamaranWidth;
+
+            if (_startPosY + _drawingCatamaranHeight > _pictureHeight)
+                _startPosY = _pictureHeight - _drawingCatamaranHeight;
+
+        }
+
+        return true;
+
+
+
+    }
+
+    /// <summary>
+    /// Установка позиции
+    /// </summary>
+    /// <param name="x">Координата X</param>
+    /// <param name="y">Координата Y</param>
+    public void SetPosition(int x, int y)
+    {
+        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
+            return;
+
+        _startPosX = x;
+        _startPosY = y;
+
+        if (_drawingCatamaranWidth + x > _pictureWidth || x < 0)
+        {
+            _startPosX = 0;
+        }
+        if (_drawingCatamaranHeight + y > _pictureHeight || y < 0)
+        {
+            _startPosY = 0;
+        }
+
+
+
+        return;
+
+    }
+
+    /// <summary>
+	/// Изменение направления перемещения
+	/// </summary>
+	/// <param name="direction">Направление</param>
+	/// <returns>true - перемещене выполнено, false - перемещение невозможно</returns>
+    public bool MoveTransport(DirectionType direction)
+    {
+        if (EntityBoat == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return false;
+        }
+
+        switch (direction)
+        {
+            case DirectionType.Left:
+                if (_startPosX.Value - EntityBoat.Step > 0)
+                {
+                    _startPosX -= (int)EntityBoat.Step;
+                }
+                return true;
+            case DirectionType.Right:
+                if (_startPosX + EntityBoat.Step + _drawingCatamaranWidth < _pictureWidth)
+                {
+                    _startPosX += (int)EntityBoat.Step;
+                }
+                return true;
+            case DirectionType.Up:
+                if (_startPosY - EntityBoat.Step > 0)
+                {
+                    _startPosY -= (int)EntityBoat.Step;
+                }
+                return true;
+            case DirectionType.Down:
+                if (_startPosY + EntityBoat.Step + _drawingCatamaranHeight < _pictureHeight)
+                {
+                    _startPosY += (int)EntityBoat.Step;
+                }
+                return true;
+            default:
+                return false;
+
+        }
+    }
+    
+    /// <summary>
+    /// Прорисовка объекта
+    /// </summary>
+    /// <param name="g"></param>
+
+    public virtual void DrawTransport(Graphics g)
+    {
+        if (EntityBoat == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+
+        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
+            return;
+        Pen pen = new(Color.Black);
+        Brush BodyBrush = new SolidBrush(EntityBoat.BodyColor);
+       
+        // границы катамарана 
+        Point[] BoatBorders = new Point[]
+        {
+            new Point(_startPosX.Value, _startPosY.Value),
+            new Point(_startPosX.Value + 70, _startPosY.Value),
+            new Point(_startPosX.Value + 97, _startPosY.Value + 20),
+            new Point(_startPosX.Value + 70, _startPosY.Value + 35),
+            new Point(_startPosX.Value, _startPosY.Value + 35),
+
+        };
+        g.DrawPolygon(pen, BoatBorders);
+        g.FillPolygon(BodyBrush, BoatBorders);
+
+        g.DrawEllipse(pen, _startPosX.Value + 7, _startPosY.Value + 4, 57, 24);
+        g.FillEllipse(Brushes.White, _startPosX.Value + 7, _startPosY.Value + 4, 57, 24);
+
+    }
+}

ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningCatamaran.cs

@@ -0,0 +1,85 @@
+using ProjectCatamaran.Entities;
+using System.Drawing;
+
+namespace ProjectCatamaran.Drawnings;
+
+/// <summary>
+/// Класс, отвечающий за прорисовку и перемещения объекта-сущности
+/// </summary>
+public class DrawningCatamaran : DrawningBoat
+{
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="speed">скорость</param>
+    /// <param name="weight">вес</param>
+    /// <param name="bodyColor">основной цвет</param>
+    /// <param name="additionalColor">дополнительный цвет</param>
+    /// <param name="floats">наличие поплавков</param>
+    /// <param name="sail">наличие паруса</param>
+    public DrawningCatamaran(int speed, double weight, Color bodyColor, Color additionalColor, bool floats, bool sail) : base(100, 54)
+    {
+        EntityBoat = new EntityCatamaran(speed, weight, bodyColor, additionalColor, floats, sail);
+       
+     
+    }
+    public override void DrawTransport(Graphics g)
+    {
+        if (EntityBoat == null || EntityBoat is not EntityCatamaran catamaran || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+        Pen pen = new(Color.Black);
+        Brush additionalBrush = new SolidBrush(catamaran.AdditionalColor);
+        Pen additionalPen = new(catamaran.AdditionalColor, 2);
+        if (catamaran.Sail)
+        {
+            Point[] Sail = new Point[]
+            {
+            new Point(_startPosX.Value + 40, _startPosY.Value + 35),
+            new Point(_startPosX.Value + 25, _startPosY.Value + 29),
+            new Point(_startPosX.Value + 25, _startPosY.Value + 14),
+            new Point(_startPosX.Value + 40, _startPosY.Value + 8),
+            new Point(_startPosX.Value + 40, _startPosY.Value + 33),
+            };
+            g.FillPolygon(additionalBrush, Sail);
+            g.DrawPolygon(pen, Sail);
+        }
+        if (catamaran.Floaters)
+        {
+            g.DrawLine(pen, _startPosX.Value + 10, _startPosY.Value + 10, _startPosX.Value + 10, _startPosY.Value + 7);
+            g.DrawLine(pen, _startPosX.Value + 70, _startPosY.Value + 10, _startPosX.Value + 70, _startPosY.Value + 7);
+            g.DrawLine(pen, _startPosX.Value + 10, _startPosY.Value + 45, _startPosX.Value + 10, _startPosY.Value + 48);
+            g.DrawLine(pen, _startPosX.Value + 70, _startPosY.Value + 45, _startPosX.Value + 70, _startPosY.Value + 48);
+
+            DrawFloater(1, additionalBrush, g);
+            DrawFloater(48, additionalBrush, g);
+        }
+        _startPosY += 9;
+        base.DrawTransport(g);
+        _startPosY -= 9;
+    }
+    /// <summary>
+    /// Метод отрисовки поплавка
+    /// </summary>
+    /// <param name="y0"></param>
+    /// <param name="additionalBrush"></param>
+    /// <param name="g"></param>
+    private void DrawFloater(int y0, Brush additionalBrush, Graphics g)
+    {
+        Point[] Floater = new Point[]
+           {
+            new Point(_startPosX.Value, _startPosY.Value + y0 + 6),
+            new Point(_startPosX.Value + 80, _startPosY.Value + y0 + 6),
+            new Point(_startPosX.Value + 100, _startPosY.Value + y0 + 3),
+            new Point(_startPosX.Value + 80, _startPosY.Value + y0),
+            new Point(_startPosX.Value, _startPosY.Value + y0),
+
+           };
+        g.FillPolygon(additionalBrush, Floater);
+        g.DrawPolygon(Pens.Black, Floater);
+    }
+    
+
+    
+}

ProjectCatamaran/ProjectCatamaran/Entities/EntityBoat.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectCatamaran.Entities;
+
+public class EntityBoat
+{
+    /// <summary>
+    /// Скорость 
+    /// </summary>
+    public int Speed { get; private set; }
+
+    /// <summary>
+    /// Вес
+    /// </summary>
+    public double Weight { get; private set; }
+
+    /// <summary>
+    /// Основной цвет
+    /// </summary>
+    public Color BodyColor { get; private set; }
+    /// <summary>
+    /// Шаг перемещения катамарана
+    /// </summary>
+    public double Step => Speed * 100 / Weight;
+
+    /// <summary>
+    /// Конструктор сущности
+    /// </summary>
+    /// <param name="speed">скорость</param>
+    /// <param name="weight">вес</param>
+    /// <param name="bodyColor">основной цвет</param>   
+    public EntityBoat(int speed, double weight, Color bodyColor)
+    {
+        Speed = speed;
+        Weight = weight;
+        BodyColor = bodyColor;        
+    }
+}

ProjectCatamaran/ProjectCatamaran/Entities/EntityCatamaran.cs

@@ -1,22 +1,7 @@
-namespace ProjectCatamaran;
+namespace ProjectCatamaran.Entities;
 
-public class EntityCatamaran
+public class EntityCatamaran : EntityBoat
 {   
-    /// <summary>
-    /// Скорость 
-    /// </summary>
-    public int Speed { get; private set; } 
-
-    /// <summary>
-    /// Вес
-    /// </summary>
-    public double Weight { get; private set; }
-
-    /// <summary>
-    /// Основной цвет
-    /// </summary>
-    public Color BodyColor { get; private set; }
-
     /// <summary>
     /// Дополнительный цвет для дополнительных модулей
     /// </summary>
@@ -27,12 +12,11 @@ public class EntityCatamaran
     /// </summary>
     public bool Floaters { get; private set; }
 
+    /// <summary>
+    /// Признак наличия паруса
+    /// </summary>
     public bool Sail {  get; private set; }
 
-    /// <summary>
-    /// Шаг перемещения катамарана
-    /// </summary>
-    public double Step => Speed * 100 / Weight;
 
     /// <summary>
     /// Инициализация полей объекта-класса катамарана
@@ -43,11 +27,8 @@ public class EntityCatamaran
     /// <param name="additionalColor">доп цвет для паурса и поплавков</param>
     /// <param name="floaters">наличие поплавков</param>
     /// <param name="sail">наличие паруса</param>
-    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool floaters, bool sail)
+    public EntityCatamaran(int speed, double weight, Color bodyColor, Color additionalColor, bool floaters, bool sail) : base(speed, weight, bodyColor)
     {      
-        Speed = speed;
-        Weight = weight;
-        BodyColor = bodyColor;
         AdditionalColor = additionalColor;
         Floaters = floaters;  
         Sail = sail;

ProjectCatamaran/ProjectCatamaran/FormCatamaran.Designer.cs

@@ -34,6 +34,7 @@
             buttonRight = new Button();
             buttonDown = new Button();
             buttonUp = new Button();
+            buttonCreateBoat = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxCatamaran).BeginInit();
             SuspendLayout();
             // 
@@ -49,12 +50,12 @@
             // buttonCreateCatamaran
             // 
             buttonCreateCatamaran.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateCatamaran.Location = new Point(10, 448);
+            buttonCreateCatamaran.Location = new Point(12, 449);
             buttonCreateCatamaran.Margin = new Padding(3, 2, 3, 2);
             buttonCreateCatamaran.Name = "buttonCreateCatamaran";
-            buttonCreateCatamaran.Size = new Size(75, 23);
+            buttonCreateCatamaran.Size = new Size(215, 23);
             buttonCreateCatamaran.TabIndex = 1;
-            buttonCreateCatamaran.Text = "Создать";
+            buttonCreateCatamaran.Text = "Создать катамаран";
             buttonCreateCatamaran.UseVisualStyleBackColor = true;
             buttonCreateCatamaran.Click += ButtonCreateCatamaran_Click;
             // 
@@ -110,11 +111,24 @@
             buttonUp.UseVisualStyleBackColor = true;
             buttonUp.Click += ButtonMove_Click;
             // 
+            // buttonCreateBoat
+            // 
+            buttonCreateBoat.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreateBoat.Location = new Point(243, 449);
+            buttonCreateBoat.Margin = new Padding(3, 2, 3, 2);
+            buttonCreateBoat.Name = "buttonCreateBoat";
+            buttonCreateBoat.Size = new Size(215, 23);
+            buttonCreateBoat.TabIndex = 6;
+            buttonCreateBoat.Text = "Создать лодку";
+            buttonCreateBoat.UseVisualStyleBackColor = true;
+            buttonCreateBoat.Click += ButtonCreateBoat_Click;
+            // 
             // FormCatamaran
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(1139, 474);
+            Controls.Add(buttonCreateBoat);
             Controls.Add(buttonUp);
             Controls.Add(buttonDown);
             Controls.Add(buttonRight);
@@ -135,5 +149,6 @@
         private Button buttonRight;
         private Button buttonDown;
         private Button buttonUp;
+        private Button buttonCreateBoat;
     }
 }

ProjectCatamaran/ProjectCatamaran/FormCatamaran.cs

@@ -1,9 +1,11 @@
-namespace ProjectCatamaran;
+using ProjectCatamaran.Drawnings;
+
+namespace ProjectCatamaran;
 
 
 public partial class FormCatamaran : Form
 {
-    private DrawingCatamaran? _drawingCatamaran;
+    private DrawningBoat? _drawingBoat;
     public FormCatamaran()
     {
         InitializeComponent();
@@ -14,7 +16,7 @@ public partial class FormCatamaran : Form
 	/// </summary>
     private void Draw()
     {
-        if (_drawingCatamaran == null)
+        if (_drawingBoat == null)
         {
             return;
         }
@@ -25,29 +27,45 @@ public partial class FormCatamaran : Form
 
         Bitmap bmp = new(pictureBoxCatamaran.Width, pictureBoxCatamaran.Height);
         Graphics gr = Graphics.FromImage(bmp);
-        _drawingCatamaran?.DrawTransport(gr);
+        _drawingBoat?.DrawTransport(gr);
         pictureBoxCatamaran.Image = bmp;
     }
-
-    /// <summary>
-    /// Обработка нажатия кнопки "Создать"
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonCreateCatamaran_Click(object sender, EventArgs e)
+    private void CreateObject(string type)
     {
         Random random = new();
-        _drawingCatamaran = new DrawingCatamaran();
-        _drawingCatamaran.Init(random.Next(30, 100), random.Next(100, 500),
+        switch(type)
+        {
+            case nameof(DrawningBoat):
+                _drawingBoat = new DrawningBoat(random.Next(30, 100), random.Next(100, 500), Color.FromArgb(random.Next(0, 256)));
+                break;
+            case nameof(DrawningCatamaran):
+                _drawingBoat = new DrawningCatamaran(random.Next(30, 100), random.Next(100, 500), 
                     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)));
-        _drawingCatamaran.SetPictureSize(pictureBoxCatamaran.Width, pictureBoxCatamaran.Height);
-        _drawingCatamaran.SetPosition(random.Next(15, 100), random.Next(15, 100));
+                break;
+            default:
+                return;
 
+        }
+        _drawingBoat.SetPictureSize(pictureBoxCatamaran.Width, pictureBoxCatamaran.Height);
+        _drawingBoat.SetPosition(random.Next(15, 100), random.Next(15, 100));
         Draw();
 
     }
+
+    /// <summary>
+    /// Обработка нажатия кнопки "Создать катамаран"
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonCreateCatamaran_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningCatamaran));
+    /// <summary>
+    /// Обработка нажатия кнопки "Создать лодку"
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonCreateBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBoat));
     /// <summary>
 	/// Перемещение объекта по форме (нажатие кнопок навигации)
 	/// </summary>
@@ -55,7 +73,7 @@ public partial class FormCatamaran : Form
 	/// <param name="e"></param>
     private void ButtonMove_Click(object sender, EventArgs e)
     {
-        if (_drawingCatamaran == null)
+        if (_drawingBoat == null)
         {
             return;
         }
@@ -65,16 +83,16 @@ public partial class FormCatamaran : Form
         switch (name)
         {
             case "buttonUp":
-                result = _drawingCatamaran.MoveTransport(DirectionType.Up);
+                result = _drawingBoat.MoveTransport(DirectionType.Up);
                 break;
             case "buttonDown":
-                result = _drawingCatamaran.MoveTransport(DirectionType.Down);
+                result = _drawingBoat.MoveTransport(DirectionType.Down);
                 break;
             case "buttonLeft":
-                result = _drawingCatamaran.MoveTransport(DirectionType.Left);
+                result = _drawingBoat.MoveTransport(DirectionType.Left);
                 break;
             case "buttonRight":
-                result = _drawingCatamaran.MoveTransport(DirectionType.Right);
+                result = _drawingBoat.MoveTransport(DirectionType.Right);
                 break;
         }
 
@@ -83,4 +101,5 @@ public partial class FormCatamaran : Form
             Draw();
         }
     }
+   
 }