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

Event Tab fixes, plus LineChart zoomed in bug fix

Browse Source
This commit is contained in:
Mark Watkins 2011-07-27 19:53:29 +10:00
parent f9796306ca
commit a4287d0f64
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Graphs/gLineChart.cpp
View File

@ -164,8 +164,6 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
//assert(x1<x2); //assert(x1<x2);
//} //}
} }
done=false;
first=true;
if (accel) { if (accel) {
x1=el.time(1); x1=el.time(1);
@ -264,6 +262,9 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
const vector<EventStoreType> & dat=el.getData(); const vector<EventStoreType> & dat=el.getData();
const vector<qint64> & tim=el.getTime(); const vector<qint64> & tim=el.getTime();
done=false;
first=true;
bool firstpx=true; bool firstpx=true;
if (el.type()==EVL_Waveform) { // Waveform Plot if (el.type()==EVL_Waveform) { // Waveform Plot
time=el.time(idx); time=el.time(idx);
@ -340,7 +341,12 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
lastpy=py; lastpy=py;
} }
} }
} else { // Standard events/zoomed in Plot
} else {
//////////////////////////////////////////////////////////////////
// Standard events/zoomed in Plot
//////////////////////////////////////////////////////////////////
first=true;
for (int i=idx;i<siz;i+=sam) { for (int i=idx;i<siz;i+=sam) {
time=tim[i]; //el.time(i); time=tim[i]; //el.time(i);
@ -348,6 +354,7 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
if (time < minx) continue; // Skip stuff before the start of our data window if (time < minx) continue; // Skip stuff before the start of our data window
first=false; first=false;
if (i>=sam) i-=sam; // Start with the previous sample (which will be in clipping area) if (i>=sam) i-=sam; // Start with the previous sample (which will be in clipping area)
time=tim[i]; //el.time(i);
} }
data=dat[i]*gain; // data=dat[i]*gain; //
//data=el.data(i); // raw access is faster //data=el.data(i); // raw access is faster

21
daily.cpp
View File

@ -308,7 +308,7 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day)
tree->clear(); tree->clear();
if (!day) return; if (!day) return;
return; //return;
tree->setColumnCount(1); // 1 visible common.. (1 hidden) tree->setColumnCount(1); // 1 visible common.. (1 hidden)
QTreeWidgetItem *root=NULL;//new QTreeWidgetItem((QTreeWidget *)0,QStringList("Stuff")); QTreeWidgetItem *root=NULL;//new QTreeWidgetItem((QTreeWidget *)0,QStringList("Stuff"));
@ -325,16 +325,15 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day)
for (m=(*s)->eventlist.begin();m!=(*s)->eventlist.end();m++) { for (m=(*s)->eventlist.begin();m!=(*s)->eventlist.end();m++) {
MachineCode code=m->first; MachineCode code=m->first;
if (code==CPAP_Leak) continue; if ((code!=CPAP_Obstructive)
if (code==CPAP_RespiratoryRate) continue; && (code!=CPAP_Hypopnea)
if (code==CPAP_TidalVolume) continue; && (code!=CPAP_Apnea)
if (code==CPAP_MinuteVentilation) continue; && (code!=CPAP_ClearAirway)
if (code==CPAP_FlowLimitGraph) continue; && (code!=CPAP_CSR)
&& (code!=CPAP_RERA)
// Note this is not so evil on PRS1. && (code!=CPAP_FlowLimit)
if (code==CPAP_Pressure) continue; && (code!=PRS1_PressurePulse)
if (code==CPAP_Snore) continue; && (code!=CPAP_VSnore)) continue;
if (code==PRS1_Unknown12) continue;
QTreeWidgetItem *mcr; QTreeWidgetItem *mcr;
if (mcroot.find(code)==mcroot.end()) { if (mcroot.find(code)==mcroot.end()) {
int cnt=day->count(code); int cnt=day->count(code);