Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r0a51f20ac93373a43f79bb4c6327bce1d46545c6 -r184de624feae0c0a051e34298d66e304d073daf5 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 0a51f20ac93373a43f79bb4c6327bce1d46545c6) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 184de624feae0c0a051e34298d66e304d073daf5) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17929 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -247,6 +247,15 @@ } /// + /// Looks up a localized string similar to Genereer &scenario's.... + /// + public static string CalculationGroup_Generate_Scenarios { + get { + return ResourceManager.GetString("CalculationGroup_Generate_Scenarios", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Resultaat. /// public static string CalculationOutput_DisplayName { @@ -659,6 +668,16 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// + public static System.Drawing.Bitmap GenerateScenariosIcon { + get { + object obj = ResourceManager.GetObject("GenerateScenariosIcon", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// public static System.Drawing.Bitmap GenericInputOutputIcon { get { object obj = ResourceManager.GetObject("GenericInputOutputIcon", resourceCulture); Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r0a51f20ac93373a43f79bb4c6327bce1d46545c6 -r184de624feae0c0a051e34298d66e304d073daf5 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 0a51f20ac93373a43f79bb4c6327bce1d46545c6) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 184de624feae0c0a051e34298d66e304d073daf5) @@ -412,4 +412,10 @@ Er is geen hydraulische randvoorwaarden database geïmporteerd. + + Genereer &scenario's... + + + ..\resources\wand-hat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Resources/wand-hat.png =================================================================== diff -u Binary files differ Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj =================================================================== diff -u -re1157c221217ef3b5ade6034183a7da0e620eb05 -r184de624feae0c0a051e34298d66e304d073daf5 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision e1157c221217ef3b5ade6034183a7da0e620eb05) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision 184de624feae0c0a051e34298d66e304d073daf5) @@ -157,6 +157,7 @@ + Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs =================================================================== diff -u -r5546343f650bb277b3c1937f1abf3ee0b7a7dc89 -r184de624feae0c0a051e34298d66e304d073daf5 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs (.../GrassCoverErosionInwardsFailureMechanism.cs) (revision 5546343f650bb277b3c1937f1abf3ee0b7a7dc89) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs (.../GrassCoverErosionInwardsFailureMechanism.cs) (revision 184de624feae0c0a051e34298d66e304d073daf5) @@ -23,7 +23,7 @@ using System.Linq; using Core.Common.Base; - +using Core.Common.Base.Geometry; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.GrassCoverErosionInwards.Data.Properties; @@ -48,7 +48,10 @@ CalculationsGroup = new CalculationGroup(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName, false); GeneralInput = new GeneralGrassCoverErosionInwardsInput(); sectionResults = new List(); - DikeProfiles = new ObservableList(); + DikeProfiles = new ObservableList + { +// new DikeProfile(new Point2D(1,0)) + }; } public override IEnumerable Calculations Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsContext.cs =================================================================== diff -u -rdd95a590c807772d742ebe1b7e28611fa4931863 -r184de624feae0c0a051e34298d66e304d073daf5 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsContext.cs (.../GrassCoverErosionInwardsContext.cs) (revision dd95a590c807772d742ebe1b7e28611fa4931863) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsContext.cs (.../GrassCoverErosionInwardsContext.cs) (revision 184de624feae0c0a051e34298d66e304d073daf5) @@ -80,6 +80,17 @@ public IAssessmentSection AssessmentSection { get; private set; } /// + /// Gets the available dike profiles which can be used to assign to a . + /// + public IEnumerable AvailableDikeProfiles + { + get + { + return FailureMechanism.DikeProfiles; + } + } + + /// /// Gets the available hydraulic boundary locations in order for the user to select one to /// set . /// Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs =================================================================== diff -u -r12a35732d53e73c149035a212f96d2a0e9604cff -r184de624feae0c0a051e34298d66e304d073daf5 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs (.../GrassCoverErosionInwardsGuiPlugin.cs) (revision 12a35732d53e73c149035a212f96d2a0e9604cff) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs (.../GrassCoverErosionInwardsGuiPlugin.cs) (revision 184de624feae0c0a051e34298d66e304d073daf5) @@ -27,6 +27,7 @@ using System.Windows.Forms; using Core.Common.Controls.TreeView; +using Core.Common.Gui.ContextMenu; using Core.Common.Gui.Forms.ProgressDialog; using Core.Common.Gui.Plugin; @@ -354,9 +355,13 @@ var builder = new RingtoetsContextMenuBuilder(Gui.Get(context, treeViewControl)); var isNestedGroup = parentData is GrassCoverErosionInwardsCalculationGroupContext; + var generateCalculationsItem = CreateGenerateCalculationsItem(context); + if (!isNestedGroup) { builder.AddOpenItem() + .AddSeparator() + .AddCustomItem(generateCalculationsItem) .AddSeparator(); } @@ -384,6 +389,29 @@ .Build(); } + private StrictContextMenuItem CreateGenerateCalculationsItem(GrassCoverErosionInwardsCalculationGroupContext nodeData) + { + var isDikeProfileAvailable = nodeData.AvailableDikeProfiles.Any(); + + var calculationGroupGenerateCalculationsToolTip = + isDikeProfileAvailable ? + GrassCoverErosionInwardsPluginResources.GrassCoverErosionInwardsGuiPlugin_CreateGenerateCalculationsItem_ToolTip : + GrassCoverErosionInwardsPluginResources.GrassCoverErosionInwardsGuiPlugin_CreateGenerateCalculationsItem_NoDikeLocations_ToolTip; + + var generateCalculationsItem = new StrictContextMenuItem( + RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios, + calculationGroupGenerateCalculationsToolTip, + RingtoetsCommonFormsResources.GenerateScenariosIcon, (o, args) => { ShowDikeProfileSelectionDialog(nodeData); }) + { + Enabled = isDikeProfileAvailable + }; + return generateCalculationsItem; + } + + private void ShowDikeProfileSelectionDialog(GrassCoverErosionInwardsCalculationGroupContext nodeData) + { + } + private static void CalculationGroupContextOnNodeRemoved(GrassCoverErosionInwardsCalculationGroupContext context, object parentNodeData) { var parentGroupContext = (GrassCoverErosionInwardsCalculationGroupContext)parentNodeData; Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -r12a35732d53e73c149035a212f96d2a0e9604cff -r184de624feae0c0a051e34298d66e304d073daf5 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 12a35732d53e73c149035a212f96d2a0e9604cff) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 184de624feae0c0a051e34298d66e304d073daf5) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -71,6 +71,25 @@ } /// + /// Looks up a localized string similar to Er zijn geen dijkprofielen beschikbaar om berekeningen voor te genereren.. + /// + internal static string GrassCoverErosionInwardsGuiPlugin_CreateGenerateCalculationsItem_NoDikeLocations_ToolTip { + get { + return ResourceManager.GetString("GrassCoverErosionInwardsGuiPlugin_CreateGenerateCalculationsItem_NoDikeLocations_" + + "ToolTip", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Genereer scenario's op basis van geselecteerde dijkprofielen.. + /// + internal static string GrassCoverErosionInwardsGuiPlugin_CreateGenerateCalculationsItem_ToolTip { + get { + return ResourceManager.GetString("GrassCoverErosionInwardsGuiPlugin_CreateGenerateCalculationsItem_ToolTip", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Dijkprofielen. /// internal static string GrassCoverErosionInwardsGuiPlugin_DikeProfilesContext_DisplayName { Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/Properties/Resources.resx =================================================================== diff -u -r12a35732d53e73c149035a212f96d2a0e9604cff -r184de624feae0c0a051e34298d66e304d073daf5 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 12a35732d53e73c149035a212f96d2a0e9604cff) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 184de624feae0c0a051e34298d66e304d073daf5) @@ -121,6 +121,12 @@ ..\Resources\DikeProfile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Er zijn geen dijkprofielen beschikbaar om berekeningen voor te genereren. + + + Genereer scenario's op basis van geselecteerde dijkprofielen. + Dijkprofielen Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r5e6eacaf76f765ba77febee673e9e94895e46feb -r184de624feae0c0a051e34298d66e304d073daf5 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 5e6eacaf76f765ba77febee673e9e94895e46feb) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 184de624feae0c0a051e34298d66e304d073daf5) @@ -40,12 +40,12 @@ using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionInwards.Plugin; -using Ringtoets.GrassCoverErosionInwards.Plugin.Properties; using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Data; using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources; using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources; using GrassCoverErosionInwardsFormResources = Ringtoets.GrassCoverErosionInwards.Forms.Properties.Resources; +using GrassCoverErosionInwardsPluginResources = Ringtoets.GrassCoverErosionInwards.Plugin.Properties.Resources; namespace Ringtoets.GrassCoverErosionInwards.Forms.Test.TreeNodeInfos { @@ -170,7 +170,9 @@ menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); @@ -215,27 +217,25 @@ ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControlMock); // Assert - Assert.AreEqual(9, menu.Items.Count); - + Assert.AreEqual(11, menu.Items.Count); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup, - RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup, - RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip, - RingtoetsFormsResources.AddFolderIcon); + RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup, + RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip, + RingtoetsFormsResources.AddFolderIcon); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexRootGroup, - RingtoetsFormsResources.CalculationGroup_Add_Calculation, - RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip, - RingtoetsFormsResources.FailureMechanismIcon); - + RingtoetsFormsResources.CalculationGroup_Add_Calculation, + RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip, + RingtoetsFormsResources.FailureMechanismIcon); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup, - RingtoetsFormsResources.Calculate_all, - RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run, - RingtoetsFormsResources.CalculateIcon, - false); + RingtoetsFormsResources.Calculate_all, + RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run, + RingtoetsFormsResources.CalculateIcon, + false); TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup, - RingtoetsFormsResources.Clear_all_output, - RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, - RingtoetsFormsResources.ClearIcon, - false); + RingtoetsFormsResources.Clear_all_output, + RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, + RingtoetsFormsResources.ClearIcon, + false); mocks.VerifyAll(); } @@ -541,8 +541,72 @@ RingtoetsFormsResources.CalculateIcon); mocks.VerifyAll(); } + + [Test] + public void ContextMenuStrip_FailureMechanismWithoutDikeProfiles_ContextMenuItemGenerateCalculationsDisabledAndTooltipSet() + { + // Setup + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); + var assessmentSectionMock = mocks.StrictMock(); + assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(null); + + var nodeData = new GrassCoverErosionInwardsCalculationGroupContext(failureMechanism.CalculationsGroup, + failureMechanism, + assessmentSectionMock); + + var treeViewControlMock = mocks.StrictMock(); + var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); + guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder); + + mocks.ReplayAll(); + + // Call + var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock); + + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuGenerateCalculationsIndexRootGroup, + RingtoetsFormsResources.CalculationGroup_Generate_Scenarios, + GrassCoverErosionInwardsPluginResources.GrassCoverErosionInwardsGuiPlugin_CreateGenerateCalculationsItem_NoDikeLocations_ToolTip, + RingtoetsFormsResources.GenerateScenariosIcon, + false); + + mocks.VerifyAll(); + } + [Test] + public void ContextMenuStrip_FailureMechanismWithDikeProfiles_ContextMenuItemGenerateCalculationsDisabledAndTooltipSet() + { + // Setup + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); + failureMechanism.DikeProfiles.Add(new DikeProfile(new Point2D(1,2))); + + var assessmentSectionMock = mocks.StrictMock(); + assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(null); + + var nodeData = new GrassCoverErosionInwardsCalculationGroupContext(failureMechanism.CalculationsGroup, + failureMechanism, + assessmentSectionMock); + + var treeViewControlMock = mocks.StrictMock(); + var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); + guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder); + + mocks.ReplayAll(); + + // Call + var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock); + + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuGenerateCalculationsIndexRootGroup, + RingtoetsFormsResources.CalculationGroup_Generate_Scenarios, + GrassCoverErosionInwardsPluginResources.GrassCoverErosionInwardsGuiPlugin_CreateGenerateCalculationsItem_ToolTip, + RingtoetsFormsResources.GenerateScenariosIcon); + + mocks.VerifyAll(); + } + + [Test] public void ContextMenuStrip_ClickOnCalculateAllItem_ScheduleAllChildCalculations() { // Setup @@ -781,10 +845,11 @@ mocks.VerifyAll(); } - private const int contextMenuAddCalculationGroupIndexRootGroup = 1; - private const int contextMenuAddCalculationIndexRootGroup = 2; - private const int contextMenuCalculateAllIndexRootGroup = 4; - private const int contextMenuClearAllIndexRootGroup = 5; + private const int contextMenuGenerateCalculationsIndexRootGroup = 1; + private const int contextMenuAddCalculationGroupIndexRootGroup = 3; + private const int contextMenuAddCalculationIndexRootGroup = 4; + private const int contextMenuCalculateAllIndexRootGroup = 6; + private const int contextMenuClearAllIndexRootGroup = 7; private const int contextMenuAddCalculationGroupIndexNestedGroup = 0; private const int contextMenuAddCalculationIndexNestedGroup = 1; private const int contextMenuCalculateAllIndexNestedGroup = 3; Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingSurfaceLineSelectionDialog.cs =================================================================== diff -u -rfc38d18fc6ff1749476da0ea43281d5d80568283 -r184de624feae0c0a051e34298d66e304d073daf5 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingSurfaceLineSelectionDialog.cs (.../PipingSurfaceLineSelectionDialog.cs) (revision fc38d18fc6ff1749476da0ea43281d5d80568283) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingSurfaceLineSelectionDialog.cs (.../PipingSurfaceLineSelectionDialog.cs) (revision 184de624feae0c0a051e34298d66e304d073daf5) @@ -2,10 +2,11 @@ using System.Collections.Generic; using System.Windows.Forms; using Core.Common.Controls.Dialogs; -using Ringtoets.Piping.Forms.Properties; using Ringtoets.Piping.Forms.Views; using Ringtoets.Piping.Primitives; +using CommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; + namespace Ringtoets.Piping.Forms { /// @@ -20,7 +21,7 @@ /// The parent of the dialog. /// The collection of to show in the dialog. public PipingSurfaceLineSelectionDialog(IWin32Window dialogParent, IEnumerable surfaceLines) - : base(dialogParent, Resources.GeneratePipingCalculationsIcon, 300, 400) + : base(dialogParent, CommonFormsResources.GenerateScenariosIcon, 300, 400) { InitializeComponent(); Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -re5eb6aafecb6223ded5109bc1f76b4d3b35e21ed -r184de624feae0c0a051e34298d66e304d073daf5 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e5eb6aafecb6223ded5109bc1f76b4d3b35e21ed) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 184de624feae0c0a051e34298d66e304d073daf5) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17929 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -421,16 +421,6 @@ } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap GeneratePipingCalculationsIcon { - get { - object obj = ResourceManager.GetObject("GeneratePipingCalculationsIcon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// /// Looks up a localized string similar to Importeer ondergrondschematisaties. /// public static string Import_SoilProfiles { @@ -550,15 +540,6 @@ } /// - /// Looks up a localized string similar to Genereer &scenario's.... - /// - public static string PipingCalculationGroup_Generate_PipingCalculations { - get { - return ResourceManager.GetString("PipingCalculationGroup_Generate_PipingCalculations", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Er zijn geen profielschematisaties of stochastische ondergrondmodellen beschikbaar om berekeningen voor te genereren.. /// public static string PipingCalculationGroup_Generate_PipingCalculations_NoSurfaceLinesOrSoilModels_ToolTip { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -re5eb6aafecb6223ded5109bc1f76b4d3b35e21ed -r184de624feae0c0a051e34298d66e304d073daf5 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision e5eb6aafecb6223ded5109bc1f76b4d3b35e21ed) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 184de624feae0c0a051e34298d66e304d073daf5) @@ -637,12 +637,6 @@ Ondergrondschematisaties - - ..\resources\wand-hat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Genereer &scenario's... - Genereer scenario's op basis van geselecteerde profielschematisaties. Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Resources/wand-hat.png =================================================================== diff -u -rbff183a6d323111affe69f3afa19b9ada02c9375 -r184de624feae0c0a051e34298d66e304d073daf5 Binary files differ Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj =================================================================== diff -u -rf816a8ef737d38b4f044855b73abf3ea32b79422 -r184de624feae0c0a051e34298d66e304d073daf5 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj (.../Ringtoets.Piping.Forms.csproj) (revision f816a8ef737d38b4f044855b73abf3ea32b79422) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj (.../Ringtoets.Piping.Forms.csproj) (revision 184de624feae0c0a051e34298d66e304d073daf5) @@ -256,9 +256,6 @@ - - - Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs =================================================================== diff -u -r0fdde49cfbdc5a411fac387d6a99484f05112700 -r184de624feae0c0a051e34298d66e304d073daf5 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision 0fdde49cfbdc5a411fac387d6a99484f05112700) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision 184de624feae0c0a051e34298d66e304d073daf5) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Collections; using System.Collections.Generic; using System.Drawing; @@ -642,9 +641,9 @@ if (isNestedGroup) { - builder.AddRenameItem(); - builder.AddDeleteItem(); - builder.AddSeparator(); + builder.AddRenameItem() + .AddDeleteItem() + .AddSeparator(); } return builder.AddImportItem() @@ -683,9 +682,9 @@ PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_NoSurfaceLinesOrSoilModels_ToolTip; var generateCalculationsItem = new StrictContextMenuItem( - PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations, + RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios, pipingCalculationGroupGeneratePipingCalculationsToolTip, - PipingFormsResources.GeneratePipingCalculationsIcon, (o, args) => { ShowSurfaceLineSelectionDialog(nodeData); }) + RingtoetsCommonFormsResources.GenerateScenariosIcon, (o, args) => { ShowSurfaceLineSelectionDialog(nodeData); }) { Enabled = surfaceLineAvailable }; Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r12a35732d53e73c149035a212f96d2a0e9604cff -r184de624feae0c0a051e34298d66e304d073daf5 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 12a35732d53e73c149035a212f96d2a0e9604cff) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 184de624feae0c0a051e34298d66e304d073daf5) @@ -412,9 +412,9 @@ // Assert TestHelper.AssertContextMenuStripContainsItem(menu, 1, - PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations, + RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios, PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_NoSurfaceLinesOrSoilModels_ToolTip, - PipingFormsResources.GeneratePipingCalculationsIcon, + RingtoetsCommonFormsResources.GenerateScenariosIcon, false); } mocks.VerifyAll(); @@ -454,9 +454,9 @@ // Assert TestHelper.AssertContextMenuStripContainsItem(menu, 1, - PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations, + RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios, PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_NoSurfaceLinesOrSoilModels_ToolTip, - PipingFormsResources.GeneratePipingCalculationsIcon, + RingtoetsCommonFormsResources.GenerateScenariosIcon, false); } mocks.VerifyAll(); @@ -499,9 +499,9 @@ // Assert TestHelper.AssertContextMenuStripContainsItem(menu, 1, - PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations, + RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios, PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_ToolTip, - PipingFormsResources.GeneratePipingCalculationsIcon); + RingtoetsCommonFormsResources.GenerateScenariosIcon); } mocks.VerifyAll(); }