diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/DirectionType.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DirectionType.cs similarity index 70% rename from SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/DirectionType.cs rename to SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DirectionType.cs index c0d5667..b32b3e8 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/DirectionType.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DirectionType.cs @@ -4,10 +4,10 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SelfPropelledArtilleryUnit; +namespace SelfPropelledArtilleryUnit.Drawnings; - public enum DirectionType - { +public enum DirectionType +{ Up = 1, Down = 2, Left = 3, diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningArtillery.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningArtillery.cs new file mode 100644 index 0000000..ee46f1e --- /dev/null +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningArtillery.cs @@ -0,0 +1,58 @@ +using SelfPropelledArtilleryUnit.Entities; + +namespace SelfPropelledArtilleryUnit.Drawnings; +/// +/// Класс, отвечающий за прорисовку и перемещение объекта-сущности +/// +public class DrawningArtillery : DrawningTank +{ + /// + /// конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия пушки + /// Признак наличия залповой установки + + public DrawningArtillery(int speed, double weight, Color bodyColor, Color additionalColor, bool cannon, bool rocket) : base(130,70) + { + EntityTank = new EntityArtillery(speed, weight, bodyColor, additionalColor, cannon, rocket); + } + + public override void DrawTransport(Graphics g) + { + + if (EntityTank == null || EntityTank is not EntityArtillery artillery || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + + Pen pen = new(Color.Black); + Brush additionalBrush = new SolidBrush(artillery.AdditionalColor); + + //орудие + if (artillery.Cannon) + { + g.FillRectangle(additionalBrush, _startPosX.Value + 80, _startPosY.Value + 25, 50, 5); + g.DrawRectangle(pen, _startPosX.Value + 80, _startPosY.Value + 25, 50, 5); + } + //установка + if (artillery.Cannon) + { + //колонна + g.FillRectangle(additionalBrush, _startPosX.Value + 5, _startPosY.Value + 10, 5, 30); + g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value + 10, 5, 30); + //контейнер + g.FillRectangle(additionalBrush, _startPosX.Value + 3, _startPosY.Value + 5, 50, 13); + g.DrawRectangle(pen, _startPosX.Value + 3, _startPosY.Value + 5, 50, 13); + //ракеты + g.DrawRectangle(pen, _startPosX.Value + 52, _startPosY.Value + 5, 10, 3); + g.DrawRectangle(pen, _startPosX.Value + 52, _startPosY.Value + 10, 10, 3); + g.DrawRectangle(pen, _startPosX.Value + 52, _startPosY.Value + 15, 10, 3); + } + base.DrawTransport(g); + } +} diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/DrawningArtillery.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningTank.cs similarity index 59% rename from SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/DrawningArtillery.cs rename to SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningTank.cs index 7a1825d..f4c0d4c 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/DrawningArtillery.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningTank.cs @@ -1,13 +1,18 @@ -namespace SelfPropelledArtilleryUnit; -/// -/// Класс, отвечающий за прорисовку и перемещение объекта-сущности -/// -public class DrawningArtillery +using SelfPropelledArtilleryUnit.Entities; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SelfPropelledArtilleryUnit.Drawnings; + +public class DrawningTank { /// /// Класс-сущность /// - public EntityArtillery? EntityArtillery { get; private set; } + public EntityTank? EntityTank { get; protected set; } /// /// Ширина окна /// @@ -19,39 +24,39 @@ public class DrawningArtillery /// /// Левая координата прорисовки автомобиля /// - private int? _startPosX; + protected private int? _startPosX; /// /// Верхняя кооридната прорисовки автомобиля /// - private int? _startPosY; + protected private int? _startPosY; /// /// Ширина прорисовки автомобиля /// - private readonly int _drawningArtilleryWidth = 130; + private readonly int _drawningTankWidth = 130; /// /// Высота прорисовки автомобиля /// - private readonly int _drawningArtilleryHeight = 70; + private readonly int _drawningTankHeight = 70; /// - /// Инициализация свойств + /// Пустой конструктор /// - /// Скорость - /// Вес - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия пушки - /// Признак наличия залповой установки - public void Init(int speed, double weight, Color bodyColor, Color - additionalColor, bool cannon, bool rocket) + private DrawningTank() { - EntityArtillery = new EntityArtillery(); - EntityArtillery.Init(speed, weight, bodyColor, additionalColor, cannon, rocket); _pictureWidth = null; _pictureHeight = null; _startPosX = null; _startPosY = null; } + public DrawningTank(int speed, double weight, Color bodyColor) : this() + { + EntityTank = new EntityTank(speed, weight, bodyColor); + } + protected DrawningTank(int drawningTankWidth, int drawningTankHeight) : this() + { + _drawningTankWidth = drawningTankWidth; + _pictureHeight = drawningTankHeight; + } /// /// Установка границ поля /// @@ -60,7 +65,7 @@ public class DrawningArtillery /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах public bool SetPictureSize(int width, int height) { - if (_drawningArtilleryHeight > height || _drawningArtilleryWidth > width) + if (_drawningTankHeight > height || _drawningTankWidth > width) { return false; } @@ -88,18 +93,18 @@ public class DrawningArtillery } // TODO если при установке объекта в эти координаты, он будет "выходить" за границы формы // то надо изменить координаты, чтобы он оставался в этих границах - if (x < 0 || x + _drawningArtilleryWidth > _pictureWidth) - { - _startPosX = _pictureWidth - _drawningArtilleryWidth; + if (x < 0 || x + _drawningTankWidth > _pictureWidth) + { + _startPosX = _pictureWidth - _drawningTankWidth; } - else + else { _startPosX = x; } - if (y < 0 || y + _drawningArtilleryHeight > _pictureHeight) + if (y < 0 || y + _drawningTankHeight > _pictureHeight) { - _startPosY = _pictureHeight - _drawningArtilleryHeight; + _startPosY = _pictureHeight - _drawningTankHeight; } else { @@ -113,7 +118,7 @@ public class DrawningArtillery /// true - перемещене выполнено, false - перемещение невозможно public bool MoveTransport(DirectionType direction) { - if (EntityArtillery == null || !_startPosX.HasValue || + if (EntityTank == null || !_startPosX.HasValue || !_startPosY.HasValue) { return false; @@ -122,31 +127,31 @@ public class DrawningArtillery { //влево case DirectionType.Left: - if (_startPosX.Value - EntityArtillery.Step > 0) + if (_startPosX.Value - EntityTank.Step > 0) { - _startPosX -= (int)EntityArtillery.Step; + _startPosX -= (int)EntityTank.Step; } return true; //вверх case DirectionType.Up: - if (_startPosY.Value - EntityArtillery.Step > 0) + if (_startPosY.Value - EntityTank.Step > 0) { - _startPosY -= (int)EntityArtillery.Step; + _startPosY -= (int)EntityTank.Step; } return true; // вправо case DirectionType.Right: - if (_startPosX.Value + EntityArtillery.Step + _drawningArtilleryWidth < _pictureWidth) + if (_startPosX.Value + EntityTank.Step + _drawningTankWidth < _pictureWidth) { - _startPosX += (int)EntityArtillery.Step; + _startPosX += (int)EntityTank.Step; } return true; //вниз case DirectionType.Down: - if (_startPosY.Value + EntityArtillery.Step + _drawningArtilleryHeight < _pictureHeight) + if (_startPosY.Value + EntityTank.Step + _drawningTankHeight < _pictureHeight) { - _startPosY += (int)EntityArtillery.Step; + _startPosY += (int)EntityTank.Step; } return true; default: @@ -157,27 +162,25 @@ public class DrawningArtillery /// Прорисовка объекта /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { - if (EntityArtillery == null || !_startPosX.HasValue || + if (EntityTank == null || !_startPosX.HasValue || !_startPosY.HasValue) { return; } Pen pen = new(Color.Black); - Brush additionalBrush = new - SolidBrush(EntityArtillery.AdditionalColor); - Brush brush = new SolidBrush(EntityArtillery.BodyColor); + Brush brush = new SolidBrush(EntityTank.BodyColor); Brush grayBrush = new SolidBrush(Color.Gray); Brush blackBrush = new SolidBrush(Color.Black); //тело g.FillRectangle(brush, _startPosX.Value, _startPosY.Value + 40, 110, 20); g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 40, 110, 20); - + //башня - g.FillRectangle(brush, _startPosX.Value+30, _startPosY.Value+20,50,20); - g.DrawRectangle(pen, _startPosX.Value+30, _startPosY.Value + 20, 50, 20); + g.FillRectangle(brush, _startPosX.Value + 30, _startPosY.Value + 20, 50, 20); + g.DrawRectangle(pen, _startPosX.Value + 30, _startPosY.Value + 20, 50, 20); //ходовая //основа g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value + 50, 110, 20); @@ -205,25 +208,7 @@ public class DrawningArtillery //6-ПравБол g.DrawEllipse(pen, _startPosX.Value + 7, _startPosY.Value + 52, 15, 15); g.FillEllipse(blackBrush, _startPosX.Value + 7, _startPosY.Value + 52, 15, 15); - //орудие - if (EntityArtillery.Cannon) - { - g.FillRectangle(additionalBrush, _startPosX.Value+80, _startPosY.Value + 25, 50, 5); - g.DrawRectangle(pen, _startPosX.Value+80, _startPosY.Value + 25, 50, 5); - } - //установка - if (EntityArtillery.Cannon) - { - //колонна - g.FillRectangle(additionalBrush, _startPosX.Value +5, _startPosY.Value + 10, 5, 30); - g.DrawRectangle(pen, _startPosX.Value +5, _startPosY.Value + 10, 5, 30); - //контейнер - g.FillRectangle(additionalBrush, _startPosX.Value + 3, _startPosY.Value + 5, 50, 13); - g.DrawRectangle(pen, _startPosX.Value + 3, _startPosY.Value + 5, 50, 13); - //ракеты - g.DrawRectangle(pen, _startPosX.Value + 52, _startPosY.Value + 5, 10, 3); - g.DrawRectangle(pen, _startPosX.Value + 52, _startPosY.Value + 10, 10, 3); - g.DrawRectangle(pen, _startPosX.Value + 52, _startPosY.Value + 15, 10, 3); - } + } } + diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityArtillery.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityArtillery.cs new file mode 100644 index 0000000..5e43a67 --- /dev/null +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityArtillery.cs @@ -0,0 +1,39 @@ +namespace SelfPropelledArtilleryUnit.Entities; +/// +/// Класс-сущность "САУ" +/// + +public class EntityArtillery : EntityTank +{ + /// + /// Дополнительный цвет (для опциональных элементов) + /// + public Color AdditionalColor { get; private set; } + /// + /// Признак (опция) наличия пушки + /// + public bool Cannon { get; private set; } + /// + /// Признак (опция) наличия залповой установки + /// + public bool Rocket { get; private set; } + + + /// + /// Инициализация полей объекта-класса спортивного автомобиля + /// + + /// Дополнительный цвет + /// Признак наличия пушки + /// Признак наличия залповой установки + + public EntityArtillery(int speed, double weight, Color bodyColor, Color additionalColor, bool cannon, bool rocket) : base(speed, weight, bodyColor) + { + + AdditionalColor = additionalColor; + Cannon = cannon; + Rocket = rocket; + } + +} + diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityTank.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityTank.cs new file mode 100644 index 0000000..6bc0ef7 --- /dev/null +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityTank.cs @@ -0,0 +1,36 @@ +namespace SelfPropelledArtilleryUnit.Entities; +/// +/// Класс-сущность "танк" +/// +public class EntityTank +{ + + /// + /// Скорость + /// + public int Speed { get; set; } + /// + /// Вес + /// + public double Weight { get; set; } + /// + /// Основной цвет + /// + public Color BodyColor { get; set; } + + /// + /// Шаг перемещения автомобиля + /// + public double Step => Speed * 100 / Weight; + /// + /// Конструктор сущности + /// + public EntityTank(int speed, double weight, Color bodyColor) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + + } + +} \ No newline at end of file diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/EntityArtillery.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/EntityArtillery.cs deleted file mode 100644 index 1aa0109..0000000 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/EntityArtillery.cs +++ /dev/null @@ -1,60 +0,0 @@ -namespace SelfPropelledArtilleryUnit; -/// -/// Класс-сущность "САУ" -/// - - -public class EntityArtillery - { - /// - /// Скорость - /// - 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 Cannon { get; private set; } - /// - /// Признак (опция) наличия залповой установки - /// - public bool Rocket { get; private set; } - - /// - /// Шаг перемещения автомобиля - /// - public double Step => Speed * 100 / Weight; - /// - /// Инициализация полей объекта-класса спортивного автомобиля - /// - /// Скорость - /// Вес автомобиля - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия пушки - /// Признак наличия залповой установки - - public void Init(int speed, double weight, Color bodyColor, Color - additionalColor, bool cannon, bool rocket) - { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; - AdditionalColor = additionalColor; - Cannon = cannon; - Rocket = rocket; - } - - } - diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormArtillery.Designer.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormArtillery.Designer.cs index 92e7fd1..6deb537 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormArtillery.Designer.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormArtillery.Designer.cs @@ -35,6 +35,7 @@ buttonUp = new Button(); buttonDown = new Button(); buttonRight = new Button(); + buttonCreateTank = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxArtillery).BeginInit(); SuspendLayout(); // @@ -52,9 +53,9 @@ buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; buttonCreate.Location = new Point(12, 417); buttonCreate.Name = "buttonCreate"; - buttonCreate.Size = new Size(75, 23); + buttonCreate.Size = new Size(90, 23); 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; // + // buttonCreateTank + // + buttonCreateTank.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateTank.Location = new Point(117, 417); + buttonCreateTank.Name = "buttonCreateTank"; + buttonCreateTank.Size = new Size(138, 23); + buttonCreateTank.TabIndex = 6; + buttonCreateTank.Text = "Создать самоходку"; + buttonCreateTank.UseVisualStyleBackColor = true; + buttonCreateTank.Click += ButtonCreateTank_Click; + // // FormArtillery // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(800, 461); + Controls.Add(buttonCreateTank); Controls.Add(buttonRight); Controls.Add(buttonDown); Controls.Add(buttonUp); @@ -131,5 +144,6 @@ private Button buttonUp; private Button buttonDown; private Button buttonRight; + private Button buttonCreateTank; } } \ No newline at end of file diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormArtillery.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormArtillery.cs index d2f5508..2fbc273 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormArtillery.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormArtillery.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 FormArtillery : Form { - private DrawningArtillery? _drawningArtillery; + private DrawningTank? _drawningTank; public FormArtillery() { @@ -22,36 +23,56 @@ namespace SelfPropelledArtilleryUnit private void Draw() { - if (_drawningArtillery == null) + if (_drawningTank == null) { return; } Bitmap bmp = new(pictureBoxArtillery.Width, pictureBoxArtillery.Height); Graphics gr = Graphics.FromImage(bmp); - _drawningArtillery.DrawTransport(gr); + _drawningTank.DrawTransport(gr); pictureBoxArtillery.Image = bmp; } - - private void ButtonCreate_Click(object sender, EventArgs e) + private void CreateObject(string type) { Random random = new(); - _drawningArtillery = new DrawningArtillery(); - _drawningArtillery.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))); - - _drawningArtillery.SetPictureSize(pictureBoxArtillery.Width, pictureBoxArtillery.Height); - _drawningArtillery.SetPosition(random.Next(10, 100), random.Next(10, 100)); + switch (type) + { + case nameof(DrawningTank): + _drawningTank = new DrawningTank(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(DrawningArtillery): + _drawningTank = new DrawningArtillery(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; + } + _drawningTank.SetPictureSize(pictureBoxArtillery.Width, pictureBoxArtillery.Height); + _drawningTank.SetPosition(random.Next(10, 100), random.Next(10, 100)); Draw(); - } - private void ButtonMove_Click(object sender, EventArgs e) + + /// + /// Обработка нажатия кнопки "Создать сау" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningArtillery)); + /// + /// Обработка нажатия кнопки "Создать самоходку" + /// + /// + /// + private void ButtonCreateTank_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTank)); + + private void ButtonMove_Click(object sender, EventArgs e) { - if (_drawningArtillery == null) + if (_drawningTank == null) { return; } @@ -61,16 +82,16 @@ namespace SelfPropelledArtilleryUnit switch (name) { case "buttonUp": - result = _drawningArtillery.MoveTransport(DirectionType.Up); + result = _drawningTank.MoveTransport(DirectionType.Up); break; case "buttonDown": - result = _drawningArtillery.MoveTransport(DirectionType.Down); + result = _drawningTank.MoveTransport(DirectionType.Down); break; case "buttonLeft": - result = _drawningArtillery.MoveTransport(DirectionType.Left); + result = _drawningTank.MoveTransport(DirectionType.Left); break; case "buttonRight": - result = _drawningArtillery.MoveTransport(DirectionType.Right); + result = _drawningTank.MoveTransport(DirectionType.Right); break; } @@ -79,5 +100,7 @@ namespace SelfPropelledArtilleryUnit Draw(); } } + + } }