Making sure PRS1 still works

This commit is contained in:
Mark Watkins 2011-06-30 17:27:04 +10:00
parent b6568998a7
commit 49224ee23d

View File

@ -144,7 +144,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) :
AddGraph(SNORE=new gGraphWindow(gSplitter,tr("Snore"),SF)); AddGraph(SNORE=new gGraphWindow(gSplitter,tr("Snore"),SF));
SNORE->AddLayer(new gXAxis()); SNORE->AddLayer(new gXAxis());
SNORE->AddLayer(new gYAxis()); SNORE->AddLayer(new gYAxis());
SNORE->AddLayer(new gLineChart(snore,Qt::black,4096,false,false,false)); SNORE->AddLayer(new gLineChart(snore,Qt::black,4096,false,false,true));
SNORE->setMinimumHeight(150); SNORE->setMinimumHeight(150);
AddCPAPData(mv=new EventData(CPAP_MinuteVentilation,0)); AddCPAPData(mv=new EventData(CPAP_MinuteVentilation,0));
@ -172,7 +172,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) :
AddOXIData(pulse=new EventData(OXI_Pulse,0,65536,true)); AddOXIData(pulse=new EventData(OXI_Pulse,0,65536,true));
//pulse->ForceMinY(40); //pulse->ForceMinY(40);
//pulse->ForceMaxY(120); //pulse->ForceMaxY(120);
AddGraph(PULSE=new gGraphWindow(gSplitter,tr("Pulse"),SF)); AddGraph(PULSE=new gGraphWindow(gSplitter,tr("Pulse & SpO2"),SF));
PULSE->AddLayer(new gXAxis()); PULSE->AddLayer(new gXAxis());
PULSE->AddLayer(new gYAxis()); PULSE->AddLayer(new gYAxis());
// PULSE->AddLayer(new gFooBar()); // PULSE->AddLayer(new gFooBar());
@ -183,15 +183,15 @@ Daily::Daily(QWidget *parent,QGLContext *context) :
AddOXIData(spo2=new EventData(OXI_SPO2,0,65536,true)); AddOXIData(spo2=new EventData(OXI_SPO2,0,65536,true));
//spo2->ForceMinY(60); //spo2->ForceMinY(60);
//spo2->ForceMaxY(100); //spo2->ForceMaxY(100);
AddGraph(SPO2=new gGraphWindow(gSplitter,tr("SpO2"),SF)); // AddGraph(SPO2=new gGraphWindow(gSplitter,tr("SpO2"),SF));
SPO2->AddLayer(new gXAxis()); // SPO2->AddLayer(new gXAxis());
SPO2->AddLayer(new gYAxis()); // SPO2->AddLayer(new gYAxis());
// SPO2->AddLayer(new gFooBar()); // SPO2->AddLayer(new gFooBar());
SPO2->AddLayer(new gLineChart(spo2,Qt::blue,65536,false,false,true)); PULSE->AddLayer(new gLineChart(spo2,Qt::blue,65536,false,false,true));
SPO2->setMinimumHeight(150); // SPO2->setMinimumHeight(150);
SPO2->LinkZoom(PULSE); // SPO2->LinkZoom(PULSE);
PULSE->LinkZoom(SPO2); // PULSE->LinkZoom(SPO2);
SPO2->hide(); // SPO2->hide();
PULSE->hide(); PULSE->hide();
AddCPAPData(tap_eap=new TAPData(CPAP_EAP)); AddCPAPData(tap_eap=new TAPData(CPAP_EAP));
@ -321,7 +321,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) :
gSplitter->addWidget(SNORE); gSplitter->addWidget(SNORE);
gSplitter->addWidget(NoData); gSplitter->addWidget(NoData);
gSplitter->addWidget(PULSE); gSplitter->addWidget(PULSE);
gSplitter->addWidget(SPO2); // gSplitter->addWidget(SPO2);
gSplitter->refresh(); gSplitter->refresh();
@ -620,6 +620,16 @@ void Daily::Load(QDate date)
SF->hide(); SF->hide();
SNORE->hide(); SNORE->hide();
} }
if (cpap && (cpap->machine->GetClass()=="ResMed")) {
MV->show();
TV->show();
RR->show();
} else {
MV->hide();
TV->hide();
RR->hide();
}
if (oxi) { if (oxi) {
html=html+"<tr><td>"+tr("Pulse"); html=html+"<tr><td>"+tr("Pulse");
html=html+"</td><td>"+a.sprintf("%.2fbpm",oxi->summary_min(OXI_PulseMin)); html=html+"</td><td>"+a.sprintf("%.2fbpm",oxi->summary_min(OXI_PulseMin));
@ -634,10 +644,10 @@ void Daily::Load(QDate date)
//html=html+wxT("<tr><td colspan=4>&nbsp;</td></tr>\n"); //html=html+wxT("<tr><td colspan=4>&nbsp;</td></tr>\n");
PULSE->show(); PULSE->show();
SPO2->show(); //SPO2->show();
} else { } else {
PULSE->hide(); PULSE->hide();
SPO2->hide(); //SPO2->hide();
} }
if (!cpap && !oxi) { if (!cpap && !oxi) {
NoData->setText(tr("No CPAP Data for ")+date.toString(Qt::SystemLocaleLongDate)); NoData->setText(tr("No CPAP Data for ")+date.toString(Qt::SystemLocaleLongDate));