Andrey_Abazov/PIbd-23_Abazov_A.A._AirBomber_Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Abazov A. A. LabWork03 #3

Merged
eegov merged 2 commits from LabWork03 into LabWork02 2022-10-28 09:45:49 +04:00
Conversation 0 Commits 2 Files Changed 13 +5 -24
3 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 91aeb23ae0 - Show all commits

4
AirBomber/AirBomber/FormMapWithSetAirBombers.cs
View File

@ -58,8 +58,8 @@ namespace AirBomber
FormAirBomber form = new();
if (form.ShowDialog() == DialogResult.OK)
{
DrawingObjectAirBomber car = new(form.SelectedAirBomber);
if (_mapAirBombersCollectionGeneric + car != -1)
DrawingObjectAirBomber airBomber = new(form.SelectedAirBomber);
if (_mapAirBombersCollectionGeneric + airBomber != -1)
{
MessageBox.Show("Объект добавлен");
pictureBox.Image = _mapAirBombersCollectionGeneric.ShowSet();

2
AirBomber/AirBomber/MapWithSetAirBombersGeneric.cs
View File

@ -165,7 +165,7 @@ namespace AirBomber
int numOfObjectsInRow = _pictureWidth / _placeSizeWidth;
for (int i = 0; i < _setAirBombers.Count; i++)
{
_setAirBombers.Get(i)?.SetObject((i % numOfObjectsInRow) * _placeSizeWidth, (i / numOfObjectsInRow) * _placeSizeHeight, _pictureWidth, _pictureHeight);
_setAirBombers.Get(i)?.SetObject((numOfObjectsInRow - (i % numOfObjectsInRow) - 1) * _placeSizeWidth, (i / numOfObjectsInRow) * _placeSizeHeight, _pictureWidth, _pictureHeight);
_setAirBombers.Get(i)?.DrawingObject(g);
}
}

23
AirBomber/AirBomber/SetAirBombersGeneric.cs
View File

@ -32,26 +32,7 @@ namespace AirBomber
/// <returns></returns>
public int Insert(T airBomber)
{
if (_places[0] != null) {
int indexNull = -1;
for (int i = 0; i < _places.Length; i++)
{
if (_places[i] == null)
{
indexNull = i;
break;
}
}
if (indexNull == -1) return -1;
for (int i = indexNull; i > 0; i--)
{
T tmp = _places[i];
_places[i] = _places[i - 1];
_places[i - 1] = tmp;
}
}
_places[0] = airBomber;
return 0;
return Insert(airBomber, 0);
}
/// <summary>
/// Добавление объекта в набор на конкретную позицию
@ -77,7 +58,7 @@ namespace AirBomber
}
}
if (indexNull == -1) return -1;
for (int i = indexNull; i > position; i++)
for (int i = indexNull; i > position; i--)
{
T tmp = _places[i];
_places[i] = _places[i - 1];