Merge branch 'master' of http://192.168.10.5:8099/sane/code_production

2023-02-28 14:23:41 +08:00 · 2023-02-28 14:23:41 +08:00 · 3e58dbcd0d
parent b596bcdb43 c7cb29b001
commit 3e58dbcd0d
6 changed files with 125 additions and 36 deletions
--- a/app/HGProductionTool/ProductionTool_zh_CN.qm
+++ b/app/HGProductionTool/ProductionTool_zh_CN.qm
--- a/app/HGProductionTool/ProductionTool_zh_CN.ts
+++ b/app/HGProductionTool/ProductionTool_zh_CN.ts
@ -764,28 +764,28 @@
        <translation>下一步</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="60"/>
+        <location filename="form_maininterface.cpp" line="61"/>
        <source>Device has connected</source>
        <translation>设备已连接</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="64"/>
+        <location filename="form_maininterface.cpp" line="65"/>
        <source>Device hasnot connected</source>
        <translation>设备未连接</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="65"/>
+        <location filename="form_maininterface.cpp" line="66"/>
        <source>Device type:</source>
        <translation>设备型号：</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="65"/>
+        <location filename="form_maininterface.cpp" line="66"/>
        <source>  SerialNum:</source>
        <translation>  序列号：</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="66"/>
-        <location filename="form_maininterface.cpp" line="146"/>
+        <location filename="form_maininterface.cpp" line="67"/>
+        <location filename="form_maininterface.cpp" line="147"/>
        <source>  connect status:</source>
        <translation>  设备连接状态：</translation>
    </message>
@ -798,23 +798,23 @@
        <translation type="vanished">  休眠时间： </translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="84"/>
+        <location filename="form_maininterface.cpp" line="85"/>
        <source>load last image which uploaded last time</source>
        <translation>加载上一次上传的图片</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="145"/>
+        <location filename="form_maininterface.cpp" line="146"/>
        <source>Device has disconnected</source>
        <translation>设备已断开</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="162"/>
+        <location filename="form_maininterface.cpp" line="163"/>
        <source>tips</source>
        <translation>提示</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="204"/>
-        <location filename="form_maininterface.cpp" line="214"/>
+        <location filename="form_maininterface.cpp" line="205"/>
+        <location filename="form_maininterface.cpp" line="215"/>
        <source>destortion value: </source>
        <translation>畸变修正值： </translation>
    </message>
@ -827,47 +827,85 @@
        <translation type="vanished">取消</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="68"/>
+        <location filename="form_maininterface.cpp" line="69"/>
        <source>  speed mode:</source>
        <translation>  目标配置： 速度模式：</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="69"/>
+        <location filename="form_maininterface.cpp" line="70"/>
        <source>  sleep time:</source>
        <translation>  休眠时间：</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="354"/>
+        <location filename="form_maininterface.cpp" line="246"/>
+        <source>please verify the configuration of the device:</source>
+        <translation>请验证设备配置：</translation>
+    </message>
+    <message>
+        <location filename="form_maininterface.cpp" line="247"/>
+        <source>vid:%1
+	</source>
+        <translation>vid:%1
+	</translation>
+    </message>
+    <message>
+        <location filename="form_maininterface.cpp" line="248"/>
+        <source>pid:%1
+	</source>
+        <translation>pid:%1
+	</translation>
+    </message>
+    <message>
+        <location filename="form_maininterface.cpp" line="249"/>
+        <source>sleep time:%1minute
+	</source>
+        <translation>休眠时间：%1分钟
+	</translation>
+    </message>
+    <message>
+        <location filename="form_maininterface.cpp" line="250"/>
+        <source>speed mode:%1PPM
+	</source>
+        <translation>速度模式：%1PPM
+	</translation>
+    </message>
+    <message>
+        <location filename="form_maininterface.cpp" line="251"/>
+        <source>device serial number:%1</source>
+        <translation>设备序列号：%1</translation>
+    </message>
+    <message>
+        <location filename="form_maininterface.cpp" line="371"/>
        <source>ID</source>
        <translation>序号</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="354"/>
+        <location filename="form_maininterface.cpp" line="371"/>
        <source>Test items</source>
        <translation>测试项</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="354"/>
+        <location filename="form_maininterface.cpp" line="371"/>
        <source>status</source>
        <translation>测试状态</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="436"/>
+        <location filename="form_maininterface.cpp" line="453"/>
        <source>not test</source>
        <translation>未测试</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="436"/>
