Egor_Petrushin/PIbd-22_Petrushin_E.A._SelfPropelledArtilleryUnit_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Петрушин Егор ПИбд-22 Лабораторная работа №4 "Самоходная артиллерийская установка" #9

Closed
Egor_Petrushin wants to merge 5 commits from PIbd-22_Petrushin_E.A._Lab4 into PIbd-22_Petrushin_E.A._Lab3
pull from: PIbd-22_Petrushin_E.A._Lab4
merge into: Egor_Petrushin:PIbd-22_Petrushin_E.A._Lab3
Conversation 0 Commits 5 Files Changed 5 +2 -12
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f1924cb952 - Show all commits

3
SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormSPAUCollection.cs
View File

@ -78,8 +78,7 @@ namespace SelfPropelledArtilleryUnit
/// <param name="e"></param>
private void ListBoxObjects_SelectedIndexChanged(object sender, EventArgs e)
{
pictureBoxCollection.Image =
_storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowSPAUs();
pictureBoxCollection.Image = _storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowSPAUs();
}
private void ButtonDelObject_Click(object sender, EventArgs e)

11
SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/SetGeneric.cs
View File

@ -61,20 +61,11 @@ namespace SelfPropelledArtilleryUnit.Generics
if (position >= _maxCount)
return -1;
int nullIndex = _places.IndexOf(null);
if (Count == 0)
{
_places.Add(spau);
}
else if (nullIndex != -1)
{
for (int i = nullIndex; i > 0; i--)
{
_places[i] = _places[i - 1];
}
_places[position] = spau;
}
else
{
_places.Insert(position, spau);
@ -91,7 +82,7 @@ namespace SelfPropelledArtilleryUnit.Generics
if (position < 0 || position >= Count)
return false;
_places[position] = null;
_places.RemoveAt(position);
return true;
}