diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs index cff38e76b..c78787218 100644 --- a/Results/WMeterRsltItemSpec.cs +++ b/Results/WMeterRsltItemSpec.cs @@ -418,8 +418,8 @@ namespace Results AllItems.Add(new WMeterRsltItemSpec(ItemID.CalibFactorLNA, "iPerl CalibFactorLNA", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.CalibFactorLNA))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2ErrWOCorrection, "iPerl Q2ErrWOCorrection", Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.Q2ErrWOCorrection))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrectionDone, "iPerl Q2CorrectionDone", Quantity.Boolean,ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2CorrectionDone ? Strings.Yes : Strings.No))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrRFlow, "iPerl Q2CorrRFlow", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrRL))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrLFlow, "iPerl Q2CorrLFlow", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrLR))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrRFlow, "iPerl Q2Corr R-L", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrRL))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrLFlow, "iPerl Q2Corr L-R", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrLR))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrFlowRight, "iPerl Q2CorrFlowRight", Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrFlowRight))); AllItems.Add(new WMeterRsltItemSpec(ItemID.FW_Version, "iPerl FW version", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.FWVersion))); #if ORACLE_DB diff --git a/ResultsBrowser/Forms/DatabaseSettingsDlg.Designer.cs b/ResultsBrowser/Forms/DatabaseSettingsDlg.Designer.cs index 25dbed19c..01533910b 100644 --- a/ResultsBrowser/Forms/DatabaseSettingsDlg.Designer.cs +++ b/ResultsBrowser/Forms/DatabaseSettingsDlg.Designer.cs @@ -28,204 +28,222 @@ /// 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.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 = 18; - 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 = 19; - 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(94, 13); - this.formatLabel.TabIndex = 12; - this.formatLabel.Text = "Time period 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 = "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.benchNameTextBox6 = new System.Windows.Forms.TextBox(); + this.connectionStringTextBox6 = 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, 23); + 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, 23); + 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, 69); + 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, 93); + 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 = 18; + 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 = 19; + 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, 69); + 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, 93); + 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, 245); + 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, 196); + this.formatLabel.Name = "formatLabel"; + this.formatLabel.Size = new System.Drawing.Size(94, 13); + this.formatLabel.TabIndex = 12; + this.formatLabel.Text = "Time period 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, 215); + 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, 141); + 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, 117); + 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, 141); + 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, 117); + this.connectionStringTextBox4.Name = "connectionStringTextBox4"; + this.connectionStringTextBox4.Size = new System.Drawing.Size(555, 20); + this.connectionStringTextBox4.TabIndex = 9; + // + // benchNameTextBox6 + // + this.benchNameTextBox6.Location = new System.Drawing.Point(29, 165); + this.benchNameTextBox6.Name = "benchNameTextBox6"; + this.benchNameTextBox6.Size = new System.Drawing.Size(100, 20); + this.benchNameTextBox6.TabIndex = 20; + // + // connectionStringTextBox6 + // + this.connectionStringTextBox6.Location = new System.Drawing.Point(157, 165); + this.connectionStringTextBox6.Name = "connectionStringTextBox6"; + this.connectionStringTextBox6.Size = new System.Drawing.Size(555, 20); + this.connectionStringTextBox6.TabIndex = 21; + // + // 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.benchNameTextBox6); + this.Controls.Add(this.connectionStringTextBox6); + 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 = "Settings"; + this.Load += new System.EventHandler(this.DatabaseSettings_Load); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -249,5 +267,7 @@ private System.Windows.Forms.TextBox benchNameTextBox4; private System.Windows.Forms.TextBox connectionStringTextBox5; private System.Windows.Forms.TextBox connectionStringTextBox4; + private System.Windows.Forms.TextBox benchNameTextBox6; + private System.Windows.Forms.TextBox connectionStringTextBox6; } } \ No newline at end of file diff --git a/ResultsBrowser/Forms/DatabaseSettingsDlg.cs b/ResultsBrowser/Forms/DatabaseSettingsDlg.cs index cec3bb063..09af375a7 100644 --- a/ResultsBrowser/Forms/DatabaseSettingsDlg.cs +++ b/ResultsBrowser/Forms/DatabaseSettingsDlg.cs @@ -22,12 +22,14 @@ namespace ResultsBrowser.Forms benchNameTextBox3.Text = Program.LocalSettings.Bench3; benchNameTextBox4.Text = Program.LocalSettings.Bench4; benchNameTextBox5.Text = Program.LocalSettings.Bench5; + benchNameTextBox6.Text = Program.LocalSettings.Bench6; 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; + connectionStringTextBox6.Text = Program.LocalSettings.ConnectionString6; timePeriodFormatTextBox.Text = Program.LocalSettings.TimePeriodFormat; @@ -52,12 +54,14 @@ namespace ResultsBrowser.Forms Program.LocalSettings.Bench3 = benchNameTextBox3.Text; Program.LocalSettings.Bench4 = benchNameTextBox4.Text; Program.LocalSettings.Bench5 = benchNameTextBox5.Text; + Program.LocalSettings.Bench6 = benchNameTextBox6.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.ConnectionString6 = connectionStringTextBox6.Text; Program.LocalSettings.TimePeriodFormat = timePeriodFormatTextBox.Text; diff --git a/ResultsBrowser/LocalSettings.cs b/ResultsBrowser/LocalSettings.cs index 065a317c2..6519e4581 100644 --- a/ResultsBrowser/LocalSettings.cs +++ b/ResultsBrowser/LocalSettings.cs @@ -29,6 +29,7 @@ namespace ResultsBrowser public string Bench3; public string Bench4; public string Bench5; + public string Bench6; /// Database settings of servers. public string ConnectionString1; @@ -36,12 +37,14 @@ namespace ResultsBrowser public string ConnectionString3; public string ConnectionString4; public string ConnectionString5; + public string ConnectionString6; public bool Bench1Selected; public bool Bench2Selected; public bool Bench3Selected; public bool Bench4Selected; public bool Bench5Selected; + public bool Bench6Selected; public string TimePeriodFormat; @@ -106,6 +109,21 @@ namespace ResultsBrowser public LocalSettings() { +#if TURA_IPERL || TURA_SPECIAL + Bench1 = "WR10"; + Bench2 = "WR11"; + Bench3 = "WR13"; + Bench4 = "WR14"; + Bench5 = "WR15"; + Bench6 = "PT7"; + ConnectionString1 = "SERVER=10.42.128.93; DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;"; + ConnectionString2 = "SERVER=10.42.128.102; DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;"; + ConnectionString3 = "SERVER=10.42.128.89; DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;"; + ConnectionString4 = "SERVER=10.42.128.213; DATABASE=st-wr14-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;"; + ConnectionString5 = "SERVER=10.42.128.214; DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;"; + ConnectionString6 = "SERVER=10.42.129.26; DATABASE=iperlspecial-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;"; + Language = "SK"; +#endif } /// diff --git a/ResultsBrowser/Program.cs b/ResultsBrowser/Program.cs index 8ddd4b7e9..321861847 100644 --- a/ResultsBrowser/Program.cs +++ b/ResultsBrowser/Program.cs @@ -14,25 +14,26 @@ namespace ResultsBrowser { public class Program { + static ILog log; /// log4net + /// Program information public static string Version; /// version string public static DateTime BuildDateTime; /// date and time of program build /// Local settings - public static readonly string ExecutableDirectory; - public static readonly string ConfigDirectory; - public static readonly string LogDirectory; - public static readonly string LocalSettingsFileName; - public static readonly string LocalSettingsBackupName; + public static string ExecutableDirectory; + public static string ConfigDirectory; + public static string LogDirectory; + public static string LocalSettingsFileName; + public static string LocalSettingsBackupName; public static LocalSettings LocalSettings; - - public static System.Globalization.CultureInfo AltCulture; - - static readonly ILog log; /// log4net - - static Program() - { + /// + /// The main entry point for the application. + /// + [STAThread] + static void Main(string[] args) + { /// Program version string System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly(); Version ver = thisAssembly.GetName().Version; @@ -41,26 +42,26 @@ namespace ResultsBrowser /// Local program configuration directory including the trailing backslash ExecutableDirectory = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location); - ConfigDirectory = Path.Combine(ExecutableDirectory, "..\\Cfg\\"); +#if false + /// Config directory is a sibling directory of the executable directory + ConfigDirectory = Path.Combine(ExecutableDirectory, "..", string.Format("Cfg{0}", (args.Length >= 1) ? args[0] : string.Empty)); LogDirectory = Path.Combine(ExecutableDirectory, "..\\Log\\"); - LocalSettingsFileName = ConfigDirectory + "config.xml"; - LocalSettingsBackupName = ConfigDirectory + "config.backup.xml"; +#else + /// Config directory is a directory in 'C:\Users\username\AppData\Local' folder + ConfigDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), + string.Format("ResultsBrowser{0}", (args.Length >= 1) ? args[0] : string.Empty)); + LogDirectory = "C:\\Temp\\ResultsBrowserLog\\"; +#endif + LocalSettingsFileName = Path.Combine(ConfigDirectory, "config.xml"); + LocalSettingsBackupName = Path.Combine(ConfigDirectory, "config.backup.xml"); /// Configue and start logging log4net.Config.XmlConfigurator.Configure(new System.IO.FileInfo(ConfigDirectory + "log4netConfig.xml")); log = LogManager.GetLogger(typeof(Program)); log.Fatal("------------------------------------------------------------------------------------------------"); log.Fatal("started"); - } - - - /// - /// The main entry point for the application. - /// - [STAThread] - static void Main(string[] args) - { - /// + + /// /// Load the local settings /// LocalSettings = LocalSettings.Load(Program.LocalSettingsFileName); @@ -93,7 +94,7 @@ namespace ResultsBrowser try { - string culture = LocalSettings.Language.Replace('_', '-'); + string culture = (LocalSettings.Language != null) ? LocalSettings.Language.Replace('_', '-') : "EN"; System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo(culture); } catch (Exception e) @@ -107,9 +108,6 @@ namespace ResultsBrowser new System.Globalization.CultureInfo("en"); } - //AltCulture = null; - AltCulture = new System.Globalization.CultureInfo("SK"); - /// This belongs to Application.Run(new MainWnd()) ... /// and should be executed before opening 'loginDlg' diff --git a/ResultsBrowser/Properties/AssemblyInfo.cs b/ResultsBrowser/Properties/AssemblyInfo.cs index 0322ccfb9..6b54be9cf 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.18.1108.0")] -[assembly: AssemblyFileVersion("2.18.1108.0")] +[assembly: AssemblyVersion("2.18.1109.0")] +[assembly: AssemblyFileVersion("2.18.1109.0")] diff --git a/ResultsBrowser/ResultsBrowserWnd.Designer.cs b/ResultsBrowser/ResultsBrowserWnd.Designer.cs index a3d7a1dcb..a2c98f09d 100644 --- a/ResultsBrowser/ResultsBrowserWnd.Designer.cs +++ b/ResultsBrowser/ResultsBrowserWnd.Designer.cs @@ -28,337 +28,351 @@ /// private void InitializeComponent() { - this.vSplitContainer = new System.Windows.Forms.SplitContainer(); - this.hSplitContainer = new System.Windows.Forms.SplitContainer(); - this.filtersGroupBox = new System.Windows.Forms.GroupBox(); - this.filtersFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); - this.resultsGroupBox = new System.Windows.Forms.GroupBox(); - this.resultsListView = new System.Windows.Forms.ListView(); - this.printerConfigBtn = new System.Windows.Forms.Button(); - this.statisticsBtn = new System.Windows.Forms.Button(); - this.printQueryResultsBtn = new System.Windows.Forms.Button(); - this.exportQueryResultsBtn = new System.Windows.Forms.Button(); - this.formatOfResultsBtn = new System.Windows.Forms.Button(); - this.clearFiltersBtn = new System.Windows.Forms.Button(); - this.settingsBtn = new System.Windows.Forms.Button(); - this.saveConfigBtn = new System.Windows.Forms.Button(); - this.loadConfigBtn = new System.Windows.Forms.Button(); - 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(); - ((System.ComponentModel.ISupportInitialize)(this.vSplitContainer)).BeginInit(); - this.vSplitContainer.Panel1.SuspendLayout(); - this.vSplitContainer.Panel2.SuspendLayout(); - this.vSplitContainer.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.hSplitContainer)).BeginInit(); - this.hSplitContainer.Panel1.SuspendLayout(); - this.hSplitContainer.Panel2.SuspendLayout(); - this.hSplitContainer.SuspendLayout(); - this.filtersGroupBox.SuspendLayout(); - this.resultsGroupBox.SuspendLayout(); - this.testBenchesGroupBox.SuspendLayout(); - this.SuspendLayout(); - // - // vSplitContainer - // - this.vSplitContainer.Dock = System.Windows.Forms.DockStyle.Fill; - this.vSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.vSplitContainer.Location = new System.Drawing.Point(0, 0); - this.vSplitContainer.Name = "vSplitContainer"; - // - // vSplitContainer.Panel1 - // - this.vSplitContainer.Panel1.Controls.Add(this.hSplitContainer); - this.vSplitContainer.Panel1MinSize = 100; - // - // vSplitContainer.Panel2 - // - this.vSplitContainer.Panel2.Controls.Add(this.printerConfigBtn); - this.vSplitContainer.Panel2.Controls.Add(this.statisticsBtn); - this.vSplitContainer.Panel2.Controls.Add(this.printQueryResultsBtn); - this.vSplitContainer.Panel2.Controls.Add(this.exportQueryResultsBtn); - this.vSplitContainer.Panel2.Controls.Add(this.formatOfResultsBtn); - this.vSplitContainer.Panel2.Controls.Add(this.clearFiltersBtn); - this.vSplitContainer.Panel2.Controls.Add(this.settingsBtn); - this.vSplitContainer.Panel2.Controls.Add(this.saveConfigBtn); - this.vSplitContainer.Panel2.Controls.Add(this.loadConfigBtn); - this.vSplitContainer.Panel2.Controls.Add(this.executeQueryBtn); - this.vSplitContainer.Panel2.Controls.Add(this.addFilterBtn); - this.vSplitContainer.Panel2.Controls.Add(this.testBenchesGroupBox); - this.vSplitContainer.Panel2MinSize = 100; - this.vSplitContainer.Size = new System.Drawing.Size(984, 712); - this.vSplitContainer.SplitterDistance = 840; - this.vSplitContainer.TabIndex = 0; - // - // hSplitContainer - // - this.hSplitContainer.Dock = System.Windows.Forms.DockStyle.Fill; - this.hSplitContainer.Location = new System.Drawing.Point(0, 0); - this.hSplitContainer.Name = "hSplitContainer"; - this.hSplitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // hSplitContainer.Panel1 - // - this.hSplitContainer.Panel1.Controls.Add(this.filtersGroupBox); - // - // hSplitContainer.Panel2 - // - this.hSplitContainer.Panel2.Controls.Add(this.resultsGroupBox); - this.hSplitContainer.Size = new System.Drawing.Size(840, 712); - this.hSplitContainer.SplitterDistance = 280; - this.hSplitContainer.TabIndex = 0; - // - // filtersGroupBox - // - this.filtersGroupBox.Controls.Add(this.filtersFlowLayoutPanel); - this.filtersGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.filtersGroupBox.Location = new System.Drawing.Point(0, 0); - this.filtersGroupBox.Name = "filtersGroupBox"; - this.filtersGroupBox.Size = new System.Drawing.Size(840, 280); - this.filtersGroupBox.TabIndex = 1; - this.filtersGroupBox.TabStop = false; - this.filtersGroupBox.Text = "Filters"; - // - // filtersFlowLayoutPanel - // - this.filtersFlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.filtersFlowLayoutPanel.Location = new System.Drawing.Point(3, 16); - this.filtersFlowLayoutPanel.Name = "filtersFlowLayoutPanel"; - this.filtersFlowLayoutPanel.Size = new System.Drawing.Size(834, 261); - this.filtersFlowLayoutPanel.TabIndex = 0; - // - // resultsGroupBox - // - this.resultsGroupBox.Controls.Add(this.resultsListView); - this.resultsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.resultsGroupBox.Location = new System.Drawing.Point(0, 0); - this.resultsGroupBox.Name = "resultsGroupBox"; - this.resultsGroupBox.Size = new System.Drawing.Size(840, 428); - this.resultsGroupBox.TabIndex = 1; - this.resultsGroupBox.TabStop = false; - this.resultsGroupBox.Text = "Query results"; - // - // resultsListView - // - this.resultsListView.Dock = System.Windows.Forms.DockStyle.Fill; - this.resultsListView.Location = new System.Drawing.Point(3, 16); - this.resultsListView.Name = "resultsListView"; - this.resultsListView.Size = new System.Drawing.Size(834, 409); - this.resultsListView.TabIndex = 0; - this.resultsListView.UseCompatibleStateImageBehavior = false; - this.resultsListView.View = System.Windows.Forms.View.Details; - // - // printerConfigBtn - // - this.printerConfigBtn.Location = new System.Drawing.Point(8, 316); - this.printerConfigBtn.Name = "printerConfigBtn"; - this.printerConfigBtn.Size = new System.Drawing.Size(125, 35); - this.printerConfigBtn.TabIndex = 11; - this.printerConfigBtn.Text = "Configure printer"; - this.printerConfigBtn.UseVisualStyleBackColor = true; - this.printerConfigBtn.Click += new System.EventHandler(this.printerConfigBtn_Click); - // - // statisticsBtn - // - this.statisticsBtn.Location = new System.Drawing.Point(8, 621); - this.statisticsBtn.Name = "statisticsBtn"; - this.statisticsBtn.Size = new System.Drawing.Size(125, 35); - this.statisticsBtn.TabIndex = 10; - this.statisticsBtn.Text = "Statistics"; - this.statisticsBtn.UseVisualStyleBackColor = true; - this.statisticsBtn.Click += new System.EventHandler(this.statisticsBtn_Click); - // - // printQueryResultsBtn - // - this.printQueryResultsBtn.Location = new System.Drawing.Point(8, 548); - this.printQueryResultsBtn.Name = "printQueryResultsBtn"; - this.printQueryResultsBtn.Size = new System.Drawing.Size(125, 35); - this.printQueryResultsBtn.TabIndex = 9; - this.printQueryResultsBtn.Text = "Print query results"; - this.printQueryResultsBtn.UseVisualStyleBackColor = true; - this.printQueryResultsBtn.Click += new System.EventHandler(this.printQueryResultsBtn_Click); - // - // exportQueryResultsBtn - // - this.exportQueryResultsBtn.Location = new System.Drawing.Point(8, 508); - this.exportQueryResultsBtn.Name = "exportQueryResultsBtn"; - this.exportQueryResultsBtn.Size = new System.Drawing.Size(125, 35); - this.exportQueryResultsBtn.TabIndex = 8; - this.exportQueryResultsBtn.Text = "Export query results"; - this.exportQueryResultsBtn.UseVisualStyleBackColor = true; - this.exportQueryResultsBtn.Click += new System.EventHandler(this.exportQueryResultsBtn_Click); - // - // formatOfResultsBtn - // - this.formatOfResultsBtn.Location = new System.Drawing.Point(8, 276); - this.formatOfResultsBtn.Name = "formatOfResultsBtn"; - this.formatOfResultsBtn.Size = new System.Drawing.Size(125, 35); - this.formatOfResultsBtn.TabIndex = 7; - this.formatOfResultsBtn.Text = "Configure output"; - this.formatOfResultsBtn.UseVisualStyleBackColor = true; - this.formatOfResultsBtn.Click += new System.EventHandler(this.formatOfResultsBtn_Click); - // - // clearFiltersBtn - // - this.clearFiltersBtn.Location = new System.Drawing.Point(8, 196); - this.clearFiltersBtn.Name = "clearFiltersBtn"; - this.clearFiltersBtn.Size = new System.Drawing.Size(125, 35); - this.clearFiltersBtn.TabIndex = 2; - this.clearFiltersBtn.Text = "Clear filters"; - this.clearFiltersBtn.UseVisualStyleBackColor = true; - this.clearFiltersBtn.Click += new System.EventHandler(this.clearFiltersBtn_Click); - // - // settingsBtn - // - this.settingsBtn.Location = new System.Drawing.Point(8, 12); - this.settingsBtn.Name = "settingsBtn"; - this.settingsBtn.Size = new System.Drawing.Size(125, 33); - this.settingsBtn.TabIndex = 0; - this.settingsBtn.Text = "Settings"; - this.settingsBtn.UseVisualStyleBackColor = true; - this.settingsBtn.Click += new System.EventHandler(this.settingsBtn_Click); - // - // saveConfigBtn - // - this.saveConfigBtn.Location = new System.Drawing.Point(8, 356); - this.saveConfigBtn.Name = "saveConfigBtn"; - this.saveConfigBtn.Size = new System.Drawing.Size(125, 35); - this.saveConfigBtn.TabIndex = 5; - this.saveConfigBtn.Text = "Save configuration"; - this.saveConfigBtn.UseVisualStyleBackColor = true; - this.saveConfigBtn.Click += new System.EventHandler(this.saveConfigBtn_Click); - // - // loadConfigBtn - // - this.loadConfigBtn.Location = new System.Drawing.Point(8, 396); - this.loadConfigBtn.Name = "loadConfigBtn"; - this.loadConfigBtn.Size = new System.Drawing.Size(125, 35); - this.loadConfigBtn.TabIndex = 4; - this.loadConfigBtn.Text = "Load configuration"; - this.loadConfigBtn.UseVisualStyleBackColor = true; - this.loadConfigBtn.Click += new System.EventHandler(this.loadConfigBtn_Click); - // - // executeQueryBtn - // - this.executeQueryBtn.Location = new System.Drawing.Point(8, 468); - this.executeQueryBtn.Name = "executeQueryBtn"; - this.executeQueryBtn.Size = new System.Drawing.Size(125, 35); - this.executeQueryBtn.TabIndex = 6; - this.executeQueryBtn.Text = "Execute query"; - this.executeQueryBtn.UseVisualStyleBackColor = true; - this.executeQueryBtn.Click += new System.EventHandler(this.executeQueryBtn_Click); - // - // addFilterBtn - // - this.addFilterBtn.Location = new System.Drawing.Point(8, 236); - this.addFilterBtn.Name = "addFilterBtn"; - this.addFilterBtn.Size = new System.Drawing.Size(125, 35); - this.addFilterBtn.TabIndex = 3; - this.addFilterBtn.Text = "Add filter"; - this.addFilterBtn.UseVisualStyleBackColor = true; - this.addFilterBtn.Click += new System.EventHandler(this.addFilterBtn_Click); - // - // 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, 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, 65); - this.checkBox3.Name = "checkBox3"; - this.checkBox3.Size = new System.Drawing.Size(85, 17); - this.checkBox3.TabIndex = 2; - this.checkBox3.TabStop = true; - this.checkBox3.Text = "radioButton3"; - this.checkBox3.UseVisualStyleBackColor = true; - this.checkBox3.CheckedChanged += new System.EventHandler(this.checkBox3_CheckedChanged); - // - // checkBox2 - // - this.checkBox2.AutoSize = true; - 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; - this.checkBox2.TabStop = true; - this.checkBox2.Text = "radioButton2"; - this.checkBox2.UseVisualStyleBackColor = true; - this.checkBox2.CheckedChanged += new System.EventHandler(this.checkBox2_CheckedChanged); - // - // checkBox1 - // - this.checkBox1.AutoSize = true; - this.checkBox1.Location = new System.Drawing.Point(23, 23); - this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(85, 17); - this.checkBox1.TabIndex = 0; - this.checkBox1.TabStop = true; - this.checkBox1.Text = "radioButton1"; - this.checkBox1.UseVisualStyleBackColor = true; - this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); - // - // ResultsBrowserWnd - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(984, 712); - this.Controls.Add(this.vSplitContainer); - this.Name = "ResultsBrowserWnd"; - this.Text = "Results Browser"; - this.Load += new System.EventHandler(this.ResultsBrowserWnd_Load); - this.vSplitContainer.Panel1.ResumeLayout(false); - this.vSplitContainer.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.vSplitContainer)).EndInit(); - this.vSplitContainer.ResumeLayout(false); - this.hSplitContainer.Panel1.ResumeLayout(false); - this.hSplitContainer.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.hSplitContainer)).EndInit(); - this.hSplitContainer.ResumeLayout(false); - this.filtersGroupBox.ResumeLayout(false); - this.resultsGroupBox.ResumeLayout(false); - this.testBenchesGroupBox.ResumeLayout(false); - this.testBenchesGroupBox.PerformLayout(); - this.ResumeLayout(false); + this.vSplitContainer = new System.Windows.Forms.SplitContainer(); + this.hSplitContainer = new System.Windows.Forms.SplitContainer(); + this.filtersGroupBox = new System.Windows.Forms.GroupBox(); + this.filtersFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); + this.resultsGroupBox = new System.Windows.Forms.GroupBox(); + this.resultsListView = new System.Windows.Forms.ListView(); + this.printerConfigBtn = new System.Windows.Forms.Button(); + this.statisticsBtn = new System.Windows.Forms.Button(); + this.printQueryResultsBtn = new System.Windows.Forms.Button(); + this.exportQueryResultsBtn = new System.Windows.Forms.Button(); + this.formatOfResultsBtn = new System.Windows.Forms.Button(); + this.clearFiltersBtn = new System.Windows.Forms.Button(); + this.settingsBtn = new System.Windows.Forms.Button(); + this.saveConfigBtn = new System.Windows.Forms.Button(); + this.loadConfigBtn = new System.Windows.Forms.Button(); + this.executeQueryBtn = new System.Windows.Forms.Button(); + this.addFilterBtn = new System.Windows.Forms.Button(); + this.testBenchesGroupBox = new System.Windows.Forms.GroupBox(); + this.checkBox6 = new System.Windows.Forms.RadioButton(); + 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(); + ((System.ComponentModel.ISupportInitialize)(this.vSplitContainer)).BeginInit(); + this.vSplitContainer.Panel1.SuspendLayout(); + this.vSplitContainer.Panel2.SuspendLayout(); + this.vSplitContainer.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.hSplitContainer)).BeginInit(); + this.hSplitContainer.Panel1.SuspendLayout(); + this.hSplitContainer.Panel2.SuspendLayout(); + this.hSplitContainer.SuspendLayout(); + this.filtersGroupBox.SuspendLayout(); + this.resultsGroupBox.SuspendLayout(); + this.testBenchesGroupBox.SuspendLayout(); + this.SuspendLayout(); + // + // vSplitContainer + // + this.vSplitContainer.Dock = System.Windows.Forms.DockStyle.Fill; + this.vSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.vSplitContainer.Location = new System.Drawing.Point(0, 0); + this.vSplitContainer.Name = "vSplitContainer"; + // + // vSplitContainer.Panel1 + // + this.vSplitContainer.Panel1.Controls.Add(this.hSplitContainer); + this.vSplitContainer.Panel1MinSize = 100; + // + // vSplitContainer.Panel2 + // + this.vSplitContainer.Panel2.Controls.Add(this.printerConfigBtn); + this.vSplitContainer.Panel2.Controls.Add(this.statisticsBtn); + this.vSplitContainer.Panel2.Controls.Add(this.printQueryResultsBtn); + this.vSplitContainer.Panel2.Controls.Add(this.exportQueryResultsBtn); + this.vSplitContainer.Panel2.Controls.Add(this.formatOfResultsBtn); + this.vSplitContainer.Panel2.Controls.Add(this.clearFiltersBtn); + this.vSplitContainer.Panel2.Controls.Add(this.settingsBtn); + this.vSplitContainer.Panel2.Controls.Add(this.saveConfigBtn); + this.vSplitContainer.Panel2.Controls.Add(this.loadConfigBtn); + this.vSplitContainer.Panel2.Controls.Add(this.executeQueryBtn); + this.vSplitContainer.Panel2.Controls.Add(this.addFilterBtn); + this.vSplitContainer.Panel2.Controls.Add(this.testBenchesGroupBox); + this.vSplitContainer.Panel2MinSize = 100; + this.vSplitContainer.Size = new System.Drawing.Size(984, 712); + this.vSplitContainer.SplitterDistance = 840; + this.vSplitContainer.TabIndex = 0; + // + // hSplitContainer + // + this.hSplitContainer.Dock = System.Windows.Forms.DockStyle.Fill; + this.hSplitContainer.Location = new System.Drawing.Point(0, 0); + this.hSplitContainer.Name = "hSplitContainer"; + this.hSplitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // hSplitContainer.Panel1 + // + this.hSplitContainer.Panel1.Controls.Add(this.filtersGroupBox); + // + // hSplitContainer.Panel2 + // + this.hSplitContainer.Panel2.Controls.Add(this.resultsGroupBox); + this.hSplitContainer.Size = new System.Drawing.Size(840, 712); + this.hSplitContainer.SplitterDistance = 280; + this.hSplitContainer.TabIndex = 0; + // + // filtersGroupBox + // + this.filtersGroupBox.Controls.Add(this.filtersFlowLayoutPanel); + this.filtersGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.filtersGroupBox.Location = new System.Drawing.Point(0, 0); + this.filtersGroupBox.Name = "filtersGroupBox"; + this.filtersGroupBox.Size = new System.Drawing.Size(840, 280); + this.filtersGroupBox.TabIndex = 1; + this.filtersGroupBox.TabStop = false; + this.filtersGroupBox.Text = "Filters"; + // + // filtersFlowLayoutPanel + // + this.filtersFlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.filtersFlowLayoutPanel.Location = new System.Drawing.Point(3, 16); + this.filtersFlowLayoutPanel.Name = "filtersFlowLayoutPanel"; + this.filtersFlowLayoutPanel.Size = new System.Drawing.Size(834, 261); + this.filtersFlowLayoutPanel.TabIndex = 0; + // + // resultsGroupBox + // + this.resultsGroupBox.Controls.Add(this.resultsListView); + this.resultsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.resultsGroupBox.Location = new System.Drawing.Point(0, 0); + this.resultsGroupBox.Name = "resultsGroupBox"; + this.resultsGroupBox.Size = new System.Drawing.Size(840, 428); + this.resultsGroupBox.TabIndex = 1; + this.resultsGroupBox.TabStop = false; + this.resultsGroupBox.Text = "Query results"; + // + // resultsListView + // + this.resultsListView.Dock = System.Windows.Forms.DockStyle.Fill; + this.resultsListView.Location = new System.Drawing.Point(3, 16); + this.resultsListView.Name = "resultsListView"; + this.resultsListView.Size = new System.Drawing.Size(834, 409); + this.resultsListView.TabIndex = 0; + this.resultsListView.UseCompatibleStateImageBehavior = false; + this.resultsListView.View = System.Windows.Forms.View.Details; + // + // printerConfigBtn + // + this.printerConfigBtn.Location = new System.Drawing.Point(8, 316); + this.printerConfigBtn.Name = "printerConfigBtn"; + this.printerConfigBtn.Size = new System.Drawing.Size(125, 35); + this.printerConfigBtn.TabIndex = 11; + this.printerConfigBtn.Text = "Configure printer"; + this.printerConfigBtn.UseVisualStyleBackColor = true; + this.printerConfigBtn.Click += new System.EventHandler(this.printerConfigBtn_Click); + // + // statisticsBtn + // + this.statisticsBtn.Location = new System.Drawing.Point(8, 621); + this.statisticsBtn.Name = "statisticsBtn"; + this.statisticsBtn.Size = new System.Drawing.Size(125, 35); + this.statisticsBtn.TabIndex = 10; + this.statisticsBtn.Text = "Statistics"; + this.statisticsBtn.UseVisualStyleBackColor = true; + this.statisticsBtn.Click += new System.EventHandler(this.statisticsBtn_Click); + // + // printQueryResultsBtn + // + this.printQueryResultsBtn.Location = new System.Drawing.Point(8, 548); + this.printQueryResultsBtn.Name = "printQueryResultsBtn"; + this.printQueryResultsBtn.Size = new System.Drawing.Size(125, 35); + this.printQueryResultsBtn.TabIndex = 9; + this.printQueryResultsBtn.Text = "Print query results"; + this.printQueryResultsBtn.UseVisualStyleBackColor = true; + this.printQueryResultsBtn.Click += new System.EventHandler(this.printQueryResultsBtn_Click); + // + // exportQueryResultsBtn + // + this.exportQueryResultsBtn.Location = new System.Drawing.Point(8, 508); + this.exportQueryResultsBtn.Name = "exportQueryResultsBtn"; + this.exportQueryResultsBtn.Size = new System.Drawing.Size(125, 35); + this.exportQueryResultsBtn.TabIndex = 8; + this.exportQueryResultsBtn.Text = "Export query results"; + this.exportQueryResultsBtn.UseVisualStyleBackColor = true; + this.exportQueryResultsBtn.Click += new System.EventHandler(this.exportQueryResultsBtn_Click); + // + // formatOfResultsBtn + // + this.formatOfResultsBtn.Location = new System.Drawing.Point(8, 276); + this.formatOfResultsBtn.Name = "formatOfResultsBtn"; + this.formatOfResultsBtn.Size = new System.Drawing.Size(125, 35); + this.formatOfResultsBtn.TabIndex = 7; + this.formatOfResultsBtn.Text = "Configure output"; + this.formatOfResultsBtn.UseVisualStyleBackColor = true; + this.formatOfResultsBtn.Click += new System.EventHandler(this.formatOfResultsBtn_Click); + // + // clearFiltersBtn + // + this.clearFiltersBtn.Location = new System.Drawing.Point(8, 196); + this.clearFiltersBtn.Name = "clearFiltersBtn"; + this.clearFiltersBtn.Size = new System.Drawing.Size(125, 35); + this.clearFiltersBtn.TabIndex = 2; + this.clearFiltersBtn.Text = "Clear filters"; + this.clearFiltersBtn.UseVisualStyleBackColor = true; + this.clearFiltersBtn.Click += new System.EventHandler(this.clearFiltersBtn_Click); + // + // settingsBtn + // + this.settingsBtn.Location = new System.Drawing.Point(8, 12); + this.settingsBtn.Name = "settingsBtn"; + this.settingsBtn.Size = new System.Drawing.Size(125, 33); + this.settingsBtn.TabIndex = 0; + this.settingsBtn.Text = "Settings"; + this.settingsBtn.UseVisualStyleBackColor = true; + this.settingsBtn.Click += new System.EventHandler(this.settingsBtn_Click); + // + // saveConfigBtn + // + this.saveConfigBtn.Location = new System.Drawing.Point(8, 356); + this.saveConfigBtn.Name = "saveConfigBtn"; + this.saveConfigBtn.Size = new System.Drawing.Size(125, 35); + this.saveConfigBtn.TabIndex = 5; + this.saveConfigBtn.Text = "Save configuration"; + this.saveConfigBtn.UseVisualStyleBackColor = true; + this.saveConfigBtn.Click += new System.EventHandler(this.saveConfigBtn_Click); + // + // loadConfigBtn + // + this.loadConfigBtn.Location = new System.Drawing.Point(8, 396); + this.loadConfigBtn.Name = "loadConfigBtn"; + this.loadConfigBtn.Size = new System.Drawing.Size(125, 35); + this.loadConfigBtn.TabIndex = 4; + this.loadConfigBtn.Text = "Load configuration"; + this.loadConfigBtn.UseVisualStyleBackColor = true; + this.loadConfigBtn.Click += new System.EventHandler(this.loadConfigBtn_Click); + // + // executeQueryBtn + // + this.executeQueryBtn.Location = new System.Drawing.Point(8, 468); + this.executeQueryBtn.Name = "executeQueryBtn"; + this.executeQueryBtn.Size = new System.Drawing.Size(125, 35); + this.executeQueryBtn.TabIndex = 6; + this.executeQueryBtn.Text = "Execute query"; + this.executeQueryBtn.UseVisualStyleBackColor = true; + this.executeQueryBtn.Click += new System.EventHandler(this.executeQueryBtn_Click); + // + // addFilterBtn + // + this.addFilterBtn.Location = new System.Drawing.Point(8, 236); + this.addFilterBtn.Name = "addFilterBtn"; + this.addFilterBtn.Size = new System.Drawing.Size(125, 35); + this.addFilterBtn.TabIndex = 3; + this.addFilterBtn.Text = "Add filter"; + this.addFilterBtn.UseVisualStyleBackColor = true; + this.addFilterBtn.Click += new System.EventHandler(this.addFilterBtn_Click); + // + // testBenchesGroupBox + // + this.testBenchesGroupBox.Controls.Add(this.checkBox6); + 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, 135); + this.testBenchesGroupBox.TabIndex = 1; + this.testBenchesGroupBox.TabStop = false; + this.testBenchesGroupBox.Text = "Test benches"; + // + // checkBox6 + // + this.checkBox6.AutoSize = true; + this.checkBox6.Location = new System.Drawing.Point(23, 110); + this.checkBox6.Name = "checkBox6"; + this.checkBox6.Size = new System.Drawing.Size(85, 17); + this.checkBox6.TabIndex = 5; + this.checkBox6.TabStop = true; + this.checkBox6.Text = "radioButton6"; + this.checkBox6.UseVisualStyleBackColor = true; + this.checkBox6.CheckedChanged += new System.EventHandler(this.checkBox6_CheckedChanged); + // + // checkBox5 + // + this.checkBox5.AutoSize = true; + this.checkBox5.Location = new System.Drawing.Point(23, 92); + 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, 74); + 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, 55); + this.checkBox3.Name = "checkBox3"; + this.checkBox3.Size = new System.Drawing.Size(85, 17); + this.checkBox3.TabIndex = 2; + this.checkBox3.TabStop = true; + this.checkBox3.Text = "radioButton3"; + this.checkBox3.UseVisualStyleBackColor = true; + this.checkBox3.CheckedChanged += new System.EventHandler(this.checkBox3_CheckedChanged); + // + // checkBox2 + // + this.checkBox2.AutoSize = true; + this.checkBox2.Location = new System.Drawing.Point(23, 36); + this.checkBox2.Name = "checkBox2"; + this.checkBox2.Size = new System.Drawing.Size(85, 17); + this.checkBox2.TabIndex = 1; + this.checkBox2.TabStop = true; + this.checkBox2.Text = "radioButton2"; + this.checkBox2.UseVisualStyleBackColor = true; + this.checkBox2.CheckedChanged += new System.EventHandler(this.checkBox2_CheckedChanged); + // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Location = new System.Drawing.Point(23, 17); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(85, 17); + this.checkBox1.TabIndex = 0; + this.checkBox1.TabStop = true; + this.checkBox1.Text = "radioButton1"; + this.checkBox1.UseVisualStyleBackColor = true; + this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); + // + // ResultsBrowserWnd + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(984, 712); + this.Controls.Add(this.vSplitContainer); + this.Name = "ResultsBrowserWnd"; + this.Text = "Results Browser"; + this.Load += new System.EventHandler(this.ResultsBrowserWnd_Load); + this.vSplitContainer.Panel1.ResumeLayout(false); + this.vSplitContainer.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.vSplitContainer)).EndInit(); + this.vSplitContainer.ResumeLayout(false); + this.hSplitContainer.Panel1.ResumeLayout(false); + this.hSplitContainer.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.hSplitContainer)).EndInit(); + this.hSplitContainer.ResumeLayout(false); + this.filtersGroupBox.ResumeLayout(false); + this.resultsGroupBox.ResumeLayout(false); + this.testBenchesGroupBox.ResumeLayout(false); + this.testBenchesGroupBox.PerformLayout(); + this.ResumeLayout(false); } @@ -387,5 +401,6 @@ private System.Windows.Forms.RadioButton checkBox5; private System.Windows.Forms.RadioButton checkBox4; private System.Windows.Forms.Button printerConfigBtn; + private System.Windows.Forms.RadioButton checkBox6; } } \ No newline at end of file diff --git a/ResultsBrowser/ResultsBrowserWnd.cs b/ResultsBrowser/ResultsBrowserWnd.cs index 0e23fee66..b91ed8572 100644 --- a/ResultsBrowser/ResultsBrowserWnd.cs +++ b/ResultsBrowser/ResultsBrowserWnd.cs @@ -62,6 +62,7 @@ namespace ResultsBrowser checkBox3.Checked = Program.LocalSettings.Bench3Selected; checkBox4.Checked = Program.LocalSettings.Bench4Selected; checkBox5.Checked = Program.LocalSettings.Bench5Selected; + checkBox6.Checked = Program.LocalSettings.Bench6Selected; if (args.Length == 1 && args[0].IndexOf(".qry") == args[0].Length - 4) { @@ -84,19 +85,24 @@ namespace ResultsBrowser checkBox3.Text = Program.LocalSettings.Bench3; checkBox4.Text = Program.LocalSettings.Bench4; checkBox5.Text = Program.LocalSettings.Bench5; + checkBox6.Text = Program.LocalSettings.Bench6; 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); + checkBox6.Visible = !string.IsNullOrEmpty(checkBox6.Text); } string BenchName() { return checkBox1.Checked ? Program.LocalSettings.Bench1 - : checkBox2.Checked ? Program.LocalSettings.Bench2 - : Program.LocalSettings.Bench3; + : checkBox2.Checked ? Program.LocalSettings.Bench2 + : checkBox3.Checked ? Program.LocalSettings.Bench3 + : checkBox4.Checked ? Program.LocalSettings.Bench4 + : checkBox5.Checked ? Program.LocalSettings.Bench5 + : Program.LocalSettings.Bench6; } void Localize() @@ -133,6 +139,7 @@ namespace ResultsBrowser 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(); } + private void checkBox6_CheckedChanged(object sender, EventArgs e) { SaveCheckBoxes(); } void SaveCheckBoxes() { @@ -141,6 +148,7 @@ namespace ResultsBrowser Program.LocalSettings.Bench3Selected = checkBox3.Checked; Program.LocalSettings.Bench4Selected = checkBox4.Checked; Program.LocalSettings.Bench5Selected = checkBox5.Checked; + Program.LocalSettings.Bench6Selected = checkBox6.Checked; Program.LocalSettings.Save(); } @@ -269,7 +277,8 @@ namespace ResultsBrowser (checkBox3.Checked ? Program.LocalSettings.ConnectionString3 : (checkBox4.Checked ? Program.LocalSettings.ConnectionString4 : (checkBox5.Checked ? Program.LocalSettings.ConnectionString5 : - Program.LocalSettings.ConnectionString1)))); + (checkBox6.Checked ? Program.LocalSettings.ConnectionString6 : + Program.LocalSettings.ConnectionString1))))); ISession[] sessions = new ISession[] { Results.DB.CreateSession() };