ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix findClosest() in logsmodel

Browse Source
This commit is contained in:
Michael Zanetti 2021-12-15 23:28:27 +01:00
parent 35a1fce8a5
commit 5c63c92064
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libnymea-app/models/logsmodel.cpp
View File

@ -232,8 +232,9 @@ LogEntry *LogsModel::get(int index) const
LogEntry *LogsModel::findClosest(const QDateTime &dateTime)
{
qWarning() << "********************Finding closest for:" << dateTime.time().toString();
// qWarning() << "********************Finding closest for:" << dateTime.time().toString();
if (m_list.isEmpty()) {
// qWarning() << "No entries here...";
return nullptr;
}
int newest = 0;
@ -243,22 +244,27 @@ LogEntry *LogsModel::findClosest(const QDateTime &dateTime)
LogEntry *allTimeOldestEntry = m_list.at(oldest);
if (dateTime < allTimeOldestEntry->timestamp()) {
// qWarning() << "All time oldest is newer than searched";
return nullptr;
}
while (oldest > newest && step < m_list.count()) {
// qWarning() << "Oldest:" << oldest << "newest:" << newest << "step" << step << "count" << m_list.count();
while (oldest >= newest && step < m_list.count()) {
LogEntry *oldestEntry = m_list.at(oldest);
LogEntry *newestEntry = m_list.at(newest);
int middle = (oldest - newest) / 2 + newest;
LogEntry *middleEntry = m_list.at(middle);
qWarning() << "Oldest:" << oldestEntry->timestamp().time().toString() << "Middle:" << middleEntry->timestamp().time().toString() << "Newest:" << newestEntry->timestamp().time().toString() << ":" << (oldest - newest);
// qWarning() << "Oldest:" << oldest << oldestEntry->timestamp().toString() << oldestEntry->value() << "Middle:" << middle << middleEntry->timestamp().toString() << middleEntry->value() << "Newest:" << newest << newestEntry->timestamp().toString() << newestEntry->value() << ":" << (oldest - newest);
if (dateTime <= oldestEntry->timestamp()) {
// qWarning() << "Returning oldest";
return oldestEntry;
}
if (dateTime >= newestEntry->timestamp()) {
// qWarning() << "Returning newest";
return newestEntry;
}
if (dateTime == middleEntry->timestamp()) {
// qWarning() << "Returning middle";
return middleEntry;
}
@ -269,7 +275,12 @@ LogEntry *LogsModel::findClosest(const QDateTime &dateTime)
}
if (oldest - newest == 1) {
return newestEntry;
// qWarning() << "EOL. Returning middle";
if (oldest < middle) {
return oldestEntry;
} else {
return middleEntry;
}
}
step++;
}