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

Fix loss of notes and bookmarks when importing or purging data

Browse Source 
OSCAR now calls Unload() for the current day when importing new data
or purging oximetry data.  This will cause any recently changes Notes
to be saved instead of silently discarded.

When purging the current day, OSCAR will now purge only session data
and not any other machine data it finds, which caused Bookmarks (and
probably Oximetry data) to be deleted as well.

Release Notes updated.
This commit is contained in:
Guy Scharf 2020-11-21 11:45:43 -07:00
parent 4276765bf2
commit 77b64c87e8
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Htmldocs/release_notes.html
View File

@ -22,6 +22,8 @@
<li>[fix] Fix crash and other problems when disabling an oximeter session on Daily page when a bookmark was present.</li>
<li>[fix] Fix rare problem of OSCAR crashing with unusual Journal file.</li>
<li>[fix] ResMed loader no longer rejects data from an earlier timezone or DST.</li>
<li>[fix] Newly entered notes no longer lost when importing new day or purging oximetry data.</li>
<li>[fix] Purge currently selected day no longer deletes bookmarks for that day.</li>
</ul>
<p>
<b>Changes and fixes in OSCAR v1.2.0</b>

15
oscar/mainwindow.cpp
View File

@ -748,6 +748,9 @@ int MainWindow::importCPAP(ImportPath import, const QString &message)
void MainWindow::finishCPAPImport()
{
if (daily)
daily->Unload(daily->getDate());
p_profile->StoreMachines();
QList<Machine *> machines = p_profile->GetMachines(MT_CPAP);
for (Machine * mach : machines) {
@ -1810,10 +1813,13 @@ void MainWindow::on_actionPurge_Current_Day_triggered()
QList<Session *> list;
for (s = day->begin(); s != day->end(); ++s) {
list.append(*s);
qDebug() << "Purging session ID:" << (*s)->session() << "["+QDateTime::fromTime_t((*s)->session()).toString()+"]";
qDebug() << "First Time:" << QDateTime::fromMSecsSinceEpoch((*s)->realFirst()).toString();
qDebug() << "Last Time:" << QDateTime::fromMSecsSinceEpoch((*s)->realLast()).toString();
Session *sess = *s;
if (sess->type() == MT_CPAP) {
list.append(*s);
qDebug() << "Purging session ID:" << (*s)->session() << "["+QDateTime::fromTime_t((*s)->session()).toString()+"]";
qDebug() << "First Time:" << QDateTime::fromMSecsSinceEpoch((*s)->realFirst()).toString();
qDebug() << "Last Time:" << QDateTime::fromMSecsSinceEpoch((*s)->realLast()).toString();
}
}
QFile rxcache(p_profile->Get("{" + STR_GEN_DataFolder + "}/RXChanges.cache" ));
@ -2554,6 +2560,7 @@ void MainWindow::on_actionPurgeCurrentDaysOximetry_triggered()
if (daily) {
daily->Unload(date);
daily->clearLastDay(); // otherwise Daily will crash
daily->ReloadGraphs();
}