diff --git a/Results/ItemID.cs b/Results/ItemID.cs index a6cd9db4c..19bea8b37 100644 --- a/Results/ItemID.cs +++ b/Results/ItemID.cs @@ -91,6 +91,7 @@ namespace Results P_delta_mean, /// 84 P_delta_start, /// 85 P_delta_end, /// 86 + Meter_type, /// 87 Single, Compound or HeatMeter Count, } diff --git a/Results/Resources/Strings.Designer.cs b/Results/Resources/Strings.Designer.cs index 66b4a5482..1f9b0d7e2 100644 --- a/Results/Resources/Strings.Designer.cs +++ b/Results/Resources/Strings.Designer.cs @@ -132,6 +132,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Compound. + /// + internal static string Compound { + get { + return ResourceManager.GetString("Compound", resourceCulture); + } + } + /// /// Looks up a localized string similar to Configuration. /// @@ -294,6 +303,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Heat meter. + /// + internal static string Heat_meter { + get { + return ResourceManager.GetString("Heat_meter", resourceCulture); + } + } + /// /// Looks up a localized string similar to Item. /// @@ -312,6 +330,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Meter type. + /// + internal static string Meter_type { + get { + return ResourceManager.GetString("Meter_type", resourceCulture); + } + } + /// /// Looks up a localized string similar to Mounting. /// @@ -609,6 +636,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Single. + /// + internal static string Single { + get { + return ResourceManager.GetString("Single", resourceCulture); + } + } + /// /// Looks up a localized string similar to s/n. /// diff --git a/Results/Resources/Strings.de.resx b/Results/Resources/Strings.de.resx index 65c2d00b6..0f08441e6 100644 --- a/Results/Resources/Strings.de.resx +++ b/Results/Resources/Strings.de.resx @@ -363,4 +363,16 @@ Hersteller + + Typ + + + Verbund + + + + + + Einzel + \ No newline at end of file diff --git a/Results/Resources/Strings.resx b/Results/Resources/Strings.resx index 9b3d850a7..1fac2fa2f 100644 --- a/Results/Resources/Strings.resx +++ b/Results/Resources/Strings.resx @@ -381,4 +381,16 @@ P delta start + + Meter type + + + Compound + + + Heat meter + + + Single + \ No newline at end of file diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs index 6935491ab..79a968b4d 100644 --- a/Results/WMeterRsltItemSpec.cs +++ b/Results/WMeterRsltItemSpec.cs @@ -222,6 +222,7 @@ namespace Results /// Extra water meter data AllItems.Add(new WMeterRsltItemSpec(ItemID.Result_code, Strings.Result_code, Quantity.Number, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.ResultCode.ToString() : string.Format(f, w.ResultCode))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Remark, Strings.Remark, Quantity.String, (w, t, u, f, p) => w.Batch.Remark)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Meter_type, Strings.Meter_type, Quantity.String, (w, t, u, f, p) => w.WaterMeterData.Compound ? Strings.Compound : (w.WaterMeterData.HeatMeter ? Strings.Heat_meter : Strings.Single))); #if HEAT_METERS_SUPPORT AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy, Strings.Energy + "()", Quantity.Energy, (w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeMeter).ToString(string.IsNullOrEmpty(p) ? "F1" : p))); diff --git a/ResultsBrowser/Forms/DatabaseSettingsDlg.Designer.cs b/ResultsBrowser/Forms/DatabaseSettingsDlg.Designer.cs index 0fec74ada..8d80ade9e 100644 --- a/ResultsBrowser/Forms/DatabaseSettingsDlg.Designer.cs +++ b/ResultsBrowser/Forms/DatabaseSettingsDlg.Designer.cs @@ -28,142 +28,162 @@ /// 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.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, 158); - 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, 158); - 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, 147); - 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, 171); - this.languageTextBox.Name = "languageTextBox"; - this.languageTextBox.Size = new System.Drawing.Size(100, 20); - this.languageTextBox.TabIndex = 12; - // - // 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, 232); - 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.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(); } @@ -181,5 +201,7 @@ private System.Windows.Forms.TextBox benchNameTextBox3; private System.Windows.Forms.Label languageLabel; private System.Windows.Forms.TextBox languageTextBox; + private System.Windows.Forms.Label formatLabel; + private System.Windows.Forms.TextBox timePeriodFormatTextBox; } } \ No newline at end of file diff --git a/ResultsBrowser/Forms/DatabaseSettingsDlg.cs b/ResultsBrowser/Forms/DatabaseSettingsDlg.cs index c0872f425..82bc769bf 100644 --- a/ResultsBrowser/Forms/DatabaseSettingsDlg.cs +++ b/ResultsBrowser/Forms/DatabaseSettingsDlg.cs @@ -29,6 +29,8 @@ namespace ResultsBrowser.Forms connectionStringTextBox2.Text = Program.LocalSettings.ConnectionString2; connectionStringTextBox3.Text = Program.LocalSettings.ConnectionString3; + timePeriodFormatTextBox.Text = Program.LocalSettings.TimePeriodFormat; + languageTextBox.Text = Program.LocalSettings.Language; } @@ -36,7 +38,8 @@ namespace ResultsBrowser.Forms { Text = Strings.Settings; benchNameLabel.Text = Strings.Test_bench; - connectionStringLabel.Text = Strings.Connection_string; /// TODO: Use resources + connectionStringLabel.Text = Strings.Connection_string; + formatLabel.Text = Strings.Format; languageLabel.Text = Strings.Language; okButton.Text = Strings.OkBtnText; cancelButton.Text = Strings.CancelBtnText; @@ -52,6 +55,8 @@ namespace ResultsBrowser.Forms Program.LocalSettings.ConnectionString2 = connectionStringTextBox2.Text; Program.LocalSettings.ConnectionString3 = connectionStringTextBox3.Text; + Program.LocalSettings.TimePeriodFormat = timePeriodFormatTextBox.Text; + Program.LocalSettings.Language = languageTextBox.Text; Program.LocalSettings.Save(); diff --git a/ResultsBrowser/Forms/StatisticsDlg.cs b/ResultsBrowser/Forms/StatisticsDlg.cs index 6b821f918..52d91a002 100644 --- a/ResultsBrowser/Forms/StatisticsDlg.cs +++ b/ResultsBrowser/Forms/StatisticsDlg.cs @@ -14,14 +14,18 @@ namespace ResultsBrowser.Forms bool twoDim; Results.WMeterRsltItemSpec rowItem; - Results.WMeterRsltItemSpec rowItemExt; + Results.WMeterRsltItemSpec rowItem2; + Results.WMeterRsltItemSpec rowItem3; Results.WMeterRsltItemSpec columnItem; - Results.WMeterRsltItemSpec columnItemExt; + Results.WMeterRsltItemSpec columnItem2; + Results.WMeterRsltItemSpec columnItem3; string rowTestSpec; - string rowExtTestSpec; + string rowTestSpec2; + string rowTestSpec3; string columnTestSpec; - string columnExtTestSpec; + string columnTestSpec2; + string columnTestSpec3; IList rowValues; IList columnValues; @@ -31,17 +35,30 @@ namespace ResultsBrowser.Forms public StatisticsDlg(IList waterMeters, bool twoDim, Results.WMeterRsltItemSpec rowItem, - Results.WMeterRsltItemSpec rowItemExt, + Results.WMeterRsltItemSpec rowItem2, + Results.WMeterRsltItemSpec rowItem3, Results.WMeterRsltItemSpec columnItem, - Results.WMeterRsltItemSpec columnItemExt, + Results.WMeterRsltItemSpec columnItem2, + Results.WMeterRsltItemSpec columnItem3, string rowTestSpec, - string rowExtTestSpec, + string rowTestSpec2, + string rowTestSpec3, string columnTestSpec, - string columnExtTestSpec) + string columnTestSpec2, + string columnTestSpec3, + DateTime startDate, DateTime endDate) { InitializeComponent(); - Text = Strings.Statistics; + if (!string.IsNullOrEmpty(Program.LocalSettings.TimePeriodFormat) && (startDate != new DateTime(0)) && (endDate != new DateTime(0))) + { + Text = string.Format(Program.LocalSettings.TimePeriodFormat, startDate, endDate); + } + else + { + Text = Strings.Statistics; + } + closeButton.Text = Strings.OkBtnText; this.waterMeters = waterMeters; @@ -49,13 +66,20 @@ namespace ResultsBrowser.Forms this.twoDim = twoDim; this.rowItem = rowItem; - this.rowItemExt = rowItemExt; + this.rowItem2 = rowItem2; + this.rowItem3 = rowItem3; + this.columnItem = columnItem; - this.columnItemExt = columnItemExt; + this.columnItem2 = columnItem2; + this.columnItem3 = columnItem3; + this.rowTestSpec = rowTestSpec; - this.rowExtTestSpec = rowExtTestSpec; + this.rowTestSpec2 = rowTestSpec2; + this.rowTestSpec3 = rowTestSpec3; + this.columnTestSpec = columnTestSpec; - this.columnExtTestSpec = columnExtTestSpec; + this.columnTestSpec2 = columnTestSpec2; + this.columnTestSpec3 = columnTestSpec3; } private void StatisticsDlg_Load(object sender, EventArgs e) @@ -76,13 +100,15 @@ namespace ResultsBrowser.Forms foreach (var wm in waterMeters) { string value = rowItem.Print(wm); - if (rowItemExt != null) value = value + " | " + rowItemExt.Print(wm); - if (!rowValues.Contains(value)) rowValues.Add(value); + if (rowItem2 != null) value = value + " | " + rowItem2.Print(wm); + if (rowItem3 != null) value = value + " | " + rowItem3.Print(wm); + if (!rowValues.Contains(value)) rowValues.Add(value); if (twoDim) { value = columnItem.Print(wm); - if (columnItemExt != null) value = value + " | " + columnItemExt.Print(wm); + if (columnItem2 != null) value = value + " | " + columnItem2.Print(wm); + if (columnItem3 != null) value = value + " | " + columnItem3.Print(wm); if (!columnValues.Contains(value)) columnValues.Add(value); } } @@ -98,14 +124,16 @@ namespace ResultsBrowser.Forms for (int row = 0; row < rowValues.Count; row++) { string rowValue = rowItem.Print(wm); - if (rowItemExt != null) rowValue = rowValue + " | " + rowItemExt.Print(wm); + if (rowItem2 != null) rowValue = rowValue + " | " + rowItem2.Print(wm); + if (rowItem3 != null) rowValue = rowValue + " | " + rowItem3.Print(wm); if (twoDim) { for (int column = 0; column < columnsCount; column++) { string columnValue = columnItem.Print(wm); - if (columnItemExt != null) columnValue = columnValue + " | " + columnItemExt.Print(wm); + if (columnItem2 != null) columnValue = columnValue + " | " + columnItem2.Print(wm); + if (columnItem3 != null) columnValue = columnValue + " | " + columnItem3.Print(wm); if (rowValue == rowValues[row] && columnValue == columnValues[column]) { diff --git a/ResultsBrowser/Forms/StatisticsOptionsDlg.Designer.cs b/ResultsBrowser/Forms/StatisticsOptionsDlg.Designer.cs index 31b859171..a6b19e50f 100644 --- a/ResultsBrowser/Forms/StatisticsOptionsDlg.Designer.cs +++ b/ResultsBrowser/Forms/StatisticsOptionsDlg.Designer.cs @@ -31,20 +31,26 @@ this.cancelButton = new System.Windows.Forms.Button(); this.okButton = new System.Windows.Forms.Button(); this.rowsGroupBox = new System.Windows.Forms.GroupBox(); + this.rowTestSpecTextBox2 = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.rowsComboBox2 = new System.Windows.Forms.ComboBox(); this.rowTestSpecTextBox = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.rowsComboBox = new System.Windows.Forms.ComboBox(); this.columnsGroupBox = new System.Windows.Forms.GroupBox(); + this.columnTestSpecTextBox2 = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.columnsComboBox2 = new System.Windows.Forms.ComboBox(); this.columnTestSpecTextBox = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.columnsComboBox = new System.Windows.Forms.ComboBox(); this.twoDimCheckBox = new System.Windows.Forms.CheckBox(); - this.columnsExtComboBox = new System.Windows.Forms.ComboBox(); - this.label3 = new System.Windows.Forms.Label(); - this.columnExtTestSpecTextBox = new System.Windows.Forms.TextBox(); - this.rowExtTestSpecTextBox = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.rowsExtComboBox = new System.Windows.Forms.ComboBox(); + this.rowTestSpecTextBox3 = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.rowsComboBox3 = new System.Windows.Forms.ComboBox(); + this.columnTestSpecTextBox3 = new System.Windows.Forms.TextBox(); + this.label6 = new System.Windows.Forms.Label(); + this.columnsComboBox3 = new System.Windows.Forms.ComboBox(); this.rowsGroupBox.SuspendLayout(); this.columnsGroupBox.SuspendLayout(); this.SuspendLayout(); @@ -52,7 +58,7 @@ // cancelButton // this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancelButton.Location = new System.Drawing.Point(368, 251); + this.cancelButton.Location = new System.Drawing.Point(368, 294); this.cancelButton.Name = "cancelButton"; this.cancelButton.Size = new System.Drawing.Size(95, 38); this.cancelButton.TabIndex = 9; @@ -62,7 +68,7 @@ // // okButton // - this.okButton.Location = new System.Drawing.Point(257, 251); + this.okButton.Location = new System.Drawing.Point(257, 294); this.okButton.Name = "okButton"; this.okButton.Size = new System.Drawing.Size(95, 38); this.okButton.TabIndex = 8; @@ -72,19 +78,46 @@ // // rowsGroupBox // - this.rowsGroupBox.Controls.Add(this.rowExtTestSpecTextBox); + this.rowsGroupBox.Controls.Add(this.rowTestSpecTextBox3); + this.rowsGroupBox.Controls.Add(this.label5); + this.rowsGroupBox.Controls.Add(this.rowsComboBox3); + this.rowsGroupBox.Controls.Add(this.rowTestSpecTextBox2); this.rowsGroupBox.Controls.Add(this.label4); - this.rowsGroupBox.Controls.Add(this.rowsExtComboBox); + this.rowsGroupBox.Controls.Add(this.rowsComboBox2); this.rowsGroupBox.Controls.Add(this.rowTestSpecTextBox); this.rowsGroupBox.Controls.Add(this.label1); this.rowsGroupBox.Controls.Add(this.rowsComboBox); this.rowsGroupBox.Location = new System.Drawing.Point(38, 50); this.rowsGroupBox.Name = "rowsGroupBox"; - this.rowsGroupBox.Size = new System.Drawing.Size(427, 84); + this.rowsGroupBox.Size = new System.Drawing.Size(427, 112); this.rowsGroupBox.TabIndex = 10; this.rowsGroupBox.TabStop = false; this.rowsGroupBox.Text = "Rows"; // + // rowTestSpecTextBox2 + // + this.rowTestSpecTextBox2.Location = new System.Drawing.Point(326, 52); + this.rowTestSpecTextBox2.Name = "rowTestSpecTextBox2"; + this.rowTestSpecTextBox2.Size = new System.Drawing.Size(61, 20); + this.rowTestSpecTextBox2.TabIndex = 5; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(242, 55); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(35, 13); + this.label4.TabIndex = 4; + this.label4.Text = "label4"; + // + // rowsComboBox2 + // + this.rowsComboBox2.FormattingEnabled = true; + this.rowsComboBox2.Location = new System.Drawing.Point(32, 52); + this.rowsComboBox2.Name = "rowsComboBox2"; + this.rowsComboBox2.Size = new System.Drawing.Size(185, 21); + this.rowsComboBox2.TabIndex = 3; + // // rowTestSpecTextBox // this.rowTestSpecTextBox.Location = new System.Drawing.Point(326, 24); @@ -111,19 +144,46 @@ // // columnsGroupBox // - this.columnsGroupBox.Controls.Add(this.columnExtTestSpecTextBox); + this.columnsGroupBox.Controls.Add(this.columnTestSpecTextBox3); + this.columnsGroupBox.Controls.Add(this.label6); + this.columnsGroupBox.Controls.Add(this.columnsComboBox3); + this.columnsGroupBox.Controls.Add(this.columnTestSpecTextBox2); this.columnsGroupBox.Controls.Add(this.label3); - this.columnsGroupBox.Controls.Add(this.columnsExtComboBox); + this.columnsGroupBox.Controls.Add(this.columnsComboBox2); this.columnsGroupBox.Controls.Add(this.columnTestSpecTextBox); this.columnsGroupBox.Controls.Add(this.label2); this.columnsGroupBox.Controls.Add(this.columnsComboBox); - this.columnsGroupBox.Location = new System.Drawing.Point(38, 147); + this.columnsGroupBox.Location = new System.Drawing.Point(38, 175); this.columnsGroupBox.Name = "columnsGroupBox"; - this.columnsGroupBox.Size = new System.Drawing.Size(427, 84); + this.columnsGroupBox.Size = new System.Drawing.Size(427, 112); this.columnsGroupBox.TabIndex = 11; this.columnsGroupBox.TabStop = false; this.columnsGroupBox.Text = "Columns"; // + // columnTestSpecTextBox2 + // + this.columnTestSpecTextBox2.Location = new System.Drawing.Point(326, 51); + this.columnTestSpecTextBox2.Name = "columnTestSpecTextBox2"; + this.columnTestSpecTextBox2.Size = new System.Drawing.Size(61, 20); + this.columnTestSpecTextBox2.TabIndex = 6; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(242, 54); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(35, 13); + this.label3.TabIndex = 5; + this.label3.Text = "label3"; + // + // columnsComboBox2 + // + this.columnsComboBox2.FormattingEnabled = true; + this.columnsComboBox2.Location = new System.Drawing.Point(32, 51); + this.columnsComboBox2.Name = "columnsComboBox2"; + this.columnsComboBox2.Size = new System.Drawing.Size(185, 21); + this.columnsComboBox2.TabIndex = 4; + // // columnTestSpecTextBox // this.columnTestSpecTextBox.Location = new System.Drawing.Point(326, 23); @@ -159,53 +219,53 @@ this.twoDimCheckBox.UseVisualStyleBackColor = true; this.twoDimCheckBox.CheckedChanged += new System.EventHandler(this.twoDimCheckBox_CheckedChanged); // - // columnsExtComboBox + // rowTestSpecTextBox3 // - this.columnsExtComboBox.FormattingEnabled = true; - this.columnsExtComboBox.Location = new System.Drawing.Point(32, 51); - this.columnsExtComboBox.Name = "columnsExtComboBox"; - this.columnsExtComboBox.Size = new System.Drawing.Size(185, 21); - this.columnsExtComboBox.TabIndex = 4; + this.rowTestSpecTextBox3.Location = new System.Drawing.Point(326, 80); + this.rowTestSpecTextBox3.Name = "rowTestSpecTextBox3"; + this.rowTestSpecTextBox3.Size = new System.Drawing.Size(61, 20); + this.rowTestSpecTextBox3.TabIndex = 8; // - // label3 + // label5 // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(242, 54); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(35, 13); - this.label3.TabIndex = 5; - this.label3.Text = "label3"; + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(242, 83); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(35, 13); + this.label5.TabIndex = 7; + this.label5.Text = "label5"; // - // columnExtTestSpecTextBox + // rowsComboBox3 // - this.columnExtTestSpecTextBox.Location = new System.Drawing.Point(326, 51); - this.columnExtTestSpecTextBox.Name = "columnExtTestSpecTextBox"; - this.columnExtTestSpecTextBox.Size = new System.Drawing.Size(61, 20); - this.columnExtTestSpecTextBox.TabIndex = 6; + this.rowsComboBox3.FormattingEnabled = true; + this.rowsComboBox3.Location = new System.Drawing.Point(32, 80); + this.rowsComboBox3.Name = "rowsComboBox3"; + this.rowsComboBox3.Size = new System.Drawing.Size(185, 21); + this.rowsComboBox3.TabIndex = 6; // - // rowExtTestSpecTextBox + // columnTestSpecTextBox3 // - this.rowExtTestSpecTextBox.Location = new System.Drawing.Point(326, 52); - this.rowExtTestSpecTextBox.Name = "rowExtTestSpecTextBox"; - this.rowExtTestSpecTextBox.Size = new System.Drawing.Size(61, 20); - this.rowExtTestSpecTextBox.TabIndex = 5; + this.columnTestSpecTextBox3.Location = new System.Drawing.Point(326, 79); + this.columnTestSpecTextBox3.Name = "columnTestSpecTextBox3"; + this.columnTestSpecTextBox3.Size = new System.Drawing.Size(61, 20); + this.columnTestSpecTextBox3.TabIndex = 9; // - // label4 + // label6 // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(242, 55); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(35, 13); - this.label4.TabIndex = 4; - this.label4.Text = "label4"; + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(242, 82); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(35, 13); + this.label6.TabIndex = 8; + this.label6.Text = "label6"; // - // rowsExtComboBox + // columnsComboBox3 // - this.rowsExtComboBox.FormattingEnabled = true; - this.rowsExtComboBox.Location = new System.Drawing.Point(32, 52); - this.rowsExtComboBox.Name = "rowsExtComboBox"; - this.rowsExtComboBox.Size = new System.Drawing.Size(185, 21); - this.rowsExtComboBox.TabIndex = 3; + this.columnsComboBox3.FormattingEnabled = true; + this.columnsComboBox3.Location = new System.Drawing.Point(32, 79); + this.columnsComboBox3.Name = "columnsComboBox3"; + this.columnsComboBox3.Size = new System.Drawing.Size(185, 21); + this.columnsComboBox3.TabIndex = 7; // // StatisticsOptionsDlg // @@ -213,7 +273,7 @@ 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(503, 307); + this.ClientSize = new System.Drawing.Size(503, 355); this.Controls.Add(this.columnsGroupBox); this.Controls.Add(this.twoDimCheckBox); this.Controls.Add(this.rowsGroupBox); @@ -245,11 +305,17 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.TextBox columnTestSpecTextBox; private System.Windows.Forms.Label label2; - private System.Windows.Forms.TextBox columnExtTestSpecTextBox; + private System.Windows.Forms.TextBox columnTestSpecTextBox2; private System.Windows.Forms.Label label3; - private System.Windows.Forms.ComboBox columnsExtComboBox; - private System.Windows.Forms.TextBox rowExtTestSpecTextBox; + private System.Windows.Forms.ComboBox columnsComboBox2; + private System.Windows.Forms.TextBox rowTestSpecTextBox2; private System.Windows.Forms.Label label4; - private System.Windows.Forms.ComboBox rowsExtComboBox; + private System.Windows.Forms.ComboBox rowsComboBox2; + private System.Windows.Forms.TextBox rowTestSpecTextBox3; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.ComboBox rowsComboBox3; + private System.Windows.Forms.TextBox columnTestSpecTextBox3; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.ComboBox columnsComboBox3; } } \ No newline at end of file diff --git a/ResultsBrowser/Forms/StatisticsOptionsDlg.cs b/ResultsBrowser/Forms/StatisticsOptionsDlg.cs index 9b822efa2..394cbc8ae 100644 --- a/ResultsBrowser/Forms/StatisticsOptionsDlg.cs +++ b/ResultsBrowser/Forms/StatisticsOptionsDlg.cs @@ -1,10 +1,5 @@ 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; @@ -16,13 +11,17 @@ namespace ResultsBrowser.Forms public bool TwoDim; public Results.WMeterRsltItemSpec RowItem; - public Results.WMeterRsltItemSpec RowItemExt; + public Results.WMeterRsltItemSpec RowItem2; + public Results.WMeterRsltItemSpec RowItem3; public Results.WMeterRsltItemSpec ColumnItem; - public Results.WMeterRsltItemSpec ColumnItemExt; + public Results.WMeterRsltItemSpec ColumnItem2; + public Results.WMeterRsltItemSpec ColumnItem3; public string RowTestSpecifier; - public string RowExtTestSpecifier; + public string RowTestSpecifier2; + public string RowTestSpecifier3; public string ColumnTestSpecifier; - public string ColumnExtTestSpecifier; + public string ColumnTestSpecifier2; + public string ColumnTestSpecifier3; public StatisticsOptionsDlg(IList items) { @@ -38,23 +37,29 @@ namespace ResultsBrowser.Forms columnsComboBox.Enabled = twoDimCheckBox.Checked = TwoDim = Program.LocalSettings.TwoDim; rowsComboBox.Text = Program.LocalSettings.RowItemCaption; - rowsExtComboBox.Text = Program.LocalSettings.RowExtItemCaption; + rowsComboBox2.Text = Program.LocalSettings.RowItemCaption2; + rowsComboBox3.Text = Program.LocalSettings.RowItemCaption3; columnsComboBox.Text = Program.LocalSettings.ColumnItemCaption; - columnsExtComboBox.Text = Program.LocalSettings.ColumnExtItemCaption; - /// + columnsComboBox2.Text = Program.LocalSettings.ColumnItemCaption2; + columnsComboBox3.Text = Program.LocalSettings.ColumnItemCaption3; + /// foreach (var item in items) { rowsComboBox.Items.Add(item.Caption); - rowsExtComboBox.Items.Add(item.Caption); + rowsComboBox2.Items.Add(item.Caption); + rowsComboBox3.Items.Add(item.Caption); columnsComboBox.Items.Add(item.Caption); - columnsExtComboBox.Items.Add(item.Caption); - } + columnsComboBox2.Items.Add(item.Caption); + columnsComboBox3.Items.Add(item.Caption); + } rowTestSpecTextBox.Text = RowTestSpecifier = Program.LocalSettings.RowTestSpecifier; - rowExtTestSpecTextBox.Text = RowExtTestSpecifier = Program.LocalSettings.RowExtTestSpecifier; + rowTestSpecTextBox2.Text = RowTestSpecifier2 = Program.LocalSettings.RowTestSpecifier2; + rowTestSpecTextBox3.Text = RowTestSpecifier3 = Program.LocalSettings.RowTestSpecifier3; columnTestSpecTextBox.Text = ColumnTestSpecifier = Program.LocalSettings.ColumnTestSpecifier; - columnExtTestSpecTextBox.Text = ColumnExtTestSpecifier = Program.LocalSettings.ColumnExtTestSpecifier; - } + columnTestSpecTextBox2.Text = ColumnTestSpecifier2 = Program.LocalSettings.ColumnTestSpecifier2; + columnTestSpecTextBox3.Text = ColumnTestSpecifier3 = Program.LocalSettings.ColumnTestSpecifier3; + } void Localize() { @@ -67,6 +72,8 @@ namespace ResultsBrowser.Forms label2.Text = Strings.Test; label3.Text = Strings.Test; label4.Text = Strings.Test; + label5.Text = Strings.Test; + label6.Text = Strings.Test; } private void twoDimCheckBox_CheckedChanged(object sender, EventArgs e) @@ -78,21 +85,27 @@ namespace ResultsBrowser.Forms { TwoDim = twoDimCheckBox.Checked; RowTestSpecifier = rowTestSpecTextBox.Text; - RowExtTestSpecifier = rowExtTestSpecTextBox.Text; + RowTestSpecifier2 = rowTestSpecTextBox2.Text; + RowTestSpecifier3 = rowTestSpecTextBox3.Text; ColumnTestSpecifier = columnTestSpecTextBox.Text; - ColumnExtTestSpecifier = columnExtTestSpecTextBox.Text; + ColumnTestSpecifier2 = columnTestSpecTextBox2.Text; + ColumnTestSpecifier3 = columnTestSpecTextBox3.Text; RowItem = null; - RowItemExt = null; + RowItem2 = null; + RowItem3 = null; ColumnItem = null; - ColumnItemExt = null; + ColumnItem2 = null; + ColumnItem3 = null; foreach (var item in items) { if (!string.IsNullOrEmpty(rowsComboBox.Text) && rowsComboBox.Text.Equals(item.Caption)) RowItem = item; - if (!string.IsNullOrEmpty(rowsExtComboBox.Text) && rowsExtComboBox.Text.Equals(item.Caption)) RowItemExt = item; + if (!string.IsNullOrEmpty(rowsComboBox2.Text) && rowsComboBox2.Text.Equals(item.Caption)) RowItem2 = item; + if (!string.IsNullOrEmpty(rowsComboBox3.Text) && rowsComboBox3.Text.Equals(item.Caption)) RowItem3 = item; if (!string.IsNullOrEmpty(columnsComboBox.Text) && TwoDim && columnsComboBox.Text.Equals(item.Caption)) ColumnItem = item; - if (!string.IsNullOrEmpty(columnsExtComboBox.Text) && TwoDim && columnsExtComboBox.Text.Equals(item.Caption)) ColumnItemExt = item; + if (!string.IsNullOrEmpty(columnsComboBox2.Text) && TwoDim && columnsComboBox2.Text.Equals(item.Caption)) ColumnItem2 = item; + if (!string.IsNullOrEmpty(columnsComboBox3.Text) && TwoDim && columnsComboBox3.Text.Equals(item.Caption)) ColumnItem3 = item; } @@ -104,14 +117,18 @@ namespace ResultsBrowser.Forms Program.LocalSettings.TwoDim = TwoDim; Program.LocalSettings.RowItemCaption = RowItem.Caption; - Program.LocalSettings.RowExtItemCaption = (RowItemExt != null) ? RowItemExt.Caption : string.Empty; + Program.LocalSettings.RowItemCaption2 = (RowItem2 != null) ? RowItem2.Caption : string.Empty; + Program.LocalSettings.RowItemCaption3 = (RowItem3 != null) ? RowItem3.Caption : string.Empty; Program.LocalSettings.ColumnItemCaption = (ColumnItem != null) ? ColumnItem.Caption : string.Empty; - Program.LocalSettings.ColumnExtItemCaption = (ColumnItemExt != null) ? ColumnItemExt.Caption : string.Empty; - Program.LocalSettings.RowTestSpecifier = RowTestSpecifier; - Program.LocalSettings.RowExtTestSpecifier = RowExtTestSpecifier; + Program.LocalSettings.ColumnItemCaption2 = (ColumnItem2 != null) ? ColumnItem2.Caption : string.Empty; + Program.LocalSettings.ColumnItemCaption3 = (ColumnItem3 != null) ? ColumnItem3.Caption : string.Empty; + Program.LocalSettings.RowTestSpecifier = RowTestSpecifier; + Program.LocalSettings.RowTestSpecifier2 = RowTestSpecifier2; + Program.LocalSettings.RowTestSpecifier3 = RowTestSpecifier3; Program.LocalSettings.ColumnTestSpecifier = ColumnTestSpecifier; - Program.LocalSettings.ColumnExtTestSpecifier = ColumnExtTestSpecifier; - Program.LocalSettings.Save(); + Program.LocalSettings.ColumnTestSpecifier2 = ColumnTestSpecifier2; + Program.LocalSettings.ColumnTestSpecifier3 = ColumnTestSpecifier3; + Program.LocalSettings.Save(); DialogResult = DialogResult.OK; Close(); diff --git a/ResultsBrowser/LocalSettings.cs b/ResultsBrowser/LocalSettings.cs index 2e0675c6f..c5f16555c 100644 --- a/ResultsBrowser/LocalSettings.cs +++ b/ResultsBrowser/LocalSettings.cs @@ -37,16 +37,22 @@ namespace ResultsBrowser public bool Bench2Selected; public bool Bench3Selected; + public string TimePeriodFormat; + /// Statistics options public bool TwoDim; public string RowItemCaption; - public string RowExtItemCaption; + public string RowItemCaption2; + public string RowItemCaption3; public string ColumnItemCaption; - public string ColumnExtItemCaption; - public string RowTestSpecifier; - public string RowExtTestSpecifier; + public string ColumnItemCaption2; + public string ColumnItemCaption3; + public string RowTestSpecifier; + public string RowTestSpecifier2; + public string RowTestSpecifier3; public string ColumnTestSpecifier; - public string ColumnExtTestSpecifier; + public string ColumnTestSpecifier2; + public string ColumnTestSpecifier3; public bool FilterPurchaseOrder; diff --git a/ResultsBrowser/Resources/Strings.resx b/ResultsBrowser/Resources/Strings.resx index fc1cc1cdc..04deb6d57 100644 --- a/ResultsBrowser/Resources/Strings.resx +++ b/ResultsBrowser/Resources/Strings.resx @@ -798,4 +798,7 @@ Count + + Format + \ No newline at end of file diff --git a/ResultsBrowser/Resources/Strings1.Designer.cs b/ResultsBrowser/Resources/Strings1.Designer.cs index e45c1f5c7..628a7ed9b 100644 --- a/ResultsBrowser/Resources/Strings1.Designer.cs +++ b/ResultsBrowser/Resources/Strings1.Designer.cs @@ -1176,6 +1176,15 @@ namespace ResultsBrowser.Resources { } } + /// + /// Looks up a localized string similar to Format. + /// + internal static string Format { + get { + return ResourceManager.GetString("Format", resourceCulture); + } + } + /// /// Looks up a localized string similar to Format of results. /// diff --git a/ResultsBrowser/ResultsBrowserWnd.cs b/ResultsBrowser/ResultsBrowserWnd.cs index 3acbcc49c..328ed8bf5 100644 --- a/ResultsBrowser/ResultsBrowserWnd.cs +++ b/ResultsBrowser/ResultsBrowserWnd.cs @@ -1,10 +1,5 @@ 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 NHibernate; using Results.Entities; @@ -24,13 +19,19 @@ namespace ResultsBrowser IList waterMeters; + DateTime timePeriodStart; + DateTime timePeriodEnd; + public ResultsBrowserWnd(string[] args) { InitializeComponent(); filters = new List(); filtersConfig = new FiltersConfig(); this.args = args; - } + + timePeriodStart = new DateTime(0); + timePeriodEnd = new DateTime(0); + } private void ResultsBrowserWnd_Load(object sender, EventArgs e) { @@ -193,6 +194,9 @@ namespace ResultsBrowser private void executeQueryBtn_Click(object sender, EventArgs e) { + timePeriodStart = new DateTime(0); + timePeriodEnd = new DateTime(0); + try { foreach (var filter in filters) filter.UI2Data(); /// Update filter data @@ -209,6 +213,11 @@ namespace ResultsBrowser foreach (var filter in filters) { + if (filter is DateFilter) + { + timePeriodStart = (filter as DateFilter).From; + timePeriodEnd = (filter as DateFilter).To; + } waterMeters2 = filter.ExecuteQuery(sessions, waterMeters); waterMeters = waterMeters2; } @@ -319,9 +328,11 @@ namespace ResultsBrowser /// Calculate statistics /// Forms.StatisticsDlg statisticsDlg = new Forms.StatisticsDlg(waterMeters, optionsDlg.TwoDim, - optionsDlg.RowItem, optionsDlg.RowItemExt, optionsDlg.ColumnItem, optionsDlg.ColumnItemExt, - optionsDlg.RowTestSpecifier, optionsDlg.RowExtTestSpecifier, - optionsDlg.ColumnTestSpecifier, optionsDlg.ColumnExtTestSpecifier); + optionsDlg.RowItem, optionsDlg.RowItem2, optionsDlg.RowItem3, + optionsDlg.ColumnItem, optionsDlg.ColumnItem2, optionsDlg.ColumnItem3, + optionsDlg.RowTestSpecifier, optionsDlg.RowTestSpecifier2, optionsDlg.RowTestSpecifier3, + optionsDlg.ColumnTestSpecifier, optionsDlg.ColumnTestSpecifier2, optionsDlg.ColumnTestSpecifier3, + timePeriodStart, timePeriodEnd); statisticsDlg.ShowDialog(); } }