Merge branch 'master' of https://gitee.com/luoliangyi163/hgproject

app/scanner/hg_settingdialog.cpp

@@ -799,7 +799,7 @@ void hg_settingdialog::slot_string_list_comboBoxClicked()
 {
     QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
     SANE_Int id = comboBox->property("controls_id").toInt();
-    std::string comboBoxcurrentItem(comboBox->currentText().toLocal8Bit());
+    std::string comboBoxcurrentItem(comboBox->currentText().toUtf8());
 
     const SANE_Option_Descriptor* opt = nullptr;
     for(int i = 0; i < m_list_getOpt.size(); i++)
@@ -1065,7 +1065,7 @@ void hg_settingdialog::slot_lineEditInput()
 {
     QLineEdit* lineEdit = qobject_cast<QLineEdit*>(sender());
     int id = lineEdit->property("controls_id").toInt();
-    std::string lineEditCurrentText(lineEdit->text().toLocal8Bit());
+    std::string lineEditCurrentText(lineEdit->text().toUtf8());
 
     const SANE_Option_Descriptor* opt = nullptr;
     for(int i = 0; i < m_list_getOpt.size(); i++)

app/scanner/mainwindow.cpp

@@ -198,6 +198,9 @@ MainWindow::MainWindow(QWidget *parent)
     connect(this, SIGNAL(new_image(void *)), this, SLOT(on_new_image(void *)));
     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)));
+    connect(m_dialog_log, SIGNAL(continuScan(bool)), this, SLOT(on_continuScan(bool)));
+    connect(m_dialog_log, SIGNAL(continuScan(void)), this, SLOT(on_act_acquire_triggered(void)));
+    connect(m_dialog_log, SIGNAL(invoke_stop(void)), this, SLOT(on_act_acquireStop_triggered(void)));
 
     ui->menu_device->setEnabled(false);
     m_twainDSM = nullptr;
@@ -722,12 +725,8 @@ 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);
+    //Error codes operate in slot function: on_scan_finish(QString finishInfo, int err).
+    (void)errorInfo;
 }
 
 bool MainWindow::eventFilter(QObject *obj, QEvent *event)
@@ -824,10 +823,10 @@ void MainWindow::on_scan_working(QString workingInfo)
 #else
     m_wndStatusBar->setDeviceStatusInfo(workingInfo);
     m_dialog_log->add_log(workingInfo, false);
+#endif
     m_dialog_log->setScanStatus(m_isScanning);
     m_dialog_log->updateWigetStaus();
     m_dialog_log->show();
-#endif
     set_actions_enabled(!m_isScanning);
 }
 
@@ -841,6 +840,7 @@ void MainWindow::on_scan_finish(QString finishInfo, int err)
 #else
     if(err != SANE_STATUS_GOOD)
         scanFail = true;
+    m_wndStatusBar->setDeviceStatusInfo(finishInfo);
     m_dialog_log->add_log(finishInfo, scanFail);
     m_dialog_log->setScanStatus(m_isScanning);
     m_dialog_log->updateWigetStaus();
@@ -852,6 +852,8 @@ void MainWindow::on_scan_finish(QString finishInfo, int err)
         m_thumb->addItem(m_scanFileName);
         m_scanFileName.clear();
     }
+    m_dialog_log->setScanStatus(m_isScanning);
+    m_dialog_log->updateWigetStaus();
     set_actions_enabled(!m_isScanning);
 }
 

app/scanner/mainwindow.h

@@ -10,8 +10,8 @@
 #else
 #include "sane_ex/sane_ex.h"
 #include "config.h"
-#include "dialog_log.h"
 #endif
+#include "dialog_log.h"
 #include "dialog_aquireinto.h"
 #include "imgfmt/HGImgFmt.h"
 
@@ -220,6 +220,7 @@ private:
     HGImgView *m_view;
     HGImgThumb *m_thumb;
     QMenu *m_thumbMenu;
+    dialog_log *m_dialog_log;
 #if defined(HG_CMP_MSC) && defined(APP_USE_TWAIN)
     HGTwainDSM m_twainDSM;
     HGTwainDS m_twainDS;
@@ -230,7 +231,6 @@ private:
 
     config m_config;
     std::vector<DEVCFG>  dev_schemes_;
-    dialog_log *m_dialog_log;
 #endif
 
     QString m_currFilePath;