From 74ce35f9649cedb182c12a0511b39a85e7925db2 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Fri, 12 Jul 2024 10:22:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3G100G200=E9=80=9F=E5=BA=A6?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E8=AE=BE=E7=BD=AE=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B=E6=AD=AA=E6=96=9C=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87=E8=AF=A6=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/HGProductionTool/ProductionTool_resource.qrc |  1 +
 app/HGProductionTool/dialog_inputserialnum.cpp   |  4 ++--
 app/HGProductionTool/form_maininterface.cpp      | 11 +++++++++--
 app/HGProductionTool/form_texttips.cpp           |  1 +
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/HGProductionTool/ProductionTool_resource.qrc b/app/HGProductionTool/ProductionTool_resource.qrc
index 0a25a5c..4510863 100644
--- a/app/HGProductionTool/ProductionTool_resource.qrc
+++ b/app/HGProductionTool/ProductionTool_resource.qrc
@@ -6,6 +6,7 @@
         <file>image_rsc/logo/logo.ico</file>
         <file>image_rsc/source/G100.png</file>
         <file>image_rsc/source/G200.png</file>
+        <file>image_rsc/source/skew.png</file>
     </qresource>
     <qresource prefix="/translation">
         <file>ProductionTool_zh_CN.qm</file>
diff --git a/app/HGProductionTool/dialog_inputserialnum.cpp b/app/HGProductionTool/dialog_inputserialnum.cpp
index 7930d68..b70ffa1 100644
--- a/app/HGProductionTool/dialog_inputserialnum.cpp
+++ b/app/HGProductionTool/dialog_inputserialnum.cpp
@@ -214,9 +214,9 @@ int Dialog_InputSerialNum::getSpeedMode()
     else
     {
         if (devType == "G100")
-            speed = G100[(int)speedMode - 1];
+            speed = (int)speedMode;
         else if (devType == "G200")
-            speed = G200[(int)speedMode - 1];
+            speed = (int)speedMode;
         else if (devType == "G300")
             speed = G300[(int)speedMode - 1];
         else if (devType == "G306")
diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp
index ad2d3fc..0ef18ec 100644
--- a/app/HGProductionTool/form_maininterface.cpp
+++ b/app/HGProductionTool/form_maininterface.cpp
@@ -625,9 +625,9 @@ QString Form_mainInterface::getSpeedMode()
     else
     {
         if (devType == "G100")
-            speed = G100[(int)speedMode - 1];
+            speed = (int)speedMode;
         else if (devType == "G200")
-            speed = G200[(int)speedMode - 1];
+            speed = (int)speedMode;
         else if (devType == "G300")
             speed = G300[(int)speedMode - 1];
         else if (devType == "G306")
@@ -843,6 +843,13 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur
             if (!path.isEmpty())
                 m_textTips->insertImg(path);
         }
+        if (name.toStdWString() == HGPDTTOOLDB_NAME_SKEW_DETECTION)
+        {
+            QString path;
+            path = QString(":image/image_rsc/source/skew.png");
+            if (!path.isEmpty())
+                m_textTips->insertImg(path);
+        }
     }
 }
 
diff --git a/app/HGProductionTool/form_texttips.cpp b/app/HGProductionTool/form_texttips.cpp
index 7af7312..e5748d2 100644
--- a/app/HGProductionTool/form_texttips.cpp
+++ b/app/HGProductionTool/form_texttips.cpp
@@ -43,6 +43,7 @@ void Form_textTips::insertImg(const QString &filePath)
     QTextImageFormat imgFormat;
     imgFormat.setName(filePath);
     cursor.insertImage(imgFormat);
+    cursor.insertText(QString("\n\n"));
 }