diff --git a/release/runner17_ValueDetect/raster.json b/release/runner17_ValueDetect/raster.json
deleted file mode 100644
index f227846..0000000
--- a/release/runner17_ValueDetect/raster.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "COM": {
- "baute": "19200",
- "comName": "COM1",
- "useRaster": true
- },
- "Raster": {
- "basehight": 0,
- "basehight_bool": false,
- "beilv": 1,
- "beilv_bool": true,
- "lowNum": 0,
- "lowNum_bool": false,
- "maxsize": 10,
- "maxsize_bool": false,
- "mid_value": 0.8,
- "mid_value_bool": false
- }
-}
diff --git a/release/气门芯定位检测更新内容.txt b/release/气门芯定位检测更新内容.txt
index 5006c66..d613a67 100644
--- a/release/气门芯定位检测更新内容.txt
+++ b/release/气门芯定位检测更新内容.txt
@@ -48,4 +48,10 @@
3、修复PLC索引值删除型号时没清除已保存的索引参数问题，增加启动校验索引值是否有效
4、修复在线PLC型号切换不成功bug
5、lpengine模块增加不存在的task失败信息输出
-6、修复型号手动切换和在线切换发现的bug
\ No newline at end of file
+6、修复型号手动切换和在线切换发现的bug
+2021-10-27
+1、修复输出中心坐标出现的信息不准确问题
+2、增加新添加UI的英文翻译
+2021-10-28
+1、修复空型号还能正常添加的bug
+2、调整控件按钮的显示大小和字体
diff --git a/src/lpMain/WfCtrl.cpp b/src/lpMain/WfCtrl.cpp
index 36dfb3f..cb0cfb9 100644
--- a/src/lpMain/WfCtrl.cpp
+++ b/src/lpMain/WfCtrl.cpp
@@ -144,6 +144,8 @@ bool CWfCtrl::initCurrentModel()
bool CWfCtrl::IAddModel(QString nStation, QString strModel)
{
+ if (strModel.isEmpty())
+ return false;
IStation *pStation = IGetStationByKey(nStation);
if (!pStation) {
return false;
@@ -175,6 +177,8 @@ bool CWfCtrl::IAddModel(QString nStation, QString strModel)
bool CWfCtrl::IDeleteModel(QString nStation, QString strModel)
{
+ if (strModel.isEmpty())
+ return false;
IStation *pStation = IGetStationByKey(nStation);
if (!pStation) {
return false;
diff --git a/src/lpbdesigner/CDetectorUI.cpp b/src/lpbdesigner/CDetectorUI.cpp
index aa2c028..d89965e 100644
--- a/src/lpbdesigner/CDetectorUI.cpp
+++ b/src/lpbdesigner/CDetectorUI.cpp
@@ -43,6 +43,7 @@ bool CDetectorUI::ShowMainFrame(class QWidget* parent)
m_pMainFrame->setAttribute(Qt::WA_ShowModal, true);
m_pMainFrame->show();
+ //m_pMainFrame->showMaximized();
return true;
}
diff --git a/tpvs17/lpMain/QAboutUI.ui b/tpvs17/lpMain/QAboutUI.ui
index 5e87634..4c050b0 100644
--- a/tpvs17/lpMain/QAboutUI.ui
+++ b/tpvs17/lpMain/QAboutUI.ui
@@ -22,7 +22,7 @@
- <html><head/><body><p>Main Version: 1.6.1027</p><p>Tadpole Version: 3.0.00</p><p>Final update date:20211027 11:00:00</p><p>Final Test data:20211027 11:00:00</p><p>单工位汽轮定位型号判别</p><p>CopyRight (C) 2016-2025 HangZhou Leaper </p><p>摩汽配件产品部</p><p><br/></p></body></html>
+ <html><head/><body><p>Main Version: 1.6.1028</p><p>Tadpole Version: 3.0.00</p><p>Final update date:20211028 15:00:00</p><p>Final Test data:20211028 15:00:00</p><p>单工位汽轮定位型号判别</p><p>CopyRight (C) 2016-2025 HangZhou Leaper </p><p>摩汽配件产品部</p><p><br/></p></body></html>
diff --git a/tpvs17/lpMain/QAddModeUI.cpp b/tpvs17/lpMain/QAddModeUI.cpp
index a957f09..c0fa5d8 100644
--- a/tpvs17/lpMain/QAddModeUI.cpp
+++ b/tpvs17/lpMain/QAddModeUI.cpp
@@ -1,6 +1,7 @@
#include "QAddModeUI.h"
#include
-
+#include "QMessageBox"
+#pragma execution_character_set("utf-8")
QAddModeUI::QAddModeUI(QWidget *parent)
: QDialog(parent)
{
@@ -22,6 +23,15 @@ Q_SLOT void QAddModeUI::onButtonClicked()
QString strObj = sender()->objectName();
if (strObj == "pushButton")
{
+ QString strName = ui.lineEdit->text();
+ if (strName.isEmpty())
+ {
+ QMessageBox msgWarning(QMessageBox::Warning, QObject::tr(""), strName + QObject::tr("ͺΪ"), QMessageBox::Yes);
+ msgWarning.setWindowIcon(QIcon(":/leaper/Resource/app.png"));
+ msgWarning.setButtonText(QMessageBox::Yes, QObject::tr("ȷ"));
+ msgWarning.exec();
+ return;
+ }
QDialog::accept();
}
else if (strObj == "pushButton_2") {
diff --git a/tpvs17/lpMain/QAddModeUI.ui b/tpvs17/lpMain/QAddModeUI.ui
index f0b6ed4..f3fd5b6 100644
--- a/tpvs17/lpMain/QAddModeUI.ui
+++ b/tpvs17/lpMain/QAddModeUI.ui
@@ -7,7 +7,7 @@
0
0
220
- 89
+ 105
@@ -16,9 +16,15 @@
-
+
+
+ 0
+ 25
+
+
- 11
+ 12
@@ -28,9 +34,15 @@
-
+
+
+ 0
+ 25
+
+
- 11
+ 12
@@ -40,9 +52,15 @@
-
+
+
+ 0
+ 35
+
+
- 11
+ 12
@@ -51,7 +69,7 @@
- 11
+ 12
diff --git a/tpvs17/lpMain/QModelMangerUI.cpp b/tpvs17/lpMain/QModelMangerUI.cpp
index f55b42e..ecd14fa 100644
--- a/tpvs17/lpMain/QModelMangerUI.cpp
+++ b/tpvs17/lpMain/QModelMangerUI.cpp
@@ -88,6 +88,14 @@ Q_SLOT void QModelMangerUI::onButtonClicked()
if (adddlg.exec() == QDialog::Accepted)
{
QString strName = adddlg.getInputName();
+ if (strName.isEmpty())
+ {
+ QMessageBox msgWarning(QMessageBox::Warning, QObject::tr("错误警告"), strName + QObject::tr("型号名不能为空"), QMessageBox::Yes);
+ msgWarning.setWindowIcon(QIcon(":/leaper/Resource/app.png"));
+ msgWarning.setButtonText(QMessageBox::Yes, QObject::tr("确认"));
+ msgWarning.exec();
+ return;
+ }
QString nStaionID = currentTab();
bool bFlag = m_pCtrl->IAddModel(nStaionID, strName);
if (bFlag) {
@@ -100,12 +108,11 @@ Q_SLOT void QModelMangerUI::onButtonClicked()
msgWarning.setWindowIcon(QIcon(":/leaper/Resource/app.png"));
msgWarning.setButtonText(QMessageBox::Yes, QObject::tr("确认"));
msgWarning.exec();
- }
+ }
+ QTimer::singleShot(1000, [&]() {
+ ui.mLblModelState->setText("");
+ });
}
-
- QTimer::singleShot(5000, [&]() {
- ui.mLblModelState->setText("");
- });
}
else if ("wf_model_mod_button" == strObj) {
@@ -149,9 +156,6 @@ int QModelMangerUI::lastNum(QString str)
Q_SLOT bool QModelMangerUI::OnCellClicked(const QModelIndex &index)
{
QString strListName = sender()->objectName();
- if (1 != index.column()) {
- return false;
- }
QString key = m_tabViewKeys.value(strListName);
int stationID = lastNum(strListName);
IStation *pStation = m_pCtrl->IGetStationByKey(key);
diff --git a/tpvs17/lpMain/QModelMangerUI.ui b/tpvs17/lpMain/QModelMangerUI.ui
index 80073cf..214faac 100644
--- a/tpvs17/lpMain/QModelMangerUI.ui
+++ b/tpvs17/lpMain/QModelMangerUI.ui
@@ -158,10 +158,16 @@
-
+
+
+ 0
+ 0
+
+
0
- 25
+ 30
@@ -176,10 +182,16 @@
-
+
+
+ 0
+ 0
+
+
0
- 25
+ 30
@@ -194,10 +206,16 @@
-
+
+
+ 0
+ 0
+
+
0
- 25
+ 30
@@ -212,10 +230,16 @@
-
+
+
+ 0
+ 0
+
+
0
- 25
+ 30
@@ -230,10 +254,16 @@
-
+
+
+ 0
+ 0
+
+
0
- 25
+ 30
@@ -245,6 +275,18 @@
从PLC获取当前模型
+
+
+ 32
+ 32
+
+
+
+ false
+
+
+ false
+
diff --git a/tpvs17/lpMain/QPLCIndexUI.ui b/tpvs17/lpMain/QPLCIndexUI.ui
index a138866..63c0f67 100644
--- a/tpvs17/lpMain/QPLCIndexUI.ui
+++ b/tpvs17/lpMain/QPLCIndexUI.ui
@@ -6,8 +6,8 @@
0
0
- 230
- 104
+ 205
+ 105
@@ -74,7 +74,7 @@
- 11
+ 10
@@ -99,16 +99,31 @@
-
-
+
0
0
+
+
+ 40
+ 30
+
+
15
+
+ Qt::AlignCenter
+
+
+ QAbstractSpinBox::UpDownArrows
+
+
+ QAbstractSpinBox::CorrectToPreviousValue
+
1000