From 7e5d572e215b7d00fcdc4a84f681ee08a8f65328 Mon Sep 17 00:00:00 2001 From: "bob.pan" Date: Thu, 11 Nov 2021 17:33:38 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E5=9B=A0=E6=98=A8?= =?UTF-8?q?=E5=A4=A9=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=B8=BAjpg=E5=BC=95=E8=B5=B7=E7=9A=84?= =?UTF-8?q?=E6=A0=87=E5=AE=9A=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E6=97=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=A9=BA=E7=99=BD=E7=9A=84bug=202?= =?UTF-8?q?=E3=80=81=E6=A0=B9=E6=8D=AE=E4=B8=8E=E7=8E=B0=E5=9C=BA=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E7=9A=84=E9=80=9A=E8=AE=AF=E5=86=85=E5=AE=B9=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E4=BF=AE=E6=94=B9=E8=B0=83=E6=95=B4=EF=BC=8C=E5=8F=91?= =?UTF-8?q?=E9=80=81=E5=BA=94=E7=AD=94=E7=9A=84=E7=AE=97=E6=B3=95=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E6=95=B0=E6=8D=AE=E6=94=B9=E4=B8=BA=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=203=E3=80=81valueMainUI=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=A0=BC=E5=BC=8F=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tpMain/Result2Ui.h | 2 +- tpvs17/tpMain/QPLCDevice.cpp | 7 ++++++- tpvs17/valueMainUI/valueMainUI.cpp | 10 +++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/tpMain/Result2Ui.h b/src/tpMain/Result2Ui.h index 0405651..5ee2a88 100644 --- a/src/tpMain/Result2Ui.h +++ b/src/tpMain/Result2Ui.h @@ -35,7 +35,7 @@ struct ValueResult { int stationID{ 1 };//工位ID 1 A侧 2 B侧 QString strModel{ "NG" };//型号名 double score{ 0.0 };//分数 - double angle{ 0.0 };//定位角度 + double angle{ 361.0 };//定位角度 QPointF center;//圆心坐标 物理 QPointF centerPix;//圆心坐标 像素坐标 QString strImagePath;//图像保存路径 diff --git a/tpvs17/tpMain/QPLCDevice.cpp b/tpvs17/tpMain/QPLCDevice.cpp index 49c477c..bad8d79 100644 --- a/tpvs17/tpMain/QPLCDevice.cpp +++ b/tpvs17/tpMain/QPLCDevice.cpp @@ -128,7 +128,12 @@ void QPLCDevice::onParaster(QByteArray recvData) 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 strModel = rlt.strModel.rightJustified(8,' '); + QString strAngle = QString("%1").arg(rlt.angle).rightJustified(8, ' '); + QString strCx = QString("%1").arg(QString::number(rlt.center.x(),'f',2)).rightJustified(8, ' '); + QString strCy = QString("%1").arg(QString::number(rlt.center.y(),'f',2)).rightJustified(8, ' '); + QString sdata = QString("CA;3;%1;%2;%3;%4;%5;#").arg(rlt.stationID).arg(strModel).arg(strAngle).arg(strCx).arg(strCy); + //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/valueMainUI/valueMainUI.cpp b/tpvs17/valueMainUI/valueMainUI.cpp index 97ba1c8..e2dfc25 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("识别定位一体检测系统(v1.0.3 21.11.09)")); + setWindowTitle(tr("识别定位一体检测系统(v1.0.5 21.11.11)")); lpGlobalData::instance(); lpConfig::instance()->loadConfig(); @@ -234,9 +234,9 @@ Q_SLOT void valueMainUI::onRecvDataStr_A(const QJsonObject& json) newImg.loadFromData(imgArr); m_ImgViewer_A->setImg(newImg); - QString sMsg = QString("%1 : %2->%3 %4 (%5,%6)") + QString sMsg = QString("%1 : %2->Score:%3 Angle:%4 Center:(%5,%6)") .arg(QDateTime::currentDateTime().toString("hh:mm:ss")) - .arg(strName).arg(score).arg(angle).arg(cnt_x).arg(cnt_y); + .arg(strName).arg(QString::number(score, 'f', 2)).arg(QString::number(angle, 'f', 2)).arg(QString::number(cnt_x, 'f', 2)).arg(QString::number(cnt_y, 'f', 2)); if (ui.textEdit->toPlainText().size() > 10000) ui.textEdit->clear(); ui.textEdit->append(sMsg); @@ -322,9 +322,9 @@ Q_SLOT void valueMainUI::onRecvDataStr_B(const QJsonObject& json) newImg.loadFromData(imgArr); m_ImgViewer_B->setImg(newImg); - QString sMsg = QString("%1 : %2->%3 %4 (%5,%6)") + QString sMsg = QString("%1 : %2->Score:%3 Angle:%4 Center:(%5,%6)") .arg(QDateTime::currentDateTime().toString("hh:mm:ss")) - .arg(strName).arg(score).arg(angle).arg(cnt_x).arg(cnt_y); + .arg(strName).arg(QString::number(score, 'f', 2)).arg(QString::number(angle, 'f', 2)).arg(QString::number(cnt_x, 'f', 2)).arg(QString::number(cnt_y, 'f', 2)); if (ui.textEdit_2->toPlainText().size() > 10000) ui.textEdit_2->clear(); ui.textEdit_2->append(sMsg);