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

Show revision in mainwindow titlebar, remove accidental conditional PRS1 F3 check

Browse Source
This commit is contained in:
Mark Watkins 2016-01-24 07:18:32 +10:00
parent c322e1f21c
commit db594af8e6
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -1114,7 +1114,8 @@ bool PRS1Import::ParseF0Events()
int size = event->m_data.size(); int size = event->m_data.size();
if (event->fileVersion == 3) size -= 2; bool FV3 = (event->fileVersion == 3);
if (FV3) size -= 2;
unsigned char * buffer = (unsigned char *)event->m_data.data(); unsigned char * buffer = (unsigned char *)event->m_data.data();
CPAPMode mode = (CPAPMode) session->settings[CPAP_Mode].toInt(); CPAPMode mode = (CPAPMode) session->settings[CPAP_Mode].toInt();
@ -1150,7 +1151,6 @@ bool PRS1Import::ParseF0Events()
case 0x00: // Unknown 00 case 0x00: // Unknown 00
if (event->family == 3)
if (!Code[0]) { if (!Code[0]) {
if (!(Code[0] = session->AddEventList(PRS1_00, EVL_Event))) { return false; } if (!(Code[0] = session->AddEventList(PRS1_00, EVL_Event))) { return false; }
} }
@ -1208,7 +1208,7 @@ bool PRS1Import::ParseF0Events()
break; break;
case 0x03: // BIPAP Pressure case 0x03: // BIPAP Pressure
if (event->fileVersion == 3) { if (FV3) {
if (!PRESSURE) { if (!PRESSURE) {
PRESSURE = session->AddEventList(CPAP_Pressure, EVL_Event, 0.1F); PRESSURE = session->AddEventList(CPAP_Pressure, EVL_Event, 0.1F);

8
sleepyhead/mainwindow.cpp
View File

@ -143,16 +143,12 @@ MainWindow::MainWindow(QWidget *parent) :
connect(logger, SIGNAL(outputLog(QString)), this, SLOT(logMessage(QString))); connect(logger, SIGNAL(outputLog(QString)), this, SLOT(logMessage(QString)));
} }
QString version = VersionString; QString version = VersionString + "-" + QString(GIT_REVISION) + "-" + getGraphicsEngine();
#ifdef TEST_BUILD #ifndef TEST_BUILD
version += QString(STR_TestBuild);
#else
ui->warningLabel->hide(); ui->warningLabel->hide();
#endif #endif
version += " "+getGraphicsEngine();
if (QString(GIT_BRANCH) != "master") { version += " [" + QString(GIT_BRANCH)+" branch]"; } if (QString(GIT_BRANCH) != "master") { version += " [" + QString(GIT_BRANCH)+" branch]"; }