增加上传配置文件功能

app/HGProductionTool/HGProductionTool.pro

@@ -49,6 +49,7 @@ win32 {
 
 INCLUDEPATH += $$PWD/../../../sdk/include/
 INCLUDEPATH += $$PWD/../../db/HGPdtToolDb/
+INCLUDEPATH += $$PWD/../../code/base/
 
 SOURCES += \
     HGImgView.cpp \
@@ -58,6 +59,7 @@ SOURCES += \
     dialog_changepwd.cpp \
     dialog_login.cpp \
     dialog_rootfuntion.cpp \
+    dialog_uploadcfgfile.cpp \
     form_maininterface.cpp \
     form_texttips.cpp \
     main.cpp \
@@ -71,6 +73,7 @@ HEADERS += \
     dialog_changepwd.h \
     dialog_login.h \
     dialog_rootfuntion.h \
+    dialog_uploadcfgfile.h \
     form_maininterface.h \
     form_texttips.h \
     mainwindow.h
@@ -80,6 +83,7 @@ FORMS += \
     dialog_changepwd.ui \
     dialog_login.ui \
     dialog_rootfuntion.ui \
+    dialog_uploadcfgfile.ui \
     form_maininterface.ui \
     form_texttips.ui \
     mainwindow.ui

app/HGProductionTool/ProductionTool_zh_CN.ts

@@ -29,50 +29,50 @@
         <translation>重置密码</translation>
     </message>
     <message>
-        <location filename="dialog_accountmanage.cpp" line="47"/>
+        <location filename="dialog_accountmanage.cpp" line="48"/>
-        <location filename="dialog_accountmanage.cpp" line="71"/>
+        <location filename="dialog_accountmanage.cpp" line="72"/>
-        <location filename="dialog_accountmanage.cpp" line="92"/>
+        <location filename="dialog_accountmanage.cpp" line="90"/>
-        <location filename="dialog_accountmanage.cpp" line="96"/>
+        <location filename="dialog_accountmanage.cpp" line="94"/>
         <source>tips</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="dialog_accountmanage.cpp" line="47"/>
+        <location filename="dialog_accountmanage.cpp" line="48"/>
         <source>create user failed: </source>
         <translation>创建账户失败： </translation>
     </message>
     <message>
-        <location filename="dialog_accountmanage.cpp" line="56"/>
+        <location filename="dialog_accountmanage.cpp" line="57"/>
         <source>Question</source>
         <translation>询问</translation>
     </message>
     <message>
-        <location filename="dialog_accountmanage.cpp" line="57"/>
+        <location filename="dialog_accountmanage.cpp" line="58"/>
         <source>Are you sure to destroy: </source>
         <translation>请确认是否删除账户： </translation>
     </message>
     <message>
-        <location filename="dialog_accountmanage.cpp" line="59"/>
+        <location filename="dialog_accountmanage.cpp" line="60"/>
         <source>yes</source>
         <translation>确定</translation>
     </message>
     <message>
-        <location filename="dialog_accountmanage.cpp" line="60"/>
+        <location filename="dialog_accountmanage.cpp" line="61"/>
         <source>no</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="dialog_accountmanage.cpp" line="71"/>
+        <location filename="dialog_accountmanage.cpp" line="72"/>
         <source>destroy user failed: </source>
         <translation>销毁账户失败： </translation>
     </message>
     <message>
-        <location filename="dialog_accountmanage.cpp" line="92"/>
+        <location filename="dialog_accountmanage.cpp" line="90"/>
         <source>change password succeed</source>
         <translation>修改密码成功</translation>
     </message>
     <message>
-        <location filename="dialog_accountmanage.cpp" line="96"/>
+        <location filename="dialog_accountmanage.cpp" line="94"/>
         <source>change password failed: </source>
         <translation>修改密码失败： </translation>
     </message>
@@ -134,37 +134,37 @@
         <translation>登录</translation>
     </message>
     <message>
-        <location filename="dialog_login.ui" line="95"/>
+        <location filename="dialog_login.ui" line="101"/>
         <source>TextLabel</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="dialog_login.ui" line="154"/>
+        <location filename="dialog_login.ui" line="172"/>
         <source>account:</source>
         <translation>账户：</translation>
     </message>
     <message>
-        <location filename="dialog_login.ui" line="194"/>
+        <location filename="dialog_login.ui" line="212"/>
         <source>password:</source>
         <translation>密码：</translation>
     </message>
     <message>
-        <location filename="dialog_login.ui" line="234"/>
+        <location filename="dialog_login.ui" line="252"/>
         <source>host:</source>
         <translation>IP地址：</translation>
     </message>
     <message>
-        <location filename="dialog_login.ui" line="274"/>
+        <location filename="dialog_login.ui" line="292"/>
         <source>port:</source>
         <translation>端口号：</translation>
     </message>
     <message>
-        <location filename="dialog_login.ui" line="314"/>
+        <location filename="dialog_login.ui" line="332"/>
         <source>LOG IN</source>
         <translation>登录</translation>
     </message>
     <message>
-        <location filename="dialog_login.ui" line="324"/>
+        <location filename="dialog_login.ui" line="342"/>
         <source>EXIT</source>
         <translation>退出</translation>
     </message>
@@ -184,17 +184,17 @@
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="dialog_login.cpp" line="20"/>
+        <location filename="dialog_login.cpp" line="19"/>
         <source>LogIn</source>
         <translation>登录</translation>
     </message>
     <message>
-        <location filename="dialog_login.cpp" line="84"/>
+        <location filename="dialog_login.cpp" line="85"/>
         <source>tips</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="dialog_login.cpp" line="84"/>
+        <location filename="dialog_login.cpp" line="85"/>
         <source>Login failed: </source>
         <translation>登录失败： </translation>
     </message>
@@ -242,6 +242,66 @@
         <translation>新密码：</translation>
     </message>
 </context>
+<context>
+    <name>Dialog_uploadCfgFile</name>
+    <message>
+        <location filename="dialog_uploadcfgfile.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>上传配置文件</translation>
+    </message>
+    <message>
+        <location filename="dialog_uploadcfgfile.ui" line="22"/>
+        <source>filename:</source>
+        <translation>文件名：</translation>
+    </message>
+    <message>
+        <location filename="dialog_uploadcfgfile.ui" line="32"/>
+        <source>select file</source>
+        <translation>选择目录</translation>
+    </message>
+    <message>
+        <location filename="dialog_uploadcfgfile.ui" line="43"/>
+        <source>tag:</source>
+        <translation>标识符：</translation>
+    </message>
+    <message>
+        <location filename="dialog_uploadcfgfile.ui" line="83"/>
+        <source>upload</source>
+        <translation>上传</translation>
+    </message>
+    <message>
+        <location filename="dialog_uploadcfgfile.cpp" line="24"/>
+        <source>Browse directory</source>
+        <translation>打开文件</translation>
+    </message>
+    <message>
+        <location filename="dialog_uploadcfgfile.cpp" line="24"/>
+        <source>config(*json)</source>
+        <translation>配置文件(*json)</translation>
+    </message>
+    <message>
+        <location filename="dialog_uploadcfgfile.cpp" line="36"/>
+        <location filename="dialog_uploadcfgfile.cpp" line="45"/>
+        <location filename="dialog_uploadcfgfile.cpp" line="49"/>
+        <source>tips</source>
+        <translation>提示</translation>
+    </message>
+    <message>
+        <location filename="dialog_uploadcfgfile.cpp" line="36"/>
+        <source>empty filename</source>
+        <translation>文件为空</translation>
+    </message>
+    <message>
+        <location filename="dialog_uploadcfgfile.cpp" line="45"/>
+        <source>upload succeed</source>
+        <translation>上传成功</translation>
+    </message>
+    <message>
+        <location filename="dialog_uploadcfgfile.cpp" line="49"/>
+        <source>upload failed: </source>
+        <translation>上传失败： </translation>
+    </message>
+</context>
 <context>
     <name>Form_mainInterface</name>
     <message>
@@ -280,19 +340,14 @@
         <translation>下一步</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="39"/>
+        <location filename="form_maininterface.cpp" line="60"/>
-        <source>1.Dial switch verification</source>
+        <source>HGPDTTOOLDB_TITLE_DIAL_SWITCH</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="40"/>
+        <location filename="form_maininterface.cpp" line="65"/>
-        <source>2.Check the function of ship type switch</source>
+        <source>HGPDTTOOLDB_TITLE_CIS_ORIGINAL_IMAGE</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="form_maininterface.cpp" line="41"/>
-        <source>3.Testing</source>
-        <translation></translation>
     </message>
 </context>
 <context>
@@ -302,22 +357,6 @@
         <source>Form</source>
         <translation></translation>
     </message>
-    <message>
-        <location filename="form_texttips.cpp" line="12"/>
-        <location filename="form_texttips.cpp" line="25"/>
-        <source>Please complete the calibration of ship type switch</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="form_texttips.cpp" line="28"/>
-        <source>Please power on the device and observe the startup status</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="form_texttips.cpp" line="31"/>
-        <source>Testing........</source>
-        <translation></translation>
-    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -337,67 +376,72 @@
         <translation>用户</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="50"/>
+        <location filename="mainwindow.ui" line="51"/>
         <source>act_newDevice</source>
         <translation>新建项目</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="55"/>
+        <location filename="mainwindow.ui" line="56"/>
         <source>act_manage</source>
         <translation>账户管理</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="60"/>
+        <location filename="mainwindow.ui" line="61"/>
         <source>act_changePwd</source>
         <translation>修改密码</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="65"/>
+        <location filename="mainwindow.ui" line="66"/>
         <source>act_export</source>
         <translation>导出</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="70"/>
+        <location filename="mainwindow.ui" line="71"/>
         <source>act_logOut</source>
         <translation>登出</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="75"/>
+        <location filename="mainwindow.ui" line="76"/>
         <source>act_close</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="87"/>
+        <location filename="mainwindow.ui" line="81"/>
+        <source>act_upload</source>
+        <translation>上传配置文件</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="88"/>
         <source>tips</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="87"/>
+        <location filename="mainwindow.cpp" line="88"/>
         <source>cannot create more table</source>
         <translation>不能创建更多项目</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="134"/>
+        <location filename="mainwindow.cpp" line="135"/>
         <source>Illegal user</source>
         <translation>非法的用户</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="138"/>
+        <location filename="mainwindow.cpp" line="139"/>
         <source>Wrong password</source>
         <translation>密码错误</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="142"/>
+        <location filename="mainwindow.cpp" line="143"/>
         <source>Database error</source>
         <translation>数据库错误</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="146"/>
+        <location filename="mainwindow.cpp" line="147"/>
         <source>connect error</source>
         <translation>连接错误</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="150"/>
+        <location filename="mainwindow.cpp" line="151"/>
         <source>Failed</source>
         <translation>错误</translation>
     </message>

app/HGProductionTool/analysisjson.cpp

@@ -29,7 +29,8 @@ std::vector<AnalysisJson::json_node> AnalysisJson::GetNode()
             nodes.push_back(json_node{obj[key].toObject()["title"].toString(),
                                       obj[key].toObject()["name"].toString(),
                                       obj[key].toObject()["man"].toBool(),
-                                      obj[key].toObject()["err-level"].toInt()});
+                                      obj[key].toObject()["err-level"].toInt(),
+                                      obj[key].toObject()["desc"].toString()});
     }
     return nodes;
 }
