diff --git a/ProjectMachine/ProjectMachine/DrawningMachine.cs b/ProjectMachine/ProjectMachine/DrawningMachine.cs index 4ece1c0..e76dddc 100644 --- a/ProjectMachine/ProjectMachine/DrawningMachine.cs +++ b/ProjectMachine/ProjectMachine/DrawningMachine.cs @@ -45,10 +45,9 @@ namespace ProjectMachine /// Скорость /// Вес автомобиля /// Цвет кузова - public void Init(int speed, float weight, Color bodyColor) + public DrawningMachine(int speed, float weight, Color bodyColor) { - Machine = new EntityMachine(); - Machine.Init(speed, weight, bodyColor); + Machine = new EntityMachine(speed, weight, bodyColor); } /// /// Установка позиции машины diff --git a/ProjectMachine/ProjectMachine/EntityMachine.cs b/ProjectMachine/ProjectMachine/EntityMachine.cs index 2394f7e..d3266a0 100644 --- a/ProjectMachine/ProjectMachine/EntityMachine.cs +++ b/ProjectMachine/ProjectMachine/EntityMachine.cs @@ -34,7 +34,7 @@ namespace ProjectMachine /// /// /// - public void Init(int speed, float weight, Color bodyColor) + public EntityMachine(int speed, float weight, Color bodyColor) { Random rnd = new(); Speed = speed <= 0 ? rnd.Next(50, 150) : speed; diff --git a/ProjectMachine/ProjectMachine/FormMachine.cs b/ProjectMachine/ProjectMachine/FormMachine.cs index 3b402e7..934d710 100644 --- a/ProjectMachine/ProjectMachine/FormMachine.cs +++ b/ProjectMachine/ProjectMachine/FormMachine.cs @@ -26,8 +26,7 @@ namespace ProjectMachine private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _machine = new DrawningMachine(); - _machine.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + _machine = new DrawningMachine(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); _machine.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxMachine.Width, pictureBoxMachine.Height); toolStripStatusLabelSpeed.Text = $": {_machine.Machine.Speed}"; toolStripStatusLabelWeight.Text = $": {_machine.Machine.Weight}";