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

A better attempt at the SummaryChart 0 value thing

Browse Source
This commit is contained in:
Mark Watkins 2011-12-04 18:54:39 +10:00
parent c3e3b7a9f1
commit b816bec488
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Graphs/gSummaryChart.cpp
View File

@ -104,12 +104,13 @@ void SummaryChart::SetDay(Day * nullday)
} else { } else {
for (int j=0;j<m_codes.size();j++) { // for each code slice for (int j=0;j<m_codes.size();j++) { // for each code slice
code=m_codes[j]; code=m_codes[j];
//m_values[dn][0]=0;
if (code==CPAP_Leak) suboffset=PROFILE["IntentionalLeak"].toDouble(); else suboffset=0; if (code==CPAP_Leak) suboffset=PROFILE["IntentionalLeak"].toDouble(); else suboffset=0;
type=m_type[j]; type=m_type[j];
for (int i=0;i<d.value().size();i++) { // for each machine object for this day for (int i=0;i<d.value().size();i++) { // for each machine object for this day
day=d.value()[i]; day=d.value()[i];
if (day->machine_type()!=m_machinetype) continue; if (day->machine_type()!=m_machinetype) continue;
m_values[dn][j+1]=0; //m_values[dn][j+1]=0;
bool hascode=day->channelHasData(code) || day->settingExists(code); bool hascode=day->channelHasData(code) || day->settingExists(code);
if (type==ST_HOURS || type==ST_SESSIONS || hascode) { // too many lookups happening here.. stop the crap.. if (type==ST_HOURS || type==ST_SESSIONS || hascode) { // too many lookups happening here.. stop the crap..
@ -137,12 +138,12 @@ void SummaryChart::SetDay(Day * nullday)
tmp-=suboffset; tmp-=suboffset;
if (tmp<0) tmp=0; if (tmp<0) tmp=0;
} }
fnd=true;
total+=tmp; total+=tmp;
m_values[dn][j+1]=tmp; m_values[dn][j+1]=tmp;
if (tmp<m_miny) m_miny=tmp; if (tmp<m_miny) m_miny=tmp;
if (tmp>m_maxy) m_maxy=tmp; if (tmp>m_maxy) m_maxy=tmp;
m_goodcodes[code]=true; m_goodcodes[code]=true;
fnd=true;
break; break;
} }
} }
@ -159,17 +160,36 @@ void SummaryChart::SetDay(Day * nullday)
} else m_hours[dn]=0; } else m_hours[dn]=0;
} }
} }
if (m_graphtype!=GT_SESSIONS)
for (int j=0;j<m_codes.size();j++) { // for each code slice for (int j=0;j<m_codes.size();j++) { // for each code slice
ChannelID code=m_codes[j]; ChannelID code=m_codes[j];
if (!m_goodcodes.contains(code)) { if (!m_goodcodes.contains(code)) {
m_goodcodes[code]=false; m_goodcodes[code]=false;
} } else {
/*if (m_goodcodes[code]) {
for (QHash<int,QHash<short,EventDataType> >::iterator i=m_values.begin();i!=m_values.end();i++) { if (type==ST_HOURS || type==ST_SESSIONS) continue; // too many lookups happening here.. stop the crap..
if (!m_values[i.key()].contains(j+1))
m_values[i.key()][j+1]=30; for (QMap<QDate,QVector<Day *> >::iterator d=PROFILE.daylist.begin();d!=PROFILE.daylist.end();d++) {
tt=QDateTime(d.key(),QTime(0,0,0),Qt::UTC).toTime_t();
dn=tt/86400;
for (int i=0;i<d.value().size();i++) { // for each machine object for this day
day=d.value()[i];
if (day->machine_type()!=m_machinetype) continue;
if (!m_values[dn].contains(j+1)) {
m_days[dn]=day;
m_values[dn][j+1]=0;
if (!m_values[dn].contains(0)) {
m_values[dn][0]=0;
}
if (0<m_miny) m_miny=0;
if (0>m_maxy) m_maxy=0;
m_hours[dn]=day->hours();
}
break;
}
} }
} */ m_empty=false;
}
} }
if (m_graphtype==GT_BAR) { if (m_graphtype==GT_BAR) {
m_miny=0; m_miny=0;