调整错误信息提示

app/scanner/mainwindow.cpp

@@ -121,6 +121,7 @@ MainWindow::MainWindow(QWidget *parent)
     m_thumb->setItemSize(80);
     m_thumb->setScrollSize(16);
     m_thumb->setMinScrollSliderSize(20);
+	m_thumb->setItemTextHeight(0);
 
     QImage nullScrollImage(":images/image_rsc/scroll/nullScrollImage.png");
     m_view->setNullScrollImage(&nullScrollImage);
@@ -195,8 +196,8 @@ MainWindow::MainWindow(QWidget *parent)
 #if defined(HG_CMP_MSC) && defined(APP_USE_TWAIN)
 
     connect(this, SIGNAL(new_image(void *)), this, SLOT(on_new_image(void *)));
-    connect(this, SIGNAL(scan_working()), this, SLOT(on_scan_working()));
-    connect(this, SIGNAL(scan_finish()), this, SLOT(on_scan_finish()));
+    connect(this, SIGNAL(scan_working(QString)), this, SLOT(on_scan_working(QString)));
+    connect(this, SIGNAL(scan_finish(QString, int)), this, SLOT(on_scan_finish(QString, int)));
 
     ui->menu_device->setEnabled(false);
     m_twainDSM = nullptr;
@@ -212,8 +213,8 @@ MainWindow::MainWindow(QWidget *parent)
     connect(this, SIGNAL(sane_dev_arrive(QString)), this, SLOT(on_sane_dev_arrive(QString)), Qt::QueuedConnection);
     connect(this, SIGNAL(sane_dev_remove(QString)), this, SLOT(on_sane_dev_remove(QString)), Qt::QueuedConnection);
     connect(this, SIGNAL(new_image(void *)), this, SLOT(on_new_image(void *)), Qt::QueuedConnection);
-    connect(this, SIGNAL(scan_working()), this, SLOT(on_scan_working()), Qt::QueuedConnection);
-    connect(this, SIGNAL(scan_finish()), this, SLOT(on_scan_finish()), Qt::QueuedConnection);
+    connect(this, SIGNAL(scan_working(QString)), this, SLOT(on_scan_working(QString)), Qt::QueuedConnection);
+    connect(this, SIGNAL(scan_finish(QString, int)), this, SLOT(on_scan_finish(QString, int)), Qt::QueuedConnection);
     connect(this, SIGNAL(sane_dev_error(QString)), this, SLOT(on_sane_dev_error(QString)), Qt::QueuedConnection);
     connect(m_dialog_log, SIGNAL(continuScan(bool)), this, SLOT(on_continuScan(bool)), Qt::QueuedConnection);
     connect(m_dialog_log, SIGNAL(continuScan(void)), this, SLOT(on_act_acquire_triggered(void)), Qt::QueuedConnection);
@@ -721,12 +722,12 @@ void MainWindow::on_sane_dev_remove(QString devName)
 
 void MainWindow::on_sane_dev_error(QString errorInfo)
 {
-    m_isScanning = false;
-    m_wndStatusBar->setDeviceStatusInfo(errorInfo);
-    m_dialog_log->add_log(errorInfo, true);
-    m_dialog_log->setScanStatus(m_isScanning);
-    m_dialog_log->updateWigetStaus();
-    set_actions_enabled(!m_isScanning);
+//    m_isScanning = false;
+//    m_wndStatusBar->setDeviceStatusInfo(errorInfo);
+//    m_dialog_log->add_log(errorInfo, true);
+//    m_dialog_log->setScanStatus(m_isScanning);
+//    m_dialog_log->updateWigetStaus();
+//    set_actions_enabled(!m_isScanning);
 }
 
 bool MainWindow::eventFilter(QObject *obj, QEvent *event)
@@ -814,28 +815,33 @@ void MainWindow::on_new_image(void *img)
     HGBase_DestroyImage(image);
 }
 