@@ -64,6 +65,7 @@ bool AnalysisJson::savejson(QString path, std::vector<AnalysisJson::json_node> j
         tmp_obj["name"] = json_.name;
         tmp_obj["man"] = json_.is_man;
         tmp_obj["err_level"] = json_.err_level;
+        tmp_obj["desc"] = json_.desc;
         obj[QString::number(index++)] = tmp_obj;
     }
     doc.setObject(obj);

app/HGProductionTool/analysisjson.h

@@ -12,6 +12,7 @@ public:
         QString name;
         bool is_man;
         std::int32_t err_level;
+        QString desc;
     };
 
     struct json_global{

app/HGProductionTool/dialog_login.cpp

@@ -19,6 +19,7 @@ Dialog_logIn::Dialog_logIn(QWidget *parent) :
     ui->label_title->setText(tr("LogIn"));
 
     ui->lineEdit_account->setText("root");
+    ui->lineEdit_password->setText("123456");
     ui->lineEdit_password->setEchoMode(QLineEdit::EchoMode::Password);
     ui->lineEdit_host->setText("192.168.1.70");
     ui->lineEdit_port->setText("3306");
@@ -27,6 +28,7 @@ Dialog_logIn::Dialog_logIn(QWidget *parent) :
     ui->label_port->setVisible(false);
     ui->lineEdit_host->setVisible(false);
     ui->lineEdit_port->setVisible(false);
+
 }
 
 Dialog_logIn::~Dialog_logIn()

