diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp index c9de3e9b..3465849c 100644 --- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp @@ -3196,136 +3196,47 @@ void ResInitModelMap() resmed_codes.clear(); // BRP file - resmed_codes[CPAP_FlowRate].push_back("Flow"); - resmed_codes[CPAP_FlowRate].push_back("Flow.40ms"); - resmed_codes[CPAP_MaskPressureHi].push_back("Mask Pres"); - resmed_codes[CPAP_MaskPressureHi].push_back("Press.40ms"); - + resmed_codes[CPAP_FlowRate] = QStringList{ "Flow", "Flow.40ms" }; + resmed_codes[CPAP_MaskPressureHi] = QStringList{ "Mask Pres", "Press.40ms" }; // PLD File - resmed_codes[CPAP_MaskPressure].push_back("Mask Pres"); + resmed_codes[CPAP_MaskPressure] = QStringList { "Mask Pres", "MaskPress.2s" }; + resmed_codes[CPAP_RespEvent] = QStringList {"Resp Event" }; + resmed_codes[CPAP_Pressure] = QStringList { "Therapy Pres", "Press.2s" }; // Un problemo... IPAP also uses Press.2s.. check the mode :/ + resmed_codes[CPAP_IPAP] = QStringList { "Insp Pres", "IPAP", "S.BL.IPAP" }; + resmed_codes[CPAP_EPAP] = QStringList { "Exp Pres", "EprPress.2s", "EPAP", "S.BL.EPAP", "EPRPress.2s" }; + resmed_codes[CPAP_EPAPHi] = QStringList { "Max EPAP" }; + resmed_codes[CPAP_EPAPLo] = QStringList { "Min EPAP", "S.VA.MinEPAP" }; + resmed_codes[CPAP_IPAPHi] = QStringList { "Max IPAP", "S.VA.MaxIPAP" }; + resmed_codes[CPAP_IPAPLo] = QStringList { "Min IPAP" }; + resmed_codes[CPAP_PS] = QStringList { "PS", "S.VA.PS" }; + resmed_codes[CPAP_PSMin] = QStringList { "Min PS" }; + resmed_codes[CPAP_PSMax] = QStringList { "Max PS" }; + resmed_codes[CPAP_Leak] = QStringList { "Leak", "Leck", "Fuites", "Fuite", "Fuga", "\xE6\xBC\x8F\xE6\xB0\x94", "Lekk", "Läck","Läck", "Leak.2s" }; + resmed_codes[CPAP_RespRate] = QStringList { "RR", "AF", "FR", "RespRate.2s" }; + resmed_codes[CPAP_MinuteVent] = QStringList { "MV", "VM", "MinVent.2s" }; + resmed_codes[CPAP_TidalVolume] = QStringList { "Vt", "VC", "TidVol.2s" }; + resmed_codes[CPAP_IE] = QStringList { "I:E", "IERatio.2s" }; + resmed_codes[CPAP_Snore] = QStringList { "Snore", "Snore.2s" }; + resmed_codes[CPAP_FLG] = QStringList { "FFL Index", "FlowLim.2s" }; + resmed_codes[CPAP_Ti] = QStringList { "Ti", "B5ITime.2s" }; + resmed_codes[CPAP_Te] = QStringList { "Te", "B5ETime.2s" }; + resmed_codes[CPAP_TgMV] = QStringList { "TgMV", "TgtVent.2s" }; + resmed_codes[OXI_Pulse] = QStringList { "Pulse", "Puls", "Pouls", "Pols", "Pulse.1s" }; + resmed_codes[OXI_SPO2] = QStringList { "SpO2", "SpO2.1s" }; + resmed_codes[CPAP_Obstructive] = QStringList { "Obstructive apnea" }; + resmed_codes[CPAP_Hypopnea] = QStringList { "Hypopnea" }; + resmed_codes[CPAP_Apnea] = QStringList { "Apnea" }; + resmed_codes[CPAP_RERA] = QStringList { "Arousal" }; + resmed_codes[CPAP_ClearAirway] = QStringList { "Central apnea" }; + resmed_codes[CPAP_Mode] = QStringList { "Mode", "Modus", "Funktion", "\xE6\xA8\xA1\xE5\xBC\x8F" }; + resmed_codes[RMS9_SetPressure] = QStringList { "Set Pressure", "Eingest. Druck", "Ingestelde druk", "\xE8\xAE\xBE\xE5\xAE\x9A\xE5\x8E\x8B\xE5\x8A\x9B", "Pres. prescrite", "Inställt tryck", "Inställt tryck", "S.C.Press" }; + resmed_codes[RMS9_EPR] = QStringList { "EPR", "\xE5\x91\xBC\xE6\xB0\x94\xE9\x87\x8A\xE5\x8E\x8B\x28\x45\x50" }; + resmed_codes[RMS9_EPRLevel] = QStringList { "EPR Level", "EPR-Stufe", "EPR-niveau", "\x45\x50\x52\x20\xE6\xB0\xB4\xE5\xB9\xB3", "Niveau EPR", "EPR-nivå", "EPR-nivÃ¥", "S.EPR.Level" }; + resmed_codes[CPAP_PressureMax] = QStringList { "Max Pressure", "Max. Druck", "Max druk", "\xE6\x9C\x80\xE5\xA4\xA7\xE5\x8E\x8B\xE5\x8A\x9B", "Pression max.", "Max tryck", "S.AS.MaxPress" }; + resmed_codes[CPAP_PressureMin] = QStringList { "Min Pressure", "Min. Druck", "Min druk", "\xE6\x9C\x80\xE5\xB0\x8F\xE5\x8E\x8B\xE5\x8A\x9B", "Pression min.", "Min tryck", "S.AS.MinPress" }; - - resmed_codes[CPAP_RespEvent].push_back("Resp Event"); - resmed_codes[CPAP_Pressure].push_back("Therapy Pres"); - resmed_codes[CPAP_IPAP].push_back("Insp Pres"); - resmed_codes[CPAP_IPAP].push_back("IPAP"); - resmed_codes[CPAP_IPAP].push_back("S.BL.IPAP"); - resmed_codes[CPAP_EPAP].push_back("Exp Pres"); - resmed_codes[CPAP_EPAP].push_back("EprPress.2s"); - resmed_codes[CPAP_EPAP].push_back("EPAP"); - resmed_codes[CPAP_EPAP].push_back("S.BL.EPAP"); - resmed_codes[CPAP_EPAPHi].push_back("Max EPAP"); - resmed_codes[CPAP_EPAPLo].push_back("Min EPAP"); - resmed_codes[CPAP_EPAPLo].push_back("S.VA.MinEPAP"); - resmed_codes[CPAP_IPAPHi].push_back("Max IPAP"); - resmed_codes[CPAP_IPAPHi].push_back("S.VA.MaxIPAP"); - resmed_codes[CPAP_IPAPLo].push_back("Min IPAP"); - - resmed_codes[CPAP_PS].push_back("PS"); - resmed_codes[CPAP_PS].push_back("S.VA.PS"); - resmed_codes[CPAP_PSMin].push_back("Min PS"); - resmed_codes[CPAP_PSMax].push_back("Max PS"); - - resmed_codes[CPAP_Leak].push_back("Leak"); // Leak Leck Lekk Läck Fuites - resmed_codes[CPAP_Leak].push_back("Leck"); - resmed_codes[CPAP_Leak].push_back("Fuites"); - resmed_codes[CPAP_Leak].push_back("Fuite"); - resmed_codes[CPAP_Leak].push_back("Fuga"); - - resmed_codes[CPAP_Leak].push_back("\xE6\xBC\x8F\xE6\xB0\x94"); - resmed_codes[CPAP_Leak].push_back("Lekk"); - resmed_codes[CPAP_Leak].push_back("Läck"); - resmed_codes[CPAP_Leak].push_back("Läck"); - resmed_codes[CPAP_RespRate].push_back("RR"); - resmed_codes[CPAP_RespRate].push_back("AF"); - resmed_codes[CPAP_RespRate].push_back("FR"); - resmed_codes[CPAP_MinuteVent].push_back("MV"); - resmed_codes[CPAP_MinuteVent].push_back("VM"); - resmed_codes[CPAP_TidalVolume].push_back("Vt"); - resmed_codes[CPAP_TidalVolume].push_back("VC"); - resmed_codes[CPAP_IE].push_back("I:E"); - resmed_codes[CPAP_IE].push_back("IERatio.2s"); - resmed_codes[CPAP_Snore].push_back("Snore"); - resmed_codes[CPAP_FLG].push_back("FFL Index"); - resmed_codes[CPAP_Ti].push_back("Ti"); - resmed_codes[CPAP_Ti].push_back("B5ITime.2s"); - resmed_codes[CPAP_Te].push_back("Te"); - resmed_codes[CPAP_Te].push_back("B5ETime.2s"); - - resmed_codes[CPAP_TgMV].push_back("TgMV"); - resmed_codes[CPAP_TgMV].push_back("TgtVent.2s"); - resmed_codes[OXI_Pulse].push_back("Pulse"); - resmed_codes[OXI_Pulse].push_back("Puls"); - resmed_codes[OXI_Pulse].push_back("Pouls"); - resmed_codes[OXI_Pulse].push_back("Pols"); - resmed_codes[OXI_SPO2].push_back("SpO2"); - resmed_codes[CPAP_Obstructive].push_back("Obstructive apnea"); - resmed_codes[CPAP_Hypopnea].push_back("Hypopnea"); - resmed_codes[CPAP_Apnea].push_back("Apnea"); - resmed_codes[CPAP_RERA].push_back("Arousal"); - resmed_codes[CPAP_ClearAirway].push_back("Central apnea"); - resmed_codes[CPAP_Mode].push_back("Mode"); - resmed_codes[CPAP_Mode].push_back("Modus"); - resmed_codes[CPAP_Mode].push_back("Funktion"); - resmed_codes[CPAP_Mode].push_back("\xE6\xA8\xA1\xE5\xBC\x8F"); // Chinese - - resmed_codes[RMS9_SetPressure].push_back("Set Pressure"); - resmed_codes[RMS9_SetPressure].push_back("Eingest. Druck"); - resmed_codes[RMS9_SetPressure].push_back("Ingestelde druk"); - resmed_codes[RMS9_SetPressure].push_back("\xE8\xAE\xBE\xE5\xAE\x9A\xE5\x8E\x8B\xE5\x8A\x9B"); // Chinese - resmed_codes[RMS9_SetPressure].push_back("Pres. prescrite"); - resmed_codes[RMS9_SetPressure].push_back("Inställt tryck"); - resmed_codes[RMS9_SetPressure].push_back("Inställt tryck"); - - resmed_codes[RMS9_EPR].push_back("EPR"); //resmed_codes[RMS9_EPR].push_back("S.EPR.EPRType"); - - resmed_codes[RMS9_EPR].push_back("\xE5\x91\xBC\xE6\xB0\x94\xE9\x87\x8A\xE5\x8E\x8B\x28\x45\x50"); // Chinese - resmed_codes[RMS9_EPRLevel].push_back("EPR Level"); - resmed_codes[RMS9_EPRLevel].push_back("EPR-Stufe"); - resmed_codes[RMS9_EPRLevel].push_back("EPR-niveau"); - resmed_codes[RMS9_EPRLevel].push_back("\x45\x50\x52\x20\xE6\xB0\xB4\xE5\xB9\xB3"); // Chinese - - resmed_codes[RMS9_EPRLevel].push_back("Niveau EPR"); - resmed_codes[RMS9_EPRLevel].push_back("EPR-nivå"); - resmed_codes[RMS9_EPRLevel].push_back("EPR-nivÃ¥"); - resmed_codes[CPAP_PressureMax].push_back("Max Pressure"); - resmed_codes[CPAP_PressureMax].push_back("Max. Druck"); - resmed_codes[CPAP_PressureMax].push_back("Max druk"); - - resmed_codes[CPAP_PressureMax].push_back("\xE6\x9C\x80\xE5\xA4\xA7\xE5\x8E\x8B\xE5\x8A\x9B"); // Chinese - resmed_codes[CPAP_PressureMax].push_back("Pression max."); - resmed_codes[CPAP_PressureMax].push_back("Max tryck"); - resmed_codes[CPAP_PressureMin].push_back("Min Pressure"); - resmed_codes[CPAP_PressureMin].push_back("Min. Druck"); - resmed_codes[CPAP_PressureMin].push_back("Min druk"); - resmed_codes[CPAP_PressureMin].push_back("\xE6\x9C\x80\xE5\xB0\x8F\xE5\x8E\x8B\xE5\x8A\x9B"); // Chinese - resmed_codes[CPAP_PressureMin].push_back("Pression min."); - resmed_codes[CPAP_PressureMin].push_back("Min tryck"); - - // SAD file - resmed_codes[OXI_Pulse].push_back("Pulse.1s"); - resmed_codes[OXI_SPO2].push_back("SpO2.1s"); - - // PLD file - resmed_codes[CPAP_MaskPressure].push_back("MaskPress.2s"); - resmed_codes[CPAP_Pressure].push_back("Press.2s"); // Un problemo... IPAP also uses this.. :/ - resmed_codes[CPAP_EPAP].push_back("EPRPress.2s"); - resmed_codes[CPAP_Leak].push_back("Leak.2s"); - resmed_codes[CPAP_RespRate].push_back("RespRate.2s"); - resmed_codes[CPAP_TidalVolume].push_back("TidVol.2s"); - resmed_codes[CPAP_MinuteVent].push_back("MinVent.2s"); - resmed_codes[CPAP_Snore].push_back("Snore.2s"); - resmed_codes[CPAP_FLG].push_back("FlowLim.2s"); - - //S.AS.StartPress - resmed_codes[CPAP_PressureMin].push_back("S.AS.MinPress"); - resmed_codes[CPAP_PressureMax].push_back("S.AS.MaxPress"); - - resmed_codes[RMS9_SetPressure].push_back("S.C.Press"); - - resmed_codes[RMS9_EPRLevel].push_back("S.EPR.Level"); } ChannelID ResmedLoader::CPAPModeChannel() { return RMS9_Mode; } diff --git a/sleepyhead/SleepLib/machine.cpp b/sleepyhead/SleepLib/machine.cpp index 84f316f6..a437e4d9 100644 --- a/sleepyhead/SleepLib/machine.cpp +++ b/sleepyhead/SleepLib/machine.cpp @@ -507,7 +507,7 @@ bool Machine::Purge(int secret) ext_s.toInt(&ok, 10); if (ok) { - qDebug() << "Deleting " << QDir::toNativeSeparators(fullpath); + qDebug() << "Deleting " << fullpath; if (!dir.remove(fullpath)) { qDebug() << "Could not purge file" << fullpath; //success=false; @@ -598,7 +598,7 @@ bool Machine::Load(ProgressDialog *progress) QString path = getDataPath(); QDir dir(path); - qDebug() << "Loading Database" << QDir::toNativeSeparators(path); + qDebug() << "Loading" << info.loadername.toLocal8Bit().data() << "record:" << path.toLocal8Bit().data(); if (!dir.exists() || !dir.isReadable()) { return false; @@ -712,7 +712,7 @@ bool Machine::Load(ProgressDialog *progress) } SaveSummaryCache(); - qDebug() << "Loaded" << info.model << "data in" << time.elapsed() << "ms"; + qDebug() << "Loaded" << info.model.toLocal8Bit().data() << "data in" << time.elapsed() << "ms"; progress->setProgressValue(size); } progress->setMessage("Loading Session Info"); @@ -950,13 +950,11 @@ bool Machine::LoadSummary(ProgressDialog * progress) { QTime time; time.start(); - qDebug() << "Loading Summaries"; - QString filename = getDataPath() + summaryFileName + ".gz"; QDomDocument doc; QFile file(filename); - qDebug() << "Opening " << filename; + qDebug() << "Loading" << filename.toLocal8Bit().data(); progress->setMessage(QObject::tr("Loading Summaries.xml.gz")); QApplication::processEvents(); @@ -1095,7 +1093,7 @@ bool Machine::LoadSummary(ProgressDialog * progress) progress->setProgressValue(sess_order.size()); QApplication::processEvents(); - qDebug() << "Loaded" << info.series << info.model << "data in" << time.elapsed() << "ms"; + qDebug() << "Loaded" << info.series.toLocal8Bit().data() << info.model.toLocal8Bit().data() << "data in" << time.elapsed() << "ms"; return true; } diff --git a/sleepyhead/SleepLib/preferences.cpp b/sleepyhead/SleepLib/preferences.cpp index 8aeca440..cc15731f 100644 --- a/sleepyhead/SleepLib/preferences.cpp +++ b/sleepyhead/SleepLib/preferences.cpp @@ -180,10 +180,10 @@ bool Preferences::Open(QString filename) QDomDocument doc(p_name); QFile file(p_filename); - qDebug() << "Reading " << QDir::toNativeSeparators(p_filename); + qDebug() << "Reading " << p_filename.toLocal8Bit().data(); if (!file.open(QIODevice::ReadOnly)) { - qWarning() << "Could not open" << QDir::toNativeSeparators(p_filename); + qWarning() << "Could not open" << p_filename.toLocal8Bit().data(); return false; } @@ -191,7 +191,7 @@ bool Preferences::Open(QString filename) int errorLine; int errorColumn; if (!doc.setContent(&file,false, &errorMsg, &errorLine, &errorColumn)) { - qWarning() << "Invalid XML Content in" << QDir::toNativeSeparators(p_filename); + qWarning() << "Invalid XML Content in" << p_filename.toLocal8Bit().data(); qWarning() << "Error:" << errorMsg << "in line" << errorLine << ":" << errorColumn; return false; } diff --git a/sleepyhead/SleepLib/profiles.cpp b/sleepyhead/SleepLib/profiles.cpp index a5017b99..f6c5b0c8 100644 --- a/sleepyhead/SleepLib/profiles.cpp +++ b/sleepyhead/SleepLib/profiles.cpp @@ -151,13 +151,13 @@ bool Profile::OpenMachines() QString filename = p_path+"machines.xml"; QFile file(filename); if (!file.open(QFile::ReadOnly)) { - qWarning() << "Could not open" << QDir::toNativeSeparators(filename); + qWarning() << "Could not open" << filename.toLocal8Bit().data(); return false; } QDomDocument doc("machines.xml"); if (!doc.setContent(&file)) { - qWarning() << "Invalid XML Content in" << QDir::toNativeSeparators(filename); + qWarning() << "Invalid XML Content in" << filename.toLocal8Bit().data(); return false; } file.close(); @@ -698,7 +698,7 @@ Machine * Profile::CreateMachine(MachineInfo info, MachineID id) m->setInfo(info); - qDebug() << "Added" << info.loadername << "Machine Record" << (info.serial.isEmpty() ? m->hexid() : info.serial); + // qDebug() << "Reading" << info.loadername << "Machine Record" << (info.serial.isEmpty() ? m->hexid() : info.serial); MachineList[info.loadername][info.serial] = m; AddMachine(m); diff --git a/sleepyhead/SleepLib/schema.cpp b/sleepyhead/SleepLib/schema.cpp index f5a0cc5b..3c9e61fe 100644 --- a/sleepyhead/SleepLib/schema.cpp +++ b/sleepyhead/SleepLib/schema.cpp @@ -40,8 +40,6 @@ QColor adjustcolor(QColor color, float ar=1.0, float ag=1.0, float ab=1.0) QColor darken(QColor color, float p); - - namespace schema { void resetChannels(); @@ -120,348 +118,168 @@ void init() // Group ChannelID Code Type Scope Lookup Code Translable Name Description Shortened Name Units String FieldType Default Color // Pressure Related Settings - schema::channel.add(GRP_CPAP, new Channel(CPAP_Pressure = 0x110C, WAVEFORM, MT_CPAP, SESSION, "Pressure", - STR_TR_Pressure, QObject::tr("Therapy Pressure"), STR_TR_Pressure, - STR_UNIT_CMH2O, DEFAULT, QColor("red"))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_IPAP = 0x110D, WAVEFORM, MT_CPAP, SESSION, "IPAP", - STR_TR_IPAP, QObject::tr("Inspiratory Pressure"), STR_TR_IPAP, - STR_UNIT_CMH2O, DEFAULT, QColor("red"))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_IPAPLo = 0x1110, WAVEFORM, MT_CPAP, SESSION, "IPAPLo", - STR_TR_IPAPLo, QObject::tr("Lower Inspiratory Pressure"), STR_TR_IPAPLo, - STR_UNIT_CMH2O, DEFAULT, QColor("orange"))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_IPAPHi = 0x1111, WAVEFORM, MT_CPAP, SESSION, "IPAPHi", - STR_TR_IPAPHi, QObject::tr("Higher Inspiratory Pressure"), STR_TR_IPAPHi, - STR_UNIT_CMH2O, DEFAULT, QColor("orange"))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_EPAP = 0x110E, WAVEFORM, MT_CPAP, SESSION, "EPAP", - STR_TR_EPAP, QObject::tr("Expiratory Pressure"), STR_TR_EPAP, - STR_UNIT_CMH2O, DEFAULT, QColor("green"))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_EPAPLo = 0x111C, WAVEFORM, MT_CPAP, SESSION, "EPAPLo", - STR_TR_EPAPLo, QObject::tr("Lower Expiratory Pressure"), STR_TR_EPAPLo, - STR_UNIT_CMH2O, DEFAULT, QColor("light blue"))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_EPAPHi = 0x111D, WAVEFORM, MT_CPAP, SESSION, "EPAPHi", - STR_TR_EPAPHi, QObject::tr("Higher Expiratory Pressure"), STR_TR_EPAPHi, - STR_UNIT_CMH2O, DEFAULT, QColor("aqua"))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_PS = 0x110F, WAVEFORM, MT_CPAP, SESSION, "PS", - STR_TR_PS, QObject::tr("Pressure Support"), STR_TR_PS, - STR_UNIT_CMH2O, DEFAULT, QColor("grey"))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_PSMin = 0x111A, SETTING, MT_CPAP, SESSION, "PSMin", - QObject::tr("PS Min") , QObject::tr("Pressure Support Minimum"), - QObject::tr("PS Min"), STR_UNIT_CMH2O, DEFAULT, QColor("dark cyan"))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_PSMax = 0x111B, SETTING, MT_CPAP, SESSION, "PSMax", - QObject::tr("PS Max"), QObject::tr("Pressure Support Maximum"), - QObject::tr("PS Max"), STR_UNIT_CMH2O, DEFAULT, QColor("dark magenta"))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_PressureMin = 0x1020, SETTING, MT_CPAP, SESSION, - "PressureMin", QObject::tr("Min Pressure") , QObject::tr("Minimum Therapy Pressure"), - QObject::tr("Pressure Min"), STR_UNIT_CMH2O, DEFAULT, QColor("orange"))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_PressureMax = 0x1021, SETTING, MT_CPAP, SESSION, - "PressureMax", QObject::tr("Max Pressure"), QObject::tr("Maximum Therapy Pressure"), - QObject::tr("Pressure Max"), STR_UNIT_CMH2O, DEFAULT, QColor("light blue"))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_RampTime = 0x1022, SETTING, MT_CPAP, SESSION, - "RampTime", QObject::tr("Ramp Time") , QObject::tr("Ramp Delay Period"), - QObject::tr("Ramp Time"), STR_UNIT_Minutes, DEFAULT, QColor("black"))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_RampPressure = 0x1023, SETTING, MT_CPAP, SESSION, - "RampPressure", QObject::tr("Ramp Pressure"), QObject::tr("Starting Ramp Pressure"), - QObject::tr("Ramp Pressure"), STR_UNIT_CMH2O, DEFAULT, QColor("black"))); - - - schema::channel.add(GRP_CPAP, new Channel(CPAP_Ramp = 0x1027, SPAN, MT_CPAP, SESSION, - "Ramp", QObject::tr("Ramp Event") , QObject::tr("Ramp Event"), - QObject::tr("Ramp"), STR_UNIT_EventsPerHour, DEFAULT, QColor("light blue"))); - - + schema::channel.add(GRP_CPAP, new Channel(CPAP_Pressure = 0x110C, WAVEFORM, MT_CPAP, SESSION, "Pressure", STR_TR_Pressure, QObject::tr("Therapy Pressure"), STR_TR_Pressure, STR_UNIT_CMH2O, DEFAULT, QColor("red"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_IPAP = 0x110D, WAVEFORM, MT_CPAP, SESSION, "IPAP", STR_TR_IPAP, QObject::tr("Inspiratory Pressure"), STR_TR_IPAP, STR_UNIT_CMH2O, DEFAULT, QColor("red"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_IPAPLo = 0x1110, WAVEFORM, MT_CPAP, SESSION, "IPAPLo", STR_TR_IPAPLo, QObject::tr("Lower Inspiratory Pressure"), STR_TR_IPAPLo, STR_UNIT_CMH2O, DEFAULT, QColor("orange"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_IPAPHi = 0x1111, WAVEFORM, MT_CPAP, SESSION, "IPAPHi", STR_TR_IPAPHi, QObject::tr("Higher Inspiratory Pressure"), STR_TR_IPAPHi, STR_UNIT_CMH2O, DEFAULT, QColor("orange"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_EPAP = 0x110E, WAVEFORM, MT_CPAP, SESSION, "EPAP", STR_TR_EPAP, QObject::tr("Expiratory Pressure"), STR_TR_EPAP, STR_UNIT_CMH2O, DEFAULT, QColor("green"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_EPAPLo = 0x111C, WAVEFORM, MT_CPAP, SESSION, "EPAPLo", STR_TR_EPAPLo, QObject::tr("Lower Expiratory Pressure"), STR_TR_EPAPLo, STR_UNIT_CMH2O, DEFAULT, QColor("light blue"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_EPAPHi = 0x111D, WAVEFORM, MT_CPAP, SESSION, "EPAPHi", STR_TR_EPAPHi, QObject::tr("Higher Expiratory Pressure"), STR_TR_EPAPHi, STR_UNIT_CMH2O, DEFAULT, QColor("aqua"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_PS = 0x110F, WAVEFORM, MT_CPAP, SESSION, "PS", STR_TR_PS, QObject::tr("Pressure Support"), STR_TR_PS, STR_UNIT_CMH2O, DEFAULT, QColor("grey"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_PSMin = 0x111A, SETTING, MT_CPAP, SESSION, "PSMin", QObject::tr("PS Min") , QObject::tr("Pressure Support Minimum"), QObject::tr("PS Min"), STR_UNIT_CMH2O, DEFAULT, QColor("dark cyan"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_PSMax = 0x111B, SETTING, MT_CPAP, SESSION, "PSMax", QObject::tr("PS Max"), QObject::tr("Pressure Support Maximum"), QObject::tr("PS Max"), STR_UNIT_CMH2O, DEFAULT, QColor("dark magenta"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_PressureMin = 0x1020, SETTING, MT_CPAP, SESSION, "PressureMin", QObject::tr("Min Pressure"), QObject::tr("Minimum Therapy Pressure"), QObject::tr("Pressure Min"), STR_UNIT_CMH2O, DEFAULT, QColor("orange"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_PressureMax = 0x1021, SETTING, MT_CPAP, SESSION, "PressureMax", QObject::tr("Max Pressure"), QObject::tr("Maximum Therapy Pressure"), QObject::tr("Pressure Max"), STR_UNIT_CMH2O, DEFAULT, QColor("light blue"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_RampTime = 0x1022, SETTING, MT_CPAP, SESSION, "RampTime", QObject::tr("Ramp Time") , QObject::tr("Ramp Delay Period"), QObject::tr("Ramp Time"), STR_UNIT_Minutes, DEFAULT, QColor("black"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_RampPressure = 0x1023, SETTING, MT_CPAP, SESSION, "RampPressure", QObject::tr("Ramp Pressure"), QObject::tr("Starting Ramp Pressure"), QObject::tr("Ramp Pressure"),STR_UNIT_CMH2O, DEFAULT, QColor("black"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_Ramp = 0x1027, SPAN, MT_CPAP, SESSION, "Ramp", QObject::tr("Ramp Event") , QObject::tr("Ramp Event"), QObject::tr("Ramp"), STR_UNIT_EventsPerHour,DEFAULT, QColor("light blue"))); // Flags - schema::channel.add(GRP_CPAP, new Channel(CPAP_CSR = 0x1000, SPAN, MT_CPAP, SESSION, "CSR", - QObject::tr("Cheyne Stokes Respiration"), - QObject::tr("An abnormal period of Cheyne Stokes Respiration"), - QObject::tr("CSR"), STR_UNIT_Percentage, DEFAULT, COLOR_CSR)); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_PB = 0x1028, SPAN, MT_CPAP, SESSION, "PB", - QObject::tr("Periodic Breathing"), - QObject::tr("An abnormal period of Periodic Breathing"), - QObject::tr("PB"), STR_UNIT_Percentage, DEFAULT, COLOR_CSR)); - - - schema::channel.add(GRP_CPAP, new Channel(CPAP_ClearAirway = 0x1001, FLAG, MT_CPAP, SESSION, - "ClearAirway", QObject::tr("Clear Airway"), - QObject::tr("An apnea where the airway is open"), - QObject::tr("CA"), STR_UNIT_EventsPerHour, DEFAULT, QColor("purple"))); - - - schema::channel.add(GRP_CPAP, new Channel(CPAP_Obstructive = 0x1002, FLAG, MT_CPAP, SESSION, - "Obstructive", QObject::tr("Obstructive"), - QObject::tr("An apnea caused by airway obstruction"), - QObject::tr("OA"), STR_UNIT_EventsPerHour, DEFAULT, QColor("#40c0ff"))); - - - schema::channel.add(GRP_CPAP, new Channel(CPAP_Hypopnea = 0x1003, FLAG, MT_CPAP, SESSION, - "Hypopnea", QObject::tr("Hypopnea"), - QObject::tr("A partially obstructed airway"), - QObject::tr("H"), STR_UNIT_EventsPerHour, DEFAULT, QColor("blue"))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_Apnea = 0x1004, FLAG, MT_CPAP, SESSION, "Apnea", - QObject::tr("Unclassified Apnea"), - QObject::tr("an apnea that couldn't be determined as Central or Obstructive, due to excessive leakage interfering with the classification process."), - QObject::tr("UA"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark green"))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_FlowLimit = 0x1005, FLAG, MT_CPAP, SESSION, - "FlowLimit", QObject::tr("Flow Limitation"), - QObject::tr("An restriction in breathing from normal, causing a flattening of the flow waveform."), - QObject::tr("FL"), STR_UNIT_EventsPerHour, DEFAULT, QColor("#404040"))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_RERA = 0x1006, FLAG, MT_CPAP, SESSION, "RERA", - QObject::tr("RERA"), - QObject::tr("Respiratory Effort Related Arousal: An restriction in breathing that causes an either an awakening or sleep disturbance."), - QObject::tr("RE"), STR_UNIT_EventsPerHour, DEFAULT, COLOR_Gold)); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_VSnore = 0x1007, FLAG, MT_CPAP, SESSION, "VSnore", - QObject::tr("Vibratory Snore"), QObject::tr("A vibratory snore"), - QObject::tr("VS"), STR_UNIT_EventsPerHour, DEFAULT, QColor("red"))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_VSnore2 = 0x1008, FLAG, MT_CPAP, SESSION, "VSnore2", - QObject::tr("Vibratory Snore (VS2) "), - QObject::tr("A vibratory snore as detcted by a System One machine"), - QObject::tr("VS2"), STR_UNIT_EventsPerHour, DEFAULT, QColor("red"))); - + schema::channel.add(GRP_CPAP, new Channel(CPAP_CSR = 0x1000, SPAN, MT_CPAP, SESSION, "CSR", + QObject::tr("Cheyne Stokes Respiration"), QObject::tr("An abnormal period of Cheyne Stokes Respiration"), QObject::tr("CSR"), STR_UNIT_Percentage,DEFAULT, COLOR_CSR)); + schema::channel.add(GRP_CPAP, new Channel(CPAP_PB = 0x1028, SPAN, MT_CPAP, SESSION, "PB", + QObject::tr("Periodic Breathing"),QObject::tr("An abnormal period of Periodic Breathing"), QObject::tr("PB"),STR_UNIT_Percentage, DEFAULT, COLOR_CSR)); + schema::channel.add(GRP_CPAP, new Channel(CPAP_ClearAirway = 0x1001, FLAG, MT_CPAP, SESSION, "ClearAirway", + QObject::tr("Clear Airway"), QObject::tr("An apnea where the airway is open"), QObject::tr("CA"), STR_UNIT_EventsPerHour, DEFAULT, QColor("purple"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_Obstructive = 0x1002, FLAG, MT_CPAP, SESSION, "Obstructive", + QObject::tr("Obstructive"), QObject::tr("An apnea caused by airway obstruction"), QObject::tr("OA"), STR_UNIT_EventsPerHour, DEFAULT, QColor("#40c0ff"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_Hypopnea = 0x1003, FLAG, MT_CPAP, SESSION, "Hypopnea", + QObject::tr("Hypopnea"), QObject::tr("A partially obstructed airway"), QObject::tr("H"), STR_UNIT_EventsPerHour, DEFAULT, QColor("blue"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_Apnea = 0x1004, FLAG, MT_CPAP, SESSION, "Apnea", + QObject::tr("Unclassified Apnea"), QObject::tr("an apnea that couldn't be determined as Central or Obstructive, due to excessive leakage interfering with the classification process."),QObject::tr("UA"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark green"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_FlowLimit = 0x1005, FLAG, MT_CPAP, SESSION, "FlowLimit", + QObject::tr("Flow Limitation"), QObject::tr("An restriction in breathing from normal, causing a flattening of the flow waveform."), QObject::tr("FL"), STR_UNIT_EventsPerHour, DEFAULT, QColor("#404040"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_RERA = 0x1006, FLAG, MT_CPAP, SESSION, "RERA", + QObject::tr("RERA"),QObject::tr("Respiratory Effort Related Arousal: An restriction in breathing that causes an either an awakening or sleep disturbance."), QObject::tr("RE"), STR_UNIT_EventsPerHour, DEFAULT, COLOR_Gold)); + schema::channel.add(GRP_CPAP, new Channel(CPAP_VSnore = 0x1007, FLAG, MT_CPAP, SESSION, "VSnore", + QObject::tr("Vibratory Snore"), QObject::tr("A vibratory snore"), QObject::tr("VS"), STR_UNIT_EventsPerHour, DEFAULT, QColor("red"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_VSnore2 = 0x1008, FLAG, MT_CPAP, SESSION, "VSnore2", + QObject::tr("Vibratory Snore (VS2) "),QObject::tr("A vibratory snore as detcted by a System One machine"),QObject::tr("VS2"), STR_UNIT_EventsPerHour, DEFAULT, QColor("red"))); // This Large Leak record is just a flag marker, used by Intellipap for one - schema::channel.add(GRP_CPAP, new Channel(CPAP_LeakFlag = 0x100a, FLAG, MT_CPAP, SESSION, - "LeakFlag", QObject::tr("Leak Flag"), - QObject::tr("A large mask leak affecting machine performance."), - QObject::tr("LF"), STR_UNIT_EventsPerHour, DEFAULT, QColor("light gray"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_LeakFlag = 0x100a, FLAG, MT_CPAP, SESSION, "LeakFlag", + QObject::tr("Leak Flag"), QObject::tr("A large mask leak affecting machine performance."), QObject::tr("LF"), STR_UNIT_EventsPerHour, DEFAULT, QColor("light gray"))); // The following is a Large Leak record that references a waveform span - schema::channel.add(GRP_CPAP, new Channel(CPAP_LargeLeak = 0x1158, SPAN, MT_CPAP, SESSION, - "LeakSpan", QObject::tr("Large Leak"), - QObject::tr("A large mask leak affecting machine performance."), - QObject::tr("LL"), STR_UNIT_EventsPerHour, DEFAULT, QColor("light gray"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_LargeLeak = 0x1158, SPAN, MT_CPAP, SESSION, "LeakSpan", + QObject::tr("Large Leak"),QObject::tr("A large mask leak affecting machine performance."), QObject::tr("LL"), STR_UNIT_EventsPerHour, DEFAULT, QColor("light gray"))); - schema::channel.add(GRP_CPAP, new Channel(CPAP_NRI = 0x100b, FLAG, MT_CPAP, SESSION, "NRI", - QObject::tr("Non Responding Event"), - QObject::tr("A type of respiratory event that won't respond to a pressure increase."), - QObject::tr("NR"), STR_UNIT_EventsPerHour, DEFAULT, QColor("orange"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_NRI = 0x100b, FLAG, MT_CPAP, SESSION, "NRI", + QObject::tr("Non Responding Event"), QObject::tr("A type of respiratory event that won't respond to a pressure increase."), QObject::tr("NR"), STR_UNIT_EventsPerHour, DEFAULT, QColor("orange"))); - schema::channel.add(GRP_CPAP, new Channel(CPAP_ExP = 0x100c, FLAG, MT_CPAP, SESSION, "ExP", - QObject::tr("Expiratory Puff"), - QObject::tr("Intellipap event where you breathe out your mouth."), - QObject::tr("EP"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark magenta"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_ExP = 0x100c, FLAG, MT_CPAP, SESSION, "ExP", + QObject::tr("Expiratory Puff"), QObject::tr("Intellipap event where you breathe out your mouth."), QObject::tr("EP"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark magenta"))); - schema::channel.add(GRP_CPAP, new Channel(CPAP_SensAwake = 0x100d, FLAG, MT_CPAP, SESSION, - "SensAwake", QObject::tr("SensAwake"), - QObject::tr("SensAwake feature will reduce pressure when waking is detected."), - QObject::tr("SA"), STR_UNIT_EventsPerHour, DEFAULT, COLOR_Gold)); + schema::channel.add(GRP_CPAP, new Channel(CPAP_SensAwake = 0x100d, FLAG, MT_CPAP, SESSION, "SensAwake", + QObject::tr("SensAwake"),QObject::tr("SensAwake feature will reduce pressure when waking is detected."),QObject::tr("SA"), STR_UNIT_EventsPerHour, DEFAULT, COLOR_Gold)); - schema::channel.add(GRP_CPAP, new Channel(CPAP_UserFlag1 = 0x101e, FLAG, MT_CPAP, SESSION, - "UserFlag1", QObject::tr("User Flag #1"), - QObject::tr("A user definable event detected by SleepyHead's flow waveform processor."), - QObject::tr("UF1"), STR_UNIT_EventsPerHour, DEFAULT, QColor(0xc0,0xc0,0xe0))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_UserFlag1 = 0x101e, FLAG, MT_CPAP, SESSION, "UserFlag1", + QObject::tr("User Flag #1"), QObject::tr("A user definable event detected by SleepyHead's flow waveform processor."), QObject::tr("UF1"), STR_UNIT_EventsPerHour, DEFAULT, QColor(0xc0,0xc0,0xe0))); - schema::channel.add(GRP_CPAP, new Channel(CPAP_UserFlag2 = 0x101f, FLAG, MT_CPAP, SESSION, - "UserFlag2", QObject::tr("User Flag #2"), - QObject::tr("A user definable event detected by SleepyHead's flow waveform processor."), - QObject::tr("UF2"), STR_UNIT_EventsPerHour, DEFAULT, QColor(0xa0,0xa0,0xc0))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_UserFlag3 = 0x1024, FLAG, MT_CPAP, SESSION, - "UserFlag3", QObject::tr("User Flag #3"), - QObject::tr("A user definable event detected by SleepyHead's flow waveform processor."), - QObject::tr("UF3"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark grey"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_UserFlag2 = 0x101f, FLAG, MT_CPAP, SESSION, "UserFlag2", + QObject::tr("User Flag #2"),QObject::tr("A user definable event detected by SleepyHead's flow waveform processor."), QObject::tr("UF2"), STR_UNIT_EventsPerHour, DEFAULT, QColor(0xa0,0xa0,0xc0))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_UserFlag3 = 0x1024, FLAG, MT_CPAP, SESSION, "UserFlag3", + QObject::tr("User Flag #3"),QObject::tr("A user definable event detected by SleepyHead's flow waveform processor."), QObject::tr("UF3"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark grey"))); // Oximetry schema::channel.add(GRP_OXI, new Channel(OXI_Pulse = 0x1800, WAVEFORM, MT_OXIMETER, SESSION, "Pulse", - QObject::tr("Pulse Rate"), QObject::tr("Heart rate in beats per minute"), - QObject::tr("Pulse Rate"), STR_UNIT_BPM, DEFAULT, QColor("red"))); - + QObject::tr("Pulse Rate"), QObject::tr("Heart rate in beats per minute"), QObject::tr("Pulse Rate"), STR_UNIT_BPM, DEFAULT, QColor("red"))); schema::channel[OXI_Pulse].setLowerThreshold(40); schema::channel[OXI_Pulse].setUpperThreshold(130); schema::channel.add(GRP_OXI, new Channel(OXI_SPO2 = 0x1801, WAVEFORM, MT_OXIMETER, SESSION, "SPO2", - QObject::tr("SpO2 %"), QObject::tr("Blood-oxygen saturation percentage"), - QObject::tr("SpO2"), STR_UNIT_Percentage, DEFAULT, QColor("blue"))); - + QObject::tr("SpO2 %"), QObject::tr("Blood-oxygen saturation percentage"), QObject::tr("SpO2"), STR_UNIT_Percentage, DEFAULT, QColor("blue"))); schema::channel[OXI_SPO2].setLowerThreshold(88); schema::channel.add(GRP_OXI, new Channel(OXI_Plethy = 0x1802, WAVEFORM, MT_OXIMETER, SESSION, "Plethy", - QObject::tr("Plethysomogram"), - QObject::tr("An optical Photo-plethysomogram showing heart rhythm"), - QObject::tr("Plethy"), STR_UNIT_Hz, DEFAULT, QColor("#404040"))); + QObject::tr("Plethysomogram"), QObject::tr("An optical Photo-plethysomogram showing heart rhythm"), QObject::tr("Plethy"), STR_UNIT_Hz, DEFAULT, QColor("#404040"))); - schema::channel.add(GRP_OXI, new Channel(OXI_Perf = 0x1805, WAVEFORM, MT_OXIMETER, SESSION, "Perf. Index", - QObject::tr("Perfusion Index"), - QObject::tr("A relative assessment of the pulse strength at the monitoring site"), - QObject::tr("Perf. Index %"), STR_UNIT_Percentage, DEFAULT, QColor("magenta"))); + schema::channel.add(GRP_OXI, new Channel(OXI_Perf = 0x1805, WAVEFORM, MT_OXIMETER, SESSION, "Perf. Index", + QObject::tr("Perfusion Index"), QObject::tr("A relative assessment of the pulse strength at the monitoring site"), QObject::tr("Perf. Index %"), STR_UNIT_Percentage, DEFAULT, QColor("magenta"))); - schema::channel.add(GRP_OXI, new Channel(OXI_PulseChange = 0x1803, FLAG, MT_OXIMETER, SESSION, - "PulseChange", QObject::tr("Pulse Change"), - QObject::tr("A sudden (user definable) change in heart rate"), - QObject::tr("PC"), STR_UNIT_EventsPerHour, DEFAULT, QColor("light grey"))); + schema::channel.add(GRP_OXI, new Channel(OXI_PulseChange = 0x1803, FLAG, MT_OXIMETER, SESSION, "PulseChange", + QObject::tr("Pulse Change"), QObject::tr("A sudden (user definable) change in heart rate"), QObject::tr("PC"), STR_UNIT_EventsPerHour, DEFAULT, QColor("light grey"))); - schema::channel.add(GRP_OXI, new Channel(OXI_SPO2Drop = 0x1804, FLAG, MT_OXIMETER, SESSION, - "SPO2Drop", QObject::tr("SpO2 Drop"), - QObject::tr("A sudden (user definable) drop in blood oxygen saturation"), - QObject::tr("SD"), STR_UNIT_EventsPerHour, DEFAULT, QColor("light blue"))); - - // - // - // - // - // - // - // - // - // - - // - // - // - // - // - // - // - // - // - // - // + schema::channel.add(GRP_OXI, new Channel(OXI_SPO2Drop = 0x1804, FLAG, MT_OXIMETER, SESSION, "SPO2Drop", + QObject::tr("SpO2 Drop"), QObject::tr("A sudden (user definable) drop in blood oxygen saturation"), QObject::tr("SD"), STR_UNIT_EventsPerHour, DEFAULT, QColor("light blue"))); - schema::channel.add(GRP_CPAP, new Channel(CPAP_FlowRate = 0x1100, WAVEFORM, MT_CPAP, SESSION, - "FlowRate", QObject::tr("Flow Rate"), - QObject::tr("Breathing flow rate waveform"), QObject::tr("Flow Rate"), - STR_UNIT_LPM, DEFAULT, QColor("black"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_FlowRate = 0x1100, WAVEFORM, MT_CPAP, SESSION, "FlowRate", + QObject::tr("Flow Rate"), QObject::tr("Breathing flow rate waveform"), QObject::tr("Flow Rate"), STR_UNIT_LPM, DEFAULT, QColor("black"))); - schema::channel.add(GRP_CPAP, new Channel(CPAP_MaskPressure = 0x1101, WAVEFORM, MT_CPAP, SESSION, - "MaskPressure", QObject::tr("Mask Pressure"), - QObject::tr("Mask Pressure"), QObject::tr("Mask Pressure"), - STR_UNIT_CMH2O, DEFAULT, QColor("blue"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_MaskPressure = 0x1101, WAVEFORM, MT_CPAP, SESSION, "MaskPressure", + QObject::tr("Mask Pressure"), QObject::tr("Mask Pressure"), QObject::tr("Mask Pressure"), STR_UNIT_CMH2O, DEFAULT, QColor("blue"))); - schema::channel.add(GRP_CPAP, new Channel(CPAP_MaskPressureHi = 0x1102, WAVEFORM, MT_CPAP, SESSION, - "MaskPressureHi", QObject::tr("Mask Pressure"), - QObject::tr("Mask Pressure (High resolution)"), QObject::tr("Mask Pressure"), - STR_UNIT_CMH2O, DEFAULT, QColor("blue"), 0x1101)); // linked to CPAP_MaskPressure + schema::channel.add(GRP_CPAP, new Channel(CPAP_MaskPressureHi = 0x1102, WAVEFORM, MT_CPAP, SESSION, "MaskPressureHi", + QObject::tr("Mask Pressure"), QObject::tr("Mask Pressure (High resolution)"), QObject::tr("Mask Pressure"), STR_UNIT_CMH2O, DEFAULT, QColor("blue"), 0x1101)); // linked to CPAP_MaskPressure - schema::channel.add(GRP_CPAP, new Channel(CPAP_TidalVolume = 0x1103, WAVEFORM, MT_CPAP, SESSION, - "TidalVolume", QObject::tr("Tidal Volume"), - QObject::tr("Amount of air displaced per breath"), QObject::tr("Tidal Volume"), - STR_UNIT_ml, DEFAULT, QColor("magenta"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_TidalVolume = 0x1103, WAVEFORM, MT_CPAP, SESSION, "TidalVolume", + QObject::tr("Tidal Volume"), QObject::tr("Amount of air displaced per breath"), QObject::tr("Tidal Volume"), STR_UNIT_ml, DEFAULT, QColor("magenta"))); - schema::channel.add(GRP_CPAP, new Channel(CPAP_Snore = 0x1104, WAVEFORM, MT_CPAP, SESSION, - "Snore", QObject::tr("Snore"), - QObject::tr("Graph displaying snore volume"), QObject::tr("Snore"), - STR_UNIT_Unknown, DEFAULT, QColor("grey"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_Snore = 0x1104, WAVEFORM, MT_CPAP, SESSION, "Snore", + QObject::tr("Snore"), QObject::tr("Graph displaying snore volume"), QObject::tr("Snore"), STR_UNIT_Unknown, DEFAULT, QColor("grey"))); - schema::channel.add(GRP_CPAP, new Channel(CPAP_MinuteVent = 0x1105, WAVEFORM, MT_CPAP, SESSION, - "MinuteVent", QObject::tr("Minute Ventilation"), - QObject::tr("Amount of air displaced per minute"), QObject::tr("Minute Vent."), - STR_UNIT_LPM, DEFAULT, QColor("dark cyan"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_MinuteVent = 0x1105, WAVEFORM, MT_CPAP, SESSION, "MinuteVent", + QObject::tr("Minute Ventilation"), QObject::tr("Amount of air displaced per minute"), QObject::tr("Minute Vent."), STR_UNIT_LPM, DEFAULT, QColor("dark cyan"))); - schema::channel.add(GRP_CPAP, new Channel(CPAP_RespRate = 0x1106, WAVEFORM, MT_CPAP, SESSION, - "RespRate", QObject::tr("Respiratory Rate"), - QObject::tr("Rate of breaths per minute"), QObject::tr("Resp. Rate"), - STR_UNIT_BreathsPerMinute, DEFAULT, QColor("dark magenta"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_RespRate = 0x1106, WAVEFORM, MT_CPAP, SESSION, "RespRate", + QObject::tr("Respiratory Rate"), QObject::tr("Rate of breaths per minute"), QObject::tr("Resp. Rate"), STR_UNIT_BreathsPerMinute, DEFAULT, QColor("dark magenta"))); schema::channel.add(GRP_CPAP, new Channel(CPAP_PTB = 0x1107, WAVEFORM, MT_CPAP, SESSION, "PTB", - QObject::tr("Patient Triggered Breaths"), - QObject::tr("Percentage of breaths triggered by patient"), QObject::tr("Pat. Trig. Breaths"), - STR_UNIT_Percentage, DEFAULT, QColor("dark grey"))); - - schema::channel.add(GRP_CPAP, new Channel(CPAP_Leak = 0x1108, WAVEFORM, MT_CPAP, SESSION, - "Leak", QObject::tr("Leak Rate"), - QObject::tr("Rate of detected mask leakage"), QObject::tr("Leak Rate"), - STR_UNIT_LPM, DEFAULT, QColor("dark green"))); + QObject::tr("Patient Triggered Breaths"), QObject::tr("Percentage of breaths triggered by patient"), QObject::tr("Pat. Trig. Breaths"), STR_UNIT_Percentage, DEFAULT, QColor("dark grey"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_Leak = 0x1108, WAVEFORM, MT_CPAP, SESSION, "Leak", + QObject::tr("Leak Rate"), QObject::tr("Rate of detected mask leakage"), QObject::tr("Leak Rate"), STR_UNIT_LPM, DEFAULT, QColor("dark green"))); schema::channel[CPAP_Leak].setLowerThreshold(24.0); - schema::channel.add(GRP_CPAP, new Channel(CPAP_IE = 0x1109, WAVEFORM, MT_CPAP, SESSION, "IE", - QObject::tr("I:E Ratio"), - QObject::tr("Ratio between Inspiratory and Expiratory time"), QObject::tr("I:E Ratio"), - STR_UNIT_Ratio, DEFAULT, QColor("dark red"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_IE = 0x1109, WAVEFORM, MT_CPAP, SESSION, "IE", + QObject::tr("I:E Ratio"), QObject::tr("Ratio between Inspiratory and Expiratory time"), QObject::tr("I:E Ratio"), STR_UNIT_Ratio, DEFAULT, QColor("dark red"))); - schema::channel.add(GRP_CPAP, new Channel(CPAP_Te = 0x110A, WAVEFORM, MT_CPAP, SESSION, "Te", - QObject::tr("Expiratory Time"), QObject::tr("Time taken to breathe out"), - QObject::tr("Exp. Time"), STR_UNIT_Seconds, DEFAULT, QColor("dark green"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_Te = 0x110A, WAVEFORM, MT_CPAP, SESSION, "Te", + QObject::tr("Expiratory Time"), QObject::tr("Time taken to breathe out"), QObject::tr("Exp. Time"), STR_UNIT_Seconds, DEFAULT, QColor("dark green"))); schema::channel.add(GRP_CPAP, new Channel(CPAP_Ti = 0x110B, WAVEFORM, MT_CPAP, SESSION, "Ti", - QObject::tr("Inspiratory Time"), QObject::tr("Time taken to breathe in"), - QObject::tr("Insp. Time"), STR_UNIT_Seconds, DEFAULT, QColor("dark blue"))); + QObject::tr("Inspiratory Time"), QObject::tr("Time taken to breathe in"), QObject::tr("Insp. Time"), STR_UNIT_Seconds, DEFAULT, QColor("dark blue"))); - schema::channel.add(GRP_CPAP, new Channel(CPAP_RespEvent = 0x1112, DATA, MT_CPAP, SESSION, - "RespEvent", QObject::tr("Respiratory Event"), - QObject::tr("A ResMed data source showing Respiratory Events"), QObject::tr("Resp. Event"), - STR_UNIT_EventsPerHour, DEFAULT, QColor("black"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_RespEvent = 0x1112, DATA, MT_CPAP, SESSION, "RespEvent", + QObject::tr("Respiratory Event"), QObject::tr("A ResMed data source showing Respiratory Events"), QObject::tr("Resp. Event"), STR_UNIT_EventsPerHour, DEFAULT, QColor("black"))); schema::channel.add(GRP_CPAP, new Channel(CPAP_FLG = 0x1113, WAVEFORM, MT_CPAP, SESSION, "FLG", - QObject::tr("Flow Limitation"), - QObject::tr("Graph showing severity of flow limitations"), QObject::tr("Flow Limit."), - STR_UNIT_Severity, DEFAULT, QColor("#585858"))); + QObject::tr("Flow Limitation"), QObject::tr("Graph showing severity of flow limitations"), QObject::tr("Flow Limit."), STR_UNIT_Severity, DEFAULT, QColor("#585858"))); - schema::channel.add(GRP_CPAP, new Channel(CPAP_TgMV = 0x1114, WAVEFORM, MT_CPAP, SESSION, - "TgMV", QObject::tr("Target Minute Ventilation"), - QObject::tr("Target Minute Ventilation?"), QObject::tr("Target Vent."), - STR_UNIT_LPM, DEFAULT, QColor("dark red"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_TgMV = 0x1114, WAVEFORM, MT_CPAP, SESSION, "TgMV", + QObject::tr("Target Minute Ventilation"), QObject::tr("Target Minute Ventilation"), QObject::tr("Target Vent."), STR_UNIT_LPM, DEFAULT, QColor("dark red"))); - schema::channel.add(GRP_CPAP, new Channel(CPAP_MaxLeak = 0x1115, WAVEFORM, MT_CPAP, SESSION, - "MaxLeak", QObject::tr("Maximum Leak"), - QObject::tr("The maximum rate of mask leakage"), QObject::tr("Max Leaks"), - STR_UNIT_LPM, DEFAULT, QColor("dark red"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_MaxLeak = 0x1115, WAVEFORM, MT_CPAP, SESSION, "MaxLeak", + QObject::tr("Maximum Leak"), QObject::tr("The maximum rate of mask leakage"), QObject::tr("Max Leaks"), STR_UNIT_LPM, DEFAULT, QColor("dark red"))); schema::channel.add(GRP_CPAP, new Channel(CPAP_AHI = 0x1116, WAVEFORM, MT_CPAP, SESSION, "AHI", - QObject::tr("Apnea Hypopnea Index"), - QObject::tr("Graph showing running AHI for the past hour"), QObject::tr("AHI"), - STR_UNIT_EventsPerHour, DEFAULT, QColor("dark red"))); + QObject::tr("Apnea Hypopnea Index"), QObject::tr("Graph showing running AHI for the past hour"), QObject::tr("AHI"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark red"))); - schema::channel.add(GRP_CPAP, new Channel(CPAP_LeakTotal = 0x1117, WAVEFORM, MT_CPAP, SESSION, - "LeakTotal", QObject::tr("Total Leak Rate"), - QObject::tr("Detected mask leakage including natural Mask leakages"), QObject::tr("Total Leaks"), - STR_UNIT_LPM, DEFAULT, QColor("dark green"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_LeakTotal = 0x1117, WAVEFORM, MT_CPAP, SESSION, "LeakTotal", + QObject::tr("Total Leak Rate"), QObject::tr("Detected mask leakage including natural Mask leakages"), QObject::tr("Total Leaks"), STR_UNIT_LPM, DEFAULT, QColor("dark green"))); - schema::channel.add(GRP_CPAP, new Channel(CPAP_LeakMedian = 0x1118, WAVEFORM, MT_CPAP, SESSION, - "LeakMedian", QObject::tr("Median Leak Rate"), - QObject::tr("Median rate of detected mask leakage"), QObject::tr("Median Leaks"), - STR_UNIT_LPM, DEFAULT, QColor("dark green"))); + schema::channel.add(GRP_CPAP, new Channel(CPAP_LeakMedian = 0x1118, WAVEFORM, MT_CPAP, SESSION, "LeakMedian", + QObject::tr("Median Leak Rate"), QObject::tr("Median rate of detected mask leakage"), QObject::tr("Median Leaks"), STR_UNIT_LPM, DEFAULT, QColor("dark green"))); schema::channel.add(GRP_CPAP, new Channel(CPAP_RDI = 0x1119, WAVEFORM, MT_CPAP, SESSION, "RDI", - QObject::tr("Respiratory Disturbance Index"), - QObject::tr("Graph showing running RDI for the past hour"), QObject::tr("RDI"), - STR_UNIT_EventsPerHour, DEFAULT, QColor("dark red"))); + QObject::tr("Respiratory Disturbance Index"), QObject::tr("Graph showing running RDI for the past hour"), QObject::tr("RDI"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark red"))); // Positional sensors - schema::channel.add(GRP_POS, new Channel(POS_Orientation = 0x2990, WAVEFORM, MT_POSITION, SESSION, - "Orientation", QObject::tr("Orientation"), - QObject::tr("Sleep position in degrees"), QObject::tr("Orientation"), STR_UNIT_Degrees, - DEFAULT, QColor("dark blue"))); + schema::channel.add(GRP_POS, new Channel(POS_Orientation = 0x2990, WAVEFORM, MT_POSITION, SESSION, "Orientation", + QObject::tr("Orientation"), QObject::tr("Sleep position in degrees"), QObject::tr("Orientation"), STR_UNIT_Degrees, DEFAULT, QColor("dark blue"))); - schema::channel.add(GRP_POS, new Channel(POS_Inclination = 0x2991, WAVEFORM, MT_POSITION, SESSION, - "Inclination", QObject::tr("Inclination"), - QObject::tr("Upright angle in degrees"), QObject::tr("Inclination"), STR_UNIT_Degrees, - DEFAULT, QColor("dark magenta"))); + schema::channel.add(GRP_POS, new Channel(POS_Inclination = 0x2991, WAVEFORM, MT_POSITION, SESSION, "Inclination", + QObject::tr("Inclination"), QObject::tr("Upright angle in degrees"), QObject::tr("Inclination"), STR_UNIT_Degrees, DEFAULT, QColor("dark magenta"))); - schema::channel.add(GRP_CPAP, new Channel(RMS9_MaskOnTime = 0x1025, DATA, MT_CPAP, SESSION, - "MaskOnTime", QObject::tr("Mask On Time"), - QObject::tr("Time started according to str.edf"), QObject::tr("Mask On Time"), STR_UNIT_Unknown, - DEFAULT, Qt::black)); + schema::channel.add(GRP_CPAP, new Channel(RMS9_MaskOnTime = 0x1025, DATA, MT_CPAP, SESSION, "MaskOnTime", + QObject::tr("Mask On Time"), QObject::tr("Time started according to str.edf"), QObject::tr("Mask On Time"), STR_UNIT_Unknown, DEFAULT, Qt::black)); - schema::channel.add(GRP_CPAP, new Channel(CPAP_SummaryOnly = 0x1026, DATA, MT_CPAP, SESSION, - "SummaryOnly", QObject::tr("Summary Only"), - QObject::tr("CPAP Session contains summary data only"), QObject::tr("Summary Only"), STR_UNIT_Unknown, - DEFAULT, Qt::black)); + schema::channel.add(GRP_CPAP, new Channel(CPAP_SummaryOnly = 0x1026, DATA, MT_CPAP, SESSION, "SummaryOnly", + QObject::tr("Summary Only"), QObject::tr("CPAP Session contains summary data only"), QObject::tr("Summary Only"), STR_UNIT_Unknown, DEFAULT, Qt::black)); Channel *ch; - schema::channel.add(GRP_CPAP, ch = new Channel(CPAP_Mode = 0x1200, SETTING, MT_CPAP, SESSION, - "PAPMode", QObject::tr("PAP Mode"), - QObject::tr("PAP Device Mode"), - QObject::tr("PAP Mode"), QString(), - LOOKUP, Qt::black)); + schema::channel.add(GRP_CPAP, ch = new Channel(CPAP_Mode = 0x1200, SETTING, MT_CPAP, SESSION, "PAPMode", + QObject::tr("PAP Mode"), QObject::tr("PAP Device Mode"), QObject::tr("PAP Mode"), QString(), LOOKUP, Qt::black)); ch->addOption(0, STR_TR_Unknown); ch->addOption(1, STR_TR_CPAP); @@ -473,242 +291,55 @@ void init() ch->addOption(7, QObject::tr("ASV (Variable EPAP)")); ch->addOption(8, QObject::tr("AVAPS")); -// -// -// - - - // - schema::channel.add(GRP_JOURNAL, ch = new Channel(Journal_Weight = 0x0803, DATA, MT_JOURNAL, DAY, - "Weight", QObject::tr("Weight"), - QObject::tr("Weight"), - QObject::tr("Weight"), STR_UNIT_KG, - DOUBLE, Qt::black)); - -// Kids grow... but that adds a whole nother layer of complexity. - // - schema::channel.add(GRP_JOURNAL, ch = new Channel(0x0804, DATA, MT_JOURNAL, DAY, - "Height", QObject::tr("Height"), - QObject::tr("Physical Height"), - QObject::tr("Height"), STR_UNIT_CM, - DOUBLE, Qt::black)); - -// - schema::channel.add(GRP_JOURNAL, ch = new Channel(Bookmark_Notes=0x0805, DATA, MT_JOURNAL, DAY, - "BookmarkNotes", QObject::tr("Notes"), - QObject::tr("Bookmark Notes"), - QObject::tr("Notes"), QString(), - STRING, Qt::black)); - -// - schema::channel.add(GRP_JOURNAL, ch = new Channel(Journal_BMI = 0x0806, DATA, MT_JOURNAL, DAY, - "BMI", QObject::tr("BMI"), - QObject::tr("Body Mass Index"), - QObject::tr("BMI"), QString(), - DOUBLE, Qt::black)); - - -// - schema::channel.add(GRP_JOURNAL, ch = new Channel(Journal_ZombieMeter = 0x0807, DATA, MT_JOURNAL, DAY, - "ZombieMeter", QObject::tr("Zombie"), - QObject::tr("How you feel (0 = like crap, 10 = unstoppable)"), - QObject::tr("Zombie"), QString(), - DOUBLE, Qt::black)); - -// - schema::channel.add(GRP_JOURNAL, ch = new Channel(Bookmark_Start=0x0808, DATA, MT_JOURNAL, DAY, - "BookmarkStart", QObject::tr("Start"), - QObject::tr("Bookmark Start"), - QObject::tr("Start"), QString(), - INTEGER, Qt::black)); -// - schema::channel.add(GRP_JOURNAL, ch = new Channel(Bookmark_End=0x0809, DATA, MT_JOURNAL, DAY, - "BookmarkEnd", QObject::tr("End"), - QObject::tr("Bookmark End"), - QObject::tr("End"), QString(), - DOUBLE, Qt::black)); -// - schema::channel.add(GRP_JOURNAL, ch = new Channel(LastUpdated=0x080a, DATA, MT_JOURNAL, DAY, - "LastUpdated", QObject::tr("Last Updated"), - QObject::tr("Last Updated"), - QObject::tr("Last Updated"), QString(), - DATETIME, Qt::black)); -// - schema::channel.add(GRP_JOURNAL, ch = new Channel(Journal_Notes = 0xd000, DATA, MT_JOURNAL, DAY, - "Journal", QObject::tr("Journal Notes"), - QObject::tr("Journal Notes"), - QObject::tr("Journal"), QString(), - RICHTEXT, Qt::black)); - -// - schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_SleepStage = 0x2000, WAVEFORM, MT_SLEEPSTAGE, SESSION, - "SleepStage", QObject::tr("Sleep Stage"), - QObject::tr("1=Awake 2=REM 3=Light Sleep 4=Deep Sleep"), - QObject::tr("Sleep Stage"), QString(), - INTEGER, Qt::darkGray)); -// - schema::channel.add(GRP_SLEEP, ch = new Channel(0x2001, WAVEFORM, MT_SLEEPSTAGE, SESSION, - "ZeoBW", QObject::tr("Brain Wave"), - QObject::tr("Brain Wave"), - QObject::tr("BrainWave"), QString(), - INTEGER, Qt::black)); -// - schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_Awakenings = 0x2002, DATA, MT_SLEEPSTAGE, SESSION, - "Awakenings", QObject::tr("Awakenings"), - QObject::tr("Number of Awakenings"), - QObject::tr("Awakenings"), QString(), - INTEGER, Qt::black)); -// - schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_MorningFeel= 0x2003, DATA, MT_SLEEPSTAGE, SESSION, - "MorningFeel", QObject::tr("Morning Feel"), - QObject::tr("How you felt in the morning"), - QObject::tr("Morning Feel"), QString(), - INTEGER, Qt::black)); -// - schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_TimeInWake = 0x2004, DATA, MT_SLEEPSTAGE, SESSION, - "TimeInWake", QObject::tr("Time Awake"), - QObject::tr("Time spent awake"), - QObject::tr("Time Awake"), STR_UNIT_Minutes, - INTEGER, Qt::black)); - -// - schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_TimeInREM = 0x2005, DATA, MT_SLEEPSTAGE, SESSION, - "TimeInREM", QObject::tr("Time In REM Sleep"), - QObject::tr("Time spent in REM Sleep"), - QObject::tr("Time in REM Sleep"), STR_UNIT_Minutes, - INTEGER, Qt::black)); -// - schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_TimeInLight = 0x2006, DATA, MT_SLEEPSTAGE, SESSION, - "TimeInLight", QObject::tr("Time In Light Sleep"), - QObject::tr("Time spent in light sleep"), - QObject::tr("Time in Light Sleep"), STR_UNIT_Minutes, - INTEGER, Qt::black)); -// - schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_TimeInDeep= 0x2007, DATA, MT_SLEEPSTAGE, SESSION, - "TimeInDeep", QObject::tr("Time In Deep Sleep"), - QObject::tr("Time spent in deep sleep"), - QObject::tr("Time in Deep Sleep"), STR_UNIT_Minutes, - INTEGER, Qt::black)); -// - schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_TimeInDeep= 0x2008, DATA, MT_SLEEPSTAGE, SESSION, - "TimeToZ", QObject::tr("Time to Sleep"), - QObject::tr("Time taken to get to sleep"), - QObject::tr("Time to Sleep"), STR_UNIT_Minutes, - INTEGER, Qt::black)); -// - schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_ZQ=0x2009, DATA, MT_SLEEPSTAGE, SESSION, - "ZeoZQ", QObject::tr("Zeo ZQ"), - QObject::tr("Zeo sleep quality measurement"), - QObject::tr("ZEO ZQ"), QString(), - INTEGER, Qt::black)); - - - -// -// - - // - // - // - // - // + + ///////////////////////////////////////////////////////////////// + // Old Journal system crap + ///////////////////////////////////////////////////////////////// + + schema::channel.add(GRP_JOURNAL, ch = new Channel(Journal_Weight = 0x0803, DATA, MT_JOURNAL, DAY, "Weight", QObject::tr("Weight"), QObject::tr("Weight"), QObject::tr("Weight"), STR_UNIT_KG, DOUBLE, Qt::black)); + schema::channel.add(GRP_JOURNAL, ch = new Channel(0x0804, DATA, MT_JOURNAL, DAY, "Height", QObject::tr("Height"), QObject::tr("Physical Height"), QObject::tr("Height"), STR_UNIT_CM, DOUBLE, Qt::black)); + schema::channel.add(GRP_JOURNAL, ch = new Channel(Bookmark_Notes=0x0805, DATA, MT_JOURNAL, DAY, "BookmarkNotes", QObject::tr("Notes"), QObject::tr("Bookmark Notes"), QObject::tr("Notes"), QString(), STRING, Qt::black)); + // This may as well be calculated + schema::channel.add(GRP_JOURNAL, ch = new Channel(Journal_BMI = 0x0806, DATA, MT_JOURNAL, DAY, "BMI", QObject::tr("BMI"), QObject::tr("Body Mass Index"), QObject::tr("BMI"), QString(), DOUBLE, Qt::black)); + schema::channel.add(GRP_JOURNAL, ch = new Channel(Journal_ZombieMeter = 0x0807, DATA, MT_JOURNAL, DAY, "ZombieMeter", QObject::tr("Zombie"), QObject::tr("How you feel (0 = like crap, 10 = unstoppable)"), QObject::tr("Zombie"), QString(), DOUBLE, Qt::black)); + schema::channel.add(GRP_JOURNAL, ch = new Channel(Bookmark_Start=0x0808, DATA, MT_JOURNAL, DAY, "BookmarkStart", QObject::tr("Start"), QObject::tr("Bookmark Start"), QObject::tr("Start"), QString(), INTEGER, Qt::black)); + schema::channel.add(GRP_JOURNAL, ch = new Channel(Bookmark_End=0x0809, DATA, MT_JOURNAL, DAY, "BookmarkEnd", QObject::tr("End"), QObject::tr("Bookmark End"), QObject::tr("End"), QString(), DOUBLE, Qt::black)); + schema::channel.add(GRP_JOURNAL, ch = new Channel(LastUpdated=0x080a, DATA, MT_JOURNAL, DAY, "LastUpdated", QObject::tr("Last Updated"), QObject::tr("Last Updated"), QObject::tr("Last Updated"), QString(), DATETIME, Qt::black)); + schema::channel.add(GRP_JOURNAL, ch = new Channel(Journal_Notes = 0xd000, DATA, MT_JOURNAL, DAY, "Journal", QObject::tr("Journal Notes"), QObject::tr("Journal Notes"), QObject::tr("Journal"), QString(), RICHTEXT, Qt::black)); + ////////////////////////////////////////////////////////////////////// + // Sleep Stage Channels + ////////////////////////////////////////////////////////////////////// + schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_SleepStage = 0x2000, WAVEFORM, MT_SLEEPSTAGE, SESSION, "SleepStage", + QObject::tr("Sleep Stage"), QObject::tr("1=Awake 2=REM 3=Light Sleep 4=Deep Sleep"), QObject::tr("Sleep Stage"), QString(), INTEGER, Qt::darkGray)); + schema::channel.add(GRP_SLEEP, ch = new Channel(0x2001, WAVEFORM, MT_SLEEPSTAGE, SESSION, "ZeoBW", + QObject::tr("Brain Wave"), QObject::tr("Brain Wave"), QObject::tr("BrainWave"), QString(), INTEGER, Qt::black)); + schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_Awakenings = 0x2002, DATA, MT_SLEEPSTAGE, SESSION, "Awakenings", QObject::tr("Awakenings"), QObject::tr("Number of Awakenings"), QObject::tr("Awakenings"), QString(), INTEGER, Qt::black)); + schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_MorningFeel= 0x2003, DATA, MT_SLEEPSTAGE, SESSION, "MorningFeel", QObject::tr("Morning Feel"), QObject::tr("How you felt in the morning"), QObject::tr("Morning Feel"), QString(), INTEGER, Qt::black)); + schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_TimeInWake = 0x2004, DATA, MT_SLEEPSTAGE, SESSION, "TimeInWake", QObject::tr("Time Awake"), QObject::tr("Time spent awake"), QObject::tr("Time Awake"), STR_UNIT_Minutes, INTEGER, Qt::black)); + schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_TimeInREM = 0x2005, DATA, MT_SLEEPSTAGE, SESSION, "TimeInREM", QObject::tr("Time In REM Sleep"), QObject::tr("Time spent in REM Sleep"), QObject::tr("Time in REM Sleep"), STR_UNIT_Minutes, INTEGER, Qt::black)); + schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_TimeInLight= 0x2006, DATA, MT_SLEEPSTAGE, SESSION, "TimeInLight",QObject::tr("Time In Light Sleep"), QObject::tr("Time spent in light sleep"), QObject::tr("Time in Light Sleep"), STR_UNIT_Minutes, INTEGER, Qt::black)); + schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_TimeInDeep = 0x2007, DATA, MT_SLEEPSTAGE, SESSION, "TimeInDeep", QObject::tr("Time In Deep Sleep"), QObject::tr("Time spent in deep sleep"), QObject::tr("Time in Deep Sleep"), STR_UNIT_Minutes, INTEGER, Qt::black)); + schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_TimeInDeep = 0x2008, DATA, MT_SLEEPSTAGE, SESSION, "TimeToZ", QObject::tr("Time to Sleep"), QObject::tr("Time taken to get to sleep"), QObject::tr("Time to Sleep"), STR_UNIT_Minutes, INTEGER, Qt::black)); + schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_ZQ = 0x2009, DATA, MT_SLEEPSTAGE, SESSION, "ZeoZQ", QObject::tr("Zeo ZQ"), QObject::tr("Zeo sleep quality measurement"), QObject::tr("ZEO ZQ"), QString(), INTEGER, Qt::black)); NoChannel = 0; - // CPAP_IPAP=schema::channel["IPAP"].id(); - // CPAP_IPAPLo=schema::channel["IPAPLo"].id(); - // CPAP_IPAPHi=schema::channel["IPAPHi"].id(); - // CPAP_EPAP=schema::channel["EPAP"].id(); - // CPAP_Pressure=schema::channel["Pressure"].id(); - // CPAP_PS=schema::channel["PS"].id(); - // CPAP_PSMin=schema::channel["PSMin"].id(); - // CPAP_PSMax=schema::channel["PSMax"].id(); -// CPAP_Mode = schema::channel["PAPMode"].id(); CPAP_BrokenSummary = schema::channel["BrokenSummary"].id(); CPAP_BrokenWaveform = schema::channel["BrokenWaveform"].id(); - // CPAP_PressureMin=schema::channel["PressureMin"].id(); - // CPAP_PressureMax=schema::channel["PressureMax"].id(); - // CPAP_RampTime=schema::channel["RampTime"].id(); - // CPAP_RampPressure=schema::channel["RampPressure"].id(); - // CPAP_Obstructive=schema::channel["Obstructive"].id(); - // CPAP_Hypopnea=schema::channel["Hypopnea"].id(); - // CPAP_ClearAirway=schema::channel["ClearAirway"].id(); - // CPAP_Apnea=schema::channel["Apnea"].id(); - // CPAP_CSR=schema::channel["CSR"].id(); - // CPAP_LeakFlag=schema::channel["LeakFlag"].id(); - // CPAP_ExP=schema::channel["ExP"].id(); - // CPAP_NRI=schema::channel["NRI"].id(); - // CPAP_VSnore=schema::channel["VSnore"].id(); - // CPAP_VSnore2=schema::channel["VSnore2"].id(); - // CPAP_RERA=schema::channel["RERA"].id(); - // CPAP_PressurePulse=schema::channel["PressurePulse"].id(); - // CPAP_FlowLimit=schema::channel["FlowLimit"].id(); - // CPAP_FlowRate=schema::channel["FlowRate"].id(); - // CPAP_MaskPressure=schema::channel["MaskPressure"].id(); - // CPAP_MaskPressureHi=schema::channel["MaskPressureHi"].id(); - // CPAP_RespEvent=schema::channel["RespEvent"].id(); - // CPAP_Snore=schema::channel["Snore"].id(); - // CPAP_MinuteVent=schema::channel["MinuteVent"].id(); - // CPAP_RespRate=schema::channel["RespRate"].id(); - // CPAP_TidalVolume=schema::channel["TidalVolume"].id(); - // CPAP_PTB=schema::channel["PTB"].id(); - // CPAP_Leak=schema::channel["Leak"].id(); - // CPAP_LeakMedian=schema::channel["LeakMedian"].id(); - // CPAP_LeakTotal=schema::channel["LeakTotal"].id(); - // CPAP_MaxLeak=schema::channel["MaxLeak"].id(); - // CPAP_FLG=schema::channel["FLG"].id(); - // CPAP_IE=schema::channel["IE"].id(); - // CPAP_Te=schema::channel["Te"].id(); - // CPAP_Ti=schema::channel["Ti"].id(); - // CPAP_TgMV=schema::channel["TgMV"].id(); - CPAP_Test1 = schema::channel["TestChan1"].id(); - CPAP_Test2 = schema::channel["TestChan2"].id(); - // CPAP_UserFlag1=schema::channel["UserFlag1"].id(); - // CPAP_UserFlag2=schema::channel["UserFlag2"].id(); - // CPAP_UserFlag3=schema::channel["UserFlag3"].id(); +// +// + + schema::channel.add(GRP_CPAP, ch=new Channel(CPAP_Test1 = 0x111e, DATA, MT_CPAP, SESSION, "TestChan1", QObject::tr("Debugging channel #1"), QObject::tr("Top secret internal stuff you're not supposed to see ;)"), QObject::tr("Test #1"), QString(), INTEGER, QColor("pink"))); + schema::channel.add(GRP_CPAP, ch=new Channel(CPAP_Test2 = 0x111f, DATA, MT_CPAP, SESSION, "TestChan2", QObject::tr("Debugging channel #2"), QObject::tr("Top secret internal stuff you're not supposed to see ;)"), QObject::tr("Test #2"), QString(), INTEGER, Qt::blue)); + RMS9_E01 = schema::channel["RMS9_E01"].id(); RMS9_E02 = schema::channel["RMS9_E02"].id(); RMS9_SetPressure = schema::channel["SetPressure"].id(); // TODO: this isn't needed anymore CPAP_HumidSetting = schema::channel["HumidSet"].id(); INTELLIPAP_Unknown1 = schema::channel["IntUnk1"].id(); INTELLIPAP_Unknown2 = schema::channel["IntUnk2"].id(); - // OXI_Pulse=schema::channel["Pulse"].id(); - // OXI_SPO2=schema::channel["SPO2"].id(); - // OXI_PulseChange=schema::channel["PulseChange"].id(); - // OXI_SPO2Drop=schema::channel["SPO2Drop"].id(); - // OXI_Plethy=schema::channel["Plethy"].id(); - // CPAP_AHI=schema::channel["AHI"].id(); - // CPAP_RDI=schema::channel["RDI"].id(); - -// ZEO_SleepStage = schema::channel["SleepStage"].id(); -// ZEO_ZQ = schema::channel["ZeoZQ"].id(); -// ZEO_Awakenings = schema::channel["Awakenings"].id(); -// ZEO_MorningFeel = schema::channel["MorningFeel"].id(); -// ZEO_TimeInWake = schema::channel["TimeInWake"].id(); -// ZEO_TimeInREM = schema::channel["TimeInREM"].id(); -// ZEO_TimeInLight = schema::channel["TimeInLight"].id(); -// ZEO_TimeInDeep = schema::channel["TimeInDeep"].id(); -// ZEO_TimeToZ = schema::channel["TimeToZ"].id(); schema::channel[CPAP_Leak].setShowInOverview(true); schema::channel[CPAP_RespRate].setShowInOverview(true); @@ -764,7 +395,6 @@ Channel::Channel(ChannelID id, ChanType type, MachineType machtype, ScopeType sc calc[Calc_Middle] = ChannelCalc(id, Calc_Middle, adjustcolor(color, 1.3f, 1.0f, 1.0f), false); calc[Calc_Perc] = ChannelCalc(id, Calc_Perc, adjustcolor(color, 1.1f, 1.2f, 1.0f), false); calc[Calc_Max] = ChannelCalc(id, Calc_Max, adjustcolor(color, 0.5f, 1.2f, 1.0f), false); - calc[Calc_Zero] = ChannelCalc(id, Calc_Zero, Qt::red, false); calc[Calc_LowerThresh] = ChannelCalc(id, Calc_LowerThresh, Qt::blue, false); calc[Calc_UpperThresh] = ChannelCalc(id, Calc_UpperThresh, Qt::red, false); @@ -955,7 +585,7 @@ bool ChannelList::Load(QString filename) it->m_links.push_back(chan); //int i=0; } else { - qWarning() << "Linked channel must be defined first in" << filename << "line" << line; + qWarning() << "Linked channel" << name << ":" << linkid << "should be defined first in" << filename << "line" << line; } } diff --git a/sleepyhead/SleepLib/session.cpp b/sleepyhead/SleepLib/session.cpp index cdce38b4..187d9e2c 100644 --- a/sleepyhead/SleepLib/session.cpp +++ b/sleepyhead/SleepLib/session.cpp @@ -123,7 +123,7 @@ bool Session::OpenEvents() // qWarning() << "Error Loading Events" << filename; return false; } - qDebug() << "Loading" << s_machine->loaderName() << "Events" << filename; + qDebug() << "Loading" << s_machine->loaderName().toLocal8Bit().data() << "Events:" << filename.toLocal8Bit().data(); return s_events_loaded = true; } diff --git a/sleepyhead/help.cpp b/sleepyhead/help.cpp index 0cf07bba..9ddfdf90 100644 --- a/sleepyhead/help.cpp +++ b/sleepyhead/help.cpp @@ -62,7 +62,7 @@ Help::Help(QWidget *parent) : QTimer::singleShot(50,this, SLOT(startup())); connect(helpEngine->contentWidget(), SIGNAL(linkActivated(QUrl)), helpBrowser, SLOT(setSource(QUrl))); - connect(helpEngine->indexWidget(), SIGNAL(linkActivated(QUrl)), helpBrowser, SLOT(setSource(QUrl))); + connect(helpEngine->indexWidget(), SIGNAL(linkActivated(QUrl, QString)), helpBrowser, SLOT(setSource(QUrl))); connect(helpBrowser, SIGNAL(forwardAvailable(bool)), this, SLOT(forwardAvailable(bool))); connect(helpBrowser, SIGNAL(backwardAvailable(bool)), this, SLOT(backwardAvailable(bool))); connect(helpEngine->searchEngine(), SIGNAL(searchingFinished(int)), this, SLOT(on_searchComplete(int))); @@ -86,7 +86,7 @@ Help::~Help() disconnect(helpEngine->searchEngine(), SIGNAL(searchingFinished(int)), this, SLOT(on_searchComplete(int))); disconnect(helpEngine->contentWidget(), SIGNAL(linkActivated(QUrl)), helpBrowser, SLOT(setSource(QUrl))); - disconnect(helpEngine->indexWidget(), SIGNAL(linkActivated(QUrl)), helpBrowser, SLOT(setSource(QUrl))); + disconnect(helpEngine->indexWidget(), SIGNAL(linkActivated(QUrl, QString)), helpBrowser, SLOT(setSource(QUrl))); disconnect(helpBrowser, SIGNAL(backwardAvailable(bool)), this, SLOT(backwardAvailable(bool))); disconnect(helpBrowser, SIGNAL(forwardAvailable(bool)), this, SLOT(forwardAvailable(bool))); diff --git a/sleepyhead/logger.cpp b/sleepyhead/logger.cpp index ac78f58a..b5bf2cf9 100644 --- a/sleepyhead/logger.cpp +++ b/sleepyhead/logger.cpp @@ -49,7 +49,7 @@ void MyOutputHandler(QtMsgType type, const QMessageLogContext &context, const QS } #ifdef ASSERTS_SUCK // else { - fprintf(stderr, "%s\n", msg.toLocal8Bit().data()); +// fprintf(stderr, "%s\n", msg.toLocal8Bit().data()); // } #endif diff --git a/sleepyhead/main.cpp b/sleepyhead/main.cpp index 032f8f56..32362779 100644 --- a/sleepyhead/main.cpp +++ b/sleepyhead/main.cpp @@ -92,8 +92,6 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); QStringList args = QCoreApplication::arguments(); - // MigrateSettings(); - QSettings settings(getDeveloperName(), getAppName()); QString lastlanguage = settings.value(LangSetting, "").toString(); @@ -131,6 +129,11 @@ int main(int argc, char *argv[]) initializeLogger(); + mainwin = new MainWindow; + qDebug() << STR_AppName.toLocal8Bit().data() << VersionString.toLocal8Bit().data() << "built with Qt" << QT_VERSION_STR << "on" << __DATE__ << __TIME__; +#ifdef BROKEN_OPENGL_BUILD + qDebug() << "This build has been created especially for computers with older graphics hardware.\n"; +#endif //////////////////////////////////////////////////////////////////////////////////////////// // Language Selection @@ -251,21 +254,6 @@ retry_directory: } } - //////////////////////////////////////////////////////////////////////////////////////////// - // Register Importer Modules for autoscanner - //////////////////////////////////////////////////////////////////////////////////////////// - schema::init(); - PRS1Loader::Register(); - ResmedLoader::Register(); - IntellipapLoader::Register(); - FPIconLoader::Register(); - WeinmannLoader::Register(); - CMS50Loader::Register(); - CMS50F37Loader::Register(); - MD300W1Loader::Register(); - - schema::setOrders(); // could be called in init... - /////////////////////////////////////////////////////////////////////////////////////////// // Initialize preferences system (Don't use PREF before this point) /////////////////////////////////////////////////////////////////////////////////////////// @@ -356,17 +344,31 @@ retry_directory: qDebug() << "Selected Font" << QApplication::font().family(); + //////////////////////////////////////////////////////////////////////////////////////////// + // Register Importer Modules for autoscanner + //////////////////////////////////////////////////////////////////////////////////////////// + schema::init(); + PRS1Loader::Register(); + ResmedLoader::Register(); + IntellipapLoader::Register(); + FPIconLoader::Register(); + WeinmannLoader::Register(); + CMS50Loader::Register(); + CMS50F37Loader::Register(); + MD300W1Loader::Register(); + + schema::setOrders(); // could be called in init... + // Scan for user profiles Profiles::Scan(); Q_UNUSED(changing_language) - MainWindow w; - mainwin = &w; if (check_updates) { mainwin->CheckForUpdates(); } - w.show(); + mainwin->SetupGUI(); + mainwin->show(); return a.exec(); } diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index a9b2b05f..3a9a336a 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -69,21 +69,44 @@ MainWindow::MainWindow(QWidget *parent) : ui(new Ui::MainWindow) { ui->setupUi(this); + ui->logText->setPlainText("00000: Startup: SleepyHead Logger initialized"); if (logger) { connect(logger, SIGNAL(outputLog(QString)), this, SLOT(logMessage(QString))); } + // Initialise sleepyHead app registry stuff + QSettings settings(getDeveloperName(), getAppName()); + + // Load previous Window geometry (this is currently broken on Mac as of Qt5.2.1) + restoreGeometry(settings.value("MainWindow/geometry").toByteArray()); + + + // Nifty Notification popups in System Tray (uses Growl on Mac) + if (QSystemTrayIcon::isSystemTrayAvailable() && QSystemTrayIcon::supportsMessages()) { + systray = new QSystemTrayIcon(QIcon(":/icons/bob-v3.0.png"), this); + systray->show(); + systraymenu = new QMenu(this); + systray->setContextMenu(systraymenu); + QAction *a = systraymenu->addAction(STR_TR_SleepyHead + " v" + VersionString); + a->setEnabled(false); + systraymenu->addSeparator(); + systraymenu->addAction(tr("&About"), this, SLOT(on_action_About_triggered())); + systraymenu->addAction(tr("Check for &Updates"), this, SLOT(on_actionCheck_for_Updates_triggered())); + systraymenu->addSeparator(); + systraymenu->addAction(tr("E&xit"), this, SLOT(close())); + } else { // if not available, the messages will popup in the taskbar + systray = nullptr; + systraymenu = nullptr; + } + +} + +void MainWindow::SetupGUI() +{ QString version = getBranchVersion(); - setWindowTitle(STR_TR_SleepyHead + QString(" %1").arg(version)); - qDebug() << STR_TR_SleepyHead << VersionString << "built with Qt" << QT_VERSION_STR << "on" << __DATE__ << __TIME__; - -#ifdef BROKEN_OPENGL_BUILD - qDebug() << "This build has been created especially for computers with older graphics hardware.\n"; -#endif - #ifdef Q_OS_MAC ui->action_About->setMenuRole(QAction::ApplicationSpecificRole); @@ -161,12 +184,6 @@ MainWindow::MainWindow(QWidget *parent) : first_load = true; - // Initialise sleepyHead app registry stuff - QSettings settings(getDeveloperName(), getAppName()); - - // Load previous Window geometry (this is currently broken on Mac as of Qt5.2.1) - restoreGeometry(settings.value("MainWindow/geometry").toByteArray()); - profileSelector = new ProfileSelector(ui->tabWidget); ui->tabWidget->insertTab(0, profileSelector, STR_TR_Profile); @@ -176,32 +193,11 @@ MainWindow::MainWindow(QWidget *parent) : // Start with the new Profile Tab ui->tabWidget->setCurrentWidget(profileSelector); // setting this to daily shows the cube during loading.. - // Nifty Notification popups in System Tray (uses Growl on Mac) - if (QSystemTrayIcon::isSystemTrayAvailable() && QSystemTrayIcon::supportsMessages()) { - systray = new QSystemTrayIcon(QIcon(":/icons/bob-v3.0.png"), this); - systray->show(); - systraymenu = new QMenu(this); - systray->setContextMenu(systraymenu); - QAction *a = systraymenu->addAction(STR_TR_SleepyHead + " v" + VersionString); - a->setEnabled(false); - systraymenu->addSeparator(); - systraymenu->addAction(tr("&About"), this, SLOT(on_action_About_triggered())); - systraymenu->addAction(tr("Check for &Updates"), this, SLOT(on_actionCheck_for_Updates_triggered())); - systraymenu->addSeparator(); - systraymenu->addAction(tr("E&xit"), this, SLOT(close())); - } else { // if not available, the messages will popup in the taskbar - systray = nullptr; - systraymenu = nullptr; - } - ui->toolBox->setCurrentIndex(0); bool b = AppSetting->rightSidebarVisible(); ui->action_Sidebar_Toggle->setChecked(b); ui->toolBox->setVisible(b); -// ui->statisticsView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); -// ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks); - on_tabWidget_currentChanged(0); #ifndef REMSTAR_M_SUPPORT @@ -242,6 +238,26 @@ void MainWindow::closeEvent(QCloseEvent * event) QThread::msleep(1000); QApplication::processEvents(); } + schema::channel.Save(); + if (p_profile) { + CloseProfile(); + } + + // Shutdown and Save the current User profile + Profiles::Done(); + + // Save current window position + QSettings settings(getDeveloperName(), getAppName()); + settings.setValue("MainWindow/geometry", saveGeometry()); + + // Trash anything allocated by the Graph objects + DestroyGraphGlobals(); + + if (systraymenu) delete systraymenu; + + disconnect(logger, SIGNAL(outputLog(QString)), this, SLOT(logMessage(QString))); + shutdownLogger(); + runonce = true; } else { qDebug() << "Qt is still calling closevent multiple times"; @@ -249,30 +265,8 @@ void MainWindow::closeEvent(QCloseEvent * event) } } -extern MainWindow *mainwin; MainWindow::~MainWindow() { - schema::channel.Save(); - if (p_profile) { - CloseProfile(); - } - - // Shutdown and Save the current User profile - Profiles::Done(); - - // Save current window position - QSettings settings(getDeveloperName(), getAppName()); - settings.setValue("MainWindow/geometry", saveGeometry()); - - // Trash anything allocated by the Graph objects - DestroyGraphGlobals(); - - if (systraymenu) delete systraymenu; - - disconnect(logger, SIGNAL(outputLog(QString)), this, SLOT(logMessage(QString))); - shutdownLogger(); - - mainwin = nullptr; delete ui; } @@ -370,6 +364,8 @@ QString GenerateWelcomeHTML(); bool MainWindow::OpenProfile(QString profileName, bool skippassword) { + qDebug() << "Opening profile" << profileName; + auto pit = Profiles::profiles.find(profileName); if (pit == Profiles::profiles.end()) return false; @@ -488,7 +484,7 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword) PopulatePurgeMenu(); AppSetting->setProfileName(p_profile->user->userName()); - mainwin->setWindowTitle(STR_TR_SleepyHead + QString(" %1 (" + tr("Profile") + ": %2)").arg(getBranchVersion()).arg(AppSetting->profileName())); + setWindowTitle(STR_TR_SleepyHead + QString(" %1 (" + tr("Profile") + ": %2)").arg(getBranchVersion()).arg(AppSetting->profileName())); ui->oximetryButton->setDisabled(false); ui->dailyButton->setDisabled(false); @@ -720,6 +716,7 @@ QStringList getDriveList() return drivelist; } +extern MainWindow * mainwin; void ImportDialogScan::cancelbutton() { mainwin->importScanCancelled = true; @@ -1795,6 +1792,9 @@ void MainWindow::on_actionPurge_Current_Day_triggered() void MainWindow::on_actionRebuildCPAP(QAction *action) { + ui->tabWidget->setCurrentWidget(welcome); // Daily view can't run during rebuild + QApplication::processEvents(); + QString data = action->data().toString(); QString cls = data.section(":",0,0); QString serial = data.section(":", 1); diff --git a/sleepyhead/mainwindow.h b/sleepyhead/mainwindow.h index dcd02a5f..ab662694 100644 --- a/sleepyhead/mainwindow.h +++ b/sleepyhead/mainwindow.h @@ -82,6 +82,9 @@ class MainWindow : public QMainWindow explicit MainWindow(QWidget *parent = 0); ~MainWindow(); + //! \brief Setup the rest of the GUI stuff + void SetupGUI(); + //! \brief Update the list of Favourites (Bookmarks) in the right sidebar. void updateFavourites(); diff --git a/sleepyhead/profileselector.cpp b/sleepyhead/profileselector.cpp index 8365671a..e9279940 100644 --- a/sleepyhead/profileselector.cpp +++ b/sleepyhead/profileselector.cpp @@ -214,8 +214,6 @@ void ProfileSelector::updateProfileHighlight(QString name) Profile *ProfileSelector::SelectProfile(QString profname, bool skippassword=false) { - qDebug() << "Selecting new profile" << profname; - auto pit = Profiles::profiles.find(profname); if (pit == Profiles::profiles.end()) return nullptr; @@ -286,8 +284,7 @@ void ProfileSelector::on_buttonOpenProfile_clicked() { if (ui->profileView->currentIndex().isValid()) { QString name = proxy->data(proxy->index(ui->profileView->currentIndex().row(), 0, QModelIndex()), Qt::UserRole+2).toString(); - qDebug() << "Opening" << name; - SelectProfile(name); + mainwin->OpenProfile(name); } } diff --git a/sleepyhead/translation.cpp b/sleepyhead/translation.cpp index 601b8b90..e7994a5b 100644 --- a/sleepyhead/translation.cpp +++ b/sleepyhead/translation.cpp @@ -49,7 +49,7 @@ void initTranslations(QSettings & settings) { #endif QDir dir(transdir); - qDebug() << "Scanning \"" << transdir << "\" for translations"; + qDebug() << "Scanning" << transdir.toLocal8Bit().data(); dir.setFilter(QDir::Files); dir.setNameFilters(QStringList("*.qm")); @@ -64,11 +64,12 @@ void initTranslations(QSettings & settings) { langNames[en]="English US"; // Scan through available translations, and add them to the list + QStringList availtrans; for (const auto & fi : list) { QString name = fi.fileName().section('.', 0, 0); QString code = fi.fileName().section('.', 1, 1); - qDebug() << "Detected" << name << "Translation"; + availtrans.push_back(name); if (langNames.contains(code)) { name = langNames[code]; @@ -79,6 +80,7 @@ void initTranslations(QSettings & settings) { langFiles[code]=fi.fileName(); } + qDebug() << "Available Translations:" << QString(availtrans.join(", ")).toLocal8Bit().data(); if (language.isEmpty() || !langNames.contains(language)) { QDialog langsel(nullptr, Qt::CustomizeWindowHint | Qt::WindowTitleHint);