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

More consistant legend marker, Added Te & Ti definitions to channels.xml

Browse Source
This commit is contained in:
Mark Watkins 2011-12-28 00:12:38 +10:00
parent 431cbadb1f
commit 9635b991cf
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Graphs/gGraphView.cpp
View File

@ -131,6 +131,12 @@ void GetTextExtent(QString text, int & width, int & height, QFont *font)
#endif
}
int GetXHeight(QFont *font)
{
QFontMetrics fm(*font);
return fm.xHeight();
}
GLBuffer::GLBuffer(int max,int type, bool stippled)
:m_max(max), m_type(type), m_stippled(stippled)
{

3
Graphs/gGraphView.h
View File

@ -45,6 +45,9 @@ extern QHash<QString, QImage *> images;
*/
void GetTextExtent(QString text, int & width, int & height, QFont *font=defaultfont);
//! \brief Return the height of the letter x for the selected font.
int GetXHeight(QFont *font=defaultfont);
class gGraphView;
class gGraph;

9
Graphs/gLineChart.cpp
View File

@ -510,11 +510,12 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
GetTextExtent(text,wid,hi);
legendx-=wid;
w.renderText(text,legendx,top-4);
int bw=hi;
legendx-=hi/2;
int bw=GetXHeight();
legendx-=bw/2;
w.quads()->add(legendx-bw,top-4,legendx,top-4,legendx,top-bw,legendx-bw,top-bw,m_line_color);
legendx-=hi+hi/2;
int tp=top-5-bw/2;
w.quads()->add(legendx-bw,tp+bw/2,legendx,tp+bw/2,legendx,tp-bw/2,legendx-bw,tp-bw/2,m_line_color);
legendx-=hi+bw/2;
}
}
if (!total_points) { // No Data?

4
docs/channels.xml
View File

@ -39,8 +39,8 @@ Important: One id code per item, DO NOT CHANGE ID NUMBERS!!!
<channel id="0x1107" class="data" name="PTB" details="Patient Triggered Breaths" label="Pat. Trig. Breaths" unit="%" color="dark grey"/>
<channel id="0x1108" class="data" name="Leak" details="Leak Rate" label="Leaks" unit="L/min" color="dark green"/>
<channel id="0x1109" class="data" name="IE" details="Inspiratory:Expiratory" label="I:E" unit="ratio" color="dark red"/>
<channel id="0x110a" class="data" name="Te" details="Te" label="Te" unit="" color="dark green"/>
<channel id="0x110b" class="data" name="Ti" details="Ti" label="Ti" unit="" color="dark blue"/>
<channel id="0x110a" class="data" name="Te" details="Expiratory Time" label="Te" unit="" color="dark green"/>
<channel id="0x110b" class="data" name="Ti" details="Inspiratory Time" label="Ti" unit="" color="dark blue"/>
<channel id="0x110c" class="data" name="Pressure" details="Pressure" label="Pressure" unit="cmH20" color="dark green"/>
<channel id="0x110d" class="data" name="IPAP" details="Inspiratory Pressure" label="IPAP" unit="cmH20" color="orange"/>
<channel id="0x110e" class="data" name="EPAP" details="Expiratory Pressure" label="EPAP" unit="cmH20" color="light blue"/>