Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs =================================================================== diff -u -r743 -r754 --- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 743) +++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 754) @@ -106,10 +106,13 @@ } if (designResult.StabilityDesignResults != null) { - desResult.NumberOfIterations = designResult.StabilityDesignResults.NumberOfIterations; //Vullen daar waar beschikbaar CreateDesignResultsStbilityOutput + CreateDesignResultsStabilityOutput(designResult, desResult); } - desResult.Scenario.CalculationResult = desResult.CalculationResult; - desResult.Scenario.CalculationResults.Add(desResult); + if (desResult.Scenario != null) + { + desResult.Scenario.CalculationResult = desResult.CalculationResult; + desResult.Scenario.CalculationResults.Add(desResult); + } damProjectData.DesignCalculations.Add(desResult); } } @@ -207,5 +210,37 @@ surfaceLine.AddCharacteristicPoint(geometryPoint, ConversionHelper.ConvertToDamPointType(inputPoint.PointType)); } } + + + private static void CreateDesignResultsStabilityOutput(DesignResult designResult, CsvExportData desResult) + { + desResult.ResultMessage = designResult.StabilityDesignResults.ResultMessage; + if (designResult.StabilityDesignResults.RedesignedSurfaceLine != null) + { + desResult.RedesignedSurfaceLine2Stability = new SurfaceLine2(); + var surfaceLine = ConvertXmlSurfaceLineToSurfaceLine2(designResult.StabilityDesignResults.RedesignedSurfaceLine); + desResult.RedesignedSurfaceLine2Stability = surfaceLine; + } + if (designResult.StabilityDesignResults.SafetyFactorSpecified) desResult.StabilitySafetyFactor = designResult.StabilityDesignResults.SafetyFactor; + if (designResult.StabilityDesignResults.Zone1SafetyFactorSpecified) desResult.Zone1SafetyFactorStability = designResult.StabilityDesignResults.Zone1SafetyFactor; + if (designResult.StabilityDesignResults.Zone1EntryPointXSpecified) desResult.LocalZone1EntryPointX = designResult.StabilityDesignResults.Zone1EntryPointX; + if (designResult.StabilityDesignResults.Zone1ExitPointXSpecified) desResult.LocalZone1ExitPointX = designResult.StabilityDesignResults.Zone1ExitPointX; + if (designResult.StabilityDesignResults.Zone2SafetyFactorSpecified) desResult.Zone2SafetyFactorStability = designResult.StabilityDesignResults.Zone2SafetyFactor; + if (designResult.StabilityDesignResults.Zone2EntryPointXSpecified) desResult.LocalZone2EntryPointX = designResult.StabilityDesignResults.Zone2EntryPointX; + if (designResult.StabilityDesignResults.Zone2ExitPointXSpecified) desResult.LocalZone2ExitPointX = designResult.StabilityDesignResults.Zone2ExitPointX; + if (designResult.StabilityDesignResults.NumberOfIterationsSpecified) desResult.NumberOfIterations = designResult.StabilityDesignResults.NumberOfIterations; + + if (designResult.StabilityDesignResults.UpliftSituation != null) + { + var uplift = designResult.StabilityDesignResults.UpliftSituation; + desResult.IsUplift = uplift.IsUplift; + desResult.Pl3MinUplift = uplift.Pl3MinUplift; + desResult.Pl3HeadAdjusted = uplift.Pl3HeadAdjusted; + desResult.Pl3LocalLocationXMinUplift = uplift.Pl3LocationXMinUplift; + desResult.Pl4MinUplift = uplift.Pl4MinUplift; + desResult.Pl4HeadAdjusted = uplift.Pl4HeadAdjusted; + desResult.Pl4LocalLocationXMinUplift = uplift.Pl4LocationXMinUplift; + } + } } }