diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html index 50b92575..b192cf56 100644 --- a/Htmldocs/release_notes.html +++ b/Htmldocs/release_notes.html @@ -10,17 +10,24 @@

Changes and fixes in OSCAR v1.1.0-rc-1

diff --git a/oscar/Resources.qrc b/oscar/Resources.qrc index d76797a0..e0f2d8ba 100644 --- a/oscar/Resources.qrc +++ b/oscar/Resources.qrc @@ -6,9 +6,6 @@ docs/tooltips.css docs/countries.txt docs/tz.txt - docs/release_notes.html - docs/about.html - docs/credits.html docs/schema.xml docs/channels.xml fonts/FreeSans.ttf diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index acca00ac..3fdfdff3 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -272,6 +272,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = { { "400X110", 0, 6, "DreamStation CPAP Pro" }, { "400X150", 0, 6, "DreamStation CPAP Pro" }, { "500X110", 0, 6, "DreamStation Auto CPAP" }, + { "500X120", 0, 6, "DreamStation Auto CPAP" }, { "500X130", 0, 6, "DreamStation Auto CPAP" }, { "500X150", 0, 6, "DreamStation Auto CPAP" }, { "501X120", 0, 6, "DreamStation Auto CPAP with P-Flex" }, @@ -4973,7 +4974,7 @@ bool PRS1DataChunk::ParseSummaryF0V4(void) // That's represented by a mask-off event 19129 seconds after the mask-on, then a time-elapsed // event after 65535 seconds, then an equipment off event after another 616 seconds. tt += data[pos] | (data[pos+1] << 8); - // TODO: see if this event exists in other versions + // TODO: see if this event exists in earlier versions break; case 5: // Clock adjustment? CHECK_VALUE(pos, 1); // Always first @@ -6113,10 +6114,10 @@ bool PRS1DataChunk::ParseSummaryF5V012(void) CHECK_VALUE(chunk_size, 1); // and the only record in the session. if (this->sessionid == 1) UNEXPECTED_VALUE(this->sessionid, ">1"); break; - case 7: // ??? + case 7: // Time Elapsed? tt += data[pos] | (data[pos+1] << 8); // This adds to the total duration (otherwise it won't match report) break; - case 8: // ??? + case 8: // Time Elapsed? How is this different from 7? tt += data[pos] | (data[pos+1] << 8); // This also adds to the total duration (otherwise it won't match report) break; case 9: // Humidifier setting change @@ -7075,6 +7076,9 @@ bool PRS1DataChunk::ParseSummaryF0V6(void) //CHECK_VALUE(data[pos+3], 0); } break; + case 0x09: // Time Elapsed (event 4 in F0V4) + tt += data[pos] | (data[pos+1] << 8); + break; case 0x0a: // Humidifier setting change tt += data[pos] | (data[pos+1] << 8); // This adds to the total duration (otherwise it won't match report) this->ParseHumidifierSettingV3(data[pos+2], data[pos+3]); diff --git a/oscar/aboutdialog.cpp b/oscar/aboutdialog.cpp index 093a7a63..dc713610 100644 --- a/oscar/aboutdialog.cpp +++ b/oscar/aboutdialog.cpp @@ -64,13 +64,13 @@ QString AboutDialog::getFilename(QString name) { QString filename; QString language = AppSetting->language(); + QString docRoot = appResourcePath() + "/Html/"; if (language == "en_US") { - filename = ":docs/"+name+".html"; + filename = docRoot+name+".html"; } else { - QString docRoot = appResourcePath() + "/Html/"; filename = docRoot + name + "-" + language + ".html"; if ( ! QFile::exists(filename) ) - filename = ":docs/"+name+".html"; + filename = docRoot+name+".html"; } qDebug() << "Looking for " + filename; return filename; diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index 53e8a30e..8d4007ea 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -2328,6 +2328,8 @@ void MainWindow::on_actionImport_ZEO_Data_triggered() Notify(tr("Imported %1 ZEO session(s) from\n\n%2").arg(c).arg(filename), tr("Import Success")); qDebug() << "Imported" << c << "ZEO sessions"; PopulatePurgeMenu(); + if (overview) overview->ReloadGraphs(); + if (welcome) welcome->refreshPage(); } else if (c == 0) { Notify(tr("Already up to date with ZEO data at\n\n%1").arg(filename), tr("Up to date")); } else { @@ -2357,6 +2359,8 @@ void MainWindow::on_actionImport_Dreem_Data_triggered() Notify(tr("Imported %1 Dreem session(s) from\n\n%2").arg(c).arg(filename), tr("Import Success")); qDebug() << "Imported" << c << "Dreem sessions"; PopulatePurgeMenu(); + if (overview) overview->ReloadGraphs(); + if (welcome) welcome->refreshPage(); } else if (c == 0) { Notify(tr("Already up to date with Dreem data at\n\n%1").arg(filename), tr("Up to date")); } else { @@ -2451,6 +2455,8 @@ void MainWindow::on_actionImport_Somnopose_Data_triggered() Notify(tr("Somnopause Data Import complete")); PopulatePurgeMenu(); + if (overview) overview->ReloadGraphs(); + if (welcome) welcome->refreshPage(); daily->LoadDate(daily->getDate()); } @@ -2477,6 +2483,8 @@ void MainWindow::on_actionImport_Viatom_Data_triggered() if (c > 0) { Notify(tr("Imported %1 oximetry session(s) from\n\n%2").arg(c).arg(filename), tr("Import Success")); PopulatePurgeMenu(); + if (overview) overview->ReloadGraphs(); + if (welcome) welcome->refreshPage(); } else if (c == 0) { Notify(tr("Already up to date with oximetry data at\n\n%1").arg(filename), tr("Up to date")); } else { diff --git a/oscar/oscar.pro b/oscar/oscar.pro index 24a68f10..a021d135 100644 --- a/oscar/oscar.pro +++ b/oscar/oscar.pro @@ -432,9 +432,6 @@ OTHER_FILES += \ docs/schema.xml \ docs/graphs.xml \ docs/channels.xml \ - docs/release_notes.html \ - docs/about.html \ - docs/credits.html \ docs/startup_tips.txt \ docs/countries.txt \ docs/tz.txt \