Reconfigured for iPearlSpecial-Camera

Config/Config.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -30,7 +30,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

Results/BatchResults.cs

@@ -101,41 +101,45 @@ namespace Results
                 }
 			}
 
-			foreach (var ti in procedure.GetTestInstances())
+
+			foreach (var t in procedure.Tests)
 			{
-				TestData td = TestData.UpdateList(d.TestDataList, new TestData(ti.Test));
+				TestData td = TestData.UpdateList(d.TestDataList, new TestData(t));
 
-				/// Create an empty test result and add it to the list
-				TestRslt tr = new TestRslt(d.Batch, td, ti.Test.Part, ti.Repetition);
-				d.Batch.TestRslts.Add(tr);
-
-				for (int i = 0; i < d.WMPositionsCount; i++)
+				for (int rnr = 1; rnr <= t.Repeats; rnr++)
 				{
-                    if (!d.Batch.WaterMeters[i].Disabled && ti.Test.IsPartCompatible(waterMeterParts[i]))
-                    {
-                        ///
-                        /// Create empty watermeter test results and add them to the list and to dictionaries
-                        ///
-                        IList<MeterTestRslt> wmtrs = d.Batch.WaterMeters[i].MeterTestRslts;
-                        if (d.Batch.Compound)
+					/// Create an empty test result and add it to the list
+					TestRslt tr = new TestRslt(d.Batch, td, t.Part, rnr);
+					d.Batch.TestRslts.Add(tr);
+
+					for (int i = 0; i < d.WMPositionsCount; i++)
+					{
+                        if (!d.Batch.WaterMeters[i].Disabled && t.IsPartCompatible(waterMeterParts[i]))
                         {
-                            /// Compound water meter
-                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.CompoundMain));
-                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.CompoundAux));
-                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.Compound));
+                            ///
+                            /// Create empty watermeter test results and add them to the list and to dictionaries
+                            ///
+                            IList<MeterTestRslt> wmtrs = d.Batch.WaterMeters[i].MeterTestRslts;
+                            if (d.Batch.Compound)
+                            {
+                                /// Compound water meter
+                                wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.CompoundMain));
+                                wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.CompoundAux));
+                                wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.Compound));
+                            }
+                            else if (d.Batch.HeatMeter)
+                            {
+                                /// Heat meter
+                                wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.HeatMeterVolume));
+                                wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.HeatMeterEnergy));
+                            }
+                            else
+                            {
+                                /// Water meter
+                                wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.Single));
+                            }
                         }
-                        else if (d.Batch.HeatMeter)
-                        {
-                            /// Heat meter
-                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.HeatMeterVolume));
-                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.HeatMeterEnergy));
-                        }
-                        else
-                        {
-                            /// Water meter
-                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.Single));
-                        }
-                    }
+					}
 				}
 			}
 

Results/Output/SensusTestInfo.cs