-void MainWindow::on_scan_working()
+void MainWindow::on_scan_working(QString workingInfo)
 {
     m_isScanning = true;
 #if defined(HG_CMP_MSC) && defined(APP_USE_TWAIN)
     //
+	m_wndStatusBar->setDeviceStatusInfo(tr("scan starting..."));
 #else
-    m_dialog_log->add_log(tr("scan starting..."), false);
+    m_wndStatusBar->setDeviceStatusInfo(workingInfo);
+    m_dialog_log->add_log(workingInfo, false);
     m_dialog_log->setScanStatus(m_isScanning);
     m_dialog_log->updateWigetStaus();
     m_dialog_log->show();
 #endif
-    m_wndStatusBar->setDeviceStatusInfo(tr("scan starting..."));
     set_actions_enabled(!m_isScanning);
 }
 
-void MainWindow::on_scan_finish()
+void MainWindow::on_scan_finish(QString finishInfo, int err)
 {
+	bool scanFail = false;
     m_isScanning = false;
 #if defined(HG_CMP_MSC) && defined(APP_USE_TWAIN)
     //
+	m_wndStatusBar->setDeviceStatusInfo(tr("scan finished"));
 #else
-    m_dialog_log->add_log(tr("scan finished"), false);
+    if(err != SANE_STATUS_GOOD)
+        scanFail = true;
+    m_dialog_log->add_log(finishInfo, scanFail);
     m_dialog_log->setScanStatus(m_isScanning);
     m_dialog_log->updateWigetStaus();
 #endif
@@ -846,7 +852,6 @@ void MainWindow::on_scan_finish()
         m_thumb->addItem(m_scanFileName);
         m_scanFileName.clear();
     }
-    m_wndStatusBar->setDeviceStatusInfo(tr("scan finished"));
     set_actions_enabled(!m_isScanning);
 }
 
@@ -1671,7 +1676,8 @@ int MainWindow::sane_ex_callback(SANE_Handle hdev, int code, void *data, unsigne
         break;
     case SANE_EVENT_WORKING:
         {
-            emit p->scan_working();
+            QString workingInfo((char*)data);
+            emit p->scan_working(workingInfo);
         }
         break;
     case SANE_EVENT_IMAGE_OK:
@@ -1697,7 +1703,11 @@ int MainWindow::sane_ex_callback(SANE_Handle hdev, int code, void *data, unsigne
         }
         break;
     case SANE_EVENT_SCAN_FINISHED:
-        emit p->scan_finish();
+        {
+            int err = len ? *len : 0;
+            QString finishInfo((char*)data);
+            emit p->scan_finish(finishInfo, err);
+        }
         break;
     }
 

app/scanner/mainwindow.h

@@ -92,8 +92,8 @@ signals:
     void sane_dev_error(QString errorInfo);
 #endif
     void new_image(void *img);
-    void scan_working();
-    void scan_finish();
+    void scan_working(QString workingInfo);
+    void scan_finish(QString finishInfo, int err);
 
 private slots:
     void on_itemCountChanged(int count);
@@ -117,8 +117,8 @@ private slots:
     virtual bool eventFilter(QObject* obj, QEvent* event) override;
 #endif
     void on_new_image(void *img);
-    void on_scan_working();
-    void on_scan_finish();
+    void on_scan_working(QString workingInfo);
+    void on_scan_finish(QString finishInfo, int err);
     void on_continuScan(bool isContinuScan);
 
     void on_act_thumbnailBar_triggered(bool checked);

build-qt/uos/amd64/HGSolution/HGScanner.pro

@@ -88,8 +88,8 @@ HEADERS += \
     ../../../../app/scanner/dialog_admin.h \
     ../../../../app/scanner/dialog_log.h \
     ../../../../app/scanner/config.h \
-    ../../../../third_party/json/json.h \
-    ../../../../third_party/json/cJSON.h \
+    ../../../../app/scanner/json/json.h \
+    ../../../../app/scanner/json/cJSON.h \
     ../../../../ui/HGImgThumb.h \
     ../../../../ui/HGImgView.h \
     ../../../../ui/HGUIGlobal.h