diff --git a/ProjectLiner/ProjectLiner/DirectionType.cs b/ProjectLiner/ProjectLiner/Drawnings/DirectionType.cs similarity index 91% rename from ProjectLiner/ProjectLiner/DirectionType.cs rename to ProjectLiner/ProjectLiner/Drawnings/DirectionType.cs index 12c5fb2..cc78a5a 100644 --- a/ProjectLiner/ProjectLiner/DirectionType.cs +++ b/ProjectLiner/ProjectLiner/Drawnings/DirectionType.cs @@ -1,4 +1,4 @@ -namespace ProjectLiner; +namespace ProjectLiner.Drawnings; /// /// Направление перемещения diff --git a/ProjectLiner/ProjectLiner/DrawningLiner.cs b/ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs similarity index 60% rename from ProjectLiner/ProjectLiner/DrawningLiner.cs rename to ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs index 35d42b6..2bc1885 100644 --- a/ProjectLiner/ProjectLiner/DrawningLiner.cs +++ b/ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs @@ -1,14 +1,17 @@ -namespace ProjectLiner; +using ProjectLiner.Entities; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -/// -/// Класс, отвечающий за прорисовку и перемещение объекта-сущности -/// -public class DrawningLiner +namespace ProjectLiner.Drawnings; +public class DrawningCommonLiner { /// /// Класс-сущность /// - public EntityLiner? EntityLiner { get; private set; } + public EntityCommonLiner? EntityCommonLiner { get; protected set; } /// /// Ширина окна @@ -23,12 +26,12 @@ public class DrawningLiner /// /// Левая координата прорисовки лайнера /// - private int? _startPosX; + protected int? _startPosX; /// /// Верхняя кооридната прорисовки лайнера /// - private int? _startPosY; + protected int? _startPosY; /// /// Ширина прорисовки лайнера @@ -38,27 +41,44 @@ public class DrawningLiner /// /// Высота прорисовки лайнера /// - private readonly int _drawningLinerHeight = 125; + private readonly int _drawningLinerHeight = 90; /// - /// Инициализация свойств + /// Пустой конструктор /// - /// Скорость - /// Вес - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия якоря - /// Признак наличия шлюпок - /// Признак наличия трубы - public void Init(EntityLiner liner) + + public DrawningCommonLiner() { - EntityLiner = liner; _pictureWidth = null; _pictureHeight = null; _startPosX = null; _startPosY = null; } + /// + /// конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + + public DrawningCommonLiner(int speed, double weight, Color bodycolor) : this() + { + EntityCommonLiner = new EntityCommonLiner(speed, weight, bodycolor); + } + + /// + /// конструктор для наследников + /// + /// Высота + /// Длина + + protected DrawningCommonLiner(int drawningLinerWight, int drawningLinerHeight) : this() + { + _drawningLinerHeight = drawningLinerHeight; + _drawningLinerWidth = drawningLinerWight; + } + /// /// Установка границ поля /// @@ -73,7 +93,7 @@ public class DrawningLiner _pictureHeight = height; if (_startPosX != null && _startPosY != null) { - if (_startPosX.Value < 0) + if (_startPosX.Value < 0) _startPosX = 0; if (_startPosY.Value < 0) _startPosY = 0; @@ -129,7 +149,7 @@ public class DrawningLiner /// true - перемещене выполнено, false - перемещение невозможно public bool MoveTransport(DirectionType direction) { - if (EntityLiner == null || !_startPosX.HasValue || !_startPosY.HasValue) + if (EntityCommonLiner == null || !_startPosX.HasValue || !_startPosY.HasValue) { return false; } @@ -138,30 +158,30 @@ public class DrawningLiner { //влево case DirectionType.Left: - if (_startPosX.Value - EntityLiner.Step > 0) + if (_startPosX.Value - EntityCommonLiner.Step > 0) { - _startPosX -= (int)EntityLiner.Step; + _startPosX -= (int)EntityCommonLiner.Step; } return true; //вверх case DirectionType.Up: - if (_startPosY.Value - EntityLiner.Step > 0) + if (_startPosY.Value - EntityCommonLiner.Step > 0) { - _startPosY -= (int)EntityLiner.Step; + _startPosY -= (int)EntityCommonLiner.Step; } return true; // вправо case DirectionType.Right: - if (_startPosX.Value + EntityLiner.Step < _pictureWidth-_drawningLinerWidth) + if (_startPosX.Value + EntityCommonLiner.Step < _pictureWidth - _drawningLinerWidth) { - _startPosX += (int)EntityLiner.Step; + _startPosX += (int)EntityCommonLiner.Step; } return true; //вниз case DirectionType.Down: - if (_startPosY.Value + EntityLiner.Step < _pictureHeight-_drawningLinerHeight) + if (_startPosY.Value + EntityCommonLiner.Step < _pictureHeight - _drawningLinerHeight) { - _startPosY += (int)EntityLiner.Step; + _startPosY += (int)EntityCommonLiner.Step; } return true; default: @@ -173,61 +193,33 @@ public class DrawningLiner /// Прорисовка объекта /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { - if (EntityLiner == null || !_startPosX.HasValue || !_startPosY.HasValue) + if (EntityCommonLiner == null || !_startPosX.HasValue || !_startPosY.HasValue) { return; } Pen pen = new(Color.Black); - Brush additionalBrush = new SolidBrush(EntityLiner.AdditionalColor); - Brush br = new SolidBrush(EntityLiner.BodyColor); + Brush br = new SolidBrush(EntityCommonLiner.BodyColor); - // якорь - if (EntityLiner.Anchor) - { - g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 85, _startPosX.Value + 45, _startPosY.Value + 115); - g.DrawLine(pen, _startPosX.Value + 30, _startPosY.Value + 95, _startPosX.Value + 60, _startPosY.Value + 95); - g.DrawLine(pen, _startPosX.Value + 25, _startPosY.Value + 100, _startPosX.Value + 45, _startPosY.Value + 115); - g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 115, _startPosX.Value + 65, _startPosY.Value + 100); - } // кузов лайнера - Point point1 = new Point(_startPosX.Value, _startPosY.Value + 80); - Point point2 = new Point(_startPosX.Value + 50, _startPosY.Value + 130); - Point point3 = new Point(_startPosX.Value + 135, _startPosY.Value + 130); - Point point4 = new Point(_startPosX.Value + 155, _startPosY.Value + 80); + Point point1 = new Point(_startPosX.Value, _startPosY.Value + 40); + Point point2 = new Point(_startPosX.Value + 50, _startPosY.Value + 90); + Point point3 = new Point(_startPosX.Value + 135, _startPosY.Value + 90); + Point point4 = new Point(_startPosX.Value + 155, _startPosY.Value + 40); Point[] curvePoints = { point1, point2, point3, point4 }; g.FillPolygon(br, curvePoints); // борт лайнера - Point point5 = new Point(_startPosX.Value+40, _startPosY.Value + 40); - Point point6 = new Point(_startPosX.Value + 140, _startPosY.Value + 40); - Point point7 = new Point(_startPosX.Value + 140, _startPosY.Value + 80); - Point point8 = new Point(_startPosX.Value + 40, _startPosY.Value + 80); + Point point5 = new Point(_startPosX.Value + 40, _startPosY.Value); + Point point6 = new Point(_startPosX.Value + 140, _startPosY.Value); + Point point7 = new Point(_startPosX.Value + 140, _startPosY.Value + 40); + Point point8 = new Point(_startPosX.Value + 40, _startPosY.Value + 40); Point[] curvePoints2 = { point5, point6, point7, point8 }; - g.FillPolygon(additionalBrush, curvePoints2); + g.FillPolygon(br, curvePoints2); - // шлюпки - if (EntityLiner.Boats) - { - g.FillEllipse(additionalBrush, _startPosX.Value + 40, _startPosY.Value + 85, 30, 15); - g.FillEllipse(additionalBrush, _startPosX.Value + 75, _startPosY.Value + 85, 30, 15); - g.FillEllipse(additionalBrush, _startPosX.Value + 110, _startPosY.Value + 85, 30, 15); - } - - // труба - if (EntityLiner.Pipe) - { - - Point point9 = new Point(_startPosX.Value + 90, _startPosY.Value + 10); - Point point10 = new Point(_startPosX.Value + 90, _startPosY.Value + 40); - Point point11 = new Point(_startPosX.Value + 115, _startPosY.Value + 40); - Point point12 = new Point(_startPosX.Value + 115, _startPosY.Value + 10); - Point[] curvePoints3 = { point9, point10, point11, point12 }; - g.FillPolygon(br, curvePoints3); - } } } diff --git a/ProjectLiner/ProjectLiner/Drawnings/DrawningLiner.cs b/ProjectLiner/ProjectLiner/Drawnings/DrawningLiner.cs new file mode 100644 index 0000000..a2ce841 --- /dev/null +++ b/ProjectLiner/ProjectLiner/Drawnings/DrawningLiner.cs @@ -0,0 +1,72 @@ +using ProjectLiner.Entities; + +namespace ProjectLiner.Drawnings; + +/// +/// Класс, отвечающий за прорисовку и перемещение объекта-сущности +/// +public class DrawningLiner : DrawningCommonLiner +{ + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия якоря + /// Признак наличия шлюпок + /// Признак наличия трубы + public DrawningLiner(int speed, double weight, Color bodycolor, Color additionalColor, bool anchor, bool boats, bool pipe) : base(150, 125) + { + EntityCommonLiner = new EntityLiner(speed, weight, bodycolor, additionalColor, anchor, boats, pipe); + + } + + public override void DrawTransport(Graphics g) + { + if (EntityCommonLiner == null || EntityCommonLiner is not EntityLiner liner || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + Brush additionalBrush = new SolidBrush(liner.AdditionalColor); + Brush br = new SolidBrush(liner.BodyColor); + + _startPosY += 40; + base.DrawTransport(g); + _startPosY -= 40; + + + // якорь + if (liner.Anchor) + { + g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 85, _startPosX.Value + 45, _startPosY.Value + 115); + g.DrawLine(pen, _startPosX.Value + 30, _startPosY.Value + 95, _startPosX.Value + 60, _startPosY.Value + 95); + g.DrawLine(pen, _startPosX.Value + 25, _startPosY.Value + 100, _startPosX.Value + 45, _startPosY.Value + 115); + g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 115, _startPosX.Value + 65, _startPosY.Value + 100); + } + + // шлюпки + if (liner.Boats) + { + g.FillEllipse(additionalBrush, _startPosX.Value + 40, _startPosY.Value + 85, 30, 15); + g.FillEllipse(additionalBrush, _startPosX.Value + 75, _startPosY.Value + 85, 30, 15); + g.FillEllipse(additionalBrush, _startPosX.Value + 110, _startPosY.Value + 85, 30, 15); + } + + // труба + if (liner.Pipe) + { + + Point point9 = new Point(_startPosX.Value + 90, _startPosY.Value + 10); + Point point10 = new Point(_startPosX.Value + 90, _startPosY.Value + 40); + Point point11 = new Point(_startPosX.Value + 115, _startPosY.Value + 40); + Point point12 = new Point(_startPosX.Value + 115, _startPosY.Value + 10); + Point[] curvePoints3 = { point9, point10, point11, point12 }; + g.FillPolygon(br, curvePoints3); + } + } + +} diff --git a/ProjectLiner/ProjectLiner/Entities/EntityCommonLiner.cs b/ProjectLiner/ProjectLiner/Entities/EntityCommonLiner.cs new file mode 100644 index 0000000..bb99401 --- /dev/null +++ b/ProjectLiner/ProjectLiner/Entities/EntityCommonLiner.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +/// +/// Класс-сущность обычного "Лайнера" +/// + +namespace ProjectLiner.Entities +{ + public class EntityCommonLiner + { + /// + /// Скорость + /// + 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 EntityCommonLiner(int speed, double weight, Color bodyColor) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + + } + } +} diff --git a/ProjectLiner/ProjectLiner/EntityLiner.cs b/ProjectLiner/ProjectLiner/Entities/EntityLiner.cs similarity index 58% rename from ProjectLiner/ProjectLiner/EntityLiner.cs rename to ProjectLiner/ProjectLiner/Entities/EntityLiner.cs index 66d27c1..18a65d3 100644 --- a/ProjectLiner/ProjectLiner/EntityLiner.cs +++ b/ProjectLiner/ProjectLiner/Entities/EntityLiner.cs @@ -1,24 +1,10 @@ -namespace ProjectLiner; +namespace ProjectLiner.Entities; /// /// Класс-сущность "Лайнер" /// -public class EntityLiner +public class EntityLiner: EntityCommonLiner { - /// - /// Скорость - /// - public int Speed { get; private set; } - - /// - /// Вес - /// - public double Weight { get; private set; } - - /// - /// Основной цвет - /// - public Color BodyColor { get; private set; } /// /// Дополнительный цвет (для опциональных элементов) @@ -40,26 +26,17 @@ public class EntityLiner /// public bool Pipe { get; private set; } - /// - /// Шаг перемещения автомобиля - /// - public double Step => Speed * 100 / Weight; /// /// Инициализация полей объекта-класса спортивного автомобиля /// - /// Скорость - /// Вес автомобиля - /// Основной цвет /// Дополнительный цвет /// Признак наличия якоря /// Признак наличия шлюпок /// Признак наличия трубы - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool anchor, bool boats, bool pipe) + public EntityLiner(int speed, double weight, Color bodyColor, Color additionalColor, bool anchor, bool boats, bool pipe) : base(speed, weight, bodyColor) { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; + new EntityCommonLiner(speed, weight, bodyColor); AdditionalColor = additionalColor; Anchor = anchor; Boats = boats; diff --git a/ProjectLiner/ProjectLiner/FormLiner.Designer.cs b/ProjectLiner/ProjectLiner/FormLiner.Designer.cs index 94eb653..2806d52 100644 --- a/ProjectLiner/ProjectLiner/FormLiner.Designer.cs +++ b/ProjectLiner/ProjectLiner/FormLiner.Designer.cs @@ -34,6 +34,7 @@ buttonUp = new Button(); buttonLeft = new Button(); buttonRight = new Button(); + buttonCreateCommonLiner = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxLiner).BeginInit(); SuspendLayout(); // @@ -50,11 +51,11 @@ // buttonCreate // buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreate.Location = new Point(12, 520); + buttonCreate.Location = new Point(12, 544); buttonCreate.Name = "buttonCreate"; - buttonCreate.Size = new Size(150, 82); + buttonCreate.Size = new Size(203, 58); buttonCreate.TabIndex = 1; - buttonCreate.Text = "Создать"; + buttonCreate.Text = "Создать Лайнер"; buttonCreate.UseVisualStyleBackColor = true; buttonCreate.Click += buttonCreate_Click; // @@ -106,11 +107,23 @@ buttonRight.UseVisualStyleBackColor = true; buttonRight.Click += ButtonMove_Click; // + // buttonCreateCommonLiner + // + buttonCreateCommonLiner.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateCommonLiner.Location = new Point(221, 544); + buttonCreateCommonLiner.Name = "buttonCreateCommonLiner"; + buttonCreateCommonLiner.Size = new Size(240, 58); + buttonCreateCommonLiner.TabIndex = 6; + buttonCreateCommonLiner.Text = "Создать Обычный Лайнер"; + buttonCreateCommonLiner.UseVisualStyleBackColor = true; + buttonCreateCommonLiner.Click += buttonCreateCommonLiner_Click; + // // FormLiner // AutoScaleDimensions = new SizeF(11F, 25F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(948, 614); + Controls.Add(buttonCreateCommonLiner); Controls.Add(buttonRight); Controls.Add(buttonLeft); Controls.Add(buttonUp); @@ -131,5 +144,6 @@ private Button buttonUp; private Button buttonLeft; private Button buttonRight; + private Button buttonCreateCommonLiner; } } \ No newline at end of file diff --git a/ProjectLiner/ProjectLiner/FormLiner.cs b/ProjectLiner/ProjectLiner/FormLiner.cs index c72187d..8597fce 100644 --- a/ProjectLiner/ProjectLiner/FormLiner.cs +++ b/ProjectLiner/ProjectLiner/FormLiner.cs @@ -7,12 +7,13 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using ProjectLiner.Drawnings; namespace ProjectLiner { public partial class FormLiner : Form { - private DrawningLiner? _drawningLiner; + private DrawningCommonLiner? _drawningCommonLiner; public FormLiner() { InitializeComponent(); @@ -23,35 +24,66 @@ namespace ProjectLiner /// private void Draw() { - if (_drawningLiner == null) + if (_drawningCommonLiner == null) { return; } Bitmap bmp = new(pictureBoxLiner.Width, pictureBoxLiner.Height); Graphics gr = Graphics.FromImage(bmp); - _drawningLiner.DrawTransport(gr); + _drawningCommonLiner.DrawTransport(gr); pictureBoxLiner.Image = bmp; } /// - /// Обработка нажатия кнопки "Создать" + /// Создание объекта класса-перемещения + /// + /// Тип создаваемого объекта + private void CreateObject(string type) + { + Random random = new(); + switch (type) + { + case nameof(DrawningCommonLiner): + _drawningCommonLiner = new DrawningCommonLiner(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(DrawningLiner): + _drawningCommonLiner = new DrawningLiner(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)), Convert.ToBoolean(random.Next(0, 2))); + break; + default: + return; + + } + + _drawningCommonLiner.SetPictureSize(pictureBoxLiner.Width, pictureBoxLiner.Height); + _drawningCommonLiner.SetPosition(random.Next(10, 100), random.Next(10, 100)); + + Draw(); + } + + /// + /// Обработка нажатия кнопки "Создать Лайнер" /// /// /// private void buttonCreate_Click(object sender, EventArgs e) { - Random random = new(); - EntityLiner liner = new EntityLiner(); - liner.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)), Convert.ToBoolean(random.Next(0, 2))); - _drawningLiner = new DrawningLiner(); - _drawningLiner.Init(liner); - _drawningLiner.SetPictureSize(pictureBoxLiner.Width, pictureBoxLiner.Height); - _drawningLiner.SetPosition(random.Next(10, 100), random.Next(10, 100)); - Draw(); + CreateObject(nameof(DrawningLiner)); + } + + /// + /// Обработка нажатия кнопки "Создать Обычный Лайнер" + /// + /// + /// + + private void buttonCreateCommonLiner_Click(object sender, EventArgs e) + { + CreateObject(nameof(DrawningCommonLiner)); } /// @@ -61,7 +93,7 @@ namespace ProjectLiner /// private void ButtonMove_Click(object sender, EventArgs e) { - if (_drawningLiner == null) + if (_drawningCommonLiner == null) { return; } @@ -71,16 +103,16 @@ namespace ProjectLiner switch (name) { case "buttonUp": - result = _drawningLiner.MoveTransport(DirectionType.Up); + result = _drawningCommonLiner.MoveTransport(DirectionType.Up); break; case "buttonDown": - result = _drawningLiner.MoveTransport(DirectionType.Down); + result = _drawningCommonLiner.MoveTransport(DirectionType.Down); break; case "buttonLeft": - result = _drawningLiner.MoveTransport(DirectionType.Left); + result = _drawningCommonLiner.MoveTransport(DirectionType.Left); break; case "buttonRight": - result = _drawningLiner.MoveTransport(DirectionType.Right); + result = _drawningCommonLiner.MoveTransport(DirectionType.Right); break; } @@ -89,5 +121,6 @@ namespace ProjectLiner Draw(); } } + } }