diff --git a/Graphs/gTitle.cpp b/Graphs/gTitle.cpp index f2121089..318e7d35 100644 --- a/Graphs/gTitle.cpp +++ b/Graphs/gTitle.cpp @@ -20,13 +20,11 @@ void gTitle::Plot(gGraphWindow & w,float scrx,float scry) float width,height; GetTextExtent(m_title,width,height); int xp=(height/2)+20; - //if (m_alignment==wxALIGN_RIGHT) xp=scrx-4-height; DrawText(w,m_title,xp,scry-(w.GetBottomMargin()+((scry-w.GetBottomMargin())/2.0)),90.0,m_color,&m_font); //DrawText(w,m_title,150,-40,45.0); //20+xp,scry-(w.GetBottomMargin()+((scry-w.GetBottomMargin())/2.0)+(height/2)),90.0,m_color,&m_font); - //glColor3ub(m_color.red(),m_color.green(),m_color.blue()); //w.renderText(xp,scry-(w.GetBottomMargin()+((scry-w.GetBottomMargin())/2.0)+(height/2)),0.35,m_title,m_font); } diff --git a/Graphs/gYAxis.cpp b/Graphs/gYAxis.cpp index 0c8e5b2b..cb6cc130 100644 --- a/Graphs/gYAxis.cpp +++ b/Graphs/gYAxis.cpp @@ -15,6 +15,7 @@ gYAxis::gYAxis(QColor col) m_show_major_lines=true; m_show_minor_lines=true; + m_yaxis_scale=1; } gYAxis::~gYAxis() { @@ -89,7 +90,7 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry) for (double i=miny; i<=maxy+min_ytick-0.00001; i+=min_ytick) { ty=(i - miny) * ymult; - fd=Format(i); // Override this as a function. + fd=Format(i*m_yaxis_scale); // Override this as a function. GetTextExtent(fd,x,y); if (x>labelW) labelW=x; h=start_py+ty; diff --git a/Graphs/gYAxis.h b/Graphs/gYAxis.h index b0e43815..5657184f 100644 --- a/Graphs/gYAxis.h +++ b/Graphs/gYAxis.h @@ -25,11 +25,15 @@ class gYAxis:public gLayer bool ShowMajorTicks() { return m_show_major_ticks; }; virtual const QString & Format(double v) { static QString t; t.sprintf("%.1f",v); return t; }; static const int Margin=50; // Left margin space + + void SetScale(float f) { m_yaxis_scale=f; }; // Scale yaxis ticker values (only what's displayed) + float Scale() { return m_yaxis_scale; }; protected: bool m_show_major_lines; bool m_show_minor_lines; bool m_show_minor_ticks; bool m_show_major_ticks; + float m_yaxis_scale; }; #endif // GYAXIS_H diff --git a/Graphs/glcommon.cpp b/Graphs/glcommon.cpp index 5e6a09fc..9eb15044 100644 --- a/Graphs/glcommon.cpp +++ b/Graphs/glcommon.cpp @@ -55,7 +55,7 @@ void GetTextExtent(QString text, float & width, float & height, QFont *font) width=fm.width(text); //fm.width(text); height=fm.xHeight()+2; //fm.ascent(); } -void DrawText(gGraphWindow & wid, QString text, int x, int y, float angle, QColor color,QFont *font) +void RDrawText(gGraphWindow & wid, QString text, int x, int y, float angle, QColor color,QFont *font) { //QFontMetrics fm(*font); float w,h; @@ -69,11 +69,13 @@ void DrawText(gGraphWindow & wid, QString text, int x, int y, float angle, QCol } // glEnable(GL_TEXTURE_2D); - glDisable(GL_DEPTH_TEST); - glFlush(); +// glDisable(GL_DEPTH_TEST); + glFinish(); QPainter painter(&wid); painter.setFont(*font); + color=Qt::black; painter.setPen(color); + painter.setBrush(QBrush(color)); painter.setOpacity(1); // painter.setCompositionMode(QPainter::CompositionMode_); if (angle==0) { @@ -93,6 +95,33 @@ void DrawText(gGraphWindow & wid, QString text, int x, int y, float angle, QCol glDisable(GL_DEPTH_TEST); } +struct TextBuffer +{ + gGraphWindow *wid; + QString text; + int x,y; + float angle; + QColor *color; + QFont *font; + TextBuffer(gGraphWindow * _wid, QString _text, int _x, int _y, float _angle, QColor *_color,QFont *_font) { + wid=_wid; text=_text; x=_x; y=_y; angle=_angle; color=_color; font=_font; + } +}; +vector TextQue; + +void DrawTextQueue() +{ + for (unsigned i=0;iwid,t->text,t->x,t->y,t->angle,*t->color,t->font); + delete TextQue[i]; + } + TextQue.clear(); +} +void DrawText(gGraphWindow & wid, QString text, int x, int y, float angle, QColor color,QFont *font) +{ + TextQue.push_back(new TextBuffer(&wid,text,x,y,angle,&color,font)); +} void RoundedRectangle(int x,int y,int w,int h,int radius,const QColor color) diff --git a/Graphs/glcommon.h b/Graphs/glcommon.h index 6e42586d..f1637ded 100644 --- a/Graphs/glcommon.h +++ b/Graphs/glcommon.h @@ -27,6 +27,7 @@ extern GLshort *vertex_array[num_vert_arrays]; class gGraphWindow; void GetTextExtent(QString text, float & width, float & height, QFont *font=defaultfont); void DrawText(gGraphWindow & wid, QString text, int x, int y, float angle=0, QColor color=QColor("black"),QFont *font=defaultfont); +void DrawTextQueue(); void LinedRoundedRectangle(int x,int y,int w,int h,int radius,int lw,QColor color); void RoundedRectangle(int x,int y,int w,int h,int radius,const QColor color); diff --git a/Graphs/graphwindow.cpp b/Graphs/graphwindow.cpp index 33c59158..a39b68ae 100644 --- a/Graphs/graphwindow.cpp +++ b/Graphs/graphwindow.cpp @@ -733,6 +733,8 @@ void gGraphWindow::Render(float w, float h) for (list::iterator l=layers.begin();l!=layers.end();l++) { (*l)->Plot(*this,w,h); } + glFinish(); + DrawTextQueue(); } void gGraphWindow::paintGL() diff --git a/SleepLib/loader_plugins/prs1_loader.cpp b/SleepLib/loader_plugins/prs1_loader.cpp index 3933bedb..1e6c7c32 100644 --- a/SleepLib/loader_plugins/prs1_loader.cpp +++ b/SleepLib/loader_plugins/prs1_loader.cpp @@ -184,7 +184,8 @@ bool PRS1Loader::ParseProperties(Machine *m,QString filename) s=f.readLine(); } bool ok; - int i=prop["ProductType"].toInt(&ok); + QString pt=prop["ProductType"]; + int i=pt.toInt(&ok,0); if (ok) { if (ModelMap.find(i)!=ModelMap.end()) { m->properties["SubModel"]=ModelMap[i]; @@ -1025,14 +1026,20 @@ bool PRS1Loader::OpenWaveforms(Session *session,QString filename) for (int j=0;jc) min[s]=c; + if (max[s]c) min[s]=c; - if (max[s]AddLayer(new gYAxis()); + gYAxis *y=new gYAxis(); + y->SetScale(.1); + MP->AddLayer(y); MP->AddLayer(new gXAxis()); gLineChart *g=new gLineChart(mpw,Qt::black,4000,true); g->ReportEmpty(true); MP->AddLayer(g); + MP->setMinimumHeight(120); AddCPAPData(frw=new WaveData(CPAP_FlowRate,1000000)); //FlowRate @@ -634,7 +637,7 @@ void Daily::Load(QDate date) if (mode==MODE_BIPAP) { html+=""+tr("90% EPAP ")+QString().sprintf("%.2f",eap90)+tr("cmH2O")+"\n" - ""+tr("90% IPAP ")+QString().sprintf("%.2f",iap90)+"\n"; + ""+tr("90% IPAP ")+QString().sprintf("%.2f",iap90)+tr("cmH2O")+"\n"; } else if (mode==MODE_APAP) { html+=("")+tr("90% Pressure ")+QString().sprintf("%.2f",cpap->summary_weighted_avg(CPAP_PressurePercentValue))+("\n"); } else if (mode==MODE_CPAP) {