diff --git a/App/ToolsUI/PowerSystem/PowerSystem.cpp b/App/ToolsUI/PowerSystem/PowerSystem.cpp index 4c66d54..7d81826 100644 --- a/App/ToolsUI/PowerSystem/PowerSystem.cpp +++ b/App/ToolsUI/PowerSystem/PowerSystem.cpp @@ -152,6 +152,9 @@ PowerSystem::PowerSystem(QWidget *parent) : ScopeMa->setGeometry(0,0,ui->frame_Ma->width(),ui->frame_Ma->height()); + averageMa.clear(); + averageTime.clear(); + //设置开车时间 connect(&timer, &QTimer::timeout, this, [=]() @@ -454,17 +457,19 @@ void PowerSystem::setMa(QVariant Ma) } - MaMap.insert(QDateTime::currentMSecsSinceEpoch(),Ma.toDouble()); - - averageMa.append(Ma.toDouble()); + averageTime.append(QDateTime::currentMSecsSinceEpoch()); - - while(averageMa.size() > 100) + while(averageTime.back() - averageTime.first() > (100 * 1000)) { + averageTime.removeFirst(); averageMa.removeFirst(); } + //qDebug() << "size of time:" << averageTime.size() << averageMa.size() << averageTime.back() << averageTime.first(); + + + ScopeMa->setSerieData(tr("马赫"),Ma); diff --git a/App/ToolsUI/PowerSystem/PowerSystem.h b/App/ToolsUI/PowerSystem/PowerSystem.h index f89889b..a59a4fa 100644 --- a/App/ToolsUI/PowerSystem/PowerSystem.h +++ b/App/ToolsUI/PowerSystem/PowerSystem.h @@ -102,6 +102,7 @@ private: QVector averageMa; + QVector averageTime; QMap MaMap;