iPerl ST component, symbol IPERLST_SPECIAL, etc. added to the project, ver. 2.4.260.

This commit is contained in:
Milan Hanajik
2016-04-07 15:37:49 +02:00
parent e94443ad8a
commit f901367817
23 changed files with 136 additions and 60 deletions
+4 -4
View File
@@ -20,12 +20,12 @@ namespace Results.Entities
public virtual double Q2_Qt { get; set; } /// [m3/h]
public virtual double Q1_Qmin { get; set; } /// [m3/h]
public virtual bool Compound { get; set; }
#if IPERLST
#if IPERLST || IPERLST_SPECIAL
public virtual int WMTypeId { get; set; }
public virtual int WMTypeRev { get; set; }
#endif
public WaterMeterData()
public WaterMeterData()
{
}
@@ -47,11 +47,11 @@ namespace Results.Entities
if (Q2_Qt != wmd.Q2_Qt) return false;
if (Q1_Qmin != wmd.Q1_Qmin) return false;
if (Compound != wmd.Compound) return false;
#if IPERLST
#if IPERLST || IPERLST_SPECIAL
if (WMTypeId != wmd.WMTypeId) return false;
if (WMTypeRev != wmd.WMTypeRev) return false;
#endif
return true;
return true;
}