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

Clean up graph legend markers

Browse Source
This commit is contained in:
Mark Watkins 2013-10-19 18:00:52 +10:00
parent 44d2117580
commit 673b75d9f0
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sleepyhead/Graphs/gGraphView.cpp
View File

@ -71,8 +71,8 @@ void InitGraphs()
PREF["Fonts_Graph_Italic"]=false; PREF["Fonts_Graph_Italic"]=false;
} }
if (!PREF.contains("Fonts_Title_Name")) { if (!PREF.contains("Fonts_Title_Name")) {
PREF["Fonts_Title_Name"]="Serif"; PREF["Fonts_Title_Name"]="Sans Serif";
PREF["Fonts_Title_Size"]=11; PREF["Fonts_Title_Size"]=14;
PREF["Fonts_Title_Bold"]=true; PREF["Fonts_Title_Bold"]=true;
PREF["Fonts_Title_Italic"]=false; PREF["Fonts_Title_Italic"]=false;
} }

13
sleepyhead/Graphs/gLineChart.cpp
View File

@ -601,18 +601,21 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Draw Legends on the top line // Draw Legends on the top line
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
QFontMetrics fm(*defaultfont);
int bw=fm.xHeight();
int bh=fm.height()/1.5;
if ((codepoints>0)) { //(m_codes.size()>1) && if ((codepoints>0)) { //(m_codes.size()>1) &&
QString text=schema::channel[code].label(); QString text=schema::channel[code].label();
int wid,hi; int wid,hi;
GetTextExtent(text,wid,hi); GetTextExtent(text,wid,hi);
legendx-=wid; legendx-=wid;
w.renderText(text,legendx,top-4); w.renderText(text,legendx,top-4);
int bw=GetXHeight();
legendx-=bw/2;
int tp=top-5-bw/2; int tp=top-5-bh/2;
w.quads()->add(legendx-bw,tp+bw/2,legendx,tp+bw/2,legendx,tp-bw/2,legendx-bw,tp-bw/2,m_colors[gi].rgba()); w.quads()->add(legendx-bw,tp+bh/2,legendx,tp+bh/2,legendx,tp-bh/2,legendx-bw,tp-bh/2,m_colors[gi].rgba());
legendx-=hi+bw/2; legendx-=bw*2;
} }
} }
if (!total_points) { // No Data? if (!total_points) { // No Data?

17
sleepyhead/Graphs/gSummaryChart.cpp
View File

@ -570,6 +570,10 @@ jumpnext:
QString a,b; QString a,b;
int x,y; int x,y;
QFontMetrics fm(*defaultfont);
int bw=fm.xHeight();
int bh=fm.height()/1.5;
bool ishours=false; bool ishours=false;
int good=0; int good=0;
for (int j=0;j<m_codes.size();j++) { for (int j=0;j<m_codes.size();j++) {
@ -635,12 +639,11 @@ jumpnext:
GetTextExtent(a,wid,hi); GetTextExtent(a,wid,hi);
legendx-=wid; legendx-=wid;
w.renderText(a,legendx,top-4); w.renderText(a,legendx,top-4);
int bw=GetXHeight(); // legendx-=bw/2;
legendx-=bw/2;
int tp=top-5-bw/2; int tp=top-5-bh/2;
w.quads()->add(legendx-bw,tp+bw/2,legendx,tp+bw/2,legendx,tp-bw/2,legendx-bw,tp-bw/2,m_colors[j].rgba()); w.quads()->add(legendx-bw,tp+bh/2,legendx,tp+bh/2,legendx,tp-bh/2,legendx-bw,tp-bh/2,m_colors[j].rgba());
legendx-=hi+bw/2; legendx-=bw*2;
//lines->add(px,py,px+20,py,m_colors[j]); //lines->add(px,py,px+20,py,m_colors[j]);
@ -652,8 +655,8 @@ jumpnext:
float val=total_val/float(total_hours); float val=total_val/float(total_hours);
a=m_label+"="+QString::number(val,'f',2)+" "; a=m_label+"="+QString::number(val,'f',2)+" ";
GetTextExtent(a,x,y); GetTextExtent(a,x,y);
legendx-=20+x; legendx-=x;
w.renderText(a,legendx+24,py+1); w.renderText(a,legendx,py+1);
} }
} }