1、修复因昨天修改图片保存格式为jpg引起的标定页面展示时显示为空白的bug

2、根据与现场对接的通讯内容进行修改调整,发送应答的算法结果数据改为固定长度
3、valueMainUI展示内容格式更改
master
bob.pan 4 years ago
parent 2a239aa03f
commit 7e5d572e21

@ -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;//图像保存路径

@ -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());
}

@ -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);

Loading…
Cancel
Save