Sergey/PYbd-21_Razubaev_C.M._HoistingCrane._Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

исправлены некоторые методы

Browse Source
This commit is contained in:
sardq 2023-12-02 23:02:19 +04:00
parent 5f77a4c906
commit 0db70e3020
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
HoistingCrane/HoistingCrane/CranesGenericCollection.cs
View File

@ -80,8 +80,6 @@ namespace HoistingCrane.Generics
int j = _pictureWidth/_placeSizeWidth-1;
int k = _pictureHeight/_placeSizeHeight-1;
foreach (var crane in _collection.GetCranes())
{
if (crane != null)
{
if (j < 0)
{
@ -89,10 +87,12 @@ namespace HoistingCrane.Generics
k--;
}
obj = crane;
if (obj != null)
{
obj.SetPosition(_placeSizeWidth * j, _placeSizeHeight * k);
obj.DrawTransport(g);
j--;
}
j--;
}
}
}

2
HoistingCrane/HoistingCrane/FormCraneCollection.cs
View File

@ -72,7 +72,7 @@ namespace HoistingCrane
var obj = _storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty];
if (obj != null)
{
if (obj + crane != 1)
if (obj + crane != -1)
{
MessageBox.Show("Объект добавлен");
pictureBoxCollection.Image = obj.ShowCars();

6
HoistingCrane/HoistingCrane/SetGeneric.cs
View File

@ -20,6 +20,8 @@
/// Добавление объекта в набор
public int Insert(T crane)
{
if(crane==null)
return -1;
_places.Insert(0, crane);
return 0;
}
@ -33,8 +35,8 @@
/// Удаление объекта из набора с конкретной позиции
public bool Remove(int position)
{
if ((position < 0) || (position > _maxCount)) return false;
_places.RemoveAt(position);
if ((position < 0) || (position > _maxCount)|| (_places[position] == null)) return false;
_places[position] = null;
return true;
}
/// Получение объекта из набора по позиции