Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs =================================================================== diff -u -rfc0a6de06f052bb48fa54c2fc0d592f0b311def5 -r5b421f80047c5b98776fb1c6f4a216775066e805 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision fc0a6de06f052bb48fa54c2fc0d592f0b311def5) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 5b421f80047c5b98776fb1c6f4a216775066e805) @@ -23,7 +23,6 @@ using System.Drawing; using System.Linq; using System.Windows.Forms; -using Core.Common.Base.Data; using Core.Common.Controls.TreeView; using Core.Common.Gui; using Core.Common.Gui.ContextMenu; @@ -75,9 +74,7 @@ }; yield return new PropertyInfo { - CreateInstance = context => new MacroStabilityInwardsInputContextProperties(context, - () => GetNormativeAssessmentLevel(context.AssessmentSection, context.MacroStabilityInwardsCalculation), - new ObservablePropertyChangeHandler(context.MacroStabilityInwardsCalculation, context.WrappedData)) + CreateInstance = context => new MacroStabilityInwardsInputContextProperties(context, new ObservablePropertyChangeHandler(context.MacroStabilityInwardsCalculation, context.WrappedData)) }; yield return new PropertyInfo { @@ -390,11 +387,6 @@ } } - private static RoundedDouble GetNormativeAssessmentLevel(IAssessmentSection assessmentSection, MacroStabilityInwardsCalculation calculation) - { - return assessmentSection.GetNormativeAssessmentLevel(calculation.InputParameters.HydraulicBoundaryLocation); - } - private bool VerifyStochasticSoilModelUpdates(MacroStabilityInwardsStochasticSoilModelCollectionContext context, string query) { var changeHandler = new FailureMechanismCalculationChangeHandler(context.FailureMechanism, @@ -545,30 +537,29 @@ { IEnumerable calculations = GetAllMacroStabilityInwardsCalculations(failureMechanismContext.WrappedData); - CalculateAll(calculations, failureMechanismContext.Parent); + CalculateAll(calculations); } private void CalculateAll(CalculationGroup group, MacroStabilityInwardsCalculationGroupContext context) { MacroStabilityInwardsCalculation[] calculations = group.GetCalculations().OfType().ToArray(); - CalculateAll(calculations, context.AssessmentSection); + CalculateAll(calculations); } - private static void ValidateAll(IEnumerable calculations, IAssessmentSection assessmentSection) + private static void ValidateAll(IEnumerable calculations) { foreach (MacroStabilityInwardsCalculation calculation in calculations) { - MacroStabilityInwardsCalculationService.Validate(calculation, GetNormativeAssessmentLevel(assessmentSection, calculation)); + MacroStabilityInwardsCalculationService.Validate(calculation); } } - private void CalculateAll(IEnumerable calculations, IAssessmentSection assessmentSection) + private void CalculateAll(IEnumerable calculations) { ActivityProgressDialogRunner.Run( Gui.MainWindow, calculations - .Select(pc => new MacroStabilityInwardsCalculationActivity(pc, - GetNormativeAssessmentLevel(assessmentSection, pc))) + .Select(pc => new MacroStabilityInwardsCalculationActivity(pc)) .ToList()); } @@ -653,7 +644,7 @@ private static void ValidateAll(MacroStabilityInwardsFailureMechanismContext context) { - ValidateAll(context.WrappedData.Calculations.OfType(), context.Parent); + ValidateAll(context.WrappedData.Calculations.OfType()); } private ContextMenuStrip FailureMechanismDisabledContextMenuStrip(MacroStabilityInwardsFailureMechanismContext macroStabilityInwardsFailureMechanismContext, @@ -789,7 +780,7 @@ private static void Validate(MacroStabilityInwardsCalculationScenarioContext context) { - MacroStabilityInwardsCalculationService.Validate(context.WrappedData, GetNormativeAssessmentLevel(context.AssessmentSection, context.WrappedData)); + MacroStabilityInwardsCalculationService.Validate(context.WrappedData); } private static string ValidateAllDataAvailableAndGetErrorMessage(MacroStabilityInwardsCalculationScenarioContext context) @@ -800,7 +791,7 @@ private void PerformCalculation(MacroStabilityInwardsCalculation calculation, MacroStabilityInwardsCalculationScenarioContext context) { ActivityProgressDialogRunner.Run(Gui.MainWindow, - new MacroStabilityInwardsCalculationActivity(calculation, GetNormativeAssessmentLevel(context.AssessmentSection, calculation))); + new MacroStabilityInwardsCalculationActivity(calculation)); } #endregion @@ -915,7 +906,7 @@ private static void ValidateAll(MacroStabilityInwardsCalculationGroupContext context) { - ValidateAll(context.WrappedData.GetCalculations().OfType(), context.AssessmentSection); + ValidateAll(context.WrappedData.GetCalculations().OfType()); } private static void AddCalculationScenario(MacroStabilityInwardsCalculationGroupContext nodeData)