From fb7a58bac4c8f49c4bdec33e31eebb8dd65cf455 Mon Sep 17 00:00:00 2001 From: xom9kxom9k Date: Fri, 15 Mar 2024 16:45:21 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AntiAircraftGun/DrawningAntiAircraftGun.cs | 3 +- AntiAircraftGun/EntityAntiAircraftGun.cs | 1 - AntiAircraftGun/FormAntiAircraftGun.cs | 151 ++++++++++----------- 3 files changed, 76 insertions(+), 79 deletions(-) diff --git a/AntiAircraftGun/DrawningAntiAircraftGun.cs b/AntiAircraftGun/DrawningAntiAircraftGun.cs index bd5d46b..0aee298 100644 --- a/AntiAircraftGun/DrawningAntiAircraftGun.cs +++ b/AntiAircraftGun/DrawningAntiAircraftGun.cs @@ -39,7 +39,6 @@ public class DrawningAntiAircraftGun /// Вес /// Основной цвет /// Дополнительный цвет - /// Наличие обвеса /// Наличие башни /// Наличие радара public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool tower, bool radar) @@ -155,7 +154,7 @@ public class DrawningAntiAircraftGun _startPosY += (int)EntityAntiAircraftGun.Step; } return true; - case DirectionType.Up: //вверх + case DirectionType.Up: if (_startPosY - EntityAntiAircraftGun.Step > 0) { _startPosY -= (int)EntityAntiAircraftGun.Step; diff --git a/AntiAircraftGun/EntityAntiAircraftGun.cs b/AntiAircraftGun/EntityAntiAircraftGun.cs index 089e843..9ec7e34 100644 --- a/AntiAircraftGun/EntityAntiAircraftGun.cs +++ b/AntiAircraftGun/EntityAntiAircraftGun.cs @@ -38,7 +38,6 @@ public class EntityAntiAircraftGun /// Вес /// Основной цвет /// Дополнительный цвет - /// Наличие обвеса /// Наличие башни /// Наличие радара public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool tower, bool radar) diff --git a/AntiAircraftGun/FormAntiAircraftGun.cs b/AntiAircraftGun/FormAntiAircraftGun.cs index 54d8173..d4eeab7 100644 --- a/AntiAircraftGun/FormAntiAircraftGun.cs +++ b/AntiAircraftGun/FormAntiAircraftGun.cs @@ -1,81 +1,80 @@ -namespace AntiAircraftGun -{ - public partial class FormAntiAircraftGun : Form - { - /// - /// Поле объект для прорисовки объекта - /// - private DrawningAntiAircraftGun? _drawningAntiAircraftGun; - /// - /// конструктор формы - /// - public FormAntiAircraftGun() - { - InitializeComponent(); - } - /// - /// Метод прорисовки транспорта - /// - private void Draw() - { - if (_drawningAntiAircraftGun == null) - { - return; - } - Bitmap bmp = new(pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height); - Graphics gr = Graphics.FromImage(bmp); - _drawningAntiAircraftGun.DrawTransport(gr); - pictureBoxAntiAircraftGun.Image = bmp; - } - /// - /// Обработка кнопик Создать - /// - /// - /// - private void ButtonCreate_Click(object sender, EventArgs e) - { - Random random = new(); - _drawningAntiAircraftGun = new DrawningAntiAircraftGun(); - _drawningAntiAircraftGun.Init(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 255), - random.Next(0, 255), random.Next(0, 255)), Color.FromArgb(random.Next(0, 255), random.Next(0, 255), random.Next(0, 255)), - Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); - _drawningAntiAircraftGun.SetPictureSize(pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height); - _drawningAntiAircraftGun.SetPosition(random.Next(10, 100), random.Next(10, 100)); +namespace AntiAircraftGun; - Draw(); - } - /// - /// Перемещение объекта по форме - /// - /// - /// - private void ButtonMove_Click(object sender, EventArgs e) +public partial class FormAntiAircraftGun : Form +{ + /// + /// Поле объект для прорисовки объекта + /// + private DrawningAntiAircraftGun? _drawningAntiAircraftGun; + /// + /// конструктор формы + /// + public FormAntiAircraftGun() + { + InitializeComponent(); + } + /// + /// Метод прорисовки транспорта + /// + private void Draw() + { + if (_drawningAntiAircraftGun == null) { - if (_drawningAntiAircraftGun == null) - { - return; - } - string name = ((Button)sender)?.Name ?? string.Empty; - bool result = false; - switch (name) - { - case "buttonUp": - result = _drawningAntiAircraftGun.MoveTransport(DirectionType.Up); - break; - case "buttonDown": - result = _drawningAntiAircraftGun.MoveTransport(DirectionType.Down); - break; - case "buttonRight": - result = _drawningAntiAircraftGun.MoveTransport(DirectionType.Right); - break; - case "buttonLeft": - result = _drawningAntiAircraftGun.MoveTransport(DirectionType.Left); - break; - } - if (result) - { - Draw(); - } + return; + } + Bitmap bmp = new(pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height); + Graphics gr = Graphics.FromImage(bmp); + _drawningAntiAircraftGun.DrawTransport(gr); + pictureBoxAntiAircraftGun.Image = bmp; + } + /// + /// Обработка кнопик Создать + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random random = new(); + _drawningAntiAircraftGun = new DrawningAntiAircraftGun(); + _drawningAntiAircraftGun.Init(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 255), + random.Next(0, 255), random.Next(0, 255)), Color.FromArgb(random.Next(0, 255), random.Next(0, 255), random.Next(0, 255)), + Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); + _drawningAntiAircraftGun.SetPictureSize(pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height); + _drawningAntiAircraftGun.SetPosition(random.Next(10, 100), random.Next(10, 100)); + + Draw(); + } + /// + /// Перемещение объекта по форме + /// + /// + /// + private void ButtonMove_Click(object sender, EventArgs e) + { + if (_drawningAntiAircraftGun == null) + { + return; + } + string name = ((Button)sender)?.Name ?? string.Empty; + bool result = false; + switch (name) + { + case "buttonUp": + result = _drawningAntiAircraftGun.MoveTransport(DirectionType.Up); + break; + case "buttonDown": + result = _drawningAntiAircraftGun.MoveTransport(DirectionType.Down); + break; + case "buttonRight": + result = _drawningAntiAircraftGun.MoveTransport(DirectionType.Right); + break; + case "buttonLeft": + result = _drawningAntiAircraftGun.MoveTransport(DirectionType.Left); + break; + } + if (result) + { + Draw(); } } } \ No newline at end of file