Index: Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs =================================================================== diff -u -reebbc3b7f6370ec49ab77281034fab75b676c66f -r171d7076759cc5d094c73342e3f5c24d642f4380 --- Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs (.../HydraulicBoundaryLocationCalculationGuiService.cs) (revision eebbc3b7f6370ec49ab77281034fab75b676c66f) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs (.../HydraulicBoundaryLocationCalculationGuiService.cs) (revision 171d7076759cc5d094c73342e3f5c24d642f4380) @@ -29,6 +29,7 @@ using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.Properties; using Ringtoets.Common.IO.HydraRing; +using Ringtoets.Common.Service; using Ringtoets.Common.Service.MessageProviders; namespace Ringtoets.Common.Forms.GuiServices @@ -74,6 +75,7 @@ RunActivities(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, + norm, HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, calculations, @@ -99,6 +101,7 @@ RunActivities(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, + norm, HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, calculations, @@ -108,19 +111,26 @@ private void RunActivities(string hydraulicBoundaryDatabaseFilePath, string preprocessorDirectory, + double norm, IEnumerable activities) where TActivity : Activity { string validationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory); if (string.IsNullOrEmpty(validationProblem)) { - ActivityProgressDialogRunner.Run(viewParent, activities); - return; + TargetProbabilityCalculationServiceHelper.ValidateTargetProbability(norm, logMessage => validationProblem = logMessage); } - log.ErrorFormat(Resources.CalculateHydraulicBoundaryLocation_Start_calculation_failed_0_, - validationProblem); + if (string.IsNullOrEmpty(validationProblem)) + { + ActivityProgressDialogRunner.Run(viewParent, activities); + } + else + { + log.ErrorFormat(Resources.CalculateHydraulicBoundaryLocation_Start_calculation_failed_0_, + validationProblem); + } } } } \ No newline at end of file