IntenseWebs/tuxclocker
3
0
Fork 0
mirror of https://github.com/Lurkki14/tuxclocker.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix target value not being emitted when reading wasn't between points

Browse Source
This commit is contained in:
Jussi Kuokkanen 2023-08-29 16:26:27 +03:00
parent 407974c0b9
commit f8b0ae15b6
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/tuxclocker-qt/data/DynamicReadableConnection.hpp
View File

@ -41,7 +41,6 @@ public:
}
virtual QVariant connectionData() override { return QVariant(); }
virtual void start() override {
// TODO: Something goes wrong here (not always!!)
connect(&m_proxy, &DynamicReadableProxy::valueChanged, [this](auto val) {
match(val)(pattern(as<ReadableValue>(arg)) = [this](auto rv) {
match(rv)(pattern(as<uint>(arg)) = [this](auto u) {
@ -49,11 +48,6 @@ public:
});
});
});
/*QDBusVariant arg{QVariant{1}};
QVariant v;
v.setValue(arg);
emit targetValueChanged(v, "1");*/
}
virtual void stop() override { disconnect(&m_proxy, nullptr, nullptr, nullptr); }
private:
@ -61,6 +55,13 @@ private:
QTimer m_timer;
QVector<QPointF> m_points;
template <typename T> void doEmit(T targetValue) {
QDBusVariant arg{QVariant{targetValue}};
QVariant v;
v.setValue(arg);
emit targetValueChanged(v, QString::number(targetValue));
}
template <typename U> void emitTargetValue(U reading) {
// Find two points from the vector so that:
// p[i].x < val < p[i + 1].x
@ -71,18 +72,29 @@ private:
break;
}
}
if (leftIndex == std::nullopt)
// Reading wasn't between points
if (reading > m_points.last().y()) {
// Use y of rightmost point
doEmit((uint) qRound(m_points.last().y()));
return;
} else if (reading < m_points.last().y()) {
// Leftmost
doEmit((uint) qRound(m_points.first().y()));
return;
}
if (leftIndex == std::nullopt) {
qWarning("Couldn't calculate target value from reading %s!",
qPrintable(QString::number(reading)));
return;
}
int li = leftIndex.value();
// What percentage the value is from dx of left and right interp points
double dx = m_points[li + 1].x() - m_points[li].x();
double dvx = reading - m_points[li].x();
double p = dvx / dx;
OutType interp_y = lerp(m_points[li].y(), m_points[li + 1].y(), p);
QDBusVariant arg{QVariant{interp_y}};
QVariant v;
v.setValue(arg);
emit targetValueChanged(v, QString::number(interp_y));
doEmit(interp_y);
}
template <typename T> T lerp(T a, T b, double t) { return a + (t * (b - a)); }