调整扫描开始和结束部分的宏定义

app/scanner/dialog_log.cpp

@@ -146,6 +146,7 @@ void dialog_log::on_flag_changed(void)
 void dialog_log::closeEvent(QCloseEvent *event)
 {
     flag_ = 0;
+    slot_stop();
 }
 void dialog_log::slot_stop(void)
 {

app/scanner/mainwindow.cpp

@@ -791,15 +791,25 @@ void MainWindow::on_new_image(void *img)
 
 void MainWindow::on_scan_working()
 {
-    m_wndStatusBar->setDeviceStatusInfo(tr("scan starting..."));
+#if defined(HG_CMP_MSC) && defined(APP_USE_TWAIN)
+    //
+#else
     m_dialog_log->add_log(tr("scan starting..."), false);
     m_dialog_log->add_flag(INFO_DLG_FLAG_PROGRESS);
     m_dialog_log->show();
+#endif
+    m_wndStatusBar->setDeviceStatusInfo(tr("scan starting..."));
     set_actions_enabled(false);
 }
 
 void MainWindow::on_scan_finish()
 {
+#if defined(HG_CMP_MSC) && defined(APP_USE_TWAIN)
+    //
+#else
+    m_dialog_log->add_log(tr("scan finished"), false);
+    m_dialog_log->remove_flag(INFO_DLG_FLAG_PROGRESS);
+#endif
     if (nullptr != m_scanImgFmtWriter)
     {
         HGImgFmt_CloseImageWriter(m_scanImgFmtWriter);
@@ -808,8 +818,6 @@ void MainWindow::on_scan_finish()
         m_scanFileName.clear();
     }
     m_wndStatusBar->setDeviceStatusInfo(tr("scan finished"));
-    m_dialog_log->add_log(tr("scan finished"), false);
-    m_dialog_log->remove_flag(INFO_DLG_FLAG_PROGRESS);
     set_actions_enabled(true);
 }