新增设备返回大型穿孔状态
This commit is contained in:
parent
4d72cadd21
commit
ca31cc7ea1
|
@ -732,7 +732,8 @@ namespace setting3288dsp
|
||||||
V4L2_IMAGE_EMPTY = 80, //扫描仪内部图片丢失
|
V4L2_IMAGE_EMPTY = 80, //扫描仪内部图片丢失
|
||||||
SLEEPING = 81, //处于休眠中
|
SLEEPING = 81, //处于休眠中
|
||||||
HAVE_DOGEAR = 82, //检测到有折角
|
HAVE_DOGEAR = 82, //检测到有折角
|
||||||
AUTO_FLATTING = 198,//自动校正中
|
HAVE_HOLE = 84 , //检测到纸张有孔洞, 注意不是穿孔,类似于中间破损一块
|
||||||
|
AUTO_FLATTING = 198, //自动校正中
|
||||||
USB_DISCONNECTED = 200, //USB 未连接
|
USB_DISCONNECTED = 200, //USB 未连接
|
||||||
USER_STOP = 201, //用户点击停止
|
USER_STOP = 201, //用户点击停止
|
||||||
AUTO_FLAT_FINISHED = 202, //自动校正完成
|
AUTO_FLAT_FINISHED = 202, //自动校正完成
|
||||||
|
|
|
@ -1094,6 +1094,9 @@ void hg_scanner::working_done(void*)
|
||||||
case SCANNER_ERR_DEVICE_DISTORTION:
|
case SCANNER_ERR_DEVICE_DISTORTION:
|
||||||
notify_ui_working_status(hg_log::lang_load(ID_STATU_DESC_SCANNER_ERR_DEVICE_DISTORTION), SANE_EVENT_SCAN_FINISHED, status_);
|
notify_ui_working_status(hg_log::lang_load(ID_STATU_DESC_SCANNER_ERR_DEVICE_DISTORTION), SANE_EVENT_SCAN_FINISHED, status_);
|
||||||
break;
|
break;
|
||||||
|
case SCANNER_ERR_DEVICE_MAYBE_IS_HOLE:
|
||||||
|
notify_ui_working_status(from_default_language(STATU_DESC_SCANNER_ERR_DEVICE_MAYBE_IS_HOLE), SANE_EVENT_SCAN_FINISHED, status_);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
notify_ui_working_status(user_cancel_ ? hg_log::lang_load(ID_STATU_DESC_SCAN_CANCELED) : hg_log::lang_load(ID_STATU_DESC_SCAN_STOPPED), SANE_EVENT_SCAN_FINISHED, status_);
|
notify_ui_working_status(user_cancel_ ? hg_log::lang_load(ID_STATU_DESC_SCAN_CANCELED) : hg_log::lang_load(ID_STATU_DESC_SCAN_STOPPED), SANE_EVENT_SCAN_FINISHED, status_);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -63,6 +63,9 @@ namespace settingsdsp_300
|
||||||
case setting3288dsp::AUTO_FLATTING:
|
case setting3288dsp::AUTO_FLATTING:
|
||||||
code = SCANNER_ERR_DEVICE_AUTO_FAIL_INFO;
|
code = SCANNER_ERR_DEVICE_AUTO_FAIL_INFO;
|
||||||
break;
|
break;
|
||||||
|
case setting3288dsp::HAVE_HOLE:
|
||||||
|
code = SCANNER_ERR_DEVICE_MAYBE_IS_HOLE;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
code = SCANNER_ERR_NO_DATA;
|
code = SCANNER_ERR_NO_DATA;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -248,6 +248,7 @@ extern "C"
|
||||||
RETURN_IF(err, SCANNER_ERR_DEVICE_SCANN_ERROR);
|
RETURN_IF(err, SCANNER_ERR_DEVICE_SCANN_ERROR);
|
||||||
RETURN_IF(err, SCANNER_ERR_DEVICE_PC_BUSY);
|
RETURN_IF(err, SCANNER_ERR_DEVICE_PC_BUSY);
|
||||||
RETURN_IF(err, SCANNER_ERR_DEVICE_ISLOCK);
|
RETURN_IF(err, SCANNER_ERR_DEVICE_ISLOCK);
|
||||||
|
RETURN_IF(err, SCANNER_ERR_DEVICE_MAYBE_IS_HOLE);
|
||||||
|
|
||||||
if (err == SCANNER_ERR_LANG_PAK_LOST)
|
if (err == SCANNER_ERR_LANG_PAK_LOST)
|
||||||
return "SCANNER_ERR_LANG_PAK_LOST";
|
return "SCANNER_ERR_LANG_PAK_LOST";
|
||||||
|
@ -318,6 +319,7 @@ extern "C"
|
||||||
RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_SCANN_ERROR);
|
RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_SCANN_ERROR);
|
||||||
RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_PC_BUSY);
|
RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_PC_BUSY);
|
||||||
RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_ISLOCK);
|
RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_ISLOCK);
|
||||||
|
RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_MAYBE_IS_HOLE);
|
||||||
|
|
||||||
if (err == SCANNER_ERR_LANG_PAK_LOST)
|
if (err == SCANNER_ERR_LANG_PAK_LOST)
|
||||||
return "SCANNER_ERR_LANG_PAK_LOST";
|
return "SCANNER_ERR_LANG_PAK_LOST";
|
||||||
|
|
Loading…
Reference in New Issue