Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r628f2f0fb1146e8b4bce994f9d81971adf6791b7 -rd3b640e93a86816e8e50b98183f2d40b346dbfab --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 628f2f0fb1146e8b4bce994f9d81971adf6791b7) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d3b640e93a86816e8e50b98183f2d40b346dbfab) @@ -4433,15 +4433,6 @@ } /// - /// Looks up a localized string similar to Waterstanden. - /// - public static string WaterLevelCalculations_DisplayName { - get { - return ResourceManager.GetString("WaterLevelCalculations_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Waterstanden bij norm. /// public static string WaterLevelCalculationsForNormTargetProbabilities_DisplayName { @@ -4523,15 +4514,6 @@ } /// - /// Looks up a localized string similar to Golfhoogten. - /// - public static string WaveHeightCalculations_DisplayName { - get { - return ResourceManager.GetString("WaveHeightCalculations_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Golfhoogten bij doelkans. /// public static string WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName { Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r628f2f0fb1146e8b4bce994f9d81971adf6791b7 -rd3b640e93a86816e8e50b98183f2d40b346dbfab --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 628f2f0fb1146e8b4bce994f9d81971adf6791b7) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision d3b640e93a86816e8e50b98183f2d40b346dbfab) @@ -1440,12 +1440,6 @@ Golfhoogten bij doelkans - - Waterstanden - - - Golfhoogten - Alle hydraulische belastingen berekenen. Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -rd622d7d3207be2390bb6e0b266f1f7712a2fe779 -rd3b640e93a86816e8e50b98183f2d40b346dbfab --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision d622d7d3207be2390bb6e0b266f1f7712a2fe779) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision d3b640e93a86816e8e50b98183f2d40b346dbfab) @@ -45,7 +45,6 @@ using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.Forms.TreeNodeInfos; using Riskeer.Common.Forms.UpdateInfos; -using Riskeer.Common.Forms.Views; using Riskeer.Common.Plugin; using Riskeer.Common.Service; using Riskeer.GrassCoverErosionOutwards.Data; @@ -147,40 +146,6 @@ (GrassCoverErosionOutwardsFailureMechanism) context.FailureMechanism) }; - yield return new ViewInfo< - GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext, - IObservableEnumerable, - DesignWaterLevelCalculationsView> - { - GetViewName = (view, context) => $"{RiskeerCommonFormsResources.WaterLevelCalculations_DisplayName} " + - $"- {RiskeerPluginHelper.FormatCategoryBoundaryName(context.CategoryBoundaryName)}", - GetViewData = context => context.WrappedData, - Image = RiskeerCommonFormsResources.GenericInputOutputIcon, - CreateInstance = context => new DesignWaterLevelCalculationsView(context.WrappedData, - context.AssessmentSection, - context.GetNormFunc, - () => context.CategoryBoundaryName), - AfterCreate = (view, context) => view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService, - CloseForData = CloseHydraulicBoundaryCalculationsViewForData - }; - - yield return new ViewInfo< - GrassCoverErosionOutwardsWaveHeightCalculationsContext, - IObservableEnumerable, - WaveHeightCalculationsView> - { - GetViewName = (view, context) => $"{RiskeerCommonFormsResources.WaveHeightCalculations_DisplayName} " + - $"- {RiskeerPluginHelper.FormatCategoryBoundaryName(context.CategoryBoundaryName)}", - GetViewData = context => context.WrappedData, - Image = RiskeerCommonFormsResources.GenericInputOutputIcon, - CreateInstance = context => new WaveHeightCalculationsView(context.WrappedData, - context.AssessmentSection, - context.GetNormFunc, - () => context.CategoryBoundaryName), - AfterCreate = (view, context) => view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService, - CloseForData = CloseHydraulicBoundaryCalculationsViewForData - }; - yield return new ViewInfo, WaveConditionsInputView> @@ -377,26 +342,7 @@ return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults); } - - private static bool CloseHydraulicBoundaryCalculationsViewForData(HydraulicBoundaryCalculationsView view, - object dataToCloseFor) - { - if (dataToCloseFor is IAssessmentSection assessmentSection) - { - return ReferenceEquals(assessmentSection, view.AssessmentSection); - } - - if (dataToCloseFor is GrassCoverErosionOutwardsHydraulicLoadsContext hydraulicLoadsContext) - { - return ReferenceEquals(hydraulicLoadsContext.WrappedData, view.AssessmentSection - .GetFailureMechanisms() - .OfType() - .FirstOrDefault()); - } - - return false; - } - + #endregion #region TreeNodeInfos Fisheye: Tag d3b640e93a86816e8e50b98183f2d40b346dbfab refers to a dead (removed) revision in file `Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d3b640e93a86816e8e50b98183f2d40b346dbfab refers to a dead (removed) revision in file `Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs'. Fisheye: No comparison available. Pass `N' to diff?