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

LineChart weirdness attempt 1

Browse Source
This commit is contained in:
Mark Watkins 2011-07-30 15:32:56 +10:00
parent d595205ce1
commit 45c3c5d55d
2 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Graphs/gLineChart.cpp
View File

@ -85,9 +85,9 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
float lastpx,lastpy; float lastpx,lastpy;
float px,py; float px,py;
int idx,idxend,np; int idx;
bool done,first; bool done,first;
double x0,x1,xL; qint64 x0,xL;
double sr; double sr;
int sam; int sam;
int minz,maxz; int minz,maxz;
@ -169,7 +169,7 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
} }
} }
if (accel) { if (accel) {
x1=el.time(1); //x1=el.time(1);
sr=el.rate(); // Time distance between samples sr=el.rate(); // Time distance between samples
if (sr<=0) { if (sr<=0) {
qWarning() << "qLineChart::Plot() assert(sr>0)"; qWarning() << "qLineChart::Plot() assert(sr>0)";
@ -216,46 +216,22 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
// The Z? values are much more accurate // The Z? values are much more accurate
idx=0; idx=0;
idxend=0;
np=0;
if (el.type()==EVL_Waveform) { if (el.type()==EVL_Waveform) {
// We can skip data previous to minx if this is a waveform // We can skip data previous to minx if this is a waveform
if (minx>x1) { if (minx>x0) {
double j=minx-x0; // == starting min of first sample in this segment double j=minx-x0; // == starting min of first sample in this segment
idx=floor(j/sr); idx=(j/sr);
// Loose the precision // Loose the precision
idx-=idx % sam; //idx-=idx % sam;
} // else just start from the beginning } // else just start from the beginning
idxend=floor(xx/sr);
idxend/=sam; // devide by number of samples skips
np=(idxend-idx)+sam;
np /= sam;
} else {
np=siz;
} }
//bool watch_verts_carefully=false;
// better to do it here than in the main loop.
np <<= 2;
if (square_plot)
np <<= 1; // double it again
if (np>=maxverts) {
// watch_verts_carefully=true;
//assert(np<maxverts);
}
int xst=start_px+1; int xst=start_px+1;
int yst=start_py+1; int yst=start_py+1;
//int done2=0;
qint64 time; qint64 time;
EventDataType data; EventDataType data;
EventDataType gain=el.gain(); EventDataType gain=el.gain();
@ -272,7 +248,7 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
if (el.type()==EVL_Waveform) { // Waveform Plot if (el.type()==EVL_Waveform) { // Waveform Plot
if (idx>sam) idx-=sam; if (idx>sam) idx-=sam;
time=el.time(idx); time=el.time(idx);
qint64 rate=sr*sam; double rate=double(sr)*double(sam);
if (accel) { if (accel) {
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
@ -319,7 +295,8 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
// Normal Waveform Plot // Normal Waveform Plot
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
for (int i=idx;i<siz;i+=sam,time+=rate) { for (int i=idx;i<siz;i+=sam) {
time+=rate;
//if (time < minx) //if (time < minx)
// continue; // Skip stuff before the start of our data window // continue; // Skip stuff before the start of our data window
data=dat[i];//el.data(i); data=dat[i];//el.data(i);
@ -376,7 +353,7 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
if (firstpx) { if (firstpx) {
firstpx=false; firstpx=false;
} else { } else {
if (m_square_plot) { if (square_plot) {
vertarray[vertcnt++]=lastpx; vertarray[vertcnt++]=lastpx;
vertarray[vertcnt++]=lastpy; vertarray[vertcnt++]=lastpy;
vertarray[vertcnt++]=px; vertarray[vertcnt++]=px;

3
SleepLib/event.cpp
View File

@ -31,7 +31,8 @@ qint64 EventList::time(int i)
if (m_type==EVL_Event) { if (m_type==EVL_Event) {
return m_first+qint64(m_time[i]); return m_first+qint64(m_time[i]);
} }
return m_first+(EventDataType(i)*m_rate);
return m_first+qint64((EventDataType(i)*m_rate));
} }
EventDataType EventList::data(int i) EventDataType EventList::data(int i)