From d2e990ba5a72c3d7209f9929ad60a4cb0c8a1a65 Mon Sep 17 00:00:00 2001 From: bekodeg Date: Tue, 24 Oct 2023 14:59:56 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?= =?UTF-8?q?=D0=B0=D1=8F=20=D0=BA=D0=BE=D1=80=D0=BA=D0=BA=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ElectricLocomotive/DrawningObjects/DrawningLocomotive.cs | 2 +- ElectricLocomotive/Generics/LocomotivesGenericCollection.cs | 2 +- ElectricLocomotive/LogicFormLocomotiveCollection.cs | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ElectricLocomotive/DrawningObjects/DrawningLocomotive.cs b/ElectricLocomotive/DrawningObjects/DrawningLocomotive.cs index 16842eb..8a91dc8 100644 --- a/ElectricLocomotive/DrawningObjects/DrawningLocomotive.cs +++ b/ElectricLocomotive/DrawningObjects/DrawningLocomotive.cs @@ -56,7 +56,7 @@ namespace ProjectElectricLocomotive.DrawningObjects public int GetHeight => _locomotiveHeight; /// - /// Получение объекта IMoveableObject из объекта DrawningCar + /// Получение объекта IMoveableObject из объекта DrawningLocomotive /// public IMoveableObject GetMoveableObject => new DrawningObjectLocomotive(this); diff --git a/ElectricLocomotive/Generics/LocomotivesGenericCollection.cs b/ElectricLocomotive/Generics/LocomotivesGenericCollection.cs index 6bb2849..2b0644b 100644 --- a/ElectricLocomotive/Generics/LocomotivesGenericCollection.cs +++ b/ElectricLocomotive/Generics/LocomotivesGenericCollection.cs @@ -95,7 +95,7 @@ namespace ProjectElectricLocomotive.Generics /// Вывод всего набора объектов /// /// - public Bitmap ShowCars() + public Bitmap ShowLocomotives() { Bitmap bmp = new(_pictureWidth, _pictureHeight); Graphics gr = Graphics.FromImage(bmp); diff --git a/ElectricLocomotive/LogicFormLocomotiveCollection.cs b/ElectricLocomotive/LogicFormLocomotiveCollection.cs index f2cb6ac..ca624f5 100644 --- a/ElectricLocomotive/LogicFormLocomotiveCollection.cs +++ b/ElectricLocomotive/LogicFormLocomotiveCollection.cs @@ -44,7 +44,7 @@ namespace ProjectElectricLocomotive if (_locomotives + form.SelectedLocomotive) { MessageBox.Show("Объект добавлен"); - pictureBoxCollection.Image = _locomotives.ShowCars(); + pictureBoxCollection.Image = _locomotives.ShowLocomotives(); } else { @@ -69,7 +69,7 @@ namespace ProjectElectricLocomotive if (_locomotives - pos != null) { MessageBox.Show("Объект удален"); - pictureBoxCollection.Image = _locomotives.ShowCars(); + pictureBoxCollection.Image = _locomotives.ShowLocomotives(); } else { @@ -83,7 +83,7 @@ namespace ProjectElectricLocomotive /// private void ButtonRefreshCollection_Click(object sender, EventArgs e) { - pictureBoxCollection.Image = _locomotives.ShowCars(); + pictureBoxCollection.Image = _locomotives.ShowLocomotives(); } } }