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

Fix 2D Line plots mucking up with small amounts of data

Browse Source
This commit is contained in:
Mark Watkins 2011-12-28 00:27:26 +10:00
parent 9635b991cf
commit af97cac384
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Graphs/gLineChart.cpp
View File

@ -439,7 +439,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
first=true; first=true;
double start=el.first(); double start=el.first();
if (siz==2) { /*if (siz==2) {
time=start+tim[0]; time=start+tim[0];
data=dat[0]*gain; data=dat[0]*gain;
data-=subtract_offset; data-=subtract_offset;
@ -454,7 +454,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
if (px>xst+width) px=xst+width; if (px>xst+width) px=xst+width;
lines->add(lastpx,lastpy,px,py,m_line_color); lines->add(lastpx,lastpy,px,py,m_line_color);
} else } else*/
for (int i=0;i<siz;i++) { for (int i=0;i<siz;i++) {
time=start+tim[i]; time=start+tim[i];
@ -477,10 +477,20 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
if (firstpx) { if (firstpx) {
firstpx=false; firstpx=false;
} else { } else {
if (square_plot) { if (py==lastpy) {
lines->add(lastpx,lastpy,px,lastpy,px,lastpy,px,py,m_line_color); if (lastpx<xst) lastpx=xst;
if (px>xst+width) px=xst+width;
if (square_plot) {
lines->add(lastpx,lastpy,px,lastpy,px,lastpy,px,py,m_line_color);
} else {
lines->add(lastpx,lastpy,px,py,m_line_color);
}
} else { } else {
lines->add(lastpx,lastpy,px,py,m_line_color); if (square_plot) {
lines->add(lastpx,lastpy,px,lastpy,px,lastpy,px,py,m_line_color);
} else {
lines->add(lastpx,lastpy,px,py,m_line_color);
}
} }
//lines->add(px,py,m_line_color); //lines->add(px,py,m_line_color);
@ -494,7 +504,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
lastpy=py; lastpy=py;
//if (lastpx>start_px+width) done=true; //if (lastpx>start_px+width) done=true;
if (time > maxx) { if (time > maxx) {
//done=true; // Let this iteration finish.. (This point will be in far clipping) done=true; // Let this iteration finish.. (This point will be in far clipping)
break; break;
} }
} }

3
Graphs/gLineOverlay.cpp
View File

@ -194,7 +194,8 @@ void gLineOverlaySummary::paint(gGraph & w,int left, int top, int width, int hei
if (time>0) val=cnt/time; if (time>0) val=cnt/time;
QString a="Event Count="+QString::number(cnt)+" Selection Time="+QString().sprintf("%02i:%02i:%02i",h,m,s)+" "+m_text+"="+QString::number(val,'f',2);
QString a=QString::number(cnt)+" Events, Duration="+QString().sprintf("%02i:%02i:%02i",h,m,s)+", "+m_text+"="+QString::number(val,'f',2);
if (isSpan) { if (isSpan) {
float sph; float sph;