解决G100G200速度模式设置失败的问题;歪斜检测增加图片详解
This commit is contained in:
parent
9426ce6c43
commit
74ce35f964
|
@ -6,6 +6,7 @@
|
||||||
<file>image_rsc/logo/logo.ico</file>
|
<file>image_rsc/logo/logo.ico</file>
|
||||||
<file>image_rsc/source/G100.png</file>
|
<file>image_rsc/source/G100.png</file>
|
||||||
<file>image_rsc/source/G200.png</file>
|
<file>image_rsc/source/G200.png</file>
|
||||||
|
<file>image_rsc/source/skew.png</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
<qresource prefix="/translation">
|
<qresource prefix="/translation">
|
||||||
<file>ProductionTool_zh_CN.qm</file>
|
<file>ProductionTool_zh_CN.qm</file>
|
||||||
|
|
|
@ -214,9 +214,9 @@ int Dialog_InputSerialNum::getSpeedMode()
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (devType == "G100")
|
if (devType == "G100")
|
||||||
speed = G100[(int)speedMode - 1];
|
speed = (int)speedMode;
|
||||||
else if (devType == "G200")
|
else if (devType == "G200")
|
||||||
speed = G200[(int)speedMode - 1];
|
speed = (int)speedMode;
|
||||||
else if (devType == "G300")
|
else if (devType == "G300")
|
||||||
speed = G300[(int)speedMode - 1];
|
speed = G300[(int)speedMode - 1];
|
||||||
else if (devType == "G306")
|
else if (devType == "G306")
|
||||||
|
|
|
@ -625,9 +625,9 @@ QString Form_mainInterface::getSpeedMode()
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (devType == "G100")
|
if (devType == "G100")
|
||||||
speed = G100[(int)speedMode - 1];
|
speed = (int)speedMode;
|
||||||
else if (devType == "G200")
|
else if (devType == "G200")
|
||||||
speed = G200[(int)speedMode - 1];
|
speed = (int)speedMode;
|
||||||
else if (devType == "G300")
|
else if (devType == "G300")
|
||||||
speed = G300[(int)speedMode - 1];
|
speed = G300[(int)speedMode - 1];
|
||||||
else if (devType == "G306")
|
else if (devType == "G306")
|
||||||
|
@ -843,6 +843,13 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur
|
||||||
if (!path.isEmpty())
|
if (!path.isEmpty())
|
||||||
m_textTips->insertImg(path);
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -43,6 +43,7 @@ void Form_textTips::insertImg(const QString &filePath)
|
||||||
QTextImageFormat imgFormat;
|
QTextImageFormat imgFormat;
|
||||||
imgFormat.setName(filePath);
|
imgFormat.setName(filePath);
|
||||||
cursor.insertImage(imgFormat);
|
cursor.insertImage(imgFormat);
|
||||||
|
cursor.insertText(QString("\n\n"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue