VoldemarProger/Pibd-22_Morozov_V.S_AirplaneWithRadar_Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Morozov V.S. LabWork3 #3

Closed
VoldemarProger wants to merge 5 commits from LabWork3 into LabWork2
pull from: LabWork3
merge into: VoldemarProger:LabWork2
Conversation 0 Commits 5 Files Changed 20 +10 -9
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d9c71375fa - Show all commits

6
AirPlaneWithRadar/AirPlaneWithRadar/MapWithSetPlainGeneric.cs
View File

@ -119,7 +119,7 @@ namespace AirPlaneWithRadar
int CountWidth = _pictureWidth / _placeSizeWidth;
int x = _pictureWidth - _placeSizeWidth - _placeSizeWidth/2 - _placeSizeWidth / 4;
int y = (_pictureHeight - _placeSizeHeight)- _placeSizeHeight/2;
int y = _placeSizeHeight/4;
for (int k = 0; k < _setPlains.Count; k++)
{
@ -137,7 +137,7 @@ namespace AirPlaneWithRadar
_setPlains.Get(k)?.SetObject(x, y, _pictureWidth, _pictureHeight);
_setPlains.Get(k)?.DrawningObject(g);
x = _pictureWidth - _placeSizeWidth - _placeSizeWidth / 2 - _placeSizeWidth / 4;
y -= _placeSizeHeight ;
y += _placeSizeHeight ;
}
}
@ -148,7 +148,7 @@ namespace AirPlaneWithRadar
else
{
x = _pictureWidth - _placeSizeWidth - _placeSizeWidth / 2 - _placeSizeWidth / 4;
y -= _placeSizeHeight;
y += _placeSizeHeight;
}
}
}

13
AirPlaneWithRadar/AirPlaneWithRadar/SetPlaneGeneric.cs
View File

@ -6,8 +6,9 @@ using System.Threading.Tasks;
namespace AirPlaneWithRadar
{
internal class SetPlaneGeneric<T>
internal class SetPlaneGeneric<T,U>
where T : class
{
private readonly T[] _places;
public int Count => _places.Length;
@ -33,14 +34,14 @@ namespace AirPlaneWithRadar
return -1;
}
public bool Insert(T plain, int position)
public int Insert(T plain, int position)
{
if (position > Count || position < 0)
return false;
return -1;
if (_places[position] == null)
{
_places[position] = plain;
return true;
return position;
}
else
{
@ -53,11 +54,11 @@ namespace AirPlaneWithRadar
_places[j] = _places[j - 1];
}
_places[position] = plain;
return true;
return position;
}
}
}
return false;
return -1;
}
public T Remove(int position)