pibd-12 Tangatarov.I.A. LabWork06 Base #21

Closed
sqdselo wants to merge 33 commits from LabWork06 into LabWork05
Showing only changes of commit 6a1f539b10 - Show all commits

View File

@ -56,7 +56,7 @@ namespace HoistingCrane.CollectionGenericObjects
public DrawningTrackedVehicle? GetRandomObject()
{
Random rnd = new();
return _collection?.Get(rnd.Next(GetMaxCount));
return arr?.Get(rnd.Next(GetMaxCount));
}
/// <summary>
@ -65,15 +65,15 @@ namespace HoistingCrane.CollectionGenericObjects
/// <returns></returns>
public Bitmap? Show()
{
Bitmap bitmap = new(_pictureWidth, _pictureHeight);
Bitmap bitmap = new(pictureWidth, pictureHeight);
Graphics graphics = Graphics.FromImage(bitmap);
DrawBackgound(graphics);
SetObjectsPosition();
for (int i = 0; i < (_collection?.Count ?? 0); ++i)
for (int i = 0; i < (arr?.Count ?? 0); ++i)
{
try
{
DrawningTrackedVehicle? obj = _collection?.Get(i);
DrawningTrackedVehicle? obj = arr?.Get(i);
obj?.DrawTransport(graphics);
}
catch (Exception) { }