From 0f2ef5a5bf45100732c95f5fd0f12c646fb0e131 Mon Sep 17 00:00:00 2001 From: Michal Buzik Date: Thu, 13 Aug 2026 15:16:58 +0200 Subject: [PATCH] bugfix IPERL_ASIC conductivity update mappings , version 3.9.3136.0 --- Results/Mappings/TestRsltMap.cs | 4 ++-- SharedDatabase/Mappings/TestRsltMap.cs | 4 ++-- SharedDatabase/SharedDatabase.csproj | 4 ++-- TBF/Properties/AssemblyInfo.cs | 4 ++-- TBF/TBF.csproj | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Results/Mappings/TestRsltMap.cs b/Results/Mappings/TestRsltMap.cs index 7713566a9..6c2ea5937 100644 --- a/Results/Mappings/TestRsltMap.cs +++ b/Results/Mappings/TestRsltMap.cs @@ -106,13 +106,13 @@ namespace Results.Mappings Map(x => x.FlowEnd); Map(x => x.FlowMin); Map(x => x.FlowMax); -#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL +//#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL Map(x => x.ConductMean); Map(x => x.ConductStart); Map(x => x.ConductEnd); Map(x => x.ConductMin); Map(x => x.ConductMax); -#endif +//#endif Map(x => x.Uncertnt); Map(x => x.UncertntScale); Map(x => x.UncertntDensity); diff --git a/SharedDatabase/Mappings/TestRsltMap.cs b/SharedDatabase/Mappings/TestRsltMap.cs index b5056552c..3ad7cf203 100644 --- a/SharedDatabase/Mappings/TestRsltMap.cs +++ b/SharedDatabase/Mappings/TestRsltMap.cs @@ -102,13 +102,13 @@ namespace SharedDatabase.Mappings Map(x => x.FlowEnd); Map(x => x.FlowMin); Map(x => x.FlowMax); -#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL +//#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || IPERL_ASIC Map(x => x.ConductMean); Map(x => x.ConductStart); Map(x => x.ConductEnd); Map(x => x.ConductMin); Map(x => x.ConductMax); -#endif +//#endif Map(x => x.Uncertnt); Map(x => x.UncertntScale); Map(x => x.UncertntDensity); diff --git a/SharedDatabase/SharedDatabase.csproj b/SharedDatabase/SharedDatabase.csproj index bdb461ffc..285fca54d 100644 --- a/SharedDatabase/SharedDatabase.csproj +++ b/SharedDatabase/SharedDatabase.csproj @@ -17,7 +17,7 @@ full false bin\Debug\ - TRACE;DEBUG;LANG_PL; + TRACE;DEBUG;LANG_PL;IPERL_ASIC prompt 4 @@ -25,7 +25,7 @@ pdbonly true bin\Release\ - TRACE; + TRACE;IPERL_ASIC prompt 4 diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index d21bd023d..fe04de4be 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("3.9.3135.0")] -[assembly: AssemblyFileVersion("3.9.3135.0")] +[assembly: AssemblyVersion("3.9.3136.0")] +[assembly: AssemblyFileVersion("3.9.3136.0")] diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index 46a89ce96..c14b62439 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -40,7 +40,7 @@ full false bin\Debug\ - TRACE;DEBUG;CAMERA;LANG_PL;IPERL; + TRACE;DEBUG;CAMERA;LANG_PL;IPERL;IPERL_ASIC; prompt 4 true @@ -51,7 +51,7 @@ pdbonly true bin\Release\ - TRACE;CAMERA;IPERL; + TRACE;CAMERA;IPERL;IPERL_ASIC; prompt 4 AnyCPU @@ -61,7 +61,7 @@ true bin\Debug\ - TRACE;DEBUG;CAMERA;LANG_PL;IPERL; + TRACE;DEBUG;CAMERA;LANG_PL;IPERL;IPERL_ASIC; full AnyCPU prompt @@ -71,7 +71,7 @@ bin\x86\Release\ - TRACE;CAMERA;LANG_PL;IPERL;LIVELOGDIAG_FlowMeter_cs;LIVELOGDIAG_RegValve_cs + TRACE;CAMERA;LANG_PL;IPERL;LIVELOGDIAG_FlowMeter_cs;LIVELOGDIAG_RegValve_cs;IPERL_ASIC true pdbonly AnyCPU