From fd417fc6b6d9a4cdb7d3bde6b030da2dd8f05f8c Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Thu, 17 Nov 2022 18:51:36 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BA=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Airbus/Airbus/FormMapWithSetPlanes.cs | 1 + Airbus/Airbus/MapsCollection.cs | 2 +- Airbus/Airbus/SaveData.txt | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Airbus/Airbus/FormMapWithSetPlanes.cs b/Airbus/Airbus/FormMapWithSetPlanes.cs index 74ab113..9083cd7 100644 --- a/Airbus/Airbus/FormMapWithSetPlanes.cs +++ b/Airbus/Airbus/FormMapWithSetPlanes.cs @@ -282,6 +282,7 @@ namespace Airbus _logger.LogInformation("Загрузка данных из файла '{0}' прошла успешно", openFileDialog.FileName); MessageBox.Show("Загрузка данных прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + ReloadMaps(); } catch(Exception ex) { diff --git a/Airbus/Airbus/MapsCollection.cs b/Airbus/Airbus/MapsCollection.cs index fca15ee..7d87b34 100644 --- a/Airbus/Airbus/MapsCollection.cs +++ b/Airbus/Airbus/MapsCollection.cs @@ -113,7 +113,7 @@ namespace Airbus } _mapStorage.Add(element[0], new MapWithSetPlanesGeneric(_pictureWidth, _pictureHeight, - map)); + map)); _mapStorage[element[0]].LoadData(element[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries)); } diff --git a/Airbus/Airbus/SaveData.txt b/Airbus/Airbus/SaveData.txt index 8b13789..ee94049 100644 --- a/Airbus/Airbus/SaveData.txt +++ b/Airbus/Airbus/SaveData.txt @@ -1 +1,4 @@ - +MapsCollection +123|DesertStormMap|1000:750:Blue; +6543|StarWarsMap|1000:750:Red:Red:True:True; +9876|SimpleMap|1000:750:Lime;