HeatMetersPath, UI, etc., HEAT_METERS_SUPPORT symbol introduced

ProcedureDlg modifications: (1) localization by TBF.Resources.Strings, (2) Heat meters support FlyingStartMassCollection and CombinedMeters methods with similar sequences
2016-07-06 15:59:28 +02:00
parent 7cbbb2270b
commit 0ac1fe2b4e
42 changed files with 3181 additions and 2871 deletions
@@ -51,7 +51,10 @@ namespace Results.Entities
 		public virtual double Q2_Qt()			  { return WaterMeterData.Q2_Qt; }
 		public virtual double Q1_Qmin()			  { return WaterMeterData.Q1_Qmin; }

-        public virtual bool   Compound()		     { return WaterMeterData.Compound; }
+        public virtual bool   Compound()		  { return WaterMeterData.Compound; }
+#if HEAT_METER_SUPPORT
+        public virtual bool   HeatMeter()		  { return WaterMeterData.HeatMeter; }
+#endif

        public virtual string ProducerAux()          { return WaterMeterData.ProducerAux; }
        public virtual double Q3_Qn_Aux()            { return WaterMeterData.Q3_Qn_Aux; }