@@ -9,24 +9,23 @@ namespace Results.Output
 {
     public enum LogType
     {
-        Just_Q3Q2Q1,            /// pNrs = -1,3,2,1
-        Just_Q3Q2Q1_Alt,        /// pNrs = -1,5,2,1
-        Just_Q3Q2adjQ1,         /// pNrs = -1,3,2,1
-        Just_Q3Q2adjQ1_Alt,     /// pNrs = -1,5,2,1
-        JustA0A4_Q3Q2adjQ1,     /// pNrs = -2,-1,3,2,1 (Australia 169 MHz, raw data pNrs: -2,-1,4,3,2,1)
-        DEWA,           	    /// Q4, Q3, Q2adj, Q2, Q1
-        DEWA_wo_Q2,             /// Q4, Q3, Q2adj, Q1
-        Suez,           	    /// Two directions, with Q2 and Q2ac
-        Suez_smart,             /// There is only Q2ac in both directions
-        Suez_Repeatability,     /// 3xQ3, 3xQ2, 3xQ1 
-        Suez_EMP_DN15,          /// EMP: 12 flow rates
-        Suez_EMP_DN20,          /// EMP: 12 flow rates
-        Suez_EMP_DN32,          /// EMP: 12 flow rates
-        Suez_EMP_DN40,          /// EMP: 12 flow rates
-        Greece,                 /// Q3, Q2adj, Q2, Q1
-        S620,                   /// Q3, Q100, Q2, Q1
-        S620_Alt,               /// Q3, Q100, Q2, Q1
-        S620_Kiwa,
+        Just_Q3Q2Q1,        /// pNrs = -1,3,2,1
+        Just_Q3Q2Q1_Alt,    /// pNrs = -1,5,2,1
+        Just_Q3Q2adjQ1,     /// pNrs = -1,3,2,1
+        Just_Q3Q2adjQ1_Alt, /// pNrs = -1,5,2,1
+        JustA0A4_Q3Q2adjQ1,    /// pNrs = -2,-1,3,2,1 (Australia 169 MHz)
+        DEWA,           	/// Q4, Q3, Q2adj, Q2, Q1
+        DEWA_wo_Q2,         /// Q4, Q3, Q2adj, Q1
+        Suez,           	/// Two directions, with Q2 and Q2ac
+        Suez_smart,         /// There is only Q2ac in both directions
+        Suez_Repeatability, /// 3xQ3, 3xQ2, 3xQ1 
+        Suez_EMP_DN15,      /// EMP: 12 flow rates
+        Suez_EMP_DN20,      /// EMP: 12 flow rates
+        Suez_EMP_DN32,      /// EMP: 12 flow rates
+        Suez_EMP_DN40,      /// EMP: 12 flow rates
+        Greece,             /// Q3, Q2adj, Q2, Q1
+        S620,               /// Q3, Q100, Q2, Q1
+        S620_Alt,           /// Q3, Q100, Q2, Q1
         Count,
         None,
     }
@@ -267,18 +266,18 @@ namespace Results.Output
                         new SensusTestInfo("Q1",           1,   "Q1",   1, "01",   1,   "Q1", Range.R100_110),
                     };
 
-                case LogType.JustA0A4_Q3Q2adjQ1:    /// Australia 169 MHz
+                case LogType.JustA0A4_Q3Q2adjQ1:
                     return new SensusTestInfo[]
                     {
                         ///                TBF            Oracle DB    Opto RAW   LU logfiles 
-                        new SensusTestInfo("Q2adj",        0,     "",   3, "03",   3,"Q2adj", Range.R100_110),
+                        new SensusTestInfo("Q2adj",        0,     "",   2, "02",   0,     "", Range.R100_110),
                         new SensusTestInfo("Qjust_A0",    -1, "Just",  -1, "-1",  -1,  "Q-1", Range.R95_105),
                         new SensusTestInfo("Qjust_A4",    -2, "Just",  -2, "-2",  -2,  "Q-2", Range.R95_105),
-                        new SensusTestInfo("Q3",           3,   "Q3",   4, "04",   4,   "Q3", Range.R90_100),
-                        new SensusTestInfo("Q2",           2,   "Q2",   2, "02",   2,   "Q2", Range.R100_110),
+                        new SensusTestInfo("Q3",           3,   "Q3",   3, "03",   3,   "Q3", Range.R90_100),
+                        new SensusTestInfo("Q2",           2,   "Q2",   0,   "",   2,   "Q2", Range.R100_110),
                         new SensusTestInfo("Q1",           1,   "Q1",   1, "01",   1,   "Q1", Range.R100_110),
                     };
-                
+
                 case LogType.DEWA:                  /// DEWA (with Q4 and Q2 after correction)
                     return new SensusTestInfo[]
                     {
@@ -448,15 +447,6 @@ namespace Results.Output
                         new SensusTestInfo("Q2",          2,    "Q2",   2, "02",   2,   "Q2", Range.R100_110),
                         new SensusTestInfo("Q1",          1,    "Q1",   1, "01",   1,   "Q1", Range.R100_110),
                     };
-
-                case LogType.S620_Kiwa:
-                    return new SensusTestInfo[]
-                    {
-                        ///                TBF           Oracle DB    Opto RAW   LU logfiles 
-                        new SensusTestInfo("Q4",          5,    "Q4",   5, "04",   5,   "Q4", Range.R90_100),
-                        new SensusTestInfo("Q2",          2,    "Q2",   2, "02",   2,   "Q2", Range.R100_110),
-                        new SensusTestInfo("Q1",          1,    "Q1",   1, "01",   1,   "Q1", Range.R100_110),
-                    };
             }
         }
 
