b0n3l3sS/PIbd-23_Mochalov_D.V._Locomotive_Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Переход на конструкторы

Browse Source
This commit is contained in:
Данила Мочалов 2022-09-25 15:50:46 +04:00
parent 79d879bc9f
commit da86c334a4
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Locomotive/Locomotive/DrawningLocomotive.cs
View File

@ -25,10 +25,9 @@ namespace Locomotive
private readonly int _locomotiveHeight = 50;
/// Инициализация свойств
public void Init(int speed, float weight, Color bodyColor, EntityLocomotive entity)
public DrawningLocomotive(int speed, float weight, Color bodyColor)
{
Locomotive = entity;
Locomotive.Init(speed, weight, bodyColor);
Locomotive = new EntityLocomotive(speed, weight, bodyColor);
}
/// Установка позиции локомотива
public void SetPosition(int x, int y, int width, int height)

2
Locomotive/Locomotive/EntityLocomotive.cs
View File

@ -17,7 +17,7 @@ namespace Locomotive
/// Шаг перемещения локомотива
public float Step => Speed * 100 / Weight;
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;

5
Locomotive/Locomotive/FormLocomotive.cs
View File

@ -3,7 +3,6 @@ namespace Locomotive
public partial class FormLocomotive : Form
{
private DrawningLocomotive _locomotive;
private EntityLocomotive _entity;
public FormLocomotive()
{
@ -22,9 +21,7 @@ namespace Locomotive
private void buttonCreate_Click(object sender, EventArgs e)
{
Random rnd = new();
_locomotive = new DrawningLocomotive();
_entity = new EntityLocomotive();
_locomotive.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), _entity);
_locomotive = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
_locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height);
toolStripStatusLabelSpeed.Text = $"Speed: {_locomotive.Locomotive.Speed}";
toolStripStatusLabelWeight.Text = $"Weight: {_locomotive.Locomotive.Weight}";