From 648707cd8488b4eab48fb52db9ed1dd8e9005838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B0=D0=B2=D0=B5=D0=BB=20=D0=9F=D1=83=D1=82=D0=B8?= =?UTF-8?q?=D0=BB=D0=B8=D0=BD?= Date: Tue, 4 Oct 2022 21:03:34 +0400 Subject: [PATCH 1/3] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AirplaneWithRadar/DrawingAirplane.cs | 31 ++++++++--- .../DrawningAirplaneWithRadar.cs | 53 +++++++++++++++++++ .../AirplaneWithRadar/EntityAirplane.cs | 2 +- .../EntityAirplaneWithRadar.cs | 41 ++++++++++++++ .../FormAirplane.Designer.cs | 15 +++++- .../AirplaneWithRadar/FormAirplane.cs | 46 ++++++++++++---- 6 files changed, 169 insertions(+), 19 deletions(-) create mode 100644 AirplaneWithRadar/AirplaneWithRadar/DrawningAirplaneWithRadar.cs create mode 100644 AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs index 2ded9de..26e50e6 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs @@ -9,15 +9,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; /// /// Ширина окна отрисовки /// @@ -40,11 +40,27 @@ namespace AirplaneWithRadar /// Скорость /// Вес /// Цвет - public void Init(int speed, float weight, Color bodyColor) + public DrawningAirplane(int speed, float weight, Color bodyColor) { - Airplane = new EntityAirplane(); - Airplane.Init(speed, weight, bodyColor); + Airplane = new EntityAirplane(speed, weight, bodyColor); } + + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес самолёта + /// Цвет кузова + /// Ширина отрисовки самолёта + /// Высота отрисовки самолёта + protected DrawningAirplane(int speed, float weight, Color bodyColor, int + airplaneWidth, int airplaneHeight) : + this(speed, weight, bodyColor) + { + _airplaneWidth = airplaneWidth; + _airplaneHeight = airplaneHeight; + } + /// /// Установка позиции /// @@ -52,6 +68,7 @@ namespace AirplaneWithRadar /// Координата Y /// Ширина картинки /// Высота картинки + public void SetPosition(int x, int y, int width, int height) { _startPosX = x; @@ -111,7 +128,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/DrawningAirplaneWithRadar.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawningAirplaneWithRadar.cs new file mode 100644 index 0000000..a44612d --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawningAirplaneWithRadar.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using static System.Windows.Forms.VisualStyles.VisualStyleElement; + +namespace AirplaneWithRadar +{ + internal class DrawningAirplaneWithRadar : DrawningAirplane + { + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес автомобиля + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия радара + /// Признак наличия дополнительных топливных баков + public DrawningAirplaneWithRadar(int speed, float weight, Color bodyColor, Color +dopColor, bool radar, bool fuelTanks) : + base(speed, weight, bodyColor, 100, 10) + { + Airplane = new EntityAirplaneWithRadar(speed, weight, bodyColor, dopColor, radar, fuelTanks); + } + + public override void DrawTransport(Graphics g) + { + if (Airplane is not EntityAirplaneWithRadar airplaneWithRadar) + { + return; + } + Pen pen = new(Color.Black); + Brush dopBrush = new SolidBrush(airplaneWithRadar.DopColor); + if (airplaneWithRadar.Radar) + { + g.FillEllipse(dopBrush, _startPosX + 40, _startPosY, 20, 5); + g.DrawLine(pen, _startPosX + 43, _startPosY + 4, _startPosX + 43, _startPosY + 7); + g.DrawLine(pen, _startPosX + 57, _startPosY + 4, _startPosX + 57, _startPosY + 7); + } + _startPosX += 10; + _startPosY += 5; + base.DrawTransport(g); + _startPosX -= 10; + _startPosY -= 5; + if (airplaneWithRadar.FuelTanks) + { + g.FillEllipse(dopBrush, _startPosX + 35, _startPosY + 13, 30, 5); + } + } + } +} diff --git a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs index ef80d96..4682efc 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs @@ -29,7 +29,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/EntityAirplaneWithRadar.cs b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs new file mode 100644 index 0000000..3ce6d0d --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs @@ -0,0 +1,41 @@ +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 FuelTanks { get; private set; } + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес самолёта + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия радара + /// Признак наличия дополнительных топливных баков + public EntityAirplaneWithRadar(int speed, float weight, Color bodyColor, Color + dopColor, bool radar, bool fuelTanks) : + base(speed, weight, bodyColor) + { + DopColor = dopColor; + Radar = radar; + FuelTanks = fuelTanks; + } + } +} diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.Designer.cs b/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.Designer.cs index 5cd3dbb..b0dc9d2 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.Designer.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.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.statusStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).BeginInit(); this.SuspendLayout(); @@ -89,7 +90,7 @@ 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, 395); this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(75, 23); + this.buttonCreate.Size = new System.Drawing.Size(96, 23); this.buttonCreate.TabIndex = 2; this.buttonCreate.Text = "Создать"; this.buttonCreate.UseVisualStyleBackColor = true; @@ -143,11 +144,22 @@ this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(12, 366); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(96, 23); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click); + // // FormAirplane // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); 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); @@ -177,5 +189,6 @@ private Button buttonLeft; private Button buttonDown; private Button buttonRight; + private Button buttonCreateModif; } } \ No newline at end of file diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.cs index 3be033f..bc1643b 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.cs @@ -9,14 +9,15 @@ namespace AirplaneWithRadar InitializeComponent(); } - /// - /// - /// private void pictureBoxAirplane_Click(object sender, EventArgs e) { } + + /// + /// + /// private void Draw() { Bitmap bmp = new(pictureBoxAirplane.Width, pictureBoxAirplane.Height); @@ -24,22 +25,30 @@ namespace AirplaneWithRadar _airplane?.DrawTransport(gr); pictureBoxAirplane.Image = bmp; } + + /// + /// + /// + private void SetData() + { + Random rnd = new(); + _airplane.SetPosition(rnd.Next(20, 100), rnd.Next(20, 100), pictureBoxAirplane.Width, pictureBoxAirplane.Height); + toolStripStatusLabelSpeed.Text = $": {_airplane.Airplane.Speed}"; + toolStripStatusLabelWeight.Text = $": {_airplane.Airplane.Weight}"; + toolStripStatusLabelBodyColor.Text = $": {_airplane.Airplane.BodyColor.Name}"; + } + /// /// "" /// /// /// /// - private void buttonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _airplane = new DrawningAirplane(); - _airplane.Init(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(20, 100), rnd.Next(20, 100), pictureBoxAirplane.Width, pictureBoxAirplane.Height); - toolStripStatusLabelSpeed.Text = $": {_airplane.Airplane.Speed}"; - toolStripStatusLabelWeight.Text = $": {_airplane.Airplane.Weight}"; - toolStripStatusLabelBodyColor.Text = $": {_airplane.Airplane.BodyColor.Name}"; + _airplane = new DrawningAirplane(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(); Draw(); } @@ -79,5 +88,22 @@ namespace AirplaneWithRadar _airplane?.ChangeBorders(pictureBoxAirplane.Width, pictureBoxAirplane.Height); Draw(); } + + /// + /// "" + /// + /// + /// + private void buttonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + _airplane = new DrawningAirplaneWithRadar(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 From 5a90c4d77bfceec8c0e26c77479a3fa886c0527b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B0=D0=B2=D0=B5=D0=BB=20=D0=9F=D1=83=D1=82=D0=B8?= =?UTF-8?q?=D0=BB=D0=B8=D0=BD?= Date: Wed, 5 Oct 2022 01:52:57 +0400 Subject: [PATCH 2/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=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 | 121 ++++++++++ .../AirplaneWithRadar/Direction.cs | 1 + .../AirplaneWithRadar/DrawingAirplane.cs | 46 ++-- .../DrawningAirplaneWithRadar.cs | 14 +- .../DrawningObjectAirplane.cs | 35 +++ .../FormAirplane.Designer.cs | 5 +- .../AirplaneWithRadar/FormAirplane.cs | 10 +- .../AirplaneWithRadar/FormMap.Designer.cs | 208 ++++++++++++++++++ .../AirplaneWithRadar/FormMap.cs | 104 +++++++++ .../AirplaneWithRadar/FormMap.resx | 63 ++++++ .../AirplaneWithRadar/IDrawningObject.cs | 40 ++++ AirplaneWithRadar/AirplaneWithRadar/MyMap.cs | 54 +++++ .../AirplaneWithRadar/Program.cs | 2 +- .../AirplaneWithRadar/SimpleMap.cs | 52 +++++ 14 files changed, 717 insertions(+), 38 deletions(-) create mode 100644 AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs create mode 100644 AirplaneWithRadar/AirplaneWithRadar/DrawningObjectAirplane.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/IDrawningObject.cs create mode 100644 AirplaneWithRadar/AirplaneWithRadar/MyMap.cs 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..8fbbabd --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs @@ -0,0 +1,121 @@ +using Microsoft.Win32; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirplaneWithRadar +{ + internal abstract class AbstractMap + { + private IDrawningObject _drawningObject = 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, IDrawningObject drawningObject) + { + _width = width; + _height = height; + _drawningObject = drawningObject; + GenerateMap(); + while (!SetObjectOnMap()) + { + GenerateMap(); + } + return DrawMapWithObject(); + } + private bool HasCollisionBarrier(float x, float y, float right, float bottom) + { + if (x < 0 || y < 0 || right > _width || bottom > _height) + { + return false; + } + for (float i = x / _size_x; i < right / _size_x; i++) + { + for (float j = y / _size_y; j < bottom / _size_y; j++) + { + if (_map[(int)i, (int)j] == _barrier) + { + return true; + } + } + } + return false; + } + public Bitmap MoveObject(Direction direction) + { + (float left, float top, float right, float bottom) = _drawningObject.GetCurrentPosition(); + float width = right - left, height = bottom - top; + if (direction == Direction.Up) + { + top -= _drawningObject.Step; + } + if (direction == Direction.Down) + { + top += _drawningObject.Step; + } + if (direction == Direction.Left) + { + left -= _drawningObject.Step; + } + if (direction == Direction.Right) + { + left += _drawningObject.Step; + } + if (!HasCollisionBarrier(left, top, left+width, top+height)) + { + _drawningObject.MoveObject(direction); + } + return DrawMapWithObject(); + } + + private bool SetObjectOnMap() + { + if (_drawningObject == null || _map == null) + { + return false; + } + int x = _random.Next(0, 100); + int y = _random.Next(0, 100); + _drawningObject.SetObject(x, y, _width, _height); + (float left, float top, float right, float bottom) = _drawningObject.GetCurrentPosition(); + + return !HasCollisionBarrier(x, y, right, bottom); + } + private Bitmap DrawMapWithObject() + { + Bitmap bmp = new(_width, _height); + if (_drawningObject == 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); + } + } + + } + _drawningObject.DrawningObject(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); + } +} \ No newline at end of file diff --git a/AirplaneWithRadar/AirplaneWithRadar/Direction.cs b/AirplaneWithRadar/AirplaneWithRadar/Direction.cs index b06f00b..6d2d2e4 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/Direction.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/Direction.cs @@ -6,6 +6,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 26e50e6..4b5a8ff 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs @@ -33,7 +33,7 @@ namespace AirplaneWithRadar /// /// Высота отрисовки самолёта /// - private readonly int _airplaneHeight = 10; + private readonly int _airplaneHeight = 20; /// /// Инициализация свойств /// @@ -137,38 +137,39 @@ namespace AirplaneWithRadar } Pen pen = new(Color.Black); Brush brush = new SolidBrush(Airplane.BodyColor); + int h = 10; + _startPosY += 4; //корпус - g.DrawRectangle(pen, _startPosX, _startPosY + _airplaneHeight-7, - _airplaneWidth-5, _airplaneHeight); + g.DrawRectangle(pen, _startPosX, _startPosY + h-7, _airplaneWidth-15, h); //нос PointF[] point = new PointF[3]; - point[0] = new PointF(_startPosX + _airplaneWidth-5, _startPosY + _airplaneHeight / 3); - point[1] = new PointF(_startPosX + _airplaneWidth+10 , _startPosY + _airplaneHeight-3); - point[2] = new PointF(_startPosX + _airplaneWidth-5, _startPosY + _airplaneHeight + (_airplaneHeight / 3)); + point[0] = new PointF(_startPosX + _airplaneWidth-15, _startPosY + h / 3); + point[1] = new PointF(_startPosX + _airplaneWidth , _startPosY + h-3); + point[2] = new PointF(_startPosX + _airplaneWidth-15, _startPosY + h + (h / 3)); g.FillPolygon(brush, point); //хвост point = new PointF[3]; point[0] = new PointF(_startPosX, _startPosY-10); - point[1] = new PointF(_startPosX, _startPosY + _airplaneHeight / 3); - point[2] = new PointF(_startPosX + 15, _startPosY + _airplaneHeight / 3); + point[1] = new PointF(_startPosX, _startPosY + h / 3); + point[2] = new PointF(_startPosX + 15, _startPosY + h / 3); g.FillPolygon(brush, point); //крылья - g.DrawLine(pen, _startPosX + 20, _startPosY + _airplaneHeight - 3, _startPosX + 60, _startPosY + _airplaneHeight - 3); - g.DrawLine(pen, _startPosX + 20, _startPosY + _airplaneHeight - 2, _startPosX + 60, _startPosY + _airplaneHeight - 2); + g.DrawLine(pen, _startPosX + 20, _startPosY + h - 3, _startPosX + 60, _startPosY + h - 3); + g.DrawLine(pen, _startPosX + 20, _startPosY + h - 2, _startPosX + 60, _startPosY + h - 2); - g.DrawLine(pen, _startPosX-1, _startPosY + _airplaneHeight / 3, _startPosX + 15, _startPosY + _airplaneHeight / 3); - g.DrawLine(pen, _startPosX-1, _startPosY + _airplaneHeight / 3 + 1, _startPosX + 15, _startPosY + _airplaneHeight / 3 + 1); - g.DrawLine(pen, _startPosX-1, _startPosY + _airplaneHeight / 3 + 2, _startPosX + 15, _startPosY + _airplaneHeight / 3 + 2); + g.DrawLine(pen, _startPosX-1, _startPosY + h / 3, _startPosX + 15, _startPosY + h / 3); + g.DrawLine(pen, _startPosX-1, _startPosY + h / 3 + 1, _startPosX + 15, _startPosY + h / 3 + 1); + g.DrawLine(pen, _startPosX-1, _startPosY + h / 3 + 2, _startPosX + 15, _startPosY + h / 3 + 2); //колёса - g.DrawRectangle(pen, _startPosX + 20, _startPosY + _airplaneHeight + (_airplaneHeight / 3), 2, 2); - g.DrawRectangle(pen, _startPosX + 24, _startPosY + _airplaneHeight + (_airplaneHeight / 3), 2, 2); - g.DrawRectangle(pen, _startPosX + _airplaneWidth-20, _startPosY + _airplaneHeight + (_airplaneHeight / 3), 2, 2); - + g.DrawRectangle(pen, _startPosX + 20, _startPosY + h + (h / 3), 2, 2); + g.DrawRectangle(pen, _startPosX + 24, _startPosY + h + (h / 3), 2, 2); + g.DrawRectangle(pen, _startPosX + _airplaneWidth-20, _startPosY + h + (h / 3), 2, 2); + _startPosY -= 4; } /// /// Смена границ формы отрисовки @@ -194,6 +195,17 @@ namespace AirplaneWithRadar _startPosY = _pictureHeight.Value - _airplaneHeight; } } + /// + /// Получение текущей позиции объекта + /// + /// + public (float Left, float Top, float Right, float Bottom) + GetCurrentPosition() + { + return (_startPosX, _startPosY, _startPosX + _airplaneWidth, _startPosY + + _airplaneHeight); + } + } } diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawningAirplaneWithRadar.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawningAirplaneWithRadar.cs index a44612d..d454488 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/DrawningAirplaneWithRadar.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawningAirplaneWithRadar.cs @@ -20,7 +20,7 @@ namespace AirplaneWithRadar /// Признак наличия дополнительных топливных баков public DrawningAirplaneWithRadar(int speed, float weight, Color bodyColor, Color dopColor, bool radar, bool fuelTanks) : - base(speed, weight, bodyColor, 100, 10) + base(speed, weight, bodyColor, 100, 20) { Airplane = new EntityAirplaneWithRadar(speed, weight, bodyColor, dopColor, radar, fuelTanks); } @@ -35,18 +35,14 @@ dopColor, bool radar, bool fuelTanks) : Brush dopBrush = new SolidBrush(airplaneWithRadar.DopColor); if (airplaneWithRadar.Radar) { - g.FillEllipse(dopBrush, _startPosX + 40, _startPosY, 20, 5); - g.DrawLine(pen, _startPosX + 43, _startPosY + 4, _startPosX + 43, _startPosY + 7); - g.DrawLine(pen, _startPosX + 57, _startPosY + 4, _startPosX + 57, _startPosY + 7); + g.FillEllipse(dopBrush, _startPosX + 30, _startPosY, 20, 5); + g.DrawLine(pen, _startPosX + 33, _startPosY + 4, _startPosX + 33, _startPosY + 7); + g.DrawLine(pen, _startPosX + 47, _startPosY + 4, _startPosX + 47, _startPosY + 7); } - _startPosX += 10; - _startPosY += 5; base.DrawTransport(g); - _startPosX -= 10; - _startPosY -= 5; if (airplaneWithRadar.FuelTanks) { - g.FillEllipse(dopBrush, _startPosX + 35, _startPosY + 13, 30, 5); + g.FillEllipse(dopBrush, _startPosX + 25, _startPosY + 12, 30, 5); } } } diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawningObjectAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawningObjectAirplane.cs new file mode 100644 index 0000000..b5bd95a --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/DrawningObjectAirplane.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 DrawningObjectAirplane : IDrawningObject + { + private DrawningAirplane _airplane = null; + public DrawningObjectAirplane(DrawningAirplane airplane) + { + _airplane = airplane; + } + public float Step => _airplane?.Airplane?.Step ?? 0; + public (float Left, float Top, float Right, 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 DrawningObject(Graphics g) + { + _airplane.DrawTransport(g); + } + } +} diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.Designer.cs b/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.Designer.cs index b0dc9d2..d33f6ef 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.Designer.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.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); this.pictureBoxAirplane.Resize += new System.EventHandler(this.PictureBoxAirplane_Resize); // // buttonCreate @@ -94,7 +93,7 @@ this.buttonCreate.TabIndex = 2; this.buttonCreate.Text = "Создать"; this.buttonCreate.UseVisualStyleBackColor = true; - this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click); + this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); // // buttonUp // @@ -152,7 +151,7 @@ this.buttonCreateModif.TabIndex = 7; this.buttonCreateModif.Text = "Модификация"; this.buttonCreateModif.UseVisualStyleBackColor = true; - this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click); + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); // // FormAirplane // diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.cs index bc1643b..28368c0 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormAirplane.cs @@ -9,12 +9,6 @@ namespace AirplaneWithRadar InitializeComponent(); } - - private void pictureBoxAirplane_Click(object sender, EventArgs e) - { - - } - /// /// /// @@ -44,7 +38,7 @@ namespace AirplaneWithRadar /// /// /// - private void buttonCreate_Click(object sender, EventArgs e) + private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); _airplane = new DrawningAirplane(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); @@ -94,7 +88,7 @@ namespace AirplaneWithRadar /// /// /// - private void buttonCreateModif_Click(object sender, EventArgs e) + private void ButtonCreateModif_Click(object sender, EventArgs e) { Random rnd = new(); _airplane = new DrawningAirplaneWithRadar(rnd.Next(100, 300), rnd.Next(1000, 2000), diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs new file mode 100644 index 0000000..ed4f43d --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs @@ -0,0 +1,208 @@ +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.statusStrip1 = 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.statusStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).BeginInit(); + this.SuspendLayout(); + // + // statusStrip1 + // + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelBodyColor}); + this.statusStrip1.Location = new System.Drawing.Point(0, 428); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(800, 22); + this.statusStrip1.TabIndex = 0; + this.statusStrip1.Text = "statusStrip1"; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17); + this.toolStripStatusLabelSpeed.Text = "Скорость:"; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(29, 17); + this.toolStripStatusLabelWeight.Text = "Вес:"; + // + // toolStripStatusLabelBodyColor + // + this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17); + 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, 428); + 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, 395); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(96, 23); + 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.arrUp; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(722, 359); + 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.arrLeft; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(686, 395); + 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.arrDown; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(722, 395); + 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.arrRight; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(758, 395); + 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(12, 366); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(96, 23); + 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(27, 34); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23); + this.comboBoxSelectorMap.TabIndex = 8; + this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); + // + // FormMap + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.comboBoxSelectorMap); + 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.Controls.Add(this.statusStrip1); + this.Name = "FormMap"; + this.Text = "FormMap"; + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private StatusStrip statusStrip1; + 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..eb81131 --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs @@ -0,0 +1,104 @@ +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(DrawningAirplane 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 DrawningObjectAirplane(airplane)); + } + + + /// + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + var airplane = new DrawningAirplane(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 DrawningAirplaneWithRadar(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 ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + case "Моя карта": + _abstractMap = new MyMap(); + break; + } + } + } +} diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMap.resx b/AirplaneWithRadar/AirplaneWithRadar/FormMap.resx new file mode 100644 index 0000000..5cb320f --- /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/IDrawningObject.cs b/AirplaneWithRadar/AirplaneWithRadar/IDrawningObject.cs new file mode 100644 index 0000000..98e8a7f --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/IDrawningObject.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirplaneWithRadar +{ + internal interface IDrawningObject + { + /// + /// Шаг перемещения объекта + /// + public float Step { get; } + /// + /// Установка позиции объекта + /// + /// Координата X + /// Координата Y + /// Ширина полотна + /// Высота полотна + void SetObject(int x, int y, int width, int height); + /// + /// Изменение направления пермещения объекта + /// + /// Направление + void MoveObject(Direction direction); + /// + /// Отрисовка объекта + /// + /// + void DrawningObject(Graphics g); + /// + /// Получение текущей позиции объекта + /// + /// + (float Left, float Top, float Right, float Bottom) + GetCurrentPosition(); + } +} diff --git a/AirplaneWithRadar/AirplaneWithRadar/MyMap.cs b/AirplaneWithRadar/AirplaneWithRadar/MyMap.cs new file mode 100644 index 0000000..ba2953c --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/MyMap.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirplaneWithRadar +{ + internal class MyMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Brown); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.BlueViolet); + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y); + } + 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 < 20) + { + int x = _random.Next(0, _map.GetLength(0)); + int y = _random.Next(0, _map.GetLength(1)); + int len = _random.Next(3, 10); + for (int i = x; i < _map.GetLength(0) && i < len + x; i++) + { + + _map[i, y] = _barrier; + } + counter++; + } + } + } +} diff --git a/AirplaneWithRadar/AirplaneWithRadar/Program.cs b/AirplaneWithRadar/AirplaneWithRadar/Program.cs index 319f64d..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 FormAirplane()); + 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..5e942ad --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/SimpleMap.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirplaneWithRadar +{ + 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, _size_x, _size_y); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y); + } + 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++; + } + } + } + } +} \ No newline at end of file From 74bd8f9924d87e4c44680ec25d268867de5bd807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B0=D0=B2=D0=B5=D0=BB=20=D0=9F=D1=83=D1=82=D0=B8?= =?UTF-8?q?=D0=BB=D0=B8=D0=BD?= Date: Tue, 18 Oct 2022 20:30:54 +0400 Subject: [PATCH 3/3] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirplaneWithRadar/AirplaneWithRadar/FormMap.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs index eb81131..d079a8d 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs @@ -21,7 +21,7 @@ namespace AirplaneWithRadar /// /// Заполнение информации по объекту /// - /// + /// private void SetData(DrawningAirplane airplane) { toolStripStatusLabelSpeed.Text = $"Скорость: {airplane.Airplane.Speed}";