From 7b553ddbb5a1b6cb399fa9fd431378d3c51d304d Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Sat, 24 Sep 2022 23:24:31 +0400 Subject: [PATCH 1/8] =?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 --- Airbus/Airbus/DrawingAirbus.cs | 7 +++---- Airbus/Airbus/EntityAirbus.cs | 2 +- Airbus/Airbus/Form1.cs | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Airbus/Airbus/DrawingAirbus.cs b/Airbus/Airbus/DrawingAirbus.cs index 618c64e..36596f2 100644 --- a/Airbus/Airbus/DrawingAirbus.cs +++ b/Airbus/Airbus/DrawingAirbus.cs @@ -16,7 +16,7 @@ namespace Airbus private float _startPosY; //верхняя координата отрисовки private int? _pictureWidth = null; //ширина окна отрисовки - + private int? _pictureHeight = null; //высота окна отрисовки protected readonly int _airbusWidth = 50; //ширина отрисовки самолёта @@ -24,10 +24,9 @@ namespace Airbus protected readonly int _airbusHeight = 16; //высота отрисовки самолёта //инициализаци свойств - public void Initial(int speed, float weight, Color corpusColor) + public DrawingAirbus(int speed, float weight, Color corpusColor) { - Airbus = new EntityAirbus(); - Airbus.Initial(speed, weight, corpusColor); + Airbus = new EntityAirbus(speed, weight, corpusColor); } //установка координат позиции самолёта diff --git a/Airbus/Airbus/EntityAirbus.cs b/Airbus/Airbus/EntityAirbus.cs index c2beb31..3033781 100644 --- a/Airbus/Airbus/EntityAirbus.cs +++ b/Airbus/Airbus/EntityAirbus.cs @@ -16,7 +16,7 @@ namespace Airbus public float Step => Speed * 100 / Weight; //шаг перемещения самолёта - public void Initial(int speed, float weight, Color corpusColor) + public EntityAirbus(int speed, float weight, Color corpusColor) { Speed = speed; Weight = weight; diff --git a/Airbus/Airbus/Form1.cs b/Airbus/Airbus/Form1.cs index 076d42a..19a10c1 100644 --- a/Airbus/Airbus/Form1.cs +++ b/Airbus/Airbus/Form1.cs @@ -32,8 +32,7 @@ namespace Airbus private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _airbus = new DrawingAirbus(); - _airbus.Initial(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + _airbus = new DrawingAirbus(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); _airbus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirbus.Width, pictureBoxAirbus.Height); toolStripStatusLabelSpeed.Text = $"Скорость: {_airbus.Airbus?.Speed}"; toolStripStatusLabelWeight.Text = $"Вес: {_airbus.Airbus?.Weight}"; From c4a88ba804354d2c4e4433a06ed54b400a8ce107 Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Sun, 25 Sep 2022 01:12:44 +0400 Subject: [PATCH 2/8] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B4=D0=B2=D0=B8=D0=BD?= =?UTF-8?q?=D1=83=D1=82=D1=8B=D0=B9=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Airbus/Airbus/DrawingAirbus.cs | 17 +++++++--- Airbus/Airbus/DrawingSuperAirbus.cs | 49 +++++++++++++++++++++++++++++ Airbus/Airbus/EntityAirbus.cs | 1 + Airbus/Airbus/EntitySuperAirbus.cs | 30 ++++++++++++++++++ Airbus/Airbus/Form1.Designer.cs | 16 +++++++++- Airbus/Airbus/Form1.cs | 34 +++++++++++++++----- Airbus/Airbus/Form1.resx | 6 ++-- 7 files changed, 137 insertions(+), 16 deletions(-) create mode 100644 Airbus/Airbus/DrawingSuperAirbus.cs create mode 100644 Airbus/Airbus/EntitySuperAirbus.cs diff --git a/Airbus/Airbus/DrawingAirbus.cs b/Airbus/Airbus/DrawingAirbus.cs index 36596f2..e9cd0dd 100644 --- a/Airbus/Airbus/DrawingAirbus.cs +++ b/Airbus/Airbus/DrawingAirbus.cs @@ -6,14 +6,14 @@ using System.Threading.Tasks; namespace Airbus { - //класс, отвечающий за прорисовку и перемещение объект + //класс, отвечающий за прорисовку и перемещение объекта internal class DrawingAirbus { - public EntityAirbus Airbus { get; private set; } //класс-сущность + public EntityAirbus Airbus { get; protected set; } //класс-сущность - private float _startPosX; //левая координата отрисовки + protected float _startPosX; //левая координата отрисовки - private float _startPosY; //верхняя координата отрисовки + protected float _startPosY; //верхняя координата отрисовки private int? _pictureWidth = null; //ширина окна отрисовки @@ -29,6 +29,13 @@ namespace Airbus Airbus = new EntityAirbus(speed, weight, corpusColor); } + protected DrawingAirbus(int speed, float weight, Color corpusColor, int airbusWidth, int airbusHeight) : + this(speed, weight, corpusColor) + { + _airbusWidth = airbusWidth; + _airbusHeight = airbusHeight; + } + //установка координат позиции самолёта public void SetPosition(int x, int y, int width, int height) { @@ -87,7 +94,7 @@ namespace Airbus } //отрисовка самолёта - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) { diff --git a/Airbus/Airbus/DrawingSuperAirbus.cs b/Airbus/Airbus/DrawingSuperAirbus.cs new file mode 100644 index 0000000..a83295f --- /dev/null +++ b/Airbus/Airbus/DrawingSuperAirbus.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Airbus +{ + internal class DrawingSuperAirbus : DrawingAirbus + { + //Инициализаци свойств + public DrawingSuperAirbus(int speed, float weight, Color corpusColor, Color addColor, bool addCompartment, bool addEngine) : + base(speed, weight, corpusColor, 110, 60) + { + Airbus = new EntitySuperAirbus(speed, weight, corpusColor, addColor, addCompartment, addEngine); + } + + public override void DrawTransport(Graphics g) + { + if (Airbus is not EntitySuperAirbus superAirbus) + { + return; + } + + Pen pen = new(Color.Black); + Brush addBrush = new SolidBrush(superAirbus.AddColor); + + //дополнительный пассажирский отсек + if (superAirbus.AddСompartment) + { + g.FillRectangle(addBrush, _startPosX + 30, _startPosY + 12, 14, 3); + g.DrawRectangle(pen, _startPosX + 30, _startPosY + 12, 14, 3); + } + + _startPosX += 10; + _startPosY += 5; + base.DrawTransport(g); + _startPosX -= 10; + _startPosY -= 5; + + //дополнительный двигатель + if (superAirbus.AddEngine) + { + g.FillEllipse(addBrush, _startPosX + 24, _startPosY + 22, 10, 5); + g.DrawEllipse(pen, _startPosX + 24, _startPosY + 22, 10, 5); + } + } + } +} diff --git a/Airbus/Airbus/EntityAirbus.cs b/Airbus/Airbus/EntityAirbus.cs index 3033781..e09d934 100644 --- a/Airbus/Airbus/EntityAirbus.cs +++ b/Airbus/Airbus/EntityAirbus.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; namespace Airbus { + //класс-сущность аэробус internal class EntityAirbus { public int Speed { get; private set; } //скорость diff --git a/Airbus/Airbus/EntitySuperAirbus.cs b/Airbus/Airbus/EntitySuperAirbus.cs new file mode 100644 index 0000000..264d36d --- /dev/null +++ b/Airbus/Airbus/EntitySuperAirbus.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Airbus +{ + //класс-сущность супер аэробус + internal class EntitySuperAirbus : EntityAirbus + { + //Дополнительный цвет + public Color AddColor { get; private set; } + + //Признак наличия дополнительно пассажирского отсека + public bool AddСompartment { get; private set; } + + //Признак наличия доплнительных двигателей + public bool AddEngine { get; private set; } + + //Инициализация свойств + public EntitySuperAirbus(int speed, float weight, Color corpusColor, Color addColor, bool addCompartment, bool addEngine) : + base(speed, weight, corpusColor) + { + AddColor = addColor; + AddСompartment = addCompartment; + AddEngine = addEngine; + } + } +} diff --git a/Airbus/Airbus/Form1.Designer.cs b/Airbus/Airbus/Form1.Designer.cs index 412c891..8f24a42 100644 --- a/Airbus/Airbus/Form1.Designer.cs +++ b/Airbus/Airbus/Form1.Designer.cs @@ -39,6 +39,7 @@ this.buttonLeft = new System.Windows.Forms.Button(); this.buttonDown = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirbus)).BeginInit(); this.statusStrip1.SuspendLayout(); this.SuspendLayout(); @@ -89,7 +90,7 @@ this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.buttonCreate.Location = new System.Drawing.Point(12, 392); this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(94, 29); + this.buttonCreate.Size = new System.Drawing.Size(95, 30); this.buttonCreate.TabIndex = 2; this.buttonCreate.Text = "Создать"; this.buttonCreate.UseVisualStyleBackColor = true; @@ -143,11 +144,23 @@ this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.Click += new System.EventHandler(this.ButtonMove_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, 392); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(120, 30); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonDown); this.Controls.Add(this.buttonLeft); @@ -177,5 +190,6 @@ private Button buttonLeft; private Button buttonDown; private Button buttonRight; + private Button buttonCreateModif; } } \ No newline at end of file diff --git a/Airbus/Airbus/Form1.cs b/Airbus/Airbus/Form1.cs index 19a10c1..099483a 100644 --- a/Airbus/Airbus/Form1.cs +++ b/Airbus/Airbus/Form1.cs @@ -27,22 +27,30 @@ namespace Airbus _airbus?.DrawTransport(gr); pictureBoxAirbus.Image = bmp; } + + //метод установки данных + private void SetData() + { + Random rnd = new(); + toolStripStatusLabelSpeed.Text = $"Скорость: {_airbus.Airbus?.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {_airbus.Airbus?.Weight}"; + toolStripStatusLabelCorpusColor.Text = $"Цвет: {_airbus.Airbus?.CorpusColor.Name}"; + _airbus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirbus.Width, pictureBoxAirbus.Height); + } //обработка нажатия кнопки "Создать" private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _airbus = new DrawingAirbus(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - _airbus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirbus.Width, pictureBoxAirbus.Height); - toolStripStatusLabelSpeed.Text = $"Скорость: {_airbus.Airbus?.Speed}"; - toolStripStatusLabelWeight.Text = $"Вес: {_airbus.Airbus?.Weight}"; - toolStripStatusLabelCorpusColor.Text = $"Цвет: {_airbus.Airbus?.CorpusColor.Name}"; + _airbus = new DrawingAirbus(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(); Draw(); } private void ButtonMove_Click(object sender, EventArgs e) { - //получаем имя кнопки + //Получаем имя кнопки string name = ((Button)sender)?.Name ?? string.Empty; switch (name) { @@ -62,11 +70,23 @@ namespace Airbus Draw(); } - // Изменение размеров формы + //изменение размеров формы private void PictureBoxCar_Resize(object sender, EventArgs e) { _airbus?.ChangeBorders(pictureBoxAirbus.Width, pictureBoxAirbus.Height); Draw(); } + + //обработка нажития кнопки "Модификация" + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + _airbus = new DrawingSuperAirbus(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/Airbus/Airbus/Form1.resx b/Airbus/Airbus/Form1.resx index a5f411d..f9f7fdf 100644 --- a/Airbus/Airbus/Form1.resx +++ b/Airbus/Airbus/Form1.resx @@ -64,7 +64,7 @@ iVBORw0KGgoAAAANSUhEUgAAA5gAAAOYBAMAAABC5kGOAAAABGdBTUEAALGPC/xhBQAAABtQTFRF//// - AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOwAAADsABataJCQAAFsZJREFUeNrt + AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOvgAADr4B6kKxwAAAFsZJREFUeNrt nT2LJMkVRZNC0O4WNDtrptppWxS9rDkjBLLFMItcIRZkqmBBrtbS/mzNR+1OV1V+RGbGu++9yHO9O1bl HE69jIzI6u7pS/ruSxqs/eGvv3z389t2L/BrbfriPtc/nI8f86bdC/xam764z3l3/JzHVi/wVW364j7l +XjJvxu9wFe16Yv7lPNvMB8bvcCb+jGHyz+1VvuH4+952+IFvq5dyxf3qZy/wvxvixe4I5ivxTw+Hp6A @@ -168,7 +168,7 @@ iVBORw0KGgoAAAANSUhEUgAAA5gAAAOYBAMAAABC5kGOAAAABGdBTUEAALGPC/xhBQAAABtQTFRF//// - AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOwAAADsABataJCQAAFodJREFUeNrt + AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOvgAADr4B6kKxwAAAFodJREFUeNrt nU2PHEd2RQsFAdy6BvRQy56GAf+AhgwvJcOA1gYhw1vD0KxbhhbeDgb632aTzSYZnVFVWRkf7508x6s3 Xsx0HVxGRUTeysPhcLz/xOETA8affzvBeff7lA92/H/n8afTDni7C5l3u3D5ZHMHMr877YQf+TL3EswP 0Rwv88PH+/wfPf8nvcfTbhj8wX6cx/53vjnthke8zL+cdsM/4GXit5hfeKdMDt/jZZ52BF3m8bQj7uAy @@ -271,7 +271,7 @@ iVBORw0KGgoAAAANSUhEUgAAA5gAAAOYBAMAAABC5kGOAAAABGdBTUEAALGPC/xhBQAAABtQTFRF//// - AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOwAAADsABataJCQAAGCxJREFUeNrt + AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOvgAADr4B6kKxwAAAGCxJREFUeNrt nU2LHEcWRdNFg2dbM7bby6LwP2jK6xEY/ANEe2+M963GMLM1xoN/9thSy5Ki4kXlV0S8G++c3dNGBIeb 2ZWRN2M6n0/TO87vGG48Hb7/9Y9fTuMu8O8xgMzDm+Of3J+QqT+eXh3f8gUy9cfPjy88DbrAQDLfB/PP C+005ALPgWTeHY9JNJEpO372QeZLNJGpOn64yv4VzcN4C/x4HF7mm49k3p/GW+DH4/CX2ePHPA24wHNU From 98ffecd55679be8cd5fedc5b22b049a48050b4a1 Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Sun, 25 Sep 2022 22:10:10 +0400 Subject: [PATCH 3/8] =?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 --- .../{DrawingAirbus.cs => DrawningAirbus.cs} | 12 ++++-- Airbus/Airbus/DrawningObjectAirbus.cs | 40 +++++++++++++++++++ ...gSuperAirbus.cs => DrawningSuperAirbus.cs} | 4 +- Airbus/Airbus/Form1.cs | 6 +-- Airbus/Airbus/IDrawningObject.cs | 27 +++++++++++++ 5 files changed, 81 insertions(+), 8 deletions(-) rename Airbus/Airbus/{DrawingAirbus.cs => DrawningAirbus.cs} (91%) create mode 100644 Airbus/Airbus/DrawningObjectAirbus.cs rename Airbus/Airbus/{DrawingSuperAirbus.cs => DrawningSuperAirbus.cs} (88%) create mode 100644 Airbus/Airbus/IDrawningObject.cs diff --git a/Airbus/Airbus/DrawingAirbus.cs b/Airbus/Airbus/DrawningAirbus.cs similarity index 91% rename from Airbus/Airbus/DrawingAirbus.cs rename to Airbus/Airbus/DrawningAirbus.cs index e9cd0dd..de5b573 100644 --- a/Airbus/Airbus/DrawingAirbus.cs +++ b/Airbus/Airbus/DrawningAirbus.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace Airbus { //класс, отвечающий за прорисовку и перемещение объекта - internal class DrawingAirbus + internal class DrawningAirbus { public EntityAirbus Airbus { get; protected set; } //класс-сущность @@ -24,12 +24,12 @@ namespace Airbus protected readonly int _airbusHeight = 16; //высота отрисовки самолёта //инициализаци свойств - public DrawingAirbus(int speed, float weight, Color corpusColor) + public DrawningAirbus(int speed, float weight, Color corpusColor) { Airbus = new EntityAirbus(speed, weight, corpusColor); } - protected DrawingAirbus(int speed, float weight, Color corpusColor, int airbusWidth, int airbusHeight) : + protected DrawningAirbus(int speed, float weight, Color corpusColor, int airbusWidth, int airbusHeight) : this(speed, weight, corpusColor) { _airbusWidth = airbusWidth; @@ -156,5 +156,11 @@ namespace Airbus _startPosY = _pictureHeight.Value - _airbusHeight; } } + + //получение текущей позиции объекта + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (_startPosX, _startPosY, _startPosX + _airbusWidth, _startPosY + _airbusHeight); + } } } diff --git a/Airbus/Airbus/DrawningObjectAirbus.cs b/Airbus/Airbus/DrawningObjectAirbus.cs new file mode 100644 index 0000000..a6636cb --- /dev/null +++ b/Airbus/Airbus/DrawningObjectAirbus.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Airbus +{ + internal class DrawningObjectAirbus : IDrawningObject + { + private DrawningAirbus _airbus; + + public float Step => _airbus?.Airbus?.Step ?? 0; + + public DrawningObjectAirbus(DrawningAirbus airbus) + { + _airbus = airbus; + } + + void IDrawningObject.DrawningObject(Graphics g) + { + //ДОДУМАТЬ ЛОГИКУ ЭТОГО МЕТОДА + } + + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return _airbus?.GetCurrentPosition() ?? default; + } + + public void MoveObject(Direction direction) + { + _airbus?.MoveTransport(direction); + } + + public void SetObject(int x, int y, int width, int height) + { + _airbus?.SetPosition(x, y, width, height); + } + } +} diff --git a/Airbus/Airbus/DrawingSuperAirbus.cs b/Airbus/Airbus/DrawningSuperAirbus.cs similarity index 88% rename from Airbus/Airbus/DrawingSuperAirbus.cs rename to Airbus/Airbus/DrawningSuperAirbus.cs index a83295f..2658f09 100644 --- a/Airbus/Airbus/DrawingSuperAirbus.cs +++ b/Airbus/Airbus/DrawningSuperAirbus.cs @@ -6,10 +6,10 @@ using System.Threading.Tasks; namespace Airbus { - internal class DrawingSuperAirbus : DrawingAirbus + internal class DrawningSuperAirbus : DrawningAirbus { //Инициализаци свойств - public DrawingSuperAirbus(int speed, float weight, Color corpusColor, Color addColor, bool addCompartment, bool addEngine) : + public DrawningSuperAirbus(int speed, float weight, Color corpusColor, Color addColor, bool addCompartment, bool addEngine) : base(speed, weight, corpusColor, 110, 60) { Airbus = new EntitySuperAirbus(speed, weight, corpusColor, addColor, addCompartment, addEngine); diff --git a/Airbus/Airbus/Form1.cs b/Airbus/Airbus/Form1.cs index 099483a..1f8e0a0 100644 --- a/Airbus/Airbus/Form1.cs +++ b/Airbus/Airbus/Form1.cs @@ -12,7 +12,7 @@ namespace Airbus { public partial class Form1 : Form { - private DrawingAirbus _airbus; + private DrawningAirbus _airbus; public Form1() { @@ -42,7 +42,7 @@ namespace Airbus private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _airbus = new DrawingAirbus(rnd.Next(100, 300), rnd.Next(1000, 2000), + _airbus = new DrawningAirbus(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); SetData(); Draw(); @@ -81,7 +81,7 @@ namespace Airbus private void ButtonCreateModif_Click(object sender, EventArgs e) { Random rnd = new(); - _airbus = new DrawingSuperAirbus(rnd.Next(100, 300), rnd.Next(1000, 2000), + _airbus = new DrawningSuperAirbus(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))); diff --git a/Airbus/Airbus/IDrawningObject.cs b/Airbus/Airbus/IDrawningObject.cs new file mode 100644 index 0000000..5da91a0 --- /dev/null +++ b/Airbus/Airbus/IDrawningObject.cs @@ -0,0 +1,27 @@ +using Microsoft.VisualBasic.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Airbus +{ + internal interface IDrawningObject + { + //шаг перемещения объекта + 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 fc7c4b87fb7905e98f4087c1d602cf6a9425d56d Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Sun, 25 Sep 2022 23:32:24 +0400 Subject: [PATCH 4/8] =?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 --- Airbus/Airbus/AbstractMap.cs | 95 ++++++++ Airbus/Airbus/Direction.cs | 3 +- ...rm1.Designer.cs => FormAirbus.Designer.cs} | 4 +- Airbus/Airbus/{Form1.cs => FormAirbus.cs} | 4 +- Airbus/Airbus/{Form1.resx => FormAirbus.resx} | 6 +- Airbus/Airbus/FormMap.Designer.cs | 209 ++++++++++++++++++ Airbus/Airbus/FormMap.cs | 87 ++++++++ Airbus/Airbus/FormMap.resx | 63 ++++++ Airbus/Airbus/Program.cs | 2 +- Airbus/Airbus/SimpleMap.cs | 55 +++++ 10 files changed, 519 insertions(+), 9 deletions(-) create mode 100644 Airbus/Airbus/AbstractMap.cs rename Airbus/Airbus/{Form1.Designer.cs => FormAirbus.Designer.cs} (99%) rename Airbus/Airbus/{Form1.cs => FormAirbus.cs} (97%) rename Airbus/Airbus/{Form1.resx => FormAirbus.resx} (99%) create mode 100644 Airbus/Airbus/FormMap.Designer.cs create mode 100644 Airbus/Airbus/FormMap.cs create mode 100644 Airbus/Airbus/FormMap.resx create mode 100644 Airbus/Airbus/SimpleMap.cs diff --git a/Airbus/Airbus/AbstractMap.cs b/Airbus/Airbus/AbstractMap.cs new file mode 100644 index 0000000..14a9235 --- /dev/null +++ b/Airbus/Airbus/AbstractMap.cs @@ -0,0 +1,95 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Airbus +{ + internal abstract class AbstractMap + { + private IDrawningObject _drawningObject = null; + protected int[,] _map = null; + protected int _width; + protected int _height; + protected float _size_x; + protected float _size_y; + protected readonly Random _random = new(); + protected readonly int _freeRoad = 0; + protected readonly int _barrier = 1; + + public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject) + { + _width = width; + _height = height; + _drawningObject = drawningObject; + + GenerateMap(); + while (!SetObjectOnMap()) + { + GenerateMap(); + } + + return DrawMapWithObject(); + } + + public Bitmap MoveObject(Direction direction) + { + //Сделать проверку на то, что объект может поместиться в выбранном направлении + 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); + //Сделать проверку на то, то объект не "накладывается" на закрытые участки + 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/Airbus/Airbus/Direction.cs b/Airbus/Airbus/Direction.cs index 3276803..7e54263 100644 --- a/Airbus/Airbus/Direction.cs +++ b/Airbus/Airbus/Direction.cs @@ -12,6 +12,7 @@ namespace Airbus Up = 1, Down = 2, Left = 3, - Right = 4 + Right = 4, + None = 5 } } diff --git a/Airbus/Airbus/Form1.Designer.cs b/Airbus/Airbus/FormAirbus.Designer.cs similarity index 99% rename from Airbus/Airbus/Form1.Designer.cs rename to Airbus/Airbus/FormAirbus.Designer.cs index 8f24a42..3713d67 100644 --- a/Airbus/Airbus/Form1.Designer.cs +++ b/Airbus/Airbus/FormAirbus.Designer.cs @@ -1,6 +1,6 @@ namespace Airbus { - partial class Form1 + partial class FormAirbus { /// /// Required designer variable. @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormAirbus)); this.pictureBoxAirbus = new System.Windows.Forms.PictureBox(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); diff --git a/Airbus/Airbus/Form1.cs b/Airbus/Airbus/FormAirbus.cs similarity index 97% rename from Airbus/Airbus/Form1.cs rename to Airbus/Airbus/FormAirbus.cs index 1f8e0a0..08fd0b6 100644 --- a/Airbus/Airbus/Form1.cs +++ b/Airbus/Airbus/FormAirbus.cs @@ -10,11 +10,11 @@ using System.Windows.Forms; namespace Airbus { - public partial class Form1 : Form + public partial class FormAirbus : Form { private DrawningAirbus _airbus; - public Form1() + public FormAirbus() { InitializeComponent(); } diff --git a/Airbus/Airbus/Form1.resx b/Airbus/Airbus/FormAirbus.resx similarity index 99% rename from Airbus/Airbus/Form1.resx rename to Airbus/Airbus/FormAirbus.resx index f9f7fdf..2e6fdd9 100644 --- a/Airbus/Airbus/Form1.resx +++ b/Airbus/Airbus/FormAirbus.resx @@ -64,7 +64,7 @@ iVBORw0KGgoAAAANSUhEUgAAA5gAAAOYBAMAAABC5kGOAAAABGdBTUEAALGPC/xhBQAAABtQTFRF//// - AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOvgAADr4B6kKxwAAAFsZJREFUeNrt + AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOvQAADr0BR/uQrQAAFsZJREFUeNrt nT2LJMkVRZNC0O4WNDtrptppWxS9rDkjBLLFMItcIRZkqmBBrtbS/mzNR+1OV1V+RGbGu++9yHO9O1bl HE69jIzI6u7pS/ruSxqs/eGvv3z389t2L/BrbfriPtc/nI8f86bdC/xam764z3l3/JzHVi/wVW364j7l +XjJvxu9wFe16Yv7lPNvMB8bvcCb+jGHyz+1VvuH4+952+IFvq5dyxf3qZy/wvxvixe4I5ivxTw+Hp6A @@ -168,7 +168,7 @@ iVBORw0KGgoAAAANSUhEUgAAA5gAAAOYBAMAAABC5kGOAAAABGdBTUEAALGPC/xhBQAAABtQTFRF//// - AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOvgAADr4B6kKxwAAAFodJREFUeNrt + AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOvQAADr0BR/uQrQAAFodJREFUeNrt nU2PHEd2RQsFAdy6BvRQy56GAf+AhgwvJcOA1gYhw1vD0KxbhhbeDgb632aTzSYZnVFVWRkf7508x6s3 Xsx0HVxGRUTeysPhcLz/xOETA8affzvBeff7lA92/H/n8afTDni7C5l3u3D5ZHMHMr877YQf+TL3EswP 0Rwv88PH+/wfPf8nvcfTbhj8wX6cx/53vjnthke8zL+cdsM/4GXit5hfeKdMDt/jZZ52BF3m8bQj7uAy @@ -271,7 +271,7 @@ iVBORw0KGgoAAAANSUhEUgAAA5gAAAOYBAMAAABC5kGOAAAABGdBTUEAALGPC/xhBQAAABtQTFRF//// - AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOvgAADr4B6kKxwAAAGCxJREFUeNrt + AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOvQAADr0BR/uQrQAAGCxJREFUeNrt nU2LHEcWRdNFg2dbM7bby6LwP2jK6xEY/ANEe2+M963GMLM1xoN/9thSy5Ki4kXlV0S8G++c3dNGBIeb 2ZWRN2M6n0/TO87vGG48Hb7/9Y9fTuMu8O8xgMzDm+Of3J+QqT+eXh3f8gUy9cfPjy88DbrAQDLfB/PP C+005ALPgWTeHY9JNJEpO372QeZLNJGpOn64yv4VzcN4C/x4HF7mm49k3p/GW+DH4/CX2ePHPA24wHNU diff --git a/Airbus/Airbus/FormMap.Designer.cs b/Airbus/Airbus/FormMap.Designer.cs new file mode 100644 index 0000000..bc610f1 --- /dev/null +++ b/Airbus/Airbus/FormMap.Designer.cs @@ -0,0 +1,209 @@ +namespace Airbus +{ + 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.pictureBoxAirbus = new System.Windows.Forms.PictureBox(); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelCorpusColor = new System.Windows.Forms.ToolStripStatusLabel(); + this.buttonCreate = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonRight = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirbus)).BeginInit(); + this.statusStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBoxAirbus + // + this.pictureBoxAirbus.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxAirbus.Location = new System.Drawing.Point(0, 0); + this.pictureBoxAirbus.Name = "pictureBoxAirbus"; + this.pictureBoxAirbus.Size = new System.Drawing.Size(800, 424); + this.pictureBoxAirbus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxAirbus.TabIndex = 0; + this.pictureBoxAirbus.TabStop = false; + // + // statusStrip1 + // + this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelCorpusColor}); + this.statusStrip1.Location = new System.Drawing.Point(0, 424); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(800, 26); + this.statusStrip1.TabIndex = 1; + this.statusStrip1.Text = "statusStrip1"; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20); + this.toolStripStatusLabelSpeed.Text = "Скорость:"; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20); + this.toolStripStatusLabelWeight.Text = "Вес:"; + // + // toolStripStatusLabelCorpusColor + // + this.toolStripStatusLabelCorpusColor.Name = "toolStripStatusLabelCorpusColor"; + this.toolStripStatusLabelCorpusColor.Size = new System.Drawing.Size(45, 20); + this.toolStripStatusLabelCorpusColor.Text = "Цвет:"; + // + // 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, 392); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(95, 30); + this.buttonCreate.TabIndex = 2; + this.buttonCreate.Text = "Создать"; + this.buttonCreate.UseVisualStyleBackColor = true; + this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); + // + // buttonUp + // + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.BackgroundImage = global::Airbus.Properties.Resources.Up; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.buttonUp.Location = new System.Drawing.Point(692, 325); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(45, 45); + this.buttonUp.TabIndex = 3; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonLeft + // + this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonLeft.BackgroundImage = global::Airbus.Properties.Resources.Left; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.buttonLeft.Location = new System.Drawing.Point(641, 376); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(45, 45); + this.buttonLeft.TabIndex = 4; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonDown + // + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::Airbus.Properties.Resources.Down; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.buttonDown.Location = new System.Drawing.Point(692, 376); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(45, 45); + this.buttonDown.TabIndex = 5; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::Airbus.Properties.Resources.Right; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.buttonRight.Location = new System.Drawing.Point(743, 376); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(45, 45); + this.buttonRight.TabIndex = 6; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_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, 392); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(120, 30); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // + // comboBoxSelectorMap + // + this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxSelectorMap.FormattingEnabled = true; + this.comboBoxSelectorMap.Items.AddRange(new object[] { + "Простая карта"}); + this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28); + this.comboBoxSelectorMap.TabIndex = 8; + this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); + // + // FormMap + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.comboBoxSelectorMap); + this.Controls.Add(this.buttonCreateModif); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.pictureBoxAirbus); + this.Controls.Add(this.statusStrip1); + this.Name = "FormMap"; + this.Text = "Карта"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirbus)).EndInit(); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private PictureBox pictureBoxAirbus; + private StatusStrip statusStrip1; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelCorpusColor; + private Button buttonCreate; + private Button buttonUp; + private Button buttonLeft; + private Button buttonDown; + private Button buttonRight; + private Button buttonCreateModif; + private ComboBox comboBoxSelectorMap; + } +} \ No newline at end of file diff --git a/Airbus/Airbus/FormMap.cs b/Airbus/Airbus/FormMap.cs new file mode 100644 index 0000000..044f172 --- /dev/null +++ b/Airbus/Airbus/FormMap.cs @@ -0,0 +1,87 @@ +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 Airbus +{ + public partial class FormMap : Form + { + private AbstractMap _abstractMap; + + public FormMap() + { + InitializeComponent(); + _abstractMap = new SimpleMap(); + } + + //заполнение информации по объекту + private void SetData(DrawningAirbus airbus) + { + toolStripStatusLabelSpeed.Text = $"Скорость: {airbus.Airbus?.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {airbus.Airbus?.Weight}"; + toolStripStatusLabelCorpusColor.Text = $"Цвет: {airbus.Airbus?.CorpusColor.Name}"; + pictureBoxAirbus.Image = _abstractMap.CreateMap(pictureBoxAirbus.Width, pictureBoxAirbus.Height, + new DrawningObjectAirbus(airbus)); + } + + //обработка нажатия кнопки "Создать" + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + var airbus = new DrawningAirbus(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(airbus); + } + + 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; + } + pictureBoxAirbus.Image = _abstractMap?.MoveObject(dir); + } + + //обработка нажития кнопки "Модификация" + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + var airbus = new DrawningSuperAirbus(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(airbus); + } + + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + } + } + } +} + diff --git a/Airbus/Airbus/FormMap.resx b/Airbus/Airbus/FormMap.resx new file mode 100644 index 0000000..5cb320f --- /dev/null +++ b/Airbus/Airbus/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/Airbus/Airbus/Program.cs b/Airbus/Airbus/Program.cs index a16658c..3c7e1fb 100644 --- a/Airbus/Airbus/Program.cs +++ b/Airbus/Airbus/Program.cs @@ -11,7 +11,7 @@ namespace Airbus // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new Form1()); + Application.Run(new FormMap()); } } } \ No newline at end of file diff --git a/Airbus/Airbus/SimpleMap.cs b/Airbus/Airbus/SimpleMap.cs new file mode 100644 index 0000000..5bb3fe3 --- /dev/null +++ b/Airbus/Airbus/SimpleMap.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Airbus +{ + internal class SimpleMap : AbstractMap + { + //цвет закрытого уастка + Brush barriedColor = new SolidBrush(Color.Black); + + //цвет открытого участка + Brush roadColor = new SolidBrush(Color.Gray); + + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barriedColor, 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++; + } + } + } + } +} From bc0803532e7a54256ceec4cc3b892e3b83486a8c Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Mon, 26 Sep 2022 22:43:45 +0400 Subject: [PATCH 5/8] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=B2=D1=83=D1=85=20=D0=B4=D0=BE=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D0=BD=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20?= =?UTF-8?q?=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B9=20?= =?UTF-8?q?=D0=B0=D0=B1=D1=81=D1=82=D1=80=D0=B0=D0=BA=D1=82=D0=BD=D0=BE?= =?UTF-8?q?=D0=B3=D0=BE=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Airbus/Airbus/DrawningObjectAirbus.cs | 2 +- Airbus/Airbus/FormMap.Designer.cs | 4 +- Airbus/Airbus/FormMap.cs | 39 +++++++++- Airbus/Airbus/SecondSimpleMap.cs | 60 ++++++++++++++ Airbus/Airbus/SecondVersionAbstractMap.cs | 95 +++++++++++++++++++++++ Airbus/Airbus/SimpleMap.cs | 2 +- Airbus/Airbus/ThirdSimpleMap.cs | 63 +++++++++++++++ Airbus/Airbus/ThirdVersionAbstractMap.cs | 95 +++++++++++++++++++++++ 8 files changed, 355 insertions(+), 5 deletions(-) create mode 100644 Airbus/Airbus/SecondSimpleMap.cs create mode 100644 Airbus/Airbus/SecondVersionAbstractMap.cs create mode 100644 Airbus/Airbus/ThirdSimpleMap.cs create mode 100644 Airbus/Airbus/ThirdVersionAbstractMap.cs diff --git a/Airbus/Airbus/DrawningObjectAirbus.cs b/Airbus/Airbus/DrawningObjectAirbus.cs index a6636cb..c207cd7 100644 --- a/Airbus/Airbus/DrawningObjectAirbus.cs +++ b/Airbus/Airbus/DrawningObjectAirbus.cs @@ -19,7 +19,7 @@ namespace Airbus void IDrawningObject.DrawningObject(Graphics g) { - //ДОДУМАТЬ ЛОГИКУ ЭТОГО МЕТОДА + _airbus.DrawTransport(g); } public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() diff --git a/Airbus/Airbus/FormMap.Designer.cs b/Airbus/Airbus/FormMap.Designer.cs index bc610f1..3d2f24b 100644 --- a/Airbus/Airbus/FormMap.Designer.cs +++ b/Airbus/Airbus/FormMap.Designer.cs @@ -160,7 +160,9 @@ this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxSelectorMap.FormattingEnabled = true; this.comboBoxSelectorMap.Items.AddRange(new object[] { - "Простая карта"}); + "Простая карта", + "Буря в пустыне", + "Звёздные войны"}); this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12); this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28); diff --git a/Airbus/Airbus/FormMap.cs b/Airbus/Airbus/FormMap.cs index 044f172..71768bd 100644 --- a/Airbus/Airbus/FormMap.cs +++ b/Airbus/Airbus/FormMap.cs @@ -13,11 +13,14 @@ namespace Airbus public partial class FormMap : Form { private AbstractMap _abstractMap; + private SecondVersionAbstractMap _secondAbstractMap; + private ThirdVersionAbstractMap _thirdVersionAbstractMap; public FormMap() { InitializeComponent(); _abstractMap = new SimpleMap(); + _secondAbstractMap = new SecondSimpleMap(); } //заполнение информации по объекту @@ -26,8 +29,22 @@ namespace Airbus toolStripStatusLabelSpeed.Text = $"Скорость: {airbus.Airbus?.Speed}"; toolStripStatusLabelWeight.Text = $"Вес: {airbus.Airbus?.Weight}"; toolStripStatusLabelCorpusColor.Text = $"Цвет: {airbus.Airbus?.CorpusColor.Name}"; - pictureBoxAirbus.Image = _abstractMap.CreateMap(pictureBoxAirbus.Width, pictureBoxAirbus.Height, + + if (comboBoxSelectorMap.Text == "Простая карта") + { + pictureBoxAirbus.Image = _abstractMap.CreateMap(pictureBoxAirbus.Width, pictureBoxAirbus.Height, new DrawningObjectAirbus(airbus)); + } + if (comboBoxSelectorMap.Text == "Буря в пустыне") + { + pictureBoxAirbus.Image = _secondAbstractMap.CreateMap(pictureBoxAirbus.Width, pictureBoxAirbus.Height, + new DrawningObjectAirbus(airbus)); + } + if (comboBoxSelectorMap.Text == "Звёздные войны") + { + pictureBoxAirbus.Image = _thirdVersionAbstractMap.CreateMap(pictureBoxAirbus.Width, pictureBoxAirbus.Height, + new DrawningObjectAirbus(airbus)); + } } //обработка нажатия кнопки "Создать" @@ -59,7 +76,19 @@ namespace Airbus dir = Direction.Right; break; } - pictureBoxAirbus.Image = _abstractMap?.MoveObject(dir); + + if (comboBoxSelectorMap.Text == "Простая карта") + { + pictureBoxAirbus.Image = _abstractMap?.MoveObject(dir); + } + if (comboBoxSelectorMap.Text == "Буря в пустыне") + { + pictureBoxAirbus.Image = _secondAbstractMap?.MoveObject(dir); + } + if (comboBoxSelectorMap.Text == "Звёздные войны") + { + pictureBoxAirbus.Image = _thirdVersionAbstractMap?.MoveObject(dir); + } } //обработка нажития кнопки "Модификация" @@ -80,6 +109,12 @@ namespace Airbus case "Простая карта": _abstractMap = new SimpleMap(); break; + case "Буря в пустыне": + _secondAbstractMap = new SecondSimpleMap(); + break; + case "Звёздные войны": + _thirdVersionAbstractMap = new ThirdSimpleMap(); + break; } } } diff --git a/Airbus/Airbus/SecondSimpleMap.cs b/Airbus/Airbus/SecondSimpleMap.cs new file mode 100644 index 0000000..64266be --- /dev/null +++ b/Airbus/Airbus/SecondSimpleMap.cs @@ -0,0 +1,60 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Airbus +{ + internal class SecondSimpleMap : SecondVersionAbstractMap + { + //цвет закрытого участка + Brush barriedColor = new SolidBrush(Color.DarkRed); + + //цвет открытого участка + Brush roadColor = new SolidBrush(Color.DarkOrange); + + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + //float _weightLength = i * (_size_x + 1) - i * _size_x; + //float _heightLength = j * (_size_y + 1) - j * _size_y; + + g.FillEllipse(barriedColor, i * _size_x, j * _size_y, 10, 10); + } + + protected override void DrawRoadPart(Graphics g, int i, int j) + { + float _weightLength = i * (_size_x + 1); + float _heightLength = j * (_size_y + 1); + g.FillRectangle(roadColor, i * _size_x, j * _size_y, _weightLength, _heightLength); + } + + 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++; + } + } + } + } +} diff --git a/Airbus/Airbus/SecondVersionAbstractMap.cs b/Airbus/Airbus/SecondVersionAbstractMap.cs new file mode 100644 index 0000000..37449c5 --- /dev/null +++ b/Airbus/Airbus/SecondVersionAbstractMap.cs @@ -0,0 +1,95 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Airbus +{ + internal abstract class SecondVersionAbstractMap + { + private IDrawningObject _drawningObject = null; + protected int[,] _map = null; + protected int _width; + protected int _height; + protected float _size_x; + protected float _size_y; + protected readonly Random _random = new(); + protected readonly int _freeRoad = 0; + protected readonly int _barrier = 1; + + public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject) + { + _width = width; + _height = height; + _drawningObject = drawningObject; + + GenerateMap(); + while (!SetObjectOnMap()) + { + GenerateMap(); + } + + return DrawMapWithObject(); + } + + public Bitmap MoveObject(Direction direction) + { + //Сделать проверку на то, что объект может поместиться в выбранном направлении + 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); + //Сделать проверку на то, то объект не "накладывается" на закрытые участки + 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/Airbus/Airbus/SimpleMap.cs b/Airbus/Airbus/SimpleMap.cs index 5bb3fe3..f0a8f5e 100644 --- a/Airbus/Airbus/SimpleMap.cs +++ b/Airbus/Airbus/SimpleMap.cs @@ -8,7 +8,7 @@ namespace Airbus { internal class SimpleMap : AbstractMap { - //цвет закрытого уастка + //цвет закрытого участка Brush barriedColor = new SolidBrush(Color.Black); //цвет открытого участка diff --git a/Airbus/Airbus/ThirdSimpleMap.cs b/Airbus/Airbus/ThirdSimpleMap.cs new file mode 100644 index 0000000..a38a182 --- /dev/null +++ b/Airbus/Airbus/ThirdSimpleMap.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Airbus +{ + internal class ThirdSimpleMap : ThirdVersionAbstractMap + { + + Random rnd = new Random(); + + //цвет выстрела из лазера + Color randomColor = new Color(); + + //цвет закрытого участка + Brush barriedColor; + + //цвет открытого участка + Brush roadColor = new SolidBrush(Color.DarkBlue); + + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + randomColor = Color.FromArgb(rnd.Next(256), rnd.Next(256), rnd.Next(256)); + barriedColor = new SolidBrush(randomColor); + g.FillRectangle(barriedColor, i * _size_x, j * _size_y, i * (_size_x + 1) + 10, 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++; + } + } + } + } +} diff --git a/Airbus/Airbus/ThirdVersionAbstractMap.cs b/Airbus/Airbus/ThirdVersionAbstractMap.cs new file mode 100644 index 0000000..c42499b --- /dev/null +++ b/Airbus/Airbus/ThirdVersionAbstractMap.cs @@ -0,0 +1,95 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Airbus +{ + internal abstract class ThirdVersionAbstractMap + { + private IDrawningObject _drawningObject = null; + protected int[,] _map = null; + protected int _width; + protected int _height; + protected float _size_x; + protected float _size_y; + protected readonly Random _random = new(); + protected readonly int _freeRoad = 0; + protected readonly int _barrier = 1; + + public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject) + { + _width = width; + _height = height; + _drawningObject = drawningObject; + + GenerateMap(); + while (!SetObjectOnMap()) + { + GenerateMap(); + } + + return DrawMapWithObject(); + } + + public Bitmap MoveObject(Direction direction) + { + //Сделать проверку на то, что объект может поместиться в выбранном направлении + 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); + //Сделать проверку на то, то объект не "накладывается" на закрытые участки + 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); + } +} From c1158d0aca30ef68eeede6236a8d8e86ea139394 Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Tue, 27 Sep 2022 10:33:30 +0400 Subject: [PATCH 6/8] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=BE=D0=B2=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20=D0=B2=D0=BE=D0=B7?= =?UTF-8?q?=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=B2=D0=B8=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Airbus/Airbus/AbstractMap.cs | 90 +++++++++++++++++++-- Airbus/Airbus/DrawningAirbus.cs | 46 ++++++++++- Airbus/Airbus/DrawningSuperAirbus.cs | 2 + Airbus/Airbus/FormMap.cs | 38 ++------- Airbus/Airbus/SecondSimpleMap.cs | 11 +-- Airbus/Airbus/SecondVersionAbstractMap.cs | 95 ----------------------- Airbus/Airbus/SimpleMap.cs | 4 +- Airbus/Airbus/ThirdSimpleMap.cs | 6 +- Airbus/Airbus/ThirdVersionAbstractMap.cs | 95 ----------------------- 9 files changed, 143 insertions(+), 244 deletions(-) delete mode 100644 Airbus/Airbus/SecondVersionAbstractMap.cs delete mode 100644 Airbus/Airbus/ThirdVersionAbstractMap.cs diff --git a/Airbus/Airbus/AbstractMap.cs b/Airbus/Airbus/AbstractMap.cs index 14a9235..916a451 100644 --- a/Airbus/Airbus/AbstractMap.cs +++ b/Airbus/Airbus/AbstractMap.cs @@ -1,4 +1,5 @@ -using System; +using Microsoft.VisualBasic.Logging; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -33,17 +34,62 @@ namespace Airbus return DrawMapWithObject(); } + //проверка на "накладывание" + protected bool CheckPosition(float Left, float Right, float Top, float Bottom) + { + int x_start = (int)(Left / _size_x); + int y_start = (int)(Right / _size_y); + int x_end = (int)(Top / _size_x); + int y_end = (int)(Bottom / _size_y); + + for(int i = x_start; i <= x_end; i++) + { + for(int j = y_start; j <= y_end; j++) + { + if (_map[i, j] == _barrier) + { + return true; + } + } + } + + return false; + } + public Bitmap MoveObject(Direction direction) { - //Сделать проверку на то, что объект может поместиться в выбранном направлении - if (true) + _drawningObject.MoveObject(direction); + (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition(); + + if (CheckPosition(Left, Right, Top, Bottom)) { - _drawningObject.MoveObject(direction); + _drawningObject.MoveObject(MoveObjectBack(direction)); } return DrawMapWithObject(); } + private Direction MoveObjectBack(Direction direction) + { + switch (direction) + { + case Direction.Up: + return Direction.Down; + break; + case Direction.Down: + return Direction.Up; + break; + case Direction.Left: + return Direction.Right; + break; + case Direction.Right: + return Direction.Left; + break; + } + + return Direction.None; + } + private bool SetObjectOnMap() { if(_drawningObject == null || _map == null) @@ -54,8 +100,40 @@ namespace Airbus int x = _random.Next(0, 10); int y = _random.Next(0, 10); _drawningObject.SetObject(x, y, _width, _height); - //Сделать проверку на то, то объект не "накладывается" на закрытые участки - return true; + (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition(); + + if(!CheckPosition(Left, Right, Top, Bottom)) + { + return true; + } + + float x_start = Left; + float y_start = Right; + float x_length = Top - Left; + float y_length = Bottom - Right; + while(CheckPosition(x_start, y_start, x_start + x_length, y_start + y_length)) + { + bool check; + + do + { + check = CheckPosition(x_start, y_start, x_start + x_length, y_start + y_length); + + if (!check) + { + _drawningObject.SetObject((int)x_start, (int)y_start, _width, _height); + return true; + } + else + { + x_start += _size_x; + } + } while (check); + } + + x_start = x; + y_start += _size_y; + return false; } private Bitmap DrawMapWithObject() diff --git a/Airbus/Airbus/DrawningAirbus.cs b/Airbus/Airbus/DrawningAirbus.cs index de5b573..40b09ad 100644 --- a/Airbus/Airbus/DrawningAirbus.cs +++ b/Airbus/Airbus/DrawningAirbus.cs @@ -102,23 +102,57 @@ namespace Airbus } Pen pen = new(Color.Black); + Brush darkBrush = new SolidBrush(Color.DarkKhaki); + Brush darcBlue = new SolidBrush(Color.DarkSlateBlue); //корпус + g.FillRectangle(darkBrush, _startPosX, _startPosY + 10, 40, 10); g.DrawRectangle(pen, _startPosX, _startPosY + 10, 40, 10); //крыло - Brush darkBrush = new SolidBrush(Color.Black); g.FillRectangle(darkBrush, _startPosX + 10, _startPosY + 13, 20, 2); g.FillRectangle(darkBrush, _startPosX + 12, _startPosY + 15, 16, 2); + g.DrawRectangle(pen, _startPosX + 10, _startPosY + 13, 20, 2); + g.DrawRectangle(pen, _startPosX + 12, _startPosY + 15, 16, 2); //хвостовое крыло + Point[] point_tailWing = new Point[] + { + new Point((int)_startPosX, (int)_startPosY + 10), + new Point((int)_startPosX, (int)_startPosY), + new Point((int)_startPosX + 10, (int)_startPosY + 10), + new Point((int)_startPosX, (int)_startPosY + 10) + }; + + g.FillPolygon(darkBrush, point_tailWing); g.DrawLine(pen, _startPosX, _startPosY + 10, _startPosX, _startPosY); g.DrawLine(pen, _startPosX, _startPosY, _startPosX + 10, _startPosY + 10); //заднее поперечное крыло g.FillEllipse(darkBrush, _startPosX - 3, _startPosY + 7, 10, 5); + g.DrawEllipse(pen, _startPosX - 3, _startPosY + 7, 10, 5); //нос самолёта + //верхняя половина + Point[] point_upperBow = new Point[] + { + new Point((int)_startPosX + 40, (int)_startPosY + 15), + new Point((int)_startPosX + 50, (int)_startPosY + 16), + new Point((int)_startPosX + 40, (int)_startPosY + 10), + new Point((int)_startPosX + 40, (int)_startPosY + 15) + }; + + //нижняя половина + Point[] point_lowerBow = new Point[] + { + new Point((int)_startPosX + 40, (int)_startPosY + 15), + new Point((int)_startPosX + 40, (int)_startPosY + 20), + new Point((int)_startPosX + 50, (int)_startPosY + 16), + new Point((int)_startPosX + 40, (int)_startPosY + 15), + }; + + g.FillPolygon(darcBlue, point_upperBow); + g.FillPolygon(darkBrush, point_lowerBow); g.DrawLine(pen, _startPosX + 40, _startPosY + 15, _startPosX + 50, _startPosY + 16); g.DrawLine(pen, _startPosX + 40, _startPosY + 10, _startPosX + 47, _startPosY + 15); g.DrawLine(pen, _startPosX + 40, _startPosY + 20, _startPosX + 50, _startPosY + 15); @@ -127,10 +161,16 @@ namespace Airbus g.FillRectangle(darkBrush, _startPosX + 10, _startPosY + 21, 2, 2); g.FillRectangle(darkBrush, _startPosX + 12, _startPosY + 23, 4, 4); g.FillRectangle(darkBrush, _startPosX + 8, _startPosY + 23, 2, 4); + g.DrawRectangle(pen, _startPosX + 10, _startPosY + 21, 2, 2); + g.DrawRectangle(pen, _startPosX + 12, _startPosY + 23, 4, 4); + g.DrawRectangle(pen, _startPosX + 8, _startPosY + 23, 2, 4); //переднее шасси - g.FillRectangle(darkBrush, _startPosX + 35, _startPosY + 21, 2, 2); - g.FillRectangle(darkBrush, _startPosX + 35, _startPosY + 23, 4, 4); + g.FillRectangle(darkBrush, _startPosX + 36, _startPosY + 21, 2, 2); + g.FillRectangle(darkBrush, _startPosX + 36, _startPosY + 23, 4, 4); + g.DrawRectangle(pen, _startPosX + 35, _startPosY + 21, 2, 2); + g.DrawRectangle(pen, _startPosX + 35, _startPosY + 23, 4, 4); + } //смена границ формы отрисовки diff --git a/Airbus/Airbus/DrawningSuperAirbus.cs b/Airbus/Airbus/DrawningSuperAirbus.cs index 2658f09..4d3b1ba 100644 --- a/Airbus/Airbus/DrawningSuperAirbus.cs +++ b/Airbus/Airbus/DrawningSuperAirbus.cs @@ -45,5 +45,7 @@ namespace Airbus g.DrawEllipse(pen, _startPosX + 24, _startPosY + 22, 10, 5); } } + + } } diff --git a/Airbus/Airbus/FormMap.cs b/Airbus/Airbus/FormMap.cs index 71768bd..833a002 100644 --- a/Airbus/Airbus/FormMap.cs +++ b/Airbus/Airbus/FormMap.cs @@ -13,14 +13,11 @@ namespace Airbus public partial class FormMap : Form { private AbstractMap _abstractMap; - private SecondVersionAbstractMap _secondAbstractMap; - private ThirdVersionAbstractMap _thirdVersionAbstractMap; public FormMap() { InitializeComponent(); _abstractMap = new SimpleMap(); - _secondAbstractMap = new SecondSimpleMap(); } //заполнение информации по объекту @@ -30,21 +27,9 @@ namespace Airbus toolStripStatusLabelWeight.Text = $"Вес: {airbus.Airbus?.Weight}"; toolStripStatusLabelCorpusColor.Text = $"Цвет: {airbus.Airbus?.CorpusColor.Name}"; - if (comboBoxSelectorMap.Text == "Простая карта") - { - pictureBoxAirbus.Image = _abstractMap.CreateMap(pictureBoxAirbus.Width, pictureBoxAirbus.Height, - new DrawningObjectAirbus(airbus)); - } - if (comboBoxSelectorMap.Text == "Буря в пустыне") - { - pictureBoxAirbus.Image = _secondAbstractMap.CreateMap(pictureBoxAirbus.Width, pictureBoxAirbus.Height, - new DrawningObjectAirbus(airbus)); - } - if (comboBoxSelectorMap.Text == "Звёздные войны") - { - pictureBoxAirbus.Image = _thirdVersionAbstractMap.CreateMap(pictureBoxAirbus.Width, pictureBoxAirbus.Height, - new DrawningObjectAirbus(airbus)); - } + pictureBoxAirbus.Image = _abstractMap.CreateMap(pictureBoxAirbus.Width, pictureBoxAirbus.Height, + new DrawningObjectAirbus(airbus)); + } //обработка нажатия кнопки "Создать" @@ -77,18 +62,7 @@ namespace Airbus break; } - if (comboBoxSelectorMap.Text == "Простая карта") - { - pictureBoxAirbus.Image = _abstractMap?.MoveObject(dir); - } - if (comboBoxSelectorMap.Text == "Буря в пустыне") - { - pictureBoxAirbus.Image = _secondAbstractMap?.MoveObject(dir); - } - if (comboBoxSelectorMap.Text == "Звёздные войны") - { - pictureBoxAirbus.Image = _thirdVersionAbstractMap?.MoveObject(dir); - } + pictureBoxAirbus.Image = _abstractMap?.MoveObject(dir); } //обработка нажития кнопки "Модификация" @@ -110,10 +84,10 @@ namespace Airbus _abstractMap = new SimpleMap(); break; case "Буря в пустыне": - _secondAbstractMap = new SecondSimpleMap(); + _abstractMap = new SecondSimpleMap(); break; case "Звёздные войны": - _thirdVersionAbstractMap = new ThirdSimpleMap(); + _abstractMap = new ThirdSimpleMap(); break; } } diff --git a/Airbus/Airbus/SecondSimpleMap.cs b/Airbus/Airbus/SecondSimpleMap.cs index 64266be..87968ba 100644 --- a/Airbus/Airbus/SecondSimpleMap.cs +++ b/Airbus/Airbus/SecondSimpleMap.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Airbus { - internal class SecondSimpleMap : SecondVersionAbstractMap + internal class SecondSimpleMap : AbstractMap { //цвет закрытого участка Brush barriedColor = new SolidBrush(Color.DarkRed); @@ -16,17 +16,12 @@ namespace Airbus protected override void DrawBarrierPart(Graphics g, int i, int j) { - //float _weightLength = i * (_size_x + 1) - i * _size_x; - //float _heightLength = j * (_size_y + 1) - j * _size_y; - - g.FillEllipse(barriedColor, i * _size_x, j * _size_y, 10, 10); + g.FillEllipse(barriedColor, i * _size_x, j * _size_y, _size_x, _size_x); } protected override void DrawRoadPart(Graphics g, int i, int j) { - float _weightLength = i * (_size_x + 1); - float _heightLength = j * (_size_y + 1); - g.FillRectangle(roadColor, i * _size_x, j * _size_y, _weightLength, _heightLength); + g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y); } protected override void GenerateMap() diff --git a/Airbus/Airbus/SecondVersionAbstractMap.cs b/Airbus/Airbus/SecondVersionAbstractMap.cs deleted file mode 100644 index 37449c5..0000000 --- a/Airbus/Airbus/SecondVersionAbstractMap.cs +++ /dev/null @@ -1,95 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Airbus -{ - internal abstract class SecondVersionAbstractMap - { - private IDrawningObject _drawningObject = null; - protected int[,] _map = null; - protected int _width; - protected int _height; - protected float _size_x; - protected float _size_y; - protected readonly Random _random = new(); - protected readonly int _freeRoad = 0; - protected readonly int _barrier = 1; - - public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject) - { - _width = width; - _height = height; - _drawningObject = drawningObject; - - GenerateMap(); - while (!SetObjectOnMap()) - { - GenerateMap(); - } - - return DrawMapWithObject(); - } - - public Bitmap MoveObject(Direction direction) - { - //Сделать проверку на то, что объект может поместиться в выбранном направлении - 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); - //Сделать проверку на то, то объект не "накладывается" на закрытые участки - 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/Airbus/Airbus/SimpleMap.cs b/Airbus/Airbus/SimpleMap.cs index f0a8f5e..d347c15 100644 --- a/Airbus/Airbus/SimpleMap.cs +++ b/Airbus/Airbus/SimpleMap.cs @@ -16,12 +16,12 @@ namespace Airbus protected override void DrawBarrierPart(Graphics g, int i, int j) { - g.FillRectangle(barriedColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + g.FillRectangle(barriedColor, i * _size_x, j * _size_y, _size_x, _size_y); } protected override void DrawRoadPart(Graphics g, int i, int j) { - g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y); } protected override void GenerateMap() diff --git a/Airbus/Airbus/ThirdSimpleMap.cs b/Airbus/Airbus/ThirdSimpleMap.cs index a38a182..0e24b10 100644 --- a/Airbus/Airbus/ThirdSimpleMap.cs +++ b/Airbus/Airbus/ThirdSimpleMap.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Airbus { - internal class ThirdSimpleMap : ThirdVersionAbstractMap + internal class ThirdSimpleMap : AbstractMap { Random rnd = new Random(); @@ -24,12 +24,12 @@ namespace Airbus { randomColor = Color.FromArgb(rnd.Next(256), rnd.Next(256), rnd.Next(256)); barriedColor = new SolidBrush(randomColor); - g.FillRectangle(barriedColor, i * _size_x, j * _size_y, i * (_size_x + 1) + 10, j * (_size_y + 1)); + g.FillRectangle(barriedColor, i * _size_x, j * _size_y, _size_x, _size_y); } protected override void DrawRoadPart(Graphics g, int i, int j) { - g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y); } protected override void GenerateMap() diff --git a/Airbus/Airbus/ThirdVersionAbstractMap.cs b/Airbus/Airbus/ThirdVersionAbstractMap.cs deleted file mode 100644 index c42499b..0000000 --- a/Airbus/Airbus/ThirdVersionAbstractMap.cs +++ /dev/null @@ -1,95 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Airbus -{ - internal abstract class ThirdVersionAbstractMap - { - private IDrawningObject _drawningObject = null; - protected int[,] _map = null; - protected int _width; - protected int _height; - protected float _size_x; - protected float _size_y; - protected readonly Random _random = new(); - protected readonly int _freeRoad = 0; - protected readonly int _barrier = 1; - - public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject) - { - _width = width; - _height = height; - _drawningObject = drawningObject; - - GenerateMap(); - while (!SetObjectOnMap()) - { - GenerateMap(); - } - - return DrawMapWithObject(); - } - - public Bitmap MoveObject(Direction direction) - { - //Сделать проверку на то, что объект может поместиться в выбранном направлении - 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); - //Сделать проверку на то, то объект не "накладывается" на закрытые участки - 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); - } -} From 0a9c05f7fa82cb79b179dc0a432eba17bf494eac Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Wed, 5 Oct 2022 20:43:08 +0400 Subject: [PATCH 7/8] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B9=20?= =?UTF-8?q?=D1=8D=D0=BB=D0=B5=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{DrawningObjectAirbus.cs => DrawningObjectPlane.cs} | 4 ++-- Airbus/Airbus/FormAirbus.Designer.cs | 4 ++-- Airbus/Airbus/FormAirbus.cs | 4 ++-- Airbus/Airbus/FormAirbus.resx | 6 +++--- Airbus/Airbus/FormMap.cs | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) rename Airbus/Airbus/{DrawningObjectAirbus.cs => DrawningObjectPlane.cs} (87%) diff --git a/Airbus/Airbus/DrawningObjectAirbus.cs b/Airbus/Airbus/DrawningObjectPlane.cs similarity index 87% rename from Airbus/Airbus/DrawningObjectAirbus.cs rename to Airbus/Airbus/DrawningObjectPlane.cs index c207cd7..0af9cab 100644 --- a/Airbus/Airbus/DrawningObjectAirbus.cs +++ b/Airbus/Airbus/DrawningObjectPlane.cs @@ -6,13 +6,13 @@ using System.Threading.Tasks; namespace Airbus { - internal class DrawningObjectAirbus : IDrawningObject + internal class DrawningObjectPlane : IDrawningObject { private DrawningAirbus _airbus; public float Step => _airbus?.Airbus?.Step ?? 0; - public DrawningObjectAirbus(DrawningAirbus airbus) + public DrawningObjectPlane(DrawningAirbus airbus) { _airbus = airbus; } diff --git a/Airbus/Airbus/FormAirbus.Designer.cs b/Airbus/Airbus/FormAirbus.Designer.cs index 3713d67..8f24a42 100644 --- a/Airbus/Airbus/FormAirbus.Designer.cs +++ b/Airbus/Airbus/FormAirbus.Designer.cs @@ -1,6 +1,6 @@ namespace Airbus { - partial class FormAirbus + partial class Form1 { /// /// Required designer variable. @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormAirbus)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); this.pictureBoxAirbus = new System.Windows.Forms.PictureBox(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); diff --git a/Airbus/Airbus/FormAirbus.cs b/Airbus/Airbus/FormAirbus.cs index 08fd0b6..1f8e0a0 100644 --- a/Airbus/Airbus/FormAirbus.cs +++ b/Airbus/Airbus/FormAirbus.cs @@ -10,11 +10,11 @@ using System.Windows.Forms; namespace Airbus { - public partial class FormAirbus : Form + public partial class Form1 : Form { private DrawningAirbus _airbus; - public FormAirbus() + public Form1() { InitializeComponent(); } diff --git a/Airbus/Airbus/FormAirbus.resx b/Airbus/Airbus/FormAirbus.resx index 2e6fdd9..e397a18 100644 --- a/Airbus/Airbus/FormAirbus.resx +++ b/Airbus/Airbus/FormAirbus.resx @@ -64,7 +64,7 @@ iVBORw0KGgoAAAANSUhEUgAAA5gAAAOYBAMAAABC5kGOAAAABGdBTUEAALGPC/xhBQAAABtQTFRF//// - AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOvQAADr0BR/uQrQAAFsZJREFUeNrt + AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOvAAADrwBlbxySQAAFsZJREFUeNrt nT2LJMkVRZNC0O4WNDtrptppWxS9rDkjBLLFMItcIRZkqmBBrtbS/mzNR+1OV1V+RGbGu++9yHO9O1bl HE69jIzI6u7pS/ruSxqs/eGvv3z389t2L/BrbfriPtc/nI8f86bdC/xam764z3l3/JzHVi/wVW364j7l +XjJvxu9wFe16Yv7lPNvMB8bvcCb+jGHyz+1VvuH4+952+IFvq5dyxf3qZy/wvxvixe4I5ivxTw+Hp6A @@ -168,7 +168,7 @@ iVBORw0KGgoAAAANSUhEUgAAA5gAAAOYBAMAAABC5kGOAAAABGdBTUEAALGPC/xhBQAAABtQTFRF//// - AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOvQAADr0BR/uQrQAAFodJREFUeNrt + AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOvAAADrwBlbxySQAAFodJREFUeNrt nU2PHEd2RQsFAdy6BvRQy56GAf+AhgwvJcOA1gYhw1vD0KxbhhbeDgb632aTzSYZnVFVWRkf7508x6s3 Xsx0HVxGRUTeysPhcLz/xOETA8affzvBeff7lA92/H/n8afTDni7C5l3u3D5ZHMHMr877YQf+TL3EswP 0Rwv88PH+/wfPf8nvcfTbhj8wX6cx/53vjnthke8zL+cdsM/4GXit5hfeKdMDt/jZZ52BF3m8bQj7uAy @@ -271,7 +271,7 @@ iVBORw0KGgoAAAANSUhEUgAAA5gAAAOYBAMAAABC5kGOAAAABGdBTUEAALGPC/xhBQAAABtQTFRF//// - AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOvQAADr0BR/uQrQAAGCxJREFUeNrt + AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOvAAADrwBlbxySQAAGCxJREFUeNrt nU2LHEcWRdNFg2dbM7bby6LwP2jK6xEY/ANEe2+M963GMLM1xoN/9thSy5Ki4kXlV0S8G++c3dNGBIeb 2ZWRN2M6n0/TO87vGG48Hb7/9Y9fTuMu8O8xgMzDm+Of3J+QqT+eXh3f8gUy9cfPjy88DbrAQDLfB/PP C+005ALPgWTeHY9JNJEpO372QeZLNJGpOn64yv4VzcN4C/x4HF7mm49k3p/GW+DH4/CX2ePHPA24wHNU diff --git a/Airbus/Airbus/FormMap.cs b/Airbus/Airbus/FormMap.cs index 833a002..3575d79 100644 --- a/Airbus/Airbus/FormMap.cs +++ b/Airbus/Airbus/FormMap.cs @@ -28,7 +28,7 @@ namespace Airbus toolStripStatusLabelCorpusColor.Text = $"Цвет: {airbus.Airbus?.CorpusColor.Name}"; pictureBoxAirbus.Image = _abstractMap.CreateMap(pictureBoxAirbus.Width, pictureBoxAirbus.Height, - new DrawningObjectAirbus(airbus)); + new DrawningObjectPlane(airbus)); } From 3aa10a0e4b3f8e0629a694663b7f4d683c1c29bc Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Wed, 5 Oct 2022 20:54:22 +0400 Subject: [PATCH 8/8] =?UTF-8?q?=D0=A4=D0=B8=D0=BD=D0=B0=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B2=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=D1=85.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Airbus/Airbus/{SecondSimpleMap.cs => DesertStormMap.cs} | 2 +- Airbus/Airbus/FormMap.cs | 4 ++-- Airbus/Airbus/{ThirdSimpleMap.cs => StarWarsMap.cs} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename Airbus/Airbus/{SecondSimpleMap.cs => DesertStormMap.cs} (96%) rename Airbus/Airbus/{ThirdSimpleMap.cs => StarWarsMap.cs} (97%) diff --git a/Airbus/Airbus/SecondSimpleMap.cs b/Airbus/Airbus/DesertStormMap.cs similarity index 96% rename from Airbus/Airbus/SecondSimpleMap.cs rename to Airbus/Airbus/DesertStormMap.cs index 87968ba..2f65038 100644 --- a/Airbus/Airbus/SecondSimpleMap.cs +++ b/Airbus/Airbus/DesertStormMap.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Airbus { - internal class SecondSimpleMap : AbstractMap + internal class DesertStormMap : AbstractMap { //цвет закрытого участка Brush barriedColor = new SolidBrush(Color.DarkRed); diff --git a/Airbus/Airbus/FormMap.cs b/Airbus/Airbus/FormMap.cs index 3575d79..23fadff 100644 --- a/Airbus/Airbus/FormMap.cs +++ b/Airbus/Airbus/FormMap.cs @@ -84,10 +84,10 @@ namespace Airbus _abstractMap = new SimpleMap(); break; case "Буря в пустыне": - _abstractMap = new SecondSimpleMap(); + _abstractMap = new DesertStormMap(); break; case "Звёздные войны": - _abstractMap = new ThirdSimpleMap(); + _abstractMap = new StarWarsMap(); break; } } diff --git a/Airbus/Airbus/ThirdSimpleMap.cs b/Airbus/Airbus/StarWarsMap.cs similarity index 97% rename from Airbus/Airbus/ThirdSimpleMap.cs rename to Airbus/Airbus/StarWarsMap.cs index 0e24b10..c6c4761 100644 --- a/Airbus/Airbus/ThirdSimpleMap.cs +++ b/Airbus/Airbus/StarWarsMap.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Airbus { - internal class ThirdSimpleMap : AbstractMap + internal class StarWarsMap : AbstractMap { Random rnd = new Random();