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

Merge branch 'dev' of http://192.168.10.5:8099/sane/code_app into dev

This commit is contained in:
luoliangyi 2024-05-21 11:41:34 +08:00
parent 5b230ba660 19cb7d4b15
commit ad221c136c
5 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build2/qt/HGScannerLib/HGScannerLib.def
View File

@ -40,6 +40,7 @@ HGLib_StopDeviceScan
HGLib_StopDeviceScanAsyn
HGLib_GetDeviceOperateCode
HGLib_GetDevicePageId
HGLib_SetOriginalImage
Java_com_easing_java_HGScannerLib_LoadImage
Java_com_easing_java_HGScannerLib_SaveImage

8
sdk/scannerlib/HGLibDeviceImpl.cpp
View File

@ -467,7 +467,13 @@ HGBool HGLibDeviceImpl::SetDeviceToken(const HGChar* code)
if (NULL == code)
return HGFALSE;
SetValueStr256(0x8116, code);
return SetValueStr256(0x8116, code);
}
HGBool HGLibDeviceImpl::SetOriginalImage(HGBool isOriginal)
{
assert(NULL != m_devHandle);
return SetValueInt32(0x886F, isOriginal);
}
HGBool HGLibDeviceImpl::SetParam(HGUInt option, const HGVoid* data)

1
sdk/scannerlib/HGLibDeviceImpl.hpp
View File

@ -30,6 +30,7 @@ public:
HGInt GetTotalCount();
HGBool ClearRollerCount();
HGBool SetDeviceToken(const HGChar* code);
HGBool SetOriginalImage(HGBool isOriginal);
HGBool SetParam(HGUInt option, const HGVoid* data);
HGLibDeviceParamGroup* GetParamGroupList(HGUInt* count);
HGLibDeviceParam* GetParam(HGUInt option);

13
sdk/scannerlib/HGScannerLib.cpp
View File

@ -1,4 +1,4 @@
#include "HGScannerLib.h"
#include "HGScannerLib.h"
#include "base/HGInc.h"
#include "base/HGImage.h"
#include "imgfmt/HGImgFmt.h"
@ -489,3 +489,14 @@ HGBool HGAPI HGLib_SetDeviceToken(HGLibDevice device, const HGChar *code)
HGLibDeviceImpl* deviceImpl = (HGLibDeviceImpl*)device;
return deviceImpl->SetDeviceToken(code);
}
HGBool HGAPI HGLib_SetOriginalImage(HGLibDevice device, HGBool isOriginal)
{
if (NULL == device)
{
return HGFALSE;
}
HGLibDeviceImpl* deviceImpl = (HGLibDeviceImpl*)device;
return deviceImpl->SetOriginalImage(isOriginal);
}

3
sdk/scannerlib/HGScannerLib.h
View File

@ -649,6 +649,9 @@ HGEXPORT HGBool HGAPI HGLib_ClearDeviceRollerCount(HGLibDevice device);
/* 设置设备锁定令牌 */
HGEXPORT HGBool HGAPI HGLib_SetDeviceToken(HGLibDevice device, const HGChar *code);
/* 设置是否获取原图 */
HGEXPORT HGBool HGAPI HGLib_SetOriginalImage(HGLibDevice device, HGBool isOriginal);
/* 设置设备参数 */
HGEXPORT HGBool HGAPI HGLib_SetDeviceParam(HGLibDevice device, HGUInt option, const HGVoid *data);