lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整读取多流输出默认参数

This commit is contained in:
yangjiaxuan 2022-12-01 17:50:28 +08:00
parent b64a92d7ac
commit 3ce040b3e6
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/oldwebscan/demo/C++TestDemo/sln/testdemo.vcxproj
View File

@ -28,12 +28,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>

29
sdk/oldwebscan/hgscannersdk/HG_SCANNER_API.cpp
View File

@ -238,6 +238,7 @@ void HG_CloseScanner(HG_Scanner_Handle pScanner)
}
int GetDeviceParam(HG_Scanner_Handle pScanner)
{
HGBool is_MultiOutput = false;
HGUInt count = 0;
HGLibDeviceParamGroup* group = HGLib_GetDeviceParamGroupList((HGLibDevice)pScanner, &count);
if (NULL == group)
@ -260,18 +261,28 @@ int GetDeviceParam(HG_Scanner_Handle pScanner)
else if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_YSMS_HB)
m_params.PixelType = HG_BlackWhite;
}
else if (devParam->option == HGLIB_OPTION_NAME_DLSC && devParam->type == HGLIB_OPTION_VALUETYPE_BOOL)
{
is_MultiOutput = devParam->boolValue;
}
else if (devParam->option == HGLIB_OPTION_NAME_DLSCLX && devParam->type == HGLIB_OPTION_VALUETYPE_ENUM)
{
if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_DLSCLX_W)
if (is_MultiOutput)
{
if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_DLSCLX_CS_HD_HB)
m_params.MultiOutput = HG_All;
else if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_DLSCLX_CS_HD)
m_params.MultiOutput = HG_ColorGray;
else if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_DLSCLX_CS_HB)
m_params.MultiOutput = HG_ColorBw;
else if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_DLSCLX_HD_HB)
m_params.MultiOutput = HG_GrayBw;
}
else
{
m_params.MultiOutput = HG_Unused;
else if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_DLSCLX_CS_HD_HB)
m_params.MultiOutput = HG_All;
else if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_DLSCLX_CS_HD)
m_params.MultiOutput = HG_ColorGray;
else if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_DLSCLX_CS_HB)
m_params.MultiOutput = HG_ColorBw;
else if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_DLSCLX_HD_HB)
m_params.MultiOutput = HG_GrayBw;
}
is_MultiOutput = false;
}
else if (devParam->option == HGLIB_OPTION_NAME_HDHHBTX_CS && devParam->type == HGLIB_OPTION_VALUETYPE_ENUM)
{

4
sdk/oldwebscan/sln/hgscannersdk/hgscannersdk.vcxproj
View File

@ -28,12 +28,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>