From 90990ad66d9f727c1d7b3d53101c2f168f70100d Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 8 Jun 2018 08:03:20 +1000 Subject: [PATCH] Prune some old commented out code --- .../SleepLib/loader_plugins/resmed_loader.cpp | 274 +----------------- sleepyhead/daily.h | 13 - sleepyhead/overview.cpp | 86 ------ 3 files changed, 7 insertions(+), 366 deletions(-) diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp index 3465849c..9927f250 100644 --- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp @@ -1102,267 +1102,8 @@ int ResmedLoader::scanFiles(Machine * mach, const QString & datalog_path) #endif return resdayList.size(); -} /*// Check for duplicates - if (newfiles.contains(filename)) { - // Not sure what to do with it.. delete it? check compress status and delete the other one? - // Either way we don't want to process so skip it - qDebug() << "Duplicate EDF file detected" << filename; - continue; - } +} - QString fullname = fi.canonicalFilePath(); - - // Peek inside the EDF file and get the EDFDuration record for the session matching that follows - EDFduration dur = getEDFDuration(fullname); - dur.filename = filename; - - if (dur.start != dur.end) { // make sure empty EVE's are skipped - - // Insert into newfiles map for later processing - QMap::iterator it = newfiles.insert(filename, dur); - - // And index in filesbytype for quick lookup by type - filesbytype[dur.type].append(&it.value()); - } - } -#ifdef DEBUG_EFFICIENCY - qDebug() << "ResmedLoader::scanFiles() EDF Duration scan took" << time.elapsed() << "ms"; -#endif - - QList EDForder; - EDForder.push_back(EDF_PLD); - EDForder.push_back(EDF_BRP); - EDForder.push_back(EDF_SAD); - QHash::iterator gi; - - emit setProgressMax(filesbytype[EDF_PLD].size() + filesbytype[EDF_BRP].size() + filesbytype[EDF_SAD].size()); - cnt = 0; - - for (int i=0; i<3; i++) { - EDFType basetype = EDForder.takeFirst(); - - // Process PLD files - QList & LIST = filesbytype[basetype]; - int base_size = LIST.size(); - for (int f=0; f < base_size; ++f) { - if ((cnt % 50) == 0) { - emit setProgressValue(cnt); - QApplication::processEvents(); - } - cnt++; - const EDFduration * dur = LIST.at(f); - - quint32 start = dur->start; - if (start == 0) continue; - - quint32 end = dur->end; - QHash grp; - -// grp[EDF_PLD] = QStringList(); -// grp[EDF_SAD] = QStringList(); -// grp[EDF_BRP] = QStringList(); -// grp[EDF_EVE] = QStringList(); -// grp[EDF_CSL] = QStringList(); - - - grp[basetype].append(create_backups ? backup(dur->path, backup_path) : dur->path); - - - QStringList files; - files.append(dur->filename); - - for (int o=0; o & EDF_list = filesbytype[type]; - QList::iterator item; - QList::iterator list_end = EDF_list.end(); - for (item = EDF_list.begin(); item != list_end; ++item) { - const EDFduration * dur2 = *item; - if (dur2->start == 0) continue; - - // Do the sessions Overlap? - if ((start < dur2->end) && ( dur2->start < end)) { - start = qMin(start, dur2->start); - end = qMax(end, dur2->end); - - files.append(dur2->filename); - - grp[type].append(create_backups ? backup(dur2->path, backup_path) : dur2->path); - - filesbytype[type].erase(item); - } - } - - } - - // EVE annotation files can cover multiple sessions - QList & EDF_list = filesbytype[EDF_EVE]; - QList::iterator item; - QList::iterator list_end = EDF_list.end(); - for (item = EDF_list.begin(); item != list_end; ++item) { - const EDFduration * dur2 = *item; - if (dur2->start == 0) continue; - - // Do the sessions Overlap? - if ((start < dur2->end) && ( dur2->start < end)) { -// start = qMin(start, dur2->start); -// end = qMax(end, dur2->end); - - files.append(dur2->filename); - - grp[EDF_EVE].append(create_backups ? backup(dur2->path, backup_path) : dur2->path); - } - } - - // CSL files contain CSR flags - QList & CSL_list = filesbytype[EDF_CSL]; - list_end = CSL_list.end(); - for (item = CSL_list.begin(); item != list_end; ++item) { - const EDFduration * dur2 = *item; - if (dur2->start == 0) continue; - - // Do the sessions Overlap? - if ((start < dur2->end) && ( dur2->start < end)) { -// start = qMin(start, dur2->start); -// end = qMax(end, dur2->end); - - files.append(dur2->filename); - - grp[EDF_CSL].append(create_backups ? backup(dur2->path, backup_path) : dur2->path); - } - } - - - - if (mach->SessionExists(start) == nullptr) { - //EDFGroup group(grp[EDF_BRP], grp[EDF_EVE], grp[EDF_PLD], grp[EDF_SAD], grp[EDF_CSL]); - if (grp.size() > 0) { - queTask(new ResmedImport(this, start, grp, mach)); - for (int i=0; i::iterator it; - QMap::iterator itn; - QMap::iterator it_end = newfiles.end(); - - // Now scan through all new files, and group together into sessions - for (it = newfiles.begin(); it != it_end; ++it) { - quint32 start = it.value().start; - - if (start == 0) - continue; - - const QString & file = it.key(); - - quint32 end = it.value().end; - - - QString type = file.section("_", -1).section(".", 0, 0).toUpper(); - - QString newpath = create_backups ? backup(it.value().path, backup_path) : it.value().path; - - EDFGroup group; - - if (type == "BRP") group.BRP = newpath; - else if (type == "EVE") { - if (group.BRP.isEmpty()) { - qDebug() << "Jedimark's Order theory was wrong.. EVE's need to be parsed seperately!"; - } - group.EVE = newpath; - } - - else if (type == "PLD") group.PLD = newpath; - else if (type == "SAD") group.SAD = newpath; - else continue; - - QStringList sessfiles; - sessfiles.push_back(file); - - for (itn = it+1; itn != it_end; ++itn) { - if (itn.value().start == 0) continue; // already processed - const EDFduration & dur2 = itn.value(); - - // Do the sessions Overlap? - if ((start < dur2.end) && ( dur2.start < end)) { - - start = qMin(start, dur2.start); - end = qMax(end, dur2.end); - - type = itn.key().section("_",-1).section(".",0,0).toUpper(); - - newpath = create_backups ? backup(dur2.path, backup_path) : dur2.path; - - if (type == "BRP") { - if (!group.BRP.isEmpty()) { - itn.value().start = 0; - continue; - } - group.BRP = newpath; - } else if (type == "EVE") { - if (!group.EVE.isEmpty()) { - itn.value().start = 0; - continue; - } - group.EVE = newpath; - } else if (type == "PLD") { - if (!group.PLD.isEmpty()) { - itn.value().start = 0; - continue; - } - group.PLD = newpath; - } else if (type == "SAD") { - if (!group.SAD.isEmpty()) { - itn.value().start = 0; - continue; - } - group.SAD = newpath; - } else { - itn.value().start = 0; - continue; - } - sessfiles.push_back(itn.key()); - - itn.value().start = 0; - } - } - - if (mach->SessionExists(start) == nullptr) { - queTask(new ResmedImport(this, start, group, mach)); - for (int i=0; i < sessfiles.size(); ++i) { - skipfiles[sessfiles.at(i)] = start; - } - } - } */ - - // Run the tasks... - /* int c = countTasks(); - runTasks(AppSetting->multithreading()); - - newSkipFiles.append(skipfiles.keys()); - impfile.remove(); - - if (impfile.open(QFile::WriteOnly)) { - QTextStream out(&impfile); - out << mach->serial() << "\n"; - QHash::iterator skit; - QHash::iterator skit_end = skipfiles.end(); - for (skit = skipfiles.begin(); skit != skit_end; ++skit) { - QString a = QString("%1,%2\n").arg(skit.key()).arg(skit.value());; - out << a; - } - out.flush(); - } - impfile.close(); - - return c; -}*/ void DetectPAPMode(Session *sess) { if (sess->channelDataExists(CPAP_Pressure)) { @@ -1388,6 +1129,7 @@ void DetectPAPMode(Session *sess) } } + void StoreSummarySettings(Session * sess, STRRecord & R) { if (R.mode >= 0) { @@ -3160,9 +2902,7 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path) return true; } -void ResInitModelMap() -{ - // don't really need this anymore + // don't really need this anymore, but perhaps it's useful info for reference // Resmed_Model_Map = { // { "S9 Escape", { 36001, 36011, 36021, 36141, 36201, 36221, 36261, 36301, 36361 } }, // { "S9 Escape Auto", { 36002, 36012, 36022, 36302, 36362 } }, @@ -3185,6 +2925,8 @@ void ResInitModelMap() // { "S8 AutoSet II", { 33129 } }, // }; +void setupResTransMap() +{ //////////////////////////////////////////////////////////////////////////// // Translation lookup table for non-english machines //////////////////////////////////////////////////////////////////////////// @@ -3392,10 +3134,8 @@ void ResmedLoader::initChannels() chan->addOption(0, STR_TR_Off); chan->addOption(1, STR_TR_On); - - // Modelmap needs channels initalized above!!! - ResInitModelMap(); - + // Setup ResMeds signal name translation map + setupResTransMap(); } bool resmed_initialized = false; diff --git a/sleepyhead/daily.h b/sleepyhead/daily.h index 2ff47ba5..831f9e8c 100644 --- a/sleepyhead/daily.h +++ b/sleepyhead/daily.h @@ -306,24 +306,11 @@ private: QHash graphlist; -// QList OXIData; -// QList CPAPData; -// QList STAGEData; -// QList POSData; QHash GraphToggles; QVector GraphAction; QGLContext *offscreen_context; QList splitter_sizes; -// Layer * AddCPAP(Layer *d) { CPAPData.push_back(d); return d; } -// Layer * AddSTAGE(Layer *d) { STAGEData.push_back(d); return d; } -// Layer * AddPOS(Layer *d) { POSData.push_back(d); return d; } -// Layer * AddOXI(Layer *d) { OXIData.push_back(d); return d; } - -// void UpdateCPAPGraphs(Day *day); -// void UpdateOXIGraphs(Day *day); -// void UpdateSTAGEGraphs(Day *day); -// void UpdatePOSGraphs(Day *day); Ui::Daily *ui; QDate previous_date; diff --git a/sleepyhead/overview.cpp b/sleepyhead/overview.cpp index 691bbbbe..b0721036 100644 --- a/sleepyhead/overview.cpp +++ b/sleepyhead/overview.cpp @@ -158,7 +158,6 @@ void Overview::RebuildGraphs(bool reset) AHI = createGraph("AHIBreakdown", STR_TR_AHI, tr("Apnea\nHypopnea\nIndex")); } - ahi = new gAHIChart(); AHI->AddLayer(ahi); @@ -177,27 +176,6 @@ void Overview::RebuildGraphs(bool reset) ttia = new gTTIAChart(); TTIA->AddLayer(ttia); -// LK = createGraph("Leaks", STR_TR_Leaks, STR_TR_UnintentionalLeaks + "\n(" + STR_UNIT_LPM + ")"); -// LK->AddLayer(new gSummaryChart(CPAP_Leak, MT_CPAP)); - -// TOTLK = createGraph("TotalLeaks", STR_TR_TotalLeaks, STR_TR_TotalLeaks + "\n(" + STR_UNIT_LPM + ")"); -// TOTLK->AddLayer(new gSummaryChart(CPAP_LeakTotal, MT_CPAP)); - -// NLL = createGraph("TimeInLL", tr("% in %1").arg(schema::channel[CPAP_LargeLeak].label()), tr("Large Leaks\n(% of night)")); -// NLL->AddLayer(nll = new gSummaryChart("TimeInLL", MT_CPAP)); -// nll->addCalc(CPAP_LargeLeak, ST_SPH); - -// RR = createGraph(schema::channel[CPAP_RespRate].code(), schema::channel[CPAP_RespRate].label(), schema::channel[CPAP_RespRate].fullname()+"\n"+schema::channel[CPAP_RespRate].units()); -// RR->AddLayer(new gSummaryChart(CPAP_RespRate, MT_CPAP)); -// TV = createGraph(schema::channel[CPAP_TidalVolume].code(),schema::channel[CPAP_TidalVolume].label(), tr("Tidal\nVolume\n(ml)")); -// TV->AddLayer(new gSummaryChart(CPAP_TidalVolume, MT_CPAP)); -// MV = createGraph(schema::channel[CPAP_MinuteVent].code(), schema::channel[CPAP_MinuteVent].label(), tr("Minute\nVentilation\n(L/min)")); -// MV->AddLayer(new gSummaryChart(CPAP_MinuteVent, MT_CPAP)); -// FL = createGraph(schema::channel[CPAP_FLG].code(), schema::channel[CPAP_FLG].label(), STR_TR_FlowLimit); -// FL->AddLayer(new gSummaryChart(CPAP_FLG, MT_CPAP)); -// SN = createGraph(schema::channel[CPAP_Snore].code(), schema::channel[CPAP_Snore].label(), schema::channel[CPAP_Snore].fullname()+"\n"+schema::channel[CPAP_Snore].units()); -// SN->AddLayer(new gSummaryChart(CPAP_Snore, MT_CPAP)); - QHash::iterator chit; QHash::iterator chit_end = schema::channel.channels.end(); for (chit = schema::channel.channels.begin(); chit != chit_end; ++chit) { @@ -227,25 +205,6 @@ void Overview::RebuildGraphs(bool reset) } -/* PULSE = createGraph(schema::channel[OXI_Pulse].code(), schema::channel[OXI_Pulse].label(), STR_TR_PulseRate + "\n(" + STR_UNIT_BPM + ")"); - PULSE->AddLayer(new gSummaryChart(OXI_Pulse, MT_OXIMETER)); - - SPO2 = createGraph(schema::channel[OXI_SPO2].code(), schema::channel[OXI_SPO2].label(), tr("Oxygen Saturation\n(%)")); - SPO2->AddLayer(new gSummaryChart(OXI_SPO2, MT_OXIMETER)); - - - NPB = createGraph("TimeInPB", tr("% in %1").arg(schema::channel[CPAP_CSR].label()), tr("%1\n(% of night)").arg(schema::channel[CPAP_LargeLeak].description())); - NPB->AddLayer(npb = new gSummaryChart(tr("% PB"), MT_CPAP)); - npb->addCalc(CPAP_CSR, ST_SPH); - - if (ahicode == CPAP_RDI) { - AHIHR = createGraph(STR_GRAPH_PeakAHI, tr("Peak RDI"), tr("Peak RDI\nShows RDI Clusters\n(RDI/hr)")); - AHIHR->AddLayer(new gSummaryChart(CPAP_RDI, MT_CPAP)); - } else { - AHIHR = createGraph(STR_GRAPH_PeakAHI, tr("Peak AHI"), tr("Peak AHI\nShows AHI Clusters\n(AHI/hr)")); - AHIHR->AddLayer(new gSummaryChart(CPAP_AHI, MT_CPAP)); - } */ - WEIGHT = createGraph(STR_GRAPH_Weight, STR_TR_Weight, STR_TR_Weight, YT_Weight); BMI = createGraph(STR_GRAPH_BMI, STR_TR_BMI, tr("Body\nMass\nIndex")); ZOMBIE = createGraph(STR_GRAPH_Zombie, STR_TR_Zombie, tr("How you felt\n(0-10)")); @@ -257,8 +216,6 @@ void Overview::RebuildGraphs(bool reset) GraphView->resetLayout(); updateGraphCombo(); } - - } gGraph *Overview::createGraph(QString code, QString name, QString units, YTickerType yttype) @@ -344,8 +301,6 @@ void Overview::updateGraphCombo() void Overview::ResetGraphs() { - //qint64 st,et; - //GraphView->GetXBounds(st,et); QDate start = ui->dateStart->date(); QDate end = ui->dateEnd->date(); GraphView->setDay(nullptr); @@ -354,8 +309,6 @@ void Overview::ResetGraphs() if (start.isValid() && end.isValid()) { setRange(start, end); } - - //GraphView->SetXBounds(st,et); } void Overview::ResetGraph(QString name) @@ -448,49 +401,11 @@ void Overview::on_toolButton_clicked() GraphView->SetXBounds(d1, d2); } -//void Overview::on_printButton_clicked() -//{ -// mainwin->PrintReport(GraphView,STR_TR_Overview); // Must be translated the same as PrintReport checks. -//} - void Overview::ResetGraphLayout() { GraphView->resetLayout(); } - -/*void Overview::on_printDailyButton_clicked() -{ - qint64 st,et; - GraphView->GetXBounds(st,et); - - QDate s1=QDateTime::fromTime_t(st/1000L).date(); - QDate s2=QDateTime::fromTime_t(et/1000L).date(); - - int len=p_profile->countDays(MT_UNKNOWN,s1,s2); - if (len>7) { - if (QMessageBox::question(this, "Woah!", "Do you really want to print "+QString::number(len)+" days worth of Daily reports,\n from "+s1.toString(Qt::SystemLocaleShortDate)+" to "+s2.toString(Qt::SystemLocaleShortDate)+"?",QMessageBox::Yes,QMessageBox::No)==QMessageBox::No) { - return; - } - if (len>14) { - int weeks=len/7; - if (QMessageBox::question(this, "Hold Up!", "We are talking about over "+QString::number(weeks)+" weeks of information.\n\nThis will likely take a very long time, and a heck of a lot of paper if your not printing to a PDF file.\n\nAre you really sure?",QMessageBox::Yes,QMessageBox::No)==QMessageBox::No) { - return; - } - if (len>31) { - if (QMessageBox::question(this, "Are you serious!!??", "We are talking about printing a lot of information.\n\nIf your not printing to a PDF file, you must really hate trees.\n\nAre you really REALLY sure?",QMessageBox::Yes,QMessageBox::No)==QMessageBox::No) { - return; - } - } - } - - mainwin->Notify("I'm not going to nag you any more, but it would probably help if I implemented this feature.. ;)"); - - - } else mainwin->Notify("If this was implemented yet, You'd be able to print multiple daily reports right now."); - -}*/ - void Overview::on_rangeCombo_activated(int index) { p_profile->general->setLastOverviewRange(index); @@ -608,7 +523,6 @@ void Overview::on_toggleVisibility_clicked(bool checked) QString s; QIcon *icon = checked ? icon_off : icon_on; - //ui->toggleVisibility->setArrowType(checked ? Qt::UpArrow : Qt::DownArrow); for (int i = 0; i < ui->graphCombo->count(); i++) { s = ui->graphCombo->itemText(i); ui->graphCombo->setItemIcon(i, *icon);