Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r4e53af4a4179994c7a7d7fa25ab2b0bf256ca543 -reffe3cbc48073f4f368b6a72851444ca1a3fec61 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 4e53af4a4179994c7a7d7fa25ab2b0bf256ca543) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision effe3cbc48073f4f368b6a72851444ca1a3fec61) @@ -45,6 +45,7 @@ using Ringtoets.Common.Forms.ImportInfos; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.Common.Forms.TreeNodeInfos; +using Ringtoets.Common.Plugin; using Ringtoets.Common.Service; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms; @@ -56,6 +57,7 @@ using Ringtoets.GrassCoverErosionOutwards.Service; using Ringtoets.GrassCoverErosionOutwards.Service.MessageProviders; using Ringtoets.Revetment.Data; +using Ringtoets.Revetment.Forms.Views; using Ringtoets.Revetment.IO.Configurations; using RingtoetsGrassCoverErosionOutwardsFormsResources = Ringtoets.GrassCoverErosionOutwards.Forms.Properties.Resources; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; @@ -176,6 +178,20 @@ AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; }, CloseForData = (view, data) => CloseHydraulicBoundaryCalculationsViewForData(view.AssessmentSection, data) }; + + yield return new ViewInfo, + WaveConditionsInputView> + { + Image = RingtoetsCommonFormsResources.GenericInputOutputIcon, + GetViewName = (view, context) => RingtoetsCommonFormsResources.Calculation_Input, + GetViewData = context => context.Calculation, + CloseForData = RingtoetsPluginHelper.ShouldCloseViewWithCalculationData, + CreateInstance = context => new WaveConditionsInputView(new GrassCoverErosionOutwardsWaveConditionsInputViewStyle(), + () => context.FailureMechanism.GetNormativeAssessmentLevel( + context.AssessmentSection, + context.Calculation.InputParameters.HydraulicBoundaryLocation)) + }; } public override IEnumerable GetTreeNodeInfos() Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/Ringtoets.GrassCoverErosionOutwards.Plugin.csproj =================================================================== diff -u -recc8ef0eb9c115e10464b534e6c83c2bb780f9d1 -reffe3cbc48073f4f368b6a72851444ca1a3fec61 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/Ringtoets.GrassCoverErosionOutwards.Plugin.csproj (.../Ringtoets.GrassCoverErosionOutwards.Plugin.csproj) (revision ecc8ef0eb9c115e10464b534e6c83c2bb780f9d1) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/Ringtoets.GrassCoverErosionOutwards.Plugin.csproj (.../Ringtoets.GrassCoverErosionOutwards.Plugin.csproj) (revision effe3cbc48073f4f368b6a72851444ca1a3fec61) @@ -52,6 +52,11 @@ Core.Common.Util False + + {2465CCA1-C505-4827-9454-4FD5FD9194CD} + Core.Components.Chart.Forms + False + {4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5} Core.Components.Gis.Forms @@ -77,6 +82,11 @@ Ringtoets.Common.IO False + + {8513B8D6-79C8-4173-B663-59C91AC65E5F} + Ringtoets.Common.Plugin + False + {D951D6DA-FE83-4920-9FDB-63BF96480B54} Ringtoets.Common.Service Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj =================================================================== diff -u -r9c2d9527fe10eebf7ad90f343a7ed21c37441e24 -reffe3cbc48073f4f368b6a72851444ca1a3fec61 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision 9c2d9527fe10eebf7ad90f343a7ed21c37441e24) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision effe3cbc48073f4f368b6a72851444ca1a3fec61) @@ -67,11 +67,6 @@ Core.Common.Util False - - {2465cca1-c505-4827-9454-4fd5fd9194cd} - Core.Components.Chart.Forms - False - {4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5} Core.Components.Gis.Forms @@ -132,16 +127,6 @@ Ringtoets.MacroStabilityInwards.Forms False - - {87C2C553-C0BC-40BF-B1EA-B83BFF357F27} - Ringtoets.Revetment.Data - False - - - {AF1ACFA2-AEE5-4DB7-98CA-8B3720E46AD9} - Ringtoets.Revetment.Forms - False - {3D4B9740-8348-4434-8D77-B611FC6EE57F} Ringtoets.StabilityPointStructures.Data Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r5cfc0d61dc4789261beb5ee660401619a35ffe6e -reffe3cbc48073f4f368b6a72851444ca1a3fec61 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 5cfc0d61dc4789261beb5ee660401619a35ffe6e) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision effe3cbc48073f4f368b6a72851444ca1a3fec61) @@ -70,7 +70,6 @@ using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; -using Ringtoets.GrassCoverErosionOutwards.Forms.Views; using Ringtoets.HeightStructures.Data; using Ringtoets.HeightStructures.Forms.PresentationObjects; using Ringtoets.Integration.Data; @@ -95,17 +94,12 @@ using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.Piping.Data; using Ringtoets.Piping.Forms.PresentationObjects; -using Ringtoets.Revetment.Data; -using Ringtoets.Revetment.Forms.PresentationObjects; -using Ringtoets.Revetment.Forms.Views; using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityPointStructures.Forms.PresentationObjects; using Ringtoets.StabilityStoneCover.Data; using Ringtoets.StabilityStoneCover.Forms.PresentationObjects; -using Ringtoets.StabilityStoneCover.Forms.Views; using Ringtoets.WaveImpactAsphaltCover.Data; using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects; -using Ringtoets.WaveImpactAsphaltCover.Forms.Views; using RingtoetsDataResources = Ringtoets.Integration.Data.Properties.Resources; using RingtoetsFormsResources = Ringtoets.Integration.Forms.Properties.Resources; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; @@ -546,16 +540,6 @@ GetViewData = context => context.WrappedData.Sections }; - yield return new ViewInfo, WaveConditionsInputView> - { - Image = RingtoetsCommonFormsResources.GenericInputOutputIcon, - GetViewName = (view, context) => RingtoetsCommonFormsResources.Calculation_Input, - GetViewData = context => context.Calculation, - CloseForData = RingtoetsPluginHelper.ShouldCloseViewWithCalculationData, - CreateInstance = context => new WaveConditionsInputView(GetWaveConditionsInputViewStyle(context), - () => GetNormativeAssessmentLevel(context)) - }; - yield return new ViewInfo { Image = RingtoetsCommonFormsResources.GeneralOutputIcon, @@ -1208,33 +1192,6 @@ #endregion - #region WaveConditionsInputViewInfo - - private static IWaveConditionsInputViewStyle GetWaveConditionsInputViewStyle(WaveConditionsInputContext context) - { - if (context is GrassCoverErosionOutwardsWaveConditionsInputContext) - { - return new GrassCoverErosionOutwardsWaveConditionsInputViewStyle(); - } - - return null; - } - - private static RoundedDouble GetNormativeAssessmentLevel(WaveConditionsInputContext context) - { - var grassCoverErosionOutwardsWaveConditionsInputContext = context as GrassCoverErosionOutwardsWaveConditionsInputContext; - if (grassCoverErosionOutwardsWaveConditionsInputContext != null) - { - return grassCoverErosionOutwardsWaveConditionsInputContext.FailureMechanism.GetNormativeAssessmentLevel( - grassCoverErosionOutwardsWaveConditionsInputContext.AssessmentSection, - grassCoverErosionOutwardsWaveConditionsInputContext.Calculation.InputParameters.HydraulicBoundaryLocation); - } - - return context.AssessmentSection.GetNormativeAssessmentLevel(context.Calculation.InputParameters.HydraulicBoundaryLocation); - } - - #endregion - #region AssemblyTotalResultContext ViewInfo private static bool CloseAssemblyResultTotalViewForData(AssemblyResultTotalView view, object o)