From ee6bc766f403472286fd859508af889536faa6b0 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Thu, 28 Jul 2011 17:32:02 +1000 Subject: [PATCH] PieCharts return, plus Memory Hog option in View Menu (defaults on) --- Graphs/gpiechart.cpp | 59 ++++++++++++++++++++----------------- Graphs/gpiechart.h | 13 +++++--- Graphs/graphdata.cpp | 2 +- Graphs/graphdata_custom.cpp | 6 ++-- Graphs/graphlayer.h | 2 +- daily.cpp | 37 ++++++++++------------- mainwindow.cpp | 10 +++++++ mainwindow.h | 2 ++ mainwindow.ui | 13 ++++++-- 9 files changed, 85 insertions(+), 59 deletions(-) diff --git a/Graphs/gpiechart.cpp b/Graphs/gpiechart.cpp index 3c1a06f3..cd22ac82 100644 --- a/Graphs/gpiechart.cpp +++ b/Graphs/gpiechart.cpp @@ -1,22 +1,41 @@ #include #include "gpiechart.h" -gPieChart::gPieChart(MachineCode code,QColor col) -:gLayer(code) +gPieChart::gPieChart(QColor outline_color) +:gLayer(MC_UNKNOWN),m_outline_color(outline_color) { - color.clear(); - color.push_back(col); } gPieChart::~gPieChart() { } +void gPieChart::AddSlice(MachineCode code,QColor color,QString name) +{ + m_counts[code]=code; + m_colors[code]=color; + m_names[code]=name; + m_total=0; +} +void gPieChart::SetDay(Day *d) +{ + gLayer::SetDay(d); + m_total=0; + if (!m_day) return; + for (map::iterator c=m_counts.begin();c!=m_counts.end();c++) { + c->second=0; + for (vector::iterator s=m_day->begin();s!=m_day->end();s++) { + int cnt=(*s)->count(c->first); + c->second+=cnt; + m_total+=cnt; + } + } + +} void gPieChart::Plot(gGraphWindow & w,float scrx,float scry) { if (!m_visible) return; - /*if (!data) return; - if (!data->IsReady()) return; - + if (!m_day) return; + if (!m_total) return; int start_px=w.GetLeftMargin(); int start_py=w.GetBottomMargin(); int width=scrx-(w.GetLeftMargin()+w.GetRightMargin()); @@ -26,29 +45,19 @@ void gPieChart::Plot(gGraphWindow & w,float scrx,float scry) diameter-=8; float radius=diameter/2.0; - double total=0; - for (int i=0;inp[0];i++) - total+=data->point[0][i].y(); - - double j=0.0; double sum=0.0; double step=1.0/45.0; float px,py; - //glEnable(GL_TEXTURE_2D); - //glEnable(GL_DEPTH_TEST); glEnable(GL_BLEND); - //glEnable(GL_POLYGON_SMOOTH); glEnable(GL_LINE_SMOOTH); glLineWidth(1.5); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - //glBlendFunc( GL_SRC_ALPHA_SATURATE, GL_ONE ); - //glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST); - for (int i=0;inp[0];i++) { - j=(data->point[0][i].y()/total); // ratio of this pie slice - QColor col1=color[i % color.size()]; - w.qglColor(col1); + for (map::iterator m=m_counts.begin();m!=m_counts.end();m++) { + if (!m->second) continue; + j=float(m->second)/float(m_total); // ratio of this pie slice + w.qglColor(m_colors[m->first]); glPolygonMode(GL_BACK,GL_FILL); glBegin(GL_POLYGON); glVertex2f(start_px+radius+4, start_py+radius+4); @@ -65,7 +74,7 @@ void gPieChart::Plot(gGraphWindow & w,float scrx,float scry) glEnd(); glPolygonMode(GL_BACK,GL_LINE); - w.qglColor(Qt::black); + w.qglColor(m_outline_color); glBegin(GL_POLYGON); glVertex2f(start_px+radius+4, start_py+radius+4); for (q=sum;q m_names; - + map m_names; + map m_counts; + map m_colors; + int m_total; + QColor m_outline_color; }; #endif // GPIECHART_H diff --git a/Graphs/graphdata.cpp b/Graphs/graphdata.cpp index 88feba27..704677ee 100644 --- a/Graphs/graphdata.cpp +++ b/Graphs/graphdata.cpp @@ -4,7 +4,7 @@ License: GPL *********************************************************************/ -#include "graphdata.h" +//#include "graphdata.h" /* gGraphData::gGraphData(int mp,gDataType t) :vc(0),type(t),max_points(mp) diff --git a/Graphs/graphdata_custom.cpp b/Graphs/graphdata_custom.cpp index 2dd2de2a..4335511d 100644 --- a/Graphs/graphdata_custom.cpp +++ b/Graphs/graphdata_custom.cpp @@ -4,9 +4,9 @@ License: GPL *********************************************************************/ -#include -#include -#include "graphdata_custom.h" +//#include +//#include +//#include "graphdata_custom.h" /* WaveData::WaveData(MachineCode _code, int _size) diff --git a/Graphs/graphlayer.h b/Graphs/graphlayer.h index bc220b06..313c3584 100644 --- a/Graphs/graphlayer.h +++ b/Graphs/graphlayer.h @@ -23,7 +23,7 @@ public: vector color; virtual void SetDay(Day * d); - void SetCode(MachineCode c) { m_code=c; } + virtual void SetCode(MachineCode c) { m_code=c; } virtual qint64 Minx() { if (m_day) return m_day->first(); return m_minx; } virtual qint64 Maxx() { if (m_day) return m_day->last(); return m_maxx; } virtual EventDataType Miny() { return m_miny; } diff --git a/daily.cpp b/daily.cpp index 39204e7a..d0f30be4 100644 --- a/daily.cpp +++ b/daily.cpp @@ -201,30 +201,23 @@ Daily::Daily(QWidget *parent,QGLWidget * shared) : //TAP_IAP->AddLayer(new gCandleStick(tap_iap)); - //G_AHI->SetMargins(0,0,0,0); + G_AHI->SetMargins(0,0,0,0); //AddCPAPData(g_ahi=new AHIData()); //gCandleStick *l=new gCandleStick(g_ahi); - /*gPieChart *l=new gPieChart(g_ahi); - l->AddName(tr("H")); - l->AddName(tr("OA")); - l->AddName(tr("CA")); - l->AddName(tr("RE")); - l->AddName(tr("FL")); - // l->AddName(tr("CSR")); - l->color.clear(); - l->color.push_back(QColor(0x40,0x40,0xff,0xff)); // blue - l->color.push_back(QColor(0x40,0xaf,0xbf,0xff)); // aqua - l->color.push_back(QColor(0xb2,0x54,0xcd,0xff)); // purple - l->color.push_back(QColor(0xff,0xff,0x80,0xff)); // yellow - l->color.push_back(QColor(0x40,0x40,0x40,0xff)); // dark grey + gPieChart *l=new gPieChart(Qt::black); + l->AddSlice(CPAP_Hypopnea,QColor(0x40,0x40,0xff,0xff),"H"); + l->AddSlice(CPAP_Obstructive,QColor(0x40,0xaf,0xbf,0xff),"OA"); + l->AddSlice(CPAP_ClearAirway,QColor(0xb2,0x54,0xcd,0xff),"CA"); + l->AddSlice(CPAP_RERA,QColor(0xff,0xff,0x80,0xff),"RE"); + l->AddSlice(CPAP_FlowLimit,QColor(0x40,0x40,0x40,0xff),"FL"); //l->color.push_back(QColor(0x60,0xff,0x60,0xff)); // green - G_AHI->AddLayer(l); + G_AHI->AddLayer(AddCPAP(l)); G_AHI->SetGradientBackground(false); //G_AHI->setMaximumSize(2000,30); //TAP->setMaximumSize(2000,30); G_AHI->hide(); - TAP->hide(); + /*TAP->hide(); TAP_IAP->hide(); TAP_EAP->hide(); */ @@ -417,9 +410,11 @@ void Daily::Load(QDate date) Day *oxi=profile->GetDay(date,MT_OXIMETER); // Day *sleepstage=profile->GetDay(date,MT_SLEEPSTAGE); - if (lastcpapday && (lastcpapday!=cpap)) { - for (vector::iterator s=lastcpapday->begin();s!=lastcpapday->end();s++) { - (*s)->TrashEvents(); + if (!pref["MemoryHog"].toBool()) { + if (lastcpapday && (lastcpapday!=cpap)) { + for (vector::iterator s=lastcpapday->begin();s!=lastcpapday->end();s++) { + (*s)->TrashEvents(); + } } } lastcpapday=cpap; @@ -526,13 +521,13 @@ void Daily::Load(QDate date) html+="\n"+tr("Event Breakdown")+"\n"; if (1) { - /* G_AHI->setFixedSize(gwwidth,gwheight); + G_AHI->setFixedSize(gwwidth,gwheight); QPixmap pixmap=G_AHI->renderPixmap(120,120,false); //gwwidth,gwheight,false); QByteArray byteArray; QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray buffer.open(QIODevice::WriteOnly); pixmap.save(&buffer, "PNG"); - html += "\n"; */ + html += "\n"; } html+="" "\n" diff --git a/mainwindow.cpp b/mainwindow.cpp index dac847f7..523f87ab 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -99,10 +99,15 @@ MainWindow::MainWindow(QWidget *parent) : if (!pref.Exists("NoonDateSplit")) pref["NoonDateSplit"]=false; ui->action_Noon_Date_Split->setChecked(pref["NoonDateSplit"].toBool()); + if (!pref.Exists("MemoryHog")) pref["MemoryHog"]=true; + ui->action_Memory_Hog->setChecked(pref["MemoryHog"].toBool()); + if (!pref.Exists("fruitsalad")) pref["fruitsalad"]=true; if (!pref.Exists("UseAntiAliasing")) pref["UseAntiAliasing"]=false; ui->actionUse_AntiAliasing->setChecked(pref["UseAntiAliasing"].toBool()); + + first_load=true; if (!pref.Exists("AlwaysShowOverlayBars")) pref["AlwaysShowOverlayBars"]=true; @@ -333,3 +338,8 @@ void MainWindow::on_actionOverlay_Bars_toggled(bool checked) if (daily) daily->RedrawGraphs(); } + +void MainWindow::on_action_Memory_Hog_toggled(bool checked) +{ + pref["MemoryHog"]=checked; +} diff --git a/mainwindow.h b/mainwindow.h index ed44f63a..a73e02b4 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -74,6 +74,8 @@ private slots: void on_actionOverlay_Bars_toggled(bool arg1); + void on_action_Memory_Hog_toggled(bool arg1); + private: Ui::MainWindow *ui; Daily * daily; diff --git a/mainwindow.ui b/mainwindow.ui index 38b34af3..04b010f6 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -591,9 +591,10 @@ + - + @@ -715,7 +716,15 @@ true - Overlay Bars + &Overlay Bars + + + + + true + + + &Memory Hog