diff --git a/ResultsBrowser/Forms/DatabaseSettingsDlg.Designer.cs b/ResultsBrowser/Forms/DatabaseSettingsDlg.Designer.cs
index 8d80ade9e..67d8c7f29 100644
--- a/ResultsBrowser/Forms/DatabaseSettingsDlg.Designer.cs
+++ b/ResultsBrowser/Forms/DatabaseSettingsDlg.Designer.cs
@@ -28,162 +28,204 @@
///
private void InitializeComponent()
{
- this.connectionStringTextBox1 = new System.Windows.Forms.TextBox();
- this.benchNameLabel = new System.Windows.Forms.Label();
- this.connectionStringLabel = new System.Windows.Forms.Label();
- this.connectionStringTextBox2 = new System.Windows.Forms.TextBox();
- this.connectionStringTextBox3 = new System.Windows.Forms.TextBox();
- this.okButton = new System.Windows.Forms.Button();
- this.cancelButton = new System.Windows.Forms.Button();
- this.benchNameTextBox1 = new System.Windows.Forms.TextBox();
- this.benchNameTextBox2 = new System.Windows.Forms.TextBox();
- this.benchNameTextBox3 = new System.Windows.Forms.TextBox();
- this.languageLabel = new System.Windows.Forms.Label();
- this.languageTextBox = new System.Windows.Forms.TextBox();
- this.formatLabel = new System.Windows.Forms.Label();
- this.timePeriodFormatTextBox = new System.Windows.Forms.TextBox();
- this.SuspendLayout();
- //
- // connectionStringTextBox1
- //
- this.connectionStringTextBox1.Location = new System.Drawing.Point(157, 45);
- this.connectionStringTextBox1.Name = "connectionStringTextBox1";
- this.connectionStringTextBox1.Size = new System.Drawing.Size(555, 20);
- this.connectionStringTextBox1.TabIndex = 0;
- //
- // benchNameLabel
- //
- this.benchNameLabel.AutoSize = true;
- this.benchNameLabel.Location = new System.Drawing.Point(26, 20);
- this.benchNameLabel.Name = "benchNameLabel";
- this.benchNameLabel.Size = new System.Drawing.Size(67, 13);
- this.benchNameLabel.TabIndex = 1;
- this.benchNameLabel.Text = "Bench name";
- //
- // connectionStringLabel
- //
- this.connectionStringLabel.AutoSize = true;
- this.connectionStringLabel.Location = new System.Drawing.Point(154, 20);
- this.connectionStringLabel.Name = "connectionStringLabel";
- this.connectionStringLabel.Size = new System.Drawing.Size(89, 13);
- this.connectionStringLabel.TabIndex = 3;
- this.connectionStringLabel.Text = "Connection string";
- //
- // connectionStringTextBox2
- //
- this.connectionStringTextBox2.Location = new System.Drawing.Point(157, 71);
- this.connectionStringTextBox2.Name = "connectionStringTextBox2";
- this.connectionStringTextBox2.Size = new System.Drawing.Size(555, 20);
- this.connectionStringTextBox2.TabIndex = 2;
- //
- // connectionStringTextBox3
- //
- this.connectionStringTextBox3.Location = new System.Drawing.Point(157, 97);
- this.connectionStringTextBox3.Name = "connectionStringTextBox3";
- this.connectionStringTextBox3.Size = new System.Drawing.Size(555, 20);
- this.connectionStringTextBox3.TabIndex = 4;
- //
- // okButton
- //
- this.okButton.Location = new System.Drawing.Point(506, 194);
- this.okButton.Name = "okButton";
- this.okButton.Size = new System.Drawing.Size(95, 38);
- this.okButton.TabIndex = 6;
- this.okButton.Text = "OK";
- this.okButton.UseVisualStyleBackColor = true;
- this.okButton.Click += new System.EventHandler(this.okButton_Click);
- //
- // cancelButton
- //
- this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.cancelButton.Location = new System.Drawing.Point(617, 194);
- this.cancelButton.Name = "cancelButton";
- this.cancelButton.Size = new System.Drawing.Size(95, 38);
- this.cancelButton.TabIndex = 7;
- this.cancelButton.Text = "Cancel";
- this.cancelButton.UseVisualStyleBackColor = true;
- this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
- //
- // benchNameTextBox1
- //
- this.benchNameTextBox1.Location = new System.Drawing.Point(29, 45);
- this.benchNameTextBox1.Name = "benchNameTextBox1";
- this.benchNameTextBox1.Size = new System.Drawing.Size(100, 20);
- this.benchNameTextBox1.TabIndex = 8;
- //
- // benchNameTextBox2
- //
- this.benchNameTextBox2.Location = new System.Drawing.Point(29, 71);
- this.benchNameTextBox2.Name = "benchNameTextBox2";
- this.benchNameTextBox2.Size = new System.Drawing.Size(100, 20);
- this.benchNameTextBox2.TabIndex = 9;
- //
- // benchNameTextBox3
- //
- this.benchNameTextBox3.Location = new System.Drawing.Point(29, 97);
- this.benchNameTextBox3.Name = "benchNameTextBox3";
- this.benchNameTextBox3.Size = new System.Drawing.Size(100, 20);
- this.benchNameTextBox3.TabIndex = 10;
- //
- // languageLabel
- //
- this.languageLabel.AutoSize = true;
- this.languageLabel.Location = new System.Drawing.Point(26, 183);
- this.languageLabel.Name = "languageLabel";
- this.languageLabel.Size = new System.Drawing.Size(55, 13);
- this.languageLabel.TabIndex = 11;
- this.languageLabel.Text = "Language";
- //
- // languageTextBox
- //
- this.languageTextBox.Location = new System.Drawing.Point(29, 207);
- this.languageTextBox.Name = "languageTextBox";
- this.languageTextBox.Size = new System.Drawing.Size(100, 20);
- this.languageTextBox.TabIndex = 12;
- //
- // formatLabel
- //
- this.formatLabel.AutoSize = true;
- this.formatLabel.Location = new System.Drawing.Point(26, 129);
- this.formatLabel.Name = "formatLabel";
- this.formatLabel.Size = new System.Drawing.Size(39, 13);
- this.formatLabel.TabIndex = 13;
- this.formatLabel.Text = "Format";
- //
- // timePeriodFormatTextBox
- //
- this.timePeriodFormatTextBox.Location = new System.Drawing.Point(29, 151);
- this.timePeriodFormatTextBox.Name = "timePeriodFormatTextBox";
- this.timePeriodFormatTextBox.Size = new System.Drawing.Size(683, 20);
- this.timePeriodFormatTextBox.TabIndex = 14;
- //
- // DatabaseSettingsDlg
- //
- this.AcceptButton = this.okButton;
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.CancelButton = this.cancelButton;
- this.ClientSize = new System.Drawing.Size(743, 254);
- this.Controls.Add(this.timePeriodFormatTextBox);
- this.Controls.Add(this.formatLabel);
- this.Controls.Add(this.languageTextBox);
- this.Controls.Add(this.languageLabel);
- this.Controls.Add(this.benchNameTextBox3);
- this.Controls.Add(this.benchNameTextBox2);
- this.Controls.Add(this.benchNameTextBox1);
- this.Controls.Add(this.cancelButton);
- this.Controls.Add(this.okButton);
- this.Controls.Add(this.connectionStringTextBox3);
- this.Controls.Add(this.connectionStringLabel);
- this.Controls.Add(this.connectionStringTextBox2);
- this.Controls.Add(this.benchNameLabel);
- this.Controls.Add(this.connectionStringTextBox1);
- this.Name = "DatabaseSettingsDlg";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "Database Settings";
- this.Load += new System.EventHandler(this.DatabaseSettings_Load);
- this.ResumeLayout(false);
- this.PerformLayout();
+ this.connectionStringTextBox1 = new System.Windows.Forms.TextBox();
+ this.benchNameLabel = new System.Windows.Forms.Label();
+ this.connectionStringLabel = new System.Windows.Forms.Label();
+ this.connectionStringTextBox2 = new System.Windows.Forms.TextBox();
+ this.connectionStringTextBox3 = new System.Windows.Forms.TextBox();
+ this.okButton = new System.Windows.Forms.Button();
+ this.cancelButton = new System.Windows.Forms.Button();
+ this.benchNameTextBox1 = new System.Windows.Forms.TextBox();
+ this.benchNameTextBox2 = new System.Windows.Forms.TextBox();
+ this.benchNameTextBox3 = new System.Windows.Forms.TextBox();
+ this.languageLabel = new System.Windows.Forms.Label();
+ this.languageTextBox = new System.Windows.Forms.TextBox();
+ this.formatLabel = new System.Windows.Forms.Label();
+ this.timePeriodFormatTextBox = new System.Windows.Forms.TextBox();
+ this.benchNameTextBox5 = new System.Windows.Forms.TextBox();
+ this.benchNameTextBox4 = new System.Windows.Forms.TextBox();
+ this.connectionStringTextBox5 = new System.Windows.Forms.TextBox();
+ this.connectionStringTextBox4 = new System.Windows.Forms.TextBox();
+ this.SuspendLayout();
+ //
+ // connectionStringTextBox1
+ //
+ this.connectionStringTextBox1.Location = new System.Drawing.Point(157, 45);
+ this.connectionStringTextBox1.Name = "connectionStringTextBox1";
+ this.connectionStringTextBox1.Size = new System.Drawing.Size(555, 20);
+ this.connectionStringTextBox1.TabIndex = 3;
+ //
+ // benchNameLabel
+ //
+ this.benchNameLabel.AutoSize = true;
+ this.benchNameLabel.Location = new System.Drawing.Point(26, 20);
+ this.benchNameLabel.Name = "benchNameLabel";
+ this.benchNameLabel.Size = new System.Drawing.Size(67, 13);
+ this.benchNameLabel.TabIndex = 0;
+ this.benchNameLabel.Text = "Bench name";
+ //
+ // connectionStringLabel
+ //
+ this.connectionStringLabel.AutoSize = true;
+ this.connectionStringLabel.Location = new System.Drawing.Point(154, 20);
+ this.connectionStringLabel.Name = "connectionStringLabel";
+ this.connectionStringLabel.Size = new System.Drawing.Size(89, 13);
+ this.connectionStringLabel.TabIndex = 1;
+ this.connectionStringLabel.Text = "Connection string";
+ //
+ // connectionStringTextBox2
+ //
+ this.connectionStringTextBox2.Location = new System.Drawing.Point(157, 71);
+ this.connectionStringTextBox2.Name = "connectionStringTextBox2";
+ this.connectionStringTextBox2.Size = new System.Drawing.Size(555, 20);
+ this.connectionStringTextBox2.TabIndex = 5;
+ //
+ // connectionStringTextBox3
+ //
+ this.connectionStringTextBox3.Location = new System.Drawing.Point(157, 97);
+ this.connectionStringTextBox3.Name = "connectionStringTextBox3";
+ this.connectionStringTextBox3.Size = new System.Drawing.Size(555, 20);
+ this.connectionStringTextBox3.TabIndex = 7;
+ //
+ // okButton
+ //
+ this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.okButton.Location = new System.Drawing.Point(506, 250);
+ this.okButton.Name = "okButton";
+ this.okButton.Size = new System.Drawing.Size(95, 38);
+ this.okButton.TabIndex = 16;
+ this.okButton.Text = "OK";
+ this.okButton.UseVisualStyleBackColor = true;
+ this.okButton.Click += new System.EventHandler(this.okButton_Click);
+ //
+ // cancelButton
+ //
+ this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.cancelButton.Location = new System.Drawing.Point(617, 250);
+ this.cancelButton.Name = "cancelButton";
+ this.cancelButton.Size = new System.Drawing.Size(95, 38);
+ this.cancelButton.TabIndex = 17;
+ this.cancelButton.Text = "Cancel";
+ this.cancelButton.UseVisualStyleBackColor = true;
+ this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
+ //
+ // benchNameTextBox1
+ //
+ this.benchNameTextBox1.Location = new System.Drawing.Point(29, 45);
+ this.benchNameTextBox1.Name = "benchNameTextBox1";
+ this.benchNameTextBox1.Size = new System.Drawing.Size(100, 20);
+ this.benchNameTextBox1.TabIndex = 2;
+ //
+ // benchNameTextBox2
+ //
+ this.benchNameTextBox2.Location = new System.Drawing.Point(29, 71);
+ this.benchNameTextBox2.Name = "benchNameTextBox2";
+ this.benchNameTextBox2.Size = new System.Drawing.Size(100, 20);
+ this.benchNameTextBox2.TabIndex = 4;
+ //
+ // benchNameTextBox3
+ //
+ this.benchNameTextBox3.Location = new System.Drawing.Point(29, 97);
+ this.benchNameTextBox3.Name = "benchNameTextBox3";
+ this.benchNameTextBox3.Size = new System.Drawing.Size(100, 20);
+ this.benchNameTextBox3.TabIndex = 6;
+ //
+ // languageLabel
+ //
+ this.languageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.languageLabel.AutoSize = true;
+ this.languageLabel.Location = new System.Drawing.Point(26, 239);
+ this.languageLabel.Name = "languageLabel";
+ this.languageLabel.Size = new System.Drawing.Size(55, 13);
+ this.languageLabel.TabIndex = 14;
+ this.languageLabel.Text = "Language";
+ //
+ // languageTextBox
+ //
+ this.languageTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.languageTextBox.Location = new System.Drawing.Point(29, 263);
+ this.languageTextBox.Name = "languageTextBox";
+ this.languageTextBox.Size = new System.Drawing.Size(100, 20);
+ this.languageTextBox.TabIndex = 15;
+ //
+ // formatLabel
+ //
+ this.formatLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.formatLabel.AutoSize = true;
+ this.formatLabel.Location = new System.Drawing.Point(26, 185);
+ this.formatLabel.Name = "formatLabel";
+ this.formatLabel.Size = new System.Drawing.Size(39, 13);
+ this.formatLabel.TabIndex = 12;
+ this.formatLabel.Text = "Format";
+ //
+ // timePeriodFormatTextBox
+ //
+ this.timePeriodFormatTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.timePeriodFormatTextBox.Location = new System.Drawing.Point(29, 207);
+ this.timePeriodFormatTextBox.Name = "timePeriodFormatTextBox";
+ this.timePeriodFormatTextBox.Size = new System.Drawing.Size(683, 20);
+ this.timePeriodFormatTextBox.TabIndex = 13;
+ //
+ // benchNameTextBox5
+ //
+ this.benchNameTextBox5.Location = new System.Drawing.Point(29, 149);
+ this.benchNameTextBox5.Name = "benchNameTextBox5";
+ this.benchNameTextBox5.Size = new System.Drawing.Size(100, 20);
+ this.benchNameTextBox5.TabIndex = 10;
+ //
+ // benchNameTextBox4
+ //
+ this.benchNameTextBox4.Location = new System.Drawing.Point(29, 123);
+ this.benchNameTextBox4.Name = "benchNameTextBox4";
+ this.benchNameTextBox4.Size = new System.Drawing.Size(100, 20);
+ this.benchNameTextBox4.TabIndex = 8;
+ //
+ // connectionStringTextBox5
+ //
+ this.connectionStringTextBox5.Location = new System.Drawing.Point(157, 149);
+ this.connectionStringTextBox5.Name = "connectionStringTextBox5";
+ this.connectionStringTextBox5.Size = new System.Drawing.Size(555, 20);
+ this.connectionStringTextBox5.TabIndex = 11;
+ //
+ // connectionStringTextBox4
+ //
+ this.connectionStringTextBox4.Location = new System.Drawing.Point(157, 123);
+ this.connectionStringTextBox4.Name = "connectionStringTextBox4";
+ this.connectionStringTextBox4.Size = new System.Drawing.Size(555, 20);
+ this.connectionStringTextBox4.TabIndex = 9;
+ //
+ // DatabaseSettingsDlg
+ //
+ this.AcceptButton = this.okButton;
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.CancelButton = this.cancelButton;
+ this.ClientSize = new System.Drawing.Size(743, 310);
+ this.Controls.Add(this.benchNameTextBox5);
+ this.Controls.Add(this.benchNameTextBox4);
+ this.Controls.Add(this.connectionStringTextBox5);
+ this.Controls.Add(this.connectionStringTextBox4);
+ this.Controls.Add(this.timePeriodFormatTextBox);
+ this.Controls.Add(this.formatLabel);
+ this.Controls.Add(this.languageTextBox);
+ this.Controls.Add(this.languageLabel);
+ this.Controls.Add(this.benchNameTextBox3);
+ this.Controls.Add(this.benchNameTextBox2);
+ this.Controls.Add(this.benchNameTextBox1);
+ this.Controls.Add(this.cancelButton);
+ this.Controls.Add(this.okButton);
+ this.Controls.Add(this.connectionStringTextBox3);
+ this.Controls.Add(this.connectionStringLabel);
+ this.Controls.Add(this.connectionStringTextBox2);
+ this.Controls.Add(this.benchNameLabel);
+ this.Controls.Add(this.connectionStringTextBox1);
+ this.Name = "DatabaseSettingsDlg";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "Database Settings";
+ this.Load += new System.EventHandler(this.DatabaseSettings_Load);
+ this.ResumeLayout(false);
+ this.PerformLayout();
}
@@ -203,5 +245,9 @@
private System.Windows.Forms.TextBox languageTextBox;
private System.Windows.Forms.Label formatLabel;
private System.Windows.Forms.TextBox timePeriodFormatTextBox;
+ private System.Windows.Forms.TextBox benchNameTextBox5;
+ private System.Windows.Forms.TextBox benchNameTextBox4;
+ private System.Windows.Forms.TextBox connectionStringTextBox5;
+ private System.Windows.Forms.TextBox connectionStringTextBox4;
}
}
\ No newline at end of file
diff --git a/ResultsBrowser/Forms/DatabaseSettingsDlg.cs b/ResultsBrowser/Forms/DatabaseSettingsDlg.cs
index 82bc769bf..45d388426 100644
--- a/ResultsBrowser/Forms/DatabaseSettingsDlg.cs
+++ b/ResultsBrowser/Forms/DatabaseSettingsDlg.cs
@@ -1,10 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
using System.Windows.Forms;
using ResultsBrowser.Resources;
@@ -24,10 +18,14 @@ namespace ResultsBrowser.Forms
benchNameTextBox1.Text = Program.LocalSettings.Bench1;
benchNameTextBox2.Text = Program.LocalSettings.Bench2;
benchNameTextBox3.Text = Program.LocalSettings.Bench3;
+ benchNameTextBox4.Text = Program.LocalSettings.Bench4;
+ benchNameTextBox5.Text = Program.LocalSettings.Bench5;
connectionStringTextBox1.Text = Program.LocalSettings.ConnectionString1;
connectionStringTextBox2.Text = Program.LocalSettings.ConnectionString2;
connectionStringTextBox3.Text = Program.LocalSettings.ConnectionString3;
+ connectionStringTextBox4.Text = Program.LocalSettings.ConnectionString4;
+ connectionStringTextBox5.Text = Program.LocalSettings.ConnectionString5;
timePeriodFormatTextBox.Text = Program.LocalSettings.TimePeriodFormat;
@@ -50,10 +48,14 @@ namespace ResultsBrowser.Forms
Program.LocalSettings.Bench1 = benchNameTextBox1.Text;
Program.LocalSettings.Bench2 = benchNameTextBox2.Text;
Program.LocalSettings.Bench3 = benchNameTextBox3.Text;
+ Program.LocalSettings.Bench4 = benchNameTextBox4.Text;
+ Program.LocalSettings.Bench5 = benchNameTextBox5.Text;
Program.LocalSettings.ConnectionString1 = connectionStringTextBox1.Text;
Program.LocalSettings.ConnectionString2 = connectionStringTextBox2.Text;
Program.LocalSettings.ConnectionString3 = connectionStringTextBox3.Text;
+ Program.LocalSettings.ConnectionString4 = connectionStringTextBox4.Text;
+ Program.LocalSettings.ConnectionString5 = connectionStringTextBox5.Text;
Program.LocalSettings.TimePeriodFormat = timePeriodFormatTextBox.Text;
diff --git a/ResultsBrowser/LocalSettings.cs b/ResultsBrowser/LocalSettings.cs
index c5f16555c..c30bd914a 100644
--- a/ResultsBrowser/LocalSettings.cs
+++ b/ResultsBrowser/LocalSettings.cs
@@ -27,15 +27,21 @@ namespace ResultsBrowser
public string Bench1;
public string Bench2;
public string Bench3;
+ public string Bench4;
+ public string Bench5;
/// Database settings of servers.
public string ConnectionString1;
public string ConnectionString2;
public string ConnectionString3;
+ public string ConnectionString4;
+ public string ConnectionString5;
public bool Bench1Selected;
public bool Bench2Selected;
public bool Bench3Selected;
+ public bool Bench4Selected;
+ public bool Bench5Selected;
public string TimePeriodFormat;
diff --git a/ResultsBrowser/Properties/AssemblyInfo.cs b/ResultsBrowser/Properties/AssemblyInfo.cs
index 2c245402e..b64d21a73 100644
--- a/ResultsBrowser/Properties/AssemblyInfo.cs
+++ b/ResultsBrowser/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.12.542.0")]
-[assembly: AssemblyFileVersion("2.12.542.0")]
+[assembly: AssemblyVersion("2.14.572.0")]
+[assembly: AssemblyFileVersion("2.14.572.0")]
diff --git a/ResultsBrowser/ResultsBrowserWnd.Designer.cs b/ResultsBrowser/ResultsBrowserWnd.Designer.cs
index ad593f4f6..442e3e000 100644
--- a/ResultsBrowser/ResultsBrowserWnd.Designer.cs
+++ b/ResultsBrowser/ResultsBrowserWnd.Designer.cs
@@ -45,6 +45,8 @@
this.executeQueryBtn = new System.Windows.Forms.Button();
this.addFilterBtn = new System.Windows.Forms.Button();
this.testBenchesGroupBox = new System.Windows.Forms.GroupBox();
+ this.checkBox5 = new System.Windows.Forms.RadioButton();
+ this.checkBox4 = new System.Windows.Forms.RadioButton();
this.checkBox3 = new System.Windows.Forms.RadioButton();
this.checkBox2 = new System.Windows.Forms.RadioButton();
this.checkBox1 = new System.Windows.Forms.RadioButton();
@@ -151,7 +153,7 @@
//
// statisticsBtn
//
- this.statisticsBtn.Location = new System.Drawing.Point(8, 562);
+ this.statisticsBtn.Location = new System.Drawing.Point(8, 581);
this.statisticsBtn.Name = "statisticsBtn";
this.statisticsBtn.Size = new System.Drawing.Size(125, 33);
this.statisticsBtn.TabIndex = 10;
@@ -161,7 +163,7 @@
//
// printQueryResultsBtn
//
- this.printQueryResultsBtn.Location = new System.Drawing.Point(8, 487);
+ this.printQueryResultsBtn.Location = new System.Drawing.Point(8, 506);
this.printQueryResultsBtn.Name = "printQueryResultsBtn";
this.printQueryResultsBtn.Size = new System.Drawing.Size(125, 33);
this.printQueryResultsBtn.TabIndex = 9;
@@ -171,7 +173,7 @@
//
// exportQueryResultsBtn
//
- this.exportQueryResultsBtn.Location = new System.Drawing.Point(8, 448);
+ this.exportQueryResultsBtn.Location = new System.Drawing.Point(8, 467);
this.exportQueryResultsBtn.Name = "exportQueryResultsBtn";
this.exportQueryResultsBtn.Size = new System.Drawing.Size(125, 33);
this.exportQueryResultsBtn.TabIndex = 8;
@@ -181,7 +183,7 @@
//
// formatOfResultsBtn
//
- this.formatOfResultsBtn.Location = new System.Drawing.Point(8, 255);
+ this.formatOfResultsBtn.Location = new System.Drawing.Point(8, 274);
this.formatOfResultsBtn.Name = "formatOfResultsBtn";
this.formatOfResultsBtn.Size = new System.Drawing.Size(125, 33);
this.formatOfResultsBtn.TabIndex = 7;
@@ -191,7 +193,7 @@
//
// clearFiltersBtn
//
- this.clearFiltersBtn.Location = new System.Drawing.Point(8, 177);
+ this.clearFiltersBtn.Location = new System.Drawing.Point(8, 196);
this.clearFiltersBtn.Name = "clearFiltersBtn";
this.clearFiltersBtn.Size = new System.Drawing.Size(125, 33);
this.clearFiltersBtn.TabIndex = 2;
@@ -211,7 +213,7 @@
//
// saveConfigBtn
//
- this.saveConfigBtn.Location = new System.Drawing.Point(8, 294);
+ this.saveConfigBtn.Location = new System.Drawing.Point(8, 313);
this.saveConfigBtn.Name = "saveConfigBtn";
this.saveConfigBtn.Size = new System.Drawing.Size(125, 33);
this.saveConfigBtn.TabIndex = 5;
@@ -221,7 +223,7 @@
//
// loadConfigBtn
//
- this.loadConfigBtn.Location = new System.Drawing.Point(8, 333);
+ this.loadConfigBtn.Location = new System.Drawing.Point(8, 352);
this.loadConfigBtn.Name = "loadConfigBtn";
this.loadConfigBtn.Size = new System.Drawing.Size(125, 33);
this.loadConfigBtn.TabIndex = 4;
@@ -231,7 +233,7 @@
//
// executeQueryBtn
//
- this.executeQueryBtn.Location = new System.Drawing.Point(8, 409);
+ this.executeQueryBtn.Location = new System.Drawing.Point(8, 428);
this.executeQueryBtn.Name = "executeQueryBtn";
this.executeQueryBtn.Size = new System.Drawing.Size(125, 33);
this.executeQueryBtn.TabIndex = 6;
@@ -241,7 +243,7 @@
//
// addFilterBtn
//
- this.addFilterBtn.Location = new System.Drawing.Point(8, 216);
+ this.addFilterBtn.Location = new System.Drawing.Point(8, 235);
this.addFilterBtn.Name = "addFilterBtn";
this.addFilterBtn.Size = new System.Drawing.Size(125, 33);
this.addFilterBtn.TabIndex = 3;
@@ -251,20 +253,46 @@
//
// testBenchesGroupBox
//
+ this.testBenchesGroupBox.Controls.Add(this.checkBox5);
+ this.testBenchesGroupBox.Controls.Add(this.checkBox4);
this.testBenchesGroupBox.Controls.Add(this.checkBox3);
this.testBenchesGroupBox.Controls.Add(this.checkBox2);
this.testBenchesGroupBox.Controls.Add(this.checkBox1);
this.testBenchesGroupBox.Location = new System.Drawing.Point(8, 54);
this.testBenchesGroupBox.Name = "testBenchesGroupBox";
- this.testBenchesGroupBox.Size = new System.Drawing.Size(125, 99);
+ this.testBenchesGroupBox.Size = new System.Drawing.Size(125, 135);
this.testBenchesGroupBox.TabIndex = 1;
this.testBenchesGroupBox.TabStop = false;
this.testBenchesGroupBox.Text = "Test benches";
//
+ // checkBox5
+ //
+ this.checkBox5.AutoSize = true;
+ this.checkBox5.Location = new System.Drawing.Point(23, 106);
+ this.checkBox5.Name = "checkBox5";
+ this.checkBox5.Size = new System.Drawing.Size(85, 17);
+ this.checkBox5.TabIndex = 4;
+ this.checkBox5.TabStop = true;
+ this.checkBox5.Text = "radioButton5";
+ this.checkBox5.UseVisualStyleBackColor = true;
+ this.checkBox5.CheckedChanged += new System.EventHandler(this.checkBox5_CheckedChanged);
+ //
+ // checkBox4
+ //
+ this.checkBox4.AutoSize = true;
+ this.checkBox4.Location = new System.Drawing.Point(23, 86);
+ this.checkBox4.Name = "checkBox4";
+ this.checkBox4.Size = new System.Drawing.Size(85, 17);
+ this.checkBox4.TabIndex = 3;
+ this.checkBox4.TabStop = true;
+ this.checkBox4.Text = "radioButton4";
+ this.checkBox4.UseVisualStyleBackColor = true;
+ this.checkBox4.CheckedChanged += new System.EventHandler(this.checkBox4_CheckedChanged);
+ //
// checkBox3
//
this.checkBox3.AutoSize = true;
- this.checkBox3.Location = new System.Drawing.Point(23, 69);
+ this.checkBox3.Location = new System.Drawing.Point(23, 65);
this.checkBox3.Name = "checkBox3";
this.checkBox3.Size = new System.Drawing.Size(85, 17);
this.checkBox3.TabIndex = 2;
@@ -276,7 +304,7 @@
// checkBox2
//
this.checkBox2.AutoSize = true;
- this.checkBox2.Location = new System.Drawing.Point(23, 46);
+ this.checkBox2.Location = new System.Drawing.Point(23, 44);
this.checkBox2.Name = "checkBox2";
this.checkBox2.Size = new System.Drawing.Size(85, 17);
this.checkBox2.TabIndex = 1;
@@ -344,5 +372,7 @@
private System.Windows.Forms.Button printQueryResultsBtn;
private System.Windows.Forms.Button statisticsBtn;
private System.Windows.Forms.ListView resultsListView;
+ private System.Windows.Forms.RadioButton checkBox5;
+ private System.Windows.Forms.RadioButton checkBox4;
}
}
\ No newline at end of file
diff --git a/ResultsBrowser/ResultsBrowserWnd.cs b/ResultsBrowser/ResultsBrowserWnd.cs
index b329cb739..e992eecda 100644
--- a/ResultsBrowser/ResultsBrowserWnd.cs
+++ b/ResultsBrowser/ResultsBrowserWnd.cs
@@ -50,6 +50,8 @@ namespace ResultsBrowser
checkBox1.Checked = Program.LocalSettings.Bench1Selected;
checkBox2.Checked = Program.LocalSettings.Bench2Selected;
checkBox3.Checked = Program.LocalSettings.Bench3Selected;
+ checkBox4.Checked = Program.LocalSettings.Bench4Selected;
+ checkBox5.Checked = Program.LocalSettings.Bench5Selected;
if (args.Length == 1 && args[0].IndexOf(".qry") == args[0].Length - 4)
{
@@ -70,10 +72,14 @@ namespace ResultsBrowser
checkBox1.Text = Program.LocalSettings.Bench1;
checkBox2.Text = Program.LocalSettings.Bench2;
checkBox3.Text = Program.LocalSettings.Bench3;
+ checkBox4.Text = Program.LocalSettings.Bench4;
+ checkBox5.Text = Program.LocalSettings.Bench5;
checkBox1.Visible = !string.IsNullOrEmpty(checkBox1.Text);
checkBox2.Visible = !string.IsNullOrEmpty(checkBox2.Text);
checkBox3.Visible = !string.IsNullOrEmpty(checkBox3.Text);
+ checkBox4.Visible = !string.IsNullOrEmpty(checkBox4.Text);
+ checkBox5.Visible = !string.IsNullOrEmpty(checkBox5.Text);
}
string BenchName()
@@ -111,12 +117,16 @@ namespace ResultsBrowser
private void checkBox1_CheckedChanged(object sender, EventArgs e) { SaveCheckBoxes(); }
private void checkBox2_CheckedChanged(object sender, EventArgs e) { SaveCheckBoxes(); }
private void checkBox3_CheckedChanged(object sender, EventArgs e) { SaveCheckBoxes(); }
+ private void checkBox4_CheckedChanged(object sender, EventArgs e) { SaveCheckBoxes(); }
+ private void checkBox5_CheckedChanged(object sender, EventArgs e) { SaveCheckBoxes(); }
void SaveCheckBoxes()
{
Program.LocalSettings.Bench1Selected = checkBox1.Checked;
Program.LocalSettings.Bench2Selected = checkBox2.Checked;
Program.LocalSettings.Bench3Selected = checkBox3.Checked;
+ Program.LocalSettings.Bench4Selected = checkBox4.Checked;
+ Program.LocalSettings.Bench5Selected = checkBox5.Checked;
Program.LocalSettings.Save();
}
@@ -215,7 +225,9 @@ namespace ResultsBrowser
Results.DB.ConnectionString = checkBox1.Checked ? Program.LocalSettings.ConnectionString1 :
(checkBox2.Checked ? Program.LocalSettings.ConnectionString2 :
(checkBox3.Checked ? Program.LocalSettings.ConnectionString3 :
- Program.LocalSettings.ConnectionString1));
+ (checkBox4.Checked ? Program.LocalSettings.ConnectionString4 :
+ (checkBox5.Checked ? Program.LocalSettings.ConnectionString5 :
+ Program.LocalSettings.ConnectionString1))));
ISession[] sessions = new ISession[] { Results.DB.CreateSession() };
diff --git a/TestBenchFramework/BenchControl/Sequences/ProcessData.cs b/TestBenchFramework/BenchControl/Sequences/ProcessData.cs
index a461ce6c0..8f8e834f2 100644
--- a/TestBenchFramework/BenchControl/Sequences/ProcessData.cs
+++ b/TestBenchFramework/BenchControl/Sequences/ProcessData.cs
@@ -31,6 +31,9 @@ namespace TBF.BenchControl.Sequences
public static DateTime TestStartTime;
public static DateTime TestEndTime;
+ public static double StartTime;
+ public static double EndTime;
+
/// Heat meters only
public static DoubleBox TempRefHi1 = new DoubleBox() { Name = "T hi ac 1", Format = "F3" }; /// [°C]
public static DoubleBox TempRefHi2 = new DoubleBox() { Name = "T hi ac 2", Format = "F3" }; /// [°C]
diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
index 7acddc95f..ac064d091 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
@@ -467,6 +467,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
}
while (!e.Contains(Event.MeasurementStarted));
+ StartTime = (double)StateMachine.Time;
State.Create(string.Format("{0}({1}) : Opening the start/stop valve at the beginning of the fixed start test", test.Method, test.Name))
.AddOperation(checkUiOp)
@@ -574,6 +575,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
test_completed:
+ EndTime = (double)StateMachine.Time;
+
State.Create(string.Format("{0}({1}) : Closing the start/stop valve at the end of the fixed start test", test.Method, test.Name))
.AddOperation(checkUiOp)
.AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
@@ -757,7 +760,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
tstRslt.EndTime = TestEndTime;
tstRslt.FlowSetTime = flowSetTime;
- tstRslt.TestTime = cBrd.TTime; /// [s] measurement time <--------------------------------------------------------------
+ tstRslt.TestTime = Math.Max(1.0, EndTime - StartTime); /// [s] measurement time, at least 1 to prevent division by zero
+
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total)
tstRslt.MassStartRaw = StartMass.Val;
tstRslt.MassStart = massStart;
diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
index 24657e980..5305e6dde 100644
--- a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
@@ -32,6 +32,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
CmdTest,
Verify,
WrongIPerlType,
+ CalibFactorOoRange,
}
@@ -984,8 +985,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
{
if (wm.CommFailed) return CommErr.CommFailed;
- if (OpenPort(wm) != 0) return CommErr.OpenPort; /// Open RFID port
-
///
/// Parse calibration factor (1 argument) or calibration factor limits (2 arguments)
///
@@ -1011,17 +1010,21 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
}
else
{
- newCalibFactor = 2710; /// Default calibration factor for DN15
+ newCalibFactor = wm.CalculateNewCalibFactor(wm.CalibrationFactor, wm.FactorLimitLo, wm.FactorLimitHi);
}
}
else
{
- newCalibFactor = wm.CalculateNewCalibFactor(wm.CalibrationFactor, 2400, 2700); /// Default factor limits for DN15
+ newCalibFactor = wm.CalculateNewCalibFactor(wm.CalibrationFactor, wm.FactorLimitLo, wm.FactorLimitHi);
}
+ if (newCalibFactor == 0) return CommErr.CalibFactorOoRange;
+
///
/// Start communication with iPerl
///
+ if (OpenPort(wm) != 0) return CommErr.OpenPort; /// Open RFID port
+
CommErr error;
byte[] data = new byte[2] { (byte)(newCalibFactor & 0x00FF), (byte)((newCalibFactor >> 8) & 0x00FF) };
int writeAndVerifyRetries = 0;
diff --git a/TestBenchFramework/BenchControl/WaterMeters/iPerl/ProcParams.cs b/TestBenchFramework/BenchControl/WaterMeters/iPerl/ProcParams.cs
index 7f007082f..7f58ac464 100644
--- a/TestBenchFramework/BenchControl/WaterMeters/iPerl/ProcParams.cs
+++ b/TestBenchFramework/BenchControl/WaterMeters/iPerl/ProcParams.cs
@@ -47,6 +47,9 @@ namespace TBF.BenchControl.WaterMeters.iPerl
public int WMType_ID; /// Required for Oracle DB: ID_WZTyp in table VT_PRUEFPUNKT_SOLL_SD
public int WMType_Rev; /// Required for Oracle DB: Rev_WZTyp in table VT_PRUEFPUNKT_SOLL_SD
#endif
+ public int FactorLimitLo; /// Lower limit for the calibration factor
+ public int FactorLimitHi; /// Upper limit for the calibration factor
+
public override void InitializeAll()
{
@@ -77,6 +80,8 @@ namespace TBF.BenchControl.WaterMeters.iPerl
WMType_ID = 2; /// Value for iPerl DN15
WMType_Rev = 1; /// Value for iPerl DN15
#endif
+ FactorLimitLo = 1000;
+ FactorLimitHi = 8000;
}
string[] paramNames = new string[]
@@ -108,6 +113,8 @@ namespace TBF.BenchControl.WaterMeters.iPerl
"WMType ID",
"WMType Rev.",
#endif
+ "Calib. factor Lo",
+ "Calib. factor Hi",
};
public override string ParamName(int i) { return paramNames[i]; }
public override int ParamsCount() { return paramNames.Length; }
@@ -143,6 +150,8 @@ namespace TBF.BenchControl.WaterMeters.iPerl
case 23: return WMType_ID.ToString();
case 24: return WMType_Rev.ToString();
#endif
+ case 25: return FactorLimitLo.ToString();
+ case 26: return FactorLimitHi.ToString();
default: return string.Empty;
}
}
@@ -208,6 +217,8 @@ namespace TBF.BenchControl.WaterMeters.iPerl
case 23: WMType_ID = int.Parse(strValue); return;
case 24: WMType_Rev = int.Parse(strValue); return;
#endif
+ case 25: FactorLimitLo = int.Parse(strValue); return;
+ case 26: FactorLimitHi = int.Parse(strValue); return;
default: return;
}
}
@@ -265,6 +276,11 @@ namespace TBF.BenchControl.WaterMeters.iPerl
if (int.TryParse(strValue, out iDummy)) return true;
break;
#endif
+ case 25:
+ case 26:
+ if (int.TryParse(strValue, out iDummy) && iDummy >= 1000 && iDummy <= 8000) return true;
+ break;
+
default:
message = "Invalid index";
return false;
@@ -303,6 +319,8 @@ namespace TBF.BenchControl.WaterMeters.iPerl
prms.WMType_ID = this.WMType_ID;
prms.WMType_Rev = this.WMType_Rev;
#endif
+ prms.FactorLimitLo = this.FactorLimitLo;
+ prms.FactorLimitHi = this.FactorLimitHi;
}
public IParamsProvider Clone()
diff --git a/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs b/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs
index a99c02c03..b2b6cc6e3 100644
--- a/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs
+++ b/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs
@@ -71,12 +71,11 @@ namespace TBF.BenchControl.WaterMeters.iPerl
public string Text5 { get { return iPerlCfg.ProcParams.Text5; } }
#if ORACLE_DB
- /// WM Type ID for Oracle DB
- public int WMType_ID { get { return iPerlCfg.ProcParams.WMType_ID; } }
-
- /// WM Type Revision for Oracle DB
- public int WMType_Rev { get { return iPerlCfg.ProcParams.WMType_Rev; } }
+ public int WMType_ID { get { return iPerlCfg.ProcParams.WMType_ID; } } /// Required by Oracle DB
+ public int WMType_Rev { get { return iPerlCfg.ProcParams.WMType_Rev; } } /// Required by Oracle DB
#endif
+ public ushort FactorLimitLo { get { return (ushort)iPerlCfg.ProcParams.FactorLimitLo; } }
+ public ushort FactorLimitHi { get { return (ushort)iPerlCfg.ProcParams.FactorLimitHi; } }
/// Properties set by the Begin and the End form
public string SerialNr
@@ -186,7 +185,7 @@ namespace TBF.BenchControl.WaterMeters.iPerl
/// and results of the last test.
///
/// Original calibration factor
- /// New calibration factor
+ /// New calibration factor or 0 (= Out of range)
public UInt16 CalculateNewCalibFactor(UInt16 originalCalibrationFactor, UInt16 FactorLimitLo, UInt16 FactorLimitHi)
{
OriginalCalibFactor = originalCalibrationFactor;
@@ -203,8 +202,7 @@ namespace TBF.BenchControl.WaterMeters.iPerl
VolumeLtrStart.ToString("F3"), VolumeLtrEnd.ToString("F3"), volumeMeter.ToString("F3"),
VolumeLtrRef.ToString("F3"));
- if (newFactor < FactorLimitLo) newFactor = FactorLimitLo;
- if (newFactor > FactorLimitHi) newFactor = FactorLimitHi;
+ if (newFactor < FactorLimitLo || newFactor > FactorLimitHi) return 0;
return newFactor;
}