From 91aaf22ac6b7831441025d53d3a4f9fa01f1e21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=B0=D1=82=20=D0=97=D0=B0=D1=80=D0=B3?= =?UTF-8?q?=D0=B0=D1=80=D0=BE=D0=B2?= Date: Mon, 3 Oct 2022 21:09:35 +0400 Subject: [PATCH 1/7] =?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 --- DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs | 5 ++--- DoubleDeckerBus/DoubleDeckerBus/EntityBus.cs | 2 +- DoubleDeckerBus/DoubleDeckerBus/FormBus.cs | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs index c51638b..58e332d 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs @@ -45,10 +45,9 @@ namespace DoubleDeckerBus /// Скорость /// Вес автобуса /// Цвет кузова - public void Init(int speed, float weight, Color bodyColor) + public DrawningBus(int speed, float weight, Color bodyColor) { - Bus = new EntityBus(); - Bus.Init(speed, weight, bodyColor); + Bus = new EntityBus(speed, weight, bodyColor); } /// /// Установка позиции автобуса diff --git a/DoubleDeckerBus/DoubleDeckerBus/EntityBus.cs b/DoubleDeckerBus/DoubleDeckerBus/EntityBus.cs index e04fa53..74ace8c 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/EntityBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/EntityBus.cs @@ -34,7 +34,7 @@ namespace DoubleDeckerBus /// /// /// - public void Init(int speed, float weight, Color bodyColor) + public EntityBus(int speed, float weight, Color bodyColor) { Random rnd = new(); Speed = speed <= 0 ? rnd.Next(50, 150) : speed; diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs b/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs index 90c0c0e..11caede 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs @@ -24,8 +24,7 @@ namespace DoubleDeckerBus private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _bus = new DrawningBus(); - _bus.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), + _bus = new DrawningBus(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); _bus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxBus.Width, pictureBoxBus.Height); -- 2.25.1 From 20c0f2302cf02b1bbec57c69995b8bf54a846d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=B0=D1=82=20=D0=97=D0=B0=D1=80=D0=B3?= =?UTF-8?q?=D0=B0=D1=80=D0=BE=D0=B2?= Date: Mon, 3 Oct 2022 23:53:33 +0400 Subject: [PATCH 2/7] =?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?=20=D0=B1=D0=B5=D0=B7=20=D0=BE=D1=82=D1=80=D0=B8=D1=81=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DoubleDeckerBus/DrawningBus.cs | 21 ++++++-- .../DrawningDoubleDeckerBus.cs | 51 +++++++++++++++++++ .../DoubleDeckerBus/EntityDoubleDeckerBus.cs | 47 +++++++++++++++++ .../DoubleDeckerBus/FormBus.Designer.cs | 13 +++++ DoubleDeckerBus/DoubleDeckerBus/FormBus.cs | 34 +++++++++++-- 5 files changed, 159 insertions(+), 7 deletions(-) create mode 100644 DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs create mode 100644 DoubleDeckerBus/DoubleDeckerBus/EntityDoubleDeckerBus.cs diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs index 58e332d..56f41c1 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs @@ -14,15 +14,15 @@ namespace DoubleDeckerBus /// /// Класс-сущность /// - public EntityBus Bus { private set; get; } + public EntityBus Bus { protected set; get; } /// /// Левая координата отрисовки автобуса /// - private float _startPosX; + protected float _startPosX; /// /// Верхняя кооридната отрисовки автобуса /// - private float _startPosY; + protected float _startPosY; /// /// Ширина окна отрисовки /// @@ -49,6 +49,19 @@ namespace DoubleDeckerBus { Bus = new EntityBus(speed, weight, bodyColor); } + /// Инициализация свойств + /// + /// Скорость + /// Вес автобуса + /// Цвет кузова + /// Ширина отрисовки автобуса + /// Высота отрисовки автобуса + protected DrawningBus(int speed, float weight, Color bodyColor, int busWidth, int busHeight) : + this(speed, weight, bodyColor) + { + _busWidth = busWidth; + _busHeight = busHeight; + } /// /// Установка позиции автобуса /// @@ -112,7 +125,7 @@ namespace DoubleDeckerBus /// Отрисовка автобуса /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs new file mode 100644 index 0000000..d433743 --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DoubleDeckerBus +{ + internal class DrawningDoubleDeckerBus : DrawningBus + { + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес автобуса + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия обвеса + /// Признак наличия антикрыла + /// Признак наличия гоночной полосы + public DrawningDoubleDeckerBus(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) : + base(speed, weight, bodyColor, 112, 50) + { + Bus = new EntityDoubleDeckerBus(speed, weight, bodyColor, dopColor, bodyKit,wing, sportLine); + } + public override void DrawTransport(Graphics g) + { + if (Bus is not EntityDoubleDeckerBus doubleDeckerBus) + { + return; + } + Pen pen = new(Color.Black); + Brush dopBrush = new SolidBrush(doubleDeckerBus.DopColor); + if (doubleDeckerBus.BodyKit) + { + } + _startPosX += 10; + _startPosY += 5; + base.DrawTransport(g); + _startPosX -= 10; + _startPosY -= 5; + if (doubleDeckerBus.SportLine) + { + } + if (doubleDeckerBus.Wing) + { + } + } + + } +} diff --git a/DoubleDeckerBus/DoubleDeckerBus/EntityDoubleDeckerBus.cs b/DoubleDeckerBus/DoubleDeckerBus/EntityDoubleDeckerBus.cs new file mode 100644 index 0000000..2869162 --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/EntityDoubleDeckerBus.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DoubleDeckerBus +{ + internal class EntityDoubleDeckerBus : EntityBus + { + /// + /// Дополнительный цвет + /// + public Color DopColor { get; private set; } + /// + /// Признак наличия обвеса + /// + public bool BodyKit { get; private set; } + /// + /// Признак наличия антикрыла + /// + public bool Wing { get; private set; } + /// + /// Признак наличия гоночной полосы + /// + public bool SportLine { get; private set; } + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес автобуса + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия обвеса + /// Признак наличия антикрыла + /// Признак наличия гоночной полосы + public EntityDoubleDeckerBus(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) : + base(speed, weight, bodyColor) + { + DopColor = dopColor; + BodyKit = bodyKit; + Wing = wing; + SportLine = sportLine; + } + + } +} diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormBus.Designer.cs b/DoubleDeckerBus/DoubleDeckerBus/FormBus.Designer.cs index 4348178..e83ef61 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/FormBus.Designer.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/FormBus.Designer.cs @@ -38,6 +38,7 @@ this.buttonLeft = new System.Windows.Forms.Button(); this.buttonDown = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).BeginInit(); this.statusStrip.SuspendLayout(); this.SuspendLayout(); @@ -140,11 +141,22 @@ this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(93, 393); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(104, 23); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // // FormBus // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonDown); this.Controls.Add(this.buttonLeft); @@ -174,5 +186,6 @@ private Button buttonLeft; private Button buttonDown; private Button buttonRight; + private Button buttonCreateModif; } } \ No newline at end of file diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs b/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs index 11caede..3339d96 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs @@ -14,6 +14,20 @@ namespace DoubleDeckerBus _bus?.DrawTransport(gr); pictureBoxBus.Image = bmp; } + /// + /// + /// + /// + /// + private void SetData() + { + Random rnd = new(); + _bus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxBus.Width, pictureBoxBus.Height); + toolStripStatusLabelSpeed.Text = $": {_bus.Bus.Speed}"; + toolStripStatusLabelWeight.Text = $": {_bus.Bus.Weight}"; + toolStripStatusLabelBodyColor.Text = $":{_bus.Bus.BodyColor.Name}"; + } + /// /// "" /// @@ -28,9 +42,7 @@ namespace DoubleDeckerBus Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); _bus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxBus.Width, pictureBoxBus.Height); - toolStripStatusLabelSpeed.Text = $": {_bus.Bus.Speed}"; - toolStripStatusLabelWeight.Text = $": {_bus.Bus.Weight}"; - toolStripStatusLabelBodyColor.Text = $":{ _bus.Bus.BodyColor.Name}"; + SetData(); Draw(); } /// @@ -69,5 +81,21 @@ namespace DoubleDeckerBus _bus?.ChangeBorders(pictureBoxBus.Width, pictureBoxBus.Height); Draw(); } + + /// + /// "" + /// + /// + /// + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + _bus = new DrawningDoubleDeckerBus(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,1)), Convert.ToBoolean(rnd.Next(0, 1)), Convert.ToBoolean(rnd.Next(0, 1))); + SetData(); + Draw(); + } } } \ No newline at end of file -- 2.25.1 From 84235cad28e2b59aa8c53da8215ff9469bb79262 Mon Sep 17 00:00:00 2001 From: klllst Date: Tue, 4 Oct 2022 13:23:24 +0400 Subject: [PATCH 3/7] =?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 --- .../DoubleDeckerBus/DrawningBus.cs | 9 ++++- .../DrawningDoubleDeckerBus.cs | 33 ++++++++++----- .../DoubleDeckerBus/DrawningObjectBus.cs | 35 ++++++++++++++++ .../DoubleDeckerBus/EntityDoubleDeckerBus.cs | 16 ++++---- DoubleDeckerBus/DoubleDeckerBus/FormBus.cs | 2 +- .../DoubleDeckerBus/IDrawningObject.cs | 40 +++++++++++++++++++ 6 files changed, 114 insertions(+), 21 deletions(-) create mode 100644 DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs create mode 100644 DoubleDeckerBus/DoubleDeckerBus/IDrawningObject.cs diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs index 56f41c1..4b68c4b 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs @@ -177,6 +177,13 @@ namespace DoubleDeckerBus _startPosY = _pictureHeight.Value - _busHeight; } } - + /// + /// Получение текущей позиции объекта + /// + /// + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (_startPosX, _startPosY, _startPosX + _busWidth, _startPosY +_busHeight); + } } } diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs index d433743..2f73043 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs @@ -16,12 +16,12 @@ namespace DoubleDeckerBus /// Цвет кузова /// Дополнительный цвет /// Признак наличия обвеса - /// Признак наличия антикрыла - /// Признак наличия гоночной полосы - public DrawningDoubleDeckerBus(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) : + /// Признак наличия второго этажа + /// Признак наличия полосы + public DrawningDoubleDeckerBus(int speed, float weight, Color bodyColor, Color dopColor, bool secondFloor, bool bodyKit, bool line) : base(speed, weight, bodyColor, 112, 50) { - Bus = new EntityDoubleDeckerBus(speed, weight, bodyColor, dopColor, bodyKit,wing, sportLine); + Bus = new EntityDoubleDeckerBus(speed, weight, bodyColor, dopColor, secondFloor, bodyKit, line); } public override void DrawTransport(Graphics g) { @@ -31,18 +31,29 @@ namespace DoubleDeckerBus } Pen pen = new(Color.Black); Brush dopBrush = new SolidBrush(doubleDeckerBus.DopColor); - if (doubleDeckerBus.BodyKit) + if (doubleDeckerBus.SecondFloor) { + //кузов + g.FillRectangle(dopBrush, _startPosX, _startPosY, 115, 40); + //граница автобуса + g.DrawRectangle(pen, _startPosX, _startPosY, 115, 40); + //стекла + Brush brBlue = new SolidBrush(Color.LightBlue); + g.FillEllipse(brBlue, _startPosX + 2, _startPosY + 2, 12, 20); + g.FillEllipse(brBlue, _startPosX + 20, _startPosY + 2, 12, 20); + g.FillEllipse(brBlue, _startPosX + 55, _startPosY + 2 , 12, 20); + g.FillEllipse(brBlue, _startPosX + 70, _startPosY + 2, 12, 20); + g.FillEllipse(brBlue, _startPosX + 85, _startPosY + 2, 12, 20); + g.FillEllipse(brBlue, _startPosX + 100 , _startPosY + 2, 12, 20); + } - _startPosX += 10; - _startPosY += 5; + _startPosY += 40; base.DrawTransport(g); - _startPosX -= 10; - _startPosY -= 5; - if (doubleDeckerBus.SportLine) + _startPosY -= 40; + if (doubleDeckerBus.Line) { } - if (doubleDeckerBus.Wing) + if (doubleDeckerBus.BodyKit) { } } diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs new file mode 100644 index 0000000..51a06b5 --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DoubleDeckerBus +{ + class DrawningObjectBus : IDrawningObject + { + private DrawningBus _bus = null; + public DrawningObjectBus(DrawningBus bus) + { + _bus = bus; + } + public float Step => _bus?.Bus?.Step ?? 0; + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return _bus?.GetCurrentPosition() ?? default; + } + public void MoveObject(Direction direction) + { + _bus?.MoveTransport(direction); + } + public void SetObject(int x, int y, int width, int height) + { + _bus.SetPosition(x, y, width, height); + } + public void DrawningObject(Graphics g) + { + _bus.DrawTransport(g); + } + + } +} diff --git a/DoubleDeckerBus/DoubleDeckerBus/EntityDoubleDeckerBus.cs b/DoubleDeckerBus/DoubleDeckerBus/EntityDoubleDeckerBus.cs index 2869162..be33785 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/EntityDoubleDeckerBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/EntityDoubleDeckerBus.cs @@ -15,15 +15,15 @@ namespace DoubleDeckerBus /// /// Признак наличия обвеса /// - public bool BodyKit { get; private set; } + public bool SecondFloor{ get; private set; } /// /// Признак наличия антикрыла /// - public bool Wing { get; private set; } + public bool BodyKit { get; private set; } /// /// Признак наличия гоночной полосы /// - public bool SportLine { get; private set; } + public bool Line { get; private set; } /// /// Инициализация свойств /// @@ -31,16 +31,16 @@ namespace DoubleDeckerBus /// Вес автобуса /// Цвет кузова /// Дополнительный цвет + /// Признак наличия второго этажа /// Признак наличия обвеса - /// Признак наличия антикрыла - /// Признак наличия гоночной полосы - public EntityDoubleDeckerBus(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) : + /// Признак наличия полосы + public EntityDoubleDeckerBus(int speed, float weight, Color bodyColor, Color dopColor, bool secondFloor, bool bodyKit, bool line) : base(speed, weight, bodyColor) { DopColor = dopColor; + SecondFloor = secondFloor; BodyKit = bodyKit; - Wing = wing; - SportLine = sportLine; + Line = line; } } diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs b/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs index 3339d96..9a1b3c1 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs @@ -93,7 +93,7 @@ namespace DoubleDeckerBus _bus = new DrawningDoubleDeckerBus(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,1)), Convert.ToBoolean(rnd.Next(0, 1)), Convert.ToBoolean(rnd.Next(0, 1))); + Convert.ToBoolean(rnd.Next(0,2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); SetData(); Draw(); } diff --git a/DoubleDeckerBus/DoubleDeckerBus/IDrawningObject.cs b/DoubleDeckerBus/DoubleDeckerBus/IDrawningObject.cs new file mode 100644 index 0000000..b7025fd --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/IDrawningObject.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DoubleDeckerBus +{ + internal interface IDrawningObject + { + /// + /// Шаг перемещения объекта + /// + public float Step { get; } + /// + /// Установка позиции объекта + /// + /// Координата X + /// Координата Y + /// Высота полотна + /// Ширина полотна + public void SetObject(int x, int y, int width, int height); + /// + /// Изменение направления перемещения объекта + /// + /// Направление + /// + public void MoveObject(Direction direction); + /// + /// Отрисовка объекта + /// + /// + public void DrawningObject(Graphics g); + /// + /// Получение текущей позиции объекта + /// + /// + (float Left, float Right, float Top, float Bottom) GetCurrentPosition(); + } +} -- 2.25.1 From 095d71b6510a75feecb1acbb9923540c78c66348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=B0=D1=82=20=D0=97=D0=B0=D1=80=D0=B3?= =?UTF-8?q?=D0=B0=D1=80=D0=BE=D0=B2?= Date: Tue, 1 Nov 2022 01:08:13 +0400 Subject: [PATCH 4/7] =?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 --- .../DoubleDeckerBus/AbstractMap.cs | 84 ++++++++ DoubleDeckerBus/DoubleDeckerBus/Direction.cs | 1 + .../DoubleDeckerBus/FormMap.Designer.cs | 204 ++++++++++++++++++ DoubleDeckerBus/DoubleDeckerBus/FormMap.cs | 103 +++++++++ DoubleDeckerBus/DoubleDeckerBus/FormMap.resx | 63 ++++++ DoubleDeckerBus/DoubleDeckerBus/Program.cs | 2 +- DoubleDeckerBus/DoubleDeckerBus/SimpleMap.cs | 56 +++++ 7 files changed, 512 insertions(+), 1 deletion(-) create mode 100644 DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs create mode 100644 DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs create mode 100644 DoubleDeckerBus/DoubleDeckerBus/FormMap.cs create mode 100644 DoubleDeckerBus/DoubleDeckerBus/FormMap.resx create mode 100644 DoubleDeckerBus/DoubleDeckerBus/SimpleMap.cs diff --git a/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs b/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs new file mode 100644 index 0000000..19fcdbe --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DoubleDeckerBus +{ + 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) + { + // TODO проверка, что объект может переместится в требуемом направлении + if (true) + { + _drawningObject.MoveObject(direction); + } + return DrawMapWithObject(); + } + private bool SetObjectOnMap() + { + if (_drawningObject == null || _map == null) + { + return false; + } + int x = _random.Next(0, 10); + int y = _random.Next(0, 10); + _drawningObject.SetObject(x, y, _width, _height); + // TODO првоерка, что объект не "накладывается" на закрытые участки + return true; + } + private Bitmap DrawMapWithObject() + { + Bitmap bmp = new(_width, _height); + if (_drawningObject == null || _map == null) + { + return bmp; + } + Graphics gr = Graphics.FromImage(bmp); + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + if (_map[i, j] == _freeRoad) + { + DrawRoadPart(gr, i, j); + } + else if (_map[i, j] == _barrier) + { + DrawBarrierPart(gr, i, j); + } + } + } + _drawningObject.DrawningObject(gr); + return bmp; + } + protected abstract void GenerateMap(); + protected abstract void DrawRoadPart(Graphics g, int i, int j); + protected abstract void DrawBarrierPart(Graphics g, int i, int j); + + } +} diff --git a/DoubleDeckerBus/DoubleDeckerBus/Direction.cs b/DoubleDeckerBus/DoubleDeckerBus/Direction.cs index 06fca10..cbae840 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/Direction.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/Direction.cs @@ -11,6 +11,7 @@ namespace DoubleDeckerBus /// internal enum Direction { + None=0, Up = 1, Down = 2, Left = 3, diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs b/DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs new file mode 100644 index 0000000..f7a0c1a --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs @@ -0,0 +1,204 @@ +namespace DoubleDeckerBus +{ + 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.pictureBoxBus = 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.toolStripStatusLabelBodyColor = 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.pictureBoxBus)).BeginInit(); + this.statusStrip.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBoxBus + // + this.pictureBoxBus.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxBus.Location = new System.Drawing.Point(0, 0); + this.pictureBoxBus.Name = "pictureBoxBus"; + this.pictureBoxBus.Size = new System.Drawing.Size(800, 428); + this.pictureBoxBus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxBus.TabIndex = 0; + this.pictureBoxBus.TabStop = false; + // + // statusStrip + // + this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelBodyColor}); + this.statusStrip.Location = new System.Drawing.Point(0, 428); + this.statusStrip.Name = "statusStrip"; + this.statusStrip.Size = new System.Drawing.Size(800, 22); + this.statusStrip.TabIndex = 1; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17); + this.toolStripStatusLabelSpeed.Text = "Скорость:"; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(29, 17); + this.toolStripStatusLabelWeight.Text = "Вес:"; + // + // toolStripStatusLabelBodyColor + // + this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17); + this.toolStripStatusLabelBodyColor.Text = "Цвет:"; + // + // 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, 393); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(75, 23); + this.buttonCreate.TabIndex = 2; + this.buttonCreate.Text = "Создать"; + this.buttonCreate.UseVisualStyleBackColor = true; + this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); + // + // buttonUp + // + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.Up; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(722, 350); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.TabIndex = 3; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonLeft + // + this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonLeft.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.Left; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(686, 386); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.TabIndex = 4; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonDown + // + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.Down; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(722, 386); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.TabIndex = 5; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.Right; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(758, 386); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.TabIndex = 6; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(93, 393); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(104, 23); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // + // comboBoxSelectorMap + // + this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxSelectorMap.FormattingEnabled = true; + this.comboBoxSelectorMap.Items.AddRange(new object[] { + "Простая карта"}); + this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23); + this.comboBoxSelectorMap.TabIndex = 8; + // + // FormMap + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.comboBoxSelectorMap); + this.Controls.Add(this.buttonCreateModif); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.pictureBoxBus); + this.Controls.Add(this.statusStrip); + this.Name = "FormMap"; + this.Text = "FormMap"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).EndInit(); + this.statusStrip.ResumeLayout(false); + this.statusStrip.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + private PictureBox pictureBoxBus; + private StatusStrip statusStrip; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelBodyColor; + 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/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs b/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs new file mode 100644 index 0000000..b29287a --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs @@ -0,0 +1,103 @@ +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 DoubleDeckerBus +{ + public partial class FormMap : Form + { + private AbstractMap _abstractMap; + public FormMap() + { + InitializeComponent(); + _abstractMap = new SimpleMap(); + } + /// + /// Заполнение информации по объекту + /// + /// + private void SetData(DrawningBus bus) + { + toolStripStatusLabelSpeed.Text = $"Скорость: {bus.Bus.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {bus.Bus.Weight}"; + toolStripStatusLabelBodyColor.Text = $"Цвет:" + $"{bus.Bus.BodyColor.Name}"; pictureBoxBus.Image = _abstractMap.CreateMap(pictureBoxBus.Width,pictureBoxBus.Height,new DrawningObjectBus(bus)); + } + /// + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + var car = new DrawningBus(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(car); + } + /// + /// Изменение размеров формы + /// + /// + /// + 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; + } + pictureBoxBus.Image = _abstractMap?.MoveObject(dir); + } + /// + /// Обработка нажатия кнопки "Модификация" + /// + /// + /// + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + var car = new DrawningDoubleDeckerBus(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)), Convert.ToBoolean(rnd.Next(0, 2))); + SetData(car); + } + /// + /// Смена карты + /// + /// + /// + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender,EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + } + } + } +} diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormMap.resx b/DoubleDeckerBus/DoubleDeckerBus/FormMap.resx new file mode 100644 index 0000000..2c0949d --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/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/DoubleDeckerBus/DoubleDeckerBus/Program.cs b/DoubleDeckerBus/DoubleDeckerBus/Program.cs index cecbba3..7d6fd56 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/Program.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/Program.cs @@ -11,7 +11,7 @@ namespace DoubleDeckerBus // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormBus()); + Application.Run(new FormMap()); } } } \ No newline at end of file diff --git a/DoubleDeckerBus/DoubleDeckerBus/SimpleMap.cs b/DoubleDeckerBus/DoubleDeckerBus/SimpleMap.cs new file mode 100644 index 0000000..1632d37 --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/SimpleMap.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DoubleDeckerBus +{ + /// + /// Простая реализация абсрактного класса AbstractMap + /// + internal class SimpleMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Black); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.Gray); + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x +1), j * (_size_y + 1)); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x +1), j * (_size_y + 1)); + } + protected override void GenerateMap() + { + _map = new int[100, 100]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + int counter = 0; + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + while (counter < 50) + { + int x = _random.Next(0, 100); + int y = _random.Next(0, 100); + if (_map[x, y] == _freeRoad) + { + _map[x, y] = _barrier; + counter++; + } + } + } + } + +} -- 2.25.1 From d26f9b040e40678d814775021b304dc3d91ce6b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=B0=D1=82=20=D0=97=D0=B0=D1=80=D0=B3?= =?UTF-8?q?=D0=B0=D1=80=D0=BE=D0=B2?= Date: Tue, 15 Nov 2022 09:13:38 +0400 Subject: [PATCH 5/7] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs b/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs index 19fcdbe..a1d54e2 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs @@ -32,9 +32,6 @@ namespace DoubleDeckerBus } public Bitmap MoveObject(Direction direction) { - // TODO проверка, что объект может переместится в требуемом направлении - if (true) - { _drawningObject.MoveObject(direction); } return DrawMapWithObject(); -- 2.25.1 From f97d2694ef97ffd5583ef7414229271205f06273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=B0=D1=82=20=D0=97=D0=B0=D1=80=D0=B3?= =?UTF-8?q?=D0=B0=D1=80=D0=BE=D0=B2?= Date: Tue, 15 Nov 2022 09:13:53 +0400 Subject: [PATCH 6/7] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DoubleDeckerBus/AbstractMap.cs | 74 +++++++++++++++---- .../DoubleDeckerBus/DrawningBus.cs | 4 +- .../DrawningDoubleDeckerBus.cs | 19 ++++- .../DoubleDeckerBus/DrawningObjectBus.cs | 10 ++- .../DoubleDeckerBus/EntityDoubleDeckerBus.cs | 8 +- .../DoubleDeckerBus/FormMap.Designer.cs | 4 +- DoubleDeckerBus/DoubleDeckerBus/FormMap.cs | 17 ++--- DoubleDeckerBus/DoubleDeckerBus/MyMap.cs | 52 +++++++++++++ 8 files changed, 154 insertions(+), 34 deletions(-) create mode 100644 DoubleDeckerBus/DoubleDeckerBus/MyMap.cs diff --git a/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs b/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs index a1d54e2..4ce9f31 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs @@ -8,21 +8,22 @@ namespace DoubleDeckerBus { internal abstract class AbstractMap { - private IDrawningObject _drawningObject = null; + private IDrawningObject _drawingObject = null; protected int[,] _map = null; protected int _width; protected int _height; protected float _size_x; protected float _size_y; - protected readonly Random _random = new(); + protected readonly Random _random = new Random(); protected readonly int _freeRoad = 0; protected readonly int _barrier = 1; - public Bitmap CreateMap(int width, int height, IDrawningObject - drawningObject) + + + public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject) { _width = width; _height = height; - _drawningObject = drawningObject; + _drawingObject = drawningObject; GenerateMap(); while (!SetObjectOnMap()) { @@ -32,26 +33,48 @@ namespace DoubleDeckerBus } public Bitmap MoveObject(Direction direction) { - _drawningObject.MoveObject(direction); + + _drawingObject.MoveObject(direction); + + bool collision = CheckCollision(); + + if (collision) + { + switch (direction) + { + case Direction.Left: + _drawingObject.MoveObject(Direction.Right); + break; + case Direction.Right: + _drawingObject.MoveObject(Direction.Left); + break; + case Direction.Up: + _drawingObject.MoveObject(Direction.Down); + break; + case Direction.Down: + _drawingObject.MoveObject(Direction.Up); + break; + } } + return DrawMapWithObject(); } private bool SetObjectOnMap() { - if (_drawningObject == null || _map == null) + if (_drawingObject == null || _map == null) { return false; } int x = _random.Next(0, 10); int y = _random.Next(0, 10); - _drawningObject.SetObject(x, y, _width, _height); - // TODO првоерка, что объект не "накладывается" на закрытые участки - return true; + _drawingObject.SetObject(x, y, _width, _height); + + return !CheckCollision(); } private Bitmap DrawMapWithObject() { Bitmap bmp = new(_width, _height); - if (_drawningObject == null || _map == null) + if (_drawingObject == null || _map == null) { return bmp; } @@ -70,12 +93,37 @@ namespace DoubleDeckerBus } } } - _drawningObject.DrawningObject(gr); + _drawingObject.DrawningObject(gr); return bmp; + + } + private bool CheckCollision() + { + var pos = _drawingObject.GetCurrentPosition(); + int startX = (int)((pos.Left) / _size_x); + int endX = (int)((pos.Right) / _size_x); + int startY = (int)((pos.Top) / _size_y); + int endY = (int)((pos.Bottom) / _size_y); + + if (startX < 0 || startY < 0 || endX > _map.GetLength(1) || endY > _map.GetLength(0)) { return false; } + + + + for (int y = startY; y < endY; y++) + { + for (int x = startX; x < endX; x++) + { + if (_map[x, y] == _barrier) + { + return true; + } + } + } + + return false; } 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/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs index 4b68c4b..5fbe44e 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs @@ -34,7 +34,7 @@ namespace DoubleDeckerBus /// /// Ширина отрисовки автобуса /// - private readonly int _busWidth = 112; + private readonly int _busWidth = 115; /// /// Высота отрисовки автобуса /// @@ -183,7 +183,7 @@ namespace DoubleDeckerBus /// public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() { - return (_startPosX, _startPosY, _startPosX + _busWidth, _startPosY +_busHeight); + return (_startPosX, _startPosX + _busWidth, _startPosY, _startPosY + _busHeight); } } } diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs index 2f73043..bd7a924 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs @@ -18,10 +18,10 @@ namespace DoubleDeckerBus /// Признак наличия обвеса /// Признак наличия второго этажа /// Признак наличия полосы - public DrawningDoubleDeckerBus(int speed, float weight, Color bodyColor, Color dopColor, bool secondFloor, bool bodyKit, bool line) : - base(speed, weight, bodyColor, 112, 50) + public DrawningDoubleDeckerBus(int speed, float weight, Color bodyColor, Color dopColor, bool secondFloor, bool bodyKit, bool stair) : + base(speed, weight, bodyColor, 115, 100) { - Bus = new EntityDoubleDeckerBus(speed, weight, bodyColor, dopColor, secondFloor, bodyKit, line); + Bus = new EntityDoubleDeckerBus(speed, weight, bodyColor, dopColor, secondFloor, bodyKit, stair); } public override void DrawTransport(Graphics g) { @@ -50,11 +50,22 @@ namespace DoubleDeckerBus _startPosY += 40; base.DrawTransport(g); _startPosY -= 40; - if (doubleDeckerBus.Line) + Brush brBlack = new SolidBrush(Color.Black); + if (doubleDeckerBus.Stair) { + g.FillRectangle(brBlack, _startPosX + 73, _startPosY + 57, 4, 5); + g.FillRectangle(brBlack, _startPosX + 76, _startPosY + 53, 3, 5); + g.FillRectangle(brBlack, _startPosX + 78, _startPosY + 49, 4, 5); + g.FillEllipse(brBlack, _startPosX + 73, _startPosY + 57, 8, 5); + g.FillEllipse(brBlack, _startPosX + 76, _startPosY + 53, 6, 5); + g.FillEllipse(brBlack, _startPosX + 78, _startPosY + 49, 4, 5); } + Brush brGray = new SolidBrush(Color.DarkGray); if (doubleDeckerBus.BodyKit) { + g.FillRectangle(brGray, _startPosX, _startPosY + 75, 14, 8); + g.FillRectangle(brGray, _startPosX + 32, _startPosY + 75, 53, 8); + g.FillRectangle(brGray, _startPosX + 102, _startPosY + 75, 14, 8); } } diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs index 51a06b5..906fba3 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs @@ -28,7 +28,15 @@ namespace DoubleDeckerBus } public void DrawningObject(Graphics g) { - _bus.DrawTransport(g); + if (_bus == null) return; + if (_bus is DrawningDoubleDeckerBus doubleDeckerBus) + { + doubleDeckerBus.DrawTransport(g); + } + else + { + _bus.DrawTransport(g); + } } } diff --git a/DoubleDeckerBus/DoubleDeckerBus/EntityDoubleDeckerBus.cs b/DoubleDeckerBus/DoubleDeckerBus/EntityDoubleDeckerBus.cs index be33785..9a8c5cb 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/EntityDoubleDeckerBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/EntityDoubleDeckerBus.cs @@ -23,7 +23,7 @@ namespace DoubleDeckerBus /// /// Признак наличия гоночной полосы /// - public bool Line { get; private set; } + public bool Stair { get; private set; } /// /// Инициализация свойств /// @@ -33,14 +33,14 @@ namespace DoubleDeckerBus /// Дополнительный цвет /// Признак наличия второго этажа /// Признак наличия обвеса - /// Признак наличия полосы - public EntityDoubleDeckerBus(int speed, float weight, Color bodyColor, Color dopColor, bool secondFloor, bool bodyKit, bool line) : + /// Признак наличия лестницы + public EntityDoubleDeckerBus(int speed, float weight, Color bodyColor, Color dopColor, bool secondFloor, bool bodyKit, bool stair) : base(speed, weight, bodyColor) { DopColor = dopColor; SecondFloor = secondFloor; BodyKit = bodyKit; - Line = line; + Stair = stair; } } diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs b/DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs index f7a0c1a..d2196bf 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs @@ -157,11 +157,13 @@ 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(121, 23); this.comboBoxSelectorMap.TabIndex = 8; + this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); // // FormMap // diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs b/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs index b29287a..ea2921e 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs @@ -16,7 +16,7 @@ namespace DoubleDeckerBus public FormMap() { InitializeComponent(); - _abstractMap = new SimpleMap(); + _abstractMap = new MyMap(); } /// /// Заполнение информации по объекту @@ -75,14 +75,10 @@ namespace DoubleDeckerBus private void ButtonCreateModif_Click(object sender, EventArgs e) { Random rnd = new(); - var car = new DrawningDoubleDeckerBus(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)), Convert.ToBoolean(rnd.Next(0, 2))); + var car = new DrawningDoubleDeckerBus(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)), Convert.ToBoolean(rnd.Next(0, 2))); SetData(car); } /// @@ -97,6 +93,9 @@ namespace DoubleDeckerBus case "Простая карта": _abstractMap = new SimpleMap(); break; + case "Моя карта": + _abstractMap = new MyMap(); + break; } } } diff --git a/DoubleDeckerBus/DoubleDeckerBus/MyMap.cs b/DoubleDeckerBus/DoubleDeckerBus/MyMap.cs new file mode 100644 index 0000000..b36ec20 --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/MyMap.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DoubleDeckerBus +{ + internal class MyMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Red); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.LightBlue); + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + } + protected override void GenerateMap() + { + _map = new int[100, 100]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + int counter = 0; + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + while (counter < 50) + { + int x = _random.Next(0, 100); + int y = _random.Next(0, 100); + if (_map[x, y] == _freeRoad) + { + _map[x, y] = _barrier; + counter++; + } + } + } + } +} -- 2.25.1 From 0e4164f751eb4168e19ab09ad31ece97292d73cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=B0=D1=82=20=D0=97=D0=B0=D1=80=D0=B3?= =?UTF-8?q?=D0=B0=D1=80=D0=BE=D0=B2?= Date: Wed, 16 Nov 2022 09:56:42 +0400 Subject: [PATCH 7/7] =?UTF-8?q?=D0=9A=D0=BE=D0=BD=D0=B5=D1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DoubleDeckerBus/DrawningDoubleDeckerBus.cs | 2 +- DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs | 10 +--------- DoubleDeckerBus/DoubleDeckerBus/FormMap.cs | 3 ++- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs index bd7a924..065f1b4 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs @@ -19,7 +19,7 @@ namespace DoubleDeckerBus /// Признак наличия второго этажа /// Признак наличия полосы public DrawningDoubleDeckerBus(int speed, float weight, Color bodyColor, Color dopColor, bool secondFloor, bool bodyKit, bool stair) : - base(speed, weight, bodyColor, 115, 100) + base(speed, weight, bodyColor, 120, 92) { Bus = new EntityDoubleDeckerBus(speed, weight, bodyColor, dopColor, secondFloor, bodyKit, stair); } diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs index 906fba3..51a06b5 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs @@ -28,15 +28,7 @@ namespace DoubleDeckerBus } public void DrawningObject(Graphics g) { - if (_bus == null) return; - if (_bus is DrawningDoubleDeckerBus doubleDeckerBus) - { - doubleDeckerBus.DrawTransport(g); - } - else - { - _bus.DrawTransport(g); - } + _bus.DrawTransport(g); } } diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs b/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs index ea2921e..94e2deb 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs @@ -16,7 +16,8 @@ namespace DoubleDeckerBus public FormMap() { InitializeComponent(); - _abstractMap = new MyMap(); + _abstractMap = new SimpleMap(); + comboBoxSelectorMap.Text = "Простая карта"; } /// /// Заполнение информации по объекту -- 2.25.1