diff --git a/sdk/scannerlib/HGLibDeviceImpl.cpp b/sdk/scannerlib/HGLibDeviceImpl.cpp index 4f1a586a..e2f39c6b 100644 --- a/sdk/scannerlib/HGLibDeviceImpl.cpp +++ b/sdk/scannerlib/HGLibDeviceImpl.cpp @@ -14,74 +14,74 @@ const char* GROUP_NAME[] = { const char* OPTION_NAME[] = { NULL, - OPTION_TITLE_DLSC, - OPTION_TITLE_DLSCLX, - OPTION_TITLE_YSMS, - OPTION_TITLE_HBTXYZ, - OPTION_TITLE_HDHHBTX_CS, - OPTION_TITLE_24WCSTX_DLSCCH, - OPTION_TITLE_24WCSTX_DTKCH, - OPTION_TITLE_BJYC, - OPTION_TITLE_BJSCFDFW, - OPTION_TITLE_RHYMH, - OPTION_TITLE_QCMW, - OPTION_TITLE_CWW, - OPTION_TITLE_CWKS, - OPTION_TITLE_HBTXZDYH, - OPTION_TITLE_ZDYHCC, - OPTION_TITLE_ZZCC, - OPTION_TITLE_ZDYSMQY, - OPTION_TITLE_SMQYZCmm, - OPTION_TITLE_SMQYYCmm, - OPTION_TITLE_SMQYSCmm, - OPTION_TITLE_SMQYXCmm, - OPTION_TITLE_CCJC, - OPTION_TITLE_SMYM, - OPTION_TITLE_TGKBYLMD, - OPTION_TITLE_FZQD, - OPTION_TITLE_XMSJ, - OPTION_TITLE_FBL, - OPTION_TITLE_HZ, - OPTION_TITLE_JHZFM, - OPTION_TITLE_TXCF, - OPTION_TITLE_ZDJP, - OPTION_TITLE_QYSDQX, - OPTION_TITLE_LDZ, - OPTION_TITLE_DBD, - OPTION_TITLE_GMZ, - OPTION_TITLE_ZPMS, - OPTION_TITLE_XCHK, - OPTION_TITLE_SSYZ, - OPTION_TITLE_YZ, - OPTION_TITLE_BJKZDJ, - OPTION_TITLE_BYSJ, - OPTION_TITLE_BJTCFS, - OPTION_TITLE_FZST, - OPTION_TITLE_FZSTDJ, - OPTION_TITLE_CKYCZC, - OPTION_TITLE_ZCCKSSFWZFMBL, - OPTION_TITLE_CKYCYC, - OPTION_TITLE_YCCKSSFWZFMBL, - OPTION_TITLE_CKYCSC, - OPTION_TITLE_SCCKSSFWZFMBL, - OPTION_TITLE_CKYCXC, - OPTION_TITLE_XCCKSSFWZFMBL, - OPTION_TITLE_SCTC, - OPTION_TITLE_CSBJC, - OPTION_TITLE_SZTPCL, - OPTION_TITLE_ZDJC, - OPTION_TITLE_SMZS, - OPTION_TITLE_SMSL, - OPTION_TITLE_WGFX, - OPTION_TITLE_BMXZ180, - OPTION_TITLE_ZJJC, - OPTION_TITLE_ZJDX, - OPTION_TITLE_WXJC, - OPTION_TITLE_WXRRD, - OPTION_TITLE_ZDCZQD, - OPTION_TITLE_CZYZ, - OPTION_TITLE_DZSM, - OPTION_TITLE_HBTXFSSC + SANE_STD_OPT_NAME_IS_MULTI_OUT, + SANE_STD_OPT_NAME_MULTI_OUT_TYPE, + SANE_STD_OPT_NAME_COLOR_MODE, + SANE_STD_OPT_NAME_BINARY_THRESHOLD, + SANE_STD_OPT_NAME_FILTER, + SANE_STD_OPT_NAME_RID_MULTIOUT_RED, + SANE_STD_OPT_NAME_RID_ANSWER_SHEET_RED, + SANE_STD_OPT_NAME_ERASE_BACKGROUND, + SANE_STD_OPT_NAME_BKG_COLOR_RANGE, + SANE_STD_OPT_NAME_SHARPEN, + SANE_STD_OPT_NAME_RID_MORR, + SANE_STD_OPT_NAME_RID_GRID, + SANE_STD_OPT_NAME_ERROR_EXTENSION, + SANE_STD_OPT_NAME_NOISE_OPTIMIZE, + SANE_STD_OPT_NAME_NOISE_SIZE, + SANE_STD_OPT_NAME_PAPER, + SANE_STD_OPT_NAME_CUSTOM_AREA, + SANE_STD_OPT_NAME_CUSTOM_AREA_LEFT, + SANE_STD_OPT_NAME_CUSTOM_AREA_RIGHT, + SANE_STD_OPT_NAME_CUSTOM_AREA_TOP, + SANE_STD_OPT_NAME_CUSTOM_AREA_BOTTOM, + SANE_STD_OPT_NAME_SIZE_CHECK, + SANE_STD_OPT_NAME_PAGE, + SANE_STD_OPT_NAME_DISCARD_BLANK_SENS, + SANE_STD_OPT_NAME_FEED_STRENGTH, + SANE_STD_OPT_NAME_TIME_TO_SLEEP, + SANE_STD_OPT_NAME_RESOLUTION, + SANE_STD_OPT_NAME_IMAGE_QUALITY, + SANE_STD_OPT_NAME_EXCHANGE, + SANE_STD_OPT_NAME_SPLIT, + SANE_STD_OPT_NAME_ANTI_SKEW, + SANE_STD_OPT_NAME_IS_CUSTOM_GAMMA, + SANE_STD_OPT_NAME_BRIGHTNESS, + SANE_STD_OPT_NAME_CONTRAST, + SANE_STD_OPT_NAME_GAMMA, + SANE_STD_OPT_NAME_IS_PHOTO_MODE, + SANE_STD_OPT_NAME_ERASE_BLACK_FRAME, + SANE_STD_OPT_NAME_DARK_SAMPLE, + SANE_STD_OPT_NAME_THRESHOLD, + SANE_STD_OPT_NAME_ANTI_NOISE_LEVEL, + SANE_STD_OPT_NAME_MARGIN, + SANE_STD_OPT_NAME_FILL_BKG_MODE, + SANE_STD_OPT_NAME_IS_ANTI_PERMEATE, + SANE_STD_OPT_NAME_ANTI_PERMEATE_LEVEL, + SANE_STD_OPT_NAME_RID_HOLE_L, + SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_L, + SANE_STD_OPT_NAME_RID_HOLE_R, + SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_R, + SANE_STD_OPT_NAME_RID_HOLE_T, + SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_T, + SANE_STD_OPT_NAME_RID_HOLE_B, + SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_B, + SANE_STD_OPT_NAME_IS_FILL_COLOR, + SANE_STD_OPT_NAME_IS_ULTROSONIC_CHECK, + SANE_STD_OPT_NAME_DOUBLE_FEED_HANDLE, + SANE_STD_OPT_NAME_IS_CHECK_STAPLE, + SANE_STD_OPT_NAME_SCAN_MODE, + SANE_STD_OPT_NAME_SCAN_COUNT, + SANE_STD_OPT_NAME_TEXT_DIRECTION, + SANE_STD_OPT_NAME_IS_ROTATE_BKG_180, + SANE_STD_OPT_NAME_IS_CHECK_DOG_EAR, + SANE_STD_OPT_NAME_DOG_EAR_SIZE, + SANE_STD_OPT_NAME_IS_CHECK_ASKEW, + SANE_STD_OPT_NAME_ASKEW_RANGE, + SANE_STD_OPT_NAME_IS_AUTO_FEED_STRENGTH, + SANE_STD_OPT_NAME_FEED_STRENGTH_VALUE, + SANE_STD_OPT_NAME_WAIT_TO_SCAN, + SANE_STD_OPT_NAME_REVERSE_01 }; const char* OPTION_ENUMVALUE[] = { @@ -432,7 +432,7 @@ HGBool HGLibDeviceImpl::SetParam(HGUInt option, const HGVoid* data) if (NULL == desp) continue; - const char* name = desp->title; + const char* name = desp->name; while (' ' == *name) ++name; @@ -489,7 +489,7 @@ HGLibDeviceParamGroup* HGLibDeviceImpl::GetParamGroupList(HGUInt* count) if (NULL == desp) continue; - const char* name = desp->title; + const char* name = desp->name; while (' ' == *name) ++name; @@ -695,7 +695,7 @@ HGLibDeviceParam* HGLibDeviceImpl::GetParam(HGUInt option) if (NULL == desp) continue; - const char* name = desp->title; + const char* name = desp->name; while (' ' == *name) ++name; @@ -909,11 +909,11 @@ HGBool HGLibDeviceImpl::ResetParam() if (NULL == desp) continue; - const char* title = desp->title; - while (' ' == *title) - ++title; + const char* name = desp->name; + while (' ' == *name) + ++name; - if (0 == strcmp(OPTION_TITLE_HFMRSZ, title) && SANE_TYPE_BUTTON == desp->type) + if (0 == strcmp(SANE_STD_OPT_NAME_RESTORE, name) && SANE_TYPE_BUTTON == desp->type) { if (SANE_STATUS_GOOD == sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, NULL, NULL)) ret = HGTRUE; diff --git a/sdk/webservice/ManagerV2.cpp b/sdk/webservice/ManagerV2.cpp index 478d0d21..dd034a8d 100644 --- a/sdk/webservice/ManagerV2.cpp +++ b/sdk/webservice/ManagerV2.cpp @@ -3341,7 +3341,7 @@ namespace ver_2 if (SANE_TYPE_GROUP == desp->type) { DeviceParamsGroup group; - group.groupName = title; + group.groupTitle = title; devParams.push_back(group); } else if (SANE_TYPE_STRING == desp->type) @@ -3457,11 +3457,11 @@ namespace ver_2 if (NULL == desp) continue; - const char* title = desp->title; - while (' ' == *title) - ++title; + const char* name = desp->name; + while (' ' == *name) + ++name; - if (0 == strcmp(OPTION_TITLE_HFMRSZ, title) && SANE_TYPE_BUTTON == desp->type) + if (0 == strcmp(SANE_STD_OPT_NAME_RESTORE, name) && SANE_TYPE_BUTTON == desp->type) { if (SANE_STATUS_GOOD == sane_control_option(hdev, i, SANE_ACTION_SET_VALUE, NULL, NULL)) ret = 0; diff --git a/sdk/webservice/ManagerV2.h b/sdk/webservice/ManagerV2.h index c1239271..b77c60bd 100644 --- a/sdk/webservice/ManagerV2.h +++ b/sdk/webservice/ManagerV2.h @@ -94,7 +94,7 @@ namespace ver_2 struct DeviceParamsGroup { - std::string groupName; + std::string groupTitle; std::vector devParams; }; diff --git a/sdk/webservice/WSUser.cpp b/sdk/webservice/WSUser.cpp index e26bb114..3805c591 100644 --- a/sdk/webservice/WSUser.cpp +++ b/sdk/webservice/WSUser.cpp @@ -2513,7 +2513,7 @@ namespace ver_2 for (int k = 0; k < (int)devParams.size(); ++k) { cJSON* groupParams = cJSON_CreateObject(); - cJSON_AddItemToObject(groupParams, "group_name", cJSON_CreateString(devParams[k].groupName.c_str())); + cJSON_AddItemToObject(groupParams, "group_name", cJSON_CreateString(devParams[k].groupTitle.c_str())); cJSON* groupParam = cJSON_CreateArray(); for (int i = 0; i < (int)devParams[k].devParams.size(); ++i) {