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

app/HGProductionTool/ProductionTool_zh_CN.ts

@@ -90,42 +90,42 @@
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="dialog_inputserialnum.cpp" line="70"/>
+        <location filename="dialog_inputserialnum.cpp" line="132"/>
-        <location filename="dialog_inputserialnum.cpp" line="77"/>
+        <location filename="dialog_inputserialnum.cpp" line="139"/>
-        <location filename="dialog_inputserialnum.cpp" line="86"/>
+        <location filename="dialog_inputserialnum.cpp" line="148"/>
-        <location filename="dialog_inputserialnum.cpp" line="93"/>
+        <location filename="dialog_inputserialnum.cpp" line="155"/>
-        <location filename="dialog_inputserialnum.cpp" line="110"/>
+        <location filename="dialog_inputserialnum.cpp" line="172"/>
-        <location filename="dialog_inputserialnum.cpp" line="115"/>
+        <location filename="dialog_inputserialnum.cpp" line="177"/>
         <source>tips</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="dialog_inputserialnum.cpp" line="70"/>
+        <location filename="dialog_inputserialnum.cpp" line="132"/>
         <source>device is lost</source>
         <translation>设备已丢失</translation>
     </message>
     <message>
-        <location filename="dialog_inputserialnum.cpp" line="77"/>
+        <location filename="dialog_inputserialnum.cpp" line="139"/>
         <source>Serial num is empty</source>
         <translation>序列号为空</translation>
     </message>
     <message>
-        <location filename="dialog_inputserialnum.cpp" line="86"/>
+        <location filename="dialog_inputserialnum.cpp" line="148"/>
         <source>sn is illegal</source>
         <translation>序列号不合法</translation>
     </message>
     <message>
-        <location filename="dialog_inputserialnum.cpp" line="93"/>
+        <location filename="dialog_inputserialnum.cpp" line="155"/>
         <source>The device is testing</source>
         <translation>该设备正在进行测试</translation>
     </message>
     <message>
-        <location filename="dialog_inputserialnum.cpp" line="110"/>
+        <location filename="dialog_inputserialnum.cpp" line="172"/>
         <source>set sn failed</source>
         <translation>设置序列号失败</translation>
     </message>
     <message>
-        <location filename="dialog_inputserialnum.cpp" line="115"/>
+        <location filename="dialog_inputserialnum.cpp" line="177"/>
         <source>set sn succeed</source>
         <translation>设置序列号成功</translation>
     </message>
@@ -196,12 +196,12 @@
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="dialog_userinput.cpp" line="91"/>
+        <location filename="dialog_userinput.cpp" line="90"/>
         <source>tips</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="dialog_userinput.cpp" line="91"/>
+        <location filename="dialog_userinput.cpp" line="90"/>
         <source>please input valid contents</source>
         <translation>请输入有效内容</translation>
     </message>
@@ -682,114 +682,117 @@
         <translation>休眠时间：</translation>
     </message>
     <message>
-        <location filename="form_maininterface.ui" line="101"/>
+        <location filename="form_maininterface.ui" line="50"/>
+        <source>VidPid:</source>
+        <translation>VIDPID:</translation>
+    </message>
+    <message>
+        <location filename="form_maininterface.ui" line="108"/>
         <source>Privious Step</source>
         <translation>上一步</translation>
     </message>
     <message>
-        <location filename="form_maininterface.ui" line="115"/>
+        <location filename="form_maininterface.ui" line="122"/>
         <source>PASS</source>
         <translation>通过</translation>
     </message>
     <message>
-        <location filename="form_maininterface.ui" line="122"/>
+        <location filename="form_maininterface.ui" line="129"/>
         <source>FAIL</source>
         <translation>不通过</translation>
     </message>
     <message>
-        <location filename="form_maininterface.ui" line="129"/>
+        <location filename="form_maininterface.ui" line="136"/>
         <source>START</source>
         <translation>开始测试</translation>
     </message>
     <message>
-        <location filename="form_maininterface.ui" line="143"/>
+        <location filename="form_maininterface.ui" line="150"/>
         <source>PrePage</source>
         <translation>上一张</translation>
     </message>
     <message>
-        <location filename="form_maininterface.ui" line="150"/>
+        <location filename="form_maininterface.ui" line="157"/>
         <source>NextPage</source>
         <translation>下一张</translation>
     </message>
     <message>
-        <location filename="form_maininterface.ui" line="157"/>
+        <location filename="form_maininterface.ui" line="164"/>
         <source>LeftRotate</source>
         <translation>左旋转</translation>
     </message>
     <message>
-        <location filename="form_maininterface.ui" line="164"/>
+        <location filename="form_maininterface.ui" line="171"/>
         <source>RightRotate</source>
         <translation>右旋转</translation>
     </message>
     <message>
-        <location filename="form_maininterface.ui" line="63"/>
+        <location filename="form_maininterface.ui" line="70"/>
         <source>STOP</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="form_maininterface.ui" line="136"/>
+        <location filename="form_maininterface.ui" line="143"/>
         <source>SHOWIMG</source>
         <translation>加载图片</translation>
     </message>
     <message>
-        <location filename="form_maininterface.ui" line="108"/>
+        <location filename="form_maininterface.ui" line="115"/>
         <source>Next Step</source>
         <translation>下一步</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="51"/>
+        <location filename="form_maininterface.cpp" line="55"/>
         <source>Device has connected</source>
         <translation>设备已连接</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="55"/>
+        <location filename="form_maininterface.cpp" line="59"/>
         <source>Device hasnot connected</source>
         <translation>设备未连接</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="56"/>
+        <location filename="form_maininterface.cpp" line="60"/>
         <source>Device type:</source>
         <translation>设备型号：</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="56"/>
+        <location filename="form_maininterface.cpp" line="60"/>
         <source>  SerialNum:</source>
         <translation>  序列号：</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="57"/>
+        <location filename="form_maininterface.cpp" line="61"/>
-        <location filename="form_maininterface.cpp" line="140"/>
+        <location filename="form_maininterface.cpp" line="146"/>
         <source>  connect status:</source>
         <translation>  设备连接状态：</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="62"/>
         <source>  speed mode: </source>
-        <translation>  速度模式： </translation>
+        <translation type="vanished">  速度模式： </translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="67"/>
         <source>  sleep time: </source>
-        <translation>  休眠时间： </translation>
+        <translation type="vanished">  休眠时间： </translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="79"/>
+        <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="139"/>
+        <location filename="form_maininterface.cpp" line="145"/>
         <source>Device has disconnected</source>
         <translation>设备已断开</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="156"/>
+        <location filename="form_maininterface.cpp" line="162"/>
-        <location filename="form_maininterface.cpp" line="589"/>
+        <location filename="form_maininterface.cpp" line="611"/>
         <source>tips</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="190"/>
+        <location filename="form_maininterface.cpp" line="196"/>
         <source>destortion value: </source>
         <translation>畸变修正值： </translation>
     </message>
@@ -802,52 +805,72 @@
         <translation type="vanished">取消</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="323"/>
+        <location filename="form_maininterface.cpp" line="66"/>
+        <source>  speed mode:</source>
+        <translation>  速度模式：</translation>
+    </message>
+    <message>
+        <location filename="form_maininterface.cpp" line="71"/>
+        <source>  sleep time:</source>
+        <translation>  休眠时间：</translation>
+    </message>
+    <message>
+        <location filename="form_maininterface.cpp" line="329"/>
         <source>ID</source>
         <translation>序号</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="323"/>
+        <location filename="form_maininterface.cpp" line="329"/>
         <source>Test items</source>
         <translation>测试项</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="323"/>
+        <location filename="form_maininterface.cpp" line="329"/>
         <source>status</source>
         <translation>测试状态</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="405"/>
+        <location filename="form_maininterface.cpp" line="411"/>
         <source>not test</source>
         <translation>未测试</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="405"/>
+        <location filename="form_maininterface.cpp" line="411"/>
         <source>not pass</source>
         <translation>不通过</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="405"/>
+        <location filename="form_maininterface.cpp" line="411"/>
         <source>not support</source>
         <translation>不支持</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="405"/>
+        <location filename="form_maininterface.cpp" line="411"/>
         <source>pass</source>
         <translation>通过</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="460"/>
+        <location filename="form_maininterface.cpp" line="466"/>
         <source>image pixel: </source>
         <translation>图像像素： </translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="489"/>
+        <location filename="form_maininterface.cpp" line="495"/>
         <source> minute</source>
         <translation> 分钟</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="589"/>
+        <location filename="form_maininterface.cpp" line="511"/>
+        <source> VID:</source>
+        <translation> VID：</translation>
+    </message>
+    <message>
+        <location filename="form_maininterface.cpp" line="511"/>
+        <source> PID:</source>
+        <translation> PID：</translation>
+    </message>
+    <message>
+        <location filename="form_maininterface.cpp" line="611"/>
         <source>no image</source>
         <translation>无图</translation>
     </message>
@@ -918,7 +941,7 @@
         <translation>刷新设备列表</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="485"/>
+        <location filename="mainwindow.cpp" line="490"/>
         <source>Account login elsewhere</source>
         <translation>账户在其他地方登录</translation>
     </message>
@@ -927,56 +950,56 @@
         <translation type="vanished">网络连接断开</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="488"/>
+        <location filename="mainwindow.cpp" line="493"/>
         <source>You have been forced offline by the administrator account</source>
         <translation>你已被管理员账户强制下线</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="491"/>
+        <location filename="mainwindow.cpp" line="496"/>
         <source>Data base error</source>
         <translation>数据库错误</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="299"/>
+        <location filename="mainwindow.cpp" line="304"/>
-        <location filename="mainwindow.cpp" line="409"/>
+        <location filename="mainwindow.cpp" line="414"/>
-        <location filename="mainwindow.cpp" line="431"/>
+        <location filename="mainwindow.cpp" line="436"/>
-        <location filename="mainwindow.cpp" line="445"/>
+        <location filename="mainwindow.cpp" line="450"/>
-        <location filename="mainwindow.cpp" line="501"/>
+        <location filename="mainwindow.cpp" line="506"/>
-        <location filename="mainwindow.cpp" line="520"/>
+        <location filename="mainwindow.cpp" line="525"/>
-        <location filename="mainwindow.cpp" line="547"/>
+        <location filename="mainwindow.cpp" line="552"/>
-        <location filename="mainwindow.cpp" line="551"/>
+        <location filename="mainwindow.cpp" line="556"/>
-        <location filename="mainwindow.cpp" line="560"/>
+        <location filename="mainwindow.cpp" line="565"/>
-        <location filename="mainwindow.cpp" line="572"/>
+        <location filename="mainwindow.cpp" line="577"/>
-        <location filename="mainwindow.cpp" line="632"/>
+        <location filename="mainwindow.cpp" line="637"/>
         <source>tips</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="299"/>
+        <location filename="mainwindow.cpp" line="304"/>
-        <location filename="mainwindow.cpp" line="560"/>
+        <location filename="mainwindow.cpp" line="565"/>
-        <location filename="mainwindow.cpp" line="572"/>
+        <location filename="mainwindow.cpp" line="577"/>
         <source>Is testing, do not close!</source>
         <translation>测试中，请勿关闭！</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="410"/>
+        <location filename="mainwindow.cpp" line="415"/>
         <source>Are you sure to connect the new device</source>
         <translation>检测到设备连接，是否启动测试？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="412"/>
+        <location filename="mainwindow.cpp" line="417"/>
         <source>yes</source>
         <translation>确定</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="413"/>
+        <location filename="mainwindow.cpp" line="418"/>
         <source>no</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="431"/>
+        <location filename="mainwindow.cpp" line="436"/>
-        <location filename="mainwindow.cpp" line="520"/>
+        <location filename="mainwindow.cpp" line="525"/>
-        <location filename="mainwindow.cpp" line="632"/>
+        <location filename="mainwindow.cpp" line="637"/>
         <source>cannot create more table</source>
         <translation>不能创建更多项目</translation>
     </message>
@@ -985,52 +1008,52 @@
         <translation type="vanished">设备已断开连接</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="445"/>
+        <location filename="mainwindow.cpp" line="450"/>
         <source>Open device failed</source>
         <translation>打开设备失败</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="542"/>
+        <location filename="mainwindow.cpp" line="547"/>
         <source>save</source>
         <translation>保存</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="542"/>
+        <location filename="mainwindow.cpp" line="547"/>
         <source>xls(*.xls)</source>
         <translation>xls表格(*.xls)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="547"/>
+        <location filename="mainwindow.cpp" line="552"/>
         <source>export succeed</source>
         <translation>导出成功</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="551"/>
+        <location filename="mainwindow.cpp" line="556"/>
         <source>export failed</source>
         <translation>导出失败</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="584"/>
+        <location filename="mainwindow.cpp" line="589"/>
         <source>Illegal user</source>
         <translation>非法的用户</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="588"/>
+        <location filename="mainwindow.cpp" line="593"/>
         <source>Wrong password</source>
         <translation>密码错误</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="592"/>
+        <location filename="mainwindow.cpp" line="597"/>
         <source>Database error</source>
         <translation>数据库错误</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="596"/>
+        <location filename="mainwindow.cpp" line="601"/>
         <source>connect error</source>
         <translation>连接错误</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="600"/>
+        <location filename="mainwindow.cpp" line="605"/>
         <source>Failed</source>
         <translation>错误</translation>
     </message>
@@ -1044,13 +1067,13 @@
         <translation>成功: </translation>
     </message>
     <message>
-        <location filename="hgscanner.cpp" line="58"/>
+        <location filename="hgscanner.cpp" line="60"/>
         <location filename="hgscanner.cpp" line="88"/>
         <source>failed: </source>
         <translation>失败： </translation>
     </message>
     <message>
