twain调整只能扫描一次的问题
This commit is contained in:
parent
a295285040
commit
579a7c9d6c
|
@ -3011,6 +3011,11 @@ COM_API_IMPLEMENT(scanner, bool, ui_show_progress(HWND parent, bool bIndicator))
|
||||||
break;
|
break;
|
||||||
case UI_RESULT_CLOSE_CANCEL:
|
case UI_RESULT_CLOSE_CANCEL:
|
||||||
uev = SANE_EVENT_UI_CLOSE_CANCEL;
|
uev = SANE_EVENT_UI_CLOSE_CANCEL;
|
||||||
|
if (!is_show_ui_)
|
||||||
|
{
|
||||||
|
on_ui_event(uev, (void*)uev);
|
||||||
|
}
|
||||||
|
else
|
||||||
stop();
|
stop();
|
||||||
break;
|
break;
|
||||||
case UI_RESULT_START_SCAN:
|
case UI_RESULT_START_SCAN:
|
||||||
|
|
|
@ -995,7 +995,7 @@ Result huagao_ds::eventProcess(const Identity&, Event& event)
|
||||||
if(ev)
|
if(ev)
|
||||||
handle_scanner_event(ev);
|
handle_scanner_event(ev);
|
||||||
}
|
}
|
||||||
// event.setMessage(Msg::Null);
|
event.setMessage(Msg::Null);
|
||||||
|
|
||||||
|
|
||||||
return { ReturnCode::NotDsEvent, ConditionCode::Success };
|
return { ReturnCode::NotDsEvent, ConditionCode::Success };
|
||||||
|
@ -1102,7 +1102,8 @@ Result huagao_ds::pendingXfersGet(const Identity&, PendingXfers& data)
|
||||||
if (!scanner_.get())
|
if (!scanner_.get())
|
||||||
return seqError();
|
return seqError();
|
||||||
|
|
||||||
data.setCount(get_scanned_image_count(-1));
|
int cnt = get_scanned_image_count(-1);
|
||||||
|
data.setCount(cnt);
|
||||||
return success();
|
return success();
|
||||||
}
|
}
|
||||||
Result huagao_ds::pendingXfersEnd(const Identity& id, PendingXfers& data)
|
Result huagao_ds::pendingXfersEnd(const Identity& id, PendingXfers& data)
|
||||||
|
|
Loading…
Reference in New Issue