+        <location filename="form_maininterface.cpp" line="453"/>
        <source>not pass</source>
        <translation>不通过</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="436"/>
+        <location filename="form_maininterface.cpp" line="453"/>
        <source>not support</source>
        <translation>不支持</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="436"/>
+        <location filename="form_maininterface.cpp" line="453"/>
        <source>pass</source>
        <translation>通过</translation>
    </message>
@ -893,29 +931,29 @@
        <translation type="vanished">Pid：</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="631"/>
-        <location filename="form_maininterface.cpp" line="680"/>
+        <location filename="form_maininterface.cpp" line="648"/>
+        <location filename="form_maininterface.cpp" line="697"/>
        <source>device roller count:</source>
        <translation>设备滚轴张数：</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="200"/>
-        <location filename="form_maininterface.cpp" line="502"/>
+        <location filename="form_maininterface.cpp" line="201"/>
+        <location filename="form_maininterface.cpp" line="519"/>
        <source>image pixel: </source>
        <translation>标准圆:宽 * 高: </translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="539"/>
+        <location filename="form_maininterface.cpp" line="556"/>
        <source> minute</source>
        <translation> 分钟</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="71"/>
+        <location filename="form_maininterface.cpp" line="72"/>
        <source> VID:</source>
        <translation> VID：</translation>
    </message>
    <message>
-        <location filename="form_maininterface.cpp" line="71"/>
+        <location filename="form_maininterface.cpp" line="72"/>
        <source> PID:</source>
        <translation> PID：</translation>
    </message>
@ -1131,19 +1169,19 @@
 <context>
    <name>QObject</name>
    <message>
-        <location filename="hgscanner.cpp" line="91"/>
+        <location filename="hgscanner.cpp" line="120"/>
        <source>success: </source>
        <oldsource>success</oldsource>
        <translation>成功: </translation>
    </message>
    <message>
-        <location filename="hgscanner.cpp" line="65"/>
-        <location filename="hgscanner.cpp" line="93"/>
+        <location filename="hgscanner.cpp" line="86"/>
+        <location filename="hgscanner.cpp" line="122"/>
        <source>failed: </source>
        <translation>失败： </translation>
    </message>
    <message>
-        <location filename="hgscanner.cpp" line="49"/>
+        <location filename="hgscanner.cpp" line="70"/>
        <source>Not find test item</source>
        <translation>没有找到该测试项</translation>
    </message>
--- a/app/HGProductionTool/form_maininterface.cpp
+++ b/app/HGProductionTool/form_maininterface.cpp
@ -53,6 +53,7 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn::
    connect(this, SIGNAL(testResultImg(void*)), this, SLOT(on_testResultImg(void*)), Qt::QueuedConnection);
    connect(this, &Form_mainInterface::testDistortion, this, &Form_mainInterface::on_testDistortion);
    connect(this, SIGNAL(testCorrectInfo(QString)), this, SLOT(on_testCorrectInfo(QString)), Qt::QueuedConnection);
+    connect(this, SIGNAL(testGetDevCfgInfo(int,int,int,int,QString)), this, SLOT(on_testGetDevCfgInfo(int,int,int,int,QString)), Qt::QueuedConnection);

    QString str;
    if (m_handle)
@ -236,6 +237,22 @@ void Form_mainInterface::on_testCorrectInfo(QString info)
    m_textTips->addContent(info);
 }

+void Form_mainInterface::on_testGetDevCfgInfo(int vid, int pid, int sleepTime, int speedMode, QString devSn)
+{
+    char buf[10];
+    sprintf(buf, "%x", vid);
+    char buf2[10];
+    sprintf(buf2, "%x", pid);
+    QString str = (tr("please verify the configuration of the device:") + "\n\t");
+    str.append(tr("vid:%1\n\t").arg(QString::fromStdString(buf)));
+    str.append(tr("pid:%1\n\t").arg(QString::fromStdString(buf2)));
+    str.append(tr("sleep time:%1minute\n\t").arg(QString::number(sleepTime)));
+    str.append(tr("speed mode:%1PPM\n\t").arg(QString::number(speedMode)));
+    str.append(tr("device serial number:%1").arg(devSn));
+
+    m_textTips->setViewContent(str);
+}
+
 void Form_mainInterface::on_viewerDblClick()
 {
    if (m_multiIndex != -1)
@ -672,7 +689,7 @@ void Form_mainInterface::on_pbtn_start_clicked()
            if (buf != nullptr && dpi > 0)
                func_test_go(name.toStdWString().c_str(), (const wchar_t*)buf, m_hg);
            else
-                func_test_go(HGPDTTOOLDB_NAME_GET_DEVICE_CONFIG, L"null", m_hg);
+                func_test_go(name.toStdWString().c_str(), L"null", m_hg);
        }

        if (name == "CLEAR_ROLLER_COUNT")
