diff --git a/Config/Data.cs b/Config/Data.cs index fff74f4ac..d398817ff 100644 --- a/Config/Data.cs +++ b/Config/Data.cs @@ -42,13 +42,13 @@ namespace Config public const int CompoundWMsCount = 1; public const int HeatMetersCount = 0; public const int MaxPartNr = WMsCount / LineSize; -#elif IPERLST +#elif TURA_IPERL public const int WMsCount = 40; public const int LineSize = 20; public const int CompoundWMsCount = 1; public const int HeatMetersCount = 0; public const int MaxPartNr = WMsCount / LineSize; -#elif IPERLST_SPECIAL +#elif TURA_SPECIAL public const int WMsCount = 6; public const int LineSize = 6; public const int CompoundWMsCount = 1; diff --git a/Config/Entities/Test.cs b/Config/Entities/Test.cs index ad3be6274..3b2ff1f39 100644 --- a/Config/Entities/Test.cs +++ b/Config/Entities/Test.cs @@ -44,7 +44,7 @@ namespace Config.Entities public virtual string BenchPath { get; set; } public virtual string OutputPath { get; set; } public virtual string MetersPath { get; set; } -#if HEAT_METERS_SUPPORT +#if HEAT_METERS public virtual string HeatMetersPath { get; set; } #endif public virtual string RelTransBefore { get; set; } @@ -129,7 +129,7 @@ namespace Config.Entities result.BenchPath = BenchPath; result.OutputPath = OutputPath; result.MetersPath = MetersPath; -#if HEAT_METERS_SUPPORT +#if HEAT_METERS result.HeatMetersPath = HeatMetersPath; #endif result.RelTransBefore = RelTransBefore; diff --git a/Config/Entities/User.cs b/Config/Entities/User.cs index a0cea0123..2c1b5f698 100644 --- a/Config/Entities/User.cs +++ b/Config/Entities/User.cs @@ -29,10 +29,10 @@ namespace Config.Entities { this.powerUser = false; Groups = new List(); -#if IPERLST || IPERLST_SPECIAL +#if ORACLE_DB Number = 6; #else - Number = 0; + Number = 0; #endif } diff --git a/Config/Mappings/HeatMetersPathMap.cs b/Config/Mappings/HeatMetersPathMap.cs index 9f9d9fadc..7c03888a0 100644 --- a/Config/Mappings/HeatMetersPathMap.cs +++ b/Config/Mappings/HeatMetersPathMap.cs @@ -6,7 +6,7 @@ using Config.Entities; namespace Config.Mappings { -#if HEAT_METERS_SUPPORT +#if HEAT_METERS class HeatMetersPathMap : ClassMap { public HeatMetersPathMap() diff --git a/Config/Mappings/TestMap.cs b/Config/Mappings/TestMap.cs index 89ec3e11a..af51d7d7d 100644 --- a/Config/Mappings/TestMap.cs +++ b/Config/Mappings/TestMap.cs @@ -44,7 +44,7 @@ namespace Config.Mappings Map(x => x.BenchPath); Map(x => x.OutputPath); Map(x => x.MetersPath); -#if HEAT_METERS_SUPPORT +#if HEAT_METERS Map(x => x.HeatMetersPath); #endif Map(x => x.RelTransBefore); diff --git a/Results/BatchResults.cs b/Results/BatchResults.cs index 8b8924e39..1510507f1 100644 --- a/Results/BatchResults.cs +++ b/Results/BatchResults.cs @@ -49,7 +49,7 @@ namespace Results ProtocolTitle = procedure.ProtocolTitle, StartTime = DateTime.Now, Compound = (procedure.MetersKind == Config.Entities.MetersKind.Combined), -#if HEAT_METERS_SUPPORT +#if HEAT_METERS HeatMeter = (procedure.MetersKind == Config.Entities.MetersKind.HeatMeter), #endif }; diff --git a/Results/Entities/WaterMeter.cs b/Results/Entities/WaterMeter.cs index 64d920cff..3b4c314e0 100644 --- a/Results/Entities/WaterMeter.cs +++ b/Results/Entities/WaterMeter.cs @@ -21,7 +21,7 @@ namespace Results.Entities public virtual bool Passed { get; set; } public virtual int ResultCode { get; set; } -#if IPERLST || IPERLST_SPECIAL +#if IPERL public virtual int SerialNrEx { get; set; } /// Aux s/n for compound meters, Serial number for iPerl water meter public virtual double OrigCalibFactor { get; set; } /// iPerl calibration factor used during the test public virtual double CalibFactor { get; set; } /// iPerl calibration factor used during the test @@ -35,7 +35,7 @@ namespace Results.Entities public virtual int Pruefindex { get; set; } /// Not mapped to DB !!! 0=unknown (saving to Oracle failed), >=1 ... pruefindex public virtual int HydrPruefung { get; set; } /// Not mapped to DB !!! #endif - public virtual WaterMeterData WaterMeterData { get; set; } + public virtual WaterMeterData WaterMeterData { get; set; } public virtual Batch Batch { get; set; } public virtual IList MeterTestRslts { get; set; } @@ -130,10 +130,10 @@ namespace Results.Entities public override string ToString() { StringBuilder sb = new StringBuilder(80); -#if IPERLST || IPERLST_SPECIAL +#if IPERL sb.AppendFormat("PCB:{0} S/N:{1} ", SerialNr, SerialNrEx); #else - sb.AppendFormat("S/N:{0} ", SerialNr); + sb.AppendFormat("S/N:{0} ", SerialNr); #endif foreach (var tr in MeterTestRslts) sb.AppendFormat(" {0}:{1}%", tr.Name(), tr.Error.ToString("F2")); diff --git a/Results/Entities/WaterMeterData.cs b/Results/Entities/WaterMeterData.cs index 167697c1a..c906aa50d 100644 --- a/Results/Entities/WaterMeterData.cs +++ b/Results/Entities/WaterMeterData.cs @@ -49,12 +49,12 @@ namespace Results.Entities public virtual bool Compound { get; set; } public virtual bool HeatMeter { get; set; } -#if IPERLST || IPERLST_SPECIAL +#if IPERL public virtual int WMTypeId { get; set; } public virtual int WMTypeRev { get; set; } #endif - public WaterMeterData() + public WaterMeterData() { } @@ -103,11 +103,11 @@ namespace Results.Entities if (Compound != wmd.Compound) return false; if (HeatMeter != wmd.HeatMeter) return false; -#if IPERLST || IPERLST_SPECIAL +#if IPERL if (WMTypeId != wmd.WMTypeId) return false; if (WMTypeRev != wmd.WMTypeRev) return false; #endif - return true; + return true; } diff --git a/Results/Mappings/TestRsltMap.cs b/Results/Mappings/TestRsltMap.cs index 064fcf6b5..c069031c6 100644 --- a/Results/Mappings/TestRsltMap.cs +++ b/Results/Mappings/TestRsltMap.cs @@ -36,7 +36,7 @@ namespace Results.Mappings Map(x => x.VolumeCTV); Map(x => x.VolumeMaster); Map(x => x.ErrorMaster); -#if HEAT_METERS_SUPPORT +#if HEAT_METERS Map(x => x.RefEnergy); #endif Map(x => x.AmbTempMean).Column("AmbientTempAve"); diff --git a/Results/Mappings/WaterMeterDataMap.cs b/Results/Mappings/WaterMeterDataMap.cs index 62b36871f..7d57bcbdb 100644 --- a/Results/Mappings/WaterMeterDataMap.cs +++ b/Results/Mappings/WaterMeterDataMap.cs @@ -49,10 +49,10 @@ namespace Results.Mappings #if HEAT_METER_SUPPORT Map(x => x.HeatMeter); #endif -#if IPERLST || IPERLST_SPECIAL +#if IPERL Map(x => x.WMTypeId); Map(x => x.WMTypeRev); #endif - } + } } } diff --git a/Results/Mappings/WaterMeterMap.cs b/Results/Mappings/WaterMeterMap.cs index 122a0f40d..3cfd7d1dc 100644 --- a/Results/Mappings/WaterMeterMap.cs +++ b/Results/Mappings/WaterMeterMap.cs @@ -23,7 +23,7 @@ namespace Results.Mappings Map(x => x.Passed); Map(x => x.ResultCode); -#if IPERLST || IPERLST_SPECIAL +#if IPERL Map(x => x.SerialNrEx); Map(x => x.OrigCalibFactor); Map(x => x.CalibFactor); @@ -35,7 +35,7 @@ namespace Results.Mappings Map(x => x.Hz2CorrectionDone); Map(x => x.Hz2Correction); #endif - References(x => x.WaterMeterData); + References(x => x.WaterMeterData); References(x => x.Batch); HasMany(x => x.MeterTestRslts) .Cascade.All(); diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs index 8c31e02de..bcee09cbb 100644 --- a/Results/WMeterRsltItemSpec.cs +++ b/Results/WMeterRsltItemSpec.cs @@ -141,7 +141,7 @@ namespace Results /// Single and combined meter results AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume, Strings.Volume + "()", Quantity.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 + "()", Quantity.Volume, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeRef).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); -#if IPERLST || IPERLST_SPECIAL +#if TURA_IPERL || TURA_SPECIAL AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, Strings.Error + "()", Quantity.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 AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, Strings.Error + "()", Quantity.Error, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).Error).ToString(string.IsNullOrEmpty(p) ? "F2" : p))); @@ -233,7 +233,7 @@ namespace Results AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume_main, Strings.End_volume_main + "()", Quantity.Volume, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeEnd).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume_aux, Strings.End_volume_aux + "()", Quantity.Volume, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeEnd).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); -#if HEAT_METERS_SUPPORT +#if HEAT_METERS AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy, Strings.Energy + "()", Quantity.Energy, (w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeMeter).ToString(string.IsNullOrEmpty(p) ? "F1" : p))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_energy, Strings.Energy_ref + "()", Quantity.Energy, (w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeRef).ToString(string.IsNullOrEmpty(p) ? "F1" : p))); AllItems.Add(new WMeterRsltItemSpec(ItemID.TempHiMean, "T hi me", Quantity.Temperature, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).Custom1).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); diff --git a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs index 58e5fddef..be72ddbb5 100644 --- a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs +++ b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs @@ -214,7 +214,7 @@ namespace TBF.BenchControl.DB.SensusOracle if (batch.WaterMeters.Count == 0) return Event.ResultsWritten; bool anyError = false; -#if IPERLST || IPERLST_SPECIAL +#if ORACLE_DB if (DBCfg.DebugLevel != DebugMode.Simulate) { if (WriteResultsToDatabase(connection, batch, false) == Retv.Error) anyError = true; @@ -241,7 +241,7 @@ namespace TBF.BenchControl.DB.SensusOracle public static Retv WriteLogsToDisk(StreamWriter logger, Results.Entities.Batch batch) { -#if IPERLST || IPERLST_SPECIAL +#if TURA_IPERL || TURA_SPECIAL if (logger == null) return Retv.Error; Results.Entities.WaterMeter wm0 = null; @@ -740,10 +740,10 @@ namespace TBF.BenchControl.DB.SensusOracle } #endif return Retv.OK; /// OK - } + } -#if IPERLST || IPERLST_SPECIAL +#if ORACLE_DB public static Retv WriteResultsToDatabase(OracleConnection conn, Results.Entities.Batch batch, bool safeMode) { OracleTransaction transaction = null; @@ -1086,5 +1086,5 @@ namespace TBF.BenchControl.DB.SensusOracle return retv; } #endif - } + } } diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs index 6ade43804..072da4a56 100644 --- a/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs @@ -237,7 +237,7 @@ namespace TBF.BenchControl.DataEntry.iPerl WaterMeters.iPerl.WaterMeter iPerl = Sequences.SequenceBase.WaterMeters[wm.WMPosition - 1] as WaterMeters.iPerl.WaterMeter; if (iPerl != null) { -#if IPERLST || IPERLST_SPECIAL +#if IPERL wm.OrigCalibFactor = iPerl.OriginalCalibFactor; wm.CalibFactor = iPerl.CalibrationFactor; wm.Q2ErrWOCorrection = iPerl.Q2ErrorWOCorrection; diff --git a/TestBenchFramework/BenchControl/Elde/Common.cs b/TestBenchFramework/BenchControl/Elde/Common.cs index 30a65e9cc..c5c7911f3 100644 --- a/TestBenchFramework/BenchControl/Elde/Common.cs +++ b/TestBenchFramework/BenchControl/Elde/Common.cs @@ -19,7 +19,7 @@ namespace TBF.BenchControl.Elde EnduranceCycleStop = 13, } -#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || IPERLST || IPERLST_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_PT200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN +#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_PT200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN public enum StatusP : ulong { RefFlowMeterMask = 0x7, diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs index 1da136f1f..6a827cae3 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs @@ -128,7 +128,7 @@ namespace TBF.BenchControl.Elde #elif GENESIS || BERLIN public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[7] { 1, 1, 1, 1, 1, 1, 1 }; -#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || IPERLST || IPERLST_SPECIAL || MURES_PT40 || FUZHOU_40 || SLM_50 +#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || TURA_IPERL || TURA_SPECIAL || MURES_PT40 || FUZHOU_40 || SLM_50 public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 }; #elif SLM_END || WARSAW_END @@ -281,13 +281,13 @@ ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent, } else { -#if GENESIS - BalanceRange = new uint[tankCapacities.Length]; -#endif - int cnt = Math.Min(BalanceRange.Length, tankCapacities.Length); - for (int i = 0; i < cnt; i++) + /// Default number of scales (and BalanceRange length) is 2. + /// If there are more scales, BalanceRange length is larger. + int scalesCnt = Math.Max(2, tankCapacities.Length); + BalanceRange = new uint[scalesCnt]; + for (int i = 0; i < scalesCnt; i++) { - BalanceRange[i] = (uint)tankCapacities[i]; + BalanceRange[i] = (uint)((i < tankCapacities.Length) ? tankCapacities[i] : 0); } controlCom = new ControlComWrap(ctrlBrdComponent); } diff --git a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs index d2deadc29..a6057d63f 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs @@ -326,7 +326,7 @@ namespace TBF.BenchControl.Elde uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses }; ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF), (ulong)(route >> 64), pulsesArr, (uint)testMethods, filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); -#else /// if IPERLST || IPERLST_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END +#else /// if TURA_IPERL || TURA_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses }; ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, pulsesArr, (uint)testMethods, filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); diff --git a/TestBenchFramework/BenchControl/Elde/StartMeasurementOp.cs b/TestBenchFramework/BenchControl/Elde/StartMeasurementOp.cs index 728c9eaa9..0a4ebb78c 100644 --- a/TestBenchFramework/BenchControl/Elde/StartMeasurementOp.cs +++ b/TestBenchFramework/BenchControl/Elde/StartMeasurementOp.cs @@ -107,7 +107,7 @@ namespace TBF.BenchControl.Elde public void Start() { controlBoard.SyncRoute(); -#if IPERLST || IPERLST_SPECIAL || BADGER_VELKA_TRAT || SLM_50 +#if TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || SLM_50 int flowMeterIdxAndDiv = flowMeterNr + 16 * diverterNr; #else int flowMeterIdxAndDiv = flowMeterNr; diff --git a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs index 95a77ab74..f84cf211e 100644 --- a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs +++ b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs @@ -293,9 +293,9 @@ namespace TBF.BenchControl.Sequences waterMeterData[wmNr].Q3_Qn_Aux = WaterMeters[auxIx].Q3_Qn; waterMeterData[wmNr].MetrologicalClassAux = WaterMeters[auxIx].MetrologicalClass; waterMeterData[wmNr].ApprovalInfoAux = WaterMeters[auxIx].ApprovalInfo; - } + } -#if IPERLST || IPERLST_SPECIAL +#if IPERL BenchControl.WaterMeters.iPerl.WaterMeter iPerl = WaterMeters[wmNr] as BenchControl.WaterMeters.iPerl.WaterMeter; if (iPerl != null) { @@ -303,7 +303,7 @@ namespace TBF.BenchControl.Sequences waterMeterData[wmNr].WMTypeRev = iPerl.WMType_Rev; } #endif - } + } /// /// Prepare empty results diff --git a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs index 295a9dbe9..f82c6c936 100644 --- a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs +++ b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs @@ -858,19 +858,19 @@ namespace TBF.BenchControl.Sequences sb.Append(";"); sb.Append(mtrRslt.VolumeMeter); /// WM Vmer - objem namerany vodomerom sb.Append(";"); sb.Append(mtrRslt.VolumeRef); /// WM Vref - objem namerany stanicou sb.Append(";"); sb.Append(mtrRslt.Error); /// WM Emt - chyba vodomerom nameraneho objemu -#if IPERLST || IPERLST_SPECIAL +#if IPERL sb.Append(";"); sb.Append(ProcessData.BatchRslts.WaterMeters[i].CalibFactor); /// iPerl calibration factor used during the test / ... #else - sb.Append(";"); sb.Append(" "); /// nechat prazdne + sb.Append(";"); sb.Append(" "); /// nechat prazdne #endif sb.Append(";"); sb.Append(mtrRslt.PulsesMeter); /// WM Np met - pocet impulzov zo skusaneho meradla sb.Append(";"); sb.Append(mtrRslt.PulsesMaster); /// WM Np elm - pocet impulzov etalonu pocas merania pre prislusny vodomer sb.Append(";"); sb.Append(mtrRslt.TestTime); /// WM Tmet - cas merania (obmedzany pri synchro skuske) sb.Append(";"); sb.Append(mtrRslt.Passed ? "OK" : "NOK"); /// WM Vysledok (t.j. ci je v hraniciach chyb) - OK/NOK -#if IPERLST || IPERLST_SPECIAL +#if IPERL sb.Append(";"); sb.Append(mtrRslt.WaterMeter.Q2Correction.ToString("F1")); /// iPerl Q2 correction factor used during the test / AN value - hodnota z analogoveho prevodnika #else - sb.Append(";"); sb.Append(" "); /// nechat prazdne + sb.Append(";"); sb.Append(" "); /// nechat prazdne #endif sb.Append(";"); sb.Append(mtrRslt.VolumeStart); /// WM Volume_start - pri datastreamovych hodnotach (alebo kamera) sb.Append(";"); sb.Append(mtrRslt.TimestampStart); /// WM Time_start - ' ' - @@ -930,7 +930,7 @@ namespace TBF.BenchControl.Sequences sb.Append(";"); sb.Append(volumeMtr.VolumeMeter); /// WM Vmer - objem namerany vodomerom sb.Append(";"); sb.Append(volumeMtr.VolumeRef); /// WM Vref - objem namerany stanicou sb.Append(";"); sb.Append(volumeMtr.Error); /// WM Emt - chyba vodomerom nameraneho objemu -#if IPERLST || IPERLST_SPECIAL +#if IPERL sb.Append(";"); sb.Append(ProcessData.BatchRslts.WaterMeters[i].CalibFactor); /// iPerl calibration factor used during the test / ... #else sb.Append(";"); sb.Append(" "); /// nechat prazdne @@ -939,7 +939,7 @@ namespace TBF.BenchControl.Sequences sb.Append(";"); sb.Append(volumeMtr.PulsesMaster); /// WM Np elm - pocet impulzov etalonu pocas merania pre prislusny vodomer sb.Append(";"); sb.Append(volumeMtr.TestTime); /// WM Tmet - cas merania (obmedzany pri synchro skuske) sb.Append(";"); sb.Append(volumeMtr.Passed ? "OK" : "NOK"); /// WM Vysledok (t.j. ci je v hraniciach chyb) - OK/NOK -#if IPERLST || IPERLST_SPECIAL +#if IPERL sb.Append(";"); sb.Append(volumeMtr.WaterMeter.Q2Correction.ToString("F1")); /// iPerl Q2 correction factor used during the test / AN value - hodnota z analogoveho prevodnika #else sb.Append(";"); sb.Append(" "); /// nechat prazdne @@ -958,7 +958,7 @@ namespace TBF.BenchControl.Sequences sb.Append(";"); sb.Append(energyMtr.VolumeMeter); /// WM Vmer - objem namerany vodomerom sb.Append(";"); sb.Append(energyMtr.VolumeRef); /// WM Vref - objem namerany stanicou sb.Append(";"); sb.Append(energyMtr.Error); /// WM Emt - chyba vodomerom nameraneho objemu -#if IPERLST || IPERLST_SPECIAL +#if IPERL sb.Append(";"); sb.Append(ProcessData.BatchRslts.WaterMeters[i].CalibFactor); /// iPerl calibration factor used during the test / ... #else sb.Append(";"); sb.Append(" "); /// nechat prazdne @@ -967,7 +967,7 @@ namespace TBF.BenchControl.Sequences sb.Append(";"); sb.Append(energyMtr.PulsesMaster); /// WM Np elm - pocet impulzov etalonu pocas merania pre prislusny vodomer sb.Append(";"); sb.Append(energyMtr.TestTime); /// WM Tmet - cas merania (obmedzany pri synchro skuske) sb.Append(";"); sb.Append(energyMtr.Passed ? "OK" : "NOK"); /// WM Vysledok (t.j. ci je v hraniciach chyb) - OK/NOK -#if IPERLST || IPERLST_SPECIAL +#if IPERL sb.Append(";"); sb.Append(energyMtr.WaterMeter.Q2Correction.ToString("F1")); /// iPerl Q2 correction factor used during the test / AN value - hodnota z analogoveho prevodnika #else sb.Append(";"); sb.Append(" "); /// nechat prazdne diff --git a/TestBenchFramework/BenchControl/StateMachine.cs b/TestBenchFramework/BenchControl/StateMachine.cs index 22084d34b..3345c50b4 100644 --- a/TestBenchFramework/BenchControl/StateMachine.cs +++ b/TestBenchFramework/BenchControl/StateMachine.cs @@ -57,7 +57,7 @@ namespace TBF.BenchControl /// Time and synchronization -#if IPERLST +#if TURA_IPERL public const int Period = 2; /// State machine period in sec. #else public const int Period = 1; /// State machine period in sec. @@ -345,7 +345,7 @@ namespace TBF.BenchControl outputPaths = session.QueryOver().OrderBy(x => x.ItemNr).Asc.List(); metersPaths = session.QueryOver().OrderBy(x => x.ItemNr).Asc.List(); TransitionSequences = session.QueryOver().OrderBy(x => x.ItemNr).Asc.List(); -#if HEAT_METERS_SUPPORT +#if HEAT_METERS heatMetersPaths = session.QueryOver().OrderBy(x => x.ItemNr).Asc.List(); #endif @@ -477,7 +477,7 @@ namespace TBF.BenchControl return false; } -#if HEAT_METERS_SUPPORT +#if HEAT_METERS foreach (var path in heatMetersPaths) { if (test.HeatMetersPath == path.Name) { phmtrs = new HeatMetersPath(path, components); break; } diff --git a/TestBenchFramework/BenchControl/TestBenchSim.cs b/TestBenchFramework/BenchControl/TestBenchSim.cs index f954bf53d..3e4658d5b 100644 --- a/TestBenchFramework/BenchControl/TestBenchSim.cs +++ b/TestBenchFramework/BenchControl/TestBenchSim.cs @@ -388,7 +388,7 @@ namespace TBF.BenchControl const ulong Path3 = VI3; const ulong Path4 = VI4; const ulong Path5 = 0; -#elif TORUN_PT50_2015 || IPERLST +#elif TORUN_PT50_2015 || TURA_IPERL const ulong VL11 = (1L << 0); const ulong VL13 = (1L << 1); const ulong VL15 = (1L << 2); @@ -431,7 +431,7 @@ namespace TBF.BenchControl const ulong Path4 = VI4; const ulong Path5 = VI5; const ulong Path6 = VI6; -#elif IPERLST_SPECIAL +#elif TURA_SPECIAL const ulong VL11 = (1L << 0); const ulong VL13 = (1L << 1); const ulong VL15 = (1L << 2); @@ -545,14 +545,14 @@ namespace TBF.BenchControl if (Div1sim && (SimRoute & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time); if (Div1sim && (SimRoute & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time); if (Div1sim && (SimRoute & Path3) == Path3) Mass1sim += DiffKg(Flow3sim, time); -#elif TORUN_PT50_2015 || IPERLST /// Path1,2,3,4,5 do WT1, Path6 do WT2 +#elif TORUN_PT50_2015 || TURA_IPERL /// Path1,2,3,4,5 do WT1, Path6 do WT2 if (Div1sim && (SimRoute & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time); if (Div1sim && (SimRoute & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time); if (Div1sim && (SimRoute & Path3) == Path3) Mass1sim += DiffKg(Flow3sim, time); if (Div2sim && (SimRoute & Path4) == Path4) Mass1sim += DiffKg(Flow4sim, time); if (Div2sim && (SimRoute & Path5) == Path5) Mass1sim += DiffKg(Flow5sim, time); if (Div3sim && (SimRoute & Path6) == Path6) Mass2sim += DiffKg(Flow4sim, time); -#elif IPERLST_SPECIAL +#elif TURA_SPECIAL if (Div1sim && (SimRoute & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time); if (Div1sim && (SimRoute & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time); if (Div1sim && (SimRoute & Path3) == Path3) Mass1sim += DiffKg(Flow3sim, time); @@ -695,7 +695,7 @@ namespace TBF.BenchControl if (toTank) { /* throw (new Exception()); */ } break; } -#elif TORUN_PT50_2015 || IPERLST +#elif TORUN_PT50_2015 || TURA_IPERL switch (regulValveNo) { case 1: @@ -714,7 +714,7 @@ namespace TBF.BenchControl if (toTank) { throw (new Exception()); } break; } -#elif IPERLST_SPECIAL +#elif TURA_SPECIAL switch (regulValveNo) { case 1: diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index 00f81e40a..e02fdac8e 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -583,10 +583,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStart meterRslt.VolumeMeter = Math.Abs(iPerl.VolumeLtrEnd - iPerl.VolumeLtrStart); meterRslt.VolumeRef = tstRslt.VolumeCTV * meterRslt.TestTime / tstRslt.TestTime; iPerl.VolumeLtrRef = meterRslt.VolumeRef; - #if IPERLST || IPERLST_SPECIAL - meterRslt.WaterMeter.CalibFactor = (iPerl.CalibrationStruct != null) ? iPerl.CalibrationStruct.Calibration : 0; - meterRslt.WaterMeter.Q2Correction = iPerl.Q2CorrectionFactor; - #endif +#if IPERL + meterRslt.WaterMeter.CalibFactor = (iPerl.CalibrationStruct != null) ? iPerl.CalibrationStruct.Calibration : 0; + meterRslt.WaterMeter.Q2Correction = iPerl.Q2CorrectionFactor; +#endif iPerl.LastTestResult2 = iPerl.LastTestResult; /// Save shift previous test result iPerl.LastTestResult = meterRslt; /// Save this test result iPerl.NominalTestFlow = 500.0 * (test.Qfrom + test.Qto); /// Ave. + convert to liter/hour diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index c7dcbd079..15be276ba 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -894,9 +894,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection meterRslt.VolumeMeter = Math.Abs(iPerl.VolumeLtrEnd - iPerl.VolumeLtrStart); meterRslt.VolumeRef = tstRslt.VolumeCTV * meterRslt.TestTime / tstRslt.TestTime; iPerl.VolumeLtrRef = meterRslt.VolumeRef; -#if IPERLST || IPERLST_SPECIAL +#if IPERL meterRslt.WaterMeter.CalibFactor = (iPerl.CalibrationStruct != null) ? iPerl.CalibrationStruct.Calibration : 0; - meterRslt.WaterMeter.Q2Correction = iPerl.Q2CorrectionFactor; + meterRslt.WaterMeter.Q2Correction = iPerl.Q2CorrectionFactor; #endif iPerl.LastTestResult2 = iPerl.LastTestResult; /// Save shift previous test result iPerl.LastTestResult = meterRslt; /// Save this test result diff --git a/TestBenchFramework/Forms/PreviousResultsDlg.cs b/TestBenchFramework/Forms/PreviousResultsDlg.cs index 9615c9205..61118905d 100644 --- a/TestBenchFramework/Forms/PreviousResultsDlg.cs +++ b/TestBenchFramework/Forms/PreviousResultsDlg.cs @@ -83,8 +83,8 @@ namespace TBF.Forms foreach (var b in batches) { if (b.BatchNr == data.BatchNr) - { -#if IPERLST || IPERLST_SPECIAL + { +#if ORACLE_DB //System.IO.StreamWriter logger; //string fname = "C:\\TBF\\Logs\\test.log"; //try { logger = new System.IO.StreamWriter(System.IO.File.Create(fname)); } @@ -115,7 +115,7 @@ namespace TBF.Forms MessageBoxIcon.Error); } #elif MUNICH - string docVersion = string.Empty; + string docVersion = string.Empty; foreach (var cmp in TBF.BenchControl.StateMachine.Components) { if (cmp.ClassName == "ResultsPrinter4Munich") diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs index 95a6cb62c..8410ec96d 100644 --- a/TestBenchFramework/MainWnd.Designer.cs +++ b/TestBenchFramework/MainWnd.Designer.cs @@ -655,10 +655,10 @@ namespace TBF #elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || MALTA_WSD25 || SLM_50 private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl24 processTabPageCtrl; -#elif IPERLST +#elif TURA_IPERL private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl48 processTabPageCtrl; -#elif IPERLST_SPECIAL +#elif TURA_SPECIAL private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; #endif diff --git a/TestBenchFramework/PathsDlg.cs b/TestBenchFramework/PathsDlg.cs index 4de443b9c..c213f3261 100644 --- a/TestBenchFramework/PathsDlg.cs +++ b/TestBenchFramework/PathsDlg.cs @@ -35,7 +35,7 @@ namespace TBF public IList FeedingRegulValves; public ISession Session; /// One common DB session passed also to the controls inside tab pages -#if HEAT_METERS_SUPPORT +#if HEAT_METERS private System.Windows.Forms.TabPage heatMetersTabPage; private UiControls.PathsHeatMetersCtrl pathsHeatMetersCtrl; #endif @@ -90,7 +90,7 @@ namespace TBF pathsOutputCtrl.Initialize(this, pathsTabControl.TabPages[(int)PathsDlgTabs.Output]); pathsMetersCtrl.Initialize(this, pathsTabControl.TabPages[(int)PathsDlgTabs.WaterMeters]); -#if HEAT_METERS_SUPPORT +#if HEAT_METERS this.heatMetersTabPage = new System.Windows.Forms.TabPage(); this.pathsHeatMetersCtrl = new TBF.UiControls.PathsHeatMetersCtrl(); diff --git a/TestBenchFramework/ProcedureDlg.cs b/TestBenchFramework/ProcedureDlg.cs index 8907c31a8..c853e2861 100644 --- a/TestBenchFramework/ProcedureDlg.cs +++ b/TestBenchFramework/ProcedureDlg.cs @@ -136,7 +136,7 @@ namespace TBF benchPaths = session.QueryOver().List(); outputPaths = session.QueryOver().List(); metersPaths = session.QueryOver().List(); -#if HEAT_METERS_SUPPORT +#if HEAT_METERS heatMetersPaths = session.QueryOver().List(); #else heatMetersPaths = new List(); @@ -306,7 +306,7 @@ namespace TBF metersKindRadioButton2.Enabled = false; metersKindRadioButton3.Enabled = false; notesTextBox.Enabled = false; -#if !HEAT_METERS_SUPPORT +#if !HEAT_METERS metersKindRadioButton3.Visible = false; #endif /// Make some controls readonly @@ -705,7 +705,7 @@ namespace TBF Bench, Output, Sensor, -#if HEAT_METERS_SUPPORT +#if HEAT_METERS HeatMeterSensors, #endif TrnStart, @@ -725,7 +725,7 @@ namespace TBF processListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Bench_chdr, Width = 80 }); processListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Output_chdr, Width = 80 }); processListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Sensors_chdr, Width = 80 }); -#if HEAT_METERS_SUPPORT +#if HEAT_METERS processListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Heat_meter_sensors, Width = 110 }); #endif processListViewEx.Columns.Add(new ColumnHeader { Text = Strings.TransitionStart_chdr, Width = 100 }); @@ -741,7 +741,7 @@ namespace TBF new ComboBox(), /// Table new ComboBox(), /// Output new ComboBox(), /// Meters -#if HEAT_METERS_SUPPORT +#if HEAT_METERS new ComboBox(), /// Heat meters #endif new ComboBox(), /// TransitionStart @@ -752,7 +752,7 @@ namespace TBF foreach (var path in benchPaths) ((ComboBox)processEditors[(int)ProcessClmn.Bench]).Items.Add(path.Name); foreach (var path in outputPaths) ((ComboBox)processEditors[(int)ProcessClmn.Output]).Items.Add(path.Name); foreach (var path in metersPaths) ((ComboBox)processEditors[(int)ProcessClmn.Sensor]).Items.Add(path.Name); -#if HEAT_METERS_SUPPORT +#if HEAT_METERS foreach (var path in heatMetersPaths) ((ComboBox)processEditors[(int)ProcessClmn.HeatMeterSensors]).Items.Add(path.Name); #endif @@ -923,7 +923,7 @@ namespace TBF lviProcess.SubItems.Add(test.BenchPath); lviProcess.SubItems.Add(test.OutputPath); lviProcess.SubItems.Add(test.MetersPath); -#if HEAT_METERS_SUPPORT +#if HEAT_METERS lviProcess.SubItems.Add(test.HeatMetersPath); #endif lviProcess.SubItems.Add(string.IsNullOrEmpty(test.RelTransBefore) ? "---" : test.RelTransBefore); @@ -1061,7 +1061,7 @@ namespace TBF { entity.MetersPath = lvi.SubItems[(int)ProcessClmn.Sensor].Text; } -#if HEAT_METERS_SUPPORT +#if HEAT_METERS if ((processEditors[(int)ProcessClmn.HeatMeterSensors] as ComboBox).Items.Contains(lvi.SubItems[(int)ProcessClmn.HeatMeterSensors].Text)) { entity.HeatMetersPath = lvi.SubItems[(int)ProcessClmn.HeatMeterSensors].Text; @@ -1495,7 +1495,7 @@ namespace TBF dataEntryComboBox.Enabled = true; metersKindRadioButton1.Enabled = true; metersKindRadioButton2.Enabled = true; -#if HEAT_METERS_SUPPORT +#if HEAT_METERS metersKindRadioButton3.Enabled = true; #endif printer1ComboBox.Enabled = true; @@ -1673,7 +1673,7 @@ namespace TBF } if (selectedMethod is BenchControl.TestMethods.PMaxTest.TestMethod) goto pressure_label; if (selectedMethod is BenchControl.TestMethods.LeakTest.TestMethod) goto pressure_label; -#if HEAT_METERS_SUPPORT +#if HEAT_METERS if (selectedMethod.CanTest(MetersKind.HeatMeter)) goto heat_meters_label; #endif @@ -1719,7 +1719,7 @@ namespace TBF goto done; -#if HEAT_METERS_SUPPORT +#if HEAT_METERS heat_meters_label: DialogResult dr = heatMetersDlg.ShowDialog(); diff --git a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs index d73d937a7..ee82569a6 100644 --- a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs +++ b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs @@ -47,7 +47,7 @@ namespace TBF.Screens { InitializeComponent(); -#if !(IPERLST || IPERLST_SPECIAL || MUNICH) +#if !(ORACLE_DB || MUNICH) previousResultsButton.Visible = false; #endif diff --git a/TestBenchFramework/UiControls/PathsHeatMetersCtrl.cs b/TestBenchFramework/UiControls/PathsHeatMetersCtrl.cs index d5d740d0d..443f6c5bf 100644 --- a/TestBenchFramework/UiControls/PathsHeatMetersCtrl.cs +++ b/TestBenchFramework/UiControls/PathsHeatMetersCtrl.cs @@ -51,7 +51,7 @@ namespace TBF.UiControls this.parent = parent; this.parentControl = parentControl; -#if HEAT_METERS_SUPPORT +#if HEAT_METERS /// Load the paths MyItems = parent.Session.QueryOver() .OrderBy(x => x.ItemNr).Asc @@ -227,7 +227,7 @@ namespace TBF.UiControls { base.OkBtnClicked(); -#if HEAT_METERS_SUPPORT +#if HEAT_METERS /// Update the database foreach (var entity in ToBeRemovedItems) {