diff --git a/PhaseCompAcq/PhaseWindow.cpp b/PhaseCompAcq/PhaseWindow.cpp index ae12e2c..9910be4 100644 --- a/PhaseCompAcq/PhaseWindow.cpp +++ b/PhaseCompAcq/PhaseWindow.cpp @@ -113,7 +113,7 @@ // 赋值,对应的lineEdit/label ((QLineEdit *)channelBox->children().at(2))->setText(phaseData->timestamp); - ((QLineEdit *)channelBox->children().at(4))->setText(QString("%1 s").arg(phaseData->channelData.at(i))); + ((QLineEdit *)channelBox->children().at(4))->setText(QString("%1 ns").arg(phaseData->channelData.at(i))); ((QLineEdit *)channelBox->children().at(6))->setText(phaseData->frameId); ((QLabel *)channelBox->children().at(7))->setText(phaseData->channelActive.at(i) == "1" ? "有效" : "无效"); } @@ -156,7 +156,7 @@ dataLabel->setStyleSheet("margin-left:20;"); vbox->addWidget(dataLabel); QLineEdit * dataValue = new QLineEdit(); - dataValue->setFixedWidth(150); + dataValue->setFixedWidth(250); dataValue->setFont(labelFont); vbox->addWidget(dataValue); diff --git a/PhaseCompAcq/PhaseWindow.cpp b/PhaseCompAcq/PhaseWindow.cpp index ae12e2c..9910be4 100644 --- a/PhaseCompAcq/PhaseWindow.cpp +++ b/PhaseCompAcq/PhaseWindow.cpp @@ -113,7 +113,7 @@ // 赋值,对应的lineEdit/label ((QLineEdit *)channelBox->children().at(2))->setText(phaseData->timestamp); - ((QLineEdit *)channelBox->children().at(4))->setText(QString("%1 s").arg(phaseData->channelData.at(i))); + ((QLineEdit *)channelBox->children().at(4))->setText(QString("%1 ns").arg(phaseData->channelData.at(i))); ((QLineEdit *)channelBox->children().at(6))->setText(phaseData->frameId); ((QLabel *)channelBox->children().at(7))->setText(phaseData->channelActive.at(i) == "1" ? "有效" : "无效"); } @@ -156,7 +156,7 @@ dataLabel->setStyleSheet("margin-left:20;"); vbox->addWidget(dataLabel); QLineEdit * dataValue = new QLineEdit(); - dataValue->setFixedWidth(150); + dataValue->setFixedWidth(250); dataValue->setFont(labelFont); vbox->addWidget(dataValue); diff --git a/PhaseCompAcq/protocol/PhaseProtocolBM.h b/PhaseCompAcq/protocol/PhaseProtocolBM.h index 234525a..20cb37e 100644 --- a/PhaseCompAcq/protocol/PhaseProtocolBM.h +++ b/PhaseCompAcq/protocol/PhaseProtocolBM.h @@ -15,7 +15,7 @@ PHASE_MESSURE_CHANNEL * PHASE_MESSURE_SIZE; static const qulonglong CALCULATE_OFFSET = 0X0080000000000000; -static const double CALCULATE_FACTOR = 1.6810E-15 * 10E9; +static const double CALCULATE_FACTOR = 1.6810E-15 * 1E9; class PhaseProtocolBM : public QObject {