From 5669b4e535c1d558541e54e8144c49fe47c88244 Mon Sep 17 00:00:00 2001 From: Sem730 Date: Mon, 26 Sep 2022 22:25:23 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectLocomotive/ProjectLocomotive/DrawningLocomotive.cs | 5 ++--- ProjectLocomotive/ProjectLocomotive/EntityLocomotive.cs | 2 +- ProjectLocomotive/ProjectLocomotive/FormLocomotive.cs | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ProjectLocomotive/ProjectLocomotive/DrawningLocomotive.cs b/ProjectLocomotive/ProjectLocomotive/DrawningLocomotive.cs index 0aa3f7a..fd3163e 100644 --- a/ProjectLocomotive/ProjectLocomotive/DrawningLocomotive.cs +++ b/ProjectLocomotive/ProjectLocomotive/DrawningLocomotive.cs @@ -45,10 +45,9 @@ namespace ProjectLocomotive /// Скорость /// Вес локомотива /// Цвет кузова - public void Init(int speed, float weight, Color bodyColor) + public DrawningLocomotive(int speed, float weight, Color bodyColor) { - Locomotivе = new EntityLocomotive(); - Locomotivе.Init(speed, weight, bodyColor); + Locomotivе = new EntityLocomotive(speed, weight, bodyColor); } /// /// Установка позиции автомобиля diff --git a/ProjectLocomotive/ProjectLocomotive/EntityLocomotive.cs b/ProjectLocomotive/ProjectLocomotive/EntityLocomotive.cs index 7ff411d..1f7dfe1 100644 --- a/ProjectLocomotive/ProjectLocomotive/EntityLocomotive.cs +++ b/ProjectLocomotive/ProjectLocomotive/EntityLocomotive.cs @@ -31,7 +31,7 @@ namespace ProjectLocomotive /// /// /// - public void Init(int speed, float weight, Color bodyColor) + public EntityLocomotive(int speed, float weight, Color bodyColor) { Random rnd = new(); Speed = speed <= 0 ? rnd.Next(50, 150) : speed; diff --git a/ProjectLocomotive/ProjectLocomotive/FormLocomotive.cs b/ProjectLocomotive/ProjectLocomotive/FormLocomotive.cs index 5827c25..c082a4f 100644 --- a/ProjectLocomotive/ProjectLocomotive/FormLocomotive.cs +++ b/ProjectLocomotive/ProjectLocomotive/FormLocomotive.cs @@ -28,8 +28,7 @@ namespace ProjectLocomotive private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _elloc = new DrawningLocomotive(); - _elloc.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + _elloc = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); _elloc.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); toolStripStatusLabelSpeed.Text = $": {_elloc.Locomotiv.Speed}"; toolStripStatusLabelWeight.Text = $": {_elloc.Locomotiv.Weight}"; From 9436161a1a4cd677767848aa922ae05d6bc6b2b1 Mon Sep 17 00:00:00 2001 From: Sem730 Date: Tue, 27 Sep 2022 10:48:19 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B4=D0=B2=D0=B8=D0=BD?= =?UTF-8?q?=D1=83=D1=82=D1=8B=D0=B9=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DrawningElectroLocomotive.cs | 90 +++++++++++++++++++ .../ProjectLocomotive/DrawningLocomotive.cs | 23 ++++- .../EntityElectricLocomotive.cs | 42 +++++++++ .../FormLocomotive.Designer.cs | 39 +++++--- .../ProjectLocomotive/FormLocomotive.cs | 31 ++++++- 5 files changed, 204 insertions(+), 21 deletions(-) create mode 100644 ProjectLocomotive/ProjectLocomotive/DrawningElectroLocomotive.cs create mode 100644 ProjectLocomotive/ProjectLocomotive/EntityElectricLocomotive.cs diff --git a/ProjectLocomotive/ProjectLocomotive/DrawningElectroLocomotive.cs b/ProjectLocomotive/ProjectLocomotive/DrawningElectroLocomotive.cs new file mode 100644 index 0000000..395b329 --- /dev/null +++ b/ProjectLocomotive/ProjectLocomotive/DrawningElectroLocomotive.cs @@ -0,0 +1,90 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive +{ + internal class DrawningElectroLocomotive : DrawningLocomotive + { + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес автомобиля + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия "рогов" для подключения + /// Признак наличия отсека электро-батарей + public DrawningElectroLocomotive(int speed, float weight, Color bodyColor, Color + dopColor, bool electroLines, bool electroBattery) : + base(speed, weight, bodyColor, 110, 60) + { + Locomotivе = new EntityElectricLocomotive(speed, weight, bodyColor, dopColor, electroLines, + electroBattery); + } + public override void DrawTransport(Graphics g) + { + if (Locomotivе is not EntityElectricLocomotive elLocc) + { + return; + } + Pen pen = new(Color.Black); + Brush dopBrush = new SolidBrush(elLocc.DopColor); + if (elLocc.ElectroLines) + { + g.DrawLine(pen, _startPosX + 20, _startPosY, _startPosX + 5, _startPosY - 12); + g.DrawLine(pen, _startPosX + 20, _startPosY, _startPosX + 35, _startPosY - 12); + g.DrawLine(pen, _startPosX + 70, _startPosY, _startPosX + 55, _startPosY - 12); + g.DrawLine(pen, _startPosX + 70, _startPosY, _startPosX + 85, _startPosY - 12); + // g.DrawEllipse(pen, _startPosX + 90, _startPosY, 20, 20); + // g.DrawEllipse(pen, _startPosX + 90, _startPosY + 40, 20, 20); + // g.DrawRectangle(pen, _startPosX + 90, _startPosY + 10, 20, 40); + // g.DrawRectangle(pen, _startPosX + 90, _startPosY, 15, 15); + // g.DrawRectangle(pen, _startPosX + 90, _startPosY + 45, 15, 15); + // g.FillEllipse(dopBrush, _startPosX + 90, _startPosY, 20, 20); + // g.FillEllipse(dopBrush, _startPosX + 90, _startPosY + 40, 20, 20); + // g.FillRectangle(dopBrush, _startPosX + 90, _startPosY + 10, 20, + //40); + // g.FillRectangle(dopBrush, _startPosX + 90, _startPosY + 1, 15, + //15); + // g.FillRectangle(dopBrush, _startPosX + 90, _startPosY + 45, 15, + //15); + // g.DrawEllipse(pen, _startPosX, _startPosY, 20, 20); + // g.DrawEllipse(pen, _startPosX, _startPosY + 40, 20, 20); + // g.DrawRectangle(pen, _startPosX, _startPosY + 10, 20, 40); + // g.DrawRectangle(pen, _startPosX + 5, _startPosY, 14, 15); + // g.DrawRectangle(pen, _startPosX + 5, _startPosY + 45, 14, 15); + // g.FillEllipse(dopBrush, _startPosX, _startPosY, 20, 20); + // g.FillEllipse(dopBrush, _startPosX, _startPosY + 40, 20, 20); + // g.FillRectangle(dopBrush, _startPosX + 1, _startPosY + 10, 25, + //40); + // g.FillRectangle(dopBrush, _startPosX + 5, _startPosY + 1, 15, 15); + // g.FillRectangle(dopBrush, _startPosX + 5, _startPosY + 45, 15, + //15); + // g.DrawRectangle(pen, _startPosX + 35, _startPosY, 39, 15); + // g.DrawRectangle(pen, _startPosX + 35, _startPosY + 45, 39, 15); + // g.FillRectangle(dopBrush, _startPosX + 35, _startPosY + 1, 40, + //15); + // g.FillRectangle(dopBrush, _startPosX + 35, _startPosY + 45, 40, + //15); + } + //_startPosX += 10; + //_startPosY += 5; + base.DrawTransport(g); + //_startPosX -= 10; + //_startPosY -= 5; + if (elLocc.ElectroBattery) + { + Brush brblack = new SolidBrush(Color.Black); + g.FillRectangle(brblack, _startPosX + 40, _startPosY + 25, 15, 5); + g.FillRectangle(brblack, _startPosX + 60, _startPosY + 25, 15, 5); + g.FillRectangle(brblack, _startPosX + 5, _startPosY + 25, 15, 5); + //g.FillRectangle(brblack, _startPosX + 70, _startPosY + 3, 5, 10); + //g.FillRectangle(dopBrush, _startPosX, _startPosY + 5, 10, 50); + //g.DrawRectangle(pen, _startPosX, _startPosY + 5, 10, 50); + } + } + } +} diff --git a/ProjectLocomotive/ProjectLocomotive/DrawningLocomotive.cs b/ProjectLocomotive/ProjectLocomotive/DrawningLocomotive.cs index fd3163e..ad2118a 100644 --- a/ProjectLocomotive/ProjectLocomotive/DrawningLocomotive.cs +++ b/ProjectLocomotive/ProjectLocomotive/DrawningLocomotive.cs @@ -14,15 +14,15 @@ namespace ProjectLocomotive /// /// Класс-сущность /// - public EntityLocomotive Locomotivе { private set; get; } + public EntityLocomotive Locomotivе { get; protected set; } /// /// Левая координата отрисовки локомотива /// - private float _startPosX; + protected float _startPosX; /// /// Верхняя кооридната отрисовки локомотива /// - private float _startPosY; + protected float _startPosY; /// /// Ширина окна отрисовки /// @@ -50,6 +50,21 @@ namespace ProjectLocomotive Locomotivе = new EntityLocomotive(speed, weight, bodyColor); } /// + /// Инициализация свойств + /// + /// Скорость + /// Вес автомобиля + /// Цвет кузова + /// Ширина отрисовки автомобиля + /// Высота отрисовки автомобиля + protected DrawningLocomotive(int speed, float weight, Color bodyColor, int + carWidth, int carHeight) : + this(speed, weight, bodyColor) + { + _LocWidth = carWidth; + _LocHeight = carHeight; + } + /// /// Установка позиции автомобиля /// /// Координата X @@ -118,7 +133,7 @@ namespace ProjectLocomotive /// Отрисовка автомобиля /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) diff --git a/ProjectLocomotive/ProjectLocomotive/EntityElectricLocomotive.cs b/ProjectLocomotive/ProjectLocomotive/EntityElectricLocomotive.cs new file mode 100644 index 0000000..4b17262 --- /dev/null +++ b/ProjectLocomotive/ProjectLocomotive/EntityElectricLocomotive.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive +{ + internal class EntityElectricLocomotive : EntityLocomotive + { + /// + /// Дополнительный цвет + /// + public Color DopColor { get; private set; } + /// + /// Признак наличия "рогов" для подключения + /// + public bool ElectroLines { get; private set; } + /// + /// Признак наличия отсека электро-батарей + /// + public bool ElectroBattery { get; private set; } + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес автомобиля + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия "рогов" для подключения + /// Признак наличия отсека электро-батарей + + public EntityElectricLocomotive(int speed, float weight, Color bodyColor, Color + dopColor, bool electroLines, bool electroBattery) : + base(speed, weight, bodyColor) + { + DopColor = dopColor; + ElectroLines = electroLines = true; + ElectroBattery = electroBattery = true; + } + } +} diff --git a/ProjectLocomotive/ProjectLocomotive/FormLocomotive.Designer.cs b/ProjectLocomotive/ProjectLocomotive/FormLocomotive.Designer.cs index 30a2ee7..1a7a23d 100644 --- a/ProjectLocomotive/ProjectLocomotive/FormLocomotive.Designer.cs +++ b/ProjectLocomotive/ProjectLocomotive/FormLocomotive.Designer.cs @@ -38,6 +38,7 @@ this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel(); this.statusStrip = new System.Windows.Forms.StatusStrip(); + this.buttonCreateModif = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotive)).BeginInit(); this.statusStrip.SuspendLayout(); this.SuspendLayout(); @@ -88,19 +89,6 @@ this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); this.buttonLeft.Resize += new System.EventHandler(this.PictureBoxLocomotive_Resize); // - // buttonRight - // - this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonRight.BackgroundImage = global::ProjectLocomotive.Properties.Resources.right; - this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonRight.Location = new System.Drawing.Point(711, 375); - this.buttonRight.Name = "buttonRight"; - this.buttonRight.Size = new System.Drawing.Size(30, 30); - this.buttonRight.TabIndex = 5; - this.buttonRight.UseVisualStyleBackColor = true; - this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); - this.buttonRight.Resize += new System.EventHandler(this.PictureBoxLocomotive_Resize); - // // buttonDown // this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); @@ -114,6 +102,19 @@ this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); this.buttonDown.Resize += new System.EventHandler(this.PictureBoxLocomotive_Resize); // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::ProjectLocomotive.Properties.Resources.right; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(711, 375); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.TabIndex = 5; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); + this.buttonRight.Resize += new System.EventHandler(this.PictureBoxLocomotive_Resize); + // // toolStripStatusLabelSpeed // this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; @@ -144,11 +145,22 @@ this.statusStrip.Size = new System.Drawing.Size(800, 32); this.statusStrip.TabIndex = 1; // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(120, 375); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(138, 30); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // // FormLocomotive // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); 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); @@ -178,5 +190,6 @@ private ToolStripStatusLabel toolStripStatusLabelWeight; private ToolStripStatusLabel toolStripStatusLabelBodyColor; private StatusStrip statusStrip; + private Button buttonCreateModif; } } \ No newline at end of file diff --git a/ProjectLocomotive/ProjectLocomotive/FormLocomotive.cs b/ProjectLocomotive/ProjectLocomotive/FormLocomotive.cs index c082a4f..f361b4c 100644 --- a/ProjectLocomotive/ProjectLocomotive/FormLocomotive.cs +++ b/ProjectLocomotive/ProjectLocomotive/FormLocomotive.cs @@ -20,6 +20,17 @@ namespace ProjectLocomotive pictureBoxLocomotive.Image = bmp; } /// + /// + /// + private void SetData() + { + Random rnd = new(); + _elloc.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); + toolStripStatusLabelSpeed.Text = $": {_elloc.Locomotiv.Speed}"; + toolStripStatusLabelWeight.Text = $": {_elloc.Locomotiv.Weight}"; + toolStripStatusLabelBodyColor.Text = $": {_elloc.Locomotiv.BodyColor.Name}"; + } + /// /// "" /// /// @@ -29,10 +40,7 @@ namespace ProjectLocomotive { Random rnd = new(); _elloc = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - _elloc.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); - toolStripStatusLabelSpeed.Text = $": {_elloc.Locomotiv.Speed}"; - toolStripStatusLabelWeight.Text = $": {_elloc.Locomotiv.Weight}"; - toolStripStatusLabelBodyColor.Text = $": {_elloc.Locomotiv.BodyColor.Name}"; + SetData(); Draw(); } /// @@ -71,5 +79,20 @@ namespace ProjectLocomotive _elloc?.ChangeBorders(pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); Draw(); } + /// + /// "" + /// + /// + /// + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + _elloc = new DrawningElectroLocomotive(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(1, 100), rnd.Next(1, 100), rnd.Next(1, 100)), + Convert.ToBoolean(rnd.Next(0, 1)), Convert.ToBoolean(rnd.Next(0, 1))); + SetData(); + Draw(); + } } } \ No newline at end of file From 42a4585ededaba7c2aabf960b2aeb4469c3328d9 Mon Sep 17 00:00:00 2001 From: Sem730 Date: Tue, 27 Sep 2022 11:07:14 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5?= =?UTF-8?q?=D0=B9=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLocomotive/DrawningLocomotive.cs | 4 ++ .../ProjectLocomotive/DrawningObject.cs | 39 ++++++++++++++++ .../ProjectLocomotive/IDrawningObject.cs | 44 +++++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 ProjectLocomotive/ProjectLocomotive/DrawningObject.cs create mode 100644 ProjectLocomotive/ProjectLocomotive/IDrawningObject.cs diff --git a/ProjectLocomotive/ProjectLocomotive/DrawningLocomotive.cs b/ProjectLocomotive/ProjectLocomotive/DrawningLocomotive.cs index ad2118a..38519a0 100644 --- a/ProjectLocomotive/ProjectLocomotive/DrawningLocomotive.cs +++ b/ProjectLocomotive/ProjectLocomotive/DrawningLocomotive.cs @@ -192,5 +192,9 @@ namespace ProjectLocomotive _startPosY = _pictureHeight.Value - _LocHeight; } } + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (_startPosX, _startPosY, _startPosX + _LocWidth, _startPosY + _LocHeight); + } } } diff --git a/ProjectLocomotive/ProjectLocomotive/DrawningObject.cs b/ProjectLocomotive/ProjectLocomotive/DrawningObject.cs new file mode 100644 index 0000000..5ed82a4 --- /dev/null +++ b/ProjectLocomotive/ProjectLocomotive/DrawningObject.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive +{ + internal class DrawningObject : IDrawningObject + { + private DrawningLocomotive _loc = null; + public DrawningObject(DrawningLocomotive loc) + { + _loc = loc; + } + + public float Step => _loc?.Locomotivе?.Step ?? 0; + + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return _loc?.GetCurrentPosition() ?? default; + } + + public void MoveObject(Direction direction) + { + _loc?.MoveTransport(direction); + } + + public void SetObject(int x, int y, int width, int height) + { + _loc.SetPosition(x, y, width, height); + } + + void IDrawningObject.DrawningObject(Graphics g) + { + // TODO + } + } +} diff --git a/ProjectLocomotive/ProjectLocomotive/IDrawningObject.cs b/ProjectLocomotive/ProjectLocomotive/IDrawningObject.cs new file mode 100644 index 0000000..26a219f --- /dev/null +++ b/ProjectLocomotive/ProjectLocomotive/IDrawningObject.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive +{ + /// + /// Интерфейс для работы с объектом, прорисовываемым на форме + /// + internal interface IDrawningObject + { + /// + /// Шаг перемещения объекта + /// + public float Step { get; } + /// + /// Установка позиции объекта + /// + /// Координата X + /// Координата Y + /// Ширина полотна + /// Высота полотна + void SetObject(int x, int y, int width, int height); + /// + /// Изменение направления пермещения объекта + /// + /// Направление + /// + void MoveObject(Direction direction); + /// + /// Отрисовка объекта + /// + /// + void DrawningObject(Graphics g); + /// + /// Получение текущей позиции объекта + /// + /// + (float Left, float Right, float Top, float Bottom) GetCurrentPosition(); + } +} + From a061d56fb9c5f1a6f45935f7a38e9cf5adea5c1b Mon Sep 17 00:00:00 2001 From: Sem730 Date: Wed, 28 Sep 2022 09:19:58 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=90=D0=B1=D1=81=D1=82=D1=80=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLocomotive/AbstractMap.cs | 145 ++++++++++++ .../ProjectLocomotive/Direction.cs | 1 + .../DrawningElectroLocomotive.cs | 39 +--- .../ProjectLocomotive/DrawningObject.cs | 1 + .../ProjectLocomotive/FormMap.Designer.cs | 218 ++++++++++++++++++ .../ProjectLocomotive/FormMap.cs | 105 +++++++++ .../ProjectLocomotive/FormMap.resx | 63 +++++ .../ProjectLocomotive/Program.cs | 2 +- ProjectLocomotive/ProjectLocomotive/SeaMap.cs | 52 +++++ .../ProjectLocomotive/SimpleMap.cs | 56 +++++ 10 files changed, 643 insertions(+), 39 deletions(-) create mode 100644 ProjectLocomotive/ProjectLocomotive/AbstractMap.cs create mode 100644 ProjectLocomotive/ProjectLocomotive/FormMap.Designer.cs create mode 100644 ProjectLocomotive/ProjectLocomotive/FormMap.cs create mode 100644 ProjectLocomotive/ProjectLocomotive/FormMap.resx create mode 100644 ProjectLocomotive/ProjectLocomotive/SeaMap.cs create mode 100644 ProjectLocomotive/ProjectLocomotive/SimpleMap.cs diff --git a/ProjectLocomotive/ProjectLocomotive/AbstractMap.cs b/ProjectLocomotive/ProjectLocomotive/AbstractMap.cs new file mode 100644 index 0000000..454c406 --- /dev/null +++ b/ProjectLocomotive/ProjectLocomotive/AbstractMap.cs @@ -0,0 +1,145 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive +{ + 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 bool CheckAround(float Left, float Right, float Top, float Bottom) + { + int startX = (int)(Left / _size_x); + int startY = (int)(Right / _size_y); + int endX = (int)(Top / _size_x); + int endY = (int)(Bottom / _size_y); + + for (int i = startX; i <= endX; i++) + { + for (int j = startY; j <= endY; j++) + { + if (_map[i, j] == _barrier) + { + return true; + } + } + } + return false; + } + public Bitmap MoveObject(Direction direction) + { + _drawningObject.MoveObject(direction); + (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition(); + + if (CheckAround(Left, Right, Top, Bottom)) + { + _drawningObject.MoveObject(MoveObjectBack(direction)); + } + return DrawMapWithObject(); + + } + private Direction MoveObjectBack(Direction direction) + { + switch (direction) + { + case Direction.Up: + return Direction.Down; + case Direction.Down: + return Direction.Up; + case Direction.Left: + return Direction.Right; + case Direction.Right: + return Direction.Left; + } + return Direction.None; + } + 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); + (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition(); + if (!CheckAround(Left, Right, Top, Bottom)) return true; + float startX = Left; + float startY = Right; + float lengthX = Top - Left; + float lengthY = Bottom - Right; + while (CheckAround(startX, startY, startX + lengthX, startY + lengthY)) + { + bool result; + do + { + result = CheckAround(startX, startY, startX + lengthX, startY + lengthY); + if (!result) + { + _drawningObject.SetObject((int)startX, (int)startY, _width, _height); + return true; + } + else + { + startX += _size_x; + } + } while (result); + startX = x; + startY += _size_y; + } + return false; + } + 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/ProjectLocomotive/ProjectLocomotive/Direction.cs b/ProjectLocomotive/ProjectLocomotive/Direction.cs index f284e18..cf1a741 100644 --- a/ProjectLocomotive/ProjectLocomotive/Direction.cs +++ b/ProjectLocomotive/ProjectLocomotive/Direction.cs @@ -8,6 +8,7 @@ namespace ProjectLocomotive { internal enum Direction { + None = 0, Up = 1, Down = 2, Left = 3, diff --git a/ProjectLocomotive/ProjectLocomotive/DrawningElectroLocomotive.cs b/ProjectLocomotive/ProjectLocomotive/DrawningElectroLocomotive.cs index 395b329..07ffd1b 100644 --- a/ProjectLocomotive/ProjectLocomotive/DrawningElectroLocomotive.cs +++ b/ProjectLocomotive/ProjectLocomotive/DrawningElectroLocomotive.cs @@ -38,52 +38,15 @@ namespace ProjectLocomotive g.DrawLine(pen, _startPosX + 20, _startPosY, _startPosX + 35, _startPosY - 12); g.DrawLine(pen, _startPosX + 70, _startPosY, _startPosX + 55, _startPosY - 12); g.DrawLine(pen, _startPosX + 70, _startPosY, _startPosX + 85, _startPosY - 12); - // g.DrawEllipse(pen, _startPosX + 90, _startPosY, 20, 20); - // g.DrawEllipse(pen, _startPosX + 90, _startPosY + 40, 20, 20); - // g.DrawRectangle(pen, _startPosX + 90, _startPosY + 10, 20, 40); - // g.DrawRectangle(pen, _startPosX + 90, _startPosY, 15, 15); - // g.DrawRectangle(pen, _startPosX + 90, _startPosY + 45, 15, 15); - // g.FillEllipse(dopBrush, _startPosX + 90, _startPosY, 20, 20); - // g.FillEllipse(dopBrush, _startPosX + 90, _startPosY + 40, 20, 20); - // g.FillRectangle(dopBrush, _startPosX + 90, _startPosY + 10, 20, - //40); - // g.FillRectangle(dopBrush, _startPosX + 90, _startPosY + 1, 15, - //15); - // g.FillRectangle(dopBrush, _startPosX + 90, _startPosY + 45, 15, - //15); - // g.DrawEllipse(pen, _startPosX, _startPosY, 20, 20); - // g.DrawEllipse(pen, _startPosX, _startPosY + 40, 20, 20); - // g.DrawRectangle(pen, _startPosX, _startPosY + 10, 20, 40); - // g.DrawRectangle(pen, _startPosX + 5, _startPosY, 14, 15); - // g.DrawRectangle(pen, _startPosX + 5, _startPosY + 45, 14, 15); - // g.FillEllipse(dopBrush, _startPosX, _startPosY, 20, 20); - // g.FillEllipse(dopBrush, _startPosX, _startPosY + 40, 20, 20); - // g.FillRectangle(dopBrush, _startPosX + 1, _startPosY + 10, 25, - //40); - // g.FillRectangle(dopBrush, _startPosX + 5, _startPosY + 1, 15, 15); - // g.FillRectangle(dopBrush, _startPosX + 5, _startPosY + 45, 15, - //15); - // g.DrawRectangle(pen, _startPosX + 35, _startPosY, 39, 15); - // g.DrawRectangle(pen, _startPosX + 35, _startPosY + 45, 39, 15); - // g.FillRectangle(dopBrush, _startPosX + 35, _startPosY + 1, 40, - //15); - // g.FillRectangle(dopBrush, _startPosX + 35, _startPosY + 45, 40, - //15); + } - //_startPosX += 10; - //_startPosY += 5; base.DrawTransport(g); - //_startPosX -= 10; - //_startPosY -= 5; if (elLocc.ElectroBattery) { Brush brblack = new SolidBrush(Color.Black); g.FillRectangle(brblack, _startPosX + 40, _startPosY + 25, 15, 5); g.FillRectangle(brblack, _startPosX + 60, _startPosY + 25, 15, 5); g.FillRectangle(brblack, _startPosX + 5, _startPosY + 25, 15, 5); - //g.FillRectangle(brblack, _startPosX + 70, _startPosY + 3, 5, 10); - //g.FillRectangle(dopBrush, _startPosX, _startPosY + 5, 10, 50); - //g.DrawRectangle(pen, _startPosX, _startPosY + 5, 10, 50); } } } diff --git a/ProjectLocomotive/ProjectLocomotive/DrawningObject.cs b/ProjectLocomotive/ProjectLocomotive/DrawningObject.cs index 5ed82a4..92381d0 100644 --- a/ProjectLocomotive/ProjectLocomotive/DrawningObject.cs +++ b/ProjectLocomotive/ProjectLocomotive/DrawningObject.cs @@ -34,6 +34,7 @@ namespace ProjectLocomotive void IDrawningObject.DrawningObject(Graphics g) { // TODO + _loc.DrawTransport(g); } } } diff --git a/ProjectLocomotive/ProjectLocomotive/FormMap.Designer.cs b/ProjectLocomotive/ProjectLocomotive/FormMap.Designer.cs new file mode 100644 index 0000000..12f06b9 --- /dev/null +++ b/ProjectLocomotive/ProjectLocomotive/FormMap.Designer.cs @@ -0,0 +1,218 @@ +namespace ProjectLocomotive +{ + 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.pictureBoxCar = 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.buttonRight = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCar)).BeginInit(); + this.statusStrip.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBoxCar + // + this.pictureBoxCar.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxCar.Location = new System.Drawing.Point(0, 0); + this.pictureBoxCar.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.pictureBoxCar.Name = "pictureBoxCar"; + this.pictureBoxCar.Size = new System.Drawing.Size(1143, 718); + this.pictureBoxCar.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxCar.TabIndex = 0; + this.pictureBoxCar.TabStop = false; + // + // statusStrip + // + this.statusStrip.ImageScalingSize = new System.Drawing.Size(24, 24); + this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelBodyColor}); + this.statusStrip.Location = new System.Drawing.Point(0, 718); + this.statusStrip.Name = "statusStrip"; + this.statusStrip.Padding = new System.Windows.Forms.Padding(1, 0, 20, 0); + this.statusStrip.Size = new System.Drawing.Size(1143, 32); + this.statusStrip.TabIndex = 1; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(93, 25); + this.toolStripStatusLabelSpeed.Text = "Скорость:"; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(43, 25); + this.toolStripStatusLabelWeight.Text = "Вес:"; + // + // toolStripStatusLabelBodyColor + // + this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(55, 25); + 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(17, 650); + this.buttonCreate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(107, 38); + 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::ProjectLocomotive.Properties.Resources.up; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(1031, 583); + this.buttonUp.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(43, 50); + 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::ProjectLocomotive.Properties.Resources.left; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(980, 643); + this.buttonLeft.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(43, 50); + this.buttonLeft.TabIndex = 4; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.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::ProjectLocomotive.Properties.Resources.right; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(1083, 643); + this.buttonRight.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(43, 50); + this.buttonRight.TabIndex = 5; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.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::ProjectLocomotive.Properties.Resources.down; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(1031, 643); + this.buttonDown.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(43, 50); + this.buttonDown.TabIndex = 6; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(149, 650); + this.buttonCreateModif.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(157, 38); + 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(17, 20); + this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(171, 33); + this.comboBoxSelectorMap.TabIndex = 8; + this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); + // + // FormMap + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1143, 750); + this.Controls.Add(this.comboBoxSelectorMap); + this.Controls.Add(this.buttonCreateModif); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.pictureBoxCar); + this.Controls.Add(this.statusStrip); + this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.Name = "FormMap"; + this.Text = "Карта"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCar)).EndInit(); + this.statusStrip.ResumeLayout(false); + this.statusStrip.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private PictureBox pictureBoxCar; + private StatusStrip statusStrip; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelBodyColor; + private Button buttonCreate; + private Button buttonUp; + private Button buttonLeft; + private Button buttonRight; + private Button buttonDown; + private Button buttonCreateModif; + private ComboBox comboBoxSelectorMap; + } +} \ No newline at end of file diff --git a/ProjectLocomotive/ProjectLocomotive/FormMap.cs b/ProjectLocomotive/ProjectLocomotive/FormMap.cs new file mode 100644 index 0000000..b072f4b --- /dev/null +++ b/ProjectLocomotive/ProjectLocomotive/FormMap.cs @@ -0,0 +1,105 @@ +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 ProjectLocomotive +{ + public partial class FormMap : Form + { + private AbstractMap _abstractMap; + + public FormMap() + { + InitializeComponent(); + _abstractMap = new SimpleMap(); + } + /// + /// Заполнение информации по объекту + /// + /// + private void SetData(DrawningLocomotive loc) + { + toolStripStatusLabelSpeed.Text = $"Скорость: {loc.Locomotivе.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {loc.Locomotivе.Weight}"; + toolStripStatusLabelBodyColor.Text = $"Цвет: {loc.Locomotivе.BodyColor.Name}"; + pictureBoxCar.Image = _abstractMap.CreateMap(pictureBoxCar.Width, pictureBoxCar.Height, + new DrawningObject(loc)); + } + /// + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + var car = new DrawningLocomotive(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; + } + pictureBoxCar.Image = _abstractMap?.MoveObject(dir); + } + /// + /// Обработка нажатия кнопки "Модификация" + /// + /// + /// + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + var car = new DrawningElectroLocomotive(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(car); + } + /// + /// Смена карты + /// + /// + /// + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + + case "Море": + _abstractMap = new SeaMap(); + break; + } + } + } +} diff --git a/ProjectLocomotive/ProjectLocomotive/FormMap.resx b/ProjectLocomotive/ProjectLocomotive/FormMap.resx new file mode 100644 index 0000000..2c0949d --- /dev/null +++ b/ProjectLocomotive/ProjectLocomotive/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/ProjectLocomotive/ProjectLocomotive/Program.cs b/ProjectLocomotive/ProjectLocomotive/Program.cs index 8f40489..76a287d 100644 --- a/ProjectLocomotive/ProjectLocomotive/Program.cs +++ b/ProjectLocomotive/ProjectLocomotive/Program.cs @@ -11,7 +11,7 @@ namespace ProjectLocomotive // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormLocomotive()); + Application.Run(new FormMap()); } } } \ No newline at end of file diff --git a/ProjectLocomotive/ProjectLocomotive/SeaMap.cs b/ProjectLocomotive/ProjectLocomotive/SeaMap.cs new file mode 100644 index 0000000..d57a4d7 --- /dev/null +++ b/ProjectLocomotive/ProjectLocomotive/SeaMap.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive +{ + internal class SeaMap : AbstractMap + { + private readonly Brush barrierColor = new SolidBrush(Color.White); + + private readonly Brush roadColor = new SolidBrush(Color.Blue); + + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + 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 < 25) + { + int x = _random.Next(0, 97); + int y = _random.Next(0, 97); + if (_map[x, y] == _freeRoad) + { + _map[x, y + 1] = _barrier; + _map[x + 1, y + 1] = _barrier; + _map[x + 2, y + 1] = _barrier; + _map[x + 1, y] = _barrier; + counter++; + } + } + } + } +} diff --git a/ProjectLocomotive/ProjectLocomotive/SimpleMap.cs b/ProjectLocomotive/ProjectLocomotive/SimpleMap.cs new file mode 100644 index 0000000..926f329 --- /dev/null +++ b/ProjectLocomotive/ProjectLocomotive/SimpleMap.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectLocomotive +{ + /// + /// Простая реализация абсрактного класса 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++; + } + } + } + } +}