From 7e377c7f18ec594d7a527c5d18813465da1c8ac8 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Thu, 14 Mar 2024 20:08:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=9F=E4=BA=A7=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E7=94=9F=E6=88=90=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=EF=BC=8C=E7=AE=80=E5=8C=96=E7=95=8C=E9=9D=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/HGPdtJsonTool/HGPdtJsonTool_zh_CN.qm | Bin 4598 -> 4548 bytes
 app/HGPdtJsonTool/HGPdtJsonTool_zh_CN.ts |   2 +-
 app/HGPdtJsonTool/mainwindow.cpp         |  11 ---
 app/HGPdtJsonTool/mainwindow.ui          |  91 +++--------------------
 4 files changed, 12 insertions(+), 92 deletions(-)

diff --git a/app/HGPdtJsonTool/HGPdtJsonTool_zh_CN.qm b/app/HGPdtJsonTool/HGPdtJsonTool_zh_CN.qm
index 7923865bdf2e07efd595cf9b44ade830edff78b2..1e643d9232327acdac313f17ba2ee6d6fee9c5de 100644
GIT binary patch
delta 44
zcmV+{0Mq~WBg7++6ah$)6+ZzxkyYT6JpsP~5R?4@Yyo1kY65Wr0h+Vi1fvX-sS!<N
Cln>tk

delta 95
zcmX@2{7rd+2xGuRQG3SJiJ=cTSoiGUVPN1Fm~6_ppV4aaSH>L1p3O;2g-pEjI2eF{
q4TzcivnO9<lHL55rHV(?Pd7mwF2kNznp#qnm@`?BTXb@{pf3Oq{22!T

diff --git a/app/HGPdtJsonTool/HGPdtJsonTool_zh_CN.ts b/app/HGPdtJsonTool/HGPdtJsonTool_zh_CN.ts
index 12f4167..fb69185 100644
--- a/app/HGPdtJsonTool/HGPdtJsonTool_zh_CN.ts
+++ b/app/HGPdtJsonTool/HGPdtJsonTool_zh_CN.ts
@@ -11,7 +11,7 @@
     <message>
         <location filename="dialog_mymessagebox.ui" line="38"/>
         <source>Ok</source>
-        <translation>确实</translation>
+        <translation>确定</translation>
     </message>
     <message>
         <location filename="dialog_mymessagebox.ui" line="45"/>
diff --git a/app/HGPdtJsonTool/mainwindow.cpp b/app/HGPdtJsonTool/mainwindow.cpp
index 84db083..c735d4e 100644
--- a/app/HGPdtJsonTool/mainwindow.cpp
+++ b/app/HGPdtJsonTool/mainwindow.cpp
@@ -43,16 +43,8 @@ void MainWindow::initDeviceInfo()
 
     QStringList sleepTime{ tr("Not dormant"), tr("5 min"), tr("10 min"), tr("20 min"), tr("30 min"), tr("1 hour"), tr("2 hours"), tr("4 hours") };
     ui->comboBox_sleepTime->addItems(sleepTime);
-
     ui->comboBox_lockDevice->addItem(tr("Not locked"));
     ui->comboBox_lockDevice->addItem(tr("Lock"));
-
-    QStringList testStation{ tr("Burn"), tr("Initial inspection"), tr("Image inspection") };
-    ui->comboBox_testStation->addItems(testStation);
-
-    QStringList testType{ tr("automatic testing"), tr("Manual testing") };
-    ui->comboBox_testType->addItems(testType);
-
     ui->lineEdit_vid->setReadOnly(true);
     ui->lineEdit_pid->setReadOnly(true);
 }
@@ -391,9 +383,6 @@ void MainWindow::on_tableWidget_itemClicked(QTableWidgetItem *item)
         ui->tableWidget->selectRow(row);
     }
 
-    ui->lineEdit_testItem->setText(ui->tableWidget->item(row, 2)->text());
-    ui->comboBox_testStation->setCurrentText(ui->tableWidget->item(row, 3)->text());
-    ui->comboBox_testType->setCurrentText(ui->tableWidget->item(row, 4)->text());
     ui->textBrowser_testContent->setText(ui->tableWidget->item(row, 5)->text());
 }
 
diff --git a/app/HGPdtJsonTool/mainwindow.ui b/app/HGPdtJsonTool/mainwindow.ui
index 21fdee5..0926f6a 100644
--- a/app/HGPdtJsonTool/mainwindow.ui
+++ b/app/HGPdtJsonTool/mainwindow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1010</width>
-    <height>787</height>
+    <width>1008</width>
+    <height>753</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -110,7 +110,7 @@
     <property name="geometry">
      <rect>
       <x>430</x>
-      <y>690</y>
+      <y>640</y>
       <width>131</width>
       <height>51</height>
      </rect>
@@ -257,81 +257,12 @@
      <string>Lock device:</string>
     </property>
    </widget>
-   <widget class="QLabel" name="label_11">
-    <property name="geometry">
-     <rect>
-      <x>40</x>
-      <y>260</y>
-      <width>71</width>
-      <height>16</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Test item:</string>
-    </property>
-   </widget>
-   <widget class="QLineEdit" name="lineEdit_testItem">
-    <property name="geometry">
-     <rect>
-      <x>130</x>
-      <y>260</y>
-      <width>161</width>
-      <height>20</height>
-     </rect>
-    </property>
-   </widget>
-   <widget class="QLabel" name="label_14">
-    <property name="geometry">
-     <rect>
-      <x>350</x>
-      <y>260</y>
-      <width>81</width>
-      <height>21</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Test station:</string>
-    </property>
-   </widget>
-   <widget class="QComboBox" name="comboBox_testStation">
-    <property name="geometry">
-     <rect>
-      <x>440</x>
-      <y>260</y>
-      <width>161</width>
-      <height>22</height>
-     </rect>
-    </property>
-   </widget>
-   <widget class="QLabel" name="label_13">
-    <property name="geometry">
-     <rect>
-      <x>660</x>
-      <y>260</y>
-      <width>71</width>
-      <height>21</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Test type:</string>
-    </property>
-   </widget>
-   <widget class="QComboBox" name="comboBox_testType">
-    <property name="geometry">
-     <rect>
-      <x>740</x>
-      <y>260</y>
-      <width>161</width>
-      <height>22</height>
-     </rect>
-    </property>
-   </widget>
    <widget class="QTableWidget" name="tableWidget">
     <property name="geometry">
      <rect>
       <x>20</x>
-      <y>320</y>
-      <width>611</width>
+      <y>280</y>
+      <width>621</width>
       <height>291</height>
      </rect>
     </property>
@@ -362,8 +293,8 @@
    <widget class="Line" name="line">
     <property name="geometry">
      <rect>
-      <x>10</x>
-      <y>220</y>
+      <x>20</x>
+      <y>230</y>
       <width>971</width>
       <height>16</height>
      </rect>
@@ -376,7 +307,7 @@
     <property name="geometry">
      <rect>
       <x>20</x>
-      <y>630</y>
+      <y>590</y>
       <width>77</width>
       <height>16</height>
      </rect>
@@ -388,8 +319,8 @@
    <widget class="QTextBrowser" name="textBrowser_testContent">
     <property name="geometry">
      <rect>
-      <x>640</x>
-      <y>320</y>
+      <x>650</x>
+      <y>280</y>
       <width>341</width>
       <height>291</height>
      </rect>
@@ -401,7 +332,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1010</width>
+     <width>1008</width>
      <height>22</height>
     </rect>
    </property>