-        <location filename="hgscanner.cpp" line="42"/>
+        <location filename="hgscanner.cpp" line="44"/>
         <source>Not find test item</source>
         <translation>没有找到该测试项</translation>
     </message>

app/HGProductionTool/dialog_inputserialnum.cpp

@@ -49,6 +49,9 @@ Dialog_InputSerialNum::Dialog_InputSerialNum(class MainWindow *mainWnd, const QS
 
 Dialog_InputSerialNum::~Dialog_InputSerialNum()
 {
+    delete m_hg;
+    m_hg = nullptr;
+
     delete ui;
 }
 
@@ -95,20 +98,22 @@ void Dialog_InputSerialNum::setSpeedAndSleep()
         int vidpidValue = vidpid.Value;
         lp->cat = WRITE_CAT_VID_PID;
         lp->val = (void*)&vidpidValue;
-        func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
         m_mainWnd->addTestingRef();
+        func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
+
 
         int speedMode = jsonGlobal.speed_mode ;
         lp->cat = WRITE_CAT_SPEED;
         lp->val = (void*)&speedMode;
-        func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
         m_mainWnd->addTestingRef();
+        func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
 
         int sleepTime = jsonGlobal.sleep_time;
         lp->cat = WRITE_CAT_SLEEP;
         lp->val = (void*)&sleepTime;
-        func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
         m_mainWnd->addTestingRef();
+        func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
+
 
         delete lp;
     }

app/HGProductionTool/form_maininterface.cpp

@@ -35,6 +35,10 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn::
     ui->setupUi(this);
 
     ui->pbtn_showImg->setVisible(false);
+    ui->pbtn_leftRotate->setVisible(false);
+    ui->pbtn_rightRotate->setVisible(false);
+    ui->pbtn_prePage->setVisible(false);
+    ui->pbtn_nextPage->setVisible(false);
 
     QFont ft;
     ft.setPointSize(15);
@@ -59,12 +63,14 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn::
     SANE_Int speedMode = 0;
     unsigned int len = sizeof(SANE_Int);
     sane_io_control(m_handle, IO_CTRL_CODE_GET_SPEED_MODE, &speedMode, &len);
-    ui->label_speedMode->setText(tr("  speed mode: ") + getSpeedMode(speedMode));
+    ui->label_speedMode->setText(tr("  speed mode:") + getSpeedMode(speedMode));
 
     int sleepTime = SANE_POWER_FIRST;
     unsigned int len2 = sizeof(int);
     sane_io_control(m_handle, IO_CTRL_CODE_GET_POWER_LEVEL, &sleepTime, &len2);
-    ui->label_sleepTime->setText(tr("  sleep time: ") + getSleepTime(sleepTime));
+    ui->label_sleepTime->setText(tr("  sleep time:") + getSleepTime(sleepTime));
+
+    setVidPid();
 
     ui->label_imgInfo->setVisible(false);
     ui->label_destortionInfo->setVisible(false);
@@ -489,6 +495,22 @@ QString Form_mainInterface::getSleepTime(int sleepTime)
     return QString::number(sleepTime / 60) + tr(" minute");
 }
 
+void Form_mainInterface::setVidPid()
+{
+    VIDPID vidpid;
+    int vidpid_val;
+    unsigned int len = sizeof(int);
+    sane_io_control(m_handle, IO_CTRL_CODE_GET_VIDPID, &vidpid_val, &len);
+    vidpid.Value = vidpid_val;
+    int vid = vidpid.VID;
+    int pid = vidpid.PID;
+    char buf[10];
+    char buf2[10];
+    sprintf(buf, "%x", vid);
+    sprintf(buf2, "%x", pid);
+    ui->label_vidpid->setText(tr(" VID:") + QString::fromStdString(buf) + tr(" PID:") + QString::fromStdString(buf2));
+}
+
 void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *current, QTableWidgetItem *previous)
 {
     (void)previous;

app/HGProductionTool/form_maininterface.h

@@ -83,6 +83,18 @@ private:
     void updateImgPixelInfo();
     QString getSpeedMode(SANE_Int speedMode);
     QString getSleepTime(int sleepTime);
+    void setVidPid();
+
+private:
+    union VIDPID
+    {
+        struct
+        {
+            unsigned short VID;
+            unsigned short PID;
+        };
+        unsigned int Value;
+    };
 
 private:
     Ui::Form_mainInterface *ui;

app/HGProductionTool/form_maininterface.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>854</width>
+    <width>847</width>
     <height>492</height>
    </rect>
   </property>
@@ -44,6 +44,13 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QLabel" name="label_vidpid">
+       <property name="text">
+        <string>VidPid:</string>
+       </property>
+      </widget>
+     </item>
      <item>
       <spacer name="horizontalSpacer_2">
        <property name="orientation">