Index: Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs =================================================================== diff -u -rbe071aa3c09c7847b51d73e6877a6409366bc78f -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e --- Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs (.../HydraulicBoundaryLocationCalculationGuiService.cs) (revision be071aa3c09c7847b51d73e6877a6409366bc78f) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs (.../HydraulicBoundaryLocationCalculationGuiService.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) @@ -58,6 +58,7 @@ } public bool CalculateDesignWaterLevels(string hydraulicBoundaryDatabaseFilePath, + string preprocessorDirectory, IEnumerable locations, double norm, ICalculationMessageProvider messageProvider) @@ -75,11 +76,13 @@ return RunActivities(hydraulicBoundaryDatabaseFilePath, locations.Select(location => new DesignWaterLevelCalculationActivity(new DesignWaterLevelCalculation(location), hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory, norm, messageProvider)).ToArray()); } public bool CalculateWaveHeights(string hydraulicBoundaryDatabaseFilePath, + string preprocessorDirectory, IEnumerable locations, double norm, ICalculationMessageProvider messageProvider) @@ -97,13 +100,14 @@ return RunActivities(hydraulicBoundaryDatabaseFilePath, locations.Select(location => new WaveHeightCalculationActivity(new WaveHeightCalculation(location), hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory, norm, messageProvider)).ToArray()); } private bool RunActivities(string hydraulicBoundaryDatabasePath, IList activities) where TActivity : Activity { - string validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabasePath); + string validationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabasePath); if (string.IsNullOrEmpty(validationProblem)) { ActivityProgressDialogRunner.Run(viewParent, activities);