From da8bf0ad38e82daa0129d703db6db8cee908d2eb Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Mon, 27 Jun 2011 17:45:59 +1000 Subject: [PATCH] Intel Graphics fixes --- Graphs/gFlagsLine.cpp | 12 ++++---- Graphs/gFooBar.cpp | 6 ++-- Graphs/gFooBar.h | 2 +- Graphs/gLineChart.cpp | 7 +++-- Graphs/graphwindow.cpp | 62 ++---------------------------------------- SleepLib/machine.cpp | 8 ++++-- daily.cpp | 33 ++++++++++++++-------- daily.h | 4 +++ 8 files changed, 49 insertions(+), 85 deletions(-) diff --git a/Graphs/gFlagsLine.cpp b/Graphs/gFlagsLine.cpp index 9fffece2..0d71d681 100644 --- a/Graphs/gFlagsLine.cpp +++ b/Graphs/gFlagsLine.cpp @@ -55,7 +55,7 @@ void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry) float line_top=(start_py+height-line_h)-line_num*line_h; - if ((line_num==total_lines-1)) { // last lines responsibility to draw the title. + if ((line_num==total_lines-1)) { // last lines responsibility to draw the bounding box glColor3f (0.1F, 0.1F, 0.1F); glLineWidth (1); @@ -65,8 +65,6 @@ void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry) glVertex2f (start_px+width,start_py+height); glVertex2f (start_px+width, start_py); glEnd (); - - } // Alternating box color @@ -78,10 +76,10 @@ void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry) // Filled rectangle glColor4ub(barcol->red(),barcol->green(),barcol->blue(),barcol->alpha()); glBegin(GL_QUADS); - glVertex2f(start_px, line_top); - glVertex2f(start_px, line_top+line_h); - glVertex2f(start_px+width, line_top+line_h); - glVertex2f(start_px+width, line_top); + glVertex2f(start_px-1, line_top); + glVertex2f(start_px-1, line_top+line_h); + glVertex2f(start_px+width-1, line_top+line_h); + glVertex2f(start_px+width-1, line_top); glEnd(); const int maxverts=65536; diff --git a/Graphs/gFooBar.cpp b/Graphs/gFooBar.cpp index 1d1a23dc..c6a6d13d 100644 --- a/Graphs/gFooBar.cpp +++ b/Graphs/gFooBar.cpp @@ -25,7 +25,7 @@ void gFooBar::Plot(gGraphWindow & w,float scrx,float scry) if (xx==0) return; - int start_px=w.GetLeftMargin(); + int start_px=w.GetLeftMargin()-1; int width=scrx - (w.GetLeftMargin() + w.GetRightMargin()); int height=scry - (w.GetTopMargin() + w.GetBottomMargin()); @@ -56,8 +56,10 @@ void gFooBar::Plot(gGraphWindow & w,float scrx,float scry) if ((m_funkbar)) { // && ((w.min_x>w.rmin_x) || (w.max_xSelectBuffer(); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - // Can't use font's in multiple contexts - Render(width,height); - - bmp=pbuffer->Snapshot(width,height); - glFlush(); - pbuffer->SelectContext(this); - } else bmp=NULL; - - - return bmp; -} */ void gGraphWindow::initializeGL() { setAutoFillBackground(false); @@ -1021,7 +965,7 @@ void gGraphWindow::DataChanged(gLayer *layer) //long l=t.GetMilliseconds().GetLo(); //wxLogMessage(wxString::Format(wxT("%li"),l)); - if ((t<1) && (layer!=lastlayer)) { + if ((t<2) && (layer!=lastlayer)) { lastlayer=layer; return; } @@ -1031,7 +975,7 @@ void gGraphWindow::DataChanged(gLayer *layer) // Assmption currently is Refresh que does skip - updateGL(); + // updateGL(); } diff --git a/SleepLib/machine.cpp b/SleepLib/machine.cpp index a100072b..c18a43d0 100644 --- a/SleepLib/machine.cpp +++ b/SleepLib/machine.cpp @@ -98,7 +98,7 @@ map DefaultMCLongNames; {PRS1_VSnore2, wxT("Vibratory Snore")}, {PRS1_PressurePulse,wxT("Pressue Pulse")} }; */ -inline const QString & _(QString q) { return q; }; +inline const QString & _(const QString q) { return q; }; void InitMapsWithoutAwesomeInitializerLists() { @@ -375,7 +375,10 @@ bool Machine::Load() int size=sessfiles.size(); int cnt=0; for (s=sessfiles.begin(); s!=sessfiles.end(); s++) { - if (qprogress) qprogress->setValue((float(++cnt)/float(size)*100.0)); + cnt++; + if ((cnt % 10)==0) + if (qprogress) qprogress->setValue((float(cnt)/float(size)*100.0)); + Session *sess=new Session(this,s->first); if (sess->LoadSummary(s->second[0])) { sess->SetEventFile(s->second[1]); @@ -386,6 +389,7 @@ bool Machine::Load() delete sess; } } + if (qprogress) qprogress->setValue(100); return true; } bool Machine::SaveSession(Session *sess) diff --git a/daily.cpp b/daily.cpp index 56b40f4e..554ee944 100644 --- a/daily.cpp +++ b/daily.cpp @@ -66,7 +66,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) : AddCPAPData(flags[8]=new FlagData(PRS1_VSnore2,1)); AddCPAPData(flags[9]=new FlagData(PRS1_Unknown0E,1)); AddCPAPData(frw=new WaveData(CPAP_FlowRate)); - SF=new gGraphWindow(gSplitter,"Event Flags",(QGLWidget *)NULL); // + AddGraph(SF=new gGraphWindow(gSplitter,"Event Flags",(QGLWidget *)NULL)); int sfc=7; SF->SetLeftMargin(SF->GetLeftMargin()+gYAxis::Margin); SF->SetBlockZoom(true); @@ -84,14 +84,14 @@ Daily::Daily(QWidget *parent,QGLContext *context) : SF->AddLayer(new gFlagsLine(flags[2],QColor("aqua"),"OA",2,sfc)); SF->AddLayer(new gFlagsLine(flags[1],QColor("purple"),"CA",1,sfc)); SF->AddLayer(new gFlagsLine(flags[0],QColor("light green"),"CSR",0,sfc)); - SF->AddLayer(new gFooBar(10,QColor("lime green"),QColor("dark grey"),true)); + SF->AddLayer(new gFooBar(10,QColor("orange"),QColor("dark grey"),true)); SF->setMinimumHeight(150+(extras ? 20 : 0)); // SF->setMaximumHeight(350); AddCPAPData(pressure_iap=new EventData(CPAP_IAP)); AddCPAPData(pressure_eap=new EventData(CPAP_EAP)); AddCPAPData(prd=new EventData(CPAP_Pressure)); - PRD=new gGraphWindow(gSplitter,"Pressure",SF); + AddGraph(PRD=new gGraphWindow(gSplitter,"Pressure",SF)); PRD->AddLayer(new gXAxis()); PRD->AddLayer(new gYAxis()); PRD->AddLayer(new gFooBar()); @@ -101,7 +101,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) : PRD->setMinimumHeight(150); - FRW=new gGraphWindow(gSplitter,"Flow Rate",SF); //shared_context); + AddGraph(FRW=new gGraphWindow(gSplitter,"Flow Rate",SF)); FRW->AddLayer(new gXAxis()); FRW->AddLayer(new gYAxis()); FRW->AddLayer(new gFooBar()); @@ -124,7 +124,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) : AddCPAPData(leakdata=new EventData(CPAP_Leak,0)); //leakdata->ForceMinY(0); //leakdata->ForceMaxY(120); - LEAK=new gGraphWindow(gSplitter,"Leaks",SF); + AddGraph(LEAK=new gGraphWindow(gSplitter,"Leaks",SF)); LEAK->AddLayer(new gXAxis()); LEAK->AddLayer(new gYAxis()); LEAK->AddLayer(new gFooBar()); @@ -135,7 +135,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) : AddCPAPData(snore=new EventData(CPAP_SnoreGraph,0)); //snore->ForceMinY(0); //snore->ForceMaxY(15); - SNORE=new gGraphWindow(gSplitter,"Snore",SF); + AddGraph(SNORE=new gGraphWindow(gSplitter,"Snore",SF)); SNORE->AddLayer(new gXAxis()); SNORE->AddLayer(new gYAxis()); SNORE->AddLayer(new gFooBar()); @@ -146,7 +146,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) : AddOXIData(pulse=new EventData(OXI_Pulse,0,65536,true)); //pulse->ForceMinY(40); //pulse->ForceMaxY(120); - PULSE=new gGraphWindow(gSplitter,"Pulse",SF); + AddGraph(PULSE=new gGraphWindow(gSplitter,"Pulse",SF)); PULSE->AddLayer(new gXAxis()); PULSE->AddLayer(new gYAxis()); PULSE->AddLayer(new gFooBar()); @@ -157,7 +157,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) : AddOXIData(spo2=new EventData(OXI_SPO2,0,65536,true)); //spo2->ForceMinY(60); //spo2->ForceMaxY(100); - SPO2=new gGraphWindow(gSplitter,"SpO2",SF); + AddGraph(SPO2=new gGraphWindow(gSplitter,"SpO2",SF)); SPO2->AddLayer(new gXAxis()); SPO2->AddLayer(new gYAxis()); SPO2->AddLayer(new gFooBar()); @@ -395,13 +395,12 @@ void Daily::Load(QDate date) html+="\n"; QString tmp; + const int gwwidth=270; + const int gwheight=25; UpdateCPAPGraphs(cpap); UpdateOXIGraphs(oxi); UpdateEventsTree(ui->treeWidget,cpap); - const int gwwidth=270; - const int gwheight=25; - QString epr,modestr; @@ -604,6 +603,7 @@ void Daily::Load(QDate date) if (journal) { ui->JournalNotes->setHtml(journal->summary[GEN_Notes].toString()); } + RedrawGraphs(); } void Daily::Unload(QDate date) @@ -770,8 +770,17 @@ void Daily::UpdateOXIGraphs(Day *day) for (list::iterator g=OXIData.begin();g!=OXIData.end();g++) { (*g)->Update(day); } -}; +} +void Daily::RedrawGraphs() +{ + + // could recall Min & Max stuff here to reset cache + // instead of using the dodgy notify calls. + for (list::iterator g=Graphs.begin();g!=Graphs.end();g++) { + (*g)->updateGL(); + } +} void Daily::on_treeWidget_itemSelectionChanged() { diff --git a/daily.h b/daily.h index 057d21a6..ae350d0c 100644 --- a/daily.h +++ b/daily.h @@ -60,10 +60,14 @@ private: list OXIData; list CPAPData; + list Graphs; + void AddCPAPData(gPointData *d) { CPAPData.push_back(d); }; void AddOXIData(gPointData *d) { OXIData.push_back(d); }; + void AddGraph(gGraphWindow *w) { Graphs.push_back(w); }; void UpdateCPAPGraphs(Day *day); void UpdateOXIGraphs(Day *day); + void RedrawGraphs(); gPointData *flags[10];