Compare commits
4 Commits
bedb400add
...
74ce35f964
Author | SHA1 | Date |
---|---|---|
yangjiaxuan | 74ce35f964 | |
yangjiaxuan | 9426ce6c43 | |
yangjiaxuan | 2260b69dea | |
yangjiaxuan | c8c5afb1e7 |
|
@ -17,8 +17,8 @@ MainWindow::MainWindow(QWidget *parent)
|
|||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
initDeviceInfo();
|
||||
initTableWidgetUi();
|
||||
initDeviceInfo();
|
||||
}
|
||||
|
||||
MainWindow::~MainWindow()
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -91,6 +91,12 @@ void Dialog_UserInput::setFwLanguageMode()
|
|||
}
|
||||
}
|
||||
|
||||
void Dialog_UserInput::setDefaultSkewValue()
|
||||
{
|
||||
ui->lineEdit->setText(QString::number(3));
|
||||
ui->lineEdit->selectAll();
|
||||
}
|
||||
|
||||
void Dialog_UserInput::on_pbtn_yes_clicked()
|
||||
{
|
||||
if (ui->lineEdit->text().isEmpty() && (m_type == ui_helper::VAL_TYPE_INT || m_type == ui_helper::VAL_TYPE_FLOAT || m_type == ui_helper::VAL_TYPE_STRING))
|
||||
|
|
|
@ -36,6 +36,7 @@ public:
|
|||
parameter *getParam();
|
||||
void setDistortValue(double value);
|
||||
void setFwLanguageMode();
|
||||
void setDefaultSkewValue();
|
||||
|
||||
private slots:
|
||||
void on_pbtn_yes_clicked();
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -43,6 +43,7 @@ void Form_textTips::insertImg(const QString &filePath)
|
|||
QTextImageFormat imgFormat;
|
||||
imgFormat.setName(filePath);
|
||||
cursor.insertImage(imgFormat);
|
||||
cursor.insertText(QString("\n\n"));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -40,6 +40,10 @@ parameter* hgscanner::get_user_input(data_from from, value_type type, const wcha
|
|||
{
|
||||
dlg.setFwLanguageMode();
|
||||
}
|
||||
if (wcscmp(L"SKEW_DETECTION", title) == 0)
|
||||
{
|
||||
dlg.setDefaultSkewValue();
|
||||
}
|
||||
|
||||
if (dlg.exec())
|
||||
{
|
||||
|
|
|
@ -256,30 +256,8 @@ class test
|
|||
std::string str = fv.substr(0, 2);
|
||||
std::string str2 = fv.substr(3, 1);
|
||||
|
||||
//设置速度模式为1 2 3 4 5
|
||||
if (str == "G1" && speed_mode >= 60 && speed_mode <= 110)
|
||||
{
|
||||
for (size_t i = 0; i < sizeof(G139) / sizeof(G139[0]); i++)
|
||||
{
|
||||
if (G139[i] == speed_mode)
|
||||
{
|
||||
speed_mode = i + 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (str == "G2" && speed_mode >= 90 && speed_mode <= 130)
|
||||
{
|
||||
for (size_t i = 0; i < sizeof(G239) / sizeof(G239[0]); i++)
|
||||
{
|
||||
if (G239[i] == speed_mode)
|
||||
{
|
||||
speed_mode = i + 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (str2 == "Z" && speed_mode >= 30 && speed_mode <= 70)
|
||||
//139和239设备直接设置实际速度,其它设备设置速度模式为1 2 3 4 5
|
||||
if (str2 == "Z" && speed_mode >= 30 && speed_mode <= 70)
|
||||
{
|
||||
for (size_t i = 0; i < sizeof(G306) / sizeof(G306[0]); i++)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue