Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs =================================================================== diff -u -r5356 -r5379 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 5356) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 5379) @@ -22,6 +22,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Linq; using Deltares.DamEngine.Io.XmlOutput; using Deltares.Geometry; using Deltares.Geotechnics.GeotechnicalGeometry; @@ -189,9 +190,11 @@ CreateDesignResultsStabilityOutput(designResult, desResult); } + int index = output.Results.CalculationResults.Where(y => y.LocationName == designResult.LocationName).ToList().IndexOf(designResult); if (desResult.Scenario != null) { desResult.LocationScenarioCount = scenario.Location.Scenarios.Count; + desResult.ScenarioIndex = index; desResult.Scenario.CalculationResult = desResult.CalculationResult; desResult.Scenario.CalculationResults.Add(desResult); } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs =================================================================== diff -u -r5349 -r5379 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 5349) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 5379) @@ -260,12 +260,20 @@ { get { - return ScenarioName + " of " + LocationScenarioCount; + return ScenarioName + " (" + (ScenarioIndex + 1) + " of " + LocationScenarioCount + ")"; } } + /// + /// The total number of scenarios of the location + /// [Browsable(false)] public int LocationScenarioCount { get; set; } - + + /// + /// The index (starting with 0) of the scenario in the list of all scenarios of the location + /// + [Browsable(false)] public int ScenarioIndex { get; set; } + [PropertyOrder(0, 3)] [ReadOnly(true)] public CalculationResult CalculationResult { get; set; } = CalculationResult.NoRun; [PropertyOrder(8, 1)] @@ -1291,8 +1299,7 @@ if (scenario != null) { ScenarioName = scenario.LocationScenarioID; - LocationName = scenario.Location.Name; - LocationScenarioCount = scenario.Location.Scenarios.Count; + LocationName = scenario.Location.Name; X = scenario.Location.XRd; Y = scenario.Location.YRd; }