From ae14815155425af5a5c692d1d9ac49dd18e5e9ab Mon Sep 17 00:00:00 2001 From: Anastasia Date: Mon, 3 Oct 2022 20:14:22 +0400 Subject: [PATCH 1/9] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D1=8B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs | 5 ++--- AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs | 2 +- AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs index 8998dae..040c5d1 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs @@ -45,10 +45,9 @@ namespace AirplaneWithRadar /// Скорость /// Вес самолета /// Цвет кузова - public void Init(int speed, float weight, Color bodyColor) + public DrawingAirplane(int speed, float weight, Color bodyColor) { - Airplane = new EntityAirplane(); - Airplane.Init(speed, weight, bodyColor); + Airplane = new EntityAirplane(speed, weight, bodyColor); } /// /// Установка позиции самолета diff --git a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs index 6a6ab6a..167e6dc 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs @@ -35,7 +35,7 @@ namespace AirplaneWithRadar /// /// /// - public void Init(int speed, float weight, Color bodyColor) + public EntityAirplane(int speed, float weight, Color bodyColor) { Random rnd = new(); Speed = speed <= 0 ? rnd.Next(50, 150) : speed; diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs index bc58cf5..33e772e 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs @@ -27,8 +27,7 @@ namespace AirplaneWithRadar private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _airplane = new DrawingAirplane(); - _airplane.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), + _airplane = new DrawingAirplane(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); _airplane.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirplane.Width, pictureBoxAirplane.Height); -- 2.25.1 From 16ad9908713b45b5908b535c7e27e36ff78d12c9 Mon Sep 17 00:00:00 2001 From: Anastasia Date: Tue, 4 Oct 2022 10:12:12 +0400 Subject: [PATCH 2/9] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B4=D0=B2=D0=B8=D0=BD?= =?UTF-8?q?=D1=83=D1=82=D1=8B=D0=B9=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirplaneWithRadar/AirplaneWithRadar.sln | 4 +- .../AirplaneWithRadar/DrawingAirplane.cs | 22 +++++- .../DrawingAirplaneWithRadar.cs | 75 +++++++++++++++++++ .../EntityAirplaneWithRadar.cs | 40 ++++++++++ .../FormAirplaneWithRadar.Designer.cs | 13 ++++ .../FormAirplaneWithRadar.cs | 35 ++++++--- AirplaneWithRadar/EntityAirplaneWithRadar.cs | 8 ++ 7 files changed, 183 insertions(+), 14 deletions(-) create mode 100644 AirplaneWithRadar/AirplaneWithRadar/DrawingAirplaneWithRadar.cs create mode 100644 AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs create mode 100644 AirplaneWithRadar/EntityAirplaneWithRadar.cs diff --git a/AirplaneWithRadar/AirplaneWithRadar.sln b/AirplaneWithRadar/AirplaneWithRadar.sln index 4a8e4db..5aea5a9 100644 --- a/AirplaneWithRadar/AirplaneWithRadar.sln +++ b/AirplaneWithRadar/AirplaneWithRadar.sln @@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.3.32819.101 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AirplaneWithRadar", "AirplaneWithRadar\AirplaneWithRadar.csproj", "{5BE6CDF5-36FB-4F6F-83FE-AA87400376ED}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AirplaneWithRadar", "AirplaneWithRadar\AirplaneWithRadar.csproj", "{5BE6CDF5-36FB-4F6F-83FE-AA87400376ED}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Элементы решения", "Элементы решения", "{D63FD6F4-AAFA-44BE-8233-A8A2B38C4526}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs index 040c5d1..25dafbc 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs @@ -14,15 +14,15 @@ namespace AirplaneWithRadar /// /// Класс-сущность /// - public EntityAirplane Airplane { private set; get; } + public EntityAirplane Airplane { protected set; get; } /// /// Левая координата отрисовки самолета /// - private float _startPosX; + protected float _startPosX; /// /// Верхняя кооридната отрисовки самолета /// - private float _startPosY; + protected float _startPosY; /// /// Ширина окна отрисовки /// @@ -49,6 +49,20 @@ namespace AirplaneWithRadar { Airplane = new EntityAirplane(speed, weight, bodyColor); } + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес автомобиля + /// Цвет кузова + /// Ширина отрисовки автомобиля + /// Высота отрисовки автомобиля + protected DrawingAirplane(int speed, float weight, Color bodyColor, int airplaneWidth, int airplaneHeight) : this(speed, weight, bodyColor) + { + _airplaneWidth = airplaneWidth; + _airplaneHeight = airplaneHeight; + } + /// /// Установка позиции самолета /// @@ -124,7 +138,7 @@ namespace AirplaneWithRadar /// Отрисовка автомобиля /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplaneWithRadar.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplaneWithRadar.cs new file mode 100644 index 0000000..3af778f --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplaneWithRadar.cs @@ -0,0 +1,75 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirplaneWithRadar +{ + internal class DrawingAirplaneWithRadar : DrawingAirplane + { + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес самолета + /// Цвет самолета + /// Дополнительный цвет + /// Признак наличия радара + /// Признак наличия дополнительных топливных баков + public DrawingAirplaneWithRadar(int speed, float weight, Color bodyColor, Color dopColor, bool radar, bool extraFuelTank) : base(speed, weight, bodyColor, 110, 60) + { + Airplane = new EntityAirplaneWithRadar(speed, weight, bodyColor, dopColor, radar, extraFuelTank); + } + public override void DrawTransport(Graphics g) + { + if (Airplane is not EntityAirplaneWithRadar airplaneWithRadar) + { + return; + } + Pen pen = new(Color.Black, 5); + Brush dopBrush = new SolidBrush(airplaneWithRadar.DopColor); + + if (airplaneWithRadar.Radar) + { + g.DrawLine(pen, _startPosX + 120, _startPosY + 30, _startPosX + 110, _startPosY + 60); + g.DrawLine(pen, _startPosX + 150, _startPosY + 60, _startPosX + 140, _startPosY + 30); + Point point1 = new Point((int)_startPosX + 120, (int)_startPosY + 30); + Point point2 = new Point((int)_startPosX + 110, (int)_startPosY + 60); + Point point3 = new Point((int)_startPosX + 150, (int)_startPosY + 60); + Point point4 = new Point((int)_startPosX + 140, (int)_startPosY + 30); + Point[] radarPoints = { point1, point2, point3, point4 }; + g.FillPolygon(dopBrush, radarPoints); + g.DrawEllipse(pen, _startPosX + 85, _startPosY + 15, 90, 20); + g.FillEllipse(dopBrush, _startPosX + 85, _startPosY + 15, 90, 20); + + } + + _startPosX += 10; + _startPosY += 5; + base.DrawTransport(g); + _startPosX -= 10; + _startPosY -= 5; + + if (airplaneWithRadar.ExtraFuelTank) + { + g.DrawLine(pen, _startPosX + 145, _startPosY + 98, _startPosX + 145, _startPosY + 108); + g.DrawLine(pen, _startPosX + 167, _startPosY + 98, _startPosX + 167, _startPosY + 108); + g.FillRectangle(dopBrush, _startPosX + 145, _startPosY + 98, 22, 10); + g.DrawEllipse(pen, _startPosX + 130, _startPosY + 102, 30, 6); + g.FillEllipse(dopBrush, _startPosX + 130, _startPosY + 102, 30, 6); + g.DrawLine(pen, _startPosX + 140, _startPosY + 102, _startPosX + 170, _startPosY + 102); + g.DrawLine(pen, _startPosX + 140, _startPosY + 108, _startPosX + 170, _startPosY + 108); + g.FillRectangle(dopBrush, _startPosX + 140, _startPosY + 102, 30, 6); + g.DrawLine(pen, _startPosX + 169, _startPosY + 102, _startPosX + 190, _startPosY + 105); + g.DrawLine(pen, _startPosX + 169, _startPosY + 108, _startPosX + 190, _startPosY + 105); + g.DrawLine(pen, _startPosX + 170, _startPosY + 105, _startPosX + 194, _startPosY + 105); + Point point1 = new Point((int)_startPosX + 169, (int)_startPosY + 102); + Point point2 = new Point((int)_startPosX + 190, (int)_startPosY + 105); + Point point3 = new Point((int)_startPosX + 169, (int)_startPosY + 108); + Point[] fuelTankPoints = { point1, point2, point3 }; + g.FillPolygon(dopBrush, fuelTankPoints); + } + } + } +} diff --git a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs new file mode 100644 index 0000000..b5ca4bc --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirplaneWithRadar +{ + internal class EntityAirplaneWithRadar : EntityAirplane + { + /// + /// Дополнительный цвет + /// + public Color DopColor { get; private set; } + /// + /// Признак наличия радара + /// + public bool Radar { get; private set; } + /// + /// Признак наличия дополнительных топливных баков + /// + public bool ExtraFuelTank { get; private set; } + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес автомобиля + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия радара + /// Признак наличия дополнительных топливных баков + public EntityAirplaneWithRadar(int speed, float weight, Color bodyColor, Color dopColor, bool radar, bool extraFuelTank) : base(speed, weight, bodyColor) + { + DopColor = dopColor; + Radar = radar; + ExtraFuelTank = extraFuelTank; + } + + } +} diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.Designer.cs b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.Designer.cs index f556edf..0c78545 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.Designer.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.Designer.cs @@ -38,6 +38,7 @@ this.buttonLeft = new System.Windows.Forms.Button(); this.buttonDown = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); this.statusStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).BeginInit(); this.SuspendLayout(); @@ -142,11 +143,22 @@ this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(130, 372); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(140, 34); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // // FormAirplaneWithRadar // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonDown); this.Controls.Add(this.buttonLeft); @@ -176,5 +188,6 @@ private Button buttonLeft; private Button buttonDown; private Button buttonRight; + private Button buttonCreateModif; } } \ No newline at end of file diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs index 33e772e..b5c0eb3 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs @@ -20,6 +20,17 @@ namespace AirplaneWithRadar pictureBoxAirplane.Image = bmp; } /// + /// + /// + private void SetData() + { + Random rnd = new(); + _airplane.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirplane.Width, pictureBoxAirplane.Height); + toolStripStatusLabelSpeed.Text = $": {_airplane.Airplane.Speed}"; + toolStripStatusLabelWeight.Text = $": {_airplane.Airplane.Weight}"; + toolStripStatusLabelBodyColor.Text = $": {_airplane.Airplane.BodyColor.Name}"; + } + /// /// "" /// /// @@ -27,13 +38,8 @@ namespace AirplaneWithRadar private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _airplane = new DrawingAirplane(rnd.Next(100, 300), rnd.Next(1000, 2000), - Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - _airplane.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), - pictureBoxAirplane.Width, pictureBoxAirplane.Height); - toolStripStatusLabelSpeed.Text = $": {_airplane.Airplane.Speed}"; - toolStripStatusLabelWeight.Text = $": {_airplane.Airplane.Weight}"; - toolStripStatusLabelBodyColor.Text = $": {_airplane.Airplane.BodyColor.Name}"; + _airplane = new DrawingAirplane(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(); Draw(); } @@ -70,7 +76,18 @@ namespace AirplaneWithRadar { } - - + /// + /// "" + /// + /// + /// + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + _airplane = new DrawingAirplaneWithRadar(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0,2))); + SetData(); + Draw(); + } } } \ No newline at end of file diff --git a/AirplaneWithRadar/EntityAirplaneWithRadar.cs b/AirplaneWithRadar/EntityAirplaneWithRadar.cs new file mode 100644 index 0000000..d555ecb --- /dev/null +++ b/AirplaneWithRadar/EntityAirplaneWithRadar.cs @@ -0,0 +1,8 @@ +using System; + +public class Class1 +{ + public Class1() + { + } +} -- 2.25.1 From 85b7fd4dcf20529c41d53f22a45197894d36974d Mon Sep 17 00:00:00 2001 From: Anastasia Date: Tue, 4 Oct 2022 11:46:12 +0400 Subject: [PATCH 3/9] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5?= =?UTF-8?q?=D0=B9=D1=81=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AirplaneWithRadar/DrawingAirplane.cs | 10 ++++- .../DrawingObjectAirplane.cs | 35 ++++++++++++++++ .../AirplaneWithRadar/IDrawingObject.cs | 42 +++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 AirplaneWithRadar/AirplaneWithRadar/DrawingObjectAirplane.cs create mode 100644 AirplaneWithRadar/AirplaneWithRadar/IDrawingObject.cs diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs index 25dafbc..fe97e8e 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs @@ -207,7 +207,15 @@ namespace AirplaneWithRadar _startPosY = _pictureHeight.Value - _airplaneHeight; } } - + /// + /// Получение текущей позиции объекта + /// + /// + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (_startPosX, _startPosY, _startPosX + _airplaneWidth, _startPosY + _airplaneHeight); +) + } } } diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingObjectAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingObjectAirplane.cs new file mode 100644 index 0000000..787cb3e --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingObjectAirplane.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirplaneWithRadar +{ + internal class DrawingObjectAirplane : IDrawingObject + { + private DrawingAirplane _airplane = null; + public DrawingObjectAirplane(DrawingAirplane airplane) + { + _airplane = airplane; + } + public float Step => _airplane?.Airplane?.Step ?? 0; + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return _airplane?.GetCurrentPosition() ?? default; + } + public void MoveObject(Direction direction) + { + _airplane?.MoveTransport(direction); + } + public void SetObject(int x, int y, int width, int height) + { + _airplane.SetPosition(x, y, width, height); + } + public void DrawingObject(Graphics g) + { + // TODO + } + + } +} diff --git a/AirplaneWithRadar/AirplaneWithRadar/IDrawingObject.cs b/AirplaneWithRadar/AirplaneWithRadar/IDrawingObject.cs new file mode 100644 index 0000000..3e8a16c --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/IDrawingObject.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirplaneWithRadar +{ + /// + /// Интерфейс для работы с объектом, прорисовываемым на форме + /// + internal interface IDrawingObject + { + /// + /// Шаг перемещения объекта + /// + public float Step { get; } + /// + /// Установка позиции объекта + /// + /// Координата X + /// Координата Y + /// Ширина полотна + /// Высота полотна + void SetObject(int x, int y, int width, int height); + /// + /// Изменение направления пермещения объекта + /// + /// Направление + void MoveObject(Direction direction); + /// + /// Отрисовка объекта + /// + /// + void DrawingObject(Graphics g); + /// + /// Получение текущей позиции объекта + /// + /// + (float Left, float Right, float Top, float Bottom) GetCurrentPosition(); + } +} -- 2.25.1 From e33395b57d6c7c7f6a387f4db73d3d84f6dd387c Mon Sep 17 00:00:00 2001 From: Anastasia Date: Tue, 4 Oct 2022 12:33:14 +0400 Subject: [PATCH 4/9] =?UTF-8?q?=D0=90=D0=B1=D1=81=D1=82=D1=80=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AirplaneWithRadar/AbstractMap.cs | 82 +++++++ .../AirplaneWithRadar/Direction.cs | 1 + .../AirplaneWithRadar/DrawingAirplane.cs | 1 - .../AirplaneWithRadar/FormMap.Designer.cs | 207 ++++++++++++++++++ .../AirplaneWithRadar/FormMap.cs | 99 +++++++++ .../AirplaneWithRadar/FormMap.resx | 63 ++++++ .../AirplaneWithRadar/Program.cs | 2 +- .../AirplaneWithRadar/SimpleMap.cs | 57 +++++ 8 files changed, 510 insertions(+), 2 deletions(-) create mode 100644 AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs create mode 100644 AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs create mode 100644 AirplaneWithRadar/AirplaneWithRadar/FormMap.cs create mode 100644 AirplaneWithRadar/AirplaneWithRadar/FormMap.resx create mode 100644 AirplaneWithRadar/AirplaneWithRadar/SimpleMap.cs diff --git a/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs b/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs new file mode 100644 index 0000000..cbe5959 --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs @@ -0,0 +1,82 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirplaneWithRadar +{ + internal abstract class AbstractMap + { + private IDrawingObject _drawingObject = null; + protected int[,] _map = null; + protected int _width; + protected int _height; + protected float _size_x; + protected float _size_y; + protected readonly Random _random = new(); + protected readonly int _freeRoad = 0; + protected readonly int _barrier = 1; + public Bitmap CreateMap(int width, int height, IDrawingObject drawingObject) + { + _width = width; + _height = height; + _drawingObject = drawingObject; + GenerateMap(); + while (!SetObjectOnMap()) + { + GenerateMap(); + } + return DrawMapWithObject(); + } + public Bitmap MoveObject(Direction direction) + { + // TODO проверка, что объект может переместится в требуемом направлении + if (true) + { + _drawingObject.MoveObject(direction); + } + return DrawMapWithObject(); + } + private bool SetObjectOnMap() + { + if (_drawingObject == null || _map == null) + { + return false; + } + int x = _random.Next(0, 10); + int y = _random.Next(0, 10); + _drawingObject.SetObject(x, y, _width, _height); + // TODO проверка, что объект не "накладывается" на закрытые участки + return true; + } + private Bitmap DrawMapWithObject() + { + Bitmap bmp = new(_width, _height); + if (_drawingObject == null || _map == null) + { + return bmp; + } + Graphics gr = Graphics.FromImage(bmp); + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + if (_map[i, j] == _freeRoad) + { + DrawRoadPart(gr, i, j); + } + else if (_map[i, j] == _barrier) + { + DrawBarrierPart(gr, i, j); + } + } + } + _drawingObject.DrawingObject(gr); + return bmp; + } + protected abstract void GenerateMap(); + protected abstract void DrawRoadPart(Graphics g, int i, int j); + protected abstract void DrawBarrierPart(Graphics g, int i, int j); + } +} diff --git a/AirplaneWithRadar/AirplaneWithRadar/Direction.cs b/AirplaneWithRadar/AirplaneWithRadar/Direction.cs index ccce08c..9a262a7 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/Direction.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/Direction.cs @@ -11,6 +11,7 @@ namespace AirplaneWithRadar /// internal enum Direction { + None = 0, Up = 1, Down = 2, Left = 3, diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs index fe97e8e..bc174ff 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs @@ -214,7 +214,6 @@ namespace AirplaneWithRadar public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() { return (_startPosX, _startPosY, _startPosX + _airplaneWidth, _startPosY + _airplaneHeight); -) } } diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs new file mode 100644 index 0000000..d55abcb --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs @@ -0,0 +1,207 @@ +namespace AirplaneWithRadar +{ + partial class FormMap + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.statusStrip = new System.Windows.Forms.StatusStrip(); + this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel(); + this.pictureBoxAirplane = new System.Windows.Forms.PictureBox(); + this.buttonCreate = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonRight = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + this.statusStrip.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).BeginInit(); + this.SuspendLayout(); + // + // statusStrip + // + this.statusStrip.ImageScalingSize = new System.Drawing.Size(24, 24); + this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelBodyColor}); + this.statusStrip.Location = new System.Drawing.Point(0, 418); + this.statusStrip.Name = "statusStrip"; + this.statusStrip.Size = new System.Drawing.Size(800, 32); + this.statusStrip.TabIndex = 0; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(93, 25); + this.toolStripStatusLabelSpeed.Text = "Скорость:"; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(43, 25); + this.toolStripStatusLabelWeight.Text = "Вес:"; + // + // toolStripStatusLabelBodyColor + // + this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(55, 25); + this.toolStripStatusLabelBodyColor.Text = "Цвет:"; + // + // pictureBoxAirplane + // + this.pictureBoxAirplane.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxAirplane.Location = new System.Drawing.Point(0, 0); + this.pictureBoxAirplane.Name = "pictureBoxAirplane"; + this.pictureBoxAirplane.Size = new System.Drawing.Size(800, 450); + this.pictureBoxAirplane.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxAirplane.TabIndex = 1; + this.pictureBoxAirplane.TabStop = false; + // + // buttonCreate + // + this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreate.Location = new System.Drawing.Point(12, 372); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(112, 34); + this.buttonCreate.TabIndex = 2; + this.buttonCreate.Text = "Создать"; + this.buttonCreate.UseVisualStyleBackColor = true; + this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); + // + // buttonUp + // + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.up; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(711, 340); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.TabIndex = 3; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonLeft + // + this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonLeft.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.left; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(675, 376); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.TabIndex = 4; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonDown + // + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.down; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(711, 376); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.TabIndex = 5; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.right; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(747, 376); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.TabIndex = 6; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(130, 372); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(140, 34); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // + // comboBoxSelectorMap + // + this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxSelectorMap.FormattingEnabled = true; + this.comboBoxSelectorMap.Items.AddRange(new object[] { + "Простая карта"}); + this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(182, 33); + this.comboBoxSelectorMap.TabIndex = 8; + this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); + // + // FormMap + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.comboBoxSelectorMap); + this.Controls.Add(this.statusStrip); + this.Controls.Add(this.buttonCreateModif); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.pictureBoxAirplane); + this.Name = "FormMap"; + this.Text = "Карта"; + this.statusStrip.ResumeLayout(false); + this.statusStrip.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private StatusStrip statusStrip; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelBodyColor; + private PictureBox pictureBoxAirplane; + private Button buttonCreate; + private Button buttonUp; + private Button buttonLeft; + private Button buttonDown; + private Button buttonRight; + private Button buttonCreateModif; + private ComboBox comboBoxSelectorMap; + } +} \ No newline at end of file diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs new file mode 100644 index 0000000..5f87b94 --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs @@ -0,0 +1,99 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace AirplaneWithRadar +{ + public partial class FormMap : Form + { + private AbstractMap _abstractMap; + public FormMap() + { + InitializeComponent(); + _abstractMap = new SimpleMap(); + } + /// + /// Заполнение информации по объекту + /// + /// + private void SetData(DrawingAirplane airplane) + { + toolStripStatusLabelSpeed.Text = $"Скорость: {airplane.Airplane.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {airplane.Airplane.Weight}"; + toolStripStatusLabelBodyColor.Text = $"Цвет:{airplane.Airplane.BodyColor.Name}"; + pictureBoxAirplane.Image = _abstractMap.CreateMap(pictureBoxAirplane.Width,pictureBoxAirplane.Height,new DrawingObjectAirplane(airplane)); + } + /// + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + var airplane = new DrawingAirplane(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(airplane); + + } + + private void ButtonMove_Click(object sender, EventArgs e) + { + //получаем имя кнопки + string name = ((Button)sender)?.Name ?? string.Empty; + Direction dir = Direction.None; + switch (name) + { + case "buttonUp": + dir = Direction.Up; + break; + case "buttonDown": + dir = Direction.Down; + break; + case "buttonLeft": + dir = Direction.Left; + break; + case "buttonRight": + dir = Direction.Right; + break; + } + pictureBoxAirplane.Image = _abstractMap?.MoveObject(dir); + + } + + /// + /// Обработка нажатия кнопки "Модификация" + /// + /// + /// + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + var airplane = new DrawingAirplaneWithRadar(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0,256)), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0,2))); + SetData(airplane); + + } + + + private void FormMap_Load(object sender, EventArgs e) + { + + } + + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + } + } + } +} diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMap.resx b/AirplaneWithRadar/AirplaneWithRadar/FormMap.resx new file mode 100644 index 0000000..2c0949d --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMap.resx @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 17, 17 + + \ No newline at end of file diff --git a/AirplaneWithRadar/AirplaneWithRadar/Program.cs b/AirplaneWithRadar/AirplaneWithRadar/Program.cs index 1d7b722..f8a0be0 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/Program.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/Program.cs @@ -11,7 +11,7 @@ namespace AirplaneWithRadar // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormAirplaneWithRadar()); + Application.Run(new FormMap()); } } } \ No newline at end of file diff --git a/AirplaneWithRadar/AirplaneWithRadar/SimpleMap.cs b/AirplaneWithRadar/AirplaneWithRadar/SimpleMap.cs new file mode 100644 index 0000000..582db27 --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/SimpleMap.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirplaneWithRadar +{ + /// + /// Простая реализация абсрактного класса AbstractMap + /// + internal class SimpleMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Black); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.Gray); + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + + 1), j * (_size_y + 1)); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + + 1), j * (_size_y + 1)); + } + protected override void GenerateMap() + { + _map = new int[100, 100]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + int counter = 0; + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + while (counter < 50) + { + int x = _random.Next(0, 100); + int y = _random.Next(0, 100); + if (_map[x, y] == _freeRoad) + { + _map[x, y] = _barrier; + counter++; + } + } + } + } +} -- 2.25.1 From 4b474bc9fbbe52d2458555761f04d99f2fd40e30 Mon Sep 17 00:00:00 2001 From: Anastasia Date: Mon, 17 Oct 2022 21:44:34 +0400 Subject: [PATCH 5/9] =?UTF-8?q?2=20=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B0=D0=B1=D1=81=D1=82=D1=80=D0=B0?= =?UTF-8?q?=D0=BA=D1=82=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BA=D0=BB=D0=B0=D1=81?= =?UTF-8?q?=D1=81=D0=B0=20=D1=81=20=D1=80=D0=B0=D0=B7=D0=BB=D0=B8=D1=87?= =?UTF-8?q?=D0=BD=D0=BE=D0=B9=20=D0=BF=D1=80=D0=BE=D1=80=D0=B8=D1=81=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=BE=D0=B9=20=D0=BA=D0=B0=D1=80=D1=82=D1=8B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AirplaneWithRadar/AbstractMap.cs | 66 +++++++++++++- .../AirplaneWithRadar/DrawingAirplane.cs | 51 ++++++----- .../DrawingAirplaneWithRadar.cs | 11 ++- .../DrawingObjectAirplane.cs | 2 +- .../AirplaneWithRadar/EntityAirplane.cs | 2 + .../EntityAirplaneWithRadar.cs | 9 +- .../FormAirplaneWithRadar.cs | 2 + .../AirplaneWithRadar/FormMap.Designer.cs | 3 +- .../AirplaneWithRadar/FormMap.cs | 7 +- AirplaneWithRadar/AirplaneWithRadar/MyMap.cs | 91 +++++++++++++++++++ .../AirplaneWithRadar/SimpleMap.cs | 6 +- 11 files changed, 208 insertions(+), 42 deletions(-) create mode 100644 AirplaneWithRadar/AirplaneWithRadar/MyMap.cs diff --git a/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs b/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs index cbe5959..1934d8f 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs @@ -32,7 +32,61 @@ namespace AirplaneWithRadar public Bitmap MoveObject(Direction direction) { // TODO проверка, что объект может переместится в требуемом направлении - if (true) + + if (direction == Direction.Right) + { + for (int i = (int)(_drawingObject.GetCurrentPosition().Right / _size_x + 1); i < _drawingObject.GetCurrentPosition().Right + _drawingObject.Step / _size_x + 1; i++) + { + for (int j = (int)(_drawingObject.GetCurrentPosition().Top / _size_y + 1 ); j < _drawingObject.GetCurrentPosition().Bottom / _size_y + 1; j++) + { + if (_map[i, j] == _barrier) + { + break; + } + } + } + } + if (direction == Direction.Up) + { + for (int i = (int)(_drawingObject.GetCurrentPosition().Top - _drawingObject.Step / _size_y); i < _drawingObject.GetCurrentPosition().Top / _size_y; i++) + { + for (int j = (int)(_drawingObject.GetCurrentPosition().Left / _size_x); j < _drawingObject.GetCurrentPosition().Right / _size_x; j++) + { + if (_map[i, j] == _barrier) + { + break; + } + } + } + } + if (direction == Direction.Left) + { + for (int i = (int)(_drawingObject.GetCurrentPosition().Left - _drawingObject.Step / _size_x); i < _drawingObject.GetCurrentPosition().Left / _size_x; i++) + { + for (int j = (int)(_drawingObject.GetCurrentPosition().Top / _size_y); j < _drawingObject.GetCurrentPosition().Bottom / _size_y; j++) + { + if (_map[i, j] == _barrier) + { + break; + } + } + } + } + if (direction == Direction.Down) + { + + for (int i = (int)(_drawingObject.GetCurrentPosition().Bottom / _size_y); i < _drawingObject.GetCurrentPosition().Bottom + _drawingObject.Step / _size_y; i++) + { + for (int j = (int)(_drawingObject.GetCurrentPosition().Left / _size_x); j < _drawingObject.GetCurrentPosition().Right / _size_x; j++) + { + if (_map[i, j] == _barrier) + { + break; + } + } + } + } + if (true) { _drawingObject.MoveObject(direction); } @@ -47,6 +101,16 @@ namespace AirplaneWithRadar int x = _random.Next(0, 10); int y = _random.Next(0, 10); _drawingObject.SetObject(x, y, _width, _height); + for (int i = (int)(_drawingObject.GetCurrentPosition().Left/_size_x); i < _drawingObject.GetCurrentPosition().Right/_size_x; i++) + { + for (int j = (int)(_drawingObject.GetCurrentPosition().Top/_size_y); j < _drawingObject.GetCurrentPosition().Bottom/_size_y; j++) + { + if (_map[i,j] == _barrier) + { + return false; + } + } + } // TODO проверка, что объект не "накладывается" на закрытые участки return true; } diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs index bc174ff..ffadaa1 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs @@ -14,13 +14,13 @@ namespace AirplaneWithRadar /// /// Класс-сущность /// - public EntityAirplane Airplane { protected set; get; } + public EntityAirplane Airplane { get; protected set; } /// - /// Левая координата отрисовки самолета + /// Левая координата отрисовки автомобиля /// protected float _startPosX; /// - /// Верхняя кооридната отрисовки самолета + /// Верхняя кооридната отрисовки автомобиля /// protected float _startPosY; /// @@ -32,18 +32,18 @@ namespace AirplaneWithRadar /// private int? _pictureHeight = null; /// - /// Ширина отрисовки самолета + /// Ширина отрисовки автомобиля /// private readonly int _airplaneWidth = 303; /// - /// Высота отрисовки самолета + /// Высота отрисовки автомобиля /// - private readonly int _airplaneHeight = 102; + private readonly int _airplaneHeight = 107; /// /// Инициализация свойств /// /// Скорость - /// Вес самолета + /// Вес автомобиля /// Цвет кузова public DrawingAirplane(int speed, float weight, Color bodyColor) { @@ -55,16 +55,16 @@ namespace AirplaneWithRadar /// Скорость /// Вес автомобиля /// Цвет кузова - /// Ширина отрисовки автомобиля - /// Высота отрисовки автомобиля - protected DrawingAirplane(int speed, float weight, Color bodyColor, int airplaneWidth, int airplaneHeight) : this(speed, weight, bodyColor) + /// Ширина отрисовки автомобиля + /// Высота отрисовки автомобиля + protected DrawingAirplane(int speed, float weight, Color bodyColor, int airplaneWidth, int airplaneHeight) : + this(speed, weight, bodyColor) { _airplaneWidth = airplaneWidth; _airplaneHeight = airplaneHeight; } - /// - /// Установка позиции самолета + /// Установка позиции автомобиля /// /// Координата X /// Координата Y @@ -72,28 +72,32 @@ namespace AirplaneWithRadar /// Высота картинки public void SetPosition(int x, int y, int width, int height) { - // TODO проверки - if (x > 0 && x < width) + // TODO checks + if (x > 0 && x < width) { _startPosX = x; } - if (y > 0 && y < height) + if (y > 0 && y < height) { _startPosY = y; - } + } if (width > 0) { _pictureWidth = width; } - if (height > 0) + if (height > 0) { _pictureHeight = height; - } - - + } + + + //_startPosX = x; + //_startPosY = y; + //_pictureWidth = width; + //_pictureHeight = height; } /// - /// Изменение направления перемещения + /// Изменение направления пермещения /// /// Направление public void MoveTransport(Direction direction) @@ -141,7 +145,7 @@ namespace AirplaneWithRadar public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 - || !_pictureHeight.HasValue || !_pictureWidth.HasValue) + || !_pictureHeight.HasValue || !_pictureWidth.HasValue) { return; } @@ -181,7 +185,6 @@ namespace AirplaneWithRadar g.FillRectangle(brBlack, _startPosX + 90, _startPosY + 67, 90, 8); g.FillEllipse(brBlack, _startPosX + 83, _startPosY + 66, 9, 9); g.FillEllipse(brBlack, _startPosX + 175, _startPosY + 66, 9, 9); - } /// /// Смена границ формы отрисовки @@ -213,7 +216,7 @@ namespace AirplaneWithRadar /// public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() { - return (_startPosX, _startPosY, _startPosX + _airplaneWidth, _startPosY + _airplaneHeight); + return (_startPosX, _startPosX + _airplaneWidth, _startPosY, _startPosY + _airplaneHeight); } } diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplaneWithRadar.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplaneWithRadar.cs index 3af778f..ea5724a 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplaneWithRadar.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplaneWithRadar.cs @@ -12,15 +12,16 @@ namespace AirplaneWithRadar /// Инициализация свойств /// /// Скорость - /// Вес самолета - /// Цвет самолета + /// Вес автомобиля + /// Цвет кузова /// Дополнительный цвет - /// Признак наличия радара - /// Признак наличия дополнительных топливных баков - public DrawingAirplaneWithRadar(int speed, float weight, Color bodyColor, Color dopColor, bool radar, bool extraFuelTank) : base(speed, weight, bodyColor, 110, 60) + /// Признак наличия обвеса + /// Признак наличия антикрыла + public DrawingAirplaneWithRadar(int speed, float weight, Color bodyColor, Color dopColor, bool radar, bool extraFuelTank) : base(speed, weight, bodyColor, 303, 102) { Airplane = new EntityAirplaneWithRadar(speed, weight, bodyColor, dopColor, radar, extraFuelTank); } + public override void DrawTransport(Graphics g) { if (Airplane is not EntityAirplaneWithRadar airplaneWithRadar) diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingObjectAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingObjectAirplane.cs index 787cb3e..08ac4fd 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/DrawingObjectAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingObjectAirplane.cs @@ -28,7 +28,7 @@ namespace AirplaneWithRadar } public void DrawingObject(Graphics g) { - // TODO + _airplane.DrawTransport(g); } } diff --git a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs index 167e6dc..eeb5690 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs @@ -42,6 +42,8 @@ namespace AirplaneWithRadar Weight = weight <= 0 ? rnd.Next(40, 70) : weight; BodyColor = bodyColor; } + + } } diff --git a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs index b5ca4bc..9026595 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs @@ -13,11 +13,11 @@ namespace AirplaneWithRadar /// public Color DopColor { get; private set; } /// - /// Признак наличия радара + /// Признак наличия обвеса /// public bool Radar { get; private set; } /// - /// Признак наличия дополнительных топливных баков + /// Признак наличия антикрыла /// public bool ExtraFuelTank { get; private set; } /// @@ -27,8 +27,8 @@ namespace AirplaneWithRadar /// Вес автомобиля /// Цвет кузова /// Дополнительный цвет - /// Признак наличия радара - /// Признак наличия дополнительных топливных баков + /// Признак наличия обвеса + /// Признак наличия антикрыла public EntityAirplaneWithRadar(int speed, float weight, Color bodyColor, Color dopColor, bool radar, bool extraFuelTank) : base(speed, weight, bodyColor) { DopColor = dopColor; @@ -36,5 +36,6 @@ namespace AirplaneWithRadar ExtraFuelTank = extraFuelTank; } + } } diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs index b5c0eb3..f93bb8a 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs @@ -25,6 +25,7 @@ namespace AirplaneWithRadar private void SetData() { Random rnd = new(); + _airplane.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirplane.Width, pictureBoxAirplane.Height); toolStripStatusLabelSpeed.Text = $": {_airplane.Airplane.Speed}"; toolStripStatusLabelWeight.Text = $": {_airplane.Airplane.Weight}"; @@ -37,6 +38,7 @@ namespace AirplaneWithRadar /// private void ButtonCreate_Click(object sender, EventArgs e) { + Random rnd = new(); _airplane = new DrawingAirplane(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); SetData(); diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs index d55abcb..977ebcf 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs @@ -158,7 +158,8 @@ this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxSelectorMap.FormattingEnabled = true; this.comboBoxSelectorMap.Items.AddRange(new object[] { - "Простая карта"}); + "Простая карта", + "Собственная карта"}); this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12); this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; this.comboBoxSelectorMap.Size = new System.Drawing.Size(182, 33); diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs index 5f87b94..9313a2d 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs @@ -74,8 +74,8 @@ namespace AirplaneWithRadar private void ButtonCreateModif_Click(object sender, EventArgs e) { Random rnd = new(); - var airplane = new DrawingAirplaneWithRadar(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0,256)), - Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0,2))); + var airplane = new DrawingAirplaneWithRadar(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); SetData(airplane); } @@ -93,6 +93,9 @@ namespace AirplaneWithRadar case "Простая карта": _abstractMap = new SimpleMap(); break; + case "Собственная карта": + _abstractMap = new MyMap(); + break; } } } diff --git a/AirplaneWithRadar/AirplaneWithRadar/MyMap.cs b/AirplaneWithRadar/AirplaneWithRadar/MyMap.cs new file mode 100644 index 0000000..a789586 --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/MyMap.cs @@ -0,0 +1,91 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirplaneWithRadar +{ + /// + /// Собственная реализация абсрактного класса AbstractMap + /// + internal class MyMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.White); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.Blue); + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + } + protected override void GenerateMap() + { + _map = new int[100, 100]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + //int counter = 0; + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + + + int counter = 0; + + for (int j = 0; j < _map.GetLength(1); j++) + { + int startX = _random.Next(0, 80); + int x = _random.Next(0, 20); + counter = 0; + while (counter < x) + { + for (int i = startX; i < startX + x; i++) + { + _map[i, j] = _barrier; + counter++; + } + } + j++; + } + //for (int i = 0; i < _map.GetLength(0); ++i) + //{ + // int startX = _random.Next(0, 90); + // int x = _random.Next(0, 100 - startX - 10); + // counter = x; + // while (counter > 0) + // { + // for (int j = 0; j < _map.GetLength(1); ++j) + // { + // _map[i, j] = _barrier; + // counter--; + // } + // } + + //} + //while (counter < 50) + //{ + // int x = _random.Next(0, 100); + // int y = _random.Next(0, 100); + // if (_map[x, y] == _freeRoad) + // { + // _map[x, y] = _barrier; + // counter++; + // } + //} + + } + } +} + diff --git a/AirplaneWithRadar/AirplaneWithRadar/SimpleMap.cs b/AirplaneWithRadar/AirplaneWithRadar/SimpleMap.cs index 582db27..6117e5e 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/SimpleMap.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/SimpleMap.cs @@ -21,13 +21,11 @@ namespace AirplaneWithRadar private readonly Brush roadColor = new SolidBrush(Color.Gray); protected override void DrawBarrierPart(Graphics g, int i, int j) { - g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + - 1), j * (_size_y + 1)); + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); } protected override void DrawRoadPart(Graphics g, int i, int j) { - g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + - 1), j * (_size_y + 1)); + g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); } protected override void GenerateMap() { -- 2.25.1 From 118cc6316cc7c2bba88b19df9f78c5fef033ff6f Mon Sep 17 00:00:00 2001 From: Anastasia Date: Mon, 31 Oct 2022 19:04:08 +0400 Subject: [PATCH 6/9] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BE=D0=BA?= =?UTF-8?q?=20=D0=B2=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B0=D1=85=20=D0=B0?= =?UTF-8?q?=D0=B1=D1=81=D1=82=D1=80=D0=B0=D0=BA=D1=82=D0=BE=D0=B3=D0=BE=20?= =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AirplaneWithRadar/AbstractMap.cs | 102 ++++++++---------- .../AirplaneWithRadar/DrawingAirplane.cs | 2 +- .../DrawingAirplaneWithRadar.cs | 2 +- AirplaneWithRadar/AirplaneWithRadar/MyMap.cs | 29 +---- 4 files changed, 50 insertions(+), 85 deletions(-) diff --git a/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs b/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs index 1934d8f..ea02d63 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs @@ -31,67 +31,62 @@ namespace AirplaneWithRadar } public Bitmap MoveObject(Direction direction) { - // TODO проверка, что объект может переместится в требуемом направлении - - if (direction == Direction.Right) + if (_drawingObject == null) return DrawMapWithObject(); + bool canMoveObject = true; + switch (direction) { - for (int i = (int)(_drawingObject.GetCurrentPosition().Right / _size_x + 1); i < _drawingObject.GetCurrentPosition().Right + _drawingObject.Step / _size_x + 1; i++) - { - for (int j = (int)(_drawingObject.GetCurrentPosition().Top / _size_y + 1 ); j < _drawingObject.GetCurrentPosition().Bottom / _size_y + 1; j++) + case Direction.Left: + if (!CheckBarriers(-1 * _drawingObject.Step, -1 * _drawingObject.Step, 0, 0)) { - if (_map[i, j] == _barrier) - { - break; - } + canMoveObject = false; } - } - } - if (direction == Direction.Up) - { - for (int i = (int)(_drawingObject.GetCurrentPosition().Top - _drawingObject.Step / _size_y); i < _drawingObject.GetCurrentPosition().Top / _size_y; i++) - { - for (int j = (int)(_drawingObject.GetCurrentPosition().Left / _size_x); j < _drawingObject.GetCurrentPosition().Right / _size_x; j++) + break; + case Direction.Right: + if (!CheckBarriers(_drawingObject.Step, _drawingObject.Step, 0, 0)) { - if (_map[i, j] == _barrier) - { - break; - } + canMoveObject = false; } - } - } - if (direction == Direction.Left) - { - for (int i = (int)(_drawingObject.GetCurrentPosition().Left - _drawingObject.Step / _size_x); i < _drawingObject.GetCurrentPosition().Left / _size_x; i++) - { - for (int j = (int)(_drawingObject.GetCurrentPosition().Top / _size_y); j < _drawingObject.GetCurrentPosition().Bottom / _size_y; j++) + break; + case Direction.Up: + if (!CheckBarriers(0, 0, -1 * _drawingObject.Step, -1 * _drawingObject.Step)) { - if (_map[i, j] == _barrier) - { - break; - } + canMoveObject = false; } - } - } - if (direction == Direction.Down) - { - - for (int i = (int)(_drawingObject.GetCurrentPosition().Bottom / _size_y); i < _drawingObject.GetCurrentPosition().Bottom + _drawingObject.Step / _size_y; i++) - { - for (int j = (int)(_drawingObject.GetCurrentPosition().Left / _size_x); j < _drawingObject.GetCurrentPosition().Right / _size_x; j++) + break; + case Direction.Down: + if (!CheckBarriers(0, 0, _drawingObject.Step, _drawingObject.Step)) { - if (_map[i, j] == _barrier) - { - break; - } + canMoveObject = false; } - } + break; } - if (true) + if (canMoveObject) { _drawingObject.MoveObject(direction); } return DrawMapWithObject(); } + + private bool CheckBarriers(float leftMove, float rightMove, float topMove, float bottomMove) + { + int left = Convert.ToInt32((_drawingObject.GetCurrentPosition().Left + leftMove) / _size_x); + int right = Convert.ToInt32((_drawingObject.GetCurrentPosition().Right + rightMove) / _size_x); + int top = Convert.ToInt32((_drawingObject.GetCurrentPosition().Top + topMove) / _size_y); + int bottom = Convert.ToInt32((_drawingObject.GetCurrentPosition().Bottom + bottomMove) / _size_y); + if (top < 0 || left < 0 || right >= _map.GetLength(1) || bottom >= _map.GetLength(0)) + { + return false; + } + for (int i = top; i <= bottom; i++) + { + for (int j = left; j <= right; j++) + { + if (_map[j, i] == 1) return false; + } + } + return true; + } + private bool SetObjectOnMap() { if (_drawingObject == null || _map == null) @@ -101,18 +96,13 @@ namespace AirplaneWithRadar int x = _random.Next(0, 10); int y = _random.Next(0, 10); _drawingObject.SetObject(x, y, _width, _height); - for (int i = (int)(_drawingObject.GetCurrentPosition().Left/_size_x); i < _drawingObject.GetCurrentPosition().Right/_size_x; i++) - { - for (int j = (int)(_drawingObject.GetCurrentPosition().Top/_size_y); j < _drawingObject.GetCurrentPosition().Bottom/_size_y; j++) - { - if (_map[i,j] == _barrier) - { - return false; - } - } - } // TODO проверка, что объект не "накладывается" на закрытые участки + if (!CheckBarriers(0, 0, 0, 0)) + { + return false; + } return true; + } private Bitmap DrawMapWithObject() { diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs index ffadaa1..d039dc7 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs @@ -38,7 +38,7 @@ namespace AirplaneWithRadar /// /// Высота отрисовки автомобиля /// - private readonly int _airplaneHeight = 107; + private readonly int _airplaneHeight = 108; /// /// Инициализация свойств /// diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplaneWithRadar.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplaneWithRadar.cs index ea5724a..9ce31b6 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplaneWithRadar.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplaneWithRadar.cs @@ -17,7 +17,7 @@ namespace AirplaneWithRadar /// Дополнительный цвет /// Признак наличия обвеса /// Признак наличия антикрыла - public DrawingAirplaneWithRadar(int speed, float weight, Color bodyColor, Color dopColor, bool radar, bool extraFuelTank) : base(speed, weight, bodyColor, 303, 102) + public DrawingAirplaneWithRadar(int speed, float weight, Color bodyColor, Color dopColor, bool radar, bool extraFuelTank) : base(speed, weight, bodyColor, 304, 109) { Airplane = new EntityAirplaneWithRadar(speed, weight, bodyColor, dopColor, radar, extraFuelTank); } diff --git a/AirplaneWithRadar/AirplaneWithRadar/MyMap.cs b/AirplaneWithRadar/AirplaneWithRadar/MyMap.cs index a789586..06ce687 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/MyMap.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/MyMap.cs @@ -42,7 +42,7 @@ namespace AirplaneWithRadar } - int counter = 0; + int counter; for (int j = 0; j < _map.GetLength(1); j++) { @@ -57,33 +57,8 @@ namespace AirplaneWithRadar counter++; } } - j++; + j += 3; } - //for (int i = 0; i < _map.GetLength(0); ++i) - //{ - // int startX = _random.Next(0, 90); - // int x = _random.Next(0, 100 - startX - 10); - // counter = x; - // while (counter > 0) - // { - // for (int j = 0; j < _map.GetLength(1); ++j) - // { - // _map[i, j] = _barrier; - // counter--; - // } - // } - - //} - //while (counter < 50) - //{ - // int x = _random.Next(0, 100); - // int y = _random.Next(0, 100); - // if (_map[x, y] == _freeRoad) - // { - // _map[x, y] = _barrier; - // counter++; - // } - //} } } -- 2.25.1 From aae1f51ef5ec2ad8d12ef889da0c375b958e1fda Mon Sep 17 00:00:00 2001 From: Anastasia Date: Tue, 1 Nov 2022 12:40:56 +0400 Subject: [PATCH 7/9] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B5=D1=89=D0=B5=20=D0=BE=D0=B4=D0=BD?= =?UTF-8?q?=D0=BE=D0=B9=20=D0=BA=D0=B0=D1=80=D1=82=D1=8B=20+=20=D1=84?= =?UTF-8?q?=D0=B8=D0=BA=D1=81=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B8=D0=B7=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AirplaneWithRadar/AbstractMap.cs | 5 +- .../AirplaneWithRadar/BlockMap.cs | 80 +++++++++++++++++++ .../AirplaneWithRadar/FormMap.Designer.cs | 3 +- .../AirplaneWithRadar/FormMap.cs | 7 +- .../{MyMap.cs => LineMap.cs} | 2 +- 5 files changed, 92 insertions(+), 5 deletions(-) create mode 100644 AirplaneWithRadar/AirplaneWithRadar/BlockMap.cs rename AirplaneWithRadar/AirplaneWithRadar/{MyMap.cs => LineMap.cs} (98%) diff --git a/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs b/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs index ea02d63..30d189f 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs @@ -81,7 +81,10 @@ namespace AirplaneWithRadar { for (int j = left; j <= right; j++) { - if (_map[j, i] == 1) return false; + if (_map[j, i] == 1) + { + return false; + } } } return true; diff --git a/AirplaneWithRadar/AirplaneWithRadar/BlockMap.cs b/AirplaneWithRadar/AirplaneWithRadar/BlockMap.cs new file mode 100644 index 0000000..2c920c7 --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/BlockMap.cs @@ -0,0 +1,80 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace AirplaneWithRadar +{ + internal class BlockMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Beige); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.LightBlue); + + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, (i + 1) * (_size_x + 1), (j + 1) * (_size_y + 1)); + + } + + protected override void GenerateMap() + { + _map = new int[100, 100]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + int block = 0; + for (int i = 0; i < _map.GetLength(0); i++) + { + for (int j = 0; j < _map.GetLength(1); j++) + { + _map[i, j] = _freeRoad; + } + } + int numberBlocks = _random.Next(10, 15); + while (block < numberBlocks) + { + int x = _random.Next(0, 80); + int y = _random.Next(0, 80); + int blockWidth = _random.Next(0, 19); + int blockHeight = _random.Next(0, 19); + + bool isFree = true; + for (int i = x; i < x + blockWidth; i++) + { + for (int j = y; j < y + blockHeight; j++) + { + if (_map[i, j] != _freeRoad) + { + isFree = false; + break; + } + + } + } + if (isFree) + { + for (int i = x; i < x + blockWidth; i++) + { + for (int j = y; j < y + blockHeight; j++) + { + _map[i, j] = _barrier; + } + } + block++; + } + } + } + } +} diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs index 977ebcf..aa2bb3e 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs @@ -159,7 +159,8 @@ this.comboBoxSelectorMap.FormattingEnabled = true; this.comboBoxSelectorMap.Items.AddRange(new object[] { "Простая карта", - "Собственная карта"}); + "Карта с линиями", + "Карта с блоками"}); this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12); this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; this.comboBoxSelectorMap.Size = new System.Drawing.Size(182, 33); diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs index 9313a2d..49f17cc 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs @@ -93,8 +93,11 @@ namespace AirplaneWithRadar case "Простая карта": _abstractMap = new SimpleMap(); break; - case "Собственная карта": - _abstractMap = new MyMap(); + case "Карта с линиями": + _abstractMap = new LineMap(); + break; + case "Карта с блоками": + _abstractMap = new BlockMap(); break; } } diff --git a/AirplaneWithRadar/AirplaneWithRadar/MyMap.cs b/AirplaneWithRadar/AirplaneWithRadar/LineMap.cs similarity index 98% rename from AirplaneWithRadar/AirplaneWithRadar/MyMap.cs rename to AirplaneWithRadar/AirplaneWithRadar/LineMap.cs index 06ce687..f26f73d 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/MyMap.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/LineMap.cs @@ -9,7 +9,7 @@ namespace AirplaneWithRadar /// /// Собственная реализация абсрактного класса AbstractMap /// - internal class MyMap : AbstractMap + internal class LineMap : AbstractMap { /// /// Цвет участка закрытого -- 2.25.1 From e1eb80499ed86d1659890dd1a8129a3f5f8d6b6e Mon Sep 17 00:00:00 2001 From: Anastasia Date: Sun, 13 Nov 2022 10:04:54 +0400 Subject: [PATCH 8/9] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AirplaneWithRadar/AbstractMap.cs | 4 --- .../AirplaneWithRadar/BlockMap.cs | 4 --- .../AirplaneWithRadar/DrawingAirplane.cs | 32 ++++++------------- .../DrawingAirplaneWithRadar.cs | 11 ++----- .../DrawingObjectAirplane.cs | 1 - .../AirplaneWithRadar/EntityAirplane.cs | 8 ++--- .../EntityAirplaneWithRadar.cs | 12 +++---- .../FormAirplaneWithRadar.Designer.cs | 1 - .../FormAirplaneWithRadar.cs | 25 ++++----------- .../AirplaneWithRadar/FormMap.cs | 25 +++++++-------- .../AirplaneWithRadar/LineMap.cs | 5 --- .../AirplaneWithRadar/Program.cs | 2 -- 12 files changed, 37 insertions(+), 93 deletions(-) diff --git a/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs b/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs index 30d189f..e235bf8 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs @@ -66,7 +66,6 @@ namespace AirplaneWithRadar } return DrawMapWithObject(); } - private bool CheckBarriers(float leftMove, float rightMove, float topMove, float bottomMove) { int left = Convert.ToInt32((_drawingObject.GetCurrentPosition().Left + leftMove) / _size_x); @@ -89,7 +88,6 @@ namespace AirplaneWithRadar } return true; } - private bool SetObjectOnMap() { if (_drawingObject == null || _map == null) @@ -99,13 +97,11 @@ namespace AirplaneWithRadar int x = _random.Next(0, 10); int y = _random.Next(0, 10); _drawingObject.SetObject(x, y, _width, _height); - // TODO проверка, что объект не "накладывается" на закрытые участки if (!CheckBarriers(0, 0, 0, 0)) { return false; } return true; - } private Bitmap DrawMapWithObject() { diff --git a/AirplaneWithRadar/AirplaneWithRadar/BlockMap.cs b/AirplaneWithRadar/AirplaneWithRadar/BlockMap.cs index 2c920c7..b601672 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/BlockMap.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/BlockMap.cs @@ -26,9 +26,7 @@ namespace AirplaneWithRadar protected override void DrawRoadPart(Graphics g, int i, int j) { g.FillRectangle(roadColor, i * _size_x, j * _size_y, (i + 1) * (_size_x + 1), (j + 1) * (_size_y + 1)); - } - protected override void GenerateMap() { _map = new int[100, 100]; @@ -49,7 +47,6 @@ namespace AirplaneWithRadar int y = _random.Next(0, 80); int blockWidth = _random.Next(0, 19); int blockHeight = _random.Next(0, 19); - bool isFree = true; for (int i = x; i < x + blockWidth; i++) { @@ -60,7 +57,6 @@ namespace AirplaneWithRadar isFree = false; break; } - } } if (isFree) diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs index d039dc7..8e7fd89 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs @@ -16,11 +16,11 @@ namespace AirplaneWithRadar /// public EntityAirplane Airplane { get; protected set; } /// - /// Левая координата отрисовки автомобиля + /// Левая координата отрисовки самолета /// protected float _startPosX; /// - /// Верхняя кооридната отрисовки автомобиля + /// Верхняя кооридната отрисовки самолета /// protected float _startPosY; /// @@ -32,18 +32,18 @@ namespace AirplaneWithRadar /// private int? _pictureHeight = null; /// - /// Ширина отрисовки автомобиля + /// Ширина отрисовки самолета /// private readonly int _airplaneWidth = 303; /// - /// Высота отрисовки автомобиля + /// Высота отрисовки самолета /// private readonly int _airplaneHeight = 108; /// /// Инициализация свойств /// /// Скорость - /// Вес автомобиля + /// Вес самолета /// Цвет кузова public DrawingAirplane(int speed, float weight, Color bodyColor) { @@ -53,10 +53,10 @@ namespace AirplaneWithRadar /// Инициализация свойств /// /// Скорость - /// Вес автомобиля + /// Вес самолета /// Цвет кузова - /// Ширина отрисовки автомобиля - /// Высота отрисовки автомобиля + /// Ширина отрисовки самолета + /// Высота отрисовки самолета protected DrawingAirplane(int speed, float weight, Color bodyColor, int airplaneWidth, int airplaneHeight) : this(speed, weight, bodyColor) { @@ -64,7 +64,7 @@ namespace AirplaneWithRadar _airplaneHeight = airplaneHeight; } /// - /// Установка позиции автомобиля + /// Установка позиции самолета /// /// Координата X /// Координата Y @@ -72,7 +72,6 @@ namespace AirplaneWithRadar /// Высота картинки public void SetPosition(int x, int y, int width, int height) { - // TODO checks if (x > 0 && x < width) { _startPosX = x; @@ -89,12 +88,6 @@ namespace AirplaneWithRadar { _pictureHeight = height; } - - - //_startPosX = x; - //_startPosY = y; - //_pictureWidth = width; - //_pictureHeight = height; } /// /// Изменение направления пермещения @@ -108,28 +101,24 @@ namespace AirplaneWithRadar } switch (direction) { - // вправо case Direction.Right: if (_startPosX + _airplaneWidth + Airplane.Step < _pictureWidth) { _startPosX += Airplane.Step; } break; - //влево case Direction.Left: if (_startPosX - Airplane.Step > 0) { _startPosX -= Airplane.Step; } break; - //вверх case Direction.Up: if (_startPosY - Airplane.Step > 0) { _startPosY -= Airplane.Step; } break; - //вниз case Direction.Down: if (_startPosY + _airplaneHeight + Airplane.Step < _pictureHeight) { @@ -139,7 +128,7 @@ namespace AirplaneWithRadar } } /// - /// Отрисовка автомобиля + /// Отрисовка самолета /// /// public virtual void DrawTransport(Graphics g) @@ -218,6 +207,5 @@ namespace AirplaneWithRadar { return (_startPosX, _startPosX + _airplaneWidth, _startPosY, _startPosY + _airplaneHeight); } - } } diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplaneWithRadar.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplaneWithRadar.cs index 9ce31b6..b959a73 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplaneWithRadar.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplaneWithRadar.cs @@ -12,16 +12,15 @@ namespace AirplaneWithRadar /// Инициализация свойств /// /// Скорость - /// Вес автомобиля + /// Вес самолета /// Цвет кузова /// Дополнительный цвет - /// Признак наличия обвеса - /// Признак наличия антикрыла + /// Признак наличия радара + /// Признак наличия дополнительных топливных баков public DrawingAirplaneWithRadar(int speed, float weight, Color bodyColor, Color dopColor, bool radar, bool extraFuelTank) : base(speed, weight, bodyColor, 304, 109) { Airplane = new EntityAirplaneWithRadar(speed, weight, bodyColor, dopColor, radar, extraFuelTank); } - public override void DrawTransport(Graphics g) { if (Airplane is not EntityAirplaneWithRadar airplaneWithRadar) @@ -30,7 +29,6 @@ namespace AirplaneWithRadar } Pen pen = new(Color.Black, 5); Brush dopBrush = new SolidBrush(airplaneWithRadar.DopColor); - if (airplaneWithRadar.Radar) { g.DrawLine(pen, _startPosX + 120, _startPosY + 30, _startPosX + 110, _startPosY + 60); @@ -43,15 +41,12 @@ namespace AirplaneWithRadar g.FillPolygon(dopBrush, radarPoints); g.DrawEllipse(pen, _startPosX + 85, _startPosY + 15, 90, 20); g.FillEllipse(dopBrush, _startPosX + 85, _startPosY + 15, 90, 20); - } - _startPosX += 10; _startPosY += 5; base.DrawTransport(g); _startPosX -= 10; _startPosY -= 5; - if (airplaneWithRadar.ExtraFuelTank) { g.DrawLine(pen, _startPosX + 145, _startPosY + 98, _startPosX + 145, _startPosY + 108); diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingObjectAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingObjectAirplane.cs index 08ac4fd..fcd2c62 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/DrawingObjectAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingObjectAirplane.cs @@ -30,6 +30,5 @@ namespace AirplaneWithRadar { _airplane.DrawTransport(g); } - } } diff --git a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs index eeb5690..3381c72 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; namespace AirplaneWithRadar { - /// /// Класс-сущность "Самолет" /// @@ -25,11 +24,11 @@ namespace AirplaneWithRadar /// public Color BodyColor { get; private set; } /// - /// Шаг перемещения автомобиля + /// Шаг перемещения самолета /// public float Step => Speed * 100 / Weight; /// - /// Инициализация полей объекта-класса автомобиля + /// Инициализация полей объекта-класса самолета /// /// /// @@ -42,8 +41,5 @@ namespace AirplaneWithRadar Weight = weight <= 0 ? rnd.Next(40, 70) : weight; BodyColor = bodyColor; } - - - } } diff --git a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs index 9026595..5c71fbd 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs @@ -13,29 +13,27 @@ namespace AirplaneWithRadar /// public Color DopColor { get; private set; } /// - /// Признак наличия обвеса + /// Признак наличия радара /// public bool Radar { get; private set; } /// - /// Признак наличия антикрыла + /// Признак наличия дополнительных топливных баков /// public bool ExtraFuelTank { get; private set; } /// /// Инициализация свойств /// /// Скорость - /// Вес автомобиля + /// Вес самолета /// Цвет кузова /// Дополнительный цвет - /// Признак наличия обвеса - /// Признак наличия антикрыла + /// Признак наличия радара + /// Признак наличия дополнительных топливных баков public EntityAirplaneWithRadar(int speed, float weight, Color bodyColor, Color dopColor, bool radar, bool extraFuelTank) : base(speed, weight, bodyColor) { DopColor = dopColor; Radar = radar; ExtraFuelTank = extraFuelTank; } - - } } diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.Designer.cs b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.Designer.cs index 0c78545..b57c74d 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.Designer.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.Designer.cs @@ -82,7 +82,6 @@ this.pictureBoxAirplane.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.pictureBoxAirplane.TabIndex = 1; this.pictureBoxAirplane.TabStop = false; - this.pictureBoxAirplane.Click += new System.EventHandler(this.pictureBoxAirplane_Click); // // buttonCreate // diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs index f93bb8a..8ee0358 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs @@ -3,14 +3,12 @@ namespace AirplaneWithRadar public partial class FormAirplaneWithRadar : Form { private DrawingAirplane _airplane; - public FormAirplaneWithRadar() { InitializeComponent(); } - /// - /// + /// /// private void Draw() { @@ -25,7 +23,6 @@ namespace AirplaneWithRadar private void SetData() { Random rnd = new(); - _airplane.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirplane.Width, pictureBoxAirplane.Height); toolStripStatusLabelSpeed.Text = $": {_airplane.Airplane.Speed}"; toolStripStatusLabelWeight.Text = $": {_airplane.Airplane.Weight}"; @@ -38,16 +35,18 @@ namespace AirplaneWithRadar /// private void ButtonCreate_Click(object sender, EventArgs e) { - Random rnd = new(); _airplane = new DrawingAirplane(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); SetData(); Draw(); } - + /// + /// + /// + /// + /// private void ButtonMove_Click(object sender, EventArgs e) { - // string name = ((Button)sender)?.Name ?? string.Empty; switch (name) { @@ -65,18 +64,6 @@ namespace AirplaneWithRadar break; } Draw(); - - } - - - private void FormAirplaneWithRadar_Load(object sender, EventArgs e) - { - - } - - private void pictureBoxAirplane_Click(object sender, EventArgs e) - { - } /// /// "" diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs index 49f17cc..a3f1674 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs @@ -21,7 +21,7 @@ namespace AirplaneWithRadar /// /// Заполнение информации по объекту /// - /// + /// private void SetData(DrawingAirplane airplane) { toolStripStatusLabelSpeed.Text = $"Скорость: {airplane.Airplane.Speed}"; @@ -39,12 +39,14 @@ namespace AirplaneWithRadar Random rnd = new(); var airplane = new DrawingAirplane(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); SetData(airplane); - } - + /// + /// Перемещение + /// + /// + /// private void ButtonMove_Click(object sender, EventArgs e) { - //получаем имя кнопки string name = ((Button)sender)?.Name ?? string.Empty; Direction dir = Direction.None; switch (name) @@ -63,9 +65,7 @@ namespace AirplaneWithRadar break; } pictureBoxAirplane.Image = _abstractMap?.MoveObject(dir); - } - /// /// Обработка нажатия кнопки "Модификация" /// @@ -77,15 +77,12 @@ namespace AirplaneWithRadar var airplane = new DrawingAirplaneWithRadar(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); SetData(airplane); - } - - - private void FormMap_Load(object sender, EventArgs e) - { - - } - + /// + /// Выбор карты + /// + /// + /// private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) { switch (comboBoxSelectorMap.Text) diff --git a/AirplaneWithRadar/AirplaneWithRadar/LineMap.cs b/AirplaneWithRadar/AirplaneWithRadar/LineMap.cs index f26f73d..28fc0d0 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/LineMap.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/LineMap.cs @@ -32,7 +32,6 @@ namespace AirplaneWithRadar _map = new int[100, 100]; _size_x = (float)_width / _map.GetLength(0); _size_y = (float)_height / _map.GetLength(1); - //int counter = 0; for (int i = 0; i < _map.GetLength(0); ++i) { for (int j = 0; j < _map.GetLength(1); ++j) @@ -40,10 +39,7 @@ namespace AirplaneWithRadar _map[i, j] = _freeRoad; } } - - int counter; - for (int j = 0; j < _map.GetLength(1); j++) { int startX = _random.Next(0, 80); @@ -59,7 +55,6 @@ namespace AirplaneWithRadar } j += 3; } - } } } diff --git a/AirplaneWithRadar/AirplaneWithRadar/Program.cs b/AirplaneWithRadar/AirplaneWithRadar/Program.cs index f8a0be0..e51b6fc 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/Program.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/Program.cs @@ -8,8 +8,6 @@ namespace AirplaneWithRadar [STAThread] static void Main() { - // To customize application configuration such as set high DPI settings or default font, - // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); Application.Run(new FormMap()); } -- 2.25.1 From e4d8c8d13541c5b051cf767202276dd1199038b8 Mon Sep 17 00:00:00 2001 From: Anastasia Date: Thu, 8 Dec 2022 20:45:14 +0400 Subject: [PATCH 9/9] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F?= =?UTF-8?q?=20=D0=B2=D1=82=D0=BE=D1=80=D0=B0=D1=8F=20=D0=BB=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs | 3 +-- AirplaneWithRadar/AirplaneWithRadar/LineMap.cs | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs index 8e7fd89..475668b 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs @@ -57,8 +57,7 @@ namespace AirplaneWithRadar /// Цвет кузова /// Ширина отрисовки самолета /// Высота отрисовки самолета - protected DrawingAirplane(int speed, float weight, Color bodyColor, int airplaneWidth, int airplaneHeight) : - this(speed, weight, bodyColor) + protected DrawingAirplane(int speed, float weight, Color bodyColor, int airplaneWidth, int airplaneHeight) : this(speed, weight, bodyColor) { _airplaneWidth = airplaneWidth; _airplaneHeight = airplaneHeight; diff --git a/AirplaneWithRadar/AirplaneWithRadar/LineMap.cs b/AirplaneWithRadar/AirplaneWithRadar/LineMap.cs index 28fc0d0..3c1ae33 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/LineMap.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/LineMap.cs @@ -6,9 +6,6 @@ using System.Threading.Tasks; namespace AirplaneWithRadar { - /// - /// Собственная реализация абсрактного класса AbstractMap - /// internal class LineMap : AbstractMap { /// -- 2.25.1