app/HGProductionTool/form_maininterface.cpp

@@ -4,6 +4,7 @@
 #include "imgfmt/HGImgFmt.h"
 #include "HGUIGlobal.h"
 #include "form_texttips.h"
+#include "test_base.h"
 
 Form_mainInterface::Form_mainInterface(QWidget *parent)
     : QWidget(parent)
@@ -11,7 +12,12 @@ Form_mainInterface::Form_mainInterface(QWidget *parent)
 {
     ui->setupUi(this);
 
-    QString path("../../doc/config.json");
+    m_textTips = new Form_textTips();
+    m_view = new HGImgView();
+    ui->stackedWidget->addWidget(m_textTips);
+    ui->stackedWidget->addWidget(m_view);
+
+    QString path("../../doc/newconfig.json");
     AnalysisJson analysisJson(path);
 
     std::vector<AnalysisJson::json_node> list_jsonNode = analysisJson.GetNode();
@@ -42,25 +48,27 @@ void Form_mainInterface::paintEvent(QPaintEvent *event)
 
 void Form_mainInterface::on_listWidget_currentRowChanged(int currentRow)
 {
+    (void)currentRow;
     ui->pbtn_preStep->setEnabled(ui->listWidget->currentRow() != 0);
     ui->pbtn_nextStep->setEnabled(ui->listWidget->currentRow() != ui->listWidget->count() - 1);
 
-    if (currentRow == 0)
-    {
-        Form_textTips *textTips = new Form_textTips();
-        ui->stackedWidget->addWidget(textTips);
-        ui->stackedWidget->setCurrentWidget(textTips);
-    }
-    if (currentRow == 1)
-    {
-        HGImgView *m_view = new HGImgView();
-        ui->stackedWidget->addWidget(m_view);
-        ui->stackedWidget->setCurrentWidget(m_view);
 
-        HGImage img;
+    QString curItemContent = ui->listWidget->currentItem()->text();
-        QString filename("C:\\Users\\yang'jia'xuan\\Pictures\\4.jpg");
+
-        HGImgFmt_LoadImage(getStdFileName(filename).toStdString().c_str(), 0, 0, 0, 0, &img);
+    if (curItemContent == HGPDTTOOLDB_TITLE_DIAL_SWITCH)
-        m_view->addImage(img);
+    {
+        m_textTips->setViewContent(tr("HGPDTTOOLDB_TITLE_DIAL_SWITCH"));
+        ui->stackedWidget->setCurrentWidget(m_textTips);
+    }
+    else if (curItemContent == HGPDTTOOLDB_TITLE_CIS_ORIGINAL_IMAGE)
+    {
+        m_textTips->setViewContent(tr("HGPDTTOOLDB_TITLE_CIS_ORIGINAL_IMAGE"));
+        ui->stackedWidget->setCurrentWidget(m_textTips);
+    }
+    else if (curItemContent == HGPDTTOOLDB_TITLE_IMAGE_QUALITY)
+    {
+        //addImg
+        ui->stackedWidget->setCurrentWidget(m_view);
     }
 }
 
@@ -81,6 +89,7 @@ void Form_mainInterface::on_pbtn_fail_clicked()
 
 void Form_mainInterface::on_pbtn_pass_clicked()
 {
-    ui->listWidget->item(ui->listWidget->currentRow())->setBackgroundColor("white");
+    ui->listWidget->item(ui->listWidget->currentRow())->setBackgroundColor("yellow");
+    on_pbtn_nextStep_clicked();
 }
 

app/HGProductionTool/form_maininterface.h

@@ -3,6 +3,7 @@
 
 #include <QWidget>
 #include "HGImgView.h"
+#include "form_texttips.h"
 #include "analysisjson.h"
 
 namespace Ui {
@@ -35,6 +36,8 @@ private:
     Ui::Form_mainInterface *ui;
 
     AnalysisJson *m_analysisJson;
+    Form_textTips *m_textTips;
+    HGImgView *m_view;
 };
 
 #endif // FORM_MAININTERFACE_H

app/HGProductionTool/form_texttips.cpp

@@ -9,7 +9,6 @@ Form_textTips::Form_textTips(QWidget *parent)
     QFont ft;
     ft.setPointSize(35);
     ui->textBrowser->setFont(ft);
-    ui->textBrowser->setText(tr("Please complete the calibration of ship type switch"));
 }
 
 Form_textTips::~Form_textTips()
@@ -17,22 +16,9 @@ Form_textTips::~Form_textTips()
     delete ui;
 }
 
