From e986a174f69e13ed27e6f46c0342575b7a4c54f4 Mon Sep 17 00:00:00 2001
From: "bob.pan" <bob.pan@hzleaper.com>
Date: Tue, 9 Nov 2021 11:31:56 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E4=B8=8EPLC?=
 =?UTF-8?q?=E7=9A=84=E9=80=9A=E8=AE=AF=E5=8D=8F=E8=AE=AE=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=AF=B7=E6=B1=82=E5=BA=94=E7=AD=94?=
 =?UTF-8?q?=E7=9A=84=E9=80=9A=E8=AE=AF=E6=96=B9=E5=BC=8F=202=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8DPLC=E9=80=9A=E8=AE=AF=E8=BF=87=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=AD=E5=87=BA=E7=8E=B0=E7=9A=84=E6=A0=BC=E5=BC=8F=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98=203=E3=80=81=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=8D=8F=E8=AE=AE=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...�识别定位一体与PLC通讯协议.docx | Bin 12931 -> 15130 bytes
 tpvs17/tpMain/QPLCDevice.cpp                  |   9 ++++-
 tpvs17/tpMain/QPLCDevice.h                    |   1 +
 tpvs17/tpMain/lpMainWin.cpp                   |   6 +--
 tpvs17/valueMainUI/lpConfigUI.cpp             |   4 ++
 tpvs17/valueMainUI/lpGlobalData.h             |   4 ++
 tpvs17/valueMainUI/valueMainUI.cpp            |  38 +++++++++++++-----
 tpvs17/valueMainUI/valueMainUI.h              |   1 +
 8 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/doc/轮毂识别定位一体与PLC通讯协议.docx b/doc/轮毂识别定位一体与PLC通讯协议.docx
index 635f24cfae28a461e2c73d66ca64971e63341fce..d172ddc27bd4767e7be5e3f3b8b4b4583b2dd5f6 100644
GIT binary patch
delta 9604
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

delta 7459
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
B|2O~u

diff --git a/tpvs17/tpMain/QPLCDevice.cpp b/tpvs17/tpMain/QPLCDevice.cpp
index ab14ab2..49c477c 100644
--- a/tpvs17/tpMain/QPLCDevice.cpp
+++ b/tpvs17/tpMain/QPLCDevice.cpp
@@ -114,16 +114,21 @@ void QPLCDevice::onParaster(QByteArray recvData)
 			int stationID = data.toInt();
 			emit sgTrigerCam(stationID);
 		}
-		else if (cmd.toInt() == 2) 
+		else if (cmd.toInt() == 2) //����Ӧ��
 		{
 			onSendHeartBit();
 		}
+		else if (cmd.toInt() == 3)
+		{
+			int stationID = data.toInt();
+			emit sgSendAlgResult(stationID);
+		}
 	}
 }
 
 void QPLCDevice::onSendValueRlt(const ValueResult& rlt)
 {
-	QString sdata = QString("CA;3;%1;%2;%3;%4;%5,#").arg(rlt.stationID).arg(rlt.strModel).arg(rlt.angle).arg(rlt.center.x()).arg(rlt.center.y());
+	QString sdata = QString("CA;3;%1;%2;%3;%4;%5;#").arg(rlt.stationID).arg(rlt.strModel).arg(rlt.angle).arg(rlt.center.x()).arg(rlt.center.y());
 	sendByteData(sdata.toLatin1());
 }
 
diff --git a/tpvs17/tpMain/QPLCDevice.h b/tpvs17/tpMain/QPLCDevice.h
index a142ae3..7310a5f 100644
--- a/tpvs17/tpMain/QPLCDevice.h
+++ b/tpvs17/tpMain/QPLCDevice.h
@@ -32,6 +32,7 @@ public:
 	bool getClinetInfo(QString &client);
 	
 signals:
+	void sgSendAlgResult(int camID);
 	void sgTrigerCam(int camID);
 	void sgSendDataCallBack(QByteArray);
 	void sgRecvDataCallBack(QByteArray);
diff --git a/tpvs17/tpMain/lpMainWin.cpp b/tpvs17/tpMain/lpMainWin.cpp
index 042ba8f..a67a739 100644
--- a/tpvs17/tpMain/lpMainWin.cpp
+++ b/tpvs17/tpMain/lpMainWin.cpp
@@ -22,9 +22,9 @@
 #include "databasesql.h"
 #include "lpCryptokey.h"
 
