diff --git a/tpvs17/tpMain/lpImageCaliUI4P.cpp b/tpvs17/tpMain/lpImageCaliUI4P.cpp index 1ba0361..16b6ed5 100644 --- a/tpvs17/tpMain/lpImageCaliUI4P.cpp +++ b/tpvs17/tpMain/lpImageCaliUI4P.cpp @@ -81,8 +81,8 @@ void lpImageCaliUI4P::showEvent(QShowEvent *event) m_point4 = lpGlobalConfig::instance()->point4_4P; testPoint = lpGlobalConfig::instance()->testPoint; QPointF tmpTestPoint = transWorldPoint(testPoint,lpGlobalConfig::instance()->matxParam_4P); - ui.label_testSrc->setText(QString("(%1,%2)").arg(testPoint.x()).arg(testPoint.y())); - ui.label_testDst->setText(QString("(%1,%2)").arg(tmpTestPoint.x()).arg(tmpTestPoint.y())); + ui.label_testSrc->setText(QString("(%1,%2)").arg(QString::number(testPoint.x(), 'f', 3)).arg(QString::number(testPoint.y(), 'f', 3))); + ui.label_testDst->setText(QString("(%1,%2)").arg(QString::number(tmpTestPoint.x(), 'f', 3)).arg(QString::number(tmpTestPoint.y(), 'f', 3))); if (m_srcImgView) { m_srcImgView->onClearAllROI(); @@ -104,6 +104,7 @@ void lpImageCaliUI4P::showEvent(QShowEvent *event) } ui.m_pbLock->setText(tr("解锁")); + ui.m_pbLock->setIcon(QIcon(":/Resource/lock.png")); } void lpImageCaliUI4P::changeEvent(QEvent *event) @@ -182,8 +183,8 @@ Q_SLOT void lpImageCaliUI4P::onButtonClicked() lpGlobalConfig::instance()->matxParam_4P = gentransform(srcPoly, dstPoly); QPointF tmpTestPoint = transWorldPoint(testPoint, lpGlobalConfig::instance()->matxParam_4P); - ui.label_testSrc->setText(QString("(%1,%2)").arg(testPoint.x()).arg(testPoint.y())); - ui.label_testDst->setText(QString("(%1,%2)").arg(tmpTestPoint.x()).arg(tmpTestPoint.y())); + ui.label_testSrc->setText(QString("(%1,%2)").arg(QString::number(testPoint.x(),'f',3)).arg(QString::number(testPoint.y(),'f',3))); + ui.label_testDst->setText(QString("(%1,%2)").arg(QString::number(tmpTestPoint.x(),'f',3)).arg(QString::number(tmpTestPoint.y(),'f',3))); lpGlobalConfig::instance()->saveStandParam(); @@ -203,12 +204,13 @@ Q_SLOT void lpImageCaliUI4P::onButtonClicked() QString str = ui.m_pbLock->text(); if (str == "解锁") { ui.m_pbLock->setText(tr("上锁")); + ui.m_pbLock->setIcon(QIcon(":/Resource/lock-open.png")); if (m_srcImgView) { m_srcImgView->setLockAll(false); } ui.label_info->setText("已解锁"); - ui.label_info->setStyleSheet("background-color: rgb(255, 68, 55);"); + ui.label_info->setStyleSheet("background-color: rgb(255, 168, 55);"); if (m_timerID == 0) { m_timerID = startTimer(1000); @@ -220,8 +222,9 @@ Q_SLOT void lpImageCaliUI4P::onButtonClicked() m_srcImgView->setLockAll(true); } ui.m_pbLock->setText(tr("解锁")); + ui.m_pbLock->setIcon(QIcon(":/Resource/lock.png")); ui.label_info->setText("已上锁"); - ui.label_info->setStyleSheet("background-color: rgb(255, 68, 55);"); + ui.label_info->setStyleSheet("background-color: rgb(255, 168, 55);"); if (m_timerID == 0) { m_timerID = startTimer(1000); @@ -271,8 +274,8 @@ Q_SLOT void lpImageCaliUI4P::onROIChange(const AwesomeRoiInfo& roiInfo, QString testPoint.setX(p.x()); testPoint.setY(p.y()); QPointF tmpTestPoint = transWorldPoint(testPoint, lpGlobalConfig::instance()->matxParam_4P); - ui.label_testSrc->setText(QString("(%1,%2)").arg(testPoint.x()).arg(testPoint.y())); - ui.label_testDst->setText(QString("(%1,%2)").arg(tmpTestPoint.x()).arg(tmpTestPoint.y())); + ui.label_testSrc->setText(QString("(%1,%2)").arg(QString::number(testPoint.x(), 'f', 3)).arg(QString::number(testPoint.y(), 'f', 3))); + ui.label_testDst->setText(QString("(%1,%2)").arg(QString::number(tmpTestPoint.x(), 'f', 3)).arg(QString::number(tmpTestPoint.y(), 'f', 3))); } }