michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(1) 'bool NewQnames' added to IWaterMeter, WaterMeters.Munich and elsewhere, (2) German language : Control water temp., Temp lim lo, Temp lim hi.

Browse Source
This commit is contained in:
Milan Hanajik
2017-11-21 10:04:02 +01:00
parent 14cfb65b6b
commit 3ad842b02a
11 changed files with 68 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Results/Entities/WaterMeter.cs
+1
View File
@@ -86,6 +86,7 @@ namespace Results.Entities
public virtual string Producer() { return WaterMeterData.Producer; }
public virtual string MetrologicalClass() { return WaterMeterData.MetrologicalClass; }
public virtual string ApprovalInfo() { return WaterMeterData.ApprovalInfo; }
public virtual bool NewQnames() { return WaterMeterData.NewQnames; }
public virtual double Q4_Qmax() { return WaterMeterData.Q4_Qmax; }
public virtual double Q3_Qn() { return WaterMeterData.Q3_Qn; }
public virtual double Q2_Qt() { return WaterMeterData.Q2_Qt; }
Results/Entities/WaterMeterData.cs
+3 -1
View File
@@ -17,7 +17,8 @@ namespace Results.Entities
public virtual double DN { get; set; } /// [mm]
public virtual double L { get; set; } /// [mm]
public virtual Config.Entities.Mounting Mounting { get; set; } /// H / V / S / F
public virtual bool NewQnames { get; set; } /// Yes = Q3... No = Qn...
public virtual double Q4_Qmax { get; set; } /// [m3/h]
public virtual double Q3_Qn { get; set; } /// [m3/h]
public virtual double Q2_Qt { get; set; } /// [m3/h]
@@ -73,6 +74,7 @@ namespace Results.Entities
if (L != wmd.L) return false;
if (Mounting != wmd.Mounting) return false;
if (NewQnames != wmd.NewQnames) return false;
if (Q4_Qmax != wmd.Q4_Qmax) return false;
if (Q3_Qn != wmd.Q3_Qn) return false;
if (Q2_Qt != wmd.Q2_Qt) return false;