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

Fix Overview SummaryChart glitch showing bad codes, icon update

Browse Source
This commit is contained in:
Mark Watkins 2011-12-01 13:40:23 +10:00
parent 6f5ac14bd3
commit f4600395c9
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Graphs/gSummaryChart.cpp
View File

@ -44,6 +44,7 @@ void SummaryChart::SetDay(Day * nullday)
m_times.clear(); m_times.clear();
m_days.clear(); m_days.clear();
m_hours.clear(); m_hours.clear();
m_badcodes.clear();
m_miny=999999999; m_miny=999999999;
m_maxy=-999999999; m_maxy=-999999999;
m_minx=0; m_minx=0;
@ -105,7 +106,8 @@ void SummaryChart::SetDay(Day * nullday)
for (int i=0;i<d.value().size();i++) { // for each day for (int i=0;i<d.value().size();i++) { // for each day
day=d.value()[i]; day=d.value()[i];
if (day->machine_type()!=m_machinetype) continue; if (day->machine_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; m_days[dn]=day;
switch(m_type[j]) { switch(m_type[j]) {
case ST_AVG: tmp=day->avg(code); break; case ST_AVG: tmp=day->avg(code); break;
@ -139,6 +141,8 @@ void SummaryChart::SetDay(Day * nullday)
break; 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_codes.size();j++) { for (int j=0;j<m_codes.size();j++) {
if (totalcounts[j]==0) continue; if (totalcounts[j]==0) continue;
if (m_badcodes.contains(m_codes[j])) continue;
a=schema::channel[m_codes[j]].label(); a=schema::channel[m_codes[j]].label();
a+=" "; a+=" ";
switch(m_type[j]) { switch(m_type[j]) {

1
Graphs/gSummaryChart.h
View File

@ -33,6 +33,7 @@ class SummaryChart:public Layer
QVector<QColor> m_colors; QVector<QColor> m_colors;
QVector<ChannelID> m_codes; QVector<ChannelID> m_codes;
QHash<ChannelID,char> m_badcodes;
QVector<SummaryType> m_type; QVector<SummaryType> m_type;
QHash<int,QHash<short,EventDataType> > m_values; QHash<int,QHash<short,EventDataType> > m_values;
QHash<int,QHash<short,EventDataType> > m_times; QHash<int,QHash<short,EventDataType> > m_times;

4
daily.cpp
View File

@ -201,8 +201,8 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
MP->AddLayer(AddCPAP(new gLineChart(CPAP_MaskPressure,Qt::blue,false))); MP->AddLayer(AddCPAP(new gLineChart(CPAP_MaskPressure,Qt::blue,false)));
RR->AddLayer(AddCPAP(new gLineChart(CPAP_RespRate,Qt::darkMagenta,square))); RR->AddLayer(AddCPAP(new gLineChart(CPAP_RespRate,Qt::darkMagenta,square)));
MV->AddLayer(AddCPAP(new gLineChart(CPAP_MinuteVent,Qt::darkCyan,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(CPAP_TidalVolume,Qt::magenta,square)));
TV->AddLayer(AddCPAP(new gLineChart("TidalVolume2",Qt::magenta,square))); //TV->AddLayer(AddCPAP(new gLineChart("TidalVolume2",Qt::magenta,square)));
FLG->AddLayer(AddCPAP(new gLineChart(CPAP_FLG,Qt::darkBlue,true))); FLG->AddLayer(AddCPAP(new gLineChart(CPAP_FLG,Qt::darkBlue,true)));
//RE->AddLayer(AddCPAP(new gLineChart(CPAP_RespiratoryEvent,Qt::magenta,true))); //RE->AddLayer(AddCPAP(new gLineChart(CPAP_RespiratoryEvent,Qt::magenta,true)));
IE->AddLayer(AddCPAP(new gLineChart(CPAP_IE,Qt::darkRed,square))); IE->AddLayer(AddCPAP(new gLineChart(CPAP_IE,Qt::darkRed,square)));

BIN
icons/arrow-end.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB