Output.FileWriter.IperlLogger bug fix : Q2 error without correction when the name of calculated test in not "Q2".

Config/Config.csproj

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

Results/Forms/BatchResultsDlg.cs

@@ -265,11 +265,6 @@ namespace Results.Forms
                 message = Strings.Invalid_Q2_correction_factors;
                 return WrongQ2FactorsColor;
             }
-            else if ((wMtr.ErrorFlags & (int)ErrorFlagMask.E25) != 0)
-            {
-                message = Strings.Test_repetition_count_exceeded_upper_limit;
-                return RejectColor;
-            }
             else if (wmtrPassed)
             {
                 /// Water meter passed (therefore is was also completed)

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.18.1241.0")]
+[assembly: AssemblyVersion("2.18.1253.0")]
-[assembly: AssemblyFileVersion("2.18.1241.0")]
+[assembly: AssemblyFileVersion("2.18.1253.0")]

Results/Results.csproj

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

ResultsBrowser/ResultsBrowser.csproj

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

TBF/BenchControl/Output/DB/ProductionTracing/Tracing.cs

@@ -266,7 +266,7 @@ namespace TBF.BenchControl.Output.DB.ProductionTracing
                 {
                     Results.Entities.WaterMeter wm = waterMeters[i];
 
-                    if ((wm != null) && !wm.Disabled && !string.IsNullOrEmpty(wm.SerialNr))
+                    if ((wm != null) && !wm.Disabled)
                     {
                         CheckPreviousRecordOfSingleWM(session, wm);
                     }

TBF/BenchControl/Output/DB/SensusOracle/Database.cs

@@ -595,9 +595,9 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
                 SaveBatchData(conn, batch);
                 foreach (var wMtr in batch.WaterMeters)
                 {
-                    if ((wMtr.ErrorFlags & ((int)ErrorFlagMask.E25 | (int)ErrorFlagMask.E26 | (int)ErrorFlagMask.E27 | (int)ErrorFlagMask.E28)) == 0)
+                    if ((wMtr.ErrorFlags & ((int)ErrorFlagMask.E26 | (int)ErrorFlagMask.E27 | (int)ErrorFlagMask.E28)) == 0)
                     {
-                        /// No error production process error => write the result of testing to Oracle DB
+                        /// No production error => write the result of testing to Oracle DB
                         SaveSingleWM2DB(conn, wMtr, safeMode);
                     }
                 }

TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
+/// Copyright (c) 2018-2019 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -311,7 +311,7 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
 			{
 				Results.Entities.WaterMeter wMtr = batch.WaterMeters[i];
 
-                if ((wMtr == null) || (wMtr.ErrorFlags & ((int)ErrorFlagMask.E25 | (int)ErrorFlagMask.E26 | (int)ErrorFlagMask.E27 | (int)ErrorFlagMask.E28)) != 0)
+                if ((wMtr == null) || (wMtr.ErrorFlags & ((int)ErrorFlagMask.E26 | (int)ErrorFlagMask.E27 | (int)ErrorFlagMask.E28)) != 0)
                 {
                     logger.WriteLine();
                     logger.WriteLine(string.Format("[Zählerdaten_{0}]", wMtr.WMPosition));
@@ -364,7 +364,7 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
                                     logger.WriteLine(string.Format("ZeitImpulse{0}={1}", flID, mtr.TestTime.ToString(Program.AltCulture)));
                                     logger.WriteLine(string.Format("Impulse{0}={1}", flID, 0));
                                     logger.WriteLine(string.Format("Volumen{0}={1}", flID, mtr.VolumeMeter.ToString(Program.AltCulture)));
-                                    logger.WriteLine(string.Format("KorrFehler{0}={1}", flID, (testInfos[j].TestName == "Q2") && ((mtr.WaterMeter.Q2CorrRL != 0) || (mtr.WaterMeter.Q2CorrLR != 0))
+                                    logger.WriteLine(string.Format("KorrFehler{0}={1}", flID, (mtr.TestData().Method != null) && mtr.TestData().Method.Contains("iPerlCommunication") && ((mtr.WaterMeter.Q2CorrRL != 0) || (mtr.WaterMeter.Q2CorrLR != 0))
                                                                                                ? mtr.WaterMeter.Q2ErrWOCorrection.ToString(Program.AltCulture)
                                                                                                : mtr.Error.ToString(Program.AltCulture)));
                                     logger.WriteLine(string.Format("KorrDurchfluss{0}={1}", flID, 0));

TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs

@@ -71,7 +71,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
                 retVal.Add(iPerlCommunicationForm.Write2HzCorrectionStr);
                 retVal.Add(string.Format("{0} if enabled", iPerlCommunicationForm.ReadConfigurationStr));
                 retVal.Add(string.Format("{0} 80", iPerlCommunicationForm.SetTestModeStr));
-                retVal.Add("iPerl_check pruefindex q2factors direction prevWorkStep");
+                retVal.Add("iPerl_check prevWorkStep direction q2factors");
             }
             else
             {

TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs

@@ -1,14 +1,11 @@
 ///
-/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2019 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
-using System.Text;
 using log4net;
 using Config.Entities;
-using TBF.BenchControl;
 using TBF.BenchControl.Sequences;
-using TBF.Boxes;
 using TBF.Resources;
 using TBF.UiBridge;
 
@@ -131,17 +128,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
                             bool anyErrorOfThisMeter = false;
                             foreach (var arg in args)
                             {
-#if ORACLE_DB
-                                if (arg.ToLower() == "pruefindex")
-                                {
-                                    if (wm.Pruefindex > maxTestIndex)
-                                    {
-                                        anyErrorOfThisMeter = true;
-                                        message += string.Format("iPerl{0} : Príliš veľa opakovaní testu vodomera{1}", wm.WMPosition, Environment.NewLine);
-                                        errorIndicators |= (int)ErrorFlagMask.E25;  /// Max pruefindex exceeded
-                                    }
-                                }
-#endif
 #if TURA_SPECIAL
                                 if (arg.ToLower() == "q2factors")
                                 {

TBF/MainWnd.Designer.cs

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

TBF/Properties/AssemblyInfo.cs

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

TBF/Screens/ResultsTabPageCtrl.cs

@@ -402,11 +402,6 @@ namespace TBF.Screens
                 message = Strings.Invalid_Q2_correction_factors;
                 return WrongQ2FactorsColor;
             }
-            else if ((wMtr.ErrorFlags & (int)ErrorFlagMask.E25) != 0)
-            {
-                message = Strings.Test_repetition_count_exceeded_upper_limit;
-                return RejectColor;
-            }
             else if (wmtrPassed)
             {
                 /// Water meter passed (therefore is was also completed)

TBF/TBF.csproj

@@ -39,7 +39,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -49,7 +49,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -58,7 +58,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
@@ -67,7 +67,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -97,8 +97,8 @@
     <SignManifests>false</SignManifests>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ControlComponent3Munich">
+    <Reference Include="ControlComponent3U">
-      <HintPath>..\packages\ControlBoard\Munich\ControlComponent3Munich.dll</HintPath>
+      <HintPath>..\packages\ControlBoard\iPerlST\ControlComponent3U.dll</HintPath>
     </Reference>
     <Reference Include="FluentNHibernate">
       <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
@@ -3306,6 +3306,24 @@
     <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>

Users/Users.csproj

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