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

More summarychart fixes

Browse Source
This commit is contained in:
Mark Watkins 2011-12-05 00:26:32 +10:00
parent b13bfd0213
commit f80327a31e
4 changed files with 58 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Graphs/gSummaryChart.cpp
View File

@ -168,10 +168,10 @@ void SummaryChart::SetDay(Day * nullday)
m_goodcodes[code]=false; m_goodcodes[code]=false;
} else { } else {
if (type==ST_HOURS || type==ST_SESSIONS || if (type==ST_HOURS || type==ST_SESSIONS || m_zeros[j]) continue;
code=="Weight" || //code=="Weight" ||
code=="BMI" || //code=="BMI" ||
code=="ZombieMeter") continue; // too many lookups happening here.. stop the crap.. //code=="ZombieMeter") continue; // too many lookups happening here.. stop the crap..
for (QMap<QDate,QVector<Day *> >::iterator d=PROFILE.daylist.begin();d!=PROFILE.daylist.end();d++) { 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(); tt=QDateTime(d.key(),QTime(0,0,0),Qt::UTC).toTime_t();
@ -241,10 +241,9 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
rtop=top; rtop=top;
GLShortBuffer *outlines=w.lines(); GLShortBuffer *outlines=w.lines();
QColor blk=Qt::black; QColor blk=Qt::black;
outlines->add(left, top, left, top+height, blk); outlines->add(left, top, left, top+height, left, top+height, left+width,top+height, blk);
outlines->add(left, top+height, left+width,top+height, blk); outlines->add(left+width,top+height, left+width, top, left+width, top, left, top, blk);
outlines->add(left+width,top+height, left+width, top, blk); //if (outlines->full()) qDebug() << "WTF??? Outlines full in SummaryChart::paint()";
outlines->add(left+width, top, left, top, blk);
qint64 minx=w.min_x, maxx=w.max_x; qint64 minx=w.min_x, maxx=w.max_x;
//qint64 minx=m_minx, maxx=m_maxx; //qint64 minx=m_minx, maxx=m_maxx;
@ -375,10 +374,8 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
quads->add(x1,py,x1,py-h,col); quads->add(x1,py,x1,py-h,col);
quads->add(x2,py-h,x2,py,col2); quads->add(x2,py-h,x2,py,col2);
if (barw>2) { if (barw>2) {
outlines->add(x1,py,x1,py-h,blk); outlines->add(x1,py,x1,py-h,x1,py-h,x2,py-h,blk);
outlines->add(x1,py-h,x2,py-h,blk); outlines->add(x1,py,x2,py,x2,py,x2,py-h,blk);
outlines->add(x1,py,x2,py,blk);
outlines->add(x2,py,x2,py-h,blk);
} // if (bar } // if (bar
//py-=h; //py-=h;
totalvalues[0]+=tmp; totalvalues[0]+=tmp;
@ -435,11 +432,10 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
quads->add(x1,py,x1,py-h,col); quads->add(x1,py,x1,py-h,col);
quads->add(x2,py-h,x2,py,col2); quads->add(x2,py-h,x2,py,col2);
if (barw>2) { if (h>0 && barw>2) {
outlines->add(x1,py,x1,py-h,blk); outlines->add(x1,py,x1,py-h,x1,py-h,x2,py-h,blk);
outlines->add(x1,py-h,x2,py-h,blk); outlines->add(x1,py,x2,py,x2,py,x2,py-h,blk);
outlines->add(x1,py,x2,py,blk); if (outlines->full()) qDebug() << "WTF??? Outlines full in SummaryChart::paint()";
outlines->add(x2,py,x2,py-h,blk);
} // if (bar } // if (bar
py-=h; py-=h;
} else if (m_graphtype==GT_LINE) { // if (m_graphtype==GT_BAR } else if (m_graphtype==GT_LINE) { // if (m_graphtype==GT_BAR

3
Graphs/gSummaryChart.h
View File

@ -22,7 +22,7 @@ class SummaryChart:public Layer
virtual void paint(gGraph & w,int left, int top, int width, int height); virtual void paint(gGraph & w,int left, int top, int width, int height);
virtual void SetDay(Day * day=NULL); virtual void SetDay(Day * day=NULL);
virtual bool isEmpty() { return m_empty; } virtual bool isEmpty() { return m_empty; }
void addSlice(ChannelID code, QColor color, SummaryType type) { m_codes.push_back(code); m_colors.push_back(color); m_type.push_back(type); } void addSlice(ChannelID code, QColor color, SummaryType type, bool ignore_zeros) { m_codes.push_back(code); m_colors.push_back(color); m_type.push_back(type); m_zeros.push_back(ignore_zeros); }
virtual void deselect() { virtual void deselect() {
hl_day=-1; hl_day=-1;
} }
@ -34,6 +34,7 @@ class SummaryChart:public Layer
QVector<QColor> m_colors; QVector<QColor> m_colors;
QVector<ChannelID> m_codes; QVector<ChannelID> m_codes;
QHash<ChannelID,bool> m_goodcodes; QHash<ChannelID,bool> m_goodcodes;
QVector<bool> m_zeros;
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;

1
docs/channels.xml
View File

@ -91,6 +91,7 @@ One id code per item
<channel id="0x0804" class="data" scope="!day" name="Height" details="Height" label="Height" unit="cm" color="blue"/> <channel id="0x0804" class="data" scope="!day" name="Height" details="Height" label="Height" unit="cm" color="blue"/>
<channel id="0x0805" class="data" name="Bookmark" details="Session Bookmark" label="Bookmark" unit="duration" color="orange"/> <channel id="0x0805" class="data" name="Bookmark" details="Session Bookmark" label="Bookmark" unit="duration" color="orange"/>
<channel id="0x0806" class="data" name="BMI" details="Body Mass Index" label="BMI" unit="kg/m2" color="orange"/> <channel id="0x0806" class="data" name="BMI" details="Body Mass Index" label="BMI" unit="kg/m2" color="orange"/>
<channel id="0x0807" class="data" name="ZombieMeter" details="How good you feel." label="Alive" unit="%" color="orange"/>
<channel id="0xd000" class="data" scope="!day" unique="true" name="Journal" details="Journal Notes" label="Journal" type="richtext"/> <channel id="0xd000" class="data" scope="!day" unique="true" name="Journal" details="Journal Notes" label="Journal" type="richtext"/>
</group> </group>
<group name="PRS1"> <group name="PRS1">

84
overview.cpp
View File

@ -115,108 +115,108 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
weight=new SummaryChart("Weight",GT_LINE); weight=new SummaryChart("Weight",GT_LINE);
weight->setMachineType(MT_JOURNAL); weight->setMachineType(MT_JOURNAL);
weight->addSlice("Weight",QColor("black"),ST_SETAVG); weight->addSlice("Weight",QColor("black"),ST_SETAVG,true);
WEIGHT->AddLayer(weight); WEIGHT->AddLayer(weight);
bmi=new SummaryChart("BMI",GT_LINE); bmi=new SummaryChart("BMI",GT_LINE);
bmi->setMachineType(MT_JOURNAL); bmi->setMachineType(MT_JOURNAL);
bmi->addSlice("BMI",QColor("dark blue"),ST_SETAVG); bmi->addSlice("BMI",QColor("dark blue"),ST_SETAVG,true);
BMI->AddLayer(bmi); BMI->AddLayer(bmi);
zombie=new SummaryChart("Zombie Meter",GT_LINE); zombie=new SummaryChart("Zombie Meter",GT_LINE);
zombie->setMachineType(MT_JOURNAL); zombie->setMachineType(MT_JOURNAL);
zombie->addSlice("ZombieMeter",QColor("dark red"),ST_SETAVG); zombie->addSlice("ZombieMeter",QColor("dark red"),ST_SETAVG,true);
ZOMBIE->AddLayer(zombie); ZOMBIE->AddLayer(zombie);
pulse=new SummaryChart("Pulse Rate",GT_LINE); pulse=new SummaryChart("Pulse Rate",GT_LINE);
pulse->setMachineType(MT_OXIMETER); pulse->setMachineType(MT_OXIMETER);
pulse->addSlice(OXI_Pulse,QColor("red"),ST_WAVG); pulse->addSlice(OXI_Pulse,QColor("red"),ST_WAVG,true);
pulse->addSlice(OXI_Pulse,QColor("light red"),ST_MIN); pulse->addSlice(OXI_Pulse,QColor("pink"),ST_MIN,true);
pulse->addSlice(OXI_Pulse,QColor("orange"),ST_MAX); pulse->addSlice(OXI_Pulse,QColor("orange"),ST_MAX,true);
PULSE->AddLayer(pulse); PULSE->AddLayer(pulse);
spo2=new SummaryChart("SpO2",GT_LINE); spo2=new SummaryChart("SpO2",GT_LINE);
spo2->setMachineType(MT_OXIMETER); spo2->setMachineType(MT_OXIMETER);
spo2->addSlice(OXI_SPO2,QColor("cyan"),ST_WAVG); spo2->addSlice(OXI_SPO2,QColor("cyan"),ST_WAVG,true);
spo2->addSlice(OXI_SPO2,QColor("light blue"),ST_90P); spo2->addSlice(OXI_SPO2,QColor("light blue"),ST_90P,true);
spo2->addSlice(OXI_SPO2,QColor("blue"),ST_MIN); spo2->addSlice(OXI_SPO2,QColor("blue"),ST_MIN,true);
SPO2->AddLayer(spo2); SPO2->AddLayer(spo2);
uc=new SummaryChart("Hours",GT_BAR); uc=new SummaryChart("Hours",GT_BAR);
uc->addSlice("",QColor("green"),ST_HOURS); uc->addSlice("",QColor("green"),ST_HOURS,true);
UC->AddLayer(uc); UC->AddLayer(uc);
us=new SummaryChart("Hours",GT_SESSIONS); us=new SummaryChart("Hours",GT_SESSIONS);
us->addSlice("",QColor("dark blue"),ST_HOURS); us->addSlice("",QColor("dark blue"),ST_HOURS,true);
us->addSlice("",QColor("blue"),ST_SESSIONS); us->addSlice("",QColor("blue"),ST_SESSIONS,true);
US->AddLayer(us); US->AddLayer(us);
ses=new SummaryChart("Sessions",GT_LINE); ses=new SummaryChart("Sessions",GT_LINE);
ses->addSlice("",QColor("blue"),ST_SESSIONS); ses->addSlice("",QColor("blue"),ST_SESSIONS,true);
SES->AddLayer(ses); SES->AddLayer(ses);
bc=new SummaryChart("AHI",GT_BAR); bc=new SummaryChart("AHI",GT_BAR);
bc->addSlice(CPAP_Hypopnea,QColor("blue"),ST_CPH); bc->addSlice(CPAP_Hypopnea,QColor("blue"),ST_CPH,false);
bc->addSlice(CPAP_Apnea,QColor("dark green"),ST_CPH); bc->addSlice(CPAP_Apnea,QColor("dark green"),ST_CPH,false);
bc->addSlice(CPAP_Obstructive,QColor("#40c0ff"),ST_CPH); bc->addSlice(CPAP_Obstructive,QColor("#40c0ff"),ST_CPH,false);
bc->addSlice(CPAP_ClearAirway,QColor("purple"),ST_CPH); bc->addSlice(CPAP_ClearAirway,QColor("purple"),ST_CPH,false);
AHI->AddLayer(bc); AHI->AddLayer(bc);
set=new SummaryChart("",GT_LINE); set=new SummaryChart("",GT_LINE);
//set->addSlice("SysOneResistSet",QColor("grey"),ST_SETAVG); //set->addSlice("SysOneResistSet",QColor("grey"),ST_SETAVG);
set->addSlice("HumidSet",QColor("blue"),ST_SETWAVG); set->addSlice("HumidSet",QColor("blue"),ST_SETWAVG,false);
set->addSlice("FlexSet",QColor("red"),ST_SETWAVG); set->addSlice("FlexSet",QColor("red"),ST_SETWAVG,false);
set->addSlice("EPR",QColor("red"),ST_SETWAVG); set->addSlice("EPR",QColor("red"),ST_SETWAVG,false);
set->addSlice("SmartFlex",QColor("red"),ST_SETWAVG); set->addSlice("SmartFlex",QColor("red"),ST_SETWAVG,false);
SET->setRecMinY(0); SET->setRecMinY(0);
SET->setRecMaxY(5); SET->setRecMaxY(5);
SET->AddLayer(set); SET->AddLayer(set);
rr=new SummaryChart("breaths/min",GT_LINE); rr=new SummaryChart("breaths/min",GT_LINE);
rr->addSlice(CPAP_RespRate,QColor("light blue"),ST_MIN); rr->addSlice(CPAP_RespRate,QColor("light blue"),ST_MIN,true);
rr->addSlice(CPAP_RespRate,QColor("light green"),ST_90P); rr->addSlice(CPAP_RespRate,QColor("light green"),ST_90P,true);
rr->addSlice(CPAP_RespRate,QColor("blue"),ST_WAVG); rr->addSlice(CPAP_RespRate,QColor("blue"),ST_WAVG,true);
RR->AddLayer(rr); RR->AddLayer(rr);
tv=new SummaryChart("L/b",GT_LINE); tv=new SummaryChart("L/b",GT_LINE);
tv->addSlice(CPAP_TidalVolume,QColor("light blue"),ST_MIN); tv->addSlice(CPAP_TidalVolume,QColor("light blue"),ST_MIN,true);
tv->addSlice(CPAP_TidalVolume,QColor("light green"),ST_90P); tv->addSlice(CPAP_TidalVolume,QColor("light green"),ST_90P,true);
tv->addSlice(CPAP_TidalVolume,QColor("blue"),ST_WAVG); tv->addSlice(CPAP_TidalVolume,QColor("blue"),ST_WAVG,true);
TV->AddLayer(tv); TV->AddLayer(tv);
mv=new SummaryChart("L/m",GT_LINE); mv=new SummaryChart("L/m",GT_LINE);
mv->addSlice(CPAP_MinuteVent,QColor("light blue"),ST_MIN); mv->addSlice(CPAP_MinuteVent,QColor("light blue"),ST_MIN,true);
mv->addSlice(CPAP_MinuteVent,QColor("light green"),ST_90P); mv->addSlice(CPAP_MinuteVent,QColor("light green"),ST_90P,true);
mv->addSlice(CPAP_MinuteVent,QColor("blue"),ST_WAVG); mv->addSlice(CPAP_MinuteVent,QColor("blue"),ST_WAVG,true);
MV->AddLayer(mv); MV->AddLayer(mv);
ptb=new SummaryChart("%PTB",GT_LINE); ptb=new SummaryChart("%PTB",GT_LINE);
ptb->addSlice(CPAP_PTB,QColor("yellow"),ST_MIN); ptb->addSlice(CPAP_PTB,QColor("yellow"),ST_MIN,true);
ptb->addSlice(CPAP_PTB,QColor("light gray"),ST_90P); ptb->addSlice(CPAP_PTB,QColor("light gray"),ST_90P,true);
ptb->addSlice(CPAP_PTB,QColor("orange"),ST_WAVG); ptb->addSlice(CPAP_PTB,QColor("orange"),ST_WAVG,true);
PTB->AddLayer(ptb); PTB->AddLayer(ptb);
pr=new SummaryChart("cmH2O",GT_LINE); pr=new SummaryChart("cmH2O",GT_LINE);
//PR->setRecMinY(4.0); //PR->setRecMinY(4.0);
//PR->setRecMaxY(12.0); //PR->setRecMaxY(12.0);
pr->addSlice(CPAP_Pressure,QColor("dark green"),ST_WAVG); pr->addSlice(CPAP_Pressure,QColor("dark green"),ST_WAVG,true);
pr->addSlice(CPAP_Pressure,QColor("orange"),ST_MIN); pr->addSlice(CPAP_Pressure,QColor("orange"),ST_MIN,true);
pr->addSlice(CPAP_Pressure,QColor("red"),ST_MAX); pr->addSlice(CPAP_Pressure,QColor("red"),ST_MAX,true);
pr->addSlice(CPAP_Pressure,QColor("grey"),ST_90P); pr->addSlice(CPAP_Pressure,QColor("grey"),ST_90P,true);
pr->addSlice(CPAP_EPAP,QColor("light green"),ST_MIN); pr->addSlice(CPAP_EPAP,QColor("light green"),ST_MIN,true);
pr->addSlice(CPAP_IPAP,QColor("light blue"),ST_MAX); pr->addSlice(CPAP_IPAP,QColor("light blue"),ST_MAX,true);
PR->AddLayer(pr); PR->AddLayer(pr);
lk=new SummaryChart("Avg Leak",GT_LINE); lk=new SummaryChart("Avg Leak",GT_LINE);
lk->addSlice(CPAP_Leak,QColor("dark grey"),ST_90P); lk->addSlice(CPAP_Leak,QColor("dark grey"),ST_90P,false);
lk->addSlice(CPAP_Leak,QColor("dark blue"),ST_WAVG); lk->addSlice(CPAP_Leak,QColor("dark blue"),ST_WAVG,false);
//lk->addSlice(CPAP_Leak,QColor("dark yellow")); //lk->addSlice(CPAP_Leak,QColor("dark yellow"));
//pr->addSlice(CPAP_IPAP,QColor("red")); //pr->addSlice(CPAP_IPAP,QColor("red"));
LK->AddLayer(lk); LK->AddLayer(lk);
NPB->AddLayer(npb=new SummaryChart("% PB",GT_BAR)); NPB->AddLayer(npb=new SummaryChart("% PB",GT_BAR));
npb->addSlice(CPAP_CSR,QColor("light green"),ST_SPH); npb->addSlice(CPAP_CSR,QColor("light green"),ST_SPH,false);
// <--- The code to the previous marker is crap // <--- The code to the previous marker is crap
report=NULL; report=NULL;