From 9ef7cdac15d2f5c85b7b8aa09c20a05d3da5f747 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Fri, 25 Aug 2023 14:26:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=9B=E5=BA=A6=E6=8C=87?=
 =?UTF-8?q?=E7=A4=BA=E5=99=A8=E6=89=AB=E6=8F=8F=E5=BC=A0=E6=95=B0=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=EF=BC=8C=E5=9B=BD=E4=BA=A7=E7=B3=BB=E7=BB=9F=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=80=E5=A7=8B=E6=89=AB=E6=8F=8F=E5=92=8C?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=89=AB=E6=8F=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/twainui/dialog_progress_ui.cpp | 19 ++++++++++---------
 modules/twainui/dialog_progress_ui.h   |  2 ++
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/modules/twainui/dialog_progress_ui.cpp b/modules/twainui/dialog_progress_ui.cpp
index 1cc2ebf7..716916bc 100644
--- a/modules/twainui/dialog_progress_ui.cpp
+++ b/modules/twainui/dialog_progress_ui.cpp
@@ -8,12 +8,12 @@
 #include <thread>
 
 extern Manager* g_manager;
-static int imageRecivedCount = 0;
 
 Dialog_progress_ui::Dialog_progress_ui(class Manager *mgr, std::function<void (ui_result)> callback, std::function<void (int, void *, int)> *notify, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::Dialog_progress_ui)
-   , m_isScanning(false)
+    , m_imageRecivedCount(0)
+    , m_isScanning(false)
     , m_thread(nullptr)
 {
     ui->setupUi(this);
@@ -31,7 +31,7 @@ Dialog_progress_ui::Dialog_progress_ui(class Manager *mgr, std::function<void (u
     ui->label_imgRecived->setVisible(false);
     ui->lineEdit_imgRecived->setVisible(false);
     ui->label_totalImgRecived->setVisible(false);
-    ui->lineEdit_imgRecived->setText(QString::number(imageRecivedCount));
+    ui->lineEdit_imgRecived->setText(QString::number(m_imageRecivedCount));
 
     m_mgr = mgr;
     m_callback = callback;
@@ -50,8 +50,6 @@ Dialog_progress_ui::~Dialog_progress_ui()
     m_thread = nullptr;
     m_mgr->m_progressUi = nullptr;
 
-    imageRecivedCount = 0;
-
     delete ui;
 }
 
@@ -108,7 +106,9 @@ void Dialog_progress_ui::on_scan_finish(int flag, QString finishInfo)
     on_scan_status(finishInfo, false);
 
     ui->label_totalImgRecived->setVisible(true);
-    ui->label_totalImgRecived->setText(tr("Total scanned images: %1").arg(QString::number(imageRecivedCount)));
+    ui->label_totalImgRecived->setText(tr("Total scanned images: %1").arg(QString::number(m_imageRecivedCount)));
+
+    m_imageRecivedCount = 0;
 
     if (SCANNER_ERR_OK == flag || SCANNER_ERR_USER_CANCELED == flag)
     {
@@ -119,7 +119,8 @@ void Dialog_progress_ui::on_scan_finish(int flag, QString finishInfo)
 
 void Dialog_progress_ui::on_image_recived()
 {
-    ui->lineEdit_imgRecived->setText(QString::number(++imageRecivedCount));
+    m_imageRecivedCount++;
+    ui->lineEdit_imgRecived->setText(QString::number(m_imageRecivedCount));
 }
 
 void HGAPI Dialog_progress_ui::ThreadFunc(HGThread thread, HGPointer param)
@@ -147,14 +148,14 @@ void Dialog_progress_ui::FuncNotify(int event, void *msg, int flag)
     {
         case SANE_EVENT_WORKING:
         {
-            QString finishInfo((char*)msg);
+            QString finishInfo(tr("Start scan..."));
             emit p->scan_status(finishInfo, true);
         }
         break;
 
         case SANE_EVENT_SCAN_FINISHED:
         {
-            QString finishInfo((char*)msg);
+            QString finishInfo(tr("Scan completed"));
             emit p->scan_finish(flag, finishInfo);
         }
         break;
diff --git a/modules/twainui/dialog_progress_ui.h b/modules/twainui/dialog_progress_ui.h
index 6c544d72..b8dd5c6b 100644
--- a/modules/twainui/dialog_progress_ui.h
+++ b/modules/twainui/dialog_progress_ui.h
@@ -49,6 +49,8 @@ public:
 private:
     Ui::Dialog_progress_ui *ui;
 
+    int m_imageRecivedCount;
+
     class Manager *m_mgr;
     std::function<void (ui_result)> m_callback;
     QTimer *m_timer;