Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r1f615259511682f345362553663378b62fcd2842 -r1c57fe6190786619723794c66843f24090a0edb0 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 1f615259511682f345362553663378b62fcd2842) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 1c57fe6190786619723794c66843f24090a0edb0) @@ -483,7 +483,7 @@ GetViewData = context => context.Calculation, CloseForData = RingtoetsPluginHelper.ShouldCloseViewWithCalculationData, CreateInstance = context => new WaveConditionsInputView(GetWaveConditionsInputViewStyle(context), - () => context.AssessmentSection.GetNormativeAssessmentLevel(context.Calculation.InputParameters.HydraulicBoundaryLocation)) + () => GetNormativeAssessmentLevel(context)) }; yield return new ViewInfo @@ -1117,6 +1117,16 @@ return null; } + private static RoundedDouble GetNormativeAssessmentLevel(WaveConditionsInputContext context) + { + if (context is GrassCoverErosionOutwardsWaveConditionsInputContext) + { + return context.Calculation.InputParameters.HydraulicBoundaryLocation?.DesignWaterLevelCalculation1.Output?.Result ?? RoundedDouble.NaN; + } + + return context.AssessmentSection.GetNormativeAssessmentLevel(context.Calculation.InputParameters.HydraulicBoundaryLocation); + } + #endregion #endregion @@ -1471,12 +1481,13 @@ { var macrostabilityOutwards = nodeData as IHasSectionResults; var failureMechanismSectionResultContexts = new object[2]; - + if (macrostabilityOutwards != null) { failureMechanismSectionResultContexts[0] = new FailureMechanismSectionResultContext(macrostabilityOutwards.SectionResults, nodeData); } + failureMechanismSectionResultContexts[1] = nodeData.OutputComments; return failureMechanismSectionResultContexts; } @@ -1502,8 +1513,8 @@ } private ContextMenuStrip MacroStabilityOutwardsFailureMechanismDisabledContextMenuStrip(MacroStabilityOutwardsFailureMechanismContext nodeData, - object parentData, - TreeViewControl treeViewControl) + object parentData, + TreeViewControl treeViewControl) { var builder = new RingtoetsContextMenuBuilder(Gui.Get(nodeData, treeViewControl)); @@ -1552,12 +1563,13 @@ { var macrostabilityOutwards = nodeData as IHasSectionResults; var failureMechanismSectionResultContexts = new object[2]; - + if (macrostabilityOutwards != null) { failureMechanismSectionResultContexts[0] = new FailureMechanismSectionResultContext(macrostabilityOutwards.SectionResults, nodeData); } + failureMechanismSectionResultContexts[1] = nodeData.OutputComments; return failureMechanismSectionResultContexts; } @@ -1583,8 +1595,8 @@ } private ContextMenuStrip PipingStructureFailureMechanismDisabledContextMenuStrip(PipingStructureFailureMechanismContext nodeData, - object parentData, - TreeViewControl treeViewControl) + object parentData, + TreeViewControl treeViewControl) { var builder = new RingtoetsContextMenuBuilder(Gui.Get(nodeData, treeViewControl)); @@ -1597,7 +1609,6 @@ #endregion - #region CategoryTreeFolder TreeNodeInfo ///