diff --git a/Results/Forms/ResultsConfigDlg.cs b/Results/Forms/ResultsConfigDlg.cs
index 47162b42b..c35158364 100644
--- a/Results/Forms/ResultsConfigDlg.cs
+++ b/Results/Forms/ResultsConfigDlg.cs
@@ -59,7 +59,12 @@ namespace Results.Forms
{
Text = Strings.Configuration;
availableResultsLabel.Text = Strings.Available_results;
+ availableTabControl.TabPages[0].Text = "A...Z";
+ availableTabControl.TabPages[1].Text = Strings.Quantity;
+ availableTabControl.TabPages[2].Text = Strings.Category;
+
selectedResultsLabel.Text = Strings.Selected_results;
+
addButton.Text = Strings.Add;
removeButton.Text = Strings.Remove;
removeAllButton.Text = Strings.Remove_all;
diff --git a/Results/ItemID.cs b/Results/ItemID.cs
index 0d4387b91..5f460737d 100644
--- a/Results/ItemID.cs
+++ b/Results/ItemID.cs
@@ -102,7 +102,16 @@ namespace Results
Start_volume_aux, /// 92
End_volume, /// 93
End_volume_main, /// 94
- End_volume_aux, /// 95
+ End_volume_aux, /// 95
+ Error_main, /// 96
+ Error_aux, /// 97
+ Serial_Nr_main, /// 98
+ Serial_Nr_aux, /// 99
+ End_state_main, /// 100
+ End_state_aux, /// 101
+ Q_rise, /// 102
+ Q_fall, /// 103
+
Count,
}
}
diff --git a/Results/Resources/Strings.Designer.cs b/Results/Resources/Strings.Designer.cs
index 3cc59a3cc..28f8b1a41 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 Category.
+ ///
+ internal static string Category {
+ get {
+ return ResourceManager.GetString("Category", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Compound.
///
@@ -609,6 +618,15 @@ namespace Results.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Quantity.
+ ///
+ internal static string Quantity {
+ get {
+ return ResourceManager.GetString("Quantity", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Ref.pulses.
///
diff --git a/Results/Resources/Strings.cs.resx b/Results/Resources/Strings.cs.resx
index 4dd2fc2c0..ea482ed25 100644
--- a/Results/Resources/Strings.cs.resx
+++ b/Results/Resources/Strings.cs.resx
@@ -189,4 +189,10 @@
str.
+
+ Kategorie
+
+
+ Veličina
+
\ No newline at end of file
diff --git a/Results/Resources/Strings.de.resx b/Results/Resources/Strings.de.resx
index b0155ef05..9ef9ee4a0 100644
--- a/Results/Resources/Strings.de.resx
+++ b/Results/Resources/Strings.de.resx
@@ -375,4 +375,10 @@
Einzel
+
+ Kategorie
+
+
+ Größe
+
\ No newline at end of file
diff --git a/Results/Resources/Strings.resx b/Results/Resources/Strings.resx
index 193f30bf2..aa9edafda 100644
--- a/Results/Resources/Strings.resx
+++ b/Results/Resources/Strings.resx
@@ -426,4 +426,10 @@
Start mass
+
+ Category
+
+
+ Quantity
+
\ No newline at end of file
diff --git a/Results/Utils.cs b/Results/Utils.cs
index b3bb34c92..220abd88c 100644
--- a/Results/Utils.cs
+++ b/Results/Utils.cs
@@ -33,10 +33,10 @@ namespace Results
///
- /// Converts float number to a string with the specified number of valid digits
+ /// Converts float number to a string with the specified number of significant digits
///
/// Float value to be converted to a string
- /// Number of valid digits: 4, 3, or 2 (otherwise a full precision number is printed)
+ /// Number of significant digits: 4, 3, or 2 (otherwise a full precision number is printed)
/// String representation of the float number
public static string DoubleToStr(double value, int validDigits)
{
diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs
index f19fd3cc0..a43b411f1 100644
--- a/Results/WMeterRsltItemSpec.cs
+++ b/Results/WMeterRsltItemSpec.cs
@@ -217,18 +217,20 @@ namespace Results
AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state, Strings.End_state, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => w.EndState));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses, Strings.Pulses + "()", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PulsesMeter.ToString()));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses__liter, Strings.PulsesLiter + "()", Quantity.PulsePerLtr, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : (string.IsNullOrEmpty(p) ? w.GetMeterTestRslt(t).PulsesPerLiter.ToString()
- : w.GetMeterTestRslt(t).PulsesPerLiter.ToString(p))));
+ : w.GetMeterTestRslt(t).PulsesPerLiter.ToString(p))));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_pulses, Strings.RefPulses + "()", Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PulsesMaster.ToString()));
/// Water meters results (combined)
- //AllItems.Add(new ItemSpec("Q rise", "Q rise [m3/h]", null, (x, y, z) => (z.QRise() == 0) ? "-" : Utils.DoubleToStr(z.QRise(), 4)));
- //AllItems.Add(new ItemSpec("Q fall", "Q fall [m3/h]", null, (x, y, z) => (z.QFall() == 0) ? "-" : Utils.DoubleToStr(z.QFall(), 4)));
- //AllItems.Add(new ItemSpec("Error large WM", "Error-L [%]", null, (x, y, z) => x.Error.ToString("F2")));
- //AllItems.Add(new ItemSpec("Error small WM", "Error-S [%]", null, (x, y, z) => y.Error.ToString("F2")));
- //AllItems.Add(new ItemSpec("Serial Nr large WM", "s/n", null, (x, y, z) => x.SerialNr()));
- //AllItems.Add(new ItemSpec("Serial Nr small WM", "s/n", null, (x, y, z) => y.SerialNr()));
- //AllItems.Add(new ItemSpec("End state large WM", "End state", null, (x, y, z) => x.EndState()));
- //AllItems.Add(new ItemSpec("End state small WM", "End state", null, (x, y, z) => y.EndState()));
+ AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_rise, Strings.Q_rise, Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (w.QRise == 0) ? "-" : Utils.DoubleToStr(w.QRise, 4)));
+ AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_fall, Strings.Q_fall, Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (w.QFall == 0) ? "-" : Utils.DoubleToStr(w.QFall, 4)));
+ AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_main, Strings.Err_main + "()", Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : (string.IsNullOrEmpty(p) ? w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).Error.ToString()
+ : w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).Error.ToString(p))));
+ AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_aux, Strings.Err_aux + "()", Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : (string.IsNullOrEmpty(p) ? w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).Error.ToString()
+ : w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).Error.ToString(p))));
+ AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr_main, Strings.sn_main, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => w.SerialNr));
+ AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr_aux, Strings.sn_aux, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => w.SerialNrAux));
+ AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state_main, Strings.EndState_main, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => w.EndState));
+ AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state_aux, Strings.EndState_aux, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => w.EndStateAux));
/// Batch info
AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_bench_ID, Strings.Bench, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => w.Batch.TestBenchId.ToString()));
diff --git a/ResultsBrowser/Properties/AssemblyInfo.cs b/ResultsBrowser/Properties/AssemblyInfo.cs
index dd2621588..436705553 100644
--- a/ResultsBrowser/Properties/AssemblyInfo.cs
+++ b/ResultsBrowser/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Sensus")]
[assembly: AssemblyProduct("ResultsBrowser")]
-[assembly: AssemblyCopyright("Copyright © 2015 - 2016 Sensus Slovensko a.s.")]
+[assembly: AssemblyCopyright("Copyright © 2015 - 2017 Sensus Slovensko a.s.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.12.478.0")]
-[assembly: AssemblyFileVersion("2.12.478.0")]
+[assembly: AssemblyVersion("2.12.484.0")]
+[assembly: AssemblyFileVersion("2.12.484.0")]
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index d66f6617f..fffc0786d 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("2.12.483.1")]
-[assembly: AssemblyFileVersion("2.12.483.1")]
+[assembly: AssemblyVersion("2.12.484.1")]
+[assembly: AssemblyFileVersion("2.12.484.1")]