Добавление родителей и ввод конструкторов

ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DirectionType.cs

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

ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DrawningShip.cs

@@ -1,11 +1,13 @@
-namespace ProjectWarmlyShip;
+using ProjectWarmlyShip.Entities;
 
-public class DrawningWarmlyShip
+namespace ProjectWarmlyShip.Drawnings;
+
+public class DrawningShip
 {
     /// <summary>
     /// Класс-сущность
     /// </summary>
-    public EntityWarmlyShip? EntityWarmlyShip { get; private set; }
+    public EntityShip? EntityShip { get; protected set; }
 
     /// <summary>
     /// Ширина окна
@@ -20,12 +22,12 @@ public class DrawningWarmlyShip
     /// <summary>
     /// Левая координата прорисовки 
     /// </summary>
-    private int? _startPosX;
+    protected int? _startPosX;
 
     /// <summary>
     /// Верхняя кооридната прорисовки
     /// </summary>
-    private int? _startPosY;
+    protected int? _startPosY;
 
     /// <summary>
     /// Ширина прорисовки
@@ -35,26 +37,37 @@ public class DrawningWarmlyShip
     /// <summary>
     /// Высота прорисовки
     /// </summary>
-    private int _drawningShipHeight = 140;
+    private int _drawningShipHeight = 80;
-
     /// <summary>
-    /// Инициализация свойств
+    /// Пустой конструктор
     /// </summary>
-    /// <param name="speed"></param>
+    private DrawningShip()
-    /// <param name="weight"></param>
-    /// <param name="bodycolor"></param>
-    /// <param name="additionalcolor"></param>
-    /// <param name="shpipipes"></param>
-    /// <param name="fueltank"></param>
-    public void Init(int speed, double weight, Color bodycolor, Color additionalcolor, bool shpipipes, bool fueltank)
     {
-        EntityWarmlyShip = new EntityWarmlyShip();
-        EntityWarmlyShip.Init(speed, weight, bodycolor, additionalcolor, shpipipes, fueltank);
         _pictureWidth = null;
         _pictureHeight = null;
         _startPosX = null;
         _startPosY = null;
     }
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="speed"></param>
+    /// <param name="weight"></param>
+    /// <param name="bodycolor"></param>
+    public DrawningShip(int speed, double weight, Color bodycolor) : this()
+    {
+        EntityShip = new EntityShip(speed, weight, bodycolor);
+    }
+    /// <summary>
+    /// Конструктор для наследования
+    /// </summary>
+    /// <param name="_drawningShipWidth"></param>
+    /// <param name="_drawnShipHeight"></param>
+    protected DrawningShip(int _drawningShipWidth, int _drawnShipHeight) : this()
+    {
+        this._drawningShipWidth= _drawningShipWidth;
+        this._drawningShipHeight = _drawnShipHeight;
+    }
     public bool SetPictureSize(int width, int height)
     {
         // TODO проверка, что объект "влезает" в размеры поля 
@@ -105,7 +118,7 @@ public class DrawningWarmlyShip
     }
     public bool MoveTransport(DirectionType direction)
     {
-        if (EntityWarmlyShip == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        if (EntityShip == null || !_startPosX.HasValue || !_startPosY.HasValue)
         {
             return false;
         }
@@ -113,30 +126,30 @@ public class DrawningWarmlyShip
         {
             //влево
             case DirectionType.Left:
-                if (_startPosX.Value - EntityWarmlyShip.Step > 0)
+                if (_startPosX.Value - EntityShip.Step > 0)
                 {
-                    _startPosX -= (int)EntityWarmlyShip.Step;
+                    _startPosX -= (int)EntityShip.Step;
                 }
                 return true;
             //вверх
             case DirectionType.Up:
-                if (_startPosY.Value - EntityWarmlyShip.Step > 0)
+                if (_startPosY.Value - EntityShip.Step > 0)
                 {
-                    _startPosY -= (int)EntityWarmlyShip.Step;
+                    _startPosY -= (int)EntityShip.Step;
                 }
                 return true;
             // вправо
             case DirectionType.Right:
-                if (_startPosX.Value + _drawningShipWidth + EntityWarmlyShip.Step < _pictureWidth)
+                if (_startPosX.Value + _drawningShipWidth + EntityShip.Step < _pictureWidth)
                 {
-                    _startPosX += (int)EntityWarmlyShip.Step;
+                    _startPosX += (int)EntityShip.Step;
                 }
                 return true;
             //вниз
             case DirectionType.Down:
-                if (_startPosY.Value + _drawningShipHeight + EntityWarmlyShip.Step < _pictureHeight)
+                if (_startPosY.Value + _drawningShipHeight + EntityShip.Step < _pictureHeight)
                 {
-                    _startPosY += (int)EntityWarmlyShip.Step;
+                    _startPosY += (int)EntityShip.Step;
                 }
                 return true;
             default:
@@ -147,37 +160,15 @@ public class DrawningWarmlyShip
     /// Отрисовка объекта
     /// </summary>
     /// <param name="g"></param>
-    public void DrawTransport(Graphics g)
+    public virtual void DrawTransport(Graphics g)
     {
-        if (EntityWarmlyShip == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        if (EntityShip == null || !_startPosX.HasValue || !_startPosY.HasValue)
         {
             return;
         }
-        Pen pen = new(Color.Black , 5);
+        Pen pen = new(Color.Black, 5);
-        
-        //трубы
-        Brush brush = new SolidBrush(EntityWarmlyShip.AdditionalColor);
-        if (EntityWarmlyShip.ShipPipes)
-        {
-            g.FillRectangle(brush, _startPosX.Value + 70, _startPosY.Value, 12, 60);
-            g.FillRectangle(brush, _startPosX.Value + 90, _startPosY.Value, 12, 60);
         //надстройка
-            brush = new SolidBrush(EntityWarmlyShip.BodyColor);
+        Brush brush = new SolidBrush(EntityShip.BodyColor);
-            g.FillRectangle(brush, _startPosX.Value + 30, _startPosY.Value + 60, 100, 30);
-            //корпус
-            g.FillPolygon(brush, new Point[]
-            {
-            new Point(_startPosX.Value,_startPosY.Value + 90), new Point(_startPosX.Value + 150, _startPosY.Value + 90),
-            new Point(_startPosX.Value + 150, _startPosY.Value + 90), new Point(_startPosX.Value + 120,_startPosY.Value + 140),
-            new Point(_startPosX.Value + 120,_startPosY.Value + 140), new Point(_startPosX.Value + 30,_startPosY.Value + 140),
-            new Point(_startPosX.Value + 30,_startPosY.Value + 140), new Point(_startPosX.Value,_startPosY.Value + 90),
-            });
-            _drawningShipHeight = 140;
-        }
-        else
-        {
-            //надстройка
-            brush = new SolidBrush(EntityWarmlyShip.BodyColor);
         g.FillRectangle(brush, _startPosX.Value + 30, _startPosY.Value, 100, 30);
         //корпус
         g.FillPolygon(brush, new Point[]
@@ -187,18 +178,6 @@ public class DrawningWarmlyShip
         new Point(_startPosX.Value + 120,_startPosY.Value + 80), new Point(_startPosX.Value + 30,_startPosY.Value + 80),
         new Point(_startPosX.Value + 30,_startPosY.Value + 80), new Point(_startPosX.Value,_startPosY.Value + 30),
         });
-            _drawningShipHeight = 80;
     }
-        //топливный бак
-        if (EntityWarmlyShip.FuelTank)
-        {
-            brush = new SolidBrush(EntityWarmlyShip.AdditionalColor);
-            if (EntityWarmlyShip.ShipPipes)
-                g.FillRectangle(brush, _startPosX.Value + 40, _startPosY.Value + 120, 70, 10);
-            else
-                g.FillRectangle(brush, _startPosX.Value + 40, _startPosY.Value + 60, 70, 10);
-        }
-
-    }
-
 }
+

ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DrawningWarmlyShip.cs

@@ -0,0 +1,49 @@
+using ProjectWarmlyShip.Entities;
+
+namespace ProjectWarmlyShip.Drawnings;
+
+public class DrawningWarmlyShip : DrawningShip
+{
+    /// <summary>
+    /// Класс-сущность
+    /// </summary>
+    public EntityWarmlyShip? EntityWarmlyShip { get; private set; }
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="additionalcolor"></param>
+    /// <param name="shpipipes"></param>
+    /// <param name="fueltank"></param>
+    public DrawningWarmlyShip(int speed, double weight, Color bodycolor, Color additionalcolor, bool shpipipes, bool fueltank) : base(150,140)
+    {
+        EntityShip = new EntityWarmlyShip(speed, weight, bodycolor, additionalcolor, shpipipes, fueltank); //дописать конструктор
+    }
+    public override void DrawTransport(Graphics g)
+    {
+        //оператор is совместимость объекта с заданным типом
+        if (EntityShip == null || EntityShip is not EntityWarmlyShip warmlyship || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+        Brush brush = new SolidBrush(warmlyship.AdditionalColor);
+        if (warmlyship.ShipPipes)
+        {
+            g.FillRectangle(brush, _startPosX.Value + 70, _startPosY.Value, 12, 60);
+            g.FillRectangle(brush, _startPosX.Value + 90, _startPosY.Value, 12, 60);
+            _startPosY += 60;
+        }       
+        base.DrawTransport(g);
+        if (warmlyship.FuelTank)
+        {
+            //if (EntityWarmlyShip.ShipPipes)
+            //{
+            //    g.FillRectangle(brush, _startPosX.Value + 40, _startPosY.Value + 120, 70, 10);
+            //}
+            //else
+            //    g.FillRectangle(brush, _startPosX.Value + 40, _startPosY.Value + 60, 70, 10);
+            g.FillRectangle(brush, _startPosX.Value + 40, _startPosY.Value + 60, 70, 10);
+        }
+        if (warmlyship.ShipPipes) _startPosY -= 60;
+    }
+
+}

ProjectWarmlyShip/ProjectWarmlyShip/Entities/EntityShip.cs

@@ -0,0 +1,34 @@
+namespace ProjectWarmlyShip.Entities;
+
+public class EntityShip
+{
+    /// <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 EntityShip(int speed, double weight, Color bodycolor)
+    {
+        Speed = speed;
+        Weight = weight;
+        BodyColor = bodycolor;
+    }
+}
+

ProjectWarmlyShip/ProjectWarmlyShip/Entities/EntityWarmlyShip.cs

@@ -0,0 +1,29 @@
+namespace ProjectWarmlyShip.Entities;
+
+public class EntityWarmlyShip : EntityShip
+{
+    /// <summary>
+    /// Дополнительтный цвет
+    /// </summary>
+    public Color AdditionalColor { get; private set; }
+    /// <summary>
+    /// Признак наличия труб
+    /// </summary>
+    public bool ShipPipes { get; private set; }
+    /// <summary>
+    /// Признак наличия топливного бака
+    /// </summary>
+    public bool FuelTank { get; private set; }
+    /// <summary>
+    /// Инициализация полей класса EntityWarmlyShip
+    /// </summary>
+    /// <param name="additionalcolor"></param>
+    /// <param name="shpipipes"></param>
+    /// <param name="fueltank"></param>
+    public EntityWarmlyShip(int speed, double weight, Color bodycolor, Color additionalcolor, bool shpipipes, bool fueltank) : base(speed, weight, bodycolor)
+    {
+        AdditionalColor = additionalcolor;
+        ShipPipes = shpipipes;
+        FuelTank = fueltank;
+    }
+}

ProjectWarmlyShip/ProjectWarmlyShip/EntityWarmlyShip.cs

@@ -1,51 +0,0 @@
-namespace ProjectWarmlyShip;
-
-public class EntityWarmlyShip
-{
-    /// <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 Color AdditionalColor { get; private set; }
-    /// <summary>
-    /// Признак наличия труб
-    /// </summary>
-    public bool ShipPipes { get; private set; }
-    /// <summary>
-    /// Признак наличия топливного бака
-    /// </summary>
-    public bool FuelTank { get; private set; }
-    /// <summary>
-    /// Шаг перемещения судна
-    /// </summary>
-    public double Step => Speed * 100 / Weight;
-    /// <summary>
-    /// Инициализация полей класса WarmlyShip
-    /// </summary>
-    /// <param name="speed"></param>
-    /// <param name="weight"></param>
-    /// <param name="bodycolor"></param>
-    /// <param name="additionalcolor"></param>
-    /// <param name="shpipipes"></param>
-    /// <param name="fueltank"></param>
-    public void Init(int speed, double weight, Color bodycolor, Color additionalcolor, bool shpipipes, bool fueltank)
-    {
-        Speed = speed;
-        Weight = weight;
-        BodyColor = bodycolor;
-        AdditionalColor = additionalcolor;
-        ShipPipes = shpipipes;
-        FuelTank = fueltank;
-    }
-}

ProjectWarmlyShip/ProjectWarmlyShip/FormWarmlyShip.Designer.cs

@@ -34,6 +34,7 @@
             buttonRight = new Button();
             buttonLeft = new Button();
             buttonDown = new Button();
+            buttonСreateShip = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxWarmlyShip).BeginInit();
             SuspendLayout();
             // 
@@ -55,9 +56,9 @@
             buttonCreate.ForeColor = SystemColors.ControlText;
             buttonCreate.Location = new Point(12, 331);
             buttonCreate.Name = "buttonCreate";
-            buttonCreate.Size = new Size(75, 23);
+            buttonCreate.Size = new Size(118, 23);
             buttonCreate.TabIndex = 1;
-            buttonCreate.Text = "Создать";
+            buttonCreate.Text = "Создать теплоход";
             buttonCreate.UseVisualStyleBackColor = false;
             buttonCreate.Click += ButtonCreate_Click;
             // 
@@ -109,11 +110,26 @@
             buttonDown.UseVisualStyleBackColor = true;
             buttonDown.Click += ButtonMove_Click;
             // 
+            // buttonСreateShip
+            // 
+            buttonСreateShip.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonСreateShip.BackColor = SystemColors.ButtonHighlight;
+            buttonСreateShip.Cursor = Cursors.IBeam;
+            buttonСreateShip.ForeColor = SystemColors.ControlText;
+            buttonСreateShip.Location = new Point(146, 331);
+            buttonСreateShip.Name = "buttonСreateShip";
+            buttonСreateShip.Size = new Size(118, 23);
+            buttonСreateShip.TabIndex = 6;
+            buttonСreateShip.Text = "Создать судно";
+            buttonСreateShip.UseVisualStyleBackColor = false;
+            buttonСreateShip.Click += buttonСreateShip_Click;
+            // 
             // FormWarmlyShip
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(830, 366);
+            Controls.Add(buttonСreateShip);
             Controls.Add(buttonDown);
             Controls.Add(buttonLeft);
             Controls.Add(buttonRight);
@@ -135,5 +151,6 @@
         private Button buttonRight;
         private Button buttonLeft;
         private Button buttonDown;
+        private Button buttonСreateShip;
     }
 }

ProjectWarmlyShip/ProjectWarmlyShip/FormWarmlyShip.cs

@@ -1,31 +1,61 @@
-namespace ProjectWarmlyShip
+using ProjectWarmlyShip.Drawnings;
+
+namespace ProjectWarmlyShip
 {
     public partial class FormWarmlyShip : Form
     {
-        private DrawningWarmlyShip? _drawningWarmlyShip;
+        private DrawningShip? _drawningShip;
         public FormWarmlyShip()
         {
             InitializeComponent();
         }
-        private void ButtonCreate_Click(object sender, EventArgs e)
+        private void CreateObject(string type)
         {
-            Random random = new();
+            Random random = new Random();
-            _drawningWarmlyShip = new DrawningWarmlyShip();
+            switch(type)
-            _drawningWarmlyShip.Init(random.Next(100, 300), random.Next(1000, 3000),
+            {
+                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(DrawningWarmlyShip):
+                    _drawningShip = new DrawningWarmlyShip(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)));
-            _drawningWarmlyShip.SetPictureSize(pictureBoxWarmlyShip.Width, pictureBoxWarmlyShip.Height);
+                    break;
-            _drawningWarmlyShip.SetPosition(random.Next(10, 100), random.Next(10, 100));
+                default:
-
+                    return;
+            }
+            _drawningShip.SetPictureSize(pictureBoxWarmlyShip.Width, pictureBoxWarmlyShip.Height);
+            _drawningShip.SetPosition(random.Next(10, 100), random.Next(10, 100));
             Bitmap bmp = new(pictureBoxWarmlyShip.Width, pictureBoxWarmlyShip.Height);
             Graphics gr = Graphics.FromImage(bmp);
-            _drawningWarmlyShip.DrawTransport(gr);
+            _drawningShip.DrawTransport(gr);
             pictureBoxWarmlyShip.Image = bmp;
+
+        }
+        /// <summary>
+        /// Кнопка создания теплохода
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreate_Click(object sender, EventArgs e)
+        {
+            CreateObject(nameof(DrawningWarmlyShip));
+        }
+        /// <summary>
+        /// Кнопка создания судна
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonСreateShip_Click(object sender, EventArgs e)
+        {
+            CreateObject(nameof(DrawningShip));
         }
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            if (_drawningWarmlyShip == null)
+            if (_drawningShip == null)
             {
                 return;
             }
@@ -34,27 +64,26 @@
             switch (name)
             {
                 case "buttonUp":
-                    result = _drawningWarmlyShip.MoveTransport(DirectionType.Up);
+                    result = _drawningShip.MoveTransport(DirectionType.Up);
                     break;
                 case "buttonDown":
-                    result = _drawningWarmlyShip.MoveTransport(DirectionType.Down);
+                    result = _drawningShip.MoveTransport(DirectionType.Down);
                     break;
                 case "buttonLeft":
-                    result = _drawningWarmlyShip.MoveTransport(DirectionType.Left);
+                    result = _drawningShip.MoveTransport(DirectionType.Left);
                     break;
                 case "buttonRight":
-                    result = _drawningWarmlyShip.MoveTransport(DirectionType.Right);
+                    result = _drawningShip.MoveTransport(DirectionType.Right);
                     break;
             }
             if (result)
             {
                 Bitmap bmp = new(pictureBoxWarmlyShip.Width, pictureBoxWarmlyShip.Height);
                 Graphics gr = Graphics.FromImage(bmp);
-                _drawningWarmlyShip.DrawTransport(gr);
+                _drawningShip.DrawTransport(gr);
                 pictureBoxWarmlyShip.Image = bmp;
             }
         }
-
     }
 
 }