Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs =================================================================== diff -u -r5343 -r5356 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 5343) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 5356) @@ -463,41 +463,46 @@ private static void CreateSlipPlaneDefinitionResults(DesignResult designResult, CsvExportData desResult) { - switch (designResult.StabilityDesignResults.StabilityModelType) + bool isBishop = designResult.StabilityDesignResults.StabilityModelType == DesignResultStabilityDesignResultsStabilityModelType.Bishop; + bool isUpliftVan = designResult.StabilityDesignResults.StabilityModelType == DesignResultStabilityDesignResultsStabilityModelType.UpliftVan; + if (designResult.StabilityDesignResults.StabilityModelType == DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan) { - case DesignResultStabilityDesignResultsStabilityModelType.Bishop: - var singleSlipCircleDefinition = (SlidingCircleMinimumSafetyCurveType) designResult.StabilityDesignResults.SlipCircleDefinition; - if (singleSlipCircleDefinition.Center != null) - { - desResult.ActiveCenterPointX = singleSlipCircleDefinition.Center.X; - desResult.ActiveCenterPointZ = singleSlipCircleDefinition.Center.Z; - desResult.ActiveCenterPointRadius = singleSlipCircleDefinition.Radius; - } + isBishop = designResult.StabilityDesignResults.SlipCircleDefinition is SlidingCircleMinimumSafetyCurveType; + isUpliftVan = designResult.StabilityDesignResults.SlipCircleDefinition is DualSlidingCircleMinimumSafetyCurveType; + } - break; - case DesignResultStabilityDesignResultsStabilityModelType.UpliftVan: - var dualSlipCircleDefinition = (DualSlidingCircleMinimumSafetyCurveType) designResult.StabilityDesignResults.SlipCircleDefinition; - if (dualSlipCircleDefinition.ActiveCircleCenter != null) - { - desResult.ActiveCenterPointX = dualSlipCircleDefinition.ActiveCircleCenter.X; - desResult.ActiveCenterPointZ = dualSlipCircleDefinition.ActiveCircleCenter.Z; - desResult.ActiveCenterPointRadius = dualSlipCircleDefinition.ActiveCircleRadius; - } + if (isBishop) + { + var singleSlipCircleDefinition = (SlidingCircleMinimumSafetyCurveType) designResult.StabilityDesignResults.SlipCircleDefinition; + if (singleSlipCircleDefinition.Center != null) + { + desResult.ActiveCenterPointX = singleSlipCircleDefinition.Center.X; + desResult.ActiveCenterPointZ = singleSlipCircleDefinition.Center.Z; + desResult.ActiveCenterPointRadius = singleSlipCircleDefinition.Radius; + } + } - if (dualSlipCircleDefinition.PassiveCircleCenter != null) - { - desResult.PassiveCenterPointX = dualSlipCircleDefinition.PassiveCircleCenter.X; - desResult.PassiveCenterPointZ = dualSlipCircleDefinition.PassiveCircleCenter.Z; - desResult.PassiveCenterPointRadius = dualSlipCircleDefinition.PassiveCircleRadius; - } + if (isUpliftVan) + { + var dualSlipCircleDefinition = (DualSlidingCircleMinimumSafetyCurveType) designResult.StabilityDesignResults.SlipCircleDefinition; + if (dualSlipCircleDefinition.ActiveCircleCenter != null) + { + desResult.ActiveCenterPointX = dualSlipCircleDefinition.ActiveCircleCenter.X; + desResult.ActiveCenterPointZ = dualSlipCircleDefinition.ActiveCircleCenter.Z; + desResult.ActiveCenterPointRadius = dualSlipCircleDefinition.ActiveCircleRadius; + } - break; + if (dualSlipCircleDefinition.PassiveCircleCenter != null) + { + desResult.PassiveCenterPointX = dualSlipCircleDefinition.PassiveCircleCenter.X; + desResult.PassiveCenterPointZ = dualSlipCircleDefinition.PassiveCircleCenter.Z; + desResult.PassiveCenterPointRadius = dualSlipCircleDefinition.PassiveCircleRadius; + } } - if (designResult.StabilityDesignResults.StabilityModelType == - DesignResultStabilityDesignResultsStabilityModelType.Bishop || - designResult.StabilityDesignResults.StabilityModelType == - DesignResultStabilityDesignResultsStabilityModelType.UpliftVan) + if (designResult.StabilityDesignResults.StabilityModelType is DesignResultStabilityDesignResultsStabilityModelType.Bishop + or DesignResultStabilityDesignResultsStabilityModelType.UpliftVan + or DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan) { if (designResult.StabilityDesignResults.SlipCircleDefinition.Slices != null) {