Oleja123/PIbd-23-Salin-O.A.-Monorail-Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправил названия классов для последующих лаб

Browse Source
This commit is contained in:
gg12 darfren 2023-10-15 19:12:56 +04:00
parent 87888ff403
commit daa6d8c91f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Monorail/Monorail/DrawningAdvancedMonorail.cs → Monorail/Monorail/DrawningLocomotive.cs
View File

@ -8,14 +8,14 @@ using Monorail.Entities;
namespace Monorail.DrawningObjects namespace Monorail.DrawningObjects
{ {
public class DrawningAdvancedMonorail : DrawningMonorail public class DrawningLocomotive : DrawningMonorail
{ {
public DrawningAdvancedMonorail(int speed, double weight, Color bodyColor, Color wheelColor, Color tireColor, int width, int height, int addWheelsNumb, public DrawningLocomotive(int speed, double weight, Color bodyColor, Color wheelColor, Color tireColor, int width, int height, int addWheelsNumb,
Color additionalColor, bool secondCabine, bool magniteRail) : base(speed, weight, bodyColor, wheelColor, tireColor, width, height) Color additionalColor, bool secondCabine, bool magniteRail) : base(speed, weight, bodyColor, wheelColor, tireColor, width, height)
{ {
if(EntityMonorail != null) if(EntityMonorail != null)
{ {
EntityMonorail = new EntityAdvancedMonorail(speed, weight, bodyColor, wheelColor, tireColor, EntityMonorail = new EntityLocomotive(speed, weight, bodyColor, wheelColor, tireColor,
addWheelsNumb, additionalColor, secondCabine, magniteRail); addWheelsNumb, additionalColor, secondCabine, magniteRail);
} }
} }
@ -29,7 +29,7 @@ namespace Monorail.DrawningObjects
Brush windowBrush = new SolidBrush(Color.White); Brush windowBrush = new SolidBrush(Color.White);
if (EntityMonorail == null) if (EntityMonorail == null)
return; return;
if(EntityMonorail is not EntityAdvancedMonorail advancedMonorail) if(EntityMonorail is not EntityLocomotive advancedMonorail)
{ {
return; return;
} }

4
Monorail/Monorail/EntityAdvancedMonorail.cs → Monorail/Monorail/EntityLocomotive.cs
View File

@ -7,7 +7,7 @@ using System.Threading.Tasks;
namespace Monorail.Entities namespace Monorail.Entities
{ {
public class EntityAdvancedMonorail : EntityMonorail public class EntityLocomotive : EntityMonorail
{ {
public Color AdditionalColor { get; private set; } public Color AdditionalColor { get; private set; }
public int AddWheelsNumb { get; private set; } public int AddWheelsNumb { get; private set; }
@ -15,7 +15,7 @@ namespace Monorail.Entities
public bool SecondCabine { get; private set; } public bool SecondCabine { get; private set; }
public bool MagniteRail { get; private set; } public bool MagniteRail { get; private set; }
public EntityAdvancedMonorail(int speed, double weight, Color bodyColor, Color wheelColor, public EntityLocomotive(int speed, double weight, Color bodyColor, Color wheelColor,
Color tireColor, int addWheelsNumb, Color secondCabineColor, bool secondCabine, bool magniteRail) : base(speed, weight, bodyColor, wheelColor, tireColor) Color tireColor, int addWheelsNumb, Color secondCabineColor, bool secondCabine, bool magniteRail) : base(speed, weight, bodyColor, wheelColor, tireColor)
{ {
AdditionalColor = secondCabineColor; AdditionalColor = secondCabineColor;

2
Monorail/Monorail/MonorailForm.cs
View File

@ -92,7 +92,7 @@ namespace Monorail
if (dialog.ShowDialog() == DialogResult.OK) if (dialog.ShowDialog() == DialogResult.OK)
additionalColor = dialog.Color; additionalColor = dialog.Color;
int addWheelNumb = random.Next(3, 5); int addWheelNumb = random.Next(3, 5);
_drawningMonorail = new DrawningAdvancedMonorail(random.Next(100, 300), random.Next(1000, 3000), _drawningMonorail = new DrawningLocomotive(random.Next(100, 300), random.Next(1000, 3000),
bodyColor, wheelColor, tireColor, bodyColor, wheelColor, tireColor,
pictureBoxMonorail.Width, pictureBoxMonorail.Height, addWheelNumb, pictureBoxMonorail.Width, pictureBoxMonorail.Height, addWheelNumb,
additionalColor, random.Next(0, 2) > 0, random.Next(0, 2) > 0); additionalColor, random.Next(0, 2) > 0, random.Next(0, 2) > 0);