Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -rbc869d73deeaf43feda4141583194e52b9f23d6f -r85a350b8d0db7125255bdb82a207ec2f70d60ca2 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision bc869d73deeaf43feda4141583194e52b9f23d6f) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 85a350b8d0db7125255bdb82a207ec2f70d60ca2) @@ -533,42 +533,40 @@ { IEnumerable calculations = GetAllPipingCalculations(failureMechanismContext.WrappedData); PipingProbabilityAssessmentInput assessmentInput = failureMechanismContext.WrappedData.PipingProbabilityAssessmentInput; - double norm = failureMechanismContext.Parent.FailureMechanismContribution.Norm; double contribution = failureMechanismContext.WrappedData.Contribution; - CalculateAll(calculations, assessmentInput, norm, contribution); + CalculateAll(calculations, assessmentInput, contribution, failureMechanismContext.Parent); } private void CalculateAll(CalculationGroup group, PipingCalculationGroupContext context) { PipingCalculation[] calculations = group.GetCalculations().OfType().ToArray(); PipingProbabilityAssessmentInput assessmentInput = context.FailureMechanism.PipingProbabilityAssessmentInput; - double norm = context.AssessmentSection.FailureMechanismContribution.Norm; double contribution = context.FailureMechanism.Contribution; - CalculateAll(calculations, assessmentInput, norm, contribution); + CalculateAll(calculations, assessmentInput, contribution, context.AssessmentSection); } - private static void ValidateAll(IEnumerable pipingCalculations) + private static void ValidateAll(IEnumerable pipingCalculations, IAssessmentSection assessmentSection) { foreach (PipingCalculation calculation in pipingCalculations) { - PipingCalculationService.Validate(calculation, GetNormativeAssessmentLevel(calculation)); + PipingCalculationService.Validate(calculation, GetNormativeAssessmentLevel(assessmentSection, calculation)); } } private void CalculateAll(IEnumerable calculations, PipingProbabilityAssessmentInput assessmentInput, - double norm, - double contribution) + double contribution, + IAssessmentSection assessmentSection) { ActivityProgressDialogRunner.Run( Gui.MainWindow, calculations .Select(pc => new PipingCalculationActivity(pc, - GetNormativeAssessmentLevel(pc), + GetNormativeAssessmentLevel(assessmentSection, pc), assessmentInput, - norm, + assessmentSection.FailureMechanismContribution.Norm, contribution)) .ToList()); } @@ -659,7 +657,7 @@ private static void ValidateAll(PipingFailureMechanismContext context) { - ValidateAll(context.WrappedData.Calculations.OfType()); + ValidateAll(context.WrappedData.Calculations.OfType(), context.Parent); } private ContextMenuStrip FailureMechanismDisabledContextMenuStrip(PipingFailureMechanismContext pipingFailureMechanismContext, @@ -999,7 +997,7 @@ private static void ValidateAll(PipingCalculationGroupContext context) { - ValidateAll(context.WrappedData.GetCalculations().OfType()); + ValidateAll(context.WrappedData.GetCalculations().OfType(), context.AssessmentSection); } private static void AddCalculationScenario(PipingCalculationGroupContext nodeData)