@@ -515,7 +505,7 @@ namespace Results.Output
         /// 
         static bool TestShouldBeIncluded(Config.Entities.Test test)
         {
-            return test.DoEvaluate && test.IsRegular() && !test.Method.ToLower().Contains("iperlcommunication");
+            return test.DoEvaluate && !test.Method.ToLower().Contains("iperlcommunication");
         }
         /// 
         public static SensusTestInfo CreateFromTest(Config.Entities.Test test, int repetitionNr, int luID, string fullTestNameWoPart)

Results/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.26.1622.0")]
-[assembly: AssemblyFileVersion("2.26.1622.0")]
+[assembly: AssemblyVersion("2.26.1560.0")]
+[assembly: AssemblyFileVersion("2.26.1560.0")]

Results/Results.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

ResultsBrowser/ResultsBrowser.csproj

@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -32,7 +32,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

TBF/BenchControl/Sequences/SequenceBase.cs

@@ -1520,127 +1520,12 @@ namespace TBF.BenchControl.Sequences
 		}
 
 
-        /// <summary>
-        /// Create a simulated test result (single meter).
-        /// </summary>
-        /// <param name="test">Test to be simulated</param>
-        /// <returns>Test result</returns>
-        public void MakeSimulatedTrivial(Config.Entities.Test test, int repetitionNr, int part)
-        {
-            string fullTestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
-
-            Results.Entities.TestRslt tstRslt = ProcessData.BatchRslts.GetTestRslt(fullTestName, part);
-            Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
-
-            if (tstRslt == null) return;        /// Prevent program crash in certain cases
-
-            tstRslt.AmbTempMean = 20.0f;
-            tstRslt.AmbPressMean = 1.0f;
-            tstRslt.AmbHumiMean = 50.0f;
-            tstRslt.PressUpStart = 1.0f;
-            tstRslt.PressDownStart = 1.0f;
-            tstRslt.TempUpStart = 20.0f;
-            tstRslt.TempDownStart = 20.0f;
-            tstRslt.TempDivStart = 20.0f;
-            tstRslt.PressUpEnd = 1.0f;
-            tstRslt.PressDownEnd = 1.0f;
-            tstRslt.TempUpEnd = 20.0f;
-            tstRslt.TempDownEnd = 20.0f;
-            tstRslt.TempDivEnd = 20.0f;
-            tstRslt.PressUpMean = 1.0f;
-            tstRslt.PressDownMean = 1.0f;
-            tstRslt.TempUpMean = 20.0f;
-            tstRslt.TempDownMean = 20.0f;
-            tstRslt.TempDivMean = 20.0f;
-            tstRslt.PressUpMin = 1.0f;
-            tstRslt.PressDownMin = 1.0f;
-            tstRslt.TempUpMin = 20.0f;
-            tstRslt.TempDownMin = 20.0f;
-            tstRslt.TempDivMin = 20.0f;
-            tstRslt.PressUpMax = 1.0f;
-            tstRslt.PressDownMax = 1.0f;
-            tstRslt.TempUpMax = 20.0f;
-            tstRslt.TempDownMax = 20.0f;
-            tstRslt.TempDivMax = 20.0f;
-            tstRslt.ConductMin = Conductivity.Val;
-            tstRslt.ConductMax = Conductivity.Val;
-
-            tstRslt.DensityIn = Config.Formulas.RealDensity();
-            tstRslt.DensityLine = Config.Formulas.RealDensity();
-            tstRslt.DensityDiv = Config.Formulas.RealDensity();
-
-            tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName;
-            tstRslt.StartTime = DateTime.Now;
-            tstRslt.EndTime = DateTime.Now + new TimeSpan(0, 0, 1);
-            tstRslt.FlowSetTime = 10;
-            tstRslt.TestTime = tstRslt.TargetTime();
-            tstRslt.PulsesMaster = (outPath.FlowMeter.LtrPerPulse > 1E-6) ? (1.0075 * tstRslt.TargetVolume() / outPath.FlowMeter.LtrPerPulse) : 1;
-            tstRslt.MassStartRaw = 0;
-            tstRslt.MassStart = Config.Formulas.CorrectedValue(tstRslt.MassStartRaw, outPath.Scale.Corrections);
-            tstRslt.MassEndRaw = tstRslt.TargetVolume() * Config.Formulas.RealDensity() / 1000.0f;
-            tstRslt.MassEnd = Config.Formulas.CorrectedValue(tstRslt.MassEndRaw, outPath.Scale.Corrections);
-            tstRslt.FlowMass = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart) / tstRslt.TestTime;
-            tstRslt.FlowVolume = 3.6 * outPath.FlowMeter.LtrPerPulse * tstRslt.PulsesMaster / tstRslt.TestTime;
-            tstRslt.MassOfEvapWater = 0;
-            tstRslt.VolumeCTV = 1000 * tstRslt.Batch.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart) / tstRslt.DensityLine;    /// [l] commercially true volume
-            tstRslt.VolumeMaster = outPath.FlowMeter.LtrPerPulse * tstRslt.PulsesMaster;										/// [l] volume from the master flow meter
-            tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse;                                             /// Uncorrected master flowmeter coefficient
-            tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, 0);            /// Corrected master pulses per liter
-            tstRslt.ConstMaster = (tstRslt.VolumeMaster == 0) ? tstRslt.ConstMasterCorr : (outPath.FlowMeter.LtrPerPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster);
-
-            tstRslt.ErrorMaster = Config.Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV);
-
-            tstRslt.FlowMean = (float)RefFlowStat.Average;
-            tstRslt.FlowStart = (float)RefFlowStat.First;
-            tstRslt.FlowEnd = (float)RefFlowStat.Last;
-            tstRslt.FlowMin = (float)RefFlowStat.Min;
-            tstRslt.FlowMax = (float)RefFlowStat.Max;
-
-            for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
-            {
-                float errorPct = 0;
-
-                Results.Entities.MeterTestRslt meterRslt = ProcessData.BatchRslts.GetMeterTestRslt(fullTestName, i, CompoundMeterId.Single);
-                IRegReader regReader = sensPath.RegisterReaders[i];
-
-                if (meterRslt != null && regReader != null)
-                {
-                    meterRslt.VolumeMeter = tstRslt.TargetVolume() * (1.0 + 0.01 * errorPct);
-
-                    meterRslt.PulsesMeter = regReader.PulsesPerLtr * meterRslt.VolumeMeter;
-                    meterRslt.PulsesMaster = tstRslt.PulsesMaster;
-                    meterRslt.PulsesPerLiter = regReader.PulsesPerLtr;
-                    meterRslt.VolumeStart = 0;
-                    meterRslt.VolumeEnd = meterRslt.VolumeMeter;
-                    meterRslt.VolumeRef = tstRslt.TargetVolume();
-                    meterRslt.TimestampStart = 0;
-                    meterRslt.TimestampEnd = tstRslt.TargetTime();
-                    meterRslt.TestTime = tstRslt.TargetTime();
-                    meterRslt.Error = errorPct;
-                    meterRslt.Passed = true;
-                    meterRslt.TestDone = true;
-                    tstRslt.TestDone = true;
-                }
-            }
-
-            tstRslt.Components = Results.Entities.Components
-                .UpdateList(BatchRslts.ComponentsList,
-                            new Results.Entities.Components((BenchInfo != null) ? BenchInfo.TestBenchId : 1,
-                                                            (BenchInfo != null) ? BenchInfo.TestBenchName : "testbench",
-                                                            inPath.Pump != null ? inPath.Pump.Name : string.Empty,
-                                                            outPath.FlowMeter != null ? outPath.FlowMeter.Name : string.Empty,
-                                                            outPath.Scale != null ? outPath.Scale.Name : string.Empty,
-                                                            outPath.RegulValve != null ? outPath.RegulValve.Name : string.Empty,
-                                                            outPath.Diverter != null ? outPath.Diverter.Name : string.Empty));
-        }
-
-
 		/// <summary>
 		/// Create a simulated test result (single meter).
 		/// </summary>
 		/// <param name="test">Test to be simulated</param>
 		/// <returns>Test result</returns>