-#define VERSION_HUB "3.0.1.7"
+#define VERSION_HUB "3.0.1.8"
 #define VERSION_ALG "3.0.1.4"
-#define UPDATE_TIME "2021-11-04"
+#define UPDATE_TIME "2021-11-09"
 
 #pragma execution_character_set("utf-8")
 #define MODEL_UI_ICON_NONE		":/image/no-img"
@@ -1717,7 +1717,7 @@ void lpMainWin::onSaveValveResult(ValueResult &rlt)
 	//}
 	sendWebAlgRlt(rlt);
 
-	QString strMsg = QString("%1 识别结果:%2  定位角度:%3").arg(QDateTime::currentDateTime().toString("hh:mm:ss")).arg(rlt.strModel).arg(rlt.angle);
+	QString strMsg = QString("%1 识别结果:%2  定位角度:%3 圆心:(%4,%5)").arg(QDateTime::currentDateTime().toString("hh:mm:ss")).arg(rlt.strModel).arg(rlt.angle).arg(rlt.center.x()).arg(rlt.center.y());
 	emit sgShowDetectLog(strMsg);
 }
 
diff --git a/tpvs17/valueMainUI/lpConfigUI.cpp b/tpvs17/valueMainUI/lpConfigUI.cpp
index 43a0404..50fbafa 100644
--- a/tpvs17/valueMainUI/lpConfigUI.cpp
+++ b/tpvs17/valueMainUI/lpConfigUI.cpp
@@ -39,11 +39,15 @@ Q_SLOT void lpConfigUI::onButtonClicked()
 	if ("pushButton" == strObj)
 	{
 		QString strUrl = QFileDialog::getOpenFileName(this, "", "", "*.exe");
+		if (strUrl.isEmpty())
+			return;
 		ui.lineEdit_APath->setText(strUrl);
 	}
 	else if ("pushButton_2" == strObj)
 	{
 		QString strUrl = QFileDialog::getOpenFileName(this, "", "", "*.exe");
+		if (strUrl.isEmpty())
+			return;
 		ui.lineEdit_BPath->setText(strUrl);
 	}
 	else if ("pushButton_3" == strObj)
diff --git a/tpvs17/valueMainUI/lpGlobalData.h b/tpvs17/valueMainUI/lpGlobalData.h
index e248f9c..b81b0ac 100644
--- a/tpvs17/valueMainUI/lpGlobalData.h
+++ b/tpvs17/valueMainUI/lpGlobalData.h
@@ -3,6 +3,7 @@
 
 #include <QObject>
 #include "lp_singleton_base.h"
+#include "Result2Ui.h"
 class lpGlobalData : public lp_singleton_base<lpGlobalData>
 {
 public:
@@ -10,6 +11,9 @@ public:
 	~lpGlobalData();
 	bool bShowRecv{ false };
 	bool bShowSend{ false };
+
+	ValueResult m_StationResult_1;
+	ValueResult m_StationResult_2;
 };
 
 #endif
diff --git a/tpvs17/valueMainUI/valueMainUI.cpp b/tpvs17/valueMainUI/valueMainUI.cpp
index 4141400..48a1edb 100644
--- a/tpvs17/valueMainUI/valueMainUI.cpp
+++ b/tpvs17/valueMainUI/valueMainUI.cpp
@@ -29,7 +29,7 @@ valueMainUI::valueMainUI(QWidget *parent)
 	
 	setupTrayIcon();//后台任务栏初始化
 	setWindowIcon(QIcon(WINDOWICON));
-	setWindowTitle(tr("识别定位一体检测系统"));
+	setWindowTitle(tr("识别定位一体检测系统(v1.0.3 21.11.09)"));
 	lpGlobalData::instance();
 	lpConfig::instance()->loadConfig();
 
@@ -124,6 +124,7 @@ valueMainUI::valueMainUI(QWidget *parent)
 		m_pPlcDevice->onInitDevice();
 		m_pPlcDevice->onStartServer(lpConfig::instance()->plcServerPort);
 		connect(m_pPlcDevice, SIGNAL(sgTrigerCam(int)), this, SLOT(onPLCTrigerCam(int)));
