From 10ee1e20d0fd7a256ff28a25453332572370b66f Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Mon, 24 Apr 2023 17:39:53 +0800
Subject: [PATCH] =?UTF-8?q?twainui=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/twainui/hg_settingdialog.cpp | 5 ++++-
 modules/twainui/hg_settingdialog.h   | 2 +-
 modules/twainui/twainui.cpp          | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

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);