diff --git a/PhaseCompAcq/PhaseDevice.cpp b/PhaseCompAcq/PhaseDevice.cpp index 1bfbd58..547ed82 100644 --- a/PhaseCompAcq/PhaseDevice.cpp +++ b/PhaseCompAcq/PhaseDevice.cpp @@ -122,7 +122,7 @@ { chFilename = chFilename.arg(i); } - QString channelDataStr = QString("%1 [%2] %3").arg(phaseData->timestamp).arg(phaseData->frameId).arg(phaseData->channelData.at(i-1)); + QString channelDataStr = QString("%1 [%2] %3").arg(phaseData->timestamp).arg(phaseData->frameId).arg(phaseData->channelDataStr.at(i-1)); QLogUtil::writeChannelDataLogByDate(date, chFilename, channelDataStr); diff --git a/PhaseCompAcq/PhaseDevice.cpp b/PhaseCompAcq/PhaseDevice.cpp index 1bfbd58..547ed82 100644 --- a/PhaseCompAcq/PhaseDevice.cpp +++ b/PhaseCompAcq/PhaseDevice.cpp @@ -122,7 +122,7 @@ { chFilename = chFilename.arg(i); } - QString channelDataStr = QString("%1 [%2] %3").arg(phaseData->timestamp).arg(phaseData->frameId).arg(phaseData->channelData.at(i-1)); + QString channelDataStr = QString("%1 [%2] %3").arg(phaseData->timestamp).arg(phaseData->frameId).arg(phaseData->channelDataStr.at(i-1)); QLogUtil::writeChannelDataLogByDate(date, chFilename, channelDataStr); diff --git a/PhaseCompAcq/PhaseWindow.cpp b/PhaseCompAcq/PhaseWindow.cpp index 9910be4..03e77c6 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 ns").arg(phaseData->channelData.at(i))); + ((QLineEdit *)channelBox->children().at(4))->setText(QString("%1 s").arg(phaseData->channelDataStr.at(i))); ((QLineEdit *)channelBox->children().at(6))->setText(phaseData->frameId); ((QLabel *)channelBox->children().at(7))->setText(phaseData->channelActive.at(i) == "1" ? "有效" : "无效"); } diff --git a/PhaseCompAcq/PhaseDevice.cpp b/PhaseCompAcq/PhaseDevice.cpp index 1bfbd58..547ed82 100644 --- a/PhaseCompAcq/PhaseDevice.cpp +++ b/PhaseCompAcq/PhaseDevice.cpp @@ -122,7 +122,7 @@ { chFilename = chFilename.arg(i); } - QString channelDataStr = QString("%1 [%2] %3").arg(phaseData->timestamp).arg(phaseData->frameId).arg(phaseData->channelData.at(i-1)); + QString channelDataStr = QString("%1 [%2] %3").arg(phaseData->timestamp).arg(phaseData->frameId).arg(phaseData->channelDataStr.at(i-1)); QLogUtil::writeChannelDataLogByDate(date, chFilename, channelDataStr); diff --git a/PhaseCompAcq/PhaseWindow.cpp b/PhaseCompAcq/PhaseWindow.cpp index 9910be4..03e77c6 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 ns").arg(phaseData->channelData.at(i))); + ((QLineEdit *)channelBox->children().at(4))->setText(QString("%1 s").arg(phaseData->channelDataStr.at(i))); ((QLineEdit *)channelBox->children().at(6))->setText(phaseData->frameId); ((QLabel *)channelBox->children().at(7))->setText(phaseData->channelActive.at(i) == "1" ? "有效" : "无效"); } diff --git a/PhaseCompAcq/protocol/PhaseProtocolBM.cpp b/PhaseCompAcq/protocol/PhaseProtocolBM.cpp index da69694..aa4f086 100644 --- a/PhaseCompAcq/protocol/PhaseProtocolBM.cpp +++ b/PhaseCompAcq/protocol/PhaseProtocolBM.cpp @@ -38,10 +38,13 @@ { dataObj->channelActive.append("0"); dataObj->channelData.append(0.00); + dataObj->channelDataStr.append("0.00"); } else { + double phase = (channelRawData - CALCULATE_OFFSET) * CALCULATE_FACTOR; dataObj->channelActive.append("1"); - dataObj->channelData.append((channelRawData - CALCULATE_OFFSET) * CALCULATE_FACTOR); + dataObj->channelData.append(phase); + dataObj->channelDataStr.append(QString::number(phase, 'f', 12)); } } diff --git a/PhaseCompAcq/PhaseDevice.cpp b/PhaseCompAcq/PhaseDevice.cpp index 1bfbd58..547ed82 100644 --- a/PhaseCompAcq/PhaseDevice.cpp +++ b/PhaseCompAcq/PhaseDevice.cpp @@ -122,7 +122,7 @@ { chFilename = chFilename.arg(i); } - QString channelDataStr = QString("%1 [%2] %3").arg(phaseData->timestamp).arg(phaseData->frameId).arg(phaseData->channelData.at(i-1)); + QString channelDataStr = QString("%1 [%2] %3").arg(phaseData->timestamp).arg(phaseData->frameId).arg(phaseData->channelDataStr.at(i-1)); QLogUtil::writeChannelDataLogByDate(date, chFilename, channelDataStr); diff --git a/PhaseCompAcq/PhaseWindow.cpp b/PhaseCompAcq/PhaseWindow.cpp index 9910be4..03e77c6 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 ns").arg(phaseData->channelData.at(i))); + ((QLineEdit *)channelBox->children().at(4))->setText(QString("%1 s").arg(phaseData->channelDataStr.at(i))); ((QLineEdit *)channelBox->children().at(6))->setText(phaseData->frameId); ((QLabel *)channelBox->children().at(7))->setText(phaseData->channelActive.at(i) == "1" ? "有效" : "无效"); } diff --git a/PhaseCompAcq/protocol/PhaseProtocolBM.cpp b/PhaseCompAcq/protocol/PhaseProtocolBM.cpp index da69694..aa4f086 100644 --- a/PhaseCompAcq/protocol/PhaseProtocolBM.cpp +++ b/PhaseCompAcq/protocol/PhaseProtocolBM.cpp @@ -38,10 +38,13 @@ { dataObj->channelActive.append("0"); dataObj->channelData.append(0.00); + dataObj->channelDataStr.append("0.00"); } else { + double phase = (channelRawData - CALCULATE_OFFSET) * CALCULATE_FACTOR; dataObj->channelActive.append("1"); - dataObj->channelData.append((channelRawData - CALCULATE_OFFSET) * CALCULATE_FACTOR); + dataObj->channelData.append(phase); + dataObj->channelDataStr.append(QString::number(phase, 'f', 12)); } } diff --git a/PhaseCompAcq/protocol/PhaseProtocolBM.h b/PhaseCompAcq/protocol/PhaseProtocolBM.h index 20cb37e..048a9c2 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 * 1E9; +static const double CALCULATE_FACTOR = 1.6810E-15; class PhaseProtocolBM : public QObject { diff --git a/PhaseCompAcq/PhaseDevice.cpp b/PhaseCompAcq/PhaseDevice.cpp index 1bfbd58..547ed82 100644 --- a/PhaseCompAcq/PhaseDevice.cpp +++ b/PhaseCompAcq/PhaseDevice.cpp @@ -122,7 +122,7 @@ { chFilename = chFilename.arg(i); } - QString channelDataStr = QString("%1 [%2] %3").arg(phaseData->timestamp).arg(phaseData->frameId).arg(phaseData->channelData.at(i-1)); + QString channelDataStr = QString("%1 [%2] %3").arg(phaseData->timestamp).arg(phaseData->frameId).arg(phaseData->channelDataStr.at(i-1)); QLogUtil::writeChannelDataLogByDate(date, chFilename, channelDataStr); diff --git a/PhaseCompAcq/PhaseWindow.cpp b/PhaseCompAcq/PhaseWindow.cpp index 9910be4..03e77c6 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 ns").arg(phaseData->channelData.at(i))); + ((QLineEdit *)channelBox->children().at(4))->setText(QString("%1 s").arg(phaseData->channelDataStr.at(i))); ((QLineEdit *)channelBox->children().at(6))->setText(phaseData->frameId); ((QLabel *)channelBox->children().at(7))->setText(phaseData->channelActive.at(i) == "1" ? "有效" : "无效"); } diff --git a/PhaseCompAcq/protocol/PhaseProtocolBM.cpp b/PhaseCompAcq/protocol/PhaseProtocolBM.cpp index da69694..aa4f086 100644 --- a/PhaseCompAcq/protocol/PhaseProtocolBM.cpp +++ b/PhaseCompAcq/protocol/PhaseProtocolBM.cpp @@ -38,10 +38,13 @@ { dataObj->channelActive.append("0"); dataObj->channelData.append(0.00); + dataObj->channelDataStr.append("0.00"); } else { + double phase = (channelRawData - CALCULATE_OFFSET) * CALCULATE_FACTOR; dataObj->channelActive.append("1"); - dataObj->channelData.append((channelRawData - CALCULATE_OFFSET) * CALCULATE_FACTOR); + dataObj->channelData.append(phase); + dataObj->channelDataStr.append(QString::number(phase, 'f', 12)); } } diff --git a/PhaseCompAcq/protocol/PhaseProtocolBM.h b/PhaseCompAcq/protocol/PhaseProtocolBM.h index 20cb37e..048a9c2 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 * 1E9; +static const double CALCULATE_FACTOR = 1.6810E-15; class PhaseProtocolBM : public QObject { diff --git a/PhaseCompAcq/protocol/dto/PhaseDataDto.cpp b/PhaseCompAcq/protocol/dto/PhaseDataDto.cpp index 0627d34..5163335 100644 --- a/PhaseCompAcq/protocol/dto/PhaseDataDto.cpp +++ b/PhaseCompAcq/protocol/dto/PhaseDataDto.cpp @@ -10,7 +10,7 @@ QJsonObject jsonObj; QJsonObject dataObj; - dataObj.insert("dataValue", QString("%1").arg(this->channelData.at(i))); + dataObj.insert("dataValue", this->channelDataStr.at(i)); dataObj.insert("frameId", this->frameId); jsonObj.insert("channelNo", (i + 1)); diff --git a/PhaseCompAcq/PhaseDevice.cpp b/PhaseCompAcq/PhaseDevice.cpp index 1bfbd58..547ed82 100644 --- a/PhaseCompAcq/PhaseDevice.cpp +++ b/PhaseCompAcq/PhaseDevice.cpp @@ -122,7 +122,7 @@ { chFilename = chFilename.arg(i); } - QString channelDataStr = QString("%1 [%2] %3").arg(phaseData->timestamp).arg(phaseData->frameId).arg(phaseData->channelData.at(i-1)); + QString channelDataStr = QString("%1 [%2] %3").arg(phaseData->timestamp).arg(phaseData->frameId).arg(phaseData->channelDataStr.at(i-1)); QLogUtil::writeChannelDataLogByDate(date, chFilename, channelDataStr); diff --git a/PhaseCompAcq/PhaseWindow.cpp b/PhaseCompAcq/PhaseWindow.cpp index 9910be4..03e77c6 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 ns").arg(phaseData->channelData.at(i))); + ((QLineEdit *)channelBox->children().at(4))->setText(QString("%1 s").arg(phaseData->channelDataStr.at(i))); ((QLineEdit *)channelBox->children().at(6))->setText(phaseData->frameId); ((QLabel *)channelBox->children().at(7))->setText(phaseData->channelActive.at(i) == "1" ? "有效" : "无效"); } diff --git a/PhaseCompAcq/protocol/PhaseProtocolBM.cpp b/PhaseCompAcq/protocol/PhaseProtocolBM.cpp index da69694..aa4f086 100644 --- a/PhaseCompAcq/protocol/PhaseProtocolBM.cpp +++ b/PhaseCompAcq/protocol/PhaseProtocolBM.cpp @@ -38,10 +38,13 @@ { dataObj->channelActive.append("0"); dataObj->channelData.append(0.00); + dataObj->channelDataStr.append("0.00"); } else { + double phase = (channelRawData - CALCULATE_OFFSET) * CALCULATE_FACTOR; dataObj->channelActive.append("1"); - dataObj->channelData.append((channelRawData - CALCULATE_OFFSET) * CALCULATE_FACTOR); + dataObj->channelData.append(phase); + dataObj->channelDataStr.append(QString::number(phase, 'f', 12)); } } diff --git a/PhaseCompAcq/protocol/PhaseProtocolBM.h b/PhaseCompAcq/protocol/PhaseProtocolBM.h index 20cb37e..048a9c2 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 * 1E9; +static const double CALCULATE_FACTOR = 1.6810E-15; class PhaseProtocolBM : public QObject { diff --git a/PhaseCompAcq/protocol/dto/PhaseDataDto.cpp b/PhaseCompAcq/protocol/dto/PhaseDataDto.cpp index 0627d34..5163335 100644 --- a/PhaseCompAcq/protocol/dto/PhaseDataDto.cpp +++ b/PhaseCompAcq/protocol/dto/PhaseDataDto.cpp @@ -10,7 +10,7 @@ QJsonObject jsonObj; QJsonObject dataObj; - dataObj.insert("dataValue", QString("%1").arg(this->channelData.at(i))); + dataObj.insert("dataValue", this->channelDataStr.at(i)); dataObj.insert("frameId", this->frameId); jsonObj.insert("channelNo", (i + 1)); diff --git a/PhaseCompAcq/protocol/dto/PhaseDataDto.h b/PhaseCompAcq/protocol/dto/PhaseDataDto.h index 05924fb..0317a83 100644 --- a/PhaseCompAcq/protocol/dto/PhaseDataDto.h +++ b/PhaseCompAcq/protocol/dto/PhaseDataDto.h @@ -20,6 +20,7 @@ QString devStatus; QList channelActive; QList channelData; + QList channelDataStr; QJsonObject toJSON(int i);