Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r2fb4c229fdc8a4990bbd9ebbffc74e99c1213073 -r1f1d9b461f56935865eab0e4bb19377f86f499e6
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2fb4c229fdc8a4990bbd9ebbffc74e99c1213073)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1f1d9b461f56935865eab0e4bb19377f86f499e6)
@@ -2121,6 +2121,15 @@
}
///
+ /// Looks up a localized string similar to HRD bestand.
+ ///
+ public static string HydraulicBoundaryDatabase_DisplayName {
+ get {
+ return ResourceManager.GetString("HydraulicBoundaryDatabase_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Coördinaten van de hydraulische belastingenlocatie..
///
public static string HydraulicBoundaryDatabase_Location_Coordinates_Description {
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r2fb4c229fdc8a4990bbd9ebbffc74e99c1213073 -r1f1d9b461f56935865eab0e4bb19377f86f499e6
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 2fb4c229fdc8a4990bbd9ebbffc74e99c1213073)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 1f1d9b461f56935865eab0e4bb19377f86f499e6)
@@ -1604,4 +1604,7 @@
Toon HRD bestand
+
+ HRD bestand
+
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.Designer.cs
===================================================================
diff -u -rcd66114d9af655f71f133ceb542da2bf2c0693e4 -r1f1d9b461f56935865eab0e4bb19377f86f499e6
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.Designer.cs (.../HydraulicBoundaryCalculationsView.Designer.cs) (revision cd66114d9af655f71f133ceb542da2bf2c0693e4)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.Designer.cs (.../HydraulicBoundaryCalculationsView.Designer.cs) (revision 1f1d9b461f56935865eab0e4bb19377f86f499e6)
@@ -46,7 +46,7 @@
this.ButtonGroupBox = new System.Windows.Forms.GroupBox();
this.CalculateForSelectedButtonErrorProvider = new System.Windows.Forms.ErrorProvider(this.components);
this.splitContainer = new System.Windows.Forms.SplitContainer();
- this.HideHydraulicBoundaryDatabaseColumnCheckBox = new System.Windows.Forms.CheckBox();
+ this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox = new System.Windows.Forms.CheckBox();
this.illustrationPointsControl = new Riskeer.Common.Forms.Views.IllustrationPointsControl();
this.ButtonGroupBox.SuspendLayout();
((System.ComponentModel.ISupportInitialize) (this.CalculateForSelectedButtonErrorProvider)).BeginInit();
@@ -64,7 +64,7 @@
this.dataGridViewControl.Name = "dataGridViewControl";
this.dataGridViewControl.Padding = new System.Windows.Forms.Padding(0, 0, 0, 5);
this.dataGridViewControl.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.RowHeaderSelect;
- this.dataGridViewControl.Size = new System.Drawing.Size(536, 347);
+ this.dataGridViewControl.Size = new System.Drawing.Size(536, 350);
this.dataGridViewControl.TabIndex = 0;
//
// CalculateForSelectedButton
@@ -102,7 +102,7 @@
this.ButtonGroupBox.Controls.Add(this.DeselectAllButton);
this.ButtonGroupBox.Controls.Add(this.SelectAllButton);
this.ButtonGroupBox.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.ButtonGroupBox.Location = new System.Drawing.Point(0, 364);
+ this.ButtonGroupBox.Location = new System.Drawing.Point(0, 350);
this.ButtonGroupBox.MinimumSize = new System.Drawing.Size(445, 61);
this.ButtonGroupBox.Name = "ButtonGroupBox";
this.ButtonGroupBox.Size = new System.Drawing.Size(536, 61);
@@ -130,7 +130,7 @@
this.splitContainer.Panel1.AutoScroll = true;
this.splitContainer.Panel1.AutoScrollMinSize = new System.Drawing.Size(535, 0);
this.splitContainer.Panel1.Controls.Add(this.dataGridViewControl);
- this.splitContainer.Panel1.Controls.Add(this.HideHydraulicBoundaryDatabaseColumnCheckBox);
+ this.splitContainer.Panel1.Controls.Add(this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox);
this.splitContainer.Panel1.Controls.Add(this.ButtonGroupBox);
//
// splitContainer.Panel2
@@ -140,15 +140,16 @@
this.splitContainer.SplitterDistance = 536;
this.splitContainer.TabIndex = 1;
//
- // HideHydraulicBoundaryDatabaseColumnCheckBox
+ // showHydraulicBoundaryDatabaseColumnCheckBox
//
- this.HideHydraulicBoundaryDatabaseColumnCheckBox.AutoSize = true;
- this.HideHydraulicBoundaryDatabaseColumnCheckBox.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.HideHydraulicBoundaryDatabaseColumnCheckBox.Location = new System.Drawing.Point(0, 347);
- this.HideHydraulicBoundaryDatabaseColumnCheckBox.Name = "HideHydraulicBoundaryDatabaseColumnCheckBox";
- this.HideHydraulicBoundaryDatabaseColumnCheckBox.Size = new System.Drawing.Size(536, 17);
- this.HideHydraulicBoundaryDatabaseColumnCheckBox.TabIndex = 3;
- this.HideHydraulicBoundaryDatabaseColumnCheckBox.UseVisualStyleBackColor = true;
+ this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.AutoSize = true;
+ this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.Location = new System.Drawing.Point(0, 411);
+ this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.Name = "showHydraulicBoundaryDatabaseFileNameColumnCheckBox";
+ this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.Size = new System.Drawing.Size(536, 14);
+ this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.TabIndex = 3;
+ this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.UseVisualStyleBackColor = true;
+ this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.CheckedChanged += new System.EventHandler(this.ShowHydraulicBoundaryDatabaseFileNameColumnCheckBox_CheckedChanged);
//
// illustrationPointsControl
//
@@ -183,7 +184,7 @@
private Core.Common.Controls.Forms.EnhancedButton DeselectAllButton;
private Core.Common.Controls.Forms.EnhancedButton SelectAllButton;
protected System.Windows.Forms.GroupBox ButtonGroupBox;
- private System.Windows.Forms.CheckBox HideHydraulicBoundaryDatabaseColumnCheckBox;
+ private System.Windows.Forms.CheckBox showHydraulicBoundaryDatabaseFileNameColumnCheckBox;
private System.Windows.Forms.ErrorProvider CalculateForSelectedButtonErrorProvider;
private System.Windows.Forms.SplitContainer splitContainer;
private IllustrationPointsControl illustrationPointsControl;
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.cs
===================================================================
diff -u -r9b5a87777197a0360236b06f01236a56067b8839 -r1f1d9b461f56935865eab0e4bb19377f86f499e6
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.cs (.../HydraulicBoundaryCalculationsView.cs) (revision 9b5a87777197a0360236b06f01236a56067b8839)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.cs (.../HydraulicBoundaryCalculationsView.cs) (revision 1f1d9b461f56935865eab0e4bb19377f86f499e6)
@@ -42,6 +42,7 @@
public abstract partial class HydraulicBoundaryCalculationsView : UserControl, ISelectionProvider, IView
{
private const int calculateColumnIndex = 0;
+ private const int hydraulicBoundaryDatabaseFileNameColumnIndex = 4;
private readonly Observer calculationsObserver;
private readonly RecursiveObserver, HydraulicBoundaryLocationCalculation> calculationObserver;
@@ -105,7 +106,9 @@
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
+
InitializeDataGridView();
+ UpdateDataGridViewColumnVisibility();
}
///
@@ -127,8 +130,8 @@
Resources.HydraulicBoundaryDatabase_Location_Name_DisplayName);
dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.Id),
Resources.HydraulicBoundaryDatabase_Location_Id_DisplayName);
- dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.Location),
- Resources.HydraulicBoundaryDatabase_Location_Coordinates_DisplayName);
+ dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.HydraulicBoundaryDatabaseFileName),
+ Resources.HydraulicBoundaryDatabase_DisplayName);
}
///
@@ -162,6 +165,12 @@
ProvideCalculationSelection();
}
+ private void UpdateDataGridViewColumnVisibility()
+ {
+ dataGridViewControl.GetColumnFromIndex(hydraulicBoundaryDatabaseFileNameColumnIndex).Visible =
+ showHydraulicBoundaryDatabaseFileNameColumnCheckBox.Checked;
+ }
+
private IEnumerable> GetCalculatableRows()
{
return dataGridViewControl.Rows
@@ -272,7 +281,7 @@
DeselectAllButton.Text = Resources.CalculatableView_DeselectAllButton_Text;
SelectAllButton.Text = Resources.CalculatableView_SelectAllButton_Text;
ButtonGroupBox.Text = Resources.CalculatableView_ButtonGroupBox_Text;
- HideHydraulicBoundaryDatabaseColumnCheckBox.Text = Resources.LocationCalculationsView_HideHydraulicBoundaryDatabaseColumnCheckBox_Text;
+ showHydraulicBoundaryDatabaseFileNameColumnCheckBox.Text = Resources.LocationCalculationsView_HideHydraulicBoundaryDatabaseColumnCheckBox_Text;
}
private void InitializeEventHandlers()
@@ -387,6 +396,11 @@
CalculateForSelectedRows();
}
+ private void ShowHydraulicBoundaryDatabaseFileNameColumnCheckBox_CheckedChanged(object sender, EventArgs e)
+ {
+ UpdateDataGridViewColumnVisibility();
+ }
+
#endregion
}
}
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/HydraulicBoundaryCalculationsViewTest.cs
===================================================================
diff -u -rcd66114d9af655f71f133ceb542da2bf2c0693e4 -r1f1d9b461f56935865eab0e4bb19377f86f499e6
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/HydraulicBoundaryCalculationsViewTest.cs (.../HydraulicBoundaryCalculationsViewTest.cs) (revision cd66114d9af655f71f133ceb542da2bf2c0693e4)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/HydraulicBoundaryCalculationsViewTest.cs (.../HydraulicBoundaryCalculationsViewTest.cs) (revision 1f1d9b461f56935865eab0e4bb19377f86f499e6)
@@ -25,7 +25,6 @@
using System.Linq;
using System.Windows.Forms;
using Core.Common.Base;
-using Core.Common.Base.Geometry;
using Core.Common.Controls.DataGrid;
using Core.Common.Controls.Views;
using Core.Common.Util.Reflection;
@@ -50,7 +49,7 @@
private const int includeIllustrationPointsColumnIndex = 1;
private const int locationNameColumnIndex = 2;
private const int locationIdColumnIndex = 3;
- private const int locationColumnIndex = 4;
+ private const int hydraulicBoundaryDatabaseFileName = 4;
private Form testForm;
@@ -132,23 +131,25 @@
var calculateColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[calculateColumnIndex];
Assert.AreEqual("Berekenen", calculateColumn.HeaderText);
+ Assert.IsTrue(calculateColumn.Visible);
var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[includeIllustrationPointsColumnIndex];
Assert.AreEqual("Illustratiepunten inlezen", includeIllustrationPointsColumn.HeaderText);
+ Assert.IsTrue(includeIllustrationPointsColumn.Visible);
var locationNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationNameColumnIndex];
Assert.AreEqual("Naam", locationNameColumn.HeaderText);
+ Assert.IsTrue(locationNameColumn.Visible);
var locationIdColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationIdColumnIndex];
Assert.AreEqual("ID", locationIdColumn.HeaderText);
+ Assert.IsTrue(locationIdColumn.Visible);
- var locationColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationColumnIndex];
- Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText);
-
- var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First();
- Assert.IsFalse(button.Enabled);
+ var hydraulicBoundaryDatabaseFileNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[hydraulicBoundaryDatabaseFileName];
+ Assert.AreEqual("HRD bestand", hydraulicBoundaryDatabaseFileNameColumn.HeaderText);
+ Assert.IsFalse(hydraulicBoundaryDatabaseFileNameColumn.Visible);
}
-
+
[Test]
public void Constructor_CalculateAllButtonCorrectlyInitialized()
{
@@ -167,12 +168,12 @@
TestHydraulicBoundaryCalculationsView view = ShowTestHydraulicBoundaryCalculationsView();
// Assert
- var checkBox = (CheckBox) view.Controls.Find("HideHydraulicBoundaryDatabaseColumnCheckBox", true)[0];
+ var checkBox = (CheckBox) view.Controls.Find("showHydraulicBoundaryDatabaseColumnCheckBox", true)[0];
Assert.AreEqual("Toon HRD bestand", checkBox.Text);
Assert.IsFalse(checkBox.Checked);
}
-
- [Test]
+
+ [Test]
public void Constructor_WithCalculations_DataGridViewCorrectlyInitialized()
{
// Setup & Call
@@ -189,23 +190,23 @@
Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
Assert.AreEqual("1", cells[locationNameColumnIndex].FormattedValue);
Assert.AreEqual("1", cells[locationIdColumnIndex].FormattedValue);
- Assert.AreEqual(new Point2D(1, 1).ToString(), cells[locationColumnIndex].FormattedValue);
+ Assert.AreEqual(string.Empty, cells[hydraulicBoundaryDatabaseFileName].FormattedValue);
cells = rows[1].Cells;
Assert.AreEqual(5, cells.Count);
Assert.AreEqual(false, cells[calculateColumnIndex].FormattedValue);
Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
Assert.AreEqual("2", cells[locationNameColumnIndex].FormattedValue);
Assert.AreEqual("2", cells[locationIdColumnIndex].FormattedValue);
- Assert.AreEqual(new Point2D(2, 2).ToString(), cells[locationColumnIndex].FormattedValue);
+ Assert.AreEqual(string.Empty, cells[hydraulicBoundaryDatabaseFileName].FormattedValue);
cells = rows[2].Cells;
Assert.AreEqual(5, cells.Count);
Assert.AreEqual(false, cells[calculateColumnIndex].FormattedValue);
Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
Assert.AreEqual("3", cells[locationNameColumnIndex].FormattedValue);
Assert.AreEqual("3", cells[locationIdColumnIndex].FormattedValue);
- Assert.AreEqual(new Point2D(3, 3).ToString(), cells[locationColumnIndex].FormattedValue);
+ Assert.AreEqual(string.Empty, cells[hydraulicBoundaryDatabaseFileName].FormattedValue);
}
[Test]
@@ -401,6 +402,41 @@
Assert.DoesNotThrow(test);
}
+ [Test]
+ public void GivenView_WhenCheckingShowHydraulicBoundaryDatabaseFileNameColumnCheckBox_ThenColumnVisible()
+ {
+ // Given
+ TestHydraulicBoundaryCalculationsView view = ShowTestHydraulicBoundaryCalculationsView();
+
+ DataGridView dataGridView = ControlTestHelper.GetDataGridView(testForm, "dataGridView");
+
+ // Precondition
+ var hydraulicBoundaryDatabaseFileNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[hydraulicBoundaryDatabaseFileName];
+ Assert.IsFalse(hydraulicBoundaryDatabaseFileNameColumn.Visible);
+
+ // When
+ var checkBox = (CheckBox) view.Controls.Find("showHydraulicBoundaryDatabaseColumnCheckBox", true)[0];
+ checkBox.Checked = true;
+
+ // Then
+ Assert.IsTrue(hydraulicBoundaryDatabaseFileNameColumn.Visible);
+ }
+
+ private static IEnumerable CreateControlItems(
+ GeneralResult generalResult)
+ {
+ return generalResult.TopLevelIllustrationPoints
+ .Select(topLevelIllustrationPoint =>
+ {
+ SubMechanismIllustrationPoint illustrationPoint = topLevelIllustrationPoint.SubMechanismIllustrationPoint;
+ return new IllustrationPointControlItem(topLevelIllustrationPoint,
+ topLevelIllustrationPoint.WindDirection.Name,
+ topLevelIllustrationPoint.ClosingSituation,
+ illustrationPoint.Stochasts,
+ illustrationPoint.Beta);
+ });
+ }
+
private TestHydraulicBoundaryCalculationsView ShowTestHydraulicBoundaryCalculationsView()
{
var view = new TestHydraulicBoundaryCalculationsView(new ObservableList(),
@@ -464,20 +500,5 @@
return null;
}
}
-
- private static IEnumerable CreateControlItems(
- GeneralResult generalResult)
- {
- return generalResult.TopLevelIllustrationPoints
- .Select(topLevelIllustrationPoint =>
- {
- SubMechanismIllustrationPoint illustrationPoint = topLevelIllustrationPoint.SubMechanismIllustrationPoint;
- return new IllustrationPointControlItem(topLevelIllustrationPoint,
- topLevelIllustrationPoint.WindDirection.Name,
- topLevelIllustrationPoint.ClosingSituation,
- illustrationPoint.Stochasts,
- illustrationPoint.Beta);
- });
- }
}
}
\ No newline at end of file