bekodeg/PIbd_22_Borovkov_M_V_ElectricLocomotive_base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Боровков М В ПИбд-22 4 лабораторная работа #5

Closed
bekodeg wants to merge 7 commits from labWork4 into labWork3
pull from: labWork4
merge into: bekodeg:labWork3
Conversation 0 Commits 7 Files Changed 7 +5 -5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d2e990ba5a - Show all commits

2
ElectricLocomotive/DrawningObjects/DrawningLocomotive.cs
View File

@ -56,7 +56,7 @@ namespace ProjectElectricLocomotive.DrawningObjects
public int GetHeight => _locomotiveHeight;
/// <summary>
/// Получение объекта IMoveableObject из объекта DrawningCar
/// Получение объекта IMoveableObject из объекта DrawningLocomotive
/// </summary>
public IMoveableObject GetMoveableObject => new DrawningObjectLocomotive(this);

2
ElectricLocomotive/Generics/LocomotivesGenericCollection.cs
View File

@ -95,7 +95,7 @@ namespace ProjectElectricLocomotive.Generics
/// Вывод всего набора объектов
/// </summary>
/// <returns></returns>
public Bitmap ShowCars()
public Bitmap ShowLocomotives()
{
Bitmap bmp = new(_pictureWidth, _pictureHeight);
Graphics gr = Graphics.FromImage(bmp);

6
ElectricLocomotive/LogicFormLocomotiveCollection.cs
View File

@ -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
/// <param name="e"></param>
private void ButtonRefreshCollection_Click(object sender, EventArgs e)
{
pictureBoxCollection.Image = _locomotives.ShowCars();
pictureBoxCollection.Image = _locomotives.ShowLocomotives();
}
}
}