diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/DirectionType.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DirectionType.cs similarity index 88% rename from SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/DirectionType.cs rename to SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DirectionType.cs index aac0d0b..2bcd53a 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/DirectionType.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DirectionType.cs @@ -1,4 +1,4 @@ -namespace SelfPropelledArtilleryUnit; +namespace SelfPropelledArtilleryUnit.Drawnings; /// /// Направление перемещения /// diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/DrawningSelfPropelledArtilleryUnit.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningPropelledArtillery.cs similarity index 60% rename from SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/DrawningSelfPropelledArtilleryUnit.cs rename to SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningPropelledArtillery.cs index 90570b1..4bebc30 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/DrawningSelfPropelledArtilleryUnit.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningPropelledArtillery.cs @@ -1,14 +1,18 @@ -namespace SelfPropelledArtilleryUnit; -/// -/// Класс, отвечающий за прорисовку и перемещение объекта-сущности -/// +using SelfPropelledArtilleryUnit.Entities; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -public class DrawningSelfPropelledArtilleryUnit +namespace SelfPropelledArtilleryUnit.Drawnings; + +public class DrawningPropelledArtillery { /// /// Класс-сущность /// - public EntitySelfPropelledArtilleryUnit? EntitySelfPropelledArtilleryUnit { get; private set; } + public EntityPropelledArtillery? EntityPropelledArtillery { get; protected set; } /// /// Ширина окна @@ -23,43 +27,57 @@ public class DrawningSelfPropelledArtilleryUnit /// /// Левая координата прорисовки cамоходной арт. установки /// - private int? _startPosX; + protected int? _startPosX; /// /// Верхняя кооридната прорисовки cамоходной арт. установки /// - private int? _startPosY; + protected int? _startPosY; /// /// Ширина прорисовки cамоходной арт. установки /// - private readonly int _drawningSelfPropelledArtilleryUnitWidth = 135; + private readonly int _drawningPropelledArtilleryWidth = 135; /// /// Высота прорисовки cамоходной арт. установки /// - private readonly int _drawningSelfPropelledArtilleryUnitHeight = 105; + private readonly int _drawningPropelledArtilleryHeight = 105; /// - /// Инициализация полей объекта-класса Самоходная арт. установка + /// Пустой конструктор /// - /// Скорость - /// Вес автомобиля - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия башни - /// Признак наличия орудия - - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool turretCannon, bool launchBattery) + private DrawningPropelledArtillery() { - EntitySelfPropelledArtilleryUnit = new EntitySelfPropelledArtilleryUnit(); - EntitySelfPropelledArtilleryUnit.Init(speed, weight, bodyColor, additionalColor, turretCannon, launchBattery); _pictureWidth = null; _pictureHeight = null; _startPosX = null; _startPosY = null; } + /// + /// Конструктор + /// + /// Скорость + /// Вес автомобиля + /// Основной цвет + + public DrawningPropelledArtillery(int speed, double weight, Color bodyColor): this() + { + EntityPropelledArtillery = new EntityPropelledArtillery(speed, weight, bodyColor); + } + /// + /// Конструктор для наследников + /// + /// Ширина прорисовки cамоходной арт. установки + /// Высота прорисовки cамоходной арт. установки + + protected DrawningPropelledArtillery(int drawningPropelledArtilleryWidth, int drawningPropelledArtilleryHeight):this() + { + _drawningPropelledArtilleryWidth = drawningPropelledArtilleryWidth; + _drawningPropelledArtilleryHeight = drawningPropelledArtilleryHeight; + } + /// /// Установка границ поля /// @@ -68,7 +86,7 @@ public class DrawningSelfPropelledArtilleryUnit /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах public bool SetPictureSize(int width, int height) { - if (_drawningSelfPropelledArtilleryUnitWidth > width || _drawningSelfPropelledArtilleryUnitHeight > height) + if (_drawningPropelledArtilleryWidth > width || _drawningPropelledArtilleryHeight > height) { return false; } @@ -77,14 +95,14 @@ public class DrawningSelfPropelledArtilleryUnit _pictureHeight = height; if (_startPosX.HasValue || _startPosY.HasValue) { - if (_startPosX + _drawningSelfPropelledArtilleryUnitWidth > _pictureWidth) + if (_startPosX + _drawningPropelledArtilleryWidth > _pictureWidth) { - _startPosX = _pictureWidth - _drawningSelfPropelledArtilleryUnitWidth; + _startPosX = _pictureWidth - _drawningPropelledArtilleryWidth; } else if (_startPosX < 0) _startPosX = 0; - if (_startPosY + _drawningSelfPropelledArtilleryUnitHeight > _pictureHeight) + if (_startPosY + _drawningPropelledArtilleryHeight > _pictureHeight) { - _startPosY = _pictureHeight - _drawningSelfPropelledArtilleryUnitHeight; + _startPosY = _pictureHeight - _drawningPropelledArtilleryHeight; } else if (_startPosY < 0) _startPosY = 0; } @@ -105,16 +123,16 @@ public class DrawningSelfPropelledArtilleryUnit // TODO если при установке объекта в эти координаты, он будет "выходить" за границы формы // то надо изменить координаты, чтобы он оставался в этих границах - if (x + _drawningSelfPropelledArtilleryUnitWidth > _pictureWidth) + if (x + _drawningPropelledArtilleryWidth > _pictureWidth) { - _startPosX = _pictureWidth - _drawningSelfPropelledArtilleryUnitWidth; + _startPosX = _pictureWidth - _drawningPropelledArtilleryWidth; } else if (x < 0) _startPosX = 0; else _startPosX = x; - if (y + _drawningSelfPropelledArtilleryUnitHeight > _pictureHeight) + if (y + _drawningPropelledArtilleryHeight > _pictureHeight) { - _startPosY = _pictureHeight - _drawningSelfPropelledArtilleryUnitHeight; + _startPosY = _pictureHeight - _drawningPropelledArtilleryHeight; } else if (y < 0) _startPosY = 0; else _startPosY = y; @@ -128,7 +146,7 @@ public class DrawningSelfPropelledArtilleryUnit /// true - перемещене выполнено, false - перемещение невозможно public bool MoveTransport(DirectionType direction) { - if (EntitySelfPropelledArtilleryUnit == null || !_startPosX.HasValue || !_startPosY.HasValue) + if (EntityPropelledArtillery == null || !_startPosX.HasValue || !_startPosY.HasValue) { return false; } @@ -137,30 +155,30 @@ public class DrawningSelfPropelledArtilleryUnit { //влево case DirectionType.Left: - if (_startPosX.Value - EntitySelfPropelledArtilleryUnit.Step > 0) + if (_startPosX.Value - EntityPropelledArtillery.Step > 0) { - _startPosX -= (int)EntitySelfPropelledArtilleryUnit.Step; + _startPosX -= (int)EntityPropelledArtillery.Step; } return true; //вверх case DirectionType.Up: - if (_startPosY.Value - EntitySelfPropelledArtilleryUnit.Step > 0) + if (_startPosY.Value - EntityPropelledArtillery.Step > 0) { - _startPosY -= (int)EntitySelfPropelledArtilleryUnit.Step; + _startPosY -= (int)EntityPropelledArtillery.Step; } return true; // вправо case DirectionType.Right: - if (_startPosX + _drawningSelfPropelledArtilleryUnitWidth + EntitySelfPropelledArtilleryUnit.Step < _pictureWidth) + if (_startPosX + _drawningPropelledArtilleryWidth + EntityPropelledArtillery.Step < _pictureWidth) { - _startPosX += (int)EntitySelfPropelledArtilleryUnit.Step; + _startPosX += (int)EntityPropelledArtillery.Step; } return true; // вниз case DirectionType.Down: - if (_startPosY + _drawningSelfPropelledArtilleryUnitHeight + EntitySelfPropelledArtilleryUnit.Step < _pictureHeight) + if (_startPosY + _drawningPropelledArtilleryHeight + EntityPropelledArtillery.Step < _pictureHeight) { - _startPosY += (int)EntitySelfPropelledArtilleryUnit.Step; + _startPosY += (int)EntityPropelledArtillery.Step; } return true; default: @@ -173,17 +191,17 @@ public class DrawningSelfPropelledArtilleryUnit /// Прорисовка объекта /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { - if (EntitySelfPropelledArtilleryUnit == null || !_startPosX.HasValue || !_startPosY.HasValue) + if (EntityPropelledArtillery == null || !_startPosX.HasValue || !_startPosY.HasValue) { return; } - + Pen pen = new(Color.Black); - Brush additionalBrush = new SolidBrush(EntitySelfPropelledArtilleryUnit.AdditionalColor); + g.DrawEllipse(pen, _startPosX.Value + 0, _startPosY.Value + 75, 30, 30); g.DrawEllipse(pen, _startPosX.Value + 90, _startPosY.Value + 75, 30, 30); g.DrawRectangle(pen, _startPosX.Value + 15, _startPosY.Value + 75, 90, 30); @@ -191,7 +209,7 @@ public class DrawningSelfPropelledArtilleryUnit //границы ЦВЕТ Brush brOlive = new SolidBrush(Color.Olive); g.FillRectangle(brOlive, _startPosX.Value + 25, _startPosY.Value + 40, 35, 30);//башня - g.FillEllipse(brOlive, _startPosX.Value +0, _startPosY.Value + 75, 30, 30); + g.FillEllipse(brOlive, _startPosX.Value + 0, _startPosY.Value + 75, 30, 30); g.FillEllipse(brOlive, _startPosX.Value + 90, _startPosY.Value + 75, 30, 30); g.FillRectangle(brOlive, _startPosX.Value + 15, _startPosY.Value + 75, 90, 30); @@ -234,28 +252,7 @@ public class DrawningSelfPropelledArtilleryUnit g.FillRectangle(brOlive, _startPosX.Value + 0, _startPosY.Value + 65, 120, 13);// - if (EntitySelfPropelledArtilleryUnit.TurretCannon) - { - g.FillEllipse(additionalBrush, _startPosX.Value + 26, _startPosY.Value + 35, 50, 30); - g.FillRectangle(additionalBrush, _startPosX.Value + 25, _startPosY.Value + 36, 20, 29); - g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 45, 60, 5); - g.FillEllipse(additionalBrush, _startPosX.Value + 113, _startPosY.Value + 42, 20, 10); - } - - if (EntitySelfPropelledArtilleryUnit.LaunchBattery) - { - g.FillRectangle(additionalBrush, _startPosX.Value + 0, _startPosY.Value + 45, 20, 20); - g.FillPolygon(additionalBrush, new Point[] - { - new Point(_startPosX.Value + 0, _startPosY.Value + 15), new Point(_startPosX.Value + 0, _startPosY.Value + 65), - new Point(_startPosX.Value + 20, _startPosY.Value + 65), new Point(_startPosX.Value + 20, _startPosY.Value + 45), - new Point(_startPosX.Value + 0, _startPosY.Value + 15) - }); - g.FillEllipse(additionalBrush, _startPosX.Value + 0, _startPosY.Value + 5, 10, 30); - g.FillRectangle(additionalBrush, _startPosX.Value + 10, _startPosY.Value + 15, 20, 5); - g.FillRectangle(additionalBrush, _startPosX.Value + 10, _startPosY.Value + 25, 15, 5); - } + } - -} \ No newline at end of file +} diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningSelfPropelledArtilleryUnit.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningSelfPropelledArtilleryUnit.cs new file mode 100644 index 0000000..628afb9 --- /dev/null +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningSelfPropelledArtilleryUnit.cs @@ -0,0 +1,58 @@ +using SelfPropelledArtilleryUnit.Entities; + +namespace SelfPropelledArtilleryUnit.Drawnings; +/// +/// Класс, отвечающий за прорисовку и перемещение объекта-сущности +/// + +public class DrawningSelfPropelledArtilleryUnit : DrawningPropelledArtillery +{ + /// + /// Конструктор + /// + /// Дополнительный цвет + /// Признак наличия башни + /// Признак наличия орудия + public DrawningSelfPropelledArtilleryUnit(int speed, double weight, Color bodyColor, Color additionalColor, bool turretCannon, bool launchBattery) : base(135, 105) + { + EntityPropelledArtillery = new EntitySelfPropelledArtilleryUnit(speed, weight, bodyColor, additionalColor, turretCannon, launchBattery); + //дописать + } + + public override void DrawTransport(Graphics g) + { + if (EntityPropelledArtillery == null || EntityPropelledArtillery is not EntitySelfPropelledArtilleryUnit selfpropelledartilleryunit || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + Brush additionalBrush = new SolidBrush(selfpropelledartilleryunit.AdditionalColor); + + if (selfpropelledartilleryunit.TurretCannon) + { + g.FillEllipse(additionalBrush, _startPosX.Value + 26, _startPosY.Value + 35, 50, 30); + g.FillRectangle(additionalBrush, _startPosX.Value + 25, _startPosY.Value + 36, 20, 29); + g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 45, 60, 5); + g.FillEllipse(additionalBrush, _startPosX.Value + 113, _startPosY.Value + 42, 20, 10); + } + + if (selfpropelledartilleryunit.LaunchBattery) + { + g.FillRectangle(additionalBrush, _startPosX.Value + 0, _startPosY.Value + 45, 20, 20); + g.FillPolygon(additionalBrush, new Point[] + { + new Point(_startPosX.Value + 0, _startPosY.Value + 15), new Point(_startPosX.Value + 0, _startPosY.Value + 65), + new Point(_startPosX.Value + 20, _startPosY.Value + 65), new Point(_startPosX.Value + 20, _startPosY.Value + 45), + new Point(_startPosX.Value + 0, _startPosY.Value + 15) + }); + g.FillEllipse(additionalBrush, _startPosX.Value + 0, _startPosY.Value + 5, 10, 30); + g.FillRectangle(additionalBrush, _startPosX.Value + 10, _startPosY.Value + 15, 20, 5); + g.FillRectangle(additionalBrush, _startPosX.Value + 10, _startPosY.Value + 25, 15, 5); + } + + base.DrawTransport(g); + + + } +} \ No newline at end of file diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityPropelledArtillery.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityPropelledArtillery.cs new file mode 100644 index 0000000..3766c4e --- /dev/null +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityPropelledArtillery.cs @@ -0,0 +1,33 @@ +namespace SelfPropelledArtilleryUnit.Entities; + +public class EntityPropelledArtillery +{ + /// + /// Скорость + /// + 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 EntityPropelledArtillery(int speed, double weight, Color bodyColor) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + } +} diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntitySelfPropelledArtilleryUnit.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntitySelfPropelledArtilleryUnit.cs new file mode 100644 index 0000000..6668c00 --- /dev/null +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntitySelfPropelledArtilleryUnit.cs @@ -0,0 +1,35 @@ +namespace SelfPropelledArtilleryUnit.Entities; + +public class EntitySelfPropelledArtilleryUnit : EntityPropelledArtillery +{ + /// + /// Дополнительный цвет (для опциональных элементов) + /// + public Color AdditionalColor { get; private set; } + /// + /// Признак - Башня с орудием + /// + public bool TurretCannon { get; private set; } + /// + /// Признак - Залповая батарея сзади + /// + public bool LaunchBattery { get; private set; } + /// + /// Шаг перемещения артеллерийской установки + /// + public double Step => Speed * 100 / Weight; + + /// + /// Инициализация полей объекта-класса EntitySelfPropelledArtilleryUnit + /// + /// Дополнительный цвет + /// Башня с орудием + /// Залповая батарея сзади + public EntitySelfPropelledArtilleryUnit(int speed, double weight, Color bodycolor, Color additionalcolor, bool turretcannon, bool launchbattery) : base(speed, weight, bodycolor) + { + AdditionalColor = additionalcolor; + TurretCannon = turretcannon; + LaunchBattery = launchbattery; + } +} + diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/EntitySelfPropelledArtilleryUnit.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/EntitySelfPropelledArtilleryUnit.cs deleted file mode 100644 index 51c67fc..0000000 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/EntitySelfPropelledArtilleryUnit.cs +++ /dev/null @@ -1,61 +0,0 @@ -namespace SelfPropelledArtilleryUnit; -/// -/// Класс-сущность "Самоходная арт. установка " -/// -public class EntitySelfPropelledArtilleryUnit -{ - /// - /// Скорость - /// - 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 TurretCannon { get; private set; } - - /// - /// Признак - Залповая батарея сзади - /// - public bool LaunchBattery { get; private set; } - - /// - /// Шаг перемещения артеллерийской установки - /// - public double Step => Speed * 100 / Weight; - - /// - /// Инициализация полей объекта-класса Самоходная арт. установка - /// - /// Скорость - /// Вес автомобиля - /// Основной цвет - /// Дополнительный цвет - /// Башня с орудием - /// Залповая батарея сзади - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool turretCannon, bool launchBattery) - { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; - AdditionalColor = additionalColor; - TurretCannon = turretCannon; - LaunchBattery = launchBattery; - } -} - diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormSelfPropelledArtilleryUnit.Designer.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormSelfPropelledArtilleryUnit.Designer.cs index 419aba2..5ad432a 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormSelfPropelledArtilleryUnit.Designer.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormSelfPropelledArtilleryUnit.Designer.cs @@ -28,10 +28,16 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "FormSelfPropelledArtilleryUnit"; + SuspendLayout(); + // + // FormSelfPropelledArtilleryUnit + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(877, 442); + Name = "FormSelfPropelledArtilleryUnit"; + Text = "FormSelfPropelledArtilleryUnit"; + ResumeLayout(false); } #endregion diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormSelfPropelledArtilleryUnit.resx b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormSelfPropelledArtilleryUnit.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormSelfPropelledArtilleryUnit.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit.Designer.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit.Designer.cs index b2f161a..d54b38f 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit.Designer.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit.Designer.cs @@ -34,6 +34,7 @@ buttonUp = new Button(); buttonDown = new Button(); buttonRight = new Button(); + button1 = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxSelfPropelledArtilleryUnit).BeginInit(); SuspendLayout(); // @@ -49,13 +50,13 @@ // buttonCreate // buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreate.Location = new Point(12, 438); + buttonCreate.Location = new Point(12, 446); buttonCreate.Name = "buttonCreate"; - buttonCreate.Size = new Size(94, 43); + buttonCreate.Size = new Size(226, 35); buttonCreate.TabIndex = 1; - buttonCreate.Text = "Создать"; + buttonCreate.Text = "Создать самоходную арт. установку"; buttonCreate.UseVisualStyleBackColor = true; - buttonCreate.Click += buttonCreate_Click; + buttonCreate.Click += buttonCreateSelfPropelledArtilleryUnit_Click; // // buttonLeft // @@ -105,11 +106,23 @@ buttonRight.UseVisualStyleBackColor = true; buttonRight.Click += ButtonMove_Click; // + // button1 + // + button1.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + button1.Location = new Point(253, 446); + button1.Name = "button1"; + button1.Size = new Size(226, 35); + button1.TabIndex = 6; + button1.Text = "Создать бронированную машину"; + button1.UseVisualStyleBackColor = true; + button1.Click += buttonCreatePropelledArtillery_Click; + // // SelfPropelledArtilleryUnit // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(923, 493); + Controls.Add(button1); Controls.Add(buttonRight); Controls.Add(buttonDown); Controls.Add(buttonUp); @@ -130,5 +143,6 @@ private Button buttonUp; private Button buttonDown; private Button buttonRight; + private Button button1; } } \ No newline at end of file diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit.cs index ae685fb..e2ff54f 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit.cs @@ -7,12 +7,13 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using SelfPropelledArtilleryUnit.Drawnings; namespace SelfPropelledArtilleryUnit { public partial class SelfPropelledArtilleryUnit : Form { - private DrawningSelfPropelledArtilleryUnit? _drawningSelfPropelledArtilleryUnit; + private DrawningPropelledArtillery? _drawningPropelledArtillery; public SelfPropelledArtilleryUnit() { @@ -20,32 +21,57 @@ namespace SelfPropelledArtilleryUnit } private void Draw() { - if (_drawningSelfPropelledArtilleryUnit == null) + if (_drawningPropelledArtillery == null) { return; } Bitmap bmp = new(pictureBoxSelfPropelledArtilleryUnit.Width, pictureBoxSelfPropelledArtilleryUnit.Height); Graphics gr = Graphics.FromImage(bmp); - _drawningSelfPropelledArtilleryUnit.DrawTransport(gr); + _drawningPropelledArtillery.DrawTransport(gr); pictureBoxSelfPropelledArtilleryUnit.Image = bmp; } - - private void buttonCreate_Click(object sender, EventArgs e) + private void CreateObject(string type) { Random random = new(); - _drawningSelfPropelledArtilleryUnit = new DrawningSelfPropelledArtilleryUnit(); - _drawningSelfPropelledArtilleryUnit.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))); - _drawningSelfPropelledArtilleryUnit.SetPictureSize(pictureBoxSelfPropelledArtilleryUnit.Width, pictureBoxSelfPropelledArtilleryUnit.Height); - _drawningSelfPropelledArtilleryUnit.SetPosition(random.Next(10, 100), random.Next(10, 100)); + switch (type) + { + case nameof(DrawningPropelledArtillery): + _drawningPropelledArtillery = new DrawningPropelledArtillery(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(DrawningSelfPropelledArtilleryUnit): + _drawningPropelledArtillery = new DrawningSelfPropelledArtilleryUnit(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; + } + + _drawningPropelledArtillery.SetPictureSize(pictureBoxSelfPropelledArtilleryUnit.Width, pictureBoxSelfPropelledArtilleryUnit.Height); + _drawningPropelledArtillery.SetPosition(random.Next(10, 100), random.Next(10, 100)); Draw(); } + + /// + /// Обработка нажатия кнопки "Создать самоходную арт.установку" + /// + /// + /// + private void buttonCreateSelfPropelledArtilleryUnit_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningSelfPropelledArtilleryUnit)); + + /// + /// Обработка нажатия кнопки "Создать бронированную машину" + /// + /// + /// + private void buttonCreatePropelledArtillery_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningPropelledArtillery)); + private void ButtonMove_Click(object sender, EventArgs e) { - if (_drawningSelfPropelledArtilleryUnit == null) + if (_drawningPropelledArtillery == null) { return; } @@ -55,13 +81,13 @@ namespace SelfPropelledArtilleryUnit switch (name) { case "buttonUp": - result = _drawningSelfPropelledArtilleryUnit.MoveTransport(DirectionType.Up); break; + result = _drawningPropelledArtillery.MoveTransport(DirectionType.Up); break; case "buttonDown": - result = _drawningSelfPropelledArtilleryUnit.MoveTransport(DirectionType.Down); break; + result = _drawningPropelledArtillery.MoveTransport(DirectionType.Down); break; case "buttonLeft": - result = _drawningSelfPropelledArtilleryUnit.MoveTransport(DirectionType.Left); break; + result = _drawningPropelledArtillery.MoveTransport(DirectionType.Left); break; case "buttonRight": - result = _drawningSelfPropelledArtilleryUnit.MoveTransport(DirectionType.Right); break; + result = _drawningPropelledArtillery.MoveTransport(DirectionType.Right); break; } if (result)