From 4fe6f533bf3f0d27c2f7066ad15c0bb06fd4bde7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BE=D0=BB=D0=BE=D0=B4=D1=8F?= Date: Mon, 26 Sep 2022 08:45:26 +0300 Subject: [PATCH 1/4] =?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/DrawingPlain.cs | 24 +++++++++++++------ .../AirPlaneWithRadar/EntetyPlain.cs | 11 +++++---- .../AirPlaneWithRadar/FormPlain.cs | 4 ++-- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs index 90f15b4..0b0acdd 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs @@ -16,11 +16,11 @@ namespace AirPlaneWithRadar private int? pictureHeight = null; protected readonly int plainWidth = 120; protected readonly int plainHeight =70; - public void Init (int speed, float weight, Color bodycolor) + public DrawingPlain(int speed, float weight, Color bodycolor) { - Plain = new EntetyPlain (); - Plain.Init (speed, weight, bodycolor); + Plain = new EntetyPlain(speed, weight, bodycolor); } + public void setPosition(int x,int y,int width,int height) { if (x + plainWidth > width || y + plainHeight > height || plainHeight > height || plainWidth > width || x <0 || y<0) @@ -66,27 +66,37 @@ namespace AirPlaneWithRadar } Pen pen = new Pen(Color.Black); - + + g.DrawRectangle(pen, startPosX, startPosY, 20, 30); g.DrawRectangle(pen, startPosX, startPosY + 30, 100, 30); g.DrawRectangle(pen, startPosX+100, startPosY + 40, 20, 15); - + //koleso1 g.DrawRectangle(pen, startPosX + 30, startPosY + 60, 5, 10); g.DrawEllipse(pen, startPosX+28, startPosY+70, 9, 9); - + //koleso2 g.DrawRectangle(pen, startPosX + 80, startPosY + 60, 5, 10); g.DrawEllipse(pen, startPosX + 78, startPosY + 70, 9, 9); - + + //Korpys Brush br = new SolidBrush(Plain?.BodyColor ?? Color.Black); g.FillRectangle(br, startPosX+3, startPosY + 33, 94, 24); g.FillRectangle(br, startPosX+1, startPosY+1, 19, 29); + + //krilya Brush brWings = new SolidBrush(Color.Black); g.FillRectangle(brWings, startPosX + 30, startPosY + 40, 40, 8); + + //cabina Brush brCabine = new SolidBrush(Color.Blue); g.FillRectangle(brCabine, startPosX + 101, startPosY + 41, 19, 14); + + + + } public void ChangeBorders(int width, int height) diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/EntetyPlain.cs b/AirPlaneWithRadar/AirPlaneWithRadar/EntetyPlain.cs index 1694c17..48af56c 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/EntetyPlain.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/EntetyPlain.cs @@ -14,13 +14,14 @@ namespace AirPlaneWithRadar public Color BodyColor { get; private set; } public float Step => Speed * 100 / Weight; - public void Init (int speed, float weight, Color bodycolor) + public EntetyPlain(int speed, float weight, Color bodyColor) { Random rd = new Random(); - - Speed = speed <= 0 ? rd.Next(50,150):speed; - Weight = weight <= 0 ? rd.Next(40, 70) :weight; - BodyColor = bodycolor; + Speed = speed <= 0 ? rd.Next(50, 150) : speed; + Weight = weight <= 0 ? rd.Next(40, 70) : weight; + BodyColor = bodyColor; } + + } } diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs index 52158d0..25cdcc4 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs @@ -22,9 +22,9 @@ namespace AirPlaneWithRadar private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _plain = new DrawingPlain(); + _plain = new DrawingPlain(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - _plain.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + _plain.setPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxPlain.Width, pictureBoxPlain.Height); toolStripStatusLabelSpeed.Text = $": {_plain.Plain.Speed}"; toolStripStatusLabelWeight.Text = $": {_plain.Plain.Weight}"; From 3c588583d48ba35efe7f327a6b46171799d6df7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BE=D0=BB=D0=BE=D0=B4=D1=8F?= Date: Mon, 26 Sep 2022 20:21:39 +0300 Subject: [PATCH 2/4] =?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/DrawingPlain.cs | 16 +++++--- .../AirPlaneWithRadar/DrawingRadarPlane.cs | 41 +++++++++++++++++++ .../AirPlaneWithRadar/FormPlain.Designer.cs | 13 ++++++ .../AirPlaneWithRadar/FormPlain.cs | 30 +++++++++++--- .../AirPlaneWithRadar/RadioPlane.cs | 21 ++++++++++ 5 files changed, 110 insertions(+), 11 deletions(-) create mode 100644 AirPlaneWithRadar/AirPlaneWithRadar/DrawingRadarPlane.cs create mode 100644 AirPlaneWithRadar/AirPlaneWithRadar/RadioPlane.cs diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs index 0b0acdd..5ca6b12 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs @@ -9,17 +9,23 @@ namespace AirPlaneWithRadar { internal class DrawingPlain { - public EntetyPlain Plain { get; private set; } - private float startPosX; - private float startPosY; + public EntetyPlain Plain { get; protected set; } + protected float startPosX; + protected float startPosY; private int? pictureWidth = null; private int? pictureHeight = null; protected readonly int plainWidth = 120; - protected readonly int plainHeight =70; + protected readonly int plainHeight = 70; public DrawingPlain(int speed, float weight, Color bodycolor) { Plain = new EntetyPlain(speed, weight, bodycolor); } + protected DrawingPlain(int speed, float weight,Color bodyColor,int plainWidth,int plainHeight): + this(speed,weight, bodyColor) + { + this.plainWidth = plainWidth; + this.plainHeight = plainHeight; + } public void setPosition(int x,int y,int width,int height) { @@ -58,7 +64,7 @@ namespace AirPlaneWithRadar break; } } - public void DrawTransoprt (Graphics g) + public virtual void DrawTransoprt (Graphics g) { if(startPosX < 0 || startPosY < 0 || !pictureHeight.HasValue || !pictureWidth.HasValue) { diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingRadarPlane.cs b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingRadarPlane.cs new file mode 100644 index 0000000..9747a0e --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingRadarPlane.cs @@ -0,0 +1,41 @@ +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 DrawingRadarPlane : DrawingPlain + { + public DrawingRadarPlane(int speed, float weight, Color bodyColor,Color dopColor, bool radar, bool oilBox) : base(speed, weight, bodyColor, 110, 60) + { + Plain = new RadioPlane(speed, weight, bodyColor, dopColor, radar, oilBox); + } + public override void DrawTransoprt(Graphics g) + { + if(Plain is not RadioPlane radioPlane) + { + return; + } + Pen pen = new(Color.Black); + Brush doBrush = new SolidBrush(radioPlane.DopColor); + base.DrawTransoprt(g); + if (radioPlane.OilBox) + { + g.DrawRectangle(pen, startPosX + 40, startPosY + 48, 20, 10); + g.FillRectangle(doBrush, startPosX + 40, startPosY + 48, 20, 10); + + g.DrawRectangle(pen, startPosX , startPosY+15, 30, 10); + g.FillRectangle(doBrush, startPosX, startPosY + 15, 30, 10); + } + if (radioPlane.Radar) + { + g.FillRectangle(doBrush, startPosX + 55, startPosY + 20, 10, 10); + g.FillEllipse(doBrush, startPosX + 40, startPosY + 13, 40, 10); + } + + } + } +} diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.Designer.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.Designer.cs index 03e91d1..91f6fb9 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.Designer.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.Designer.cs @@ -38,6 +38,7 @@ this.buttonDown = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); this.ButtonCreate = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlain)).BeginInit(); this.statusStrip.SuspendLayout(); this.SuspendLayout(); @@ -146,11 +147,22 @@ this.ButtonCreate.UseVisualStyleBackColor = true; this.ButtonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(125, 259); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(134, 29); + this.buttonCreateModif.TabIndex = 8; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click); + // // FormPlain // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(535, 318); + this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.ButtonCreate); this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonDown); @@ -180,5 +192,6 @@ private Button buttonRight; public ToolStripStatusLabel toolStripStatusLabelSpeed; private Button ButtonCreate; + private Button buttonCreateModif; } } \ No newline at end of file diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs index 25cdcc4..8ab85cd 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs @@ -18,17 +18,22 @@ namespace AirPlaneWithRadar _plain?.DrawTransoprt(gr); pictureBoxPlain.Image = bmp; } - + private void SetData() + { + Random rnd = new(); + _plain.setPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxPlain.Width, pictureBoxPlain.Height); + toolStripStatusLabelSpeed.Text = $": {_plain.Plain.Speed}"; + toolStripStatusLabelWeight.Text = $": {_plain.Plain.Weight}"; + toolStripStatusLabelColor.Text = $": {_plain.Plain.BodyColor.Name}"; + } private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); _plain = new DrawingPlain(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - _plain.setPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxPlain.Width, pictureBoxPlain.Height); - toolStripStatusLabelSpeed.Text = $": {_plain.Plain.Speed}"; - toolStripStatusLabelWeight.Text = $": {_plain.Plain.Weight}"; - toolStripStatusLabelColor.Text = $": {_plain.Plain.BodyColor.Name}"; + + SetData(); Draw(); } private void ButtonMove_Click(object sender, EventArgs e) @@ -57,8 +62,21 @@ namespace AirPlaneWithRadar _plain?.ChangeBorders(pictureBoxPlain.Width, pictureBoxPlain.Height); Draw(); } - + private void buttonCreateModif_Click(object sender, EventArgs e) + { + + Random rnd = new(); + _plain = new DrawingRadarPlane(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(); + } } } diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/RadioPlane.cs b/AirPlaneWithRadar/AirPlaneWithRadar/RadioPlane.cs new file mode 100644 index 0000000..294a489 --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/RadioPlane.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirPlaneWithRadar +{ + internal class RadioPlane : EntetyPlain + { + public Color DopColor { get; set; } + public bool Radar { get; set; } + public bool OilBox { get; set; } + public RadioPlane(int speed, float weight, Color bodyColor, Color dopColor, bool radar, bool oilBox) : base(speed, weight, bodyColor) + { + DopColor = dopColor; + Radar = radar; + OilBox = oilBox; + } + } +} From 82c8174312363371973bc18f3854abd639c5199e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BE=D0=BB=D0=BE=D0=B4=D1=8F?= Date: Mon, 26 Sep 2022 20:30:30 +0300 Subject: [PATCH 3/4] =?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/DrawingObject.cs | 40 +++++++++++++++++++ .../AirPlaneWithRadar/DrawingPlain.cs | 4 ++ .../AirPlaneWithRadar/IDrawingObject.cs | 19 +++++++++ 3 files changed, 63 insertions(+) create mode 100644 AirPlaneWithRadar/AirPlaneWithRadar/DrawingObject.cs create mode 100644 AirPlaneWithRadar/AirPlaneWithRadar/IDrawingObject.cs diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingObject.cs b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingObject.cs new file mode 100644 index 0000000..8fa9368 --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingObject.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 DrawingObject : IDrawingObject + { + private DrawingPlain _plain; + + public DrawingObject(DrawingPlain plain) + { + _plain = plain; + } + public float Step => _plain?.Plain?.Step ?? 0; + + + public void DrawningObject(Graphics g) + { + //TODO + } + + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return _plain?.GetCurrentPosition() ?? default; + } + + public void MoveObject(Direction direction) + { + _plain?.MoveTransport(direction); + } + + public void SetObject(int x, int y, int width, int height) + { + _plain.setPosition(x, y, width, height); + } + } +} diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs index 5ca6b12..2211625 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs @@ -121,5 +121,9 @@ namespace AirPlaneWithRadar if(startPosY + plainHeight > pictureHeight) startPosY = pictureHeight.Value - plainHeight; } + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (startPosX, startPosY, startPosX + plainWidth, startPosY + plainHeight); + } } } diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/IDrawingObject.cs b/AirPlaneWithRadar/AirPlaneWithRadar/IDrawingObject.cs new file mode 100644 index 0000000..6fec5b5 --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/IDrawingObject.cs @@ -0,0 +1,19 @@ +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; } + void SetObject(int x, int y, int width, int height); + void MoveObject(Direction direction); + + void DrawningObject(Graphics g); + + (float Left, float Right, float Top, float Bottom) GetCurrentPosition(); + } +} From ee7a0def182295d59430e4fa28f46c67dde0cf0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BE=D0=BB=D0=BE=D0=B4=D1=8F?= Date: Mon, 26 Sep 2022 21:01:32 +0300 Subject: [PATCH 4/4] =?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 | 84 +++++++ .../AirPlaneWithRadar/Direction.cs | 1 + .../AirPlaneWithRadar/FormMap.Designer.cs | 209 ++++++++++++++++++ .../AirPlaneWithRadar/FormMap.cs | 79 +++++++ .../AirPlaneWithRadar/FormMap.resx | 63 ++++++ .../AirPlaneWithRadar/Program.cs | 2 +- .../AirPlaneWithRadar/SimpleMap.cs | 48 ++++ 7 files changed, 485 insertions(+), 1 deletion(-) 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..1f32cf1 --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/AbstractMap.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirPlaneWithRadar +{ + internal abstract class AbstractMap + { + private IDrawingObject _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, IDrawingObject drawningObject) + { + _width = width; + _height = height; + _drawningObject = drawningObject; + GenerateMap(); + while (!SetObjectOnMap()) + { + GenerateMap(); + } + return DrawMapWithObject(); + } + public Bitmap MoveObject(Direction direction) + { + // TODO проверка, что объект может переместится в требуемом направлении + if (true) + { + _drawningObject.MoveObject(direction); + } + return DrawMapWithObject(); + } + private bool SetObjectOnMap() + { + if (_drawningObject == null || _map == null) + { + return false; + } + int x = _random.Next(0, 10); + int y = _random.Next(0, 10); + _drawningObject.SetObject(x, y, _width, _height); + // TODO првоерка, что объект не "накладывается" на закрытые участки + return true; + } + 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); + } +} diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/Direction.cs b/AirPlaneWithRadar/AirPlaneWithRadar/Direction.cs index 15d11f0..ccf9b58 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/Direction.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/Direction.cs @@ -8,6 +8,7 @@ namespace AirPlaneWithRadar { internal enum Direction { + None =0, Up =1, Down =2, Left = 3, diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.Designer.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.Designer.cs new file mode 100644 index 0000000..40e3196 --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.Designer.cs @@ -0,0 +1,209 @@ +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.pictureBoxPlain = new System.Windows.Forms.PictureBox(); + this.statusStrip = new System.Windows.Forms.StatusStrip(); + this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelColor = new System.Windows.Forms.ToolStripStatusLabel(); + 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.ButtonCreate = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); + this.comboBoxMap = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlain)).BeginInit(); + this.statusStrip.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBoxPlain + // + this.pictureBoxPlain.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxPlain.Location = new System.Drawing.Point(0, 0); + this.pictureBoxPlain.Name = "pictureBoxPlain"; + this.pictureBoxPlain.Size = new System.Drawing.Size(535, 292); + this.pictureBoxPlain.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxPlain.TabIndex = 0; + this.pictureBoxPlain.TabStop = false; + // + // statusStrip + // + this.statusStrip.ImageScalingSize = new System.Drawing.Size(20, 20); + this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelColor}); + this.statusStrip.Location = new System.Drawing.Point(0, 292); + this.statusStrip.Name = "statusStrip"; + this.statusStrip.Size = new System.Drawing.Size(535, 26); + this.statusStrip.TabIndex = 1; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(71, 20); + this.toolStripStatusLabelSpeed.Text = "скорость"; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(32, 20); + this.toolStripStatusLabelWeight.Text = "вес"; + // + // toolStripStatusLabelColor + // + this.toolStripStatusLabelColor.Name = "toolStripStatusLabelColor"; + this.toolStripStatusLabelColor.Size = new System.Drawing.Size(40, 20); + this.toolStripStatusLabelColor.Text = "цвет"; + // + // 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(383, 223); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.TabIndex = 3; + this.buttonUp.Text = " "; + 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(347, 259); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.TabIndex = 4; + this.buttonLeft.Text = " "; + 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(383, 259); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.TabIndex = 5; + this.buttonDown.Text = " "; + 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(419, 259); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.TabIndex = 6; + this.buttonRight.Text = " "; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); + // + // 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, 259); + this.ButtonCreate.Name = "ButtonCreate"; + this.ButtonCreate.Size = new System.Drawing.Size(94, 29); + this.ButtonCreate.TabIndex = 7; + this.ButtonCreate.Text = "Создать"; + this.ButtonCreate.UseVisualStyleBackColor = true; + this.ButtonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); + // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(125, 259); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(134, 29); + this.buttonCreateModif.TabIndex = 8; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click); + // + // comboBoxMap + // + this.comboBoxMap.FormattingEnabled = true; + this.comboBoxMap.Items.AddRange(new object[] { + "Простая карта"}); + this.comboBoxMap.Location = new System.Drawing.Point(24, 12); + this.comboBoxMap.Name = "comboBoxMap"; + this.comboBoxMap.Size = new System.Drawing.Size(151, 28); + this.comboBoxMap.TabIndex = 9; + this.comboBoxMap.SelectedIndexChanged += new System.EventHandler(this.comboBoxMap_SelectedIndexChanged); + // + // FormMap + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(535, 318); + this.Controls.Add(this.comboBoxMap); + this.Controls.Add(this.buttonCreateModif); + this.Controls.Add(this.ButtonCreate); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.pictureBoxPlain); + this.Controls.Add(this.statusStrip); + this.Name = "FormMap"; + this.Text = "Карта"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlain)).EndInit(); + this.statusStrip.ResumeLayout(false); + this.statusStrip.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + private PictureBox pictureBoxPlain; + private StatusStrip statusStrip; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelColor; + private Button buttonUp; + private Button buttonLeft; + private Button buttonDown; + private Button buttonRight; + public ToolStripStatusLabel toolStripStatusLabelSpeed; + private Button ButtonCreate; + private Button buttonCreateModif; + private ComboBox comboBoxMap; + } +} \ No newline at end of file diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.cs new file mode 100644 index 0000000..82e202c --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.cs @@ -0,0 +1,79 @@ +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(DrawingPlain plain) + { + toolStripStatusLabelSpeed.Text = $"Скорость: {plain.Plain.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {plain.Plain.Weight}"; + toolStripStatusLabelColor.Text = $"Цвет: {plain.Plain.BodyColor.Name}"; + pictureBoxPlain.Image = _abstractMap.CreateMap(pictureBoxPlain.Width, pictureBoxPlain.Height,new DrawingObject(plain)) ; + } + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + var plain = new DrawingPlain(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + + SetData(plain); + } + 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; + } + pictureBoxPlain.Image = _abstractMap?.MoveObject(dir); + } + + private void buttonCreateModif_Click(object sender, EventArgs e) + { + + Random rnd = new(); + var plain = new DrawingRadarPlane(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(plain); ; + + } + + private void comboBoxMap_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxMap.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 cdcf058..cb92530 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 FormPlain()); + 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..92dd4c3 --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/SimpleMap.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirPlaneWithRadar +{ + internal class SimpleMap : AbstractMap + { + Brush barrierColor = new SolidBrush(Color.DarkGray); + 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; + } + } + 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++; + } + } + } + } +}