From 74738ff78ccc7e28367c66363023754643d095ae Mon Sep 17 00:00:00 2001
From: Milan Hanajik <hanajikmilan@gmail.com>
Date: Fri, 19 Aug 2016 15:36:07 +0200
Subject: [PATCH] Heat meters results items.

---
 Results/ItemID.cs                     |  4 ++--
 Results/Resources/Strings.Designer.cs | 18 ++++++++++++++++++
 Results/Resources/Strings.resx        |  6 ++++++
 Results/WMeterRsltItemSpec.cs         |  4 ++++
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/Results/ItemID.cs b/Results/ItemID.cs
index ccabb3c7c..c9857e916 100644
--- a/Results/ItemID.cs
+++ b/Results/ItemID.cs
@@ -67,12 +67,12 @@ namespace Results
         Pulses,                         /// 60
         Pulses__liter,                  /// 61
         Reference_pulses,               /// 62
-        spare_63,
+        Reference_energy,				/// 63
         Test_bench_ID,                  /// 64
         Program_version,                /// 65
         User_name,                      /// 66
         User_nr,                        /// 67
-        spare_68,
+        Energy,							/// 68
         Watermeters,                    /// 69
         Protocol_title,                 /// 70
         Batch_start_time,               /// 71
diff --git a/Results/Resources/Strings.Designer.cs b/Results/Resources/Strings.Designer.cs
index 0d27b4e99..56093400e 100644
--- a/Results/Resources/Strings.Designer.cs
+++ b/Results/Resources/Strings.Designer.cs
@@ -195,6 +195,24 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Energy.
+        /// </summary>
+        internal static string Energy {
+            get {
+                return ResourceManager.GetString("Energy", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Energy ref..
+        /// </summary>
+        internal static string Energy_ref {
+            get {
+                return ResourceManager.GetString("Energy_ref", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Err. aux..
         /// </summary>
diff --git a/Results/Resources/Strings.resx b/Results/Resources/Strings.resx
index f9e558497..59e07ef22 100644
--- a/Results/Resources/Strings.resx
+++ b/Results/Resources/Strings.resx
@@ -363,4 +363,10 @@
   <data name="Mounting" xml:space="preserve">
     <value>Mounting</value>
   </data>
+  <data name="Energy" xml:space="preserve">
+    <value>Energy</value>
+  </data>
+  <data name="Energy_ref" xml:space="preserve">
+    <value>Energy ref.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs
index a24493433..afbc13381 100644
--- a/Results/WMeterRsltItemSpec.cs
+++ b/Results/WMeterRsltItemSpec.cs
@@ -135,6 +135,10 @@ namespace Results
             /// Single and combined meter results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume,              Strings.Volume + "()",      (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeMeter).ToString(string.IsNullOrEmpty(p) ? "F3" : p)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_volume,    Strings.VolRef + "()",      (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeRef).ToString(string.IsNullOrEmpty(p) ? "F3" : p)));
+#if HEAT_METERS_SUPPORT
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy,              Strings.Energy + "()",      (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).Energy).ToString(string.IsNullOrEmpty(p) ? "F1" : p)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_energy,    Strings.Energy_ref + "()",  (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).RefEnergy).ToString(string.IsNullOrEmpty(p) ? "F1" : p)));
+#endif
 #if IPERLST || IPERLST_SPECIAL 
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Error,               Strings.Error + "()",       (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "0" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).Error).ToString(string.IsNullOrEmpty(p) ? "F2" : p)));
 #else