From 94bd87f67f186b00298f2bd7be9891e9c965f2af 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, 3 Oct 2022 09:38:22 +0300 Subject: [PATCH 1/5] generic classes --- .../AirPlaneWithRadar/AbstractMap.cs | 73 +++++++++- ...DrawingObject.cs => DrawingObjectPlane.cs} | 11 +- .../AirPlaneWithRadar/DrawingPlain.cs | 2 +- .../AirPlaneWithRadar/DrawingRadarPlane.cs | 2 +- .../AirPlaneWithRadar/FormMap.Designer.cs | 28 ++-- .../AirPlaneWithRadar/FormMap.cs | 9 +- .../AirPlaneWithRadar/IDrawingObject.cs | 3 +- .../MapWithSetPlainGeneric.cs | 126 ++++++++++++++++++ .../AirPlaneWithRadar/SetPlaneGeneric.cs | 41 ++++++ .../AirPlaneWithRadar/SimpleMap.cs | 2 +- .../AirPlaneWithRadar/UserMap_BigBox.cs | 55 ++++++++ .../AirPlaneWithRadar/UserMap_Colums.cs | 54 ++++++++ 12 files changed, 380 insertions(+), 26 deletions(-) rename AirPlaneWithRadar/AirPlaneWithRadar/{DrawingObject.cs => DrawingObjectPlane.cs} (75%) create mode 100644 AirPlaneWithRadar/AirPlaneWithRadar/MapWithSetPlainGeneric.cs create mode 100644 AirPlaneWithRadar/AirPlaneWithRadar/SetPlaneGeneric.cs create mode 100644 AirPlaneWithRadar/AirPlaneWithRadar/UserMap_BigBox.cs create mode 100644 AirPlaneWithRadar/AirPlaneWithRadar/UserMap_Colums.cs diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/AbstractMap.cs b/AirPlaneWithRadar/AirPlaneWithRadar/AbstractMap.cs index 1f32cf1..1541d6e 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/AbstractMap.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/AbstractMap.cs @@ -32,12 +32,66 @@ namespace AirPlaneWithRadar } public Bitmap MoveObject(Direction direction) { - // TODO проверка, что объект может переместится в требуемом направлении - if (true) + + switch (direction) { - _drawningObject.MoveObject(direction); + case Direction.Up: + for (int i = 0; i < _map.GetLength(0); i++) + { + for (int j = 0; j < _map.GetLength(1); j++) + { + if (_map[i, j] == _barrier && ((_drawningObject.GetCurrentPosition().Left < i * _size_x && _drawningObject.GetCurrentPosition().Top > i * _size_x)|| + (_drawningObject.GetCurrentPosition().Left < i * (_size_x+1) && _drawningObject.GetCurrentPosition().Top > i * (_size_x+1)))&& + j*(_size_y+1)< _drawningObject.GetCurrentPosition().Right && _drawningObject.GetCurrentPosition().Right - j * (_size_y + 1) <= _drawningObject.Step) + return DrawMapWithObject(); + + } + } + break; + case Direction.Down: + for (int i = 0; i < _map.GetLength(0); i++) + { + for (int j = 0; j < _map.GetLength(1); j++) + { + if (_map[i, j] == _barrier && ((_drawningObject.GetCurrentPosition().Left < i * _size_x && _drawningObject.GetCurrentPosition().Top > i * _size_x) || + (_drawningObject.GetCurrentPosition().Left < i * (_size_x + 1) && _drawningObject.GetCurrentPosition().Top > i * (_size_x + 1))) && + j * _size_y > _drawningObject.GetCurrentPosition().Bottom && j * _size_y - _drawningObject.GetCurrentPosition().Bottom <= _drawningObject.Step) + return DrawMapWithObject(); + + } + } + break; + case Direction.Left: + for (int i = 0; i < _map.GetLength(0); i++) + { + for (int j = 0; j < _map.GetLength(1); j++) + { + if (_map[i, j] == _barrier && ((_drawningObject.GetCurrentPosition().Right < j * _size_y && _drawningObject.GetCurrentPosition().Bottom > j * _size_y) || + (_drawningObject.GetCurrentPosition().Right < j * (_size_y + 1) && _drawningObject.GetCurrentPosition().Bottom > j * (_size_y + 1))) && + i * (_size_x+1)< _drawningObject.GetCurrentPosition().Left && _drawningObject.GetCurrentPosition().Left - i * (_size_x + 1) <= _drawningObject.Step) + return DrawMapWithObject(); + + } + } + break; + case Direction.Right: + for (int i = 0; i < _map.GetLength(0); i++) + { + for (int j = 0; j < _map.GetLength(1); j++) + { + if (_map[i, j] == _barrier && ((_drawningObject.GetCurrentPosition().Right < j * _size_y && _drawningObject.GetCurrentPosition().Bottom > j * _size_y) || + (_drawningObject.GetCurrentPosition().Right < j * (_size_y + 1) && _drawningObject.GetCurrentPosition().Bottom > j * (_size_y + 1))) && + i * (_size_x ) > _drawningObject.GetCurrentPosition().Top && i * (_size_x ) - _drawningObject.GetCurrentPosition().Top <= _drawningObject.Step) + return DrawMapWithObject(); + + } + } + break; } + _drawningObject.MoveObject(direction); return DrawMapWithObject(); + + } private bool SetObjectOnMap() { @@ -48,7 +102,18 @@ namespace AirPlaneWithRadar int x = _random.Next(0, 10); int y = _random.Next(0, 10); _drawningObject.SetObject(x, y, _width, _height); - // TODO првоерка, что объект не "накладывается" на закрытые участки + if(_drawningObject is DrawingObjectPlane ) + { + for (int i = 0; i < _map.GetLength(0); i++) + { + for (int j = 0; j < _map.GetLength(1); j++) + { + if (_map[i, j] == _barrier && _drawningObject.GetCurrentPosition().Left < i*_size_x && _drawningObject.GetCurrentPosition().Right < j*_size_y && _drawningObject.GetCurrentPosition().Top > i*_size_x && _drawningObject.GetCurrentPosition().Bottom > j*_size_y) + return false; + } + } + } + return true; } private Bitmap DrawMapWithObject() diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingObject.cs b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingObjectPlane.cs similarity index 75% rename from AirPlaneWithRadar/AirPlaneWithRadar/DrawingObject.cs rename to AirPlaneWithRadar/AirPlaneWithRadar/DrawingObjectPlane.cs index 8fa9368..c265b27 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingObject.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingObjectPlane.cs @@ -1,16 +1,17 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Security.Cryptography.X509Certificates; using System.Text; using System.Threading.Tasks; namespace AirPlaneWithRadar { - internal class DrawingObject : IDrawingObject + internal class DrawingObjectPlane : IDrawingObject { - private DrawingPlain _plain; + private DrawingPlain _plain = null; - public DrawingObject(DrawingPlain plain) + public DrawingObjectPlane(DrawingPlain plain) { _plain = plain; } @@ -19,14 +20,14 @@ namespace AirPlaneWithRadar public void DrawningObject(Graphics g) { - //TODO + _plain?.DrawTransoprt(g); } public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() { return _plain?.GetCurrentPosition() ?? default; } - + public void MoveObject(Direction direction) { _plain?.MoveTransport(direction); diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs index 2211625..2b6bea5 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs @@ -15,7 +15,7 @@ namespace AirPlaneWithRadar private int? pictureWidth = null; private int? pictureHeight = null; protected readonly int plainWidth = 120; - protected readonly int plainHeight = 70; + protected readonly int plainHeight = 80; public DrawingPlain(int speed, float weight, Color bodycolor) { Plain = new EntetyPlain(speed, weight, bodycolor); diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingRadarPlane.cs b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingRadarPlane.cs index 9747a0e..a033bbd 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingRadarPlane.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingRadarPlane.cs @@ -9,7 +9,7 @@ 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) + public DrawingRadarPlane(int speed, float weight, Color bodyColor,Color dopColor, bool radar, bool oilBox) : base(speed, weight, bodyColor, 120, 80) { Plain = new RadioPlane(speed, weight, bodyColor, dopColor, radar, oilBox); } diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.Designer.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.Designer.cs index 40e3196..7877bfa 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.Designer.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.Designer.cs @@ -49,7 +49,7 @@ 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.Size = new System.Drawing.Size(908, 470); this.pictureBoxPlain.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.pictureBoxPlain.TabIndex = 0; this.pictureBoxPlain.TabStop = false; @@ -61,9 +61,9 @@ this.toolStripStatusLabelSpeed, this.toolStripStatusLabelWeight, this.toolStripStatusLabelColor}); - this.statusStrip.Location = new System.Drawing.Point(0, 292); + this.statusStrip.Location = new System.Drawing.Point(0, 470); this.statusStrip.Name = "statusStrip"; - this.statusStrip.Size = new System.Drawing.Size(535, 26); + this.statusStrip.Size = new System.Drawing.Size(908, 26); this.statusStrip.TabIndex = 1; // // toolStripStatusLabelSpeed @@ -89,7 +89,7 @@ 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.Location = new System.Drawing.Point(756, 401); this.buttonUp.Name = "buttonUp"; this.buttonUp.Size = new System.Drawing.Size(30, 30); this.buttonUp.TabIndex = 3; @@ -102,7 +102,7 @@ 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.Location = new System.Drawing.Point(720, 437); this.buttonLeft.Name = "buttonLeft"; this.buttonLeft.Size = new System.Drawing.Size(30, 30); this.buttonLeft.TabIndex = 4; @@ -115,7 +115,7 @@ 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.Location = new System.Drawing.Point(756, 437); this.buttonDown.Name = "buttonDown"; this.buttonDown.Size = new System.Drawing.Size(30, 30); this.buttonDown.TabIndex = 5; @@ -128,7 +128,7 @@ 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.Location = new System.Drawing.Point(792, 437); this.buttonRight.Name = "buttonRight"; this.buttonRight.Size = new System.Drawing.Size(30, 30); this.buttonRight.TabIndex = 6; @@ -139,7 +139,7 @@ // 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.Location = new System.Drawing.Point(12, 437); this.ButtonCreate.Name = "ButtonCreate"; this.ButtonCreate.Size = new System.Drawing.Size(94, 29); this.ButtonCreate.TabIndex = 7; @@ -149,7 +149,8 @@ // // buttonCreateModif // - this.buttonCreateModif.Location = new System.Drawing.Point(125, 259); + this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreateModif.Location = new System.Drawing.Point(112, 437); this.buttonCreateModif.Name = "buttonCreateModif"; this.buttonCreateModif.Size = new System.Drawing.Size(134, 29); this.buttonCreateModif.TabIndex = 8; @@ -159,12 +160,15 @@ // // comboBoxMap // + this.comboBoxMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxMap.FormattingEnabled = true; this.comboBoxMap.Items.AddRange(new object[] { - "Простая карта"}); + "Простая карта", + "Пользовательская карта №1", + "Пользовательская карта №2"}); this.comboBoxMap.Location = new System.Drawing.Point(24, 12); this.comboBoxMap.Name = "comboBoxMap"; - this.comboBoxMap.Size = new System.Drawing.Size(151, 28); + this.comboBoxMap.Size = new System.Drawing.Size(188, 28); this.comboBoxMap.TabIndex = 9; this.comboBoxMap.SelectedIndexChanged += new System.EventHandler(this.comboBoxMap_SelectedIndexChanged); // @@ -172,7 +176,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(535, 318); + this.ClientSize = new System.Drawing.Size(908, 496); this.Controls.Add(this.comboBoxMap); this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.ButtonCreate); diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.cs index 82e202c..3f3fcb4 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.cs @@ -23,7 +23,7 @@ namespace AirPlaneWithRadar 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)) ; + pictureBoxPlain.Image = _abstractMap.CreateMap(pictureBoxPlain.Width, pictureBoxPlain.Height,new DrawingObjectPlane(plain)) ; } private void ButtonCreate_Click(object sender, EventArgs e) { @@ -73,6 +73,13 @@ namespace AirPlaneWithRadar case "Простая карта": _abstractMap = new SimpleMap(); break; + + case "Пользовательская карта №1": + _abstractMap = new UserMap_BigBox(); + break; + case "Пользовательская карта №2": + _abstractMap = new UserMap_Colums(); + break; } } } diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/IDrawingObject.cs b/AirPlaneWithRadar/AirPlaneWithRadar/IDrawingObject.cs index 6fec5b5..4099d45 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/IDrawingObject.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/IDrawingObject.cs @@ -13,7 +13,8 @@ namespace AirPlaneWithRadar void MoveObject(Direction direction); void DrawningObject(Graphics g); - + + (float Left, float Right, float Top, float Bottom) GetCurrentPosition(); } } diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/MapWithSetPlainGeneric.cs b/AirPlaneWithRadar/AirPlaneWithRadar/MapWithSetPlainGeneric.cs new file mode 100644 index 0000000..559a16d --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/MapWithSetPlainGeneric.cs @@ -0,0 +1,126 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirPlaneWithRadar +{ + internal class MapWithSetPlainGeneric + where T : class, IDrawingObject + where U : AbstractMap + { + private readonly int _pictureWidth; + + private readonly int _pictureHeight; + + private readonly int _placeSizeWidth = 180; + + private readonly int _placeSizeHeight = 90; + + private readonly SetPlaneGeneric _setPlains; + + private readonly U _map; + + public MapWithSetPlainGeneric(int picWidth, int picHeight, U map) + { + int width = picWidth / _placeSizeWidth; + int height = picHeight / _placeSizeHeight; + _setPlains = new SetPlaneGeneric(width * height); + _pictureWidth = picWidth; + _pictureHeight = picHeight; + _map = map; + } + + public static bool operator +(MapWithSetPlainGeneric map, T car) + { + return map._setPlains.Insert(car); + } + + public static bool operator -(MapWithSetPlainGeneric map, int position) + { + return map._setPlains.Remove(position); + } + + public Bitmap ShowSet() + { + Bitmap bmp = new(_pictureWidth, _pictureHeight); + Graphics gr = Graphics.FromImage(bmp); + DrawBackground(gr); + DrawPlains(gr); + return bmp; + } + + public Bitmap ShowOnMap() + { + Shaking(); + for (int i = 0; i < _setPlains.Count; i++) + { + var car = _setPlains.Get(i); + if (car != null) + { + return _map.CreateMap(_pictureWidth, _pictureHeight, car); + } + } + return new(_pictureWidth, _pictureHeight); + } + + public Bitmap MoveObject(Direction direction) + { + if (_map != null) + { + return _map.MoveObject(direction); + } + return new(_pictureWidth, _pictureHeight); + } + + private void Shaking() + { + int j = _setPlains.Count - 1; + for (int i = 0; i < _setPlains.Count; i++) + { + if (_setPlains.Get(i) == null) + { + for (; j > i; j--) + { + var car = _setPlains.Get(j); + if (car != null) + { + _setPlains.Insert(car, i); + _setPlains.Remove(j); + break; + } + } + if (j <= i) + { + return; + } + } + } + } + + private void DrawBackground(Graphics g) + { + + Pen pen = new(Color.White, 5); + for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++) + { + for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j) + { + + g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight); + } + g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight); + } + } + private void DrawPlains(Graphics g) + { + + for (int i = 0; i < _setPlains.Count; i++) + { + + _setPlains.Get(i)?.DrawningObject(g); + } + } + } +} diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/SetPlaneGeneric.cs b/AirPlaneWithRadar/AirPlaneWithRadar/SetPlaneGeneric.cs new file mode 100644 index 0000000..b49139f --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/SetPlaneGeneric.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 SetPlaneGeneric + where T : class + { + private readonly T[] _places; + public int Count => _places.Length; + public SetPlaneGeneric(int count) + { + _places = new T[count]; + } + public bool Insert(T plain) + { + + + return true; + } + public bool Insert(T plain, int position) + { + + return true; + + } + public bool Remove(int position) + { + + return false; + } + public T Get(int position) + { + return _places[position]; + } + + } +} diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/SimpleMap.cs b/AirPlaneWithRadar/AirPlaneWithRadar/SimpleMap.cs index 92dd4c3..053304e 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/SimpleMap.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/SimpleMap.cs @@ -9,7 +9,7 @@ namespace AirPlaneWithRadar internal class SimpleMap : AbstractMap { Brush barrierColor = new SolidBrush(Color.DarkGray); - Brush roadColor = new SolidBrush(Color.Blue); + Brush roadColor = new SolidBrush(Color.Aqua); 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)); diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/UserMap_BigBox.cs b/AirPlaneWithRadar/AirPlaneWithRadar/UserMap_BigBox.cs new file mode 100644 index 0000000..f974b16 --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/UserMap_BigBox.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirPlaneWithRadar +{ + internal class UserMap_BigBox : AbstractMap + { + Brush barrierColor = new SolidBrush(Color.DarkGray); + Brush roadColor = new SolidBrush(Color.Aqua); + 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 sizeKub = 5; + 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 < 10) + { + Random rand = new Random(); + int i = rand.Next(0,100); + int j = rand.Next(0,100); + if (i > _map.GetLength(0) - sizeKub || j > _map.GetLength(0) - sizeKub) + continue; + for(int iKub = i; iKub < i+sizeKub; iKub++) + { + for(int jKub = j; jKub < j+ sizeKub; jKub++) + { + _map[iKub,jKub] = _barrier; + } + } + counter++; + } + + } + } +} diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/UserMap_Colums.cs b/AirPlaneWithRadar/AirPlaneWithRadar/UserMap_Colums.cs new file mode 100644 index 0000000..5c36628 --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/UserMap_Colums.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 UserMap_Colums : AbstractMap + { + Brush barrierColor = new SolidBrush(Color.DarkGray); + Brush roadColor = new SolidBrush(Color.Aqua); + 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 sizeHole = 30; + 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 < 3) + { + Random rand = new Random(); + int iWall = rand.Next(0, 100); + int jWall = rand.Next(0, 100); + if (iWall > _map.GetLength(0) - sizeHole) + continue; + for (int i = 0; i < _map.GetLength(0); i++) + { + + if(iiWall+sizeHole) + _map[jWall, i] = _barrier; + + } + counter++; + } + } + } +} -- 2.25.1 From cd9b796a8247399ee9d1583871cf2664d5a0dbfe 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, 3 Oct 2022 09:52:29 +0300 Subject: [PATCH 2/5] changes forms --- .../AirPlaneWithRadar/Direction.cs | 2 +- .../AirPlaneWithRadar/DrawingPlain.cs | 2 +- .../AirPlaneWithRadar/EntetyPlain.cs | 2 +- .../AirPlaneWithRadar/FormMap.Designer.cs | 213 ------------------ .../AirPlaneWithRadar/FormMap.cs | 86 ------- .../AirPlaneWithRadar/FormMap.resx | 63 ------ .../FormMapWithSetPlains.Designer.cs | 213 ++++++++++++++++++ .../AirPlaneWithRadar/FormMapWithSetPlains.cs | 130 +++++++++++ .../FormMapWithSetPlains.resx | 120 ++++++++++ .../AirPlaneWithRadar/FormPlain.Designer.cs | 21 +- .../AirPlaneWithRadar/FormPlain.cs | 9 +- .../AirPlaneWithRadar/Program.cs | 2 +- 12 files changed, 492 insertions(+), 371 deletions(-) delete mode 100644 AirPlaneWithRadar/AirPlaneWithRadar/FormMap.Designer.cs delete mode 100644 AirPlaneWithRadar/AirPlaneWithRadar/FormMap.cs delete mode 100644 AirPlaneWithRadar/AirPlaneWithRadar/FormMap.resx create mode 100644 AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.Designer.cs create mode 100644 AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs create mode 100644 AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.resx diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/Direction.cs b/AirPlaneWithRadar/AirPlaneWithRadar/Direction.cs index ccf9b58..c6a8470 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/Direction.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/Direction.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace AirPlaneWithRadar { - internal enum Direction + public enum Direction { None =0, Up =1, diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs index 2b6bea5..4d09dbe 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/DrawingPlain.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace AirPlaneWithRadar { - internal class DrawingPlain + public class DrawingPlain { public EntetyPlain Plain { get; protected set; } protected float startPosX; diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/EntetyPlain.cs b/AirPlaneWithRadar/AirPlaneWithRadar/EntetyPlain.cs index 48af56c..4c3c4e0 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/EntetyPlain.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/EntetyPlain.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace AirPlaneWithRadar { - internal class EntetyPlain + public class EntetyPlain { public int Speed { get;private set; } diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.Designer.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.Designer.cs deleted file mode 100644 index 7877bfa..0000000 --- a/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.Designer.cs +++ /dev/null @@ -1,213 +0,0 @@ -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(908, 470); - 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, 470); - this.statusStrip.Name = "statusStrip"; - this.statusStrip.Size = new System.Drawing.Size(908, 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(756, 401); - 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(720, 437); - 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(756, 437); - 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(792, 437); - 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, 437); - 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.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonCreateModif.Location = new System.Drawing.Point(112, 437); - 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.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comboBoxMap.FormattingEnabled = true; - this.comboBoxMap.Items.AddRange(new object[] { - "Простая карта", - "Пользовательская карта №1", - "Пользовательская карта №2"}); - this.comboBoxMap.Location = new System.Drawing.Point(24, 12); - this.comboBoxMap.Name = "comboBoxMap"; - this.comboBoxMap.Size = new System.Drawing.Size(188, 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(908, 496); - 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 deleted file mode 100644 index 3f3fcb4..0000000 --- a/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.cs +++ /dev/null @@ -1,86 +0,0 @@ -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 DrawingObjectPlane(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; - - case "Пользовательская карта №1": - _abstractMap = new UserMap_BigBox(); - break; - case "Пользовательская карта №2": - _abstractMap = new UserMap_Colums(); - break; - } - } - } -} diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.resx b/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.resx deleted file mode 100644 index 2c0949d..0000000 --- a/AirPlaneWithRadar/AirPlaneWithRadar/FormMap.resx +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/FormMapWithSetPlains.Designer.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.Designer.cs new file mode 100644 index 0000000..f87f8bc --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.Designer.cs @@ -0,0 +1,213 @@ +namespace AirPlaneWithRadar +{ + partial class FormMapWithSetPlains + { + /// + /// 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.groupBoxTools = new System.Windows.Forms.GroupBox(); + this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox(); + this.buttonRemoveCar = new System.Windows.Forms.Button(); + this.buttonShowStorage = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonRight = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.buttonShowOnMap = new System.Windows.Forms.Button(); + this.buttonAddCar = new System.Windows.Forms.Button(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + this.pictureBox = new System.Windows.Forms.PictureBox(); + this.groupBoxTools.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit(); + this.SuspendLayout(); + // + // groupBoxTools + // + this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition); + this.groupBoxTools.Controls.Add(this.buttonRemoveCar); + this.groupBoxTools.Controls.Add(this.buttonShowStorage); + this.groupBoxTools.Controls.Add(this.buttonDown); + this.groupBoxTools.Controls.Add(this.buttonRight); + this.groupBoxTools.Controls.Add(this.buttonLeft); + this.groupBoxTools.Controls.Add(this.buttonUp); + this.groupBoxTools.Controls.Add(this.buttonShowOnMap); + this.groupBoxTools.Controls.Add(this.buttonAddCar); + this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap); + this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right; + this.groupBoxTools.Location = new System.Drawing.Point(1057, 0); + this.groupBoxTools.Name = "groupBoxTools"; + this.groupBoxTools.Size = new System.Drawing.Size(204, 668); + this.groupBoxTools.TabIndex = 0; + this.groupBoxTools.TabStop = false; + this.groupBoxTools.Text = "Инструменты"; + // + // maskedTextBoxPosition + // + this.maskedTextBoxPosition.Location = new System.Drawing.Point(17, 166); + this.maskedTextBoxPosition.Mask = "00"; + this.maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + this.maskedTextBoxPosition.Size = new System.Drawing.Size(175, 27); + this.maskedTextBoxPosition.TabIndex = 2; + this.maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonRemoveCar + // + this.buttonRemoveCar.Location = new System.Drawing.Point(17, 195); + this.buttonRemoveCar.Name = "buttonRemoveCar"; + this.buttonRemoveCar.Size = new System.Drawing.Size(175, 35); + this.buttonRemoveCar.TabIndex = 3; + this.buttonRemoveCar.Text = "Удалить автомобиль"; + this.buttonRemoveCar.UseVisualStyleBackColor = true; + this.buttonRemoveCar.Click += new System.EventHandler(this.ButtonRemoveCar_Click); + // + // buttonShowStorage + // + this.buttonShowStorage.Location = new System.Drawing.Point(17, 287); + this.buttonShowStorage.Name = "buttonShowStorage"; + this.buttonShowStorage.Size = new System.Drawing.Size(175, 35); + this.buttonShowStorage.TabIndex = 4; + this.buttonShowStorage.Text = "Посмотреть хранилище"; + this.buttonShowStorage.UseVisualStyleBackColor = true; + this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_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(91, 618); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.TabIndex = 10; + this.buttonDown.UseVisualStyleBackColor = true; + // + // 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(127, 618); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.TabIndex = 9; + this.buttonRight.UseVisualStyleBackColor = true; + // + // 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(55, 618); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.TabIndex = 8; + this.buttonLeft.UseVisualStyleBackColor = true; + // + // 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(91, 582); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.TabIndex = 7; + this.buttonUp.UseVisualStyleBackColor = true; + // + // buttonShowOnMap + // + this.buttonShowOnMap.Location = new System.Drawing.Point(17, 391); + this.buttonShowOnMap.Name = "buttonShowOnMap"; + this.buttonShowOnMap.Size = new System.Drawing.Size(175, 35); + this.buttonShowOnMap.TabIndex = 5; + this.buttonShowOnMap.Text = "Посмотреть карту"; + this.buttonShowOnMap.UseVisualStyleBackColor = true; + this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click); + // + // buttonAddCar + // + this.buttonAddCar.Location = new System.Drawing.Point(17, 106); + this.buttonAddCar.Name = "buttonAddCar"; + this.buttonAddCar.Size = new System.Drawing.Size(175, 35); + this.buttonAddCar.TabIndex = 1; + this.buttonAddCar.Text = "Добавить автомобиль"; + this.buttonAddCar.UseVisualStyleBackColor = true; + this.buttonAddCar.Click += new System.EventHandler(this.ButtonAddCar_Click); + // + // comboBoxSelectorMap + // + this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxSelectorMap.FormattingEnabled = true; + this.comboBoxSelectorMap.Items.AddRange(new object[] { + "Простая карта", + "Пользовательская карта №1", + "Пользовательская карта №2"}); + this.comboBoxSelectorMap.Location = new System.Drawing.Point(17, 32); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 28); + this.comboBoxSelectorMap.TabIndex = 0; + this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); + // + // pictureBox + // + this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBox.Location = new System.Drawing.Point(0, 0); + this.pictureBox.Name = "pictureBox"; + this.pictureBox.Size = new System.Drawing.Size(1057, 668); + this.pictureBox.TabIndex = 1; + this.pictureBox.TabStop = false; + // + // FormMapWithSetPlains + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1261, 668); + this.Controls.Add(this.pictureBox); + this.Controls.Add(this.groupBoxTools); + this.Name = "FormMapWithSetPlains"; + this.Text = "Карта с набором объектов"; + this.groupBoxTools.ResumeLayout(false); + this.groupBoxTools.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + private GroupBox groupBoxTools; + private PictureBox pictureBox; + private ComboBox comboBoxSelectorMap; + private Button buttonShowOnMap; + private Button buttonAddCar; + private Button buttonDown; + private Button buttonRight; + private Button buttonLeft; + private Button buttonUp; + private Button buttonShowStorage; + private Button buttonRemoveCar; + private MaskedTextBox maskedTextBoxPosition; + } +} \ No newline at end of file diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs new file mode 100644 index 0000000..e979d8f --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs @@ -0,0 +1,130 @@ +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 FormMapWithSetPlains : Form + { + private MapWithSetPlainGeneric _mapPlainsCollectionGeneric; + public FormMapWithSetPlains() + { + InitializeComponent(); + } + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + AbstractMap map = null; + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + map = new SimpleMap(); + break; + case "Пользовательская карта №1": + map = new UserMap_BigBox(); + break; + case "Пользовательская карта №2": + map = new UserMap_Colums(); + break; + } + if (map != null) + { + _mapPlainsCollectionGeneric = new MapWithSetPlainGeneric( + pictureBox.Width, pictureBox.Height, map); + } + else + { + _mapPlainsCollectionGeneric = null; + } + } + private void ButtonAddCar_Click(object sender, EventArgs e) + { + if (_mapPlainsCollectionGeneric == null) + { + return; + } + FormPlain form = new(); + if (form.ShowDialog() == DialogResult.OK) + { + DrawingObjectPlane car = new(form.SelectedPlain); + if (_mapPlainsCollectionGeneric + car) + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _mapPlainsCollectionGeneric.ShowSet(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); + } + } + } + private void ButtonRemoveCar_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(maskedTextBoxPosition.Text)) + { + return; + } + if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + int pos = Convert.ToInt32(maskedTextBoxPosition.Text); + if (_mapPlainsCollectionGeneric - pos) + { + MessageBox.Show("Объект удален"); + pictureBox.Image = _mapPlainsCollectionGeneric.ShowSet(); + } + else + { + MessageBox.Show("Не удалось удалить объект"); + } + } + private void ButtonShowStorage_Click(object sender, EventArgs e) + { + if (_mapPlainsCollectionGeneric == null) + { + return; + } + pictureBox.Image = _mapPlainsCollectionGeneric.ShowSet(); + } + private void ButtonShowOnMap_Click(object sender, EventArgs e) + { + if (_mapPlainsCollectionGeneric == null) + { + return; + } + pictureBox.Image = _mapPlainsCollectionGeneric.ShowOnMap(); + } + private void ButtonMove_Click(object sender, EventArgs e) + { + if (_mapPlainsCollectionGeneric == null) + { + return; + } + + 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; + } + pictureBox.Image = _mapPlainsCollectionGeneric.MoveObject(dir); + } + } +} diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.resx b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.Designer.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.Designer.cs index 91f6fb9..3135533 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.Designer.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.Designer.cs @@ -39,6 +39,7 @@ this.buttonRight = new System.Windows.Forms.Button(); this.ButtonCreate = new System.Windows.Forms.Button(); this.buttonCreateModif = new System.Windows.Forms.Button(); + this.buttonSelect = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlain)).BeginInit(); this.statusStrip.SuspendLayout(); this.SuspendLayout(); @@ -89,7 +90,7 @@ 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.Location = new System.Drawing.Point(452, 222); this.buttonUp.Name = "buttonUp"; this.buttonUp.Size = new System.Drawing.Size(30, 30); this.buttonUp.TabIndex = 3; @@ -102,7 +103,7 @@ 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.Location = new System.Drawing.Point(416, 258); this.buttonLeft.Name = "buttonLeft"; this.buttonLeft.Size = new System.Drawing.Size(30, 30); this.buttonLeft.TabIndex = 4; @@ -115,7 +116,7 @@ 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.Location = new System.Drawing.Point(452, 258); this.buttonDown.Name = "buttonDown"; this.buttonDown.Size = new System.Drawing.Size(30, 30); this.buttonDown.TabIndex = 5; @@ -128,7 +129,7 @@ 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.Location = new System.Drawing.Point(488, 258); this.buttonRight.Name = "buttonRight"; this.buttonRight.Size = new System.Drawing.Size(30, 30); this.buttonRight.TabIndex = 6; @@ -157,11 +158,22 @@ this.buttonCreateModif.UseVisualStyleBackColor = true; this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click); // + // buttonSelect + // + this.buttonSelect.Location = new System.Drawing.Point(275, 260); + this.buttonSelect.Name = "buttonSelect"; + this.buttonSelect.Size = new System.Drawing.Size(94, 29); + this.buttonSelect.TabIndex = 9; + this.buttonSelect.Text = "Выбрать"; + this.buttonSelect.UseVisualStyleBackColor = true; + this.buttonSelect.Click += new System.EventHandler(this.buttonSelect_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.buttonSelect); this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.ButtonCreate); this.Controls.Add(this.buttonRight); @@ -193,5 +205,6 @@ public ToolStripStatusLabel toolStripStatusLabelSpeed; private Button ButtonCreate; private Button buttonCreateModif; + private Button buttonSelect; } } \ No newline at end of file diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs index 8ab85cd..a79afdc 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs @@ -4,7 +4,7 @@ namespace AirPlaneWithRadar public partial class FormPlain : Form { private DrawingPlain _plain; - + public DrawingPlain SelectedPlain { get; private set; } public FormPlain() { InitializeComponent(); @@ -77,6 +77,13 @@ namespace AirPlaneWithRadar SetData(); Draw(); } + private void buttonSelect_Click(object sender, EventArgs e) + { + SelectedPlain = _plain; + DialogResult = DialogResult.OK; + } + + } } diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/Program.cs b/AirPlaneWithRadar/AirPlaneWithRadar/Program.cs index cb92530..8cb6b9c 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 FormMap()); + Application.Run(new FormMapWithSetPlains()); } } } \ No newline at end of file -- 2.25.1 From 5ccb3d550f039dd24af64d8a784dc331f34048ea 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, 3 Oct 2022 20:10:03 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormMapWithSetPlains.Designer.cs | 48 +++++++------- .../AirPlaneWithRadar/FormMapWithSetPlains.cs | 16 +++-- .../FormMapWithSetPlains.resx | 62 +----------------- .../MapWithSetPlainGeneric.cs | 64 ++++++++++++++----- .../AirPlaneWithRadar/SetPlaneGeneric.cs | 59 ++++++++++++++--- 5 files changed, 135 insertions(+), 114 deletions(-) diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.Designer.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.Designer.cs index f87f8bc..60cdad9 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.Designer.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.Designer.cs @@ -30,14 +30,14 @@ { this.groupBoxTools = new System.Windows.Forms.GroupBox(); this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox(); - this.buttonRemoveCar = new System.Windows.Forms.Button(); + this.buttonRemovePlain = new System.Windows.Forms.Button(); this.buttonShowStorage = new System.Windows.Forms.Button(); this.buttonDown = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); this.buttonLeft = new System.Windows.Forms.Button(); this.buttonUp = new System.Windows.Forms.Button(); this.buttonShowOnMap = new System.Windows.Forms.Button(); - this.buttonAddCar = new System.Windows.Forms.Button(); + this.buttonAddPlain = new System.Windows.Forms.Button(); this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); this.pictureBox = new System.Windows.Forms.PictureBox(); this.groupBoxTools.SuspendLayout(); @@ -47,14 +47,14 @@ // groupBoxTools // this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition); - this.groupBoxTools.Controls.Add(this.buttonRemoveCar); + this.groupBoxTools.Controls.Add(this.buttonRemovePlain); this.groupBoxTools.Controls.Add(this.buttonShowStorage); this.groupBoxTools.Controls.Add(this.buttonDown); this.groupBoxTools.Controls.Add(this.buttonRight); this.groupBoxTools.Controls.Add(this.buttonLeft); this.groupBoxTools.Controls.Add(this.buttonUp); this.groupBoxTools.Controls.Add(this.buttonShowOnMap); - this.groupBoxTools.Controls.Add(this.buttonAddCar); + this.groupBoxTools.Controls.Add(this.buttonAddPlain); this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap); this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right; this.groupBoxTools.Location = new System.Drawing.Point(1057, 0); @@ -73,15 +73,15 @@ this.maskedTextBoxPosition.TabIndex = 2; this.maskedTextBoxPosition.ValidatingType = typeof(int); // - // buttonRemoveCar + // buttonRemovePlain // - this.buttonRemoveCar.Location = new System.Drawing.Point(17, 195); - this.buttonRemoveCar.Name = "buttonRemoveCar"; - this.buttonRemoveCar.Size = new System.Drawing.Size(175, 35); - this.buttonRemoveCar.TabIndex = 3; - this.buttonRemoveCar.Text = "Удалить автомобиль"; - this.buttonRemoveCar.UseVisualStyleBackColor = true; - this.buttonRemoveCar.Click += new System.EventHandler(this.ButtonRemoveCar_Click); + this.buttonRemovePlain.Location = new System.Drawing.Point(17, 195); + this.buttonRemovePlain.Name = "buttonRemovePlain"; + this.buttonRemovePlain.Size = new System.Drawing.Size(175, 35); + this.buttonRemovePlain.TabIndex = 3; + this.buttonRemovePlain.Text = "Удалить самолет"; + this.buttonRemovePlain.UseVisualStyleBackColor = true; + this.buttonRemovePlain.Click += new System.EventHandler(this.ButtonRemovePlain_Click); // // buttonShowStorage // @@ -103,6 +103,7 @@ this.buttonDown.Size = new System.Drawing.Size(30, 30); this.buttonDown.TabIndex = 10; this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); // // buttonRight // @@ -114,6 +115,7 @@ this.buttonRight.Size = new System.Drawing.Size(30, 30); this.buttonRight.TabIndex = 9; this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); // // buttonLeft // @@ -125,6 +127,7 @@ this.buttonLeft.Size = new System.Drawing.Size(30, 30); this.buttonLeft.TabIndex = 8; this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); // // buttonUp // @@ -136,6 +139,7 @@ this.buttonUp.Size = new System.Drawing.Size(30, 30); this.buttonUp.TabIndex = 7; this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); // // buttonShowOnMap // @@ -147,15 +151,15 @@ this.buttonShowOnMap.UseVisualStyleBackColor = true; this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click); // - // buttonAddCar + // buttonAddPlain // - this.buttonAddCar.Location = new System.Drawing.Point(17, 106); - this.buttonAddCar.Name = "buttonAddCar"; - this.buttonAddCar.Size = new System.Drawing.Size(175, 35); - this.buttonAddCar.TabIndex = 1; - this.buttonAddCar.Text = "Добавить автомобиль"; - this.buttonAddCar.UseVisualStyleBackColor = true; - this.buttonAddCar.Click += new System.EventHandler(this.ButtonAddCar_Click); + this.buttonAddPlain.Location = new System.Drawing.Point(17, 106); + this.buttonAddPlain.Name = "buttonAddPlain"; + this.buttonAddPlain.Size = new System.Drawing.Size(175, 35); + this.buttonAddPlain.TabIndex = 1; + this.buttonAddPlain.Text = "Добавить самолет"; + this.buttonAddPlain.UseVisualStyleBackColor = true; + this.buttonAddPlain.Click += new System.EventHandler(this.ButtonAddPlain_Click); // // comboBoxSelectorMap // @@ -201,13 +205,13 @@ private PictureBox pictureBox; private ComboBox comboBoxSelectorMap; private Button buttonShowOnMap; - private Button buttonAddCar; + private Button buttonAddPlain; private Button buttonDown; private Button buttonRight; private Button buttonLeft; private Button buttonUp; private Button buttonShowStorage; - private Button buttonRemoveCar; + private Button buttonRemovePlain; private MaskedTextBox maskedTextBoxPosition; } } \ No newline at end of file diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs index e979d8f..89e646c 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.cs @@ -17,6 +17,7 @@ namespace AirPlaneWithRadar { InitializeComponent(); } + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) { AbstractMap map = null; @@ -42,17 +43,20 @@ namespace AirPlaneWithRadar _mapPlainsCollectionGeneric = null; } } - private void ButtonAddCar_Click(object sender, EventArgs e) + private void ButtonAddPlain_Click(object sender, EventArgs e) { + if (_mapPlainsCollectionGeneric == null) { return; } + FormPlain form = new(); if (form.ShowDialog() == DialogResult.OK) { - DrawingObjectPlane car = new(form.SelectedPlain); - if (_mapPlainsCollectionGeneric + car) + DrawingObjectPlane plain = new(form.SelectedPlain); + + if ((_mapPlainsCollectionGeneric + plain)>=0) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _mapPlainsCollectionGeneric.ShowSet(); @@ -63,7 +67,7 @@ namespace AirPlaneWithRadar } } } - private void ButtonRemoveCar_Click(object sender, EventArgs e) + private void ButtonRemovePlain_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(maskedTextBoxPosition.Text)) { @@ -74,7 +78,7 @@ namespace AirPlaneWithRadar return; } int pos = Convert.ToInt32(maskedTextBoxPosition.Text); - if (_mapPlainsCollectionGeneric - pos) + if ((_mapPlainsCollectionGeneric - (pos-1)) != null) { MessageBox.Show("Объект удален"); pictureBox.Image = _mapPlainsCollectionGeneric.ShowSet(); @@ -106,7 +110,7 @@ namespace AirPlaneWithRadar { return; } - + string name = ((Button)sender)?.Name ?? string.Empty; Direction dir = Direction.None; switch (name) diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.resx b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.resx index 1af7de1..f298a7b 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.resx +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormMapWithSetPlains.resx @@ -1,64 +1,4 @@ - - - + diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/MapWithSetPlainGeneric.cs b/AirPlaneWithRadar/AirPlaneWithRadar/MapWithSetPlainGeneric.cs index 559a16d..d636c51 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/MapWithSetPlainGeneric.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/MapWithSetPlainGeneric.cs @@ -16,7 +16,7 @@ namespace AirPlaneWithRadar private readonly int _placeSizeWidth = 180; - private readonly int _placeSizeHeight = 90; + private readonly int _placeSizeHeight = 120; private readonly SetPlaneGeneric _setPlains; @@ -31,13 +31,13 @@ namespace AirPlaneWithRadar _pictureHeight = picHeight; _map = map; } - - public static bool operator +(MapWithSetPlainGeneric map, T car) + + public static int operator +(MapWithSetPlainGeneric map, T plain) { - return map._setPlains.Insert(car); + return map._setPlains.Insert(plain); } - public static bool operator -(MapWithSetPlainGeneric map, int position) + public static T operator -(MapWithSetPlainGeneric map, int position) { return map._setPlains.Remove(position); } @@ -56,10 +56,10 @@ namespace AirPlaneWithRadar Shaking(); for (int i = 0; i < _setPlains.Count; i++) { - var car = _setPlains.Get(i); - if (car != null) + var plain = _setPlains.Get(i); + if (plain != null) { - return _map.CreateMap(_pictureWidth, _pictureHeight, car); + return _map.CreateMap(_pictureWidth, _pictureHeight, plain); } } return new(_pictureWidth, _pictureHeight); @@ -83,10 +83,10 @@ namespace AirPlaneWithRadar { for (; j > i; j--) { - var car = _setPlains.Get(j); - if (car != null) + var plain = _setPlains.Get(j); + if (plain != null) { - _setPlains.Insert(car, i); + _setPlains.Insert(plain, i); _setPlains.Remove(j); break; } @@ -101,7 +101,8 @@ namespace AirPlaneWithRadar private void DrawBackground(Graphics g) { - + Brush BrushRazmetka = new SolidBrush(Color.DarkGray); + g.FillRectangle(BrushRazmetka, 0, 0, _pictureWidth, _pictureHeight); Pen pen = new(Color.White, 5); for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++) { @@ -115,12 +116,43 @@ namespace AirPlaneWithRadar } private void DrawPlains(Graphics g) { - - for (int i = 0; i < _setPlains.Count; i++) - { + int CountWidth = _pictureWidth / _placeSizeWidth; - _setPlains.Get(i)?.DrawningObject(g); + int x = _pictureWidth - _placeSizeWidth - _placeSizeWidth/2 - _placeSizeWidth / 4; + int y = (_pictureHeight - _placeSizeHeight)- _placeSizeHeight/2; + + for (int k = 0; k < _setPlains.Count; k++) + { + if (_setPlains.Get(k) != null) + { + if ((k+1) % CountWidth != 0 || k ==0) + { + _setPlains.Get(k)?.SetObject(x, y, _pictureWidth, _pictureHeight); + _setPlains.Get(k)?.DrawningObject(g); + x -= _placeSizeWidth; + } + else + { + + _setPlains.Get(k)?.SetObject(x, y, _pictureWidth, _pictureHeight); + _setPlains.Get(k)?.DrawningObject(g); + x = _pictureWidth - _placeSizeWidth - _placeSizeWidth / 2 - _placeSizeWidth / 4; + y -= _placeSizeHeight ; + + } + } + if (_setPlains.Get(k) == null) + { + if ((k + 1) % CountWidth != 0 || k ==0) + x -= _placeSizeWidth; + else + { + x = _pictureWidth - _placeSizeWidth - _placeSizeWidth / 2 - _placeSizeWidth / 4; + y -= _placeSizeHeight; + } + } } + } } } diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/SetPlaneGeneric.cs b/AirPlaneWithRadar/AirPlaneWithRadar/SetPlaneGeneric.cs index b49139f..b030bd8 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/SetPlaneGeneric.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/SetPlaneGeneric.cs @@ -15,22 +15,63 @@ namespace AirPlaneWithRadar { _places = new T[count]; } - public bool Insert(T plain) + public int Insert(T plain) { - - - return true; + int i; + for (i = 0; i < Count; i++) + { + if (_places[i] == null) + { + for (int j = i; j >= 1; j--) + { + _places[j] = _places[j - 1]; + } + _places[0] = plain; + return i; + } + } + + return -1; } public bool Insert(T plain, int position) { - - return true; + if (position > Count || position < 0) + return false; + if (_places[position] == null) + { + _places[position] = plain; + return true; + } + else + { + for (int i = position; i < Count; i++) + { + if (_places[i] == null) + { + for (int j = i; j >= position + 1; j--) + { + _places[j] = _places[j - 1]; + } + _places[position] = plain; + return true; + } + } + } + return false; } - public bool Remove(int position) + public T Remove(int position) { - - return false; + T mid; + if (_places[position] != null) + { + mid = _places[position]; + _places[position] = null; + return mid; + + } + else + return null; } public T Get(int position) { -- 2.25.1 From cceb17014c5167224045364036c5f6b4813cecfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BE=D0=BB=D0=BE=D0=B4=D1=8F?= Date: Sun, 9 Oct 2022 21:48:40 +0300 Subject: [PATCH 4/5] =?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=D1=86=D0=B2=D0=B5=D1=82=D0=BE=D0=B2=D0=BE?= =?UTF-8?q?=D0=B3=D0=BE=20=D0=B4=D0=B8=D0=B0=D0=BB=D0=BE=D0=B3=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AirPlaneWithRadar/FormPlain.cs | 30 +++++++++++++------ .../AirPlaneWithRadar/SetPlaneGeneric.cs | 2 +- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs index a79afdc..f2205e4 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/FormPlain.cs @@ -29,10 +29,13 @@ namespace AirPlaneWithRadar 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))); - - - + Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)); + ColorDialog dialog = new(); + if (dialog.ShowDialog() == DialogResult.OK) + { + color = dialog.Color; + } + _plain = new DrawingPlain(rnd.Next(100, 300), rnd.Next(1000, 2000), color); SetData(); Draw(); } @@ -67,13 +70,22 @@ namespace AirPlaneWithRadar { Random rnd = new(); + Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)); + ColorDialog dialog = new(); + if (dialog.ShowDialog() == DialogResult.OK) + { + color = dialog.Color; + } + Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)); + ColorDialog dialogDop = new(); + if (dialogDop.ShowDialog() == DialogResult.OK) + { + dopColor = dialogDop.Color; + } _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)), + color, + dopColor, Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); - - - SetData(); Draw(); } diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/SetPlaneGeneric.cs b/AirPlaneWithRadar/AirPlaneWithRadar/SetPlaneGeneric.cs index b030bd8..03b74b3 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/SetPlaneGeneric.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/SetPlaneGeneric.cs @@ -63,7 +63,7 @@ namespace AirPlaneWithRadar public T Remove(int position) { T mid; - if (_places[position] != null) + if (_places[position] != null && position < _places.Length) { mid = _places[position]; _places[position] = null; -- 2.25.1 From d9c71375fa7b05c64a55bb3eb272ef7942672462 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, 10 Oct 2022 09:24:07 +0300 Subject: [PATCH 5/5] =?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=B2=D0=BE=D0=B7=D0=B2=D1=80=D0=B0=D1=89=D0=B0?= =?UTF-8?q?=D0=B5=D0=BC=D0=BE=D0=B3=D0=BE=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20Insert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AirPlaneWithRadar/MapWithSetPlainGeneric.cs | 6 +++--- .../AirPlaneWithRadar/SetPlaneGeneric.cs | 13 +++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/MapWithSetPlainGeneric.cs b/AirPlaneWithRadar/AirPlaneWithRadar/MapWithSetPlainGeneric.cs index d636c51..0c116dc 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/MapWithSetPlainGeneric.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/MapWithSetPlainGeneric.cs @@ -119,7 +119,7 @@ namespace AirPlaneWithRadar int CountWidth = _pictureWidth / _placeSizeWidth; int x = _pictureWidth - _placeSizeWidth - _placeSizeWidth/2 - _placeSizeWidth / 4; - int y = (_pictureHeight - _placeSizeHeight)- _placeSizeHeight/2; + int y = _placeSizeHeight/4; for (int k = 0; k < _setPlains.Count; k++) { @@ -137,7 +137,7 @@ namespace AirPlaneWithRadar _setPlains.Get(k)?.SetObject(x, y, _pictureWidth, _pictureHeight); _setPlains.Get(k)?.DrawningObject(g); x = _pictureWidth - _placeSizeWidth - _placeSizeWidth / 2 - _placeSizeWidth / 4; - y -= _placeSizeHeight ; + y += _placeSizeHeight ; } } @@ -148,7 +148,7 @@ namespace AirPlaneWithRadar else { x = _pictureWidth - _placeSizeWidth - _placeSizeWidth / 2 - _placeSizeWidth / 4; - y -= _placeSizeHeight; + y += _placeSizeHeight; } } } diff --git a/AirPlaneWithRadar/AirPlaneWithRadar/SetPlaneGeneric.cs b/AirPlaneWithRadar/AirPlaneWithRadar/SetPlaneGeneric.cs index 03b74b3..15fd5a5 100644 --- a/AirPlaneWithRadar/AirPlaneWithRadar/SetPlaneGeneric.cs +++ b/AirPlaneWithRadar/AirPlaneWithRadar/SetPlaneGeneric.cs @@ -6,8 +6,9 @@ using System.Threading.Tasks; namespace AirPlaneWithRadar { - internal class SetPlaneGeneric + internal class SetPlaneGeneric where T : class + { private readonly T[] _places; public int Count => _places.Length; @@ -33,14 +34,14 @@ namespace AirPlaneWithRadar return -1; } - public bool Insert(T plain, int position) + public int Insert(T plain, int position) { if (position > Count || position < 0) - return false; + return -1; if (_places[position] == null) { _places[position] = plain; - return true; + return position; } else { @@ -53,11 +54,11 @@ namespace AirPlaneWithRadar _places[j] = _places[j - 1]; } _places[position] = plain; - return true; + return position; } } } - return false; + return -1; } public T Remove(int position) -- 2.25.1