-		public void MakeSimulated(Config.Entities.Test test, int repetitionNr, int part, float errorPctBase)
+		protected void MakeSimulated(Config.Entities.Test test, int repetitionNr, int part, float errorPctBase)
 		{
 			string fullTestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
 

TBF/BenchControl/TestMethods/FlyingStartMassCollection/Single/Component.cs

@@ -5,8 +5,6 @@ using System;
 using System.Collections.Generic;
 using log4net;
 using Config.Entities;
-using TBF.BenchControl.Sequences;
-using TBF.UiBridge;
 
 namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.Single
 {
@@ -35,18 +33,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.Single
 
 		public IList<Event> Execute(Test test, int repetNr, bool isLastRepetition)
 		{
-            if (DebugLevel == DebugMode.Normal)
-            {
-                return (new FlyingStartMassCollectionSeq()).Execute(test, repetNr, isLastRepetition, null, null, DebugLevel);
-            }
-            else
-            {
-                /// DebugLevel == DebugMode.Simulate
-                (new FlyingStartMassCollectionSeq()).MakeSimulatedTrivial(test, repetNr, test.Part);
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed));
-                Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0)));
-                return new List<Event> { Event.Done };
-            }
-        }
+			return (new FlyingStartMassCollectionSeq()).Execute(test, repetNr, isLastRepetition, null, null, DebugLevel);
+		}
 	}
 }

TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs

@@ -30,17 +30,22 @@ namespace TBF.BenchControl.TestMethods.LeakTest
 		/// </returns>
 		public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, bool isLastRepetition, LeakTestParams testParams)
 		{
+            IScale scale = null;
+
             if ((testParams.MaxPressureDrop != 0) && (benchPath.PressMtrDown == null))
             {
                 Bridge.OnError(this, Strings.Missing_a_pressure_meter);
                 return new List<Event> { Event.ConfigurationError };
             }
-
-            IScale scale = outPath.Scale as IScale;
-            if (testParams.MaxMassIncrease > 0 && scale == null)
+            
+            if (testParams.MaxMassIncrease > 0)
             {
-                Bridge.OnError(this, Strings.Missing_a_scale);
-                return new List<Event> { Event.ConfigurationError };
+                scale = outPath.Scale as IScale;
+                if (scale == null)
+                {
+                    Bridge.OnError(this, Strings.Missing_a_scale);
+                    return new List<Event> { Event.ConfigurationError };
+                }
             }
             
             IList<Event> e;                            /// Events from currently running operations
@@ -356,38 +361,26 @@ namespace TBF.BenchControl.TestMethods.LeakTest
                 tstRslt.DensityDiv = 0;
 
 				/// Main results
-                tstRslt.MethodClass      = TbfComponents.FindComponent(test.Method).ClassName;
-                tstRslt.StartTime        = TestStartTime;
-				tstRslt.EndTime          = TestEndTime;
-				tstRslt.FlowSetTime      = 0;
-				tstRslt.TestTime	     = Convert.ToDouble(testParams.DurationPMax);	/// [s] measurement time
-				tstRslt.PulsesMaster     = 0;			/// Pulses of the master flow meter (test total)
-
-                if (testParams.MaxMassIncrease > 0)
-                {
-                    tstRslt.MassStartRaw = StartMass.Val;
-                    tstRslt.MassEndRaw   = EndMass.Val;
-                    tstRslt.MassStart    = Config.Formulas.CorrectedValue(tstRslt.MassStartRaw, scale.Corrections);
-                    tstRslt.MassEnd      = Config.Formulas.CorrectedValue(tstRslt.MassEndRaw, scale.Corrections);
-                }
-                else
-                {
-                    tstRslt.MassStartRaw = 0;
-                    tstRslt.MassStart    = 0;
-                    tstRslt.MassEndRaw   = 0;
-                    tstRslt.MassEnd      = 0;
-                }
-
-                tstRslt.MassOfEvapWater  = 0;
-                tstRslt.FlowMass         = 0;		/// [kg/h]
-				tstRslt.FlowVolume       = 0;		/// [m3/h]
-                tstRslt.VolumeMaster     = 0;		/// [l] volume from the master flow meter
-				tstRslt.VolumeCTV        = 0;		/// [l] 1000.0f is because density is in [kg/m3]
-                tstRslt.ConstMasterRaw   = 0;		/// Convert the flow to [m3/h]
-                tstRslt.ConstMaster      = 0;		/// Convert the flow to [m3/h]
-				tstRslt.ErrorMaster      = 0;
-                tstRslt.ErrorFlags       = 0;
-                tstRslt.InfoFlags        = 0;
+                tstRslt.MethodClass  = TbfComponents.FindComponent(test.Method).ClassName;
+                tstRslt.StartTime    = TestStartTime;
+				tstRslt.EndTime      = TestEndTime;
+				tstRslt.FlowSetTime  = 0;
+				tstRslt.TestTime	 = Convert.ToDouble(testParams.DurationPMax);	/// [s] measurement time
+				tstRslt.PulsesMaster = 0;			/// Pulses of the master flow meter (test total)
+                tstRslt.MassStartRaw = StartMass.Val;
+                tstRslt.MassStart    = Config.Formulas.CorrectedValue(tstRslt.MassStartRaw, scale.Corrections);
+                tstRslt.MassEndRaw   = EndMass.Val;
+                tstRslt.MassEnd      = Config.Formulas.CorrectedValue(tstRslt.MassEndRaw, scale.Corrections);
+                tstRslt.MassOfEvapWater = 0;
+                tstRslt.FlowMass     = 0;			/// [kg/h]
+				tstRslt.FlowVolume   = 0;			/// [m3/h]
+                tstRslt.VolumeMaster = 0;			/// [l] volume from the master flow meter
+				tstRslt.VolumeCTV    = 0;			/// [l] 1000.0f is because density is in [kg/m3]
+                tstRslt.ConstMasterRaw = 0;			/// Convert the flow to [m3/h]
+                tstRslt.ConstMaster  = 0;			/// Convert the flow to [m3/h]
+				tstRslt.ErrorMaster  = 0;
+                tstRslt.ErrorFlags = 0;
+                tstRslt.InfoFlags = 0;
 
 
                 bool pressureDropPassed = (testParams.MaxPressureDrop == 0) ? true : ((testParams.MaxPressureDrop > 0) ? (PressDownStat.First - PressDownStat.Last < testParams.MaxPressureDrop)

TBF/BenchControl/TestMethods/LeakTest/TestMethod.cs

@@ -6,8 +6,6 @@ using System.Collections.Generic;
 using log4net;
 using Config.Entities;
 using TBF.BenchControl;
-using TBF.BenchControl.Sequences;
-using TBF.UiBridge;
 
 namespace TBF.BenchControl.TestMethods.LeakTest
 {
@@ -36,18 +34,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
 
 		public IList<Event> Execute(Test test, int repetNr, bool isLastRepetition)
 		{
-            if (DebugLevel == DebugMode.Normal)
-            {
-			    return (new LeakTestSeq()).Execute(test, repetNr, isLastRepetition, testMethodCfg.TestParams);
-            }
-            else
-            {
-                /// DebugLevel == DebugMode.Simulate
-                (new LeakTestSeq()).MakeSimulatedTrivial(test, repetNr, test.Part);
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed));
-                Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0)));
-                return new List<Event> { Event.Done };
-            }
-        }
+			return (new LeakTestSeq()).Execute(test, repetNr, isLastRepetition, testMethodCfg.TestParams);
+		}
 	}
 }

