diff --git a/ChannelItem.cpp b/ChannelItem.cpp index cc5e006..31517ab 100644 --- a/ChannelItem.cpp +++ b/ChannelItem.cpp @@ -35,8 +35,8 @@ int size = phaseVector.at(index).size() - SettingConfig::getInstance().SKIP_HEADER; if (size < 0) size = 0; double ps = phaseData->channelBeforeDelay.at(index) * 1e12; // 显示ps数据 - ui->rawValue->setText(QString::number(ps, 'f', 0) + "ps"); // 原始数据显示单位为ps - ui->channelValue->setText(QString::number(ps + channelDelay, 'f', 0) + "ps"); // 补偿值的单位也是ps, 补偿后也显示为ps + ui->rawValue->setText(QString::number(ps, 'f', 3) + "ps"); // 原始数据显示单位为ps + ui->channelValue->setText(QString::number(ps + channelDelay, 'f', 3) + "ps"); // 补偿值的单位也是ps, 补偿后也显示为ps ui->samplingOne->setText(QString::number(size)); ui->samplingTen->setText(QString::number((int)size/10)); ui->samplingHund->setText(QString::number((int)size/100)); diff --git a/ChannelItem.cpp b/ChannelItem.cpp index cc5e006..31517ab 100644 --- a/ChannelItem.cpp +++ b/ChannelItem.cpp @@ -35,8 +35,8 @@ int size = phaseVector.at(index).size() - SettingConfig::getInstance().SKIP_HEADER; if (size < 0) size = 0; double ps = phaseData->channelBeforeDelay.at(index) * 1e12; // 显示ps数据 - ui->rawValue->setText(QString::number(ps, 'f', 0) + "ps"); // 原始数据显示单位为ps - ui->channelValue->setText(QString::number(ps + channelDelay, 'f', 0) + "ps"); // 补偿值的单位也是ps, 补偿后也显示为ps + ui->rawValue->setText(QString::number(ps, 'f', 3) + "ps"); // 原始数据显示单位为ps + ui->channelValue->setText(QString::number(ps + channelDelay, 'f', 3) + "ps"); // 补偿值的单位也是ps, 补偿后也显示为ps ui->samplingOne->setText(QString::number(size)); ui->samplingTen->setText(QString::number((int)size/10)); ui->samplingHund->setText(QString::number((int)size/100)); diff --git a/ChannelItem.ui b/ChannelItem.ui index 77b6a14..ed4c515 100644 --- a/ChannelItem.ui +++ b/ChannelItem.ui @@ -542,9 +542,18 @@ + + + 微软雅黑 + 12 + + ps + + -9999 + 99999 diff --git a/ChannelItem.cpp b/ChannelItem.cpp index cc5e006..31517ab 100644 --- a/ChannelItem.cpp +++ b/ChannelItem.cpp @@ -35,8 +35,8 @@ int size = phaseVector.at(index).size() - SettingConfig::getInstance().SKIP_HEADER; if (size < 0) size = 0; double ps = phaseData->channelBeforeDelay.at(index) * 1e12; // 显示ps数据 - ui->rawValue->setText(QString::number(ps, 'f', 0) + "ps"); // 原始数据显示单位为ps - ui->channelValue->setText(QString::number(ps + channelDelay, 'f', 0) + "ps"); // 补偿值的单位也是ps, 补偿后也显示为ps + ui->rawValue->setText(QString::number(ps, 'f', 3) + "ps"); // 原始数据显示单位为ps + ui->channelValue->setText(QString::number(ps + channelDelay, 'f', 3) + "ps"); // 补偿值的单位也是ps, 补偿后也显示为ps ui->samplingOne->setText(QString::number(size)); ui->samplingTen->setText(QString::number((int)size/10)); ui->samplingHund->setText(QString::number((int)size/100)); diff --git a/ChannelItem.ui b/ChannelItem.ui index 77b6a14..ed4c515 100644 --- a/ChannelItem.ui +++ b/ChannelItem.ui @@ -542,9 +542,18 @@ + + + 微软雅黑 + 12 + + ps + + -9999 + 99999 diff --git a/PhaseDevice.cpp b/PhaseDevice.cpp index 7c5e8a9..724e344 100644 --- a/PhaseDevice.cpp +++ b/PhaseDevice.cpp @@ -98,8 +98,8 @@ QLogUtil::writeChannelDataLogByDate(phaseData->timestamp.mid(0, 10), chFilename, channelDataStr); - // 3.3 将补偿后的时差数据存入数据栈 - phaseVector[i].append(phaseData->channelData.at(i)); + // 3.3 将补偿前的时差数据存入数据栈, 用于计算allen方差 + phaseVector[i].append(phaseData->channelBeforeDelay.at(i)); // 3.4 分别计算不同时间维度的稳定度 int size = phaseVector[i].size() - SettingConfig::getInstance().SKIP_HEADER;