chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

PieCharts return, plus Memory Hog option in View Menu (defaults on)

Browse Source
This commit is contained in:
Mark Watkins 2011-07-28 17:32:02 +10:00
parent d422a46802
commit ee6bc766f4
9 changed files with 85 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
Graphs/gpiechart.cpp
View File

@ -1,22 +1,41 @@
#include <math.h>
#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<MachineCode,int>::iterator c=m_counts.begin();c!=m_counts.end();c++) {
c->second=0;
for (vector<Session *>::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;i<data->np[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;i<data->np[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<MachineCode,int>::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<sum+j;q+=step) {
@ -79,11 +88,7 @@ void gPieChart::Plot(gGraphWindow & w,float scrx,float scry)
glVertex2f(px,py);
glEnd();
sum=q;
}
glDisable(GL_POLYGON_SMOOTH);
glDisable(GL_BLEND); */
//glDisable(GL_DEPTH_TEST);
//glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND);
}

13
Graphs/gpiechart.h
View File

@ -5,15 +5,20 @@
class gPieChart : public gLayer
{
public:
gPieChart(MachineCode code=MC_UNKNOWN,QColor col=Qt::black);
gPieChart(QColor color=Qt::black);
virtual ~gPieChart();
virtual void Plot(gGraphWindow & w,float scrx,float scry);
void AddName(QString name) { m_names.push_back(name); }
virtual void SetDay(Day *d);
void AddSlice(MachineCode code,QColor col,QString name="");
protected:
vector<QString> m_names;
map <MachineCode,QString> m_names;
map <MachineCode,int> m_counts;
map <MachineCode,QColor> m_colors;
int m_total;
QColor m_outline_color;
};
#endif // GPIECHART_H

2
Graphs/graphdata.cpp
View File

@ -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)

6
Graphs/graphdata_custom.cpp
View File

@ -4,9 +4,9 @@
License: GPL
*********************************************************************/
#include <cmath>
#include <QDebug>
#include "graphdata_custom.h"
//#include <cmath>
//#include <QDebug>
//#include "graphdata_custom.h"
/*
WaveData::WaveData(MachineCode _code, int _size)

2
Graphs/graphlayer.h
View File

@ -23,7 +23,7 @@ public:
vector<QColor> 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; }

37
daily.cpp
View File

@ -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<Session *>::iterator s=lastcpapday->begin();s!=lastcpapday->end();s++) {
(*s)->TrashEvents();
if (!pref["MemoryHog"].toBool()) {
if (lastcpapday && (lastcpapday!=cpap)) {
for (vector<Session *>::iterator s=lastcpapday->begin();s!=lastcpapday->end();s++) {
(*s)->TrashEvents();
}
}
}
lastcpapday=cpap;
@ -526,13 +521,13 @@ void Daily::Load(QDate date)
html+="</tr>\n<tr><td colspan=4 align=center><i>"+tr("Event Breakdown")+"</i></td></tr>\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 += "<tr><td colspan=4 align=center><img src=\"data:image/png;base64," + byteArray.toBase64() + "\"></td></tr>\n"; */
html += "<tr><td colspan=4 align=center><img src=\"data:image/png;base64," + byteArray.toBase64() + "\"></td></tr>\n";
}
html+="</table>"
"<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n"

10
mainwindow.cpp
View File

@ -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;
}

2
mainwindow.h
View File

@ -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;

13
mainwindow.ui
View File

@ -591,9 +591,10 @@
<addaction name="actionView_Welcome"/>
<addaction name="separator"/>
<addaction name="actionUse_AntiAliasing"/>
<addaction name="actionOverlay_Bars"/>
<addaction name="action_Link_Graphs"/>
<addaction name="action_Noon_Date_Split"/>
<addaction name="actionOverlay_Bars"/>
<addaction name="action_Memory_Hog"/>
<addaction name="separator"/>
<addaction name="action_Fullscreen"/>
</widget>
@ -715,7 +716,15 @@
<bool>true</bool>
</property>
<property name="text">
<string>Overlay Bars</string>
<string>&amp;Overlay Bars</string>
</property>
</action>
<action name="action_Memory_Hog">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>&amp;Memory Hog</string>
</property>
</action>
</widget>