Index: Riskeer/Common/src/Riskeer.Common.Forms/Controls/LengthEffectSettingsControl.Designer.cs =================================================================== diff -u -r55b5a8ed0173338567036466a0c2a008fc90439b -r9c7b3107f26b93cea9eccd91b0821e3dbf66fcbf --- Riskeer/Common/src/Riskeer.Common.Forms/Controls/LengthEffectSettingsControl.Designer.cs (.../LengthEffectSettingsControl.Designer.cs) (revision 55b5a8ed0173338567036466a0c2a008fc90439b) +++ Riskeer/Common/src/Riskeer.Common.Forms/Controls/LengthEffectSettingsControl.Designer.cs (.../LengthEffectSettingsControl.Designer.cs) (revision 9c7b3107f26b93cea9eccd91b0821e3dbf66fcbf) @@ -46,6 +46,8 @@ this.lengthEffectNRoundedTextBox = new System.Windows.Forms.TextBox(); this.parameterATextBox = new System.Windows.Forms.TextBox(); this.lengthEffectErrorProvider = new System.Windows.Forms.ErrorProvider(this.components); + this.parameterAToolTip = new System.Windows.Forms.ToolTip(this.components); + this.lengthEffectNRoundedToolTip = new System.Windows.Forms.ToolTip(this.components); this.tableLayoutPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize) (this.lengthEffectErrorProvider)).BeginInit(); this.SuspendLayout(); @@ -76,7 +78,7 @@ this.parameterALabel.Location = new System.Drawing.Point(0, 3); this.parameterALabel.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.parameterALabel.Name = "parameterALabel"; - this.parameterALabel.Size = new System.Drawing.Size(165, 20); + this.parameterALabel.Size = new System.Drawing.Size(166, 20); this.parameterALabel.TabIndex = 0; this.parameterALabel.Text = global::Riskeer.Common.Forms.Properties.Resources.Parameter_A_DisplayName; this.parameterALabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -88,7 +90,7 @@ this.lengthEffectNRoundedLabel.Location = new System.Drawing.Point(0, 29); this.lengthEffectNRoundedLabel.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.lengthEffectNRoundedLabel.Name = "lengthEffectNRoundedLabel"; - this.lengthEffectNRoundedLabel.Size = new System.Drawing.Size(165, 118); + this.lengthEffectNRoundedLabel.Size = new System.Drawing.Size(166, 118); this.lengthEffectNRoundedLabel.TabIndex = 1; this.lengthEffectNRoundedLabel.Text = global::Riskeer.Common.Forms.Properties.Resources.LengthEffect_RoundedNSection_DisplayName; this.lengthEffectNRoundedLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -97,7 +99,7 @@ // this.lengthEffectNRoundedTextBox.Dock = System.Windows.Forms.DockStyle.Left; this.lengthEffectNRoundedTextBox.Enabled = false; - this.lengthEffectNRoundedTextBox.Location = new System.Drawing.Point(171, 29); + this.lengthEffectNRoundedTextBox.Location = new System.Drawing.Point(172, 29); this.lengthEffectNRoundedTextBox.Name = "lengthEffectNRoundedTextBox"; this.lengthEffectNRoundedTextBox.Size = new System.Drawing.Size(69, 20); this.lengthEffectNRoundedTextBox.TabIndex = 2; @@ -106,7 +108,7 @@ // this.parameterATextBox.Dock = System.Windows.Forms.DockStyle.Left; this.parameterATextBox.Enabled = false; - this.parameterATextBox.Location = new System.Drawing.Point(171, 3); + this.parameterATextBox.Location = new System.Drawing.Point(172, 3); this.parameterATextBox.Name = "parameterATextBox"; this.parameterATextBox.Size = new System.Drawing.Size(69, 20); this.parameterATextBox.TabIndex = 3; @@ -118,6 +120,18 @@ this.lengthEffectErrorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink; this.lengthEffectErrorProvider.ContainerControl = this; // + // parameterAToolTip + // + this.parameterAToolTip.AutoPopDelay = 5000; + this.parameterAToolTip.InitialDelay = 100; + this.parameterAToolTip.ReshowDelay = 100; + // + // lengthEffectNRoundedToolTip + // + this.lengthEffectNRoundedToolTip.AutoPopDelay = 5000; + this.lengthEffectNRoundedToolTip.InitialDelay = 100; + this.lengthEffectNRoundedToolTip.ReshowDelay = 100; + // // LengthEffectSettingsControl // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -133,6 +147,9 @@ this.PerformLayout(); } + private System.Windows.Forms.ToolTip parameterAToolTip; + private System.Windows.Forms.ToolTip lengthEffectNRoundedToolTip; + private System.Windows.Forms.Label parameterALabel; private System.Windows.Forms.Label lengthEffectNRoundedLabel; private System.Windows.Forms.TextBox lengthEffectNRoundedTextBox; Index: Riskeer/Common/src/Riskeer.Common.Forms/Controls/LengthEffectSettingsControl.cs =================================================================== diff -u -r42bc8e8d8d15a558113a7638f48eb221e836f86a -r9c7b3107f26b93cea9eccd91b0821e3dbf66fcbf --- Riskeer/Common/src/Riskeer.Common.Forms/Controls/LengthEffectSettingsControl.cs (.../LengthEffectSettingsControl.cs) (revision 42bc8e8d8d15a558113a7638f48eb221e836f86a) +++ Riskeer/Common/src/Riskeer.Common.Forms/Controls/LengthEffectSettingsControl.cs (.../LengthEffectSettingsControl.cs) (revision 9c7b3107f26b93cea9eccd91b0821e3dbf66fcbf) @@ -27,6 +27,7 @@ using Core.Common.Base.Helpers; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.Probability; +using Riskeer.Common.Forms.Properties; namespace Riskeer.Common.Forms.Controls { @@ -49,6 +50,8 @@ public LengthEffectSettingsControl() { InitializeComponent(); + InitializeToolTips(); + scenarioConfigurationObserver = new Observer(UpdateLengthEffectData); } @@ -108,6 +111,12 @@ base.Dispose(disposing); } + private void InitializeToolTips() + { + parameterAToolTip.SetToolTip(parameterALabel, Resources.Parameter_A_Description); + lengthEffectNRoundedToolTip.SetToolTip(lengthEffectNRoundedLabel, Resources.LengthEffect_RoundedNSection_Description); + } + private void ParameterATextBoxKeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Enter) Index: Riskeer/Common/src/Riskeer.Common.Forms/Controls/LengthEffectSettingsControl.resx =================================================================== diff -u -r42bc8e8d8d15a558113a7638f48eb221e836f86a -r9c7b3107f26b93cea9eccd91b0821e3dbf66fcbf --- Riskeer/Common/src/Riskeer.Common.Forms/Controls/LengthEffectSettingsControl.resx (.../LengthEffectSettingsControl.resx) (revision 42bc8e8d8d15a558113a7638f48eb221e836f86a) +++ Riskeer/Common/src/Riskeer.Common.Forms/Controls/LengthEffectSettingsControl.resx (.../LengthEffectSettingsControl.resx) (revision 9c7b3107f26b93cea9eccd91b0821e3dbf66fcbf) @@ -120,4 +120,10 @@ 17, 17 + + 195, 17 + + + 343, 17 + \ No newline at end of file Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r04d1c1bd2745a506f8df4e777fdf4ac11d46e3f9 -r9c7b3107f26b93cea9eccd91b0821e3dbf66fcbf --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 04d1c1bd2745a506f8df4e777fdf4ac11d46e3f9) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9c7b3107f26b93cea9eccd91b0821e3dbf66fcbf) @@ -2288,6 +2288,15 @@ } /// + /// Looks up a localized string similar to De parameter 'Nvak*' die het lengte-effect beschrijft in de berekening van de faalkans per vak in de semi-probabilistische toets.. + /// + public static string LengthEffect_RoundedNSection_Description { + get { + return ResourceManager.GetString("LengthEffect_RoundedNSection_Description", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Lengte-effect parameter Nvak* [-]. /// public static string LengthEffect_RoundedNSection_DisplayName { @@ -2564,6 +2573,15 @@ } /// + /// Looks up a localized string similar to Mechanismegevoelige fractie van het dijkvak.. + /// + public static string Parameter_A_Description { + get { + return ResourceManager.GetString("Parameter_A_Description", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Mechanismegevoelige fractie a [-]. /// public static string Parameter_A_DisplayName { Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r04d1c1bd2745a506f8df4e777fdf4ac11d46e3f9 -r9c7b3107f26b93cea9eccd91b0821e3dbf66fcbf --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 04d1c1bd2745a506f8df4e777fdf4ac11d46e3f9) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 9c7b3107f26b93cea9eccd91b0821e3dbf66fcbf) @@ -1553,4 +1553,10 @@ Rekeninstellingen voor geselecteerd vak + + Mechanismegevoelige fractie van het dijkvak. + + + De parameter 'Nvak*' die het lengte-effect beschrijft in de berekening van de faalkans per vak in de semi-probabilistische toets. + \ No newline at end of file Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Controls/LengthEffectSettingsControlTest.cs =================================================================== diff -u -r04d1c1bd2745a506f8df4e777fdf4ac11d46e3f9 -r9c7b3107f26b93cea9eccd91b0821e3dbf66fcbf --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Controls/LengthEffectSettingsControlTest.cs (.../LengthEffectSettingsControlTest.cs) (revision 04d1c1bd2745a506f8df4e777fdf4ac11d46e3f9) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Controls/LengthEffectSettingsControlTest.cs (.../LengthEffectSettingsControlTest.cs) (revision 9c7b3107f26b93cea9eccd91b0821e3dbf66fcbf) @@ -60,17 +60,42 @@ ShowLengthEffectSettingsControl(); // Assert - var parameterALabel = (Label) new LabelTester("parameterALabel").TheObject; + Label parameterALabel = GetParameterALabel(); Assert.AreEqual("Mechanismegevoelige fractie a [-]", parameterALabel.Text); - var lengthEffectNRoundedLabel = (Label) new LabelTester("lengthEffectNRoundedLabel").TheObject; + Label lengthEffectNRoundedLabel = GetLengthEffectNRoundedLabel(); Assert.AreEqual("Lengte-effect parameter Nvak* [-]", lengthEffectNRoundedLabel.Text); TextBox lengthEffectNRoundedTextBox = GetLengthEffectNRoundedTextBox(); Assert.IsFalse(lengthEffectNRoundedTextBox.Enabled); } [Test] + public void Constructor_ToolTipsCorrectlyInitialized() + { + // Call + LengthEffectSettingsControl view = ShowLengthEffectSettingsControl(); + + // Assert + Label parameterALabel = GetParameterALabel(); + var parameterAToolTip = TypeUtils.GetField(view, "parameterAToolTip"); + + Assert.AreEqual("Mechanismegevoelige fractie van het dijkvak.", + parameterAToolTip.GetToolTip(parameterALabel)); + Assert.AreEqual(5000, parameterAToolTip.AutoPopDelay); + Assert.AreEqual(100, parameterAToolTip.InitialDelay); + Assert.AreEqual(100, parameterAToolTip.ReshowDelay); + + Label lengthEffectNRoundedLabel = GetLengthEffectNRoundedLabel(); + var lengthEffectNRoundedToolTip = TypeUtils.GetField(view, "lengthEffectNRoundedToolTip"); + Assert.AreEqual("De parameter 'Nvak*' die het lengte-effect beschrijft in de berekening van de faalkans per vak in de semi-probabilistische toets.", + lengthEffectNRoundedToolTip.GetToolTip(lengthEffectNRoundedLabel)); + Assert.AreEqual(5000, lengthEffectNRoundedToolTip.AutoPopDelay); + Assert.AreEqual(100, lengthEffectNRoundedToolTip.InitialDelay); + Assert.AreEqual(100, lengthEffectNRoundedToolTip.ReshowDelay); + } + + [Test] public void SetScenarioConfiguration_ScenarioConfigurationNull_ThrowsArgumentNullException() { // Setup @@ -469,6 +494,16 @@ Assert.AreEqual("1,23", lengthEffectNRoundedTextBox.Text); } + private static Label GetParameterALabel() + { + return (Label) new LabelTester("parameterALabel").TheObject; + } + + private static Label GetLengthEffectNRoundedLabel() + { + return (Label) new LabelTester("lengthEffectNRoundedLabel").TheObject; + } + private static TextBoxTester GetParameterATextBoxTester() { return new TextBoxTester("parameterATextBox");