Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rb6993e964bc966bd9fa07dc8962dca7f6fbaab70 -rd803d27376ed059f1a1829292bf8048d40206604
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b6993e964bc966bd9fa07dc8962dca7f6fbaab70)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d803d27376ed059f1a1829292bf8048d40206604)
@@ -172,6 +172,24 @@
}
///
+ /// Looks up a localized string similar to Er zijn geen berekeningen om uit te voeren..
+ ///
+ public static string CalculationGroup_CalculateAll_No_calculations_to_run {
+ get {
+ return ResourceManager.GetString("CalculationGroup_CalculateAll_No_calculations_to_run", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Valideer en voer alle berekeningen binnen deze berekeningsmap uit..
+ ///
+ public static string CalculationGroup_CalculateAll_ToolTip {
+ get {
+ return ResourceManager.GetString("CalculationGroup_CalculateAll_ToolTip", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Weet u zeker dat u alle uitvoer wilt wissen?.
///
public static string CalculationGroup_ClearOutput_Are_you_sure_clear_all_output {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -rb6993e964bc966bd9fa07dc8962dca7f6fbaab70 -rd803d27376ed059f1a1829292bf8048d40206604
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision b6993e964bc966bd9fa07dc8962dca7f6fbaab70)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision d803d27376ed059f1a1829292bf8048d40206604)
@@ -139,6 +139,12 @@
Alles be&rekenen
+
+ Voer alle berekeningen binnen deze berekeningsmap uit.
+
+
+ Er zijn geen berekeningen om uit te voeren.
+
&Wis alle uitvoer...
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/CalculationTreeNodeInfoFactory.cs
===================================================================
diff -u -rb6993e964bc966bd9fa07dc8962dca7f6fbaab70 -rd803d27376ed059f1a1829292bf8048d40206604
--- Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/CalculationTreeNodeInfoFactory.cs (.../CalculationTreeNodeInfoFactory.cs) (revision b6993e964bc966bd9fa07dc8962dca7f6fbaab70)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/CalculationTreeNodeInfoFactory.cs (.../CalculationTreeNodeInfoFactory.cs) (revision d803d27376ed059f1a1829292bf8048d40206604)
@@ -149,6 +149,28 @@
builder.AddCustomItem(clearAllItem);
}
+ ///
+ /// This method adds a context menu item for performing all calculations in the calculation group.
+ ///
+ /// The builder to add the context menu item to.
+ /// The calculation group involved.
+ /// The action that performs all calculations.
+ public static void AddPerformAllCalculationsInGroupItem(IContextMenuBuilder builder, CalculationGroup calculationGroup, Action calculateAll)
+ {
+ var performAllItem = new StrictContextMenuItem(
+ Resources.Calculate_all,
+ Resources.CalculationGroup_CalculateAll_ToolTip,
+ Resources.CalculateAllIcon, (o, args) => { calculateAll(calculationGroup); });
+
+ if (!calculationGroup.GetCalculations().Any())
+ {
+ performAllItem.Enabled = false;
+ performAllItem.ToolTipText = Resources.CalculationGroup_CalculateAll_No_calculations_to_run;
+ }
+
+ builder.AddCustomItem(performAllItem);
+ }
+
# region Helper methods for CreateCalculationGroupContextTreeNodeInfo
private static bool IsNestedGroup(object parentData)
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -r743c32ba40bc0d0165d0513d6ca95282b1021e6a -rd803d27376ed059f1a1829292bf8048d40206604
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision 743c32ba40bc0d0165d0513d6ca95282b1021e6a)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision d803d27376ed059f1a1829292bf8048d40206604)
@@ -620,7 +620,6 @@
var generateCalculationsItem = CreateGeneratePipingCalculationsItem(nodeData);
var validateAllItem = CreateValidateAllItem(group);
- var calculateAllItem = CreateCalculateAllItem(group);
if (!isNestedGroup)
{
@@ -636,8 +635,8 @@
builder.AddSeparator();
builder
- .AddCustomItem(validateAllItem)
- .AddCustomItem(calculateAllItem);
+ .AddCustomItem(validateAllItem);
+ CalculationTreeNodeInfoFactory.AddPerformAllCalculationsInGroupItem(builder, group, CalculateAll);
CalculationTreeNodeInfoFactory.AddClearAllCalculationOutputInGroupItem(builder, group);
builder.AddSeparator();
@@ -710,22 +709,6 @@
}
}
- private StrictContextMenuItem CreateCalculateAllItem(CalculationGroup group)
- {
- var menuItem = new StrictContextMenuItem(
- RingtoetsCommonFormsResources.Calculate_all,
- PipingFormsResources.PipingCalculationGroup_CalculateAll_ToolTip,
- RingtoetsCommonFormsResources.CalculateAllIcon, (o, args) => { CalculateAll(group); });
-
- if (!group.GetCalculations().Any())
- {
- menuItem.Enabled = false;
- menuItem.ToolTipText = PipingFormsResources.PipingFailureMechanism_CreateCalculateAllItem_No_calculations_to_run;
- }
-
- return menuItem;
- }
-
private static StrictContextMenuItem CreateValidateAllItem(CalculationGroup group)
{
var menuItem = new StrictContextMenuItem(
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r5a11ddcabf7d816adb4d68e1abf22b414f3d54bf -rd803d27376ed059f1a1829292bf8048d40206604
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 5a11ddcabf7d816adb4d68e1abf22b414f3d54bf)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision d803d27376ed059f1a1829292bf8048d40206604)
@@ -204,7 +204,7 @@
RingtoetsFormsResources.ValidateAllIcon);
TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
RingtoetsFormsResources.Calculate_all,
- "Valideer en voer alle berekeningen binnen deze berekeningsmap uit.",
+ "Voer alle berekeningen binnen deze berekeningsmap uit.",
RingtoetsFormsResources.CalculateAllIcon);
TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearOutputIndex,
"&Wis alle uitvoer...",
@@ -316,7 +316,7 @@
RingtoetsFormsResources.ValidateAllIcon);
TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex + mainCalculationGroupContextMenuItemOffset,
RingtoetsFormsResources.Calculate_all,
- "Valideer en voer alle berekeningen binnen deze berekeningsmap uit.",
+ "Voer alle berekeningen binnen deze berekeningsmap uit.",
RingtoetsFormsResources.CalculateAllIcon);
TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearOutputIndex + mainCalculationGroupContextMenuItemOffset,
"&Wis alle uitvoer...",