bugfix IPERL_ASIC conductivity

update mappings , version 3.9.3136.0
This commit is contained in:
Michal Buzik 2026-08-13 15:16:58 +02:00
parent 55d2381e8a
commit 0f2ef5a5bf
5 changed files with 12 additions and 12 deletions

View File

@ -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);

View File

@ -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);

View File

@ -17,7 +17,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;LANG_PL;</DefineConstants>
<DefineConstants>TRACE;DEBUG;LANG_PL;IPERL_ASIC</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@ -25,7 +25,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;</DefineConstants>
<DefineConstants>TRACE;IPERL_ASIC</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>

View File

@ -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")]

View File

@ -40,7 +40,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;CAMERA;LANG_PL;IPERL;</DefineConstants>
<DefineConstants>TRACE;DEBUG;CAMERA;LANG_PL;IPERL;IPERL_ASIC;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -51,7 +51,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;CAMERA;IPERL;</DefineConstants>
<DefineConstants>TRACE;CAMERA;IPERL;IPERL_ASIC;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
@ -61,7 +61,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;CAMERA;LANG_PL;IPERL;</DefineConstants>
<DefineConstants>TRACE;DEBUG;CAMERA;LANG_PL;IPERL;IPERL_ASIC;</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
@ -71,7 +71,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE;CAMERA;LANG_PL;IPERL;LIVELOGDIAG_FlowMeter_cs;LIVELOGDIAG_RegValve_cs</DefineConstants>
<DefineConstants>TRACE;CAMERA;LANG_PL;IPERL;LIVELOGDIAG_FlowMeter_cs;LIVELOGDIAG_RegValve_cs;IPERL_ASIC</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>