+		connect(m_pPlcDevice, SIGNAL(sgSendAlgResult(int)), this, SLOT(onSendAlgResult(int)));
 		connect(m_pPlcDevice, SIGNAL(sgSendDataCallBack(QByteArray)), this, SLOT(onShowSendTcpData(QByteArray)));
 		connect(m_pPlcDevice, SIGNAL(sgRecvDataCallBack(QByteArray)), this, SLOT(onShowRecvTcpData(QByteArray)));
 	}
@@ -132,6 +133,8 @@ valueMainUI::valueMainUI(QWidget *parent)
 		m_SysTimerID = startTimer(1000);//系统定时刷新定时器 
 		m_timerStartID = startTimer(1000);//启动从机客户端 
 	}
+	lpGlobalData::instance()->m_StationResult_1.stationID = 1;
+	lpGlobalData::instance()->m_StationResult_2.stationID = 2;
 }
 
 valueMainUI::~valueMainUI()
@@ -274,9 +277,10 @@ Q_SLOT void valueMainUI::onRecvDataStr_A(const QJsonObject& json)
 			rlt.angle = angle;
 			rlt.center = QPointF(cnt_x, cnt_y);
 			rlt.strModel = strName;
+			lpGlobalData::instance()->m_StationResult_1 = rlt;
 			if (m_pPlcDevice)
 			{
-				m_pPlcDevice->onSendValueRlt(rlt);
+				m_pPlcDevice->onAckTrigerCam(1);
 			}
 		}
 		else if (strcmd == "heartbit")
@@ -287,10 +291,7 @@ Q_SLOT void valueMainUI::onRecvDataStr_A(const QJsonObject& json)
 		}
 		else if (strcmd == "triggerAck")
 		{
-			if (m_pPlcDevice)
-			{
-				m_pPlcDevice->onAckTrigerCam(1);
-			}
+
 		}
 	}
 }
@@ -365,9 +366,10 @@ Q_SLOT void valueMainUI::onRecvDataStr_B(const QJsonObject& json)
 			rlt.angle = angle;
 			rlt.center = QPointF(cnt_x, cnt_y);
 			rlt.strModel = strName;
+			lpGlobalData::instance()->m_StationResult_2 = rlt;
 			if (m_pPlcDevice)
 			{
-				m_pPlcDevice->onSendValueRlt(rlt);
+				m_pPlcDevice->onAckTrigerCam(2);
 			}
 		}
 		else if (strcmd == "heartbit")
@@ -378,10 +380,7 @@ Q_SLOT void valueMainUI::onRecvDataStr_B(const QJsonObject& json)
 		}
 		else if (strcmd == "triggerAck")
 		{
-			if (m_pPlcDevice)
-			{
-				m_pPlcDevice->onAckTrigerCam(2);
-			}
+
 		}
 	}
 }
@@ -1130,3 +1129,20 @@ Q_SLOT void valueMainUI::onLanguageChange(QString strLanguage)
 	SetLanguage(strLanguage);
 }
 
+Q_SLOT void valueMainUI::onSendAlgResult(int camID)
+{
+	if (camID == 1)
+	{
+		if (m_pPlcDevice)
+		{
+			m_pPlcDevice->onSendValueRlt(lpGlobalData::instance()->m_StationResult_1);
+		}
+	}
+	else if (camID == 2)
+	{
+		if (m_pPlcDevice)
+		{
+			m_pPlcDevice->onSendValueRlt(lpGlobalData::instance()->m_StationResult_2);
+		}
+	}
+}
\ No newline at end of file
diff --git a/tpvs17/valueMainUI/valueMainUI.h b/tpvs17/valueMainUI/valueMainUI.h
index 03f2567..4c305e1 100644
--- a/tpvs17/valueMainUI/valueMainUI.h
+++ b/tpvs17/valueMainUI/valueMainUI.h
@@ -72,6 +72,7 @@ private://trayIcon
 	void SearchQmFile(const QString & strDir);
 	void SetTranslator(const QString strPath);
 	Q_SLOT void onLanguageChange(QString strLanguage);
+	Q_SLOT void onSendAlgResult(int camID);
 protected:
 	virtual void timerEvent(QTimerEvent *event);
 	virtual void closeEvent(QCloseEvent *event);