diff --git a/ChannelCharts.cpp b/ChannelCharts.cpp index 6d713e3..2b905a3 100644 --- a/ChannelCharts.cpp +++ b/ChannelCharts.cpp @@ -3,6 +3,7 @@ #include #include "IconHelper.h" +#include "common/utils/SettingConfig.h" extern QVector> phaseVector; extern QVector> channelAllan; @@ -74,15 +75,15 @@ ui->dataPlot->yAxis->grid()->setPen(QPen(QColor(130, 130, 130), 0, Qt::SolidLine)); ui->dataPlot->yAxis->grid()->setSubGridPen(QPen(QColor(130, 130, 130), 0, Qt::DotLine)); - if (phaseVector[index].isEmpty() == false) + if (phaseVector[index].size() > SettingConfig::getInstance().SKIP_HEADER) { - double minTm = phaseVector[index].first().at(0).toLongLong() / 1000; + double minTm = phaseVector[index].at(SettingConfig::getInstance().SKIP_HEADER).at(0).toLongLong() / 1000; double maxTm = phaseVector[index].last().at(0).toLongLong() / 1000; - double minValue = phaseVector[index].first().at(1).toDouble(); - double maxValue = phaseVector[index].first().at(1).toDouble(); + double minValue = phaseVector[index].at(SettingConfig::getInstance().SKIP_HEADER).at(1).toDouble(); + double maxValue = phaseVector[index].at(SettingConfig::getInstance().SKIP_HEADER).at(1).toDouble(); QVector vecPoints; - for (int i = 0; i < phaseVector[index].size(); i++) + for (int i = SettingConfig::getInstance().SKIP_HEADER; i < phaseVector[index].size(); i++) { // 新的数据点 QCPGraphData onePoint; diff --git a/ChannelCharts.cpp b/ChannelCharts.cpp index 6d713e3..2b905a3 100644 --- a/ChannelCharts.cpp +++ b/ChannelCharts.cpp @@ -3,6 +3,7 @@ #include #include "IconHelper.h" +#include "common/utils/SettingConfig.h" extern QVector> phaseVector; extern QVector> channelAllan; @@ -74,15 +75,15 @@ ui->dataPlot->yAxis->grid()->setPen(QPen(QColor(130, 130, 130), 0, Qt::SolidLine)); ui->dataPlot->yAxis->grid()->setSubGridPen(QPen(QColor(130, 130, 130), 0, Qt::DotLine)); - if (phaseVector[index].isEmpty() == false) + if (phaseVector[index].size() > SettingConfig::getInstance().SKIP_HEADER) { - double minTm = phaseVector[index].first().at(0).toLongLong() / 1000; + double minTm = phaseVector[index].at(SettingConfig::getInstance().SKIP_HEADER).at(0).toLongLong() / 1000; double maxTm = phaseVector[index].last().at(0).toLongLong() / 1000; - double minValue = phaseVector[index].first().at(1).toDouble(); - double maxValue = phaseVector[index].first().at(1).toDouble(); + double minValue = phaseVector[index].at(SettingConfig::getInstance().SKIP_HEADER).at(1).toDouble(); + double maxValue = phaseVector[index].at(SettingConfig::getInstance().SKIP_HEADER).at(1).toDouble(); QVector vecPoints; - for (int i = 0; i < phaseVector[index].size(); i++) + for (int i = SettingConfig::getInstance().SKIP_HEADER; i < phaseVector[index].size(); i++) { // 新的数据点 QCPGraphData onePoint; diff --git a/PhaseDevice.cpp b/PhaseDevice.cpp index 0db4c72..fa8ebd7 100644 --- a/PhaseDevice.cpp +++ b/PhaseDevice.cpp @@ -116,7 +116,7 @@ // 3.3 将补偿前的时差数据存入数据栈, 用于计算allen方差 QStringList valueList; - valueList << QString::number(phaseData->milisecond) << QString::number(phaseData->channelBeforeDelay.at(i), 'e', 4); + valueList << QString::number(phaseData->milisecond) << QString::number(phaseData->channelBeforeDelay.at(i), 'e', 6); QMutex mutex; mutex.lock(); phaseVector[i].append(valueList);