Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs =================================================================== diff -u -rabcfb413c3e2024036761c3b05156c98cc2a8e44 -re8e7ca3dea8b9e1e45ca15f0276469e1197d8fe9 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision abcfb413c3e2024036761c3b05156c98cc2a8e44) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision e8e7ca3dea8b9e1e45ca15f0276469e1197d8fe9) @@ -258,22 +258,18 @@ private static void ValidateAll(IEnumerable> calculations, IAssessmentSection assessmentSection) {} - private static void ValidateAll(StabilityPointStructuresFailureMechanismContext context) + private void CalculateAll(StabilityPointStructuresFailureMechanism failureMechanism, + IEnumerable> calculations, + IAssessmentSection assessmentSection) { - ValidateAll(context.WrappedData.Calculations.OfType>(), - context.Parent); + ActivityProgressDialogRunner.Run(Gui.MainWindow, + calculations.Select(calc => new StabilityPointStructuresCalculationActivity( + calc, + assessmentSection.HydraulicBoundaryDatabase.FilePath, + failureMechanism, + assessmentSection)).ToArray()); } - private static void ValidateAll(StabilityPointStructuresCalculationGroupContext context) - { - ValidateAll(context.WrappedData.GetCalculations().OfType>(), - context.AssessmentSection); - } - - private static void CalculateAll(StabilityPointStructuresFailureMechanismContext context) {} - - private static void CalculateAll(CalculationGroup group, StabilityPointStructuresCalculationGroupContext context) {} - #endregion #region TreeNodeInfo @@ -370,6 +366,18 @@ return ValidateAllDataAvailableAndGetErrorMessage(context.Parent, context.WrappedData); } + private static void ValidateAll(StabilityPointStructuresFailureMechanismContext context) + { + ValidateAll(context.WrappedData.Calculations.OfType>(), + context.Parent); + } + + private void CalculateAll(StabilityPointStructuresFailureMechanismContext context) + { + CalculateAll(context.WrappedData, context.WrappedData.Calculations.OfType>(), context.Parent); + } + + #endregion #region StabilityPointStructuresCalculationGroupContext TreeNodeInfo @@ -531,6 +539,17 @@ return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection, context.FailureMechanism); } + private static void ValidateAll(StabilityPointStructuresCalculationGroupContext context) + { + ValidateAll(context.WrappedData.GetCalculations().OfType>(), + context.AssessmentSection); + } + + private void CalculateAll(CalculationGroup group, StabilityPointStructuresCalculationGroupContext context) + { + CalculateAll(context.FailureMechanism, group.GetCalculations().OfType>(), context.AssessmentSection); + } + #endregion #region StabilityPointStructuresCalculationContext TreeNodeInfo