ElEgEv/PIbd-21_Eliseev_E.E._Airbus_Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Eliseev E.E. LabWork07 #8

Closed
ElEgEv wants to merge 10 commits from LabWork07 into LabWork06
pull from: LabWork07
merge into: ElEgEv:LabWork06
Conversation 0 Commits 10 Files Changed 9 +4 -6
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c915bfbae1 - Show all commits

4
Airbus/Airbus/FormMapWithSetPlanes.cs
View File

@ -84,8 +84,8 @@ namespace Airbus
_mapsCollection.AddMap(textBoxNewMapName.Text,
_mapsDict[comboBoxSelectorMap.Text]);
ReloadMaps();
_logger.LogInformation("Добавлена карта {0}", textBoxNewMapName.Text);
ReloadMaps();
}
//Выбор карты
@ -106,8 +106,8 @@ namespace Airbus
{
_mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
ReloadMaps();
_logger.LogInformation("Удалена карта {0}", listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
ReloadMaps();
}
}

4
Airbus/Airbus/MapsCollection.cs
View File

@ -67,7 +67,6 @@ namespace Airbus
foreach (var storage in _mapStorage)
{
sw.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}" +
$"{Environment.NewLine}");
}
@ -113,14 +112,13 @@ namespace Airbus
}
_mapStorage.Add(element[0], new MapWithSetPlanesGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight,
map));
map));
_mapStorage[element[0]].LoadData(element[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
}
}
}
//доступ к аэродрому
public MapWithSetPlanesGeneric<IDrawningObject, AbstractMap> this[string ind]
{

2
Airbus/Airbus/SaveData.txt
View File

@ -1,2 +1,2 @@
MapsCollection
123|DesertStormMap|1000:750:Blue;1000:750:Yellow;1000:750:Red;1000:750:Lime;1000:750:Red;1000:750:Yellow;1000:750:Black;1000:750:Red;1000:750:DeepPink;1000:750:Black;1000:750:Yellow;1000:750:White;1000:750:Red;1000:750:Gray;1000:750:Lime;1000:750:Black;1000:750:Blue;1000:750:DeepPink;
123|StarWarsMap|1000:750:Red;1000:750:DeepPink:Control:False:False;