Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/CalculationsView.Designer.cs =================================================================== diff -u -r6e75ef92f00c18787f73b6d24f386ba9e0bbb2cb -r690aa5e48b5b6ffdc514439c74265e612100e49c --- Riskeer/Common/src/Riskeer.Common.Forms/Views/CalculationsView.Designer.cs (.../CalculationsView.Designer.cs) (revision 6e75ef92f00c18787f73b6d24f386ba9e0bbb2cb) +++ Riskeer/Common/src/Riskeer.Common.Forms/Views/CalculationsView.Designer.cs (.../CalculationsView.Designer.cs) (revision 690aa5e48b5b6ffdc514439c74265e612100e49c) @@ -1,6 +1,3 @@ -using System.Windows.Forms; -using Core.Common.Controls.DataGrid; - namespace Riskeer.Common.Forms.Views { partial class CalculationsView @@ -22,10 +19,10 @@ this.listBox = new System.Windows.Forms.ListBox(); this.sectionsLabel = new System.Windows.Forms.Label(); this.dataGridTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); - this.DataGridViewControl = new Core.Common.Controls.DataGrid.DataGridViewControl(); + this.dataGridViewControl = new Core.Common.Controls.DataGrid.DataGridViewControl(); this.calculationsLabel = new System.Windows.Forms.Label(); this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); - this.GenerateButton = new System.Windows.Forms.Button(); + this.generateButton = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); this.splitContainer.Panel1.SuspendLayout(); this.splitContainer.Panel2.SuspendLayout(); @@ -49,7 +46,7 @@ // this.splitContainer.Panel2.Controls.Add(this.dataGridTableLayoutPanel); this.splitContainer.Panel2.Controls.Add(this.calculationsLabel); - this.splitContainer.Size = new System.Drawing.Size(1162, 473); + this.splitContainer.Size = new System.Drawing.Size(1162, 470); this.splitContainer.SplitterDistance = 331; this.splitContainer.TabIndex = 0; // @@ -59,7 +56,7 @@ this.listBox.FormattingEnabled = true; this.listBox.Location = new System.Drawing.Point(0, 13); this.listBox.Name = "listBox"; - this.listBox.Size = new System.Drawing.Size(331, 460); + this.listBox.Size = new System.Drawing.Size(331, 457); this.listBox.TabIndex = 1; // // sectionsLabel @@ -76,24 +73,24 @@ // this.dataGridTableLayoutPanel.ColumnCount = 1; this.dataGridTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.dataGridTableLayoutPanel.Controls.Add(this.DataGridViewControl, 0, 0); + this.dataGridTableLayoutPanel.Controls.Add(this.dataGridViewControl, 0, 0); this.dataGridTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridTableLayoutPanel.Location = new System.Drawing.Point(0, 13); this.dataGridTableLayoutPanel.Name = "dataGridTableLayoutPanel"; this.dataGridTableLayoutPanel.RowCount = 1; this.dataGridTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.dataGridTableLayoutPanel.Size = new System.Drawing.Size(827, 460); + this.dataGridTableLayoutPanel.Size = new System.Drawing.Size(827, 457); this.dataGridTableLayoutPanel.TabIndex = 1; // - // DataGridViewControl + // dataGridViewControl // - this.DataGridViewControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.DataGridViewControl.Location = new System.Drawing.Point(3, 3); - this.DataGridViewControl.MultiSelect = true; - this.DataGridViewControl.Name = "dataGridViewControl"; - this.DataGridViewControl.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.RowHeaderSelect; - this.DataGridViewControl.Size = new System.Drawing.Size(821, 434); - this.DataGridViewControl.TabIndex = 0; + this.dataGridViewControl.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewControl.Location = new System.Drawing.Point(3, 3); + this.dataGridViewControl.MultiSelect = true; + this.dataGridViewControl.Name = "dataGridViewControl"; + this.dataGridViewControl.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.RowHeaderSelect; + this.dataGridViewControl.Size = new System.Drawing.Size(821, 451); + this.dataGridViewControl.TabIndex = 0; // // calculationsLabel // @@ -110,7 +107,7 @@ this.tableLayoutPanel.ColumnCount = 1; this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel.Controls.Add(this.splitContainer, 0, 0); - this.tableLayoutPanel.Controls.Add(this.GenerateButton, 0, 1); + this.tableLayoutPanel.Controls.Add(this.generateButton, 0, 1); this.tableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel.Name = "tableLayoutPanel"; @@ -122,13 +119,14 @@ // // generateButton // - this.GenerateButton.Location = new System.Drawing.Point(3, 482); - this.GenerateButton.Name = "generateButton"; - this.GenerateButton.Size = new System.Drawing.Size(127, 23); - this.GenerateButton.TabIndex = 1; - this.GenerateButton.Text = global::Riskeer.Common.Forms.Properties.Resources.CalculationGroup_Generate_calculations; - this.GenerateButton.UseVisualStyleBackColor = true; - this.GenerateButton.Click += new System.EventHandler(this.generateButton_Click); + this.generateButton.Location = new System.Drawing.Point(3, 479); + this.generateButton.Name = "generateButton"; + this.generateButton.Padding = new System.Windows.Forms.Padding(2); + this.generateButton.Size = new System.Drawing.Size(147, 26); + this.generateButton.TabIndex = 1; + this.generateButton.Text = global::Riskeer.Common.Forms.Properties.Resources.CalculationGroup_Generate_calculations; + this.generateButton.UseVisualStyleBackColor = true; + this.generateButton.Click += new System.EventHandler(this.generateButton_Click); // // CalculationsView // @@ -154,8 +152,18 @@ private System.Windows.Forms.Label sectionsLabel; private System.Windows.Forms.Label calculationsLabel; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel; - protected Button GenerateButton { get; private set; } private System.Windows.Forms.TableLayoutPanel dataGridTableLayoutPanel; - public DataGridViewControl DataGridViewControl { get; private set; } + private Core.Common.Controls.DataGrid.DataGridViewControl dataGridViewControl; + private System.Windows.Forms.Button generateButton; + + protected System.Windows.Forms.Button GenerateButton + { + get => this.generateButton; + } + + protected Core.Common.Controls.DataGrid.DataGridViewControl DataGridViewControl + { + get => this.dataGridViewControl; + } } } Fisheye: Tag bc757e489e4adb86143992e1a1041397b957a411 refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/Views/CalculationsView.resx'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/CalculationsViewTest.cs =================================================================== diff -u -r6e75ef92f00c18787f73b6d24f386ba9e0bbb2cb -r690aa5e48b5b6ffdc514439c74265e612100e49c --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/CalculationsViewTest.cs (.../CalculationsViewTest.cs) (revision 6e75ef92f00c18787f73b6d24f386ba9e0bbb2cb) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/CalculationsViewTest.cs (.../CalculationsViewTest.cs) (revision 690aa5e48b5b6ffdc514439c74265e612100e49c) @@ -105,12 +105,12 @@ // Call TestCalculationsView view = ShowCalculationsView(new CalculationGroup(), new TestFailureMechanism(), new AssessmentSectionStub()); - var button = (Button) new ControlTester("generateButton").TheObject; - // Assert Assert.IsInstanceOf(view); Assert.IsInstanceOf(view); Assert.IsInstanceOf(view); + + var button = (Button)new ControlTester("generateButton").TheObject; Assert.AreEqual("Genereer &berekeningen...", button.Text); } Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs =================================================================== diff -u -r72b35179da7cece144a0319a96122cf3eba0192c -r690aa5e48b5b6ffdc514439c74265e612100e49c --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 72b35179da7cece144a0319a96122cf3eba0192c) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 690aa5e48b5b6ffdc514439c74265e612100e49c) @@ -63,11 +63,13 @@ public void Constructor_ExpectedValues() { // Call - using (var view = new PipingCalculationsView(new CalculationGroup(), new PipingFailureMechanism(), new AssessmentSectionStub())) - { - // Assert - Assert.IsInstanceOf>(view); - } + PipingCalculationsView view = ShowPipingCalculationsView(new CalculationGroup(), new PipingFailureMechanism(), new AssessmentSectionStub()); + + // Assert + Assert.IsInstanceOf>(view); + + var button = (Button) new ControlTester("generateButton").TheObject; + Assert.AreEqual("Genereer &scenario's...", button.Text); } [Test]