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

Merge branch 'master' into translations

Browse Source
This commit is contained in:
ArieKlerk 2020-03-27 08:57:15 +01:00
commit 6bcc0180ae
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -6907,7 +6907,7 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
break;
case 0x40: // new to 400G, also seen on 500X110, alternate tubing type? appears after 0x39 and before 0x3c
CHECK_VALUE(len, 1);
if (data[pos] < 0 || data[pos] > 3) UNEXPECTED_VALUE(data[pos], "0-3"); // 0 = 22mm, 1 = 15mm, 2 = 15HT, 3 = 12mm
if (data[pos] > 3) UNEXPECTED_VALUE(data[pos], "0-3"); // 0 = 22mm, 1 = 15mm, 2 = 15HT, 3 = 12mm
this->ParseTubingTypeV3(data[pos]);
break;
case 0x3c: // View Optional Screens
@ -7467,7 +7467,7 @@ bool PRS1DataChunk::ParseSettingsF5V3(const unsigned char* data, int size)
break;
case 0x3b: // Tubing Type
CHECK_VALUE(len, 1);
if (data[pos] < 0 || data[pos] > 2) UNEXPECTED_VALUE(data[pos], "0-2"); // 15HT = 2, 15 = 1, 22 = 0, though report only says "15" for 15HT
if (data[pos] > 2) UNEXPECTED_VALUE(data[pos], "0-2"); // 15HT = 2, 15 = 1, 22 = 0, though report only says "15" for 15HT
this->ParseTubingTypeV3(data[pos]);
break;
case 0x3c: // View Optional Screens

14
oscar/mainwindow.cpp
View File

@ -135,6 +135,7 @@ void MainWindow::SetupGUI()
ui->action_Preferences->setMenuRole(QAction::PreferencesRole);
#endif
ui->actionPrint_Report->setShortcuts(QKeySequence::Print);
ui->action_Fullscreen->setShortcuts(QKeySequence::FullScreen);
ui->actionLine_Cursor->setChecked(AppSetting->lineCursorMode());
ui->actionPie_Chart->setChecked(AppSetting->showPieChart());
@ -2586,16 +2587,19 @@ void MainWindow::on_actionPurgeCurrentDaysOximetry_triggered()
}
QList<Session *> sessionlist=day->getSessions(MT_OXIMETER);
QSet<Machine *> machines;
for (auto & sess : sessionlist) {
machines += sess->machine();
sess->Destroy();
delete sess;
}
// TODO: Fix this. It deletes the underlying session data file in the machine,
// but not from the machine's summary cache. This results in future launches
// of OSCAR thinking the day has oximetry data, but then it isn't really there.
// Currently this is only useful for reimporting a single day, which the purge
// permits, and which in turn creates a new data file for that day.
// We have to update the summary cache for the affected machine(s),
// otherwise OSCAR will still think this day has oximetry data at next launch.
for (auto & mach : machines) {
mach->SaveSummaryCache();
}
if (daily) {

4
oscar/mainwindow.ui
View File

@ -2887,7 +2887,7 @@ p, li { white-space: pre-wrap; }
<property name="title">
<string>&amp;Advanced</string>
</property>
<widget class="QMenu" name="menuPurge_Oximetery_Data">
<widget class="QMenu" name="menuPurge_Oximetry_Data">
<property name="title">
<string>Purge Oximetry Data</string>
</property>
@ -2901,7 +2901,7 @@ p, li { white-space: pre-wrap; }
<addaction name="actionPurge_Current_Day"/>
<addaction name="menuPurge_CPAP_Data"/>
<addaction name="separator"/>
<addaction name="menuPurge_Oximetery_Data"/>
<addaction name="menuPurge_Oximetry_Data"/>
</widget>
<widget class="QMenu" name="menu_Rebuild_CPAP_Data">
<property name="title">