diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp index 3fb90d60..a2373744 100644 --- a/Graphs/gSummaryChart.cpp +++ b/Graphs/gSummaryChart.cpp @@ -44,6 +44,7 @@ void SummaryChart::SetDay(Day * nullday) m_times.clear(); m_days.clear(); m_hours.clear(); + m_badcodes.clear(); m_miny=999999999; m_maxy=-999999999; m_minx=0; @@ -105,7 +106,8 @@ void SummaryChart::SetDay(Day * nullday) for (int i=0;imachine_type()!=m_machinetype) continue; - if (type==ST_HOURS || type==ST_SESSIONS || day->channelHasData(code) || day->settingExists(code)) { // too many lookups happening here.. stop the crap.. + bool hascode=day->channelHasData(code) || day->settingExists(code); + if (type==ST_HOURS || type==ST_SESSIONS || hascode) { // too many lookups happening here.. stop the crap.. m_days[dn]=day; switch(m_type[j]) { case ST_AVG: tmp=day->avg(code); break; @@ -139,6 +141,8 @@ void SummaryChart::SetDay(Day * nullday) break; // } + } else { + m_badcodes[code]=1; } } } @@ -430,6 +434,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height) for (int j=0;j m_colors; QVector m_codes; + QHash m_badcodes; QVector m_type; QHash > m_values; QHash > m_times; diff --git a/daily.cpp b/daily.cpp index 2e39c399..f06f7275 100644 --- a/daily.cpp +++ b/daily.cpp @@ -201,8 +201,8 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw) MP->AddLayer(AddCPAP(new gLineChart(CPAP_MaskPressure,Qt::blue,false))); RR->AddLayer(AddCPAP(new gLineChart(CPAP_RespRate,Qt::darkMagenta,square))); MV->AddLayer(AddCPAP(new gLineChart(CPAP_MinuteVent,Qt::darkCyan,square))); - TV->AddLayer(AddCPAP(new gLineChart(CPAP_TidalVolume,Qt::yellow,square))); - TV->AddLayer(AddCPAP(new gLineChart("TidalVolume2",Qt::magenta,square))); + TV->AddLayer(AddCPAP(new gLineChart(CPAP_TidalVolume,Qt::magenta,square))); + //TV->AddLayer(AddCPAP(new gLineChart("TidalVolume2",Qt::magenta,square))); FLG->AddLayer(AddCPAP(new gLineChart(CPAP_FLG,Qt::darkBlue,true))); //RE->AddLayer(AddCPAP(new gLineChart(CPAP_RespiratoryEvent,Qt::magenta,true))); IE->AddLayer(AddCPAP(new gLineChart(CPAP_IE,Qt::darkRed,square))); diff --git a/icons/arrow-end.png b/icons/arrow-end.png index 59474a81..3dae4151 100644 Binary files a/icons/arrow-end.png and b/icons/arrow-end.png differ