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

Clean up list of events shown in TAP

Browse Source
This commit is contained in:
Mark Watkins 2016-03-08 12:31:55 +10:00
parent 9ff8389a91
commit 1266c750b5
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sleepyhead/Graphs/MinutesAtPressure.cpp
View File

@ -290,7 +290,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
for (int k=0; k<ipap.chans.size(); ++k) { for (int k=0; k<ipap.chans.size(); ++k) {
ChannelID ch = ipap.chans.at(k); ChannelID ch = ipap.chans.at(k);
//(ch != CPAP_AHI) && //(ch != CPAP_AHI) &&
if ((ch != CPAP_Hypopnea) && (ch != CPAP_Obstructive) && (ch != CPAP_ClearAirway) && (ch != CPAP_Apnea)) continue; //if ((ch != CPAP_Hypopnea) && (ch != CPAP_Obstructive) && (ch != CPAP_ClearAirway) && (ch != CPAP_Apnea)) continue;
schema::Channel & chan = schema::channel[ch]; schema::Channel & chan = schema::channel[ch];
QColor col = chan.defaultColor(); QColor col = chan.defaultColor();
col.setAlpha(50); col.setAlpha(50);
@ -855,11 +855,11 @@ void PressureInfo::finishCalcs()
} }
ChannelID cod; ChannelID cod;
chans.push_front(CPAP_AHI); //chans.push_front(CPAP_AHI);
int size = events[CPAP_Obstructive].size(); int size = events[CPAP_Obstructive].size();
events[CPAP_AHI].resize(size); /* events[CPAP_AHI].resize(size);
QHash<unsigned int, QVector<int> >::iterator OB = events.find(CPAP_Obstructive); QHash<unsigned int, QVector<int> >::iterator OB = events.find(CPAP_Obstructive);
@ -882,7 +882,7 @@ void PressureInfo::finishCalcs()
val += CA.value()[i]; val += CA.value()[i];
events[CPAP_AHI][i] = val; events[CPAP_AHI][i] = val;
} } */
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
@ -912,7 +912,16 @@ void RecalcMAP::run()
QHash<ChannelID, QMap<EventStoreType, EventDataType> > events; QHash<ChannelID, QMap<EventStoreType, EventDataType> > events;
// Get the channels for specified Channel types // Get the channels for specified Channel types
QList<ChannelID> chans = day->getSortedMachineChannels(schema::SPAN | schema::FLAG | schema::MINOR_FLAG); QList<ChannelID> chans = day->getSortedMachineChannels(schema::FLAG);
chans.removeAll(CPAP_VSnore);
chans.removeAll(CPAP_VSnore2);
chans.removeAll(CPAP_FlowLimit);
chans.removeAll(CPAP_RERA);
// for (int i=0;i<chans.size();i++) {
// schema::Channel &chan = schema::channel[chans.at(i)];
// qDebug() << chan.fullname();
// }
ChannelID ipapcode = (day->channelExists(CPAP_IPAP)) ? CPAP_IPAP : CPAP_Pressure; ChannelID ipapcode = (day->channelExists(CPAP_IPAP)) ? CPAP_IPAP : CPAP_Pressure;
ChannelID epapcode = (day->channelExists(CPAP_EPAP)) ? CPAP_EPAP : 0; ChannelID epapcode = (day->channelExists(CPAP_EPAP)) ? CPAP_EPAP : 0;