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

SummaryChart legend/index too wide Fix attempt #1

Browse Source
This commit is contained in:
Mark Watkins 2011-12-13 21:36:42 +10:00
parent 42f0889937
commit 10c282a1f5
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Graphs/gSummaryChart.cpp
View File

@ -490,28 +490,29 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
// Draw Ledgend // Draw Ledgend
px=left+width-3; px=left+width-3;
py=top-5; py=top-5;
QString a; QString a,b;
int x,y; int x,y;
for (int j=0;j<m_codes.size();j++) { for (int j=0;j<m_codes.size();j++) {
if (!m_goodcodes[j]) continue; if (!m_goodcodes[j]) continue;
ChannelID code=m_codes[j]; ChannelID code=m_codes[j];
a="";
a+=schema::channel[code].label()+" ";
switch(m_type[j]) { switch(m_type[j]) {
case ST_WAVG: a+="Avg"; break; case ST_WAVG: b="Avg"; break;
case ST_AVG: a+="Avg"; break; case ST_AVG: b="Avg"; break;
case ST_90P: a+="90%"; break; case ST_90P: b="90%"; break;
case ST_MIN: a+="Min"; break; case ST_MIN: b="Min"; break;
case ST_MAX: a+="Max"; break; case ST_MAX: b="Max"; break;
case ST_CPH: a+=""; break; case ST_CPH: b=""; break;
case ST_SPH: a+="%"; break; case ST_SPH: b="%"; break;
case ST_HOURS: a+="Hours"; break; case ST_HOURS: b="Hours"; break;
case ST_SESSIONS: a+="Sessions"; break; case ST_SESSIONS: b="Sessions"; break;
default: default:
break; break;
} }
a=schema::channel[code].label();
if (a==w.title() && !b.isEmpty()) a=b; else a+=" "+b;
QString val; QString val;
float f=0; float f=0;
if (totalcounts[j]>0) { if (totalcounts[j]>0) {

4
daily.cpp
View File

@ -596,13 +596,13 @@ void Daily::Load(QDate date)
if (cpap && oxi) { if (cpap && oxi) {
qint64 len=qAbs(cpap->first() - oxi->first()); qint64 len=qAbs(cpap->first() - oxi->first());
if (len>30000) { if (len>30000) {
GraphView->findGraph("Pulse")->setGroup(1); GraphView->findGraph("Pulse Rate")->setGroup(1);
GraphView->findGraph("SpO2")->setGroup(1); GraphView->findGraph("SpO2")->setGroup(1);
GraphView->findGraph("Plethy")->setGroup(1); GraphView->findGraph("Plethy")->setGroup(1);
mainwin->Notify("Oximetry data exists for this day, however it's timestamps are too different, so the Graphs will not be linked.",3000); mainwin->Notify("Oximetry data exists for this day, however it's timestamps are too different, so the Graphs will not be linked.",3000);
} else { } else {
//mainwin->Notify("Oximetry & CPAP graphs are linked for this day",2000); //mainwin->Notify("Oximetry & CPAP graphs are linked for this day",2000);
GraphView->findGraph("Pulse")->setGroup(0); GraphView->findGraph("Pulse Rate")->setGroup(0);
GraphView->findGraph("SpO2")->setGroup(0); GraphView->findGraph("SpO2")->setGroup(0);
GraphView->findGraph("Plethy")->setGroup(0); GraphView->findGraph("Plethy")->setGroup(0);
} }

2
docs/channels.xml
View File

@ -74,7 +74,7 @@ One id code per item
</channel> </channel>
</group> </group>
<group name="OXI"> <group name="OXI">
<channel id="0x1800" class="data" name="Pulse" details="Pulse Rate" label="Pulse" unit="bpm" color="red"/> <channel id="0x1800" class="data" name="Pulse" details="Pulse Rate" label="Pulse Rate" unit="bpm" color="red"/>
<channel id="0x1801" class="data" name="SPO2" details="Oxygen Saturation" label="SpO2" unit="%" color="blue"/> <channel id="0x1801" class="data" name="SPO2" details="Oxygen Saturation" label="SpO2" unit="%" color="blue"/>
<channel id="0x1802" class="data" name="Plethy" details="Plethysomogram" label="Plethy" color="black"/> <channel id="0x1802" class="data" name="Plethy" details="Plethysomogram" label="Plethy" color="black"/>
<channel id="0x1803" class="data" name="PulseChange" details="Pulse Change" label="Pulse Change" color="light gray"/> <channel id="0x1803" class="data" name="PulseChange" details="Pulse Change" label="Pulse Change" color="light gray"/>