--- a/app/HGProductionTool/form_maininterface.h
+++ b/app/HGProductionTool/form_maininterface.h
@ -40,12 +40,14 @@ signals:
    void testResultImg(void* img);
    void testDistortion(SANE_DISTORTION_VAL data);
    void testCorrectInfo(QString info);
+    void testGetDevCfgInfo(int vid, int pid, int sleepTime, int speedMode, QString devSn);

 private slots:
    void on_testResult(QString text);
    void on_testResultImg(void* img);
    void on_testDistortion(SANE_DISTORTION_VAL data);
    void on_testCorrectInfo(QString info);
+    void on_testGetDevCfgInfo(int vid, int pid, int sleepTime, int speedMode, QString devSn);

    void on_viewerDblClick();

--- a/app/HGProductionTool/hgscanner.cpp
+++ b/app/HGProductionTool/hgscanner.cpp
@ -12,6 +12,9 @@ hgscanner::hgscanner(Form_mainInterface *form, Form_BurnMode *burnMode, Dialog_I
    , m_inputSnDlg(inputSnDlg)
    , devHandle_(h)
    , m_distortValue(0.0)
+    , m_sleepTime(0)
+    , m_speedMode(0)
+    , m_devSn("")
 {
    cb_ = nullptr;
 }
@ -42,21 +45,22 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
 {
    if (ev == TEST_EVEB_GET_DEVICE_CONFIG_VIDPID)
    {
-      
        int vidpid = *(int*)data;
+        m_vidPid.Value = vidpid;
    }
    else if (ev == TEST_EVEB_GET_DEVICE_CONFIG_SP)
    {
-        int sp = *(int*)data;
+        m_speedMode = *(int*)data;
    }
    else if (ev == TEST_EVEB_GET_DEVICE_CONFIG_SLEEPTIME)
    {
-        int st = *(int*)data;
+        m_sleepTime = *(int*)data;
    }
    else if (ev == TEST_EVEB_GET_DEVICE_CONFIG_SN)
    {
-        QString info = QString::fromStdWString((const wchar_t*)data);
+        m_devSn = QString::fromStdWString((const wchar_t*)data);
    }
+
    if (ev == TEST_EVENT_TIPS)
    {

@ -102,6 +106,14 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
    else if (ev == TEST_EVENT_RESULT)
    {
        QString info;
+        if (wcscmp(name, HGPDTTOOLDB_NAME_GET_DEVICE_CONFIG) == 0)
+        {
+            if (m_interface != nullptr)
+            {
+                emit m_interface->testGetDevCfgInfo((int)m_vidPid.VID, (int)m_vidPid.PID, m_sleepTime, m_speedMode, m_devSn);
+            }
+        }
+
        if (data != nullptr)
        {
            if (flag)
@ -109,6 +121,7 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
            else
                info = QObject::tr("failed: ") + QString::fromStdWString((const wchar_t*)data);
        }
+
        if (m_interface != nullptr)
        {
            emit m_interface->testResult(info);
@ -117,6 +130,7 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
        {
            emit m_burnMode->testResult(flag);
        }
+
    }
    else if (ev == TEST_EVENT_DISTORTION_VAL)
    {
--- a/app/HGProductionTool/hgscanner.h
+++ b/app/HGProductionTool/hgscanner.h
@ -2,6 +2,7 @@
 #include "sane/sane_ex.h"
 #include "ui_helper.h"
 #include "test_base.h"
+#include <QString>

 class Form_mainInterface;
 class Form_BurnMode;
@ -20,12 +21,29 @@ public:
    sane_callback cb_;

    void setDistortValue(double value);
+
+private:
+    union VIDPID
+    {
+        struct
+        {
+            unsigned short VID;
+            unsigned short PID;
+        };
+        unsigned int Value;
+    };
+
 private:
    class Form_mainInterface *m_interface;
    class Form_BurnMode *m_burnMode;
    class Dialog_InputSerialNum *m_inputSnDlg;
    SANE_Handle devHandle_;

+private:
    double m_distortValue;
+    VIDPID m_vidPid;
+    int m_sleepTime;
+    int m_speedMode;
+    QString m_devSn;
 };