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

Multi select dialog not working on mac, more oximetry stuff

Browse Source
This commit is contained in:
Mark Watkins 2011-11-29 08:49:43 +10:00
parent c60cdc754d
commit 3ec70b660d
4 changed files with 50 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
SleepLib/calcs.cpp
View File

@ -323,7 +323,7 @@ int calcPulseChange(Session *session)
tmp=fabs(val2-val); tmp=fabs(val2-val);
if (tmp > lv) { if (tmp > lv) {
lastt=time2; lastt=time2;
lv=tmp; //lv=tmp;
li=j; li=j;
} }
} }
@ -361,13 +361,13 @@ int calcSPO2Drop(Session *session)
bool ok; bool ok;
qint64 window=PROFILE["SPO2DropDuration"].toDouble(&ok); qint64 window=PROFILE["SPO2DropDuration"].toDouble(&ok);
if (!ok) { if (!ok) {
PROFILE["SPO2DropDuration"]=4; PROFILE["SPO2DropDuration"]=10;
window=4000; window=10000;
} else window*=1000; } else window*=1000;
change=PROFILE["SPO2DropPercentage"].toDouble(&ok); change=PROFILE["SPO2DropPercentage"].toDouble(&ok);
if (!ok) { if (!ok) {
PROFILE["SPO2DropPercentage"]=4; PROFILE["SPO2DropPercentage"]=3;
change=4; change=3;
} }
EventList *pc=new EventList(EVL_Event); EventList *pc=new EventList(EVL_Event);
@ -375,37 +375,56 @@ int calcSPO2Drop(Session *session)
EventDataType lv=0; EventDataType lv=0;
int li=0; int li=0;
const int ringsize=10;
EventDataType ring[ringsize];
int rp=0;
for (int e=0;e<it.value().size();e++) { for (int e=0;e<it.value().size();e++) {
EventList & el=*(it.value()[e]); EventList & el=*(it.value()[e]);
for (unsigned i=0;i<el.count();i++) { for (unsigned i=0;i<el.count();i++) {
val=el.data(i); val=el.data(i);
if (!val) continue;
ring[rp]=val;
rp=++rp % ringsize;
if (i<ringsize) {
for (int j=i;j<ringsize;j++) {
ring[j]=val;
}
}
tmp=0;
for (int j=0;j<ringsize;j++) {
tmp+=ring[j];
}
tmp/=EventDataType(ringsize);
val=tmp;
time=el.time(i); time=el.time(i);
lastt=0; lastt=0;
lv=val-change; lv=val;
for (unsigned j=i+1;j<el.count();j++) { // scan ahead in the window for (unsigned j=i+1;j<el.count();j++) { // scan ahead in the window
time2=el.time(j); time2=el.time(j);
if (time2 > time+window) break;
val2=el.data(j); val2=el.data(j);
if (val2<=lv) { if (val2 <= (val-change)) {
lv=val2;
lastt=time2; lastt=time2;
li=j; li=j;
//tmp=val-val2; //lv=val2;
//if (tmp > change) { } else if (val2 <= lv) {
// pc->AddEvent(time2,tmp); lv=val2;
//break; //lastt=time2;
//} //li=j;
} } else break;
} }
if (lastt>0) { if (lastt>0) {
qint64 len=(lastt-time)/1000.0; qint64 len=(lastt-time);
pc->AddEvent(lastt,len); if (len>=window) {
pc->AddEvent(lastt,len/1000);
i=li; i=li;
}
} }
} }
} }

6
daily.cpp
View File

@ -204,8 +204,12 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
TgMV->AddLayer(AddCPAP(new gLineChart(CPAP_TgMV,Qt::darkCyan,square))); TgMV->AddLayer(AddCPAP(new gLineChart(CPAP_TgMV,Qt::darkCyan,square)));
INTPULSE->AddLayer(AddCPAP(new gLineChart(OXI_Pulse,Qt::red,square))); INTPULSE->AddLayer(AddCPAP(new gLineChart(OXI_Pulse,Qt::red,square)));
INTSPO2->AddLayer(AddCPAP(new gLineChart(OXI_SPO2,Qt::blue,square))); INTSPO2->AddLayer(AddCPAP(new gLineChart(OXI_SPO2,Qt::blue,square)));
PULSE->AddLayer(AddOXI(new gLineOverlayBar(OXI_PulseChange,QColor("light gray"),"PD",FT_Span)));
SPO2->AddLayer(AddOXI(new gLineOverlayBar(OXI_SPO2Drop,QColor("light blue"),"O2",FT_Span)));
PULSE->AddLayer(AddOXI(new gLineChart(OXI_Pulse,Qt::red,square))); PULSE->AddLayer(AddOXI(new gLineChart(OXI_Pulse,Qt::red,square)));
SPO2->AddLayer(AddOXI(new gLineChart(OXI_SPO2,Qt::blue,square))); SPO2->AddLayer(AddOXI(new gLineChart(OXI_SPO2,Qt::blue,true)));
PLETHY->AddLayer(AddOXI(new gLineChart(OXI_Plethy,Qt::darkBlue,false))); PLETHY->AddLayer(AddOXI(new gLineChart(OXI_Plethy,Qt::darkBlue,false)));
PTB->setForceMaxY(100); PTB->setForceMaxY(100);

2
mainwindow.cpp
View File

@ -253,7 +253,7 @@ void MainWindow::on_action_Import_Data_triggered()
if (asknew) { if (asknew) {
QFileDialog w; QFileDialog w;
w.setFileMode(QFileDialog::DirectoryOnly); w.setFileMode(QFileDialog::DirectoryOnly);
w.setOption(QFileDialog::DontUseNativeDialog,false); w.setOption(QFileDialog::DontUseNativeDialog,true);
QListView *l = w.findChild<QListView*>("listView"); QListView *l = w.findChild<QListView*>("listView");
if (l) { if (l) {

6
preferencesdialog.ui
View File

@ -960,6 +960,9 @@ p, li { white-space: pre-wrap; }
<property name="decimals"> <property name="decimals">
<number>0</number> <number>0</number>
</property> </property>
<property name="minimum">
<double>1.000000000000000</double>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
@ -983,6 +986,9 @@ p, li { white-space: pre-wrap; }
<property name="decimals"> <property name="decimals">
<number>0</number> <number>0</number>
</property> </property>
<property name="minimum">
<double>1.000000000000000</double>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="2">