Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r6dbb29ed12c28b66db763ff603f3ab8e28a0adf4 -r77c09b9a2aecfd8931db21ab3d16719b0b6e91db
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6dbb29ed12c28b66db763ff603f3ab8e28a0adf4)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 77c09b9a2aecfd8931db21ab3d16719b0b6e91db)
@@ -61,24 +61,6 @@
}
///
- /// Looks up a localized string similar to Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap..
- ///
- public static string Add_calculation_group_to_calculation_group_tooltip {
- get {
- return ResourceManager.GetString("Add_calculation_group_to_calculation_group_tooltip", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Voeg een nieuwe berekening toe aan deze berekeningsmap..
- ///
- public static string Add_calculation_to_calculation_group_tooltip {
- get {
- return ResourceManager.GetString("Add_calculation_to_calculation_group_tooltip", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
public static System.Drawing.Bitmap AddFolderIcon {
@@ -154,6 +136,15 @@
}
///
+ /// Looks up a localized string similar to Voeg een nieuwe berekening toe aan deze berekeningsmap..
+ ///
+ public static string CalculationGroup_Add_Calculation_Tooltip {
+ get {
+ return ResourceManager.GetString("CalculationGroup_Add_Calculation_Tooltip", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to &Map toevoegen.
///
public static string CalculationGroup_Add_CalculationGroup {
@@ -165,9 +156,9 @@
///
/// Looks up a localized string similar to Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap..
///
- public static string CalculationGroup_Add_CalculationGroup_ToolTip {
+ public static string CalculationGroup_Add_CalculationGroup_Tooltip {
get {
- return ResourceManager.GetString("CalculationGroup_Add_CalculationGroup_ToolTip", resourceCulture);
+ return ResourceManager.GetString("CalculationGroup_Add_CalculationGroup_Tooltip", resourceCulture);
}
}
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r6dbb29ed12c28b66db763ff603f3ab8e28a0adf4 -r77c09b9a2aecfd8931db21ab3d16719b0b6e91db
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6dbb29ed12c28b66db763ff603f3ab8e28a0adf4)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 77c09b9a2aecfd8931db21ab3d16719b0b6e91db)
@@ -277,9 +277,6 @@
&Map toevoegen
-
- Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.
-
&Berekening toevoegen
@@ -295,10 +292,10 @@
Geeft aan of dit faalmechanisme relevant is of niet.
-
+
Voeg een nieuwe berekening toe aan deze berekeningsmap.
-
+
Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/CalculationTreeNodeInfoFactory.cs
===================================================================
diff -u -rd803d27376ed059f1a1829292bf8048d40206604 -r77c09b9a2aecfd8931db21ab3d16719b0b6e91db
--- Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/CalculationTreeNodeInfoFactory.cs (.../CalculationTreeNodeInfoFactory.cs) (revision d803d27376ed059f1a1829292bf8048d40206604)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/CalculationTreeNodeInfoFactory.cs (.../CalculationTreeNodeInfoFactory.cs) (revision 77c09b9a2aecfd8931db21ab3d16719b0b6e91db)
@@ -84,7 +84,7 @@
{
var createCalculationGroupItem = new StrictContextMenuItem(
Resources.CalculationGroup_Add_CalculationGroup,
- Resources.Add_calculation_group_to_calculation_group_tooltip,
+ Resources.CalculationGroup_Add_CalculationGroup_Tooltip,
Resources.AddFolderIcon,
(o, args) =>
{
@@ -109,7 +109,7 @@
{
var createCalculationItem = new StrictContextMenuItem(
Resources.CalculationGroup_Add_Calculation,
- Resources.Add_calculation_to_calculation_group_tooltip,
+ Resources.CalculationGroup_Add_Calculation_Tooltip,
Resources.FailureMechanismIcon,
(o, args) => { addCalculation(calculationGroupContext); });
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/CalculationTreeNodeInfoFactoryTest.cs
===================================================================
diff -u -r623084c4429d7818397e4e27e58cfbb4f22c06d5 -r77c09b9a2aecfd8931db21ab3d16719b0b6e91db
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/CalculationTreeNodeInfoFactoryTest.cs (.../CalculationTreeNodeInfoFactoryTest.cs) (revision 623084c4429d7818397e4e27e58cfbb4f22c06d5)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/CalculationTreeNodeInfoFactoryTest.cs (.../CalculationTreeNodeInfoFactoryTest.cs) (revision 77c09b9a2aecfd8931db21ab3d16719b0b6e91db)
@@ -63,7 +63,7 @@
// Assert
TestHelper.AssertContextMenuStripContainsItem(menuBuilder.Build(), 0,
RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
- RingtoetsFormsResources.Add_calculation_group_to_calculation_group_tooltip,
+ RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
RingtoetsFormsResources.AddFolderIcon);
}
@@ -115,7 +115,7 @@
// Assert
TestHelper.AssertContextMenuStripContainsItem(menuBuilder.Build(), 0,
RingtoetsFormsResources.CalculationGroup_Add_Calculation,
- RingtoetsFormsResources.Add_calculation_to_calculation_group_tooltip,
+ RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
RingtoetsFormsResources.FailureMechanismIcon);
}
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs
===================================================================
diff -u -r6dbb29ed12c28b66db763ff603f3ab8e28a0adf4 -r77c09b9a2aecfd8931db21ab3d16719b0b6e91db
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs (.../GrassCoverErosionInwardsGuiPlugin.cs) (revision 6dbb29ed12c28b66db763ff603f3ab8e28a0adf4)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs (.../GrassCoverErosionInwardsGuiPlugin.cs) (revision 77c09b9a2aecfd8931db21ab3d16719b0b6e91db)
@@ -324,6 +324,10 @@
CalculationTreeNodeInfoFactory.AddCreateCalculationItem(builder, nodeData, AddCalculation);
builder.AddSeparator();
+ CalculationTreeNodeInfoFactory.AddPerformAllCalculationsInGroupItem(builder, group, context => { }); // TODO: Actualy connect the calculation
+ CalculationTreeNodeInfoFactory.AddClearAllCalculationOutputInGroupItem(builder, group);
+ builder.AddSeparator();
+
if (isNestedGroup)
{
builder.AddRenameItem();
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r5a11ddcabf7d816adb4d68e1abf22b414f3d54bf -r77c09b9a2aecfd8931db21ab3d16719b0b6e91db
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 5a11ddcabf7d816adb4d68e1abf22b414f3d54bf)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 77c09b9a2aecfd8931db21ab3d16719b0b6e91db)
@@ -160,54 +160,69 @@
ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl);
// Assert
- var mainCalculationGroupContextItemOffset = 2;
- Assert.AreEqual(12, menu.Items.Count);
+ Assert.AreEqual(15, menu.Items.Count);
+
TestHelper.AssertContextMenuStripContainsItem(menu, 0,
CoreCommonGuiResources.Open,
CoreCommonGuiResources.Open_ToolTip,
CoreCommonGuiResources.OpenIcon,
false);
- TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndex + mainCalculationGroupContextItemOffset,
+
+ TestHelper.AssertContextMenuStripContainsItem(menu, 2,
RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
- "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.",
+ RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
RingtoetsFormsResources.AddFolderIcon);
- TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationItemIndex + mainCalculationGroupContextItemOffset,
+ TestHelper.AssertContextMenuStripContainsItem(menu, 3,
RingtoetsFormsResources.CalculationGroup_Add_Calculation,
- "Voeg een nieuwe berekening toe aan deze berekeningsmap.",
- GrassCoverErosionInwardsFormResources.CalculationIcon);
+ RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
+ RingtoetsFormsResources.FailureMechanismIcon);
+
TestHelper.AssertContextMenuStripContainsItem(menu, 5,
+ RingtoetsFormsResources.Calculate_all,
+ RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
+ RingtoetsFormsResources.CalculateIcon,
+ false);
+ TestHelper.AssertContextMenuStripContainsItem(menu, 6,
+ RingtoetsFormsResources.Clear_all_output,
+ RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
+ RingtoetsFormsResources.ClearIcon,
+ false);
+
+ TestHelper.AssertContextMenuStripContainsItem(menu, 8,
CoreCommonGuiResources.Import,
CoreCommonGuiResources.Import_ToolTip,
CoreCommonGuiResources.ImportIcon,
false);
- TestHelper.AssertContextMenuStripContainsItem(menu, 6,
+ TestHelper.AssertContextMenuStripContainsItem(menu, 9,
CoreCommonGuiResources.Export,
CoreCommonGuiResources.Export_ToolTip,
CoreCommonGuiResources.ExportIcon,
false);
- TestHelper.AssertContextMenuStripContainsItem(menu, 8,
+ TestHelper.AssertContextMenuStripContainsItem(menu, 11,
CoreCommonGuiResources.Expand_all,
CoreCommonGuiResources.Expand_all_ToolTip,
CoreCommonGuiResources.ExpandAllIcon,
false);
- TestHelper.AssertContextMenuStripContainsItem(menu, 9,
+ TestHelper.AssertContextMenuStripContainsItem(menu, 12,
CoreCommonGuiResources.Collapse_all,
CoreCommonGuiResources.Collapse_all_ToolTip,
CoreCommonGuiResources.CollapseAllIcon,
false);
- TestHelper.AssertContextMenuStripContainsItem(menu, 11,
+ TestHelper.AssertContextMenuStripContainsItem(menu, 14,
CoreCommonGuiResources.Properties,
CoreCommonGuiResources.Properties_ToolTip,
CoreCommonGuiResources.PropertiesHS,
false);
+
CollectionAssert.AllItemsAreInstancesOfType(new[]
{
menu.Items[1],
menu.Items[4],
menu.Items[7],
- menu.Items[10]
+ menu.Items[10],
+ menu.Items[13]
}, typeof(ToolStripSeparator));
mocks.VerifyAll();
@@ -251,56 +266,72 @@
ContextMenuStrip menu = info.ContextMenuStrip(nodeData, parentData, treeViewControl);
// Assert
- Assert.AreEqual(13, menu.Items.Count);
- TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndex,
+ Assert.AreEqual(16, menu.Items.Count);
+
+ TestHelper.AssertContextMenuStripContainsItem(menu, 0,
RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
- "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.",
+ RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
RingtoetsFormsResources.AddFolderIcon);
- TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationItemIndex,
+ TestHelper.AssertContextMenuStripContainsItem(menu, 1,
RingtoetsFormsResources.CalculationGroup_Add_Calculation,
- "Voeg een nieuwe berekening toe aan deze berekeningsmap.",
- GrassCoverErosionInwardsFormResources.CalculationIcon);
+ RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
+ RingtoetsFormsResources.FailureMechanismIcon);
+
TestHelper.AssertContextMenuStripContainsItem(menu, 3,
+ RingtoetsFormsResources.Calculate_all,
+ RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
+ RingtoetsFormsResources.CalculateIcon,
+ false);
+ TestHelper.AssertContextMenuStripContainsItem(menu, 4,
+ RingtoetsFormsResources.Clear_all_output,
+ RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
+ RingtoetsFormsResources.ClearIcon,
+ false);
+
+ TestHelper.AssertContextMenuStripContainsItem(menu, 6,
CoreCommonGuiResources.Rename,
CoreCommonGuiResources.Rename_ToolTip,
CoreCommonGuiResources.RenameIcon);
- TestHelper.AssertContextMenuStripContainsItem(menu, 4,
+ TestHelper.AssertContextMenuStripContainsItem(menu, 7,
CoreCommonGuiResources.Delete,
CoreCommonGuiResources.Delete_ToolTip,
CoreCommonGuiResources.DeleteIcon);
- TestHelper.AssertContextMenuStripContainsItem(menu, 6,
+
+ TestHelper.AssertContextMenuStripContainsItem(menu, 9,
CoreCommonGuiResources.Import,
CoreCommonGuiResources.Import_ToolTip,
CoreCommonGuiResources.ImportIcon,
false);
- TestHelper.AssertContextMenuStripContainsItem(menu, 7,
+ TestHelper.AssertContextMenuStripContainsItem(menu, 10,
CoreCommonGuiResources.Export,
CoreCommonGuiResources.Export_ToolTip,
CoreCommonGuiResources.ExportIcon,
false);
- TestHelper.AssertContextMenuStripContainsItem(menu, 9,
+ TestHelper.AssertContextMenuStripContainsItem(menu, 12,
CoreCommonGuiResources.Expand_all,
CoreCommonGuiResources.Expand_all_ToolTip,
CoreCommonGuiResources.ExpandAllIcon,
false);
- TestHelper.AssertContextMenuStripContainsItem(menu, 10,
+ TestHelper.AssertContextMenuStripContainsItem(menu, 13,
CoreCommonGuiResources.Collapse_all,
CoreCommonGuiResources.Collapse_all_ToolTip,
CoreCommonGuiResources.CollapseAllIcon,
false);
- TestHelper.AssertContextMenuStripContainsItem(menu, 12,
+ TestHelper.AssertContextMenuStripContainsItem(menu, 15,
CoreCommonGuiResources.Properties,
CoreCommonGuiResources.Properties_ToolTip,
CoreCommonGuiResources.PropertiesHS,
false);
+
CollectionAssert.AllItemsAreInstancesOfType(new[]
{
menu.Items[2],
menu.Items[5],
menu.Items[8],
- menu.Items[11]
+ menu.Items[11],
+ menu.Items[14]
}, typeof(ToolStripSeparator));
mocks.VerifyAll();