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

暂时加上一段延时来处理，设备未准备好，新增色偏校正

This commit is contained in:
13038267101 2023-02-24 17:44:47 +08:00
parent d1897e2f32
commit 2595588750
6 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
device/scanner.vcxproj
View File

@ -220,6 +220,7 @@
<ClCompile Include="..\..\code_device\hgdriver\hgdev\usb_manager.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\CISTestImageProcess.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\G4Tiff.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyColorCastCorrect.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyDispersion.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyMarkCrop.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplySizeDetection.cpp" />
@ -294,6 +295,7 @@
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyAutoCrop.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyBWBinaray.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyChannel.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyColorCastCorrect.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyColorRecognition.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyConcatenation.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyCrop.h" />

6
device/scanner.vcxproj.filters
View File

@ -210,6 +210,9 @@
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\CISTestImageProcess.cpp">
<Filter>image</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyColorCastCorrect.cpp">
<Filter>image</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApply.h">
@ -443,6 +446,9 @@
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\CISTestImageProcess.h">
<Filter>image</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyColorCastCorrect.h">
<Filter>image</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="device.def">

2
sane/s2t_api.h
View File

@ -176,6 +176,8 @@ struct __declspec(novtable) ISaneInvoker : public IRef
COM_API_DECLARE(void, free_buffer(void* buf, int len));
// SANE options ID ...
SANE_OPTION_ID_API(color_correction); // 2023-02-24 15:31:19 色偏校正
SANE_OPTION_ID_API(fold_type); // 2023-02-24 15:28:47 对折模式
SANE_OPTION_ID_API(is_multiout); // 多流输出
SANE_OPTION_ID_API(multiout_type); // 多流输出类型
SANE_OPTION_ID_API(color_mode); // 颜色模式

6
sane/scanner.cpp
View File

@ -196,6 +196,8 @@ namespace callback
, {SANE_STD_OPT_NAME_IS_AUTO_FEED_STRENGTH , OPTION_TITLE_ZDFZQD}
, {SANE_STD_OPT_NAME_FEED_STRENGTH_VALUE , OPTION_TITLE_JZSBL}
, {SANE_STD_OPT_NAME_WAIT_TO_SCAN , OPTION_TITLE_DZSM}
, {SANE_STD_OPT_NAME_FOLD_TYPE , OPTION_TITLE_DZMS}
, {SANE_STD_OPT_NAME_COLOR_CORRECTION , OPTION_TITLE_SPJZ}
},
g_discard[] = { {SANE_STD_OPT_NAME_REVERSE_01 , "\351\273\221\347\231\275\345\233\276\345\203\217\345\217\215\350\211\262\350\276\223\345\207\272\357\274\210\346\255\243\345\270\270\351\242\234\350\211\262\344\270\272\357\274\2320-\351\273\221\350\211\262\357\274\2331-\347\231\275\350\211\262\357\274\211"} // 黑白图像反色输出（正常颜色为：0-黑色；1-白色）
, {SANE_STD_OPT_NAME_FILTER , "\347\201\260\345\272\246\346\210\226\351\273\221\347\231\275\345\233\276\345\203\217 - \351\231\244\350\211\262"} // 灰度或黑白图像 - 除色
@ -881,6 +883,8 @@ int scanner::init_options_id(void)
else SET_OPT_ID(is_erase_hole_b, RID_HOLE_B, extension_none)
else SET_OPT_ID(search_hole_range_b, SEARCH_HOLE_RANGE_B, extension_none)
else SET_OPT_ID(fold_direction, FOLD_TYPE, extension_none)
else SET_OPT_ID(fold_type, FOLD_TYPE, extension_none)
else SET_OPT_ID(color_correction, COLOR_CORRECTION, extension_none)
op_id++;
}
@ -2620,6 +2624,8 @@ COM_API_IMPLEMENT(scanner, void, free_buffer(void* buf, int len))
}
// SANE options ID ...
SANE_OPTION_ID_IMPLEMENT(color_correction)
SANE_OPTION_ID_IMPLEMENT(fold_type)
SANE_OPTION_ID_IMPLEMENT(is_multiout)
SANE_OPTION_ID_IMPLEMENT(multiout_type)
SANE_OPTION_ID_IMPLEMENT(color_mode)

2
sane/scanner.h
View File

@ -206,6 +206,8 @@ public:
COM_API_OVERRIDE(void, free_buffer(void* buf, int len));
// SANE options ID ...
SANE_OPTION_ID(color_correction); // 2023-02-24 15:31:19 色偏校正
SANE_OPTION_ID(fold_type); // 2023-02-24 15:28:46 对折模式
SANE_OPTION_ID(is_multiout);
SANE_OPTION_ID(multiout_type);
SANE_OPTION_ID(color_mode);

4
twain/twain/huagaods.cpp
View File

@ -140,6 +140,8 @@ enum CapTypeEx : unsigned short {
CAP_EX_SANE_is_erase_hole_b,
CAP_EX_SANE_search_hole_range_b,
CAP_EX_SANE_fold_direction,
CAP_EX_SANE_fold_type,
CAP_EX_SANE_color_correction, // 2023-02-24 15:31:19 色偏校正 // 2023-02-24 15:28:46 对折模式
// END for SANE设备层原始设置项透传属性
/////////////////////////////////////////////////////////////////////////
};
@ -3066,6 +3068,8 @@ void huagao_ds::init_support_caps_ex(void)
ADD_SANE_CAP(is_erase_hole_b); // 穿孔移除 - 下
ADD_SANE_CAP(search_hole_range_b); // 穿孔搜索范围 - 下
ADD_SANE_CAP(fold_direction); // 对折方向
ADD_SANE_CAP(fold_type);
ADD_SANE_CAP(color_correction);
}
std::wstring huagao_ds::get_config_file(void)
{