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

Stop SummaryCharts getting screwed up by Journal objects, etc..

Browse Source
This commit is contained in:
Mark Watkins 2011-10-02 15:06:58 +10:00
parent 591b73e7f3
commit 8778349e18
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Graphs/gSummaryChart.cpp
View File

@ -22,6 +22,7 @@ SummaryChart::SummaryChart(Profile *p,QString label,GraphType type)
lines->forceAntiAlias(false); lines->forceAntiAlias(false);
m_empty=true; m_empty=true;
hl_day=-1; hl_day=-1;
m_machinetype=MT_CPAP;
} }
SummaryChart::~SummaryChart() SummaryChart::~SummaryChart()
{ {
@ -69,6 +70,7 @@ void SummaryChart::SetDay(Day * nullday)
type=m_type[j]; type=m_type[j];
for (int i=0;i<d.value().size();i++) { for (int i=0;i<d.value().size();i++) {
day=d.value()[i]; day=d.value()[i];
if (day->machine_type()!=m_machinetype) continue;
if (type==ST_HOURS || day->channelExists(code) || day->settingExists(code)) { // too many lookups happening here.. stop the crap.. if (type==ST_HOURS || day->channelExists(code) || day->settingExists(code)) { // too many lookups happening here.. stop the crap..
m_days[dn]=day; m_days[dn]=day;
switch(m_type[j]) { switch(m_type[j]) {

3
Graphs/gSummaryChart.h
View File

@ -25,6 +25,8 @@ class SummaryChart:public Layer
virtual bool isEmpty() { return m_empty; } virtual bool isEmpty() { return m_empty; }
void addSlice(ChannelID code, QColor color, SummaryType type) { m_codes.push_back(code); m_colors.push_back(color); m_type.push_back(type); } void addSlice(ChannelID code, QColor color, SummaryType type) { m_codes.push_back(code); m_colors.push_back(color); m_type.push_back(type); }
void deselect() { hl_day=-1; } void deselect() { hl_day=-1; }
void setMachineType(MachineType type) { m_machinetype=type; }
MachineType machineType() { return m_machinetype; }
protected: protected:
Qt::Orientation m_orientation; Qt::Orientation m_orientation;
@ -49,6 +51,7 @@ class SummaryChart:public Layer
int hl_day; int hl_day;
gGraph * graph; gGraph * graph;
GraphType m_graphtype; GraphType m_graphtype;
MachineType m_machinetype;
virtual bool mouseMoveEvent(QMouseEvent * event); virtual bool mouseMoveEvent(QMouseEvent * event);
virtual bool mousePressEvent(QMouseEvent * event); virtual bool mousePressEvent(QMouseEvent * event);
virtual bool mouseReleaseEvent(QMouseEvent * event); virtual bool mouseReleaseEvent(QMouseEvent * event);

2
SleepLib/day.h
View File

@ -55,7 +55,7 @@ public:
qint64 total_time(); // in milliseconds qint64 total_time(); // in milliseconds
EventDataType hours() { return EventDataType(double(total_time())/3600000.0); } EventDataType hours() { return double(total_time())/3600000.0; }
Session *operator [](int i) { return sessions[i]; } Session *operator [](int i) { return sessions[i]; }