Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs =================================================================== diff -u -rfcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision fcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -390,6 +390,7 @@ ActivityProgressDialogRunner.Run(Gui.MainWindow, GetAllPipingCalculations(failureMechanismContext.WrappedData) .Select(calc => new PipingCalculationActivity(calc, + failureMechanismContext.WrappedData.PipingProbabilityAssessmentInput, failureMechanismContext.Parent.FailureMechanismContribution.Norm, failureMechanismContext.WrappedData.Contribution)) .ToList()); @@ -510,6 +511,7 @@ { ActivityProgressDialogRunner.Run(Gui.MainWindow, new PipingCalculationActivity(calculation, + context.FailureMechanism.PipingProbabilityAssessmentInput, context.AssessmentSection.FailureMechanismContribution.Norm, context.FailureMechanism.Contribution)); } @@ -596,7 +598,7 @@ private static void AddCalculationScenario(PipingCalculationGroupContext nodeData) { - var calculation = new PipingCalculationScenario(nodeData.FailureMechanism.GeneralInput, nodeData.FailureMechanism.PipingProbabilityAssessmentInput) + var calculation = new PipingCalculationScenario(nodeData.FailureMechanism.GeneralInput) { Name = NamingHelper.GetUniqueName(nodeData.WrappedData.Children, PipingDataResources.PipingCalculation_DefaultName, c => c.Name) }; @@ -629,17 +631,17 @@ var view = new PipingSurfaceLineSelectionDialog(Gui.MainWindow, nodeData.AvailablePipingSurfaceLines); view.ShowDialog(); - GeneratePipingCalculations(nodeData.WrappedData, view.SelectedSurfaceLines, nodeData.AvailableStochasticSoilModels, nodeData.FailureMechanism.GeneralInput, nodeData.FailureMechanism.PipingProbabilityAssessmentInput); + GeneratePipingCalculations(nodeData.WrappedData, view.SelectedSurfaceLines, nodeData.AvailableStochasticSoilModels, nodeData.FailureMechanism.GeneralInput); nodeData.NotifyObservers(); nodeData.WrappedData.AddCalculationScenariosToFailureMechanismSectionResult(nodeData.FailureMechanism); nodeData.FailureMechanism.NotifyObservers(); } - private void GeneratePipingCalculations(CalculationGroup target, IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput) + private void GeneratePipingCalculations(CalculationGroup target, IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput) { - foreach (var group in PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure(surfaceLines, soilModels, generalInput, pipingProbabilityAssessmentInput)) + foreach (var group in PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure(surfaceLines, soilModels, generalInput)) { target.Children.Add(group); } @@ -667,6 +669,7 @@ group.GetCalculations() .OfType() .Select(pc => new PipingCalculationActivity(pc, + context.FailureMechanism.PipingProbabilityAssessmentInput, context.AssessmentSection.FailureMechanismContribution.Norm, context.FailureMechanism.Contribution)) .ToList());