Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r7ee43e0aedeeebf6277aa2e856edd5da84f221e4 -rb1b39b8f7b5ae5d94c5b483a04af5b91ec862d26 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7ee43e0aedeeebf6277aa2e856edd5da84f221e4) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b1b39b8f7b5ae5d94c5b483a04af5b91ec862d26) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -995,7 +995,7 @@ } /// - /// Looks up a localized string similar to Kans op Heave [-]. + /// Looks up a localized string similar to Kans op Heave [1/jaar]. /// public static string PipingScenarioView_PipingScenarioRow_FailureProbabiltyHeave { get { @@ -1013,7 +1013,7 @@ } /// - /// Looks up a localized string similar to Kans op terugschrijdende erosie [-]. + /// Looks up a localized string similar to Kans op terugschrijdende erosie [1/jaar]. /// public static string PipingScenarioView_PipingScenarioRow_FailureProbabiltySellmeijer { get { @@ -1022,7 +1022,7 @@ } /// - /// Looks up a localized string similar to Kans op opbarsten [-]. + /// Looks up a localized string similar to Kans op opbarsten [1/jaar]. /// public static string PipingScenarioView_PipingScenarioRow_FailureProbabiltyUplift { get { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r7ee43e0aedeeebf6277aa2e856edd5da84f221e4 -rb1b39b8f7b5ae5d94c5b483a04af5b91ec862d26 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 7ee43e0aedeeebf6277aa2e856edd5da84f221e4) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision b1b39b8f7b5ae5d94c5b483a04af5b91ec862d26) @@ -662,15 +662,15 @@ De berekening - Kans op Heave [-] + Kans op Heave [1/jaar] Faalkans [1/jaar] - Kans op terugschrijdende erosie [-] + Kans op terugschrijdende erosie [1/jaar] - Kans op opbarsten [-] + Kans op opbarsten [1/jaar] \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.Designer.cs =================================================================== diff -u -rc9913b27dd45be4c6fe977dd2bf55e03820afcdc -rb1b39b8f7b5ae5d94c5b483a04af5b91ec862d26 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.Designer.cs (.../PipingCalculationsView.Designer.cs) (revision c9913b27dd45be4c6fe977dd2bf55e03820afcdc) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.Designer.cs (.../PipingCalculationsView.Designer.cs) (revision b1b39b8f7b5ae5d94c5b483a04af5b91ec862d26) @@ -24,7 +24,6 @@ this.tableLayoutPanelDataGrid = new System.Windows.Forms.TableLayoutPanel(); this.labelCalculations = new System.Windows.Forms.Label(); this.dataGridViewControl = new Core.Common.Controls.DataGrid.DataGridViewControl(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.buttonGenerateScenarios = new System.Windows.Forms.Button(); this.tableLayoutPanelUserControl.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); @@ -33,14 +32,13 @@ this.splitContainer.SuspendLayout(); this.tableLayoutPanelListBox.SuspendLayout(); this.tableLayoutPanelDataGrid.SuspendLayout(); - this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // tableLayoutPanelUserControl // resources.ApplyResources(this.tableLayoutPanelUserControl, "tableLayoutPanelUserControl"); this.tableLayoutPanelUserControl.Controls.Add(this.splitContainer, 0, 0); - this.tableLayoutPanelUserControl.Controls.Add(this.tableLayoutPanel1, 0, 1); + this.tableLayoutPanelUserControl.Controls.Add(this.buttonGenerateScenarios, 0, 1); this.tableLayoutPanelUserControl.Name = "tableLayoutPanelUserControl"; // // splitContainer @@ -90,14 +88,10 @@ // dataGridViewControl // resources.ApplyResources(this.dataGridViewControl, "dataGridViewControl"); + this.dataGridViewControl.MultiSelect = true; this.dataGridViewControl.Name = "dataGridViewControl"; + this.dataGridViewControl.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.RowHeaderSelect; // - // tableLayoutPanel1 - // - resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); - this.tableLayoutPanel1.Controls.Add(this.buttonGenerateScenarios, 0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - // // buttonGenerateScenarios // resources.ApplyResources(this.buttonGenerateScenarios, "buttonGenerateScenarios"); @@ -112,6 +106,7 @@ this.Controls.Add(this.tableLayoutPanelUserControl); this.Name = "PipingCalculationsView"; this.tableLayoutPanelUserControl.ResumeLayout(false); + this.tableLayoutPanelUserControl.PerformLayout(); this.splitContainer.Panel1.ResumeLayout(false); this.splitContainer.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit(); @@ -120,7 +115,6 @@ this.tableLayoutPanelListBox.PerformLayout(); this.tableLayoutPanelDataGrid.ResumeLayout(false); this.tableLayoutPanelDataGrid.PerformLayout(); - this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -134,8 +128,7 @@ private System.Windows.Forms.Label labelFailureMechanismSections; private System.Windows.Forms.TableLayoutPanel tableLayoutPanelDataGrid; private System.Windows.Forms.Label labelCalculations; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private System.Windows.Forms.Button buttonGenerateScenarios; private Core.Common.Controls.DataGrid.DataGridViewControl dataGridViewControl; + private System.Windows.Forms.Button buttonGenerateScenarios; } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.resx =================================================================== diff -u -rc9913b27dd45be4c6fe977dd2bf55e03820afcdc -rb1b39b8f7b5ae5d94c5b483a04af5b91ec862d26 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.resx (.../PipingCalculationsView.resx) (revision c9913b27dd45be4c6fe977dd2bf55e03820afcdc) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.resx (.../PipingCalculationsView.resx) (revision b1b39b8f7b5ae5d94c5b483a04af5b91ec862d26) @@ -132,8 +132,8 @@ 1 - - Fill + + Top, Bottom, Left, Right False @@ -145,7 +145,7 @@ 3, 0, 3, 0 - 203, 502 + 153, 195 1 @@ -199,7 +199,7 @@ 2 - 209, 522 + 159, 215 0 @@ -232,7 +232,7 @@ 0 - 200 + 100 1 @@ -264,14 +264,14 @@ 0 - - Fill + + Top, Bottom, Left, Right 3, 23 - 537, 496 + 325, 189 1 @@ -280,7 +280,7 @@ dataGridViewControl - Core.Common.Controls.DataGrid.DataGridViewControl, Core.Common.Controls, Version=0.5.0.3894, Culture=neutral, PublicKeyToken=null + Core.Common.Controls.DataGrid.DataGridViewControl, Core.Common.Controls, Version=16.1.1.4340, Culture=neutral, PublicKeyToken=null tableLayoutPanelDataGrid @@ -298,7 +298,7 @@ 2 - 543, 522 + 331, 215 1 @@ -331,13 +331,13 @@ 1 - 300 + 0 - 756, 522 + 494, 215 - 209 + 159 0 @@ -354,20 +354,23 @@ 0 - - 1 + + True Left False + + NoControl + - 3, 3 + 3, 224 - 137, 20 + 137, 23 0 @@ -382,55 +385,22 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tableLayoutPanel1 + tableLayoutPanelUserControl - 0 - - - Fill - - - 3, 531 - - 1 - - 756, 26 - - - 1 - - - tableLayoutPanel1 - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanelUserControl - - - 1 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="buttonGenerateScenarios" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100,Absolute,20" /><Rows Styles="Percent,100" /></TableLayoutSettings> - Fill 0, 0 - - 500, 300 - 2 - 762, 560 + 500, 250 0 @@ -448,7 +418,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="splitContainer" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanel1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="Percent,100,Absolute,32" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="splitContainer" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="buttonGenerateScenarios" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="Percent,100,AutoSize,0,Absolute,20" /></TableLayoutSettings> True @@ -460,10 +430,10 @@ True - 600, 400 + 500, 250 - 762, 560 + 500, 250 PipingCalculationsView Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenariosView.Designer.cs =================================================================== diff -u -r4af0bffb50faa15fa8accb67e35b80af45dc1213 -rb1b39b8f7b5ae5d94c5b483a04af5b91ec862d26 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenariosView.Designer.cs (.../PipingScenariosView.Designer.cs) (revision 4af0bffb50faa15fa8accb67e35b80af45dc1213) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenariosView.Designer.cs (.../PipingScenariosView.Designer.cs) (revision b1b39b8f7b5ae5d94c5b483a04af5b91ec862d26) @@ -16,15 +16,13 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PipingScenariosView)); - this.tableLayoutPanelUserControl = new System.Windows.Forms.TableLayoutPanel(); this.splitContainer = new System.Windows.Forms.SplitContainer(); this.tableLayoutPanelListBox = new System.Windows.Forms.TableLayoutPanel(); this.listBox = new System.Windows.Forms.ListBox(); this.labelFailureMechanismSections = new System.Windows.Forms.Label(); this.tableLayoutPanelDataGrid = new System.Windows.Forms.TableLayoutPanel(); this.labelCalculations = new System.Windows.Forms.Label(); this.dataGridViewControl = new Core.Common.Controls.DataGrid.DataGridViewControl(); - this.tableLayoutPanelUserControl.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); this.splitContainer.Panel1.SuspendLayout(); this.splitContainer.Panel2.SuspendLayout(); @@ -33,12 +31,6 @@ this.tableLayoutPanelDataGrid.SuspendLayout(); this.SuspendLayout(); // - // tableLayoutPanelUserControl - // - resources.ApplyResources(this.tableLayoutPanelUserControl, "tableLayoutPanelUserControl"); - this.tableLayoutPanelUserControl.Controls.Add(this.splitContainer, 0, 0); - this.tableLayoutPanelUserControl.Name = "tableLayoutPanelUserControl"; - // // splitContainer // resources.ApplyResources(this.splitContainer, "splitContainer"); @@ -86,15 +78,16 @@ // dataGridViewControl // resources.ApplyResources(this.dataGridViewControl, "dataGridViewControl"); + this.dataGridViewControl.MultiSelect = true; this.dataGridViewControl.Name = "dataGridViewControl"; + this.dataGridViewControl.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.RowHeaderSelect; // - // PipingScenarioView + // PipingScenariosView // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.tableLayoutPanelUserControl); + this.Controls.Add(this.splitContainer); this.Name = "PipingScenariosView"; - this.tableLayoutPanelUserControl.ResumeLayout(false); this.splitContainer.Panel1.ResumeLayout(false); this.splitContainer.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit(); @@ -109,7 +102,6 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanelUserControl; private System.Windows.Forms.SplitContainer splitContainer; private System.Windows.Forms.TableLayoutPanel tableLayoutPanelListBox; private System.Windows.Forms.ListBox listBox; Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenariosView.resx =================================================================== diff -u -r4af0bffb50faa15fa8accb67e35b80af45dc1213 -rb1b39b8f7b5ae5d94c5b483a04af5b91ec862d26 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenariosView.resx (.../PipingScenariosView.resx) (revision 4af0bffb50faa15fa8accb67e35b80af45dc1213) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenariosView.resx (.../PipingScenariosView.resx) (revision b1b39b8f7b5ae5d94c5b483a04af5b91ec862d26) @@ -117,23 +117,20 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1 - Fill - 3, 3 + 0, 0 + 1 - - Fill + + Top, Bottom, Left, Right False @@ -145,7 +142,7 @@ 3, 0, 3, 0 - 203, 502 + 141, 230 1 @@ -165,6 +162,9 @@ True + + NoControl + 3, 0 @@ -199,7 +199,7 @@ 2 - 209, 522 + 147, 250 0 @@ -232,14 +232,17 @@ 0 - 200 + 100 1 True + + NoControl + 3, 0 @@ -264,14 +267,14 @@ 0 - - Fill + + Top, Bottom, Left, Right 3, 23 - 537, 496 + 343, 224 1 @@ -280,7 +283,7 @@ dataGridViewControl - Core.Common.Controls.DataGrid.DataGridViewControl, Core.Common.Controls, Version=0.5.0.3894, Culture=neutral, PublicKeyToken=null + Core.Common.Controls.DataGrid.DataGridViewControl, Core.Common.Controls, Version=16.1.1.4340, Culture=neutral, PublicKeyToken=null tableLayoutPanelDataGrid @@ -298,7 +301,7 @@ 2 - 543, 522 + 349, 250 1 @@ -331,13 +334,13 @@ 1 - 300 + 0 - 756, 522 + 500, 250 - 209 + 147 0 @@ -349,44 +352,11 @@ System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tableLayoutPanelUserControl + $this 0 - - Fill - - - 0, 0 - - - 500, 300 - - - 1 - - - 762, 560 - - - 0 - - - tableLayoutPanelUserControl - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="splitContainer" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="Percent,100" /></TableLayoutSettings> - True @@ -397,10 +367,13 @@ True - 600, 400 + 500, 250 + + True + - 762, 560 + 500, 250 PipingScenariosView