TBF/BenchControl/TestMethods/PMaxTest/TestMethod.cs

@@ -1,13 +1,11 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2016 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
 using log4net;
 using Config.Entities;
 using TBF.BenchControl;
-using TBF.BenchControl.Sequences;
-using TBF.UiBridge;
 
 namespace TBF.BenchControl.TestMethods.PMaxTest
 {
@@ -39,18 +37,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
 
 		public IList<Event> Execute(Test test, int repetNr, bool isLastRepetition)
 		{
-            if (DebugLevel == DebugMode.Normal)
-            {
-                return (new PMaxTestSeq()).Execute(test, repetNr, isLastRepetition, testMethodCfg.TestParams);
-            }
-            else
-            {
-                /// DebugLevel == DebugMode.Simulate
-                (new PMaxTestSeq()).MakeSimulatedTrivial(test, repetNr, test.Part);
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed));
-                Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0)));
-                return new List<Event> { Event.Done };
-            }
+			return (new PMaxTestSeq()).Execute(test, repetNr, isLastRepetition, testMethodCfg.TestParams);
 		}
 	}
 }

TBF/BenchControl/TestMethods/iPerlCommunication/TestMethod.cs

@@ -7,8 +7,6 @@ using System.Collections.Generic;
 using log4net;
 using Config.Entities;
 using TBF.BenchControl;
