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 @@
image_rsc/logo/logo.ico
image_rsc/source/G100.png
image_rsc/source/G200.png
+ image_rsc/source/skew.png
ProductionTool_zh_CN.qm
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"));
}