chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bookmark behavior with clock drift

Browse Source
This commit is contained in:
kappa44 2021-05-11 14:48:14 +10:00
parent 6b5443e6b8
commit aec02b14aa
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Htmldocs/release_notes.html
View File

@ -46,6 +46,7 @@
<li>[fix] Improve error message when unable to access OSCAR database.</li>
<li>[fix] Stop skipping the first 40 seconds of ResMed low-rate pressure data.</li>
<li>[fix] Correct Total Time and AHI in CSV Export when non-CPAP devices are used.</li>
<li>[fix] Fix value display and bookmark behavior with clock drift.</li>
</ul>
<p>
<b>Changes and fixes in OSCAR v1.2.0</b>

21
oscar/daily.cpp
View File

@ -1912,17 +1912,18 @@ void Daily::Load(QDate date)
ui->bookmarkTable->blockSignals(true);
// Careful with drift here - apply to the label but not the
// stored data (which will be saved if journal changes occur).
qint64 clockdrift=p_profile->cpap->clockDrift()*1000L,drift;
Day * dday=p_profile->GetDay(previous_date,MT_CPAP);
drift=(dday!=nullptr) ? clockdrift : 0;
bool ok;
for (int i=0;i<start.size();i++) {
qint64 st=start.at(i).toLongLong(&ok)+drift;
qint64 et=end.at(i).toLongLong(&ok)+drift;
qint64 st=start.at(i).toLongLong(&ok);
qint64 et=end.at(i).toLongLong(&ok);
QDateTime d=QDateTime::fromTime_t(st/1000L);
QDateTime d=QDateTime::fromTime_t((st+drift)/1000L);
//int row=ui->bookmarkTable->rowCount();
ui->bookmarkTable->insertRow(i);
QTableWidgetItem *tw=new QTableWidgetItem(notes.at(i));
@ -2335,14 +2336,16 @@ void Daily::on_bookmarkTable_itemClicked(QTableWidgetItem *item)
int row=item->row();
qint64 st,et;
// qint64 clockdrift=p_profile->cpap->clockDrift()*1000L,drift;
// Day * dday=p_profile->GetDay(previous_date,MT_CPAP);
// drift=(dday!=nullptr) ? clockdrift : 0;
qint64 clockdrift=p_profile->cpap->clockDrift()*1000L,drift;
Day * dday=p_profile->GetDay(previous_date,MT_CPAP);
drift=(dday!=nullptr) ? clockdrift : 0;
QTableWidgetItem *it=ui->bookmarkTable->item(row,1);
bool ok;
st=it->data(Qt::UserRole).toLongLong(&ok);
et=it->data(Qt::UserRole+1).toLongLong(&ok);
// Add drift back in (it was removed in addBookmark)
st=it->data(Qt::UserRole).toLongLong(&ok) + drift;
et=it->data(Qt::UserRole+1).toLongLong(&ok) + drift;
qint64 st2=0,et2=0,st3,et3;
Day * day=p_profile->GetGoodDay(previous_date,MT_CPAP);
if (day) {