Boring Cosmetic stuff

This commit is contained in:
Mark Watkins 2011-07-29 04:02:51 +10:00
parent e2f1c17840
commit e3fdfcb313
3 changed files with 31 additions and 20 deletions

View File

@ -43,7 +43,7 @@ void gSegmentChart::Plot(gGraphWindow & w,float scrx,float scry)
int start_py=w.GetBottomMargin(); int start_py=w.GetBottomMargin();
int width=scrx-(w.GetLeftMargin()+w.GetRightMargin()); int width=scrx-(w.GetLeftMargin()+w.GetRightMargin());
int height=scry-(w.GetTopMargin()+w.GetBottomMargin()); int height=scry-(w.GetTopMargin()+w.GetBottomMargin());
width--;
float diameter=MIN(width,height); float diameter=MIN(width,height);
diameter-=8; diameter-=8;
float radius=diameter/2.0; float radius=diameter/2.0;

View File

@ -8,7 +8,7 @@ enum GraphSegmentType { GST_Pie, GST_CandleStick };
class gSegmentChart : public gLayer class gSegmentChart : public gLayer
{ {
public: public:
gSegmentChart(GraphSegmentType gt=GST_Pie, QColor gradient_color=Qt::lightGray,QColor outline_color=Qt::black); gSegmentChart(GraphSegmentType gt=GST_Pie, QColor gradient_color=Qt::white,QColor outline_color=Qt::black);
virtual ~gSegmentChart(); virtual ~gSegmentChart();
virtual void Plot(gGraphWindow & w,float scrx,float scry); virtual void Plot(gGraphWindow & w,float scrx,float scry);

View File

@ -196,20 +196,13 @@ Daily::Daily(QWidget *parent,QGLWidget * shared) :
// SPO2->hide(); // SPO2->hide();
PULSE->hide(); PULSE->hide();
//AddCPAPData(tap_eap=new TAPData(CPAP_EAP)); TAP_EAP->SetMargins(0,0,0,0);
//AddCPAPData(tap_iap=new TAPData(CPAP_IAP)); TAP_EAP->AddLayer(AddCPAP(new gTAPGraph(CPAP_EAP)));
//AddCPAPData(tap=new TAPData(CPAP_Pressure)); TAP_EAP->hide();
//TAP->SetMargins(20,15,5,50);
//TAP->SetMargins(0,0,0,0);
//TAP->AddLayer(new gCandleStick(tap));
//TAP->AddLayer(new gPieChart(tap));
//TAP_EAP->SetMargins(0,0,0,0);
//TAP_EAP->AddLayer(new gCandleStick(tap_eap));
//TAP_IAP->SetMargins(0,0,0,0);
//TAP_IAP->AddLayer(new gCandleStick(tap_iap));
TAP_IAP->SetMargins(0,0,0,0);
TAP_IAP->AddLayer(AddCPAP(new gTAPGraph(CPAP_IAP)));
TAP_IAP->hide();
TAP->SetMargins(0,0,0,0); TAP->SetMargins(0,0,0,0);
TAP->AddLayer(AddCPAP(new gTAPGraph(CPAP_Pressure))); TAP->AddLayer(AddCPAP(new gTAPGraph(CPAP_Pressure)));
@ -225,9 +218,6 @@ Daily::Daily(QWidget *parent,QGLWidget * shared) :
G_AHI->AddLayer(AddCPAP(l)); G_AHI->AddLayer(AddCPAP(l));
G_AHI->SetGradientBackground(false); G_AHI->SetGradientBackground(false);
G_AHI->hide(); G_AHI->hide();
/*TAP->hide();
TAP_IAP->hide();
TAP_EAP->hide(); */
NoData=new QLabel(tr("No data"),gSplitter); NoData=new QLabel(tr("No data"),gSplitter);
NoData->setAlignment(Qt::AlignCenter); NoData->setAlignment(Qt::AlignCenter);
@ -434,6 +424,7 @@ void Daily::on_calendar_selectionChanged()
void Daily::ResetGraphLayout() void Daily::ResetGraphLayout()
{ {
gSplitter->setSizes(splitter_sizes); gSplitter->setSizes(splitter_sizes);
} }
void Daily::Load(QDate date) void Daily::Load(QDate date)
@ -479,6 +470,8 @@ void Daily::Load(QDate date)
if (Graphs[i]->isEmpty()) { if (Graphs[i]->isEmpty()) {
Graphs[i]->hide(); Graphs[i]->hide();
} else { } else {
Graphs[i]->ResetBounds();
Graphs[i]->show(); Graphs[i]->show();
vis++; vis++;
} }
@ -655,7 +648,26 @@ void Daily::Load(QDate date)
if (cpap) { if (cpap) {
if (mode==MODE_BIPAP) { if (mode==MODE_BIPAP) {
{
html+=("<tr><td colspan=4 align=center><i>")+tr("Time@EPAP")+("</i></td></tr>\n");
TAP_EAP->setFixedSize(gwwidth,gwheight);
QPixmap pixmap=TAP_EAP->renderPixmap(gwwidth,gwheight,false);
QByteArray byteArray;
QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray
buffer.open(QIODevice::WriteOnly);
pixmap.save(&buffer, "PNG");
html+="<tr><td colspan=4 align=center><img src=\"data:image/png;base64," + byteArray.toBase64() + "\"></td></tr>\n";
}
{
html+=("<tr><td colspan=4 align=center><i>")+tr("Time@IPAP")+("</i></td></tr>\n");
TAP_IAP->setFixedSize(gwwidth,gwheight);
QPixmap pixmap=TAP_IAP->renderPixmap(gwwidth,gwheight,false);
QByteArray byteArray;
QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray
buffer.open(QIODevice::WriteOnly);
pixmap.save(&buffer, "PNG");
html+="<tr><td colspan=4 align=center><img src=\"data:image/png;base64," + byteArray.toBase64() + "\"></td></tr>\n";
}
} else if (mode==MODE_APAP) { } else if (mode==MODE_APAP) {
html+=("<tr><td colspan=4 align=center><i>")+tr("Time@Pressure")+("</i></td></tr>\n"); html+=("<tr><td colspan=4 align=center><i>")+tr("Time@Pressure")+("</i></td></tr>\n");
@ -862,7 +874,6 @@ void Daily::UpdateOXIGraphs(Day *day)
void Daily::RedrawGraphs() void Daily::RedrawGraphs()
{ {
for (unsigned i=0;i<Graphs.size();i++) { for (unsigned i=0;i<Graphs.size();i++) {
Graphs[i]->ResetBounds();
Graphs[i]->updateGL(); Graphs[i]->updateGL();
} }
} }