去掉twain相关代码

app/scanner/config.h

@@ -80,14 +80,24 @@ typedef struct _dev_configs
     }
     OPTSCHEME* get_current(void)
     {
-        if(cur_scheme >= 0 && cur_scheme + 1 < schemes.size())
+        if(cur_scheme >= 0 && cur_scheme + 1 < (int)schemes.size())
             return &schemes[cur_scheme + 1];
         else
             return &schemes[0];
     }
     OPTSCHEME* select(const std::string& name)
     {
+        OPTSCHEME *ret = nullptr;
+        for (int i = 0; i < (int)schemes.size(); ++i)
+        {
+            if (name == schemes[i].name)
+            {
+                ret = &schemes[i];
+                break;
+            }
+        }
 
+        return (nullptr != ret) ? ret : &schemes[0];
     }
 }DEVCFG;
 

app/scanner/dialog_log.cpp

@@ -5,7 +5,6 @@
 dialog_log::dialog_log(QWidget *parent)
     : QDialog(parent)
     , ui(new Ui::dialog_log)
-    , m_isScanning(false)
 {
     ui->setupUi(this);
     QHBoxLayout *bottom = new QHBoxLayout();
@@ -43,40 +42,48 @@ dialog_log::~dialog_log()
     delete ui;
 }
 
-void dialog_log::add_log(QString log, bool err)
+void dialog_log::addLog(const QString &log, bool err)
 {
-    if(ui->listWidget->count() > 1000)
+    if (ui->listWidget->count() > 1000)
     {
         for(int i = 0; i < 100; ++i)
-            ui->listWidget->removeItemWidget(ui->listWidget->item(1));
+        {
+            QListWidgetItem *item = ui->listWidget->takeItem(0);
+            delete item;
+        }
     }
+
     QDateTime timeCurrent = QDateTime::currentDateTime();
     QString time = timeCurrent.toString("[yy-MM-dd hh:mm:ss]");
     ui->listWidget->addItem(time + "  " + log);
 
-    int ind = ui->listWidget->count() - 1;
-    if(ind >= 0)
-        ui->listWidget->item(ind)->setTextColor(err ? Qt::red : Qt::black);
-}
-
-void dialog_log::setScanStatus(bool isscanning)
-{
-    m_isScanning = isscanning;
+    int idx = ui->listWidget->count() - 1;
+    if (idx >= 0)
+        ui->listWidget->item(idx)->setTextColor(err ? Qt::red : Qt::black);
 }
 
-void dialog_log::updateWigetStaus()
+void dialog_log::updateStatus(bool online, bool isScanning)
 {
-    if(m_isScanning)
+    if (!online)
     {
-        pbtn_stop->show();
+        pbtn_stop->hide();
         pbtn_continueScan->hide();
         pbtn_finishScan->hide();
     }
     else
     {
-        pbtn_stop->hide();
-        pbtn_continueScan->show();
-        pbtn_finishScan->show();
+        if (isScanning)
+        {
+            pbtn_stop->show();
+            pbtn_continueScan->hide();
+            pbtn_finishScan->hide();
+        }
+        else
+        {
+            pbtn_stop->hide();
+            pbtn_continueScan->show();
+            pbtn_finishScan->show();
+        }
     }
 }
 
@@ -88,18 +95,19 @@ void dialog_log::closeEvent(QCloseEvent *event)
 
 void dialog_log::on_pbtn_continuScan_cliked()
 {
-    bool isContinuScan = true;
-        emit continuScan(isContinuScan);
+    emit continueScan();
 }
 
 void dialog_log::on_pbtn_finishScan_cliked()
 {
     close();
 }
+
 void dialog_log::on_pbtn_stop_clicked(void)
 {
-    emit invoke_stop();
+    emit stopScan();
 }
+
 void dialog_log::on_pbtn_clear_clicked()
 {
     ui->listWidget->clear();

app/scanner/dialog_log.h

@@ -12,7 +12,7 @@ class dialog_log;
 enum
 {
     INFO_DLG_FLAG_INFO_LIST = 1 << 1,
-    INFO_DLG_FLAG_PROGRESS  = 1 << 2,
+    INFO_DLG_FLAG_PROGRESS  = 1 << 2
 };
 
 class QListWidgetItem;
@@ -24,27 +24,24 @@ public:
     explicit dialog_log(QWidget *parent = nullptr);
     ~dialog_log();
 
-    void add_log(QString log, bool err);
-    void setScanStatus(bool isScanning);
-    void updateWigetStaus();
+    void addLog(const QString &log, bool err);
+    void updateStatus(bool online, bool isScanning);
+
+signals:
+    void stopScan();
+    void continueScan();
 
 private:
     void closeEvent(QCloseEvent *event);
 
-
 private slots:
     void on_pbtn_stop_clicked(void);
     void on_pbtn_clear_clicked();
     void on_pbtn_continuScan_cliked();
     void on_pbtn_finishScan_cliked();
 
-signals:
-    void invoke_stop(void);
-    void continuScan(bool isContinuScan);
-
 private:
     Ui::dialog_log *ui;
-    bool m_isScanning;
     QPushButton *pbtn_stop;
     QPushButton *pbtn_clear;
     QPushButton *pbtn_continueScan;

app/scanner/hg_settingdialog.cpp

 #include "hg_settingdialog.h"
 
-#if !defined(HG_CMP_MSC) || !defined(APP_USE_TWAIN)
-
 #include <QDebug>
 #include <QLatin1String>
 
@@ -1725,5 +1723,3 @@ void hg_settingdialog::slot_pushButton_scheme_management(void)
         changed_count_++;
     }
 }
-
-#endif // !defined(HG_CMP_MSC) || !defined(APP_USE_TWAIN)

app/scanner/hg_settingdialog.h

 #ifndef HG_SETTING_DIALOG_H
 #define HG_SETTING_DIALOG_H
 
-#include "base/HGDef.h"
-#if !defined(HG_CMP_MSC) || !defined(APP_USE_TWAIN)
-
 #include <QtWidgets>
 #include <QSettings>
 #include <algorithm>
@@ -110,8 +107,6 @@ private slots:
     void slot_pushButton_scheme_management(void);
 };
 
-#endif // !defined(HG_CMP_MSC) || !defined(APP_USE_TWAIN)
-
 #endif // HG_SETTING_DIALOG_H
 
 

app/scanner/mainwindow.h

@@ -5,13 +5,8 @@
 #include <QLineEdit>
 #include "HGImgView.h"
 #include "HGImgThumb.h"
-#if defined(HG_CMP_MSC) && defined(APP_USE_TWAIN)
-#include "twain_user/HGTwain.h"
-#else
 #include "sane_ex/sane_ex.h"
 #include "config.h"
-#endif
-#include "dialog_log.h"
 #include "dialog_aquireinto.h"
 #include "imgfmt/HGImgFmt.h"
 
@@ -45,7 +40,7 @@ protected:
 
 enum askIfClear
 {
-    cancel = 0,
+    cancelScan = 0,
     clearAndScan,
     notClearAndScan
 };
@@ -56,7 +51,7 @@ class MainWindow : public QMainWindow
 
 public:
     MainWindow(QWidget *parent = nullptr);
-    ~MainWindow();
+    virtual ~MainWindow() override;
 
     void exitFullScreen();
 
@@ -86,11 +81,9 @@ private slots:
     void on_act_fullscreen_triggered();
 
 signals:
-#if !defined(HG_CMP_MSC) || !defined(APP_USE_TWAIN)
     void sane_dev_arrive(QString devName);
     void sane_dev_remove(QString devName);
     void sane_dev_error(QString errorInfo);
-#endif
     void new_image(void *img);
     void scan_working(QString workingInfo);
     void scan_finish(QString finishInfo, int err);
