Index: Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewColorCell.cs =================================================================== diff -u -r5e6189fbdb1d72d1ac13c1c5471315778f812561 -r9b3d6b83f63ca12b07473d2668aa0f3cd85266c8 --- Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewColorCell.cs (.../DataGridViewColorCell.cs) (revision 5e6189fbdb1d72d1ac13c1c5471315778f812561) +++ Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewColorCell.cs (.../DataGridViewColorCell.cs) (revision 9b3d6b83f63ca12b07473d2668aa0f3cd85266c8) @@ -25,7 +25,7 @@ namespace Core.Common.Controls.DataGrid { /// - /// This class defines cells for a data grid view in which a color is shown based + /// This class define a cell for a data grid view in which a color is shown based /// on the value of that cell. /// public class DataGridViewColorCell : DataGridViewTextBoxCell Index: Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewColorCellTest.cs =================================================================== diff -u -r62b1624215a5099b37f89ca169a6179d2cdb91c9 -r9b3d6b83f63ca12b07473d2668aa0f3cd85266c8 --- Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewColorCellTest.cs (.../DataGridViewColorCellTest.cs) (revision 62b1624215a5099b37f89ca169a6179d2cdb91c9) +++ Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewColorCellTest.cs (.../DataGridViewColorCellTest.cs) (revision 9b3d6b83f63ca12b07473d2668aa0f3cd85266c8) @@ -71,13 +71,13 @@ view.ClearSelection(); // Then - var cellDisplayRectangle = view.GetCellDisplayRectangle(0, 0, false); + Rectangle cellDisplayRectangle = view.GetCellDisplayRectangle(0, 0, false); using (Bitmap viewDrawCanvas = new Bitmap(view.Width, view.Height)) using (Bitmap expectedImage = CreateExpectedImage(cellDisplayRectangle, expectedColor, view.GridColor)) { view.DrawToBitmap(viewDrawCanvas, new Rectangle(0, 0, view.Width, view.Height)); - using (var actualImage = viewDrawCanvas.Clone(cellDisplayRectangle, viewDrawCanvas.PixelFormat)) + using (Bitmap actualImage = viewDrawCanvas.Clone(cellDisplayRectangle, viewDrawCanvas.PixelFormat)) { TestHelper.AssertImagesAreEqual(expectedImage, actualImage); } @@ -93,7 +93,7 @@ var expectedImage = new Bitmap(width, height); var colorRectangle = new Rectangle(3, 3, width - 8, height - 8); - var expectedGraphic = Graphics.FromImage(expectedImage); + Graphics expectedGraphic = Graphics.FromImage(expectedImage); expectedGraphic.FillRectangle(new SolidBrush(Color.White), new Rectangle(0, 0, width, height)); expectedGraphic.FillRectangle(new SolidBrush(cellValueColor), colorRectangle); expectedGraphic.DrawRectangle(new Pen(Color.DarkSlateGray), colorRectangle); Index: Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r9b3d6b83f63ca12b07473d2668aa0f3cd85266c8 --- Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs (.../DataGridViewControlTest.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs (.../DataGridViewControlTest.cs) (revision 9b3d6b83f63ca12b07473d2668aa0f3cd85266c8) @@ -39,6 +39,9 @@ [TestFixture] public class DataGridViewControlTest { + const string propertyName = "PropertyName"; + const string headerText = "HeaderText"; + [Test] public void Constructor_DefaultValues() { @@ -232,9 +235,6 @@ using (var form = new Form()) using (var control = new DataGridViewControl()) { - var propertyName = "PropertyName"; - var headerText = "HeaderText"; - form.Controls.Add(control); form.Show(); @@ -265,21 +265,18 @@ public void AddTextBoxColumn_AllParametersSet_AddsColumnToDataGridViewWithAutoSizeModeAndMinimumWidthAndFormat(bool readOnly) { // Setup + const DataGridViewAutoSizeColumnMode autoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; + const int minimumWidth = 100; + const string format = "1/#,#"; + using (var form = new Form()) using (var control = new DataGridViewControl()) { - var propertyName = "PropertyName"; - var headerText = "HeaderText"; - form.Controls.Add(control); form.Show(); var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - var autoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; - var minimumWidth = 100; - var format = "1/#,#"; - // Precondition Assert.AreEqual(0, dataGridView.ColumnCount); @@ -307,9 +304,6 @@ using (var form = new Form()) using (var control = new DataGridViewControl()) { - var propertyName = "PropertyName"; - var headerText = "HeaderText"; - form.Controls.Add(control); form.Show(); @@ -338,19 +332,16 @@ public void AddCheckboxColumn_ReadOnlySet_AddsColumnToDataGridViewWithReadOnlyTrue() { // Setup + const DataGridViewAutoSizeColumnMode autoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; + using (var form = new Form()) using (var control = new DataGridViewControl()) { - var propertyName = "PropertyName"; - var headerText = "HeaderText"; - form.Controls.Add(control); form.Show(); var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - var autoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; - // Precondition Assert.AreEqual(0, dataGridView.ColumnCount); @@ -374,19 +365,16 @@ public void AddCheckboxColumn_AutoSizeModeSet_AddsColumnToDataGridViewWithAutoSizeMode() { // Setup + const DataGridViewAutoSizeColumnMode autoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; + using (var form = new Form()) using (var control = new DataGridViewControl()) { - var propertyName = "PropertyName"; - var headerText = "HeaderText"; - form.Controls.Add(control); form.Show(); var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - var autoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; - // Precondition Assert.AreEqual(0, dataGridView.ColumnCount); @@ -409,12 +397,11 @@ [Test] public void AddComboBoxColumn_AutoSizeModeSet_AddsColumnToDataGridViewWithAutoSizeMode() { + const DataGridViewAutoSizeColumnMode autoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; + using (var form = new Form()) using (var control = new DataGridViewControl()) { - var propertyName = "PropertyName"; - var headerText = "HeaderText"; - form.Controls.Add(control); form.Show(); @@ -423,8 +410,6 @@ // Precondition Assert.AreEqual(0, dataGridView.ColumnCount); - var autoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; - // Call control.AddComboBoxColumn(propertyName, headerText, null, null, null, autoSizeMode); @@ -450,9 +435,6 @@ using (var form = new Form()) using (var control = new DataGridViewControl()) { - var propertyName = "PropertyName"; - var headerText = "HeaderText"; - form.Controls.Add(control); form.Show(); @@ -486,9 +468,6 @@ using (var form = new Form()) using (var control = new DataGridViewControl()) { - var propertyName = "PropertyName"; - var headerText = "HeaderText"; - form.Controls.Add(control); form.Show(); @@ -534,9 +513,6 @@ using (var form = new Form()) using (var control = new DataGridViewControl()) { - var propertyName = "PropertyName"; - var headerText = "HeaderText"; - form.Controls.Add(control); form.Show(); @@ -565,19 +541,16 @@ public void AddColorColumn_WithAutoSizeMode_AddsColumnToDataGridViewWithAutoSizeMode() { // Setup + const DataGridViewAutoSizeColumnMode autoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; + using (var form = new Form()) using (var control = new DataGridViewControl()) { - var propertyName = "PropertyName"; - var headerText = "HeaderText"; - form.Controls.Add(control); form.Show(); var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; - var autoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; - // Precondition Assert.AreEqual(0, dataGridView.ColumnCount); Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r5b2709976f49c35903cba5915b7c5217402b8aa7 -r9b3d6b83f63ca12b07473d2668aa0f3cd85266c8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5b2709976f49c35903cba5915b7c5217402b8aa7) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9b3d6b83f63ca12b07473d2668aa0f3cd85266c8) @@ -1194,6 +1194,105 @@ } /// + /// Looks up a localized string similar to Verzadigd gewicht (standaardafwijking) [kn/m³]. + /// + public static string PipingSoilLayerTable_ColumnHeader_BelowPhreaticLevelDeviation { + get { + return ResourceManager.GetString("PipingSoilLayerTable_ColumnHeader_BelowPhreaticLevelDeviation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Verzadigd gewicht (verwachtingswaarde) [kn/m³]. + /// + public static string PipingSoilLayerTable_ColumnHeader_BelowPhreaticLevelMean { + get { + return ResourceManager.GetString("PipingSoilLayerTable_ColumnHeader_BelowPhreaticLevelMean", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Verzadigd gewicht (verschuiving) [kn/m³]. + /// + public static string PipingSoilLayerTable_ColumnHeader_BelowPhreaticLevelShift { + get { + return ResourceManager.GetString("PipingSoilLayerTable_ColumnHeader_BelowPhreaticLevelShift", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Kleur. + /// + public static string PipingSoilLayerTable_ColumnHeader_Color { + get { + return ResourceManager.GetString("PipingSoilLayerTable_ColumnHeader_Color", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to d70 (standaardafwijking) [m]. + /// + public static string PipingSoilLayerTable_ColumnHeader_DiameterD70Deviation { + get { + return ResourceManager.GetString("PipingSoilLayerTable_ColumnHeader_DiameterD70Deviation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to d70 (verwachtingswaarde) [m]. + /// + public static string PipingSoilLayerTable_ColumnHeader_DiameterD70Mean { + get { + return ResourceManager.GetString("PipingSoilLayerTable_ColumnHeader_DiameterD70Mean", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Is aquifer. + /// + public static string PipingSoilLayerTable_ColumnHeader_IsAquifer { + get { + return ResourceManager.GetString("PipingSoilLayerTable_ColumnHeader_IsAquifer", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Naam. + /// + public static string PipingSoilLayerTable_ColumnHeader_MaterialName { + get { + return ResourceManager.GetString("PipingSoilLayerTable_ColumnHeader_MaterialName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Doorlatendheid (standaardafwijking) [m/s]. + /// + public static string PipingSoilLayerTable_ColumnHeader_PermeabilityDeviation { + get { + return ResourceManager.GetString("PipingSoilLayerTable_ColumnHeader_PermeabilityDeviation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Doorlatendheid (verwachtingswaarde) [m/s]. + /// + public static string PipingSoilLayerTable_ColumnHeader_PermeabilityMean { + get { + return ResourceManager.GetString("PipingSoilLayerTable_ColumnHeader_PermeabilityMean", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Topniveau [m+NAP]. + /// + public static string PipingSoilLayerTable_ColumnHeader_Top { + get { + return ResourceManager.GetString("PipingSoilLayerTable_ColumnHeader_Top", resourceCulture); + } + } + + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap PipingSoilProfileIcon { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r5b2709976f49c35903cba5915b7c5217402b8aa7 -r9b3d6b83f63ca12b07473d2668aa0f3cd85266c8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 5b2709976f49c35903cba5915b7c5217402b8aa7) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 9b3d6b83f63ca12b07473d2668aa0f3cd85266c8) @@ -625,4 +625,37 @@ Bronlocatie + + Naam + + + Kleur + + + Topniveau [m+NAP] + + + Is aquifer + + + Doorlatendheid (verwachtingswaarde) [m/s] + + + Doorlatendheid (standaardafwijking) [m/s] + + + d70 (verwachtingswaarde) [m] + + + d70 (standaardafwijking) [m] + + + Verzadigd gewicht (verwachtingswaarde) [kn/m³] + + + Verzadigd gewicht (standaardafwijking) [kn/m³] + + + Verzadigd gewicht (verschuiving) [kn/m³] + \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingSoilLayerTable.cs =================================================================== diff -u -r9aeabc9470fb977c5006f45a6844d84c8e5a2962 -r9b3d6b83f63ca12b07473d2668aa0f3cd85266c8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingSoilLayerTable.cs (.../PipingSoilLayerTable.cs) (revision 9aeabc9470fb977c5006f45a6844d84c8e5a2962) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingSoilLayerTable.cs (.../PipingSoilLayerTable.cs) (revision 9b3d6b83f63ca12b07473d2668aa0f3cd85266c8) @@ -25,6 +25,7 @@ using System.Linq; using Core.Common.Base.Data; using Core.Common.Controls.DataGrid; +using Ringtoets.Piping.Forms.Properties; using Ringtoets.Piping.Primitives; namespace Ringtoets.Piping.Forms.Views @@ -55,17 +56,17 @@ private void AddColumns() { - AddTextBoxColumn(nameof(FormattedPipingSoilLayerRow.MaterialName), "Naam", true); - AddColorColumn(nameof(FormattedPipingSoilLayerRow.Color), "Kleur"); - AddTextBoxColumn(nameof(FormattedPipingSoilLayerRow.Top), "Topniveau [m+NAP]", true); - AddCheckBoxColumn(nameof(FormattedPipingSoilLayerRow.IsAquifer), "Is aquifer", true); - AddTextBoxColumn(nameof(FormattedPipingSoilLayerRow.PermeabilityMean), "Doorlatendheid (verwachtingswaarde) [m/s]", true); - AddTextBoxColumn(nameof(FormattedPipingSoilLayerRow.PermeabilityDeviation), "Doorlatendheid (standaardafwijking) [m/s]", true); - AddTextBoxColumn(nameof(FormattedPipingSoilLayerRow.DiameterD70Mean), "d70 (verwachtingswaarde) [m]", true); - AddTextBoxColumn(nameof(FormattedPipingSoilLayerRow.DiameterD70Deviation), "d70 (standaardafwijking) [m]", true); - AddTextBoxColumn(nameof(FormattedPipingSoilLayerRow.BelowPhreaticLevelMean), "Verzadigd gewicht (verwachtingswaarde) [kn/m³]", true); - AddTextBoxColumn(nameof(FormattedPipingSoilLayerRow.BelowPhreaticLevelDeviation), "Verzadigd gewicht (standaardafwijking) [kn/m³]", true); - AddTextBoxColumn(nameof(FormattedPipingSoilLayerRow.BelowPhreaticLevelShift), "Verzadigd gewicht (verschuiving) [kn/m³]", true); + AddTextBoxColumn(nameof(FormattedPipingSoilLayerRow.MaterialName), Resources.PipingSoilLayerTable_ColumnHeader_MaterialName, true); + AddColorColumn(nameof(FormattedPipingSoilLayerRow.Color), Resources.PipingSoilLayerTable_ColumnHeader_Color); + AddTextBoxColumn(nameof(FormattedPipingSoilLayerRow.Top), Resources.PipingSoilLayerTable_ColumnHeader_Top, true); + AddCheckBoxColumn(nameof(FormattedPipingSoilLayerRow.IsAquifer), Resources.PipingSoilLayerTable_ColumnHeader_IsAquifer, true); + AddTextBoxColumn(nameof(FormattedPipingSoilLayerRow.PermeabilityMean), Resources.PipingSoilLayerTable_ColumnHeader_PermeabilityMean, true); + AddTextBoxColumn(nameof(FormattedPipingSoilLayerRow.PermeabilityDeviation), Resources.PipingSoilLayerTable_ColumnHeader_PermeabilityDeviation, true); + AddTextBoxColumn(nameof(FormattedPipingSoilLayerRow.DiameterD70Mean), Resources.PipingSoilLayerTable_ColumnHeader_DiameterD70Mean, true); + AddTextBoxColumn(nameof(FormattedPipingSoilLayerRow.DiameterD70Deviation), Resources.PipingSoilLayerTable_ColumnHeader_DiameterD70Deviation, true); + AddTextBoxColumn(nameof(FormattedPipingSoilLayerRow.BelowPhreaticLevelMean), Resources.PipingSoilLayerTable_ColumnHeader_BelowPhreaticLevelMean, true); + AddTextBoxColumn(nameof(FormattedPipingSoilLayerRow.BelowPhreaticLevelDeviation), Resources.PipingSoilLayerTable_ColumnHeader_BelowPhreaticLevelDeviation, true); + AddTextBoxColumn(nameof(FormattedPipingSoilLayerRow.BelowPhreaticLevelShift), Resources.PipingSoilLayerTable_ColumnHeader_BelowPhreaticLevelShift, true); } private class FormattedPipingSoilLayerRow Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs =================================================================== diff -u -ra246db9c5134d2c12ee5a37b19bde5e442acce38 -r9b3d6b83f63ca12b07473d2668aa0f3cd85266c8 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs (.../PipingInputViewTest.cs) (revision a246db9c5134d2c12ee5a37b19bde5e442acce38) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs (.../PipingInputViewTest.cs) (revision 9b3d6b83f63ca12b07473d2668aa0f3cd85266c8) @@ -68,9 +68,8 @@ using (var view = new PipingInputView()) { // Assert - var chartControl = view.Controls.Find("chartControl", true).First() as IChartControl; + var chartControl = (IChartControl) view.Controls.Find("chartControl", true).First(); Assert.IsInstanceOf(chartControl); - Assert.NotNull(chartControl); Assert.AreSame(chartControl, chartControl); Assert.AreEqual(DockStyle.Fill, ((Control)chartControl).Dock); Assert.AreEqual("Afstand [m]", chartControl.BottomAxisTitle); @@ -86,7 +85,7 @@ using (var view = new PipingInputView()) { // Assert - var tableControl = view.Controls.Find("pipingSoilLayerTable", true).First() as PipingSoilLayerTable; + var tableControl = (PipingSoilLayerTable) view.Controls.Find("pipingSoilLayerTable", true).First(); Assert.NotNull(tableControl); Assert.AreEqual(DockStyle.Bottom, tableControl.Dock); CollectionAssert.IsEmpty(tableControl.Rows);