diff --git a/modules/twainui/hg_settingdialog.cpp b/modules/twainui/hg_settingdialog.cpp index 11b9539f..3d8a7162 100644 --- a/modules/twainui/hg_settingdialog.cpp +++ b/modules/twainui/hg_settingdialog.cpp @@ -16,7 +16,7 @@ std::string hg_settingdialog::property_combox_data_type_ = "combox_value_type"; -hg_settingdialog::hg_settingdialog(SANE_Handle handle, const SANEAPI* saneApi, bool showScan, QWidget *parent) +hg_settingdialog::hg_settingdialog(SANE_Handle handle, const SANEAPI* saneApi, bool showScan, const char* devName, QWidget *parent) : QDialog(parent) , save_(false) , btn_cut_area_(nullptr), btn_gamma_(nullptr), clicked_gamma_(false) @@ -31,6 +31,9 @@ hg_settingdialog::hg_settingdialog(SANE_Handle handle, const SANEAPI* saneApi, b if(QFile::exists(old)) dev_que::update_old_cfg(old.toStdString().c_str()); + dev_que_.add_scanner(devName); + dev_que_.open_scanner(saneApi, handle, devName); + std::string n(dev_que_.opened_scanner_name()); for(int i = 0; i < dev_que_.scanners(); ++i) { diff --git a/modules/twainui/hg_settingdialog.h b/modules/twainui/hg_settingdialog.h index cfd7c318..0cbdddf3 100644 --- a/modules/twainui/hg_settingdialog.h +++ b/modules/twainui/hg_settingdialog.h @@ -46,7 +46,7 @@ class hg_settingdialog : public QDialog }; public: - explicit hg_settingdialog(SANE_Handle handle, const SANEAPI* saneApi, bool showScan, QWidget *parent = nullptr); + explicit hg_settingdialog(SANE_Handle handle, const SANEAPI* saneApi, bool showScan, const char* devName, QWidget *parent = nullptr); ~hg_settingdialog(); public: diff --git a/modules/twainui/twainui.cpp b/modules/twainui/twainui.cpp index 90e1ff2d..10d4218f 100644 --- a/modules/twainui/twainui.cpp +++ b/modules/twainui/twainui.cpp @@ -76,7 +76,7 @@ int show_setting_ui(SANE_Handle device, HWND parent, LPSANEAPI api, bool with_sc translator.load(":translation/TwainUI_zh_CN.qm"); QCoreApplication::installTranslator(&translator); - hg_settingdialog dlg(device, api, with_scan, qParent); + hg_settingdialog dlg(device, api, with_scan, "HUAGOSCAN G400 - 400", qParent); dlg.exec(); QCoreApplication::removeTranslator(&translator);