Index: DamClients/DamUI/trunk/src/Dam/Forms/DesignCalculationPropertyControl.cs =================================================================== diff -u -r3538 -r3557 --- DamClients/DamUI/trunk/src/Dam/Forms/DesignCalculationPropertyControl.cs (.../DesignCalculationPropertyControl.cs) (revision 3538) +++ DamClients/DamUI/trunk/src/Dam/Forms/DesignCalculationPropertyControl.cs (.../DesignCalculationPropertyControl.cs) (revision 3557) @@ -79,14 +79,9 @@ else if (sender is Deltares.Geotechnics.Soils.SoilProfile1D && locationJob != null) { var profname = ((Deltares.Geotechnics.Soils.SoilProfile1D) sender).Name; - var res = locationJob.GetDesignResultByProfileScenarioAndCalculationName(profname, scenarioName, + result = locationJob.GetDesignResultByProfileScenarioAndCalculationName(profname, scenarioName, calculationName); - // Some profiles may have no results (not relevant or failed). In that case do not update here. - if (res != null) - { - result = res; - BindSupport.Assign(this, result); - } + BindSupport.Assign(this, result); } } Index: DamClients/DamUI/trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs =================================================================== diff -u -r3526 -r3557 --- DamClients/DamUI/trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs (.../DamSpatialEditorDecorator.cs) (revision 3526) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs (.../DamSpatialEditorDecorator.cs) (revision 3557) @@ -112,7 +112,11 @@ /// internal string ProbabilityString { - get { return probability.ToString("F0") + " [%]"; } + get + { + var value = 100 * probability; + return value.ToString("F0") + " [%]"; + } } /// @@ -359,21 +363,21 @@ // Add drawing object for original surfaceline DrawSurfaceLine(); + var startPoint = new Point(); + var endPoint = new Point(); // Add drawing object for redesigned surfaceline if (DoesResultMatchCurrentLocation()) { UpdateRedesignedSurfaceLine(); + // Add drawing object for slip circle + + if (ResultSlice != null) + { + DrawSlipCircle(); + DetermineSlipCircleZoomLimits(out startPoint, out endPoint); + } } - - // Add drawing object for slip circle - var startPoint = new Point(); - var endPoint = new Point(); - if (ResultSlice != null) - { - DrawSlipCircle(); - DetermineSlipCircleZoomLimits(out startPoint, out endPoint); - } - + decoratedSpatialEditor.EmptySelection = new EmptyShape(locationJob); if (ResultSlice != null) @@ -453,7 +457,8 @@ private bool DoesResultMatchCurrentLocation() { return (csvExportData != null) && (locationJob != null) && - (locationJob.Location.Name.Equals(csvExportData.LocationName)); + (locationJob.Location.Name.Equals(csvExportData.LocationName)) && + (CurrentSoilProfile.SoilProfile.Name.Equals(csvExportData.StabilityProfileName)); } private void DrawSensors() @@ -568,6 +573,14 @@ locationJob = null; LoadLocation(); } + else if (sender is SoilSurfaceProfile) + { + if (locationJob != null && CurrentSoilProfile != null) + { + csvExportData = locationJob.GetDesignResultByProfileScenarioAndCalculationName(CurrentSoilProfile.SoilProfile.Name, + "1", "UpliftVan"); + } + } } private void ClearPropertiesForEmptyLocation()