-void Form_textTips::on_testItemChanged(int curRow)
+void Form_textTips::setViewContent(QString content)
 {
-    switch (curRow)
+    ui->textBrowser->setText(content);
-    {
-    case 0:
-        ui->textBrowser->setText(tr("Please complete the calibration of ship type switch"));
-        break;
-    case 1:
-        ui->textBrowser->setText(tr("Please power on the device and observe the startup status"));
-        break;
-    case 2:
-        ui->textBrowser->setText(tr("Testing........"));
-        break;
-    default:
-        break;
-    }
 }
 
 
@@ -43,3 +29,4 @@ void Form_textTips::on_testItemChanged(int curRow)
 
 
 
+

app/HGProductionTool/form_texttips.h

@@ -15,9 +15,7 @@ public:
     explicit Form_textTips(QWidget *parent = nullptr);
     ~Form_textTips();
 
-public slots:
+    void setViewContent(QString content);
-    void on_testItemChanged(int curRow);
-
 
 private:
     Ui::Form_textTips *ui;

app/HGProductionTool/mainwindow.cpp

@@ -6,6 +6,7 @@
 #include "dialog_login.h"
 #include "dialog_changepwd.h"
 #include "dialog_accountmanage.h"
+#include "dialog_uploadcfgfile.h"
 
 MainWindow::MainWindow(HGPdtToolDbUserMgr userMgr, QWidget *parent)
     : QMainWindow(parent)
@@ -152,3 +153,9 @@ QString MainWindow::getLogInfo(HGResult ret)
 
     return str;
 }
+
+void MainWindow::on_act_upload_triggered()
+{
+    Dialog_uploadCfgFile dlg(m_pdtToolDbuserMgr, this);
+    dlg.exec();
+}

app/HGProductionTool/mainwindow.h

@@ -36,6 +36,8 @@ private slots:
 
     void on_act_close_triggered();
 
+    void on_act_upload_triggered();
+
 private:
     QSplitter *m_top_splitter;
     QSplitter *m_bot_splitter;

app/HGProductionTool/mainwindow.ui

@@ -38,6 +38,7 @@
     <addaction name="act_changePwd"/>
     <addaction name="separator"/>
     <addaction name="act_export"/>
+    <addaction name="act_upload"/>
     <addaction name="separator"/>
     <addaction name="act_logOut"/>
    </widget>
@@ -75,6 +76,11 @@
     <string>act_close</string>
    </property>
   </action>
+  <action name="act_upload">
+   <property name="text">
+    <string>act_upload</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>