-using TBF.BenchControl.Sequences;
-using TBF.UiBridge;
 
 namespace TBF.BenchControl.TestMethods.iPerlCommunication
 {
@@ -124,18 +122,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
 
 		public IList<Event> Execute(Test test, int repetNr, bool isLastRepetition)
 		{
-            if (DebugLevel == DebugMode.Normal)
-            {
-			    return (new iPerlCommunicationSeq()).Execute(test, repetNr, testMethodCfg, testMethodCfg.TestParams);
-            }
-            else
-            {
-                /// DebugLevel == DebugMode.Simulate
-                (new iPerlCommunicationSeq()).MakeSimulatedTrivial(test, repetNr, test.Part);
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed));
-                Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0)));
-                return new List<Event> { Event.Done };
-            }
-        }
+			return (new iPerlCommunicationSeq()).Execute(test, repetNr, testMethodCfg, testMethodCfg.TestParams);
+		}
 	}
 }

TBF/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.26.1623.0")]
-[assembly: AssemblyFileVersion("2.26.1623.0")]
+[assembly: AssemblyVersion("2.26.1607.0")]
+[assembly: AssemblyFileVersion("2.26.1607.0")]

TBF/TBF.csproj

@@ -39,7 +39,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK;STABLE_MASS_EXTRAS</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK;CAMERA</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -50,7 +50,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK;STABLE_MASS_EXTRAS</DefineConstants>
+    <DefineConstants>TRACE;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK;CAMERA</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -60,7 +60,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK;STABLE_MASS_EXTRAS</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK;CAMERA</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
@@ -70,7 +70,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK;STABLE_MASS_EXTRAS</DefineConstants>
+    <DefineConstants>TRACE;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK;CAMERA</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -101,8 +101,9 @@
     <SignManifests>false</SignManifests>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ControlComponent3U">
-      <HintPath>..\packages\ControlBoard\iPerlST\ControlComponent3U.dll</HintPath>
+    <Reference Include="ControlComponent3U, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ControlBoard\iPerlST-special\ControlComponent3U.dll</HintPath>
     </Reference>
     <Reference Include="FluentNHibernate">
       <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
@@ -3672,24 +3673,6 @@
     <None Include="Resources\RoiStyle1.bmp" />
     <None Include="Resources\RoiStyle2.bmp" />
     <None Include="Resources\RoiStyle3.bmp" />
-    <Content Include="libgcc_s_dw2-1.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="libRfid1.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="libRfid2.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="libRfid3.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="libRfid4.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="libstdc++-6.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="Pictures\forward_dir_left.jpg">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

TBF/UI/MainWnd.Designer.cs

@@ -54,9 +54,9 @@ namespace TBF.UI
             this.horizontalSplitContainer = new System.Windows.Forms.SplitContainer();
             this.mainTabControl = new System.Windows.Forms.TabControl();
             this.homeTabPage = new System.Windows.Forms.TabPage();
-			this.ctrlBrdComponent = new ControlComponent_Torino2015.UserControl1();
+            this.ctrlBrdComponent = new ControlComponent_Torino2015.UserControl1();
             this.processTabPage = new System.Windows.Forms.TabPage();
-			this.processTabPageCtrl = new TBF.UI.Process.ProcessTabPageCtrl48();
+            this.processTabPageCtrl = new TBF.UI.Process.ProcessTabPageExCtrl();
             this.insertTabPage = new System.Windows.Forms.TabPage();
             this.resultsTabPage = new System.Windows.Forms.TabPage();
             this.resultsTabPageCtrl = new TBF.UI.ResultsMI.ResultsTabPageCtrl();

Users/Users.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;TURA_IPERL;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_SPECIAL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -28,7 +28,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TURA_IPERL;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;TURA_SPECIAL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>