Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r3c1b0b97a6f8a5f3df4b9dad0164e69a886d1330 -rcfa21301665f4ca7122f6065fd83fad20b96843e
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3c1b0b97a6f8a5f3df4b9dad0164e69a886d1330)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision cfa21301665f4ca7122f6065fd83fad20b96843e)
@@ -2422,6 +2422,16 @@
}
///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap UpdateItemIcon {
+ get {
+ object obj = ResourceManager.GetObject("UpdateItemIcon", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
/// Looks up a localized string similar to &Valideren.
///
public static string Validate {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r3c1b0b97a6f8a5f3df4b9dad0164e69a886d1330 -rcfa21301665f4ca7122f6065fd83fad20b96843e
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 3c1b0b97a6f8a5f3df4b9dad0164e69a886d1330)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision cfa21301665f4ca7122f6065fd83fad20b96843e)
@@ -920,4 +920,7 @@
..\Resources\MapsIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\update.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/update.png
===================================================================
diff -u
Binary files differ
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -rf861839e975251253e2ffd7bc3f0a1839b85534e -rcfa21301665f4ca7122f6065fd83fad20b96843e
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision f861839e975251253e2ffd7bc3f0a1839b85534e)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision cfa21301665f4ca7122f6065fd83fad20b96843e)
@@ -290,6 +290,7 @@
+
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79 -rcfa21301665f4ca7122f6065fd83fad20b96843e
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision cfa21301665f4ca7122f6065fd83fad20b96843e)
@@ -815,8 +815,8 @@
PipingCalculationService.Validate(context.WrappedData);
}
- private static string ValidateAllDataAvailableAndGetErrorMessage(PipingCalculationScenarioContext context)
- {
+ private static string ValidateAllDataAvailableAndGetErrorMessage(PipingCalculationScenarioContext context)
+ {
return ValidateAllDataAvailableAndGetErrorMessage(context.FailureMechanism);
}
@@ -833,10 +833,14 @@
{
bool hasSurfaceLine = context.WrappedData.InputParameters.SurfaceLine != null;
+ string toolTipMessage = hasSurfaceLine
+ ? Resources.PipingPlugin_CreateUpdateEntryAndExitPointItem_Update_calculation_with_characteristic_points_ToolTip
+ : Resources.PipingPlugin_CreateUpdateEntryAndExitPointItem_Update_calculation_requires_surface_line_selected_ToolTip;
+
var updateEntryAndExitPointItem = new StrictContextMenuItem(
- "Bijwerken intrede- en uittredepunt",
- "", // TODO WTI-1076: update tooltip
- null, // TODO WTI-1076: update icon
+ Resources.PipingPlugin_CreateUpdateEntryAndExitPointItem_Update_entry_and_exit_point,
+ toolTipMessage,
+ RingtoetsCommonFormsResources.UpdateItemIcon,
(o, args) => { UpdateSurfaceLineDependentData(context.WrappedData); })
{
Enabled = hasSurfaceLine
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -r26da131fa5dbcf95f9a16de6f81eb4acc8d1be14 -rcfa21301665f4ca7122f6065fd83fad20b96843e
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 26da131fa5dbcf95f9a16de6f81eb4acc8d1be14)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision cfa21301665f4ca7122f6065fd83fad20b96843e)
@@ -82,6 +82,35 @@
}
///
+ /// Looks up a localized string similar to Er moet een profielschematisatie geselecteerd zijn..
+ ///
+ public static string PipingPlugin_CreateUpdateEntryAndExitPointItem_Update_calculation_requires_surface_line_selected_ToolTip {
+ get {
+ return ResourceManager.GetString("PipingPlugin_CreateUpdateEntryAndExitPointItem_Update_calculation_requires_surfac" +
+ "e_line_selected_ToolTip", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Berekening bijwerken met de karakteristieke punten..
+ ///
+ public static string PipingPlugin_CreateUpdateEntryAndExitPointItem_Update_calculation_with_characteristic_points_ToolTip {
+ get {
+ return ResourceManager.GetString("PipingPlugin_CreateUpdateEntryAndExitPointItem_Update_calculation_with_characteri" +
+ "stic_points_ToolTip", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Bijwerken intrede- en uittredepunt.
+ ///
+ public static string PipingPlugin_CreateUpdateEntryAndExitPointItem_Update_entry_and_exit_point {
+ get {
+ return ResourceManager.GetString("PipingPlugin_CreateUpdateEntryAndExitPointItem_Update_entry_and_exit_point", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Ringtoets berekeningenconfiguratie.
///
public static string PipingPlugin_PipingConfigurationFileFilter_calculation_configuration_description {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx
===================================================================
diff -u -r26da131fa5dbcf95f9a16de6f81eb4acc8d1be14 -rcfa21301665f4ca7122f6065fd83fad20b96843e
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 26da131fa5dbcf95f9a16de6f81eb4acc8d1be14)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision cfa21301665f4ca7122f6065fd83fad20b96843e)
@@ -238,4 +238,13 @@
Weet u zeker dat u wilt doorgaan?
+
+ Bijwerken intrede- en uittredepunt
+
+
+ Berekening bijwerken met de karakteristieke punten.
+
+
+ Er moet een profielschematisatie geselecteerd zijn.
+
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -r53cf7e65c1ee70a2ef0143eff830b650785bdf79 -rcfa21301665f4ca7122f6065fd83fad20b96843e
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 53cf7e65c1ee70a2ef0143eff830b650785bdf79)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision cfa21301665f4ca7122f6065fd83fad20b96843e)
@@ -415,8 +415,8 @@
TestHelper.AssertContextMenuStripContainsItem(contextMenu,
contextMenuUpdateEntryAndExitPointIndex,
"Bijwerken intrede- en uittredepunt",
- "", // TODO WTI-1076: update tooltip
- null, // TODO WTI-1076: update icon
+ "Er moet een profielschematisatie geselecteerd zijn.",
+ RingtoetsCommonFormsResources.UpdateItemIcon,
false);
}
}
@@ -462,8 +462,8 @@
TestHelper.AssertContextMenuStripContainsItem(contextMenu,
contextMenuUpdateEntryAndExitPointIndex,
"Bijwerken intrede- en uittredepunt",
- "", // TODO WTI-1076: update tooltip
- null); // TODO WTI-1076: update icon
+ "Berekening bijwerken met de karakteristieke punten.",
+ RingtoetsCommonFormsResources.UpdateItemIcon);
}
}
}
@@ -501,7 +501,7 @@
var inputObserver = mocks.StrictMock();
inputObserver.Expect(obs => obs.UpdateObserver());
nodeData.WrappedData.InputParameters.Attach(inputObserver);
-
+
var gui = mocks.Stub();
gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
mocks.ReplayAll();
@@ -522,19 +522,19 @@
});
surfaceLine.SetDikeToeAtRiverAt(new Point3D(2, 0, 3));
surfaceLine.SetDikeToeAtPolderAt(new Point3D(3, 0, 0));
-
+
contextMenuStrip.Items[contextMenuUpdateEntryAndExitPointIndex].PerformClick();
// Then
PipingInput inputParameters = calculation.InputParameters;
Assert.AreEqual(new RoundedDouble(2, 2), inputParameters.EntryPointL);
Assert.AreEqual(new RoundedDouble(3, 3), inputParameters.ExitPointL);
-
+
// Note: observer assertions are verified in Teardown
}
}
}
-
+
[Test]
public void GivenCalculationWithSurfaceLineAndOutput_WhenSurfaceLineUpdatedAndUpdateEntryAndExitPointClicked__ThenPointsUpdatedOutputsRemovedAndObserversNotified()
{