@@ -109,17 +102,16 @@ private slots:
     void on_dialog_multirotate_refreshImgFile(const QString &fileName);
     void on_multiPageLineEditFinished();
     void on_clearCache();
-#if !defined(HG_CMP_MSC) || !defined(APP_USE_TWAIN)
     void on_devMenu_action_triggered();
     void on_sane_dev_arrive(QString devName);
     void on_sane_dev_remove(QString devName);
     void on_sane_dev_error(QString errorInfo);
     virtual bool eventFilter(QObject* obj, QEvent* event) override;
-#endif
     void on_new_image(void *img);
     void on_scan_working(QString workingInfo);
     void on_scan_finish(QString finishInfo, int err);
-    void on_continuScan(bool isContinuScan);
+    void on_continueScan();
+    void on_stopScan();
 
     void on_act_thumbnailBar_triggered(bool checked);
 
@@ -187,8 +179,6 @@ private slots:
 
     void on_act_acquire_triggered();
 
-    void on_act_acquireStop_triggered();
-
     void on_act_acquireSingle_triggered();
 
     void on_act_acquireInto_triggered();
@@ -196,21 +186,16 @@ private slots:
     void on_act_insertFromScanner_triggered();
 
 protected:
-    virtual void closeEvent(QCloseEvent *e);
+    virtual void closeEvent(QCloseEvent *e) override;
 
 private:
-#if defined(HG_CMP_MSC) && defined(APP_USE_TWAIN)
-    static void HGAPI DSEventCallback(HGTwainDS ds, HGUInt event, HGPointer param);
-#else
     static int sane_ex_callback(SANE_Handle hdev, int code, void *data, unsigned int* len, void *param);
-#endif
 
     QString getCacheFileName();
     HGImage createImage();
     int getMultiPageCount();
     void updateStatusBarPixelInfo();
     void updateActionStatus();
-    void set_actions_enabled(bool enable);
     askIfClear startScanMessageBox(QWidget* parent);
 
 private:
@@ -220,18 +205,11 @@ 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;
-#else
     QAction *m_saneNoDevAction;
     QAction *m_saneDeviceAction;
     SANE_Handle m_saneDeviceHandle;
-
     config m_config;
-    std::vector<DEVCFG>  dev_schemes_;
-#endif
+    std::vector<DEVCFG>  m_devSchemes;
 
     QString m_currFilePath;
     int m_currIndex;
@@ -241,14 +219,14 @@ private:
     bool m_modify; // m_view上面的图像是否改变
     int m_scanType; // 1-扫描到缓存目录，2-扫描到本地目录
     int m_scanInsertPos; // 扫描插入位置,-1表示插入到最后
-    bool m_isScanning;
-    bool m_isContinuScan;
     QString m_scanFileName;
     HGImgFmtWriter m_scanImgFmtWriter;
     AquireIntoSaveParam m_aquireIntoSaveParam;
+    bool m_isScanning;
 
     class HGLineEdit* m_multiPageLineEdit;
     class Widget_StatusBar *m_wndStatusBar;
+    class dialog_log *m_dialogLog;
     class Dialog_FullScreen *m_dlgFullScreen;
 };
 #endif // MAINWINDOW_H

app/scanner/widget_statusbar.cpp

@@ -48,8 +48,20 @@ void Widget_StatusBar::setScale(double scale)
     m_lbl_scale->setText(QString("%1%").arg((int)(scale * 100.0)));
 }
 
-void Widget_StatusBar::setDeviceStatusInfo(const QString &info)
+void Widget_StatusBar::setDeviceStatusInfo(const QString &info, bool err)
 {
     ui->lbl_devSts->setText(info);
-    m_devStatusInfos.append(info);
+
+    if (err)
+    {
+        QPalette pe;
+        pe.setColor(QPalette::WindowText, Qt::red);
+        ui->lbl_devSts->setPalette(pe);
+    }
+    else
+    {
+        QPalette pe;
+        pe.setColor(QPalette::WindowText, Qt::black);
+        ui->lbl_devSts->setPalette(pe);
+    }
 }

app/scanner/widget_statusbar.h

@@ -20,13 +20,12 @@ public:
     void setPixelInfo(int width, int height, int bpp);
     void setMousePosInfo(int x, int y);
     void setScale(double scale);
-    void setDeviceStatusInfo(const QString &info);
+    void setDeviceStatusInfo(const QString &info, bool err);
 
 private:
     Ui::Widget_StatusBar *ui;
 
     QLabel* m_lbl_scale;
-    QStringList m_devStatusInfos;
 };
 
 #endif // WIDGET_STATUSBAR_H

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 \
-    ../../../../app/scanner/json/json.h \
-    ../../../../app/scanner/json/cJSON.h \
+    ../../../../app/scanner/json.h \
+    ../../../../app/scanner/cJSON.h \
     ../../../../ui/HGImgThumb.h \
     ../../../../ui/HGImgView.h \
     ../../../../ui/HGUIGlobal.h
@@ -121,9 +121,8 @@ TRANSLATIONS += \
     ../../../../app/scanner/Scanner_zh_CN.ts
 
 RESOURCES += \
-    ../../../../app/scanner/Scanner_resource.qrc \
+    ../../../../app/scanner/Scanner_resource.qrc
 
 DISTFILES += \
     ../../../../app/scanner/Scanner_zh_CN.qm \
-    ../../../../app/scanner/Scanner_zh_CN.ts \
     ../../../../app/scanner/qt_zh_CN.qm

build-qt/windows/HGSolution/HGScanner.pro

@@ -10,8 +10,6 @@ CONFIG += c++11
 # deprecated API in order to know how to port your code away from it.
 DEFINES += QT_DEPRECATED_WARNINGS
 
-#DEFINES += APP_USE_TWAIN
-
 RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico
 
 # You can also make your code fail to compile if it uses deprecated APIs.
@@ -21,7 +19,7 @@ RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico
 
 win32 {
 contains(QT_ARCH, i386) {
-                LIBS += -L../../../release/lib/windows/x86 -lHGBase -lHGImgFmt -lHGImgProc -lHGTwainUser -lhgsane
+                LIBS += -L../../../release/lib/windows/x86 -lHGBase -lHGImgFmt -lHGImgProc -lhgsane
         CONFIG(release, debug|release) {
             DESTDIR = ../../../release/bin/windows/x86/
         }
@@ -29,7 +27,7 @@ contains(QT_ARCH, i386) {
             
         }
     } else {
-                LIBS += -L../../../release/lib/windows/x64 -lHGBase -lHGImgFmt -lHGImgProc -lHGTwainUser
+                LIBS += -L../../../release/lib/windows/x64 -lHGBase -lHGImgFmt -lHGImgProc -lhgsane
         CONFIG(release, debug|release) {
             DESTDIR = ../../../release/bin/windows/x64/
         }
@@ -100,8 +98,8 @@ HEADERS += \
     ../../../app/scanner/dialog_admin.h \
     ../../../app/scanner/dialog_log.h \
     ../../../app/scanner/config.h \
-    ../../../app/scanner/json/json.h \
-    ../../../app/scanner/json/cJSON.h \
+    ../../../app/scanner/json.h \
+    ../../../app/scanner/cJSON.h \
     ../../../ui/HGImgThumb.h \
     ../../../ui/HGImgView.h \
     ../../../ui/HGUIGlobal.h
@@ -133,9 +131,8 @@ TRANSLATIONS += \
     ../../../app/scanner/Scanner_zh_CN.ts
 
 RESOURCES += \
-    ../../../app/scanner/Scanner_resource.qrc \
+    ../../../app/scanner/Scanner_resource.qrc
 
 DISTFILES += \
     ../../../app/scanner/Scanner_zh_CN.qm \
-    ../../../app/scanner/Scanner_zh_CN.ts \
     ../../../app/scanner/qt_zh_CN.qm