diff --git a/re/rangestatewindow.cpp b/re/rangestatewindow.cpp index 8695adf..840b6d6 100644 --- a/re/rangestatewindow.cpp +++ b/re/rangestatewindow.cpp @@ -194,7 +194,7 @@ void RangeStateWindow::refreshFilterList() void RangeStateWindow::recalcButton() { - QHash::iterator iter; + QMap::iterator iter; uint32_t id; ui->listCandidates->clear(); @@ -209,6 +209,8 @@ void RangeStateWindow::recalcButton() progress.setMinimumDuration(0); progress.show(); + + for (iter = idFilters.begin(); iter != idFilters.end(); ++iter) { if (iter.value() == true) @@ -345,7 +347,7 @@ bool RangeStateWindow::processSignal(int startBit, int bitLength, int sensitivit { //now look at the second order differentials. This is acceleration. There shouldn't be hard acceleration in values for a ranging signal comparisonValue = Utility::Lerp((double)range * 0.20, 1, lerpPoint); - maxOvers = maxOvers / 10; + maxOvers = Utility::Lerp(8, 2, lerpPoint); //really clamp down on second order over limits qDebug() << "2nd Delta comparisonvalue: " << comparisonValue; overValues = 0; for (i = 0; i < diff2.count(); i++) diff --git a/re/rangestatewindow.h b/re/rangestatewindow.h index 193e052..b4db783 100644 --- a/re/rangestatewindow.h +++ b/re/rangestatewindow.h @@ -2,6 +2,7 @@ #define RANGESTATEWINDOW_H #include +#include #include "can_structs.h" namespace Ui { @@ -27,7 +28,7 @@ private: const QVector *modelFrames; QVector frameCache; QList foundSignals; - QHash idFilters; + QMap idFilters; void refreshFilterList(); void closeEvent(QCloseEvent *event);