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

Mouse Handling cleanup, Graph YAxis prep work, profile screen improvements

Browse Source
This commit is contained in:
Mark Watkins 2013-10-25 20:39:30 +10:00
parent 0a67a16baa
commit 142feb9ace
28 changed files with 1026 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
sleepyhead/Graphs/gFlagsLine.cpp
View File

@ -10,6 +10,17 @@
#include "gFlagsLine.h" #include "gFlagsLine.h"
#include "gYAxis.h" #include "gYAxis.h"
gFlagsLabelArea::gFlagsLabelArea(gFlagsGroup * group)
:gSpacer(20)
{
m_group=group;
}
bool gFlagsLabelArea::mouseMoveEvent(QMouseEvent * event,gGraph * graph)
{
if (m_group) m_group->mouseMoveEvent(event,graph);
}
gFlagsGroup::gFlagsGroup() gFlagsGroup::gFlagsGroup()
{ {
addVertexBuffer(quads=new gVertexBuffer(512,GL_QUADS)); addVertexBuffer(quads=new gVertexBuffer(512,GL_QUADS));
@ -61,7 +72,7 @@ void gFlagsGroup::SetDay(Day * d)
m_barh=0; m_barh=0;
} }
void gFlagsGroup::paint(gGraph &w, int left, int top, int width, int height) void gFlagsGroup::paint(gGraph &g, int left, int top, int width, int height)
{ {
if (!m_visible) return; if (!m_visible) return;
if (!m_day) return; if (!m_day) return;
@ -77,11 +88,12 @@ void gFlagsGroup::paint(gGraph &w, int left, int top, int width, int height)
quads->add(left, linetop, left, linetop+m_barh, left+width-1, linetop+m_barh, left+width-1, linetop, barcol.rgba()); quads->add(left, linetop, left, linetop+m_barh, left+width-1, linetop+m_barh, left+width-1, linetop, barcol.rgba());
// Paint the actual flags // Paint the actual flags
lvisible[i]->paint(w,left,linetop,width,m_barh); lvisible[i]->m_rect=QRect(left,linetop,width,m_barh);
lvisible[i]->paint(g,left,linetop,width,m_barh);
linetop+=m_barh; linetop+=m_barh;
} }
gVertexBuffer *outlines=w.lines(); gVertexBuffer *outlines=g.lines();
outlines->add(left-1, top, left-1, top+height, COLOR_Outline.rgba()); outlines->add(left-1, top, left-1, top+height, COLOR_Outline.rgba());
outlines->add(left-1, top+height, left+width,top+height, COLOR_Outline.rgba()); outlines->add(left-1, top+height, left+width,top+height, COLOR_Outline.rgba());
outlines->add(left+width,top+height, left+width, top,COLOR_Outline.rgba()); outlines->add(left+width,top+height, left+width, top,COLOR_Outline.rgba());
@ -91,6 +103,30 @@ void gFlagsGroup::paint(gGraph &w, int left, int top, int width, int height)
//lines->add(left+width, top+height, left+width, top); //lines->add(left+width, top+height, left+width, top);
} }
bool gFlagsGroup::mouseMoveEvent(QMouseEvent * event,gGraph * graph)
{
for (int i=0;i<lvisible.size();i++) {
gFlagsLine *fl=lvisible[i];
if (fl->m_rect.contains(event->x(),event->y())) {
if (fl->mouseMoveEvent(event,graph)) return true;
} else {
// Inside main graph area?
if ((event->y() > fl->m_rect.y()) && (event->y()) < (fl->m_rect.y()+fl->m_rect.height())) {
if (event->x() < lvisible[i]->m_rect.x()) {
// Display tooltip
QString ttip=schema::channel[fl->code()].description();
graph->graphView()->m_tooltip->display(ttip,event->x(),event->y()-15,p_profile->general->tooltipTimeout());
graph->redraw();
}
}
}
}
return false;
}
gFlagsLine::gFlagsLine(ChannelID code,QColor flag_color,QString label,bool always_visible,FlagType flt) gFlagsLine::gFlagsLine(ChannelID code,QColor flag_color,QString label,bool always_visible,FlagType flt)
:Layer(code),m_label(label),m_always_visible(always_visible),m_flt(flt),m_flag_color(flag_color) :Layer(code),m_label(label),m_always_visible(always_visible),m_flt(flt),m_flag_color(flag_color)
{ {
@ -243,3 +279,10 @@ void gFlagsLine::paint(gGraph & w,int left, int top, int width, int height)
qWarning() << "maxverts exceeded in gFlagsLine::plot()"; qWarning() << "maxverts exceeded in gFlagsLine::plot()";
} }
} }
bool gFlagsLine::mouseMoveEvent(QMouseEvent * event,gGraph * graph)
{
// qDebug() << code() << event->x() << event->y() << graph->rect();
return false;
}

30
sleepyhead/Graphs/gFlagsLine.h
View File

@ -8,9 +8,32 @@
#define GFLAGSLINE_H #define GFLAGSLINE_H
#include "gGraphView.h" #include "gGraphView.h"
#include "gspacer.h"
class gFlagsGroup; class gFlagsGroup;
/*! \class gYSpacer
\brief A dummy vertical spacer object
*/
class gFlagsLabelArea:public gSpacer
{
public:
gFlagsLabelArea(gFlagsGroup * group);
virtual void paint(gGraph & w,int left,int top, int width, int height) {
Q_UNUSED(w)
Q_UNUSED(left)
Q_UNUSED(top)
Q_UNUSED(width)
Q_UNUSED(height)
}
protected:
gFlagsGroup * m_group;
virtual bool mouseMoveEvent(QMouseEvent * event,gGraph * graph);
};
/*! \class gFlagsLine /*! \class gFlagsLine
\brief One single line of event flags in the Event Flags chart \brief One single line of event flags in the Event Flags chart
*/ */
@ -45,6 +68,9 @@ class gFlagsLine:public Layer
void setTotalLines(int i) { total_lines=i; } void setTotalLines(int i) { total_lines=i; }
void setLineNum(int i) { line_num=i; } void setLineNum(int i) { line_num=i; }
protected: protected:
virtual bool mouseMoveEvent(QMouseEvent * event,gGraph * graph);
QString m_label; QString m_label;
bool m_always_visible; bool m_always_visible;
int total_lines,line_num; int total_lines,line_num;
@ -60,6 +86,8 @@ class gFlagsLine:public Layer
*/ */
class gFlagsGroup:public LayerGroup class gFlagsGroup:public LayerGroup
{ {
friend class gFlagsLabelArea;
public: public:
gFlagsGroup(); gFlagsGroup();
virtual ~gFlagsGroup(); virtual ~gFlagsGroup();
@ -88,6 +116,8 @@ public:
QVector<gFlagsLine *> & visibleLayers() { return lvisible; } QVector<gFlagsLine *> & visibleLayers() { return lvisible; }
protected: protected:
virtual bool mouseMoveEvent(QMouseEvent * event,gGraph * graph);
gVertexBuffer *quads, *lines; gVertexBuffer *quads, *lines;
QVector<gFlagsLine *> lvisible; QVector<gFlagsLine *> lvisible;
float m_barh; float m_barh;

1
sleepyhead/Graphs/gFooBar.cpp
View File

@ -5,6 +5,7 @@
*/ */
#include <cmath> #include <cmath>
#include "gFooBar.h" #include "gFooBar.h"
#include "gYAxis.h"
gShadowArea::gShadowArea(QColor shadow_color,QColor line_color) gShadowArea::gShadowArea(QColor shadow_color,QColor line_color)
:Layer(NoChannel),m_shadow_color(shadow_color),m_line_color(line_color) :Layer(NoChannel),m_shadow_color(shadow_color),m_line_color(line_color)

346
sleepyhead/Graphs/gGraphView.cpp
View File

@ -781,9 +781,10 @@ void gToolTip::paint() //actually paints it.
int x=m_pos.x();// - tw / 2; int x=m_pos.x();// - tw / 2;
int y=m_pos.y();// - th; int y=m_pos.y();// - th;
QPainter painter;
if (!usepixmap | (usepixmap && m_invalidate)) { if (!usepixmap | (usepixmap && m_invalidate)) {
QPainter painter;
painter.begin(m_graphview); painter.begin(m_graphview);
@ -830,14 +831,17 @@ void gToolTip::paint() //actually paints it.
m_image=QImage(rect.width()+2,rect.height()+2,QImage::Format_ARGB32_Premultiplied); m_image=QImage(rect.width()+2,rect.height()+2,QImage::Format_ARGB32_Premultiplied);
m_image.fill(Qt::transparent); m_image.fill(Qt::transparent);
painter.begin(&m_image); painter.begin(&m_image);
painter.setCompositionMode(QPainter::CompositionMode_Source);
} }
lines_drawn_this_frame+=4; lines_drawn_this_frame+=4;
quads_drawn_this_frame+=1; quads_drawn_this_frame+=1;
QBrush brush(QColor(255,255,128,200)); QBrush brush(QColor(255,255,128,255));
brush.setStyle(Qt::SolidPattern); brush.setStyle(Qt::SolidPattern);
painter.setBrush(brush); painter.setBrush(brush);
painter.setPen(QColor(0,0,0,255));
painter.drawRoundedRect(rect,5,5); painter.drawRoundedRect(rect,5,5);
painter.setBrush(Qt::black); painter.setBrush(Qt::black);
@ -846,10 +850,11 @@ void gToolTip::paint() //actually paints it.
painter.end(); painter.end();
if (usepixmap) { if (usepixmap) {
m_image=QGLWidget::convertToGLFormat(m_image); //m_image=m_image.
m_textureID=m_graphview->bindTexture(m_image,GL_TEXTURE_2D,GL_RGBA,QGLContext::NoBindOption); // m_textureID=m_graphview->bindTexture(m_image,GL_TEXTURE_2D,GL_RGBA,QGLContext::NoBindOption);
m_invalidate=false; m_invalidate=false;
} }
} }
if (usepixmap) { if (usepixmap) {
x-=m_spacer+m_image.width()/2; x-=m_spacer+m_image.width()/2;
@ -858,12 +863,10 @@ void gToolTip::paint() //actually paints it.
if (x<0) x=0; if (x<0) x=0;
if ((x+m_image.width()) > (m_graphview->width()-10)) x=m_graphview->width()-10 - m_image.width(); if ((x+m_image.width()) > (m_graphview->width()-10)) x=m_graphview->width()-10 - m_image.width();
if (usepixmap && !m_image.isNull()) { if (usepixmap && !m_image.isNull()) {
glEnable(GL_BLEND); painter.begin(m_graphview);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_TEXTURE_2D); painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
m_graphview->drawTexture(QPoint(x,y),m_textureID); painter.drawImage(QPoint(x,y),m_image);
glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND);
} }
} }
@ -1039,7 +1042,7 @@ EventDataType LayerGroup::Miny()
EventDataType m=0,t; EventDataType m=0,t;
for (int i=0;i<layers.size();i++) { for (int i=0;i<layers.size();i++) {
t=layers[i]->Miny(); t=layers[i]->Miny();
if (t==layers[i]->Minx()) continue; if (t==layers[i]->Maxy()) continue;
if (first) { if (first) {
m=t; m=t;
first=false; first=false;
@ -1065,6 +1068,54 @@ EventDataType LayerGroup::Maxy()
return m; return m;
} }
//! \brief Mouse wheel moved somewhere over this layer
bool LayerGroup::wheelEvent(QWheelEvent * event, gGraph * graph)
{
for (int i=0;i<layers.size();i++)
if (layers[i]->wheelEvent(event,graph))
return true;
return false;
}
//! \brief Mouse moved somewhere over this layer
bool LayerGroup::mouseMoveEvent(QMouseEvent * event, gGraph * graph)
{
for (int i=0;i<layers.size();i++)
if (layers[i]->mouseMoveEvent(event,graph)) return true;
return false;
}
//! \brief Mouse left or right button pressed somewhere on this layer
bool LayerGroup::mousePressEvent(QMouseEvent * event, gGraph * graph)
{
for (int i=0;i<layers.size();i++)
if (layers[i]->mousePressEvent(event,graph)) return true;
return false;
}
//! \brief Mouse button released that was originally pressed somewhere on this layer
bool LayerGroup::mouseReleaseEvent(QMouseEvent * event, gGraph * graph)
{
for (int i=0;i<layers.size();i++)
if (layers[i]->mouseReleaseEvent(event,graph)) return true;
return false;
}
//! \brief Mouse button double clicked somewhere on this layer
bool LayerGroup::mouseDoubleClickEvent(QMouseEvent * event, gGraph * graph)
{
for (int i=0;i<layers.size();i++)
if (layers[i]->mouseDoubleClickEvent(event,graph)) return true;
return false;
}
//! \brief A key was pressed on the keyboard while the graph area was focused.
bool LayerGroup::keyPressEvent(QKeyEvent * event, gGraph * graph)
{
for (int i=0;i<layers.size();i++)
if (layers[i]->keyPressEvent(event,graph)) return true;
return false;
}
const double zoom_hard_limit=500.0; const double zoom_hard_limit=500.0;
@ -1240,7 +1291,7 @@ void gGraph::renderText(QString text, int x,int y, float angle, QColor color, QF
void gGraph::paint(int originX, int originY, int width, int height) void gGraph::paint(int originX, int originY, int width, int height)
{ {
m_lastbounds=QRect(originX,originY,width,height); m_rect=QRect(originX,originY,width,height);
/*glEnable(GL_BLEND); /*glEnable(GL_BLEND);
glBegin(GL_QUADS); glBegin(GL_QUADS);
@ -1351,6 +1402,7 @@ void gGraph::paint(int originX, int originY, int width, int height)
if (!ll->visible()) continue; if (!ll->visible()) continue;
tmp=ll->Width()*m_graphview->printScaleX(); tmp=ll->Width()*m_graphview->printScaleX();
if (ll->position()==LayerLeft) { if (ll->position()==LayerLeft) {
ll->m_rect=QRect(originX+left,originY+top,tmp,height-top-bottom);
ll->paint(*this,originX+left,originY+top,tmp,height-top-bottom); ll->paint(*this,originX+left,originY+top,tmp,height-top-bottom);
left+=tmp; left+=tmp;
#ifdef DEBUG_LAYOUT #ifdef DEBUG_LAYOUT
@ -1359,6 +1411,7 @@ void gGraph::paint(int originX, int originY, int width, int height)
} }
if (ll->position()==LayerRight) { if (ll->position()==LayerRight) {
right+=tmp; right+=tmp;
ll->m_rect=QRect(originX+width-right,originY+top,tmp,height-top-bottom);
ll->paint(*this,originX+width-right,originY+top,tmp,height-top-bottom); ll->paint(*this,originX+width-right,originY+top,tmp,height-top-bottom);
#ifdef DEBUG_LAYOUT #ifdef DEBUG_LAYOUT
lines()->add(originX+width-right,originY,originX+width-right,originY+height,col); lines()->add(originX+width-right,originY,originX+width-right,originY+height,col);
@ -1372,11 +1425,13 @@ void gGraph::paint(int originX, int originY, int width, int height)
if (!ll->visible()) continue; if (!ll->visible()) continue;
tmp=ll->Height()*m_graphview->printScaleY(); tmp=ll->Height()*m_graphview->printScaleY();
if (ll->position()==LayerTop) { if (ll->position()==LayerTop) {
ll->m_rect=QRect(originX+left,originY+top,width-left-right,tmp);
ll->paint(*this,originX+left,originY+top,width-left-right,tmp); ll->paint(*this,originX+left,originY+top,width-left-right,tmp);
top+=tmp; top+=tmp;
} }
if (ll->position()==LayerBottom) { if (ll->position()==LayerBottom) {
bottom+=tmp; bottom+=tmp;
ll->m_rect=QRect(originX+left,originY+height-bottom,width-left-right,tmp);
ll->paint(*this,originX+left,originY+height-bottom,width-left-right,tmp); ll->paint(*this,originX+left,originY+height-bottom,width-left-right,tmp);
} }
} }
@ -1385,6 +1440,7 @@ void gGraph::paint(int originX, int originY, int width, int height)
Layer *ll=m_layers[i]; Layer *ll=m_layers[i];
if (!ll->visible()) continue; if (!ll->visible()) continue;
if (ll->position()==LayerCenter) { if (ll->position()==LayerCenter) {
ll->m_rect=QRect(originX+left,originY+top,width-left-right,height-top-bottom);
ll->paint(*this,originX+left,originY+top,width-left-right,height-top-bottom); ll->paint(*this,originX+left,originY+top,width-left-right,height-top-bottom);
} }
} }
@ -1397,7 +1453,7 @@ void gGraph::paint(int originX, int originY, int width, int height)
} }
void gGraphView::queGraph(gGraph * g,int left, int top, int width, int height) void gGraphView::queGraph(gGraph * g,int left, int top, int width, int height)
{ {
g->m_lastbounds=QRect(left,top,width,height); g->m_rect=QRect(left,top,width,height);
#ifdef ENABLED_THREADED_DRAWING #ifdef ENABLED_THREADED_DRAWING
dl_mutex.lock(); dl_mutex.lock();
#endif #endif
@ -1450,28 +1506,36 @@ void gGraph::timedRedraw(int ms)
void gGraph::mouseMoveEvent(QMouseEvent * event) void gGraph::mouseMoveEvent(QMouseEvent * event)
{ {
// qDebug() << m_title << "Move" << event->pos() << m_graphview->pointClicked(); // qDebug() << m_title << "Move" << event->pos() << m_graphview->pointClicked();
//int y=event->pos().y(); int y=event->y();
int x=event->pos().x(); int x=event->x();
int x2=m_graphview->pointClicked().x();//,y2=m_graphview->pointClicked().y();
int w=m_lastbounds.width()-(right); bool doredraw=false;
for (int i=0;i<m_layers.size();i++) {
if (m_layers[i]->m_rect.contains(x,y))
if (m_layers[i]->mouseMoveEvent(event,this)) doredraw=true;
}
y-=m_rect.top();
x-=m_rect.left();
int x2=m_graphview->pointClicked().x()-m_rect.left();
int w=m_rect.width()-(left+right);
//int h=m_lastbounds.height()-(bottom+m_marginbottom); //int h=m_lastbounds.height()-(bottom+m_marginbottom);
double xx=max_x-min_x; double xx=max_x-min_x;
double xmult=xx/w; double xmult=xx/w;
if (m_graphview->m_selected_graph==this) { // Left Mouse button dragging
//bool nolayer=false;
bool doredraw=false;
if (m_graphview->m_selected_graph==this) {
if (event->buttons() & Qt::LeftButton) { if (event->buttons() & Qt::LeftButton) {
//qDebug() << m_title << "Moved" << x << y << left << right << top << bottom << m_width << h; //qDebug() << m_title << "Moved" << x << y << left << right << top << bottom << m_width << h;
int a1=MIN(x,x2); int a1=MIN(x,x2);
int a2=MAX(x,x2); int a2=MAX(x,x2);
if (a1<left) a1=left; if (a1<left) a1=left;
if (a2>w) a2=w; if (a2>left+w) a2=left+w;
m_selecting_area=true; m_selecting_area=true;
m_selection=QRect(a1-1,0,a2-a1,m_lastbounds.height()); m_selection=QRect(a1-1,0,a2-a1,m_rect.height());
double w2=m_lastbounds.width()-right-left; //-(right+m_marginright)-(m_marginleft+left); double w2=m_rect.width()-right-left;
if (m_blockzoom) { if (m_blockzoom) {
xmult=(rmax_x-rmin_x)/w2; xmult=(rmax_x-rmin_x)/w2;
} else { } else {
@ -1493,20 +1557,13 @@ void gGraph::mouseMoveEvent(QMouseEvent * event)
if (qstatus2) { if (qstatus2) {
qstatus2->setText(str); qstatus2->setText(str);
} }
//m_graphview->redraw();
//nolayer=false;
doredraw=true; doredraw=true;
} else if (event->buttons() & Qt::RightButton) { } else if (event->buttons() & Qt::RightButton) { // Right Mouse button dragging
m_graphview->setPointClicked(event->pos()); m_graphview->setPointClicked(event->pos());
x-=left+m_marginleft; x-=left;
x2-=left+m_marginleft; x2-=left;
//int a1=MIN(x,x2);
//int a2=MAX(x,x2);
//if (a1<m_marginleft+left) a1=m_marginleft+left;
//if (a2>w) a2=w;
if (!m_blockzoom) { if (!m_blockzoom) {
xx=max_x-min_x; xx=max_x-min_x;
w-=m_marginleft+left;
xmult=xx/double(w); xmult=xx/double(w);
qint64 j1=xmult*x; qint64 j1=xmult*x;
qint64 j2=xmult*x2; qint64 j2=xmult*x2;
@ -1521,15 +1578,12 @@ void gGraph::mouseMoveEvent(QMouseEvent * event)
max_x=rmax_x; max_x=rmax_x;
min_x=rmax_x-xx; min_x=rmax_x-xx;
} }
//if (a2>rmax_x) a2=rmax_x;
m_graphview->SetXBounds(min_x,max_x,m_group,false); m_graphview->SetXBounds(min_x,max_x,m_group,false);
doredraw=true; doredraw=true;
//nolayer=true;
} else { } else {
qint64 qq=rmax_x-rmin_x; qint64 qq=rmax_x-rmin_x;
xx=max_x-min_x; xx=max_x-min_x;
if (xx==qq) xx=1800000; if (xx==qq) xx=1800000;
w-=m_marginleft+left;
xmult=qq/double(w); xmult=qq/double(w);
qint64 j1=(xmult*x); qint64 j1=(xmult*x);
min_x=rmin_x+j1-(xx/2); min_x=rmin_x+j1-(xx/2);
@ -1544,16 +1598,11 @@ void gGraph::mouseMoveEvent(QMouseEvent * event)
} }
m_graphview->SetXBounds(min_x,max_x,m_group,false); m_graphview->SetXBounds(min_x,max_x,m_group,false);
doredraw=true; doredraw=true;
//nolayer=true;
} }
} }
} }
//if (!nolayer) { // no mouse button //if (!nolayer) { // no mouse button
for (int i=0;i<m_layers.size();i++) {
if (m_layers[i]->mouseMoveEvent(event)) doredraw=true;
}
if (doredraw) if (doredraw)
m_graphview->redraw(); m_graphview->redraw();
//} //}
@ -1565,10 +1614,15 @@ void gGraph::mouseMoveEvent(QMouseEvent * event)
} }
void gGraph::mousePressEvent(QMouseEvent * event) void gGraph::mousePressEvent(QMouseEvent * event)
{ {
for (int i=0;i<m_layers.size();i++) int y=event->pos().y();
if (m_layers[i]->mousePressEvent(event)) return ;
/*int y=event->pos().y();
int x=event->pos().x(); int x=event->pos().x();
for (int i=0;i<m_layers.size();i++) {
if (m_layers[i]->m_rect.contains(x,y))
if (m_layers[i]->mousePressEvent(event,this))
return;
}
/*
int w=m_lastbounds.width()-(right+m_marginright); int w=m_lastbounds.width()-(right+m_marginright);
//int h=m_lastbounds.height()-(bottom+m_marginbottom); //int h=m_lastbounds.height()-(bottom+m_marginbottom);
//int x2,y2; //int x2,y2;
@ -1584,15 +1638,23 @@ void gGraph::mousePressEvent(QMouseEvent * event)
void gGraph::mouseReleaseEvent(QMouseEvent * event) void gGraph::mouseReleaseEvent(QMouseEvent * event)
{ {
for (int i=0;i<m_layers.size();i++)
if (m_layers[i]->mouseReleaseEvent(event))
return;
int y=event->pos().y(); int y=event->pos().y();
int x=event->pos().x(); int x=event->pos().x();
int w=m_lastbounds.width()-left-right; //(m_marginleft+left+right+m_marginright);
int h=m_lastbounds.height()-(bottom); //+m_marginbottom); for (int i=0;i<m_layers.size();i++) {
int x2=m_graphview->pointClicked().x(),y2=m_graphview->pointClicked().y(); if (m_layers[i]->m_rect.contains(x,y))
if (m_layers[i]->mouseReleaseEvent(event,this))
return;
}
x-=m_rect.left();
y-=m_rect.top();
int w=m_rect.width()-left-right; //(m_marginleft+left+right+m_marginright);
int h=m_rect.height()-bottom; //+m_marginbottom);
int x2=m_graphview->pointClicked().x()-m_rect.left();
int y2=m_graphview->pointClicked().y()-m_rect.top();
//qDebug() << m_title << "Released" << min_x << max_x << x << y << x2 << y2 << left << right << top << bottom << m_width << m_height; //qDebug() << m_title << "Released" << min_x << max_x << x << y << x2 << y2 << left << right << top << bottom << m_width << m_height;
@ -1721,6 +1783,14 @@ void gGraph::wheelEvent(QWheelEvent * event)
} else { } else {
ZoomX(1.5,x); ZoomX(1.5,x);
} }
int y=event->pos().y();
x=event->pos().x();
for (int i=0;i<m_layers.size();i++) {
if (m_layers[i]->m_rect.contains(x,y))
m_layers[i]->wheelEvent(event,this);
}
} }
void gGraph::mouseDoubleClickEvent(QMouseEvent * event) void gGraph::mouseDoubleClickEvent(QMouseEvent * event)
{ {
@ -1728,18 +1798,25 @@ void gGraph::mouseDoubleClickEvent(QMouseEvent * event)
//mouseReleaseEvent(event); //mouseReleaseEvent(event);
int y=event->pos().y(); int y=event->pos().y();
int x=event->pos().x(); int x=event->pos().x();
int w=m_lastbounds.width()-(m_marginleft+left+right+m_marginright); for (int i=0;i<m_layers.size();i++) {
int h=m_lastbounds.height()-(bottom+m_marginbottom); if (m_layers[i]->m_rect.contains(x,y))
//int x2=m_graphview->pointClicked().x(),y2=m_graphview->pointClicked().y(); m_layers[i]->mouseDoubleClickEvent(event,this);
if ((m_graphview->horizTravel()<mouse_movement_threshold) && (x>left+m_marginleft && x<w+m_marginleft+left && y>top+m_margintop && y<h)) { // normal click in main area
if (event->button() & Qt::RightButton) {
ZoomX(1.66,x); // Zoon out
return;
} else if (event->button() & Qt::LeftButton) {
ZoomX(0.75/2.0,x); // zoom in.
return;
}
} }
//int w=m_lastbounds.width()-(m_marginleft+left+right+m_marginright);
//int h=m_lastbounds.height()-(bottom+m_marginbottom);
//int x2=m_graphview->pointClicked().x(),y2=m_graphview->pointClicked().y();
// if ((m_graphview->horizTravel()<mouse_movement_threshold) && (x>left+m_marginleft && x<w+m_marginleft+left && y>top+m_margintop && y<h)) { // normal click in main area
// if (event->button() & Qt::RightButton) {
// ZoomX(1.66,x); // Zoon out
// return;
// } else if (event->button() & Qt::LeftButton) {
// ZoomX(0.75/2.0,x); // zoom in.
// return;
// }
// } else {
// Propagate the events to graph Layers
// }
//mousePressEvent(event); //mousePressEvent(event);
//mouseReleaseEvent(event); //mouseReleaseEvent(event);
//qDebug() << m_title << "Double Clicked" << event->x() << event->y(); //qDebug() << m_title << "Double Clicked" << event->x() << event->y();
@ -1747,7 +1824,7 @@ void gGraph::mouseDoubleClickEvent(QMouseEvent * event)
void gGraph::keyPressEvent(QKeyEvent * event) void gGraph::keyPressEvent(QKeyEvent * event)
{ {
for (QVector<Layer *>::iterator i=m_layers.begin();i!=m_layers.end();i++) { for (QVector<Layer *>::iterator i=m_layers.begin();i!=m_layers.end();i++) {
(*i)->keyPressEvent(event); (*i)->keyPressEvent(event,this);
} }
//qDebug() << m_title << "Key Pressed.. implement me" << event->key(); //qDebug() << m_title << "Key Pressed.. implement me" << event->key();
} }
@ -1755,7 +1832,7 @@ void gGraph::keyPressEvent(QKeyEvent * event)
void gGraph::ZoomX(double mult,int origin_px) void gGraph::ZoomX(double mult,int origin_px)
{ {
int width=m_lastbounds.width()-left-right; //(m_marginleft+left+right+m_marginright); int width=m_rect.width()-left-right; //(m_marginleft+left+right+m_marginright);
if (origin_px==0) origin_px=(width/2); else origin_px-=left; if (origin_px==0) origin_px=(width/2); else origin_px-=left;
if (origin_px<0) origin_px=0; if (origin_px<0) origin_px=0;
@ -2133,6 +2210,8 @@ void gGraph::ResetBounds()
} }
void gGraph::ToolTip(QString text, int x, int y, int timeout) void gGraph::ToolTip(QString text, int x, int y, int timeout)
{ {
if (timeout<=0)
timeout=p_profile->general->tooltipTimeout();
m_graphview->m_tooltip->display(text,x,y,timeout); m_graphview->m_tooltip->display(text,x,y,timeout);
} }
@ -3018,7 +3097,7 @@ bool gGraphView::renderGraphs()
for (int i=0;i<s;i++) { for (int i=0;i<s;i++) {
gGraph *g=m_drawlist.at(0); gGraph *g=m_drawlist.at(0);
m_drawlist.pop_front(); m_drawlist.pop_front();
g->paint(g->m_lastbounds.x(), g->m_lastbounds.y(), g->m_lastbounds.width(), g->m_lastbounds.height()); g->paint(g->m_rect.x(), g->m_rect.y(), g->m_rect.width(), g->m_rect.height());
} }
#ifdef ENABLED_THREADED_DRAWING #ifdef ENABLED_THREADED_DRAWING
} }
@ -3038,7 +3117,6 @@ bool gGraphView::renderGraphs()
// lines->setSize(linesize); // lines->setSize(linesize);
// DrawTextQue(); // DrawTextQue();
m_tooltip->paint();
//glDisable(GL_TEXTURE_2D); //glDisable(GL_TEXTURE_2D);
//glDisable(GL_DEPTH_TEST); //glDisable(GL_DEPTH_TEST);
@ -3238,6 +3316,7 @@ void gGraphView::paintGL()
} }
DrawTextQue(); DrawTextQue();
} }
m_tooltip->paint();
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
const int rs=10; const int rs=10;
@ -3381,9 +3460,11 @@ void gGraphView::mouseMoveEvent(QMouseEvent * event)
float py = -m_offsetY; float py = -m_offsetY;
float h; float h;
// Propagate mouseMove events to relevant graphs
for (int i=0; i < m_graphs.size(); i++) { for (int i=0; i < m_graphs.size(); i++) {
if (m_graphs[i]->isEmpty() || (!m_graphs[i]->visible())) continue; if (m_graphs[i]->isEmpty() || (!m_graphs[i]->visible()))
continue;
h=m_graphs[i]->height() * m_scaleY; h=m_graphs[i]->height() * m_scaleY;
if (py > height()) if (py > height())
@ -3393,13 +3474,30 @@ void gGraphView::mouseMoveEvent(QMouseEvent * event)
if (m_graphs[i]->isSelected()) { if (m_graphs[i]->isSelected()) {
m_graphs[i]->deselect(); m_graphs[i]->deselect();
timedRedraw(150); timedRedraw(150);
//redraw();
} }
} }
if (m_button_down || ((py + h + graphSpacer) >= 0)) {
if ((y >= py + h) && (y <= py + h + graphSpacer + 1)) { // Update Mouse Cursor shape
this->setCursor(Qt::SplitVCursor); if ((y >= py + h -1) && (y < (py + h + graphSpacer))) {
} else if (!m_button_down && (y >= py) && (y < py+m_graphs[i]->top)) { this->setCursor(Qt::SplitVCursor);
} else if ((y >= py+1) && (y < py + h)) {
if (x >= titleWidth+10)
this->setCursor(Qt::ArrowCursor);
else
this->setCursor(Qt::OpenHandCursor);
m_horiz_travel+=qAbs(x-m_lastxpos)+qAbs(y-m_lastypos);
m_lastxpos=x;
m_lastypos=y;
// QPoint p(x,y);
// QMouseEvent e(event->type(),p,event->button(),event->buttons(),event->modifiers());
m_graphs[i]->mouseMoveEvent(event);
}
/* else if (!m_button_down && (y >= py) && (y < py+m_graphs[i]->top)) {
// Mouse cursor is in top graph margin. // Mouse cursor is in top graph margin.
} else if (!m_button_down && (y >= py+h-m_graphs[i]->bottom) && (y <= py+h)) { } else if (!m_button_down && (y >= py+h-m_graphs[i]->bottom) && (y <= py+h)) {
// Mouse cursor is in bottom grpah margin. // Mouse cursor is in bottom grpah margin.
@ -3451,9 +3549,9 @@ void gGraphView::mouseMoveEvent(QMouseEvent * event)
this->setCursor(Qt::OpenHandCursor); this->setCursor(Qt::OpenHandCursor);
} }
} } */
} // }
py+=h; py+=h;
py+=graphSpacer; py+=graphSpacer;
} }
@ -3477,33 +3575,34 @@ void gGraphView::mousePressEvent(QMouseEvent * event)
break; break;
if ((py + h + graphSpacer) >= 0) { if ((py + h + graphSpacer) >= 0) {
if ((y >= py) && (y < py + h)) { if ((y >= py + h-1) && (y <= py + h + graphSpacer)) {
//qDebug() << "Clicked" << i;
if (x < titleWidth+20) { // clicked on title to drag graph..
m_graph_dragging=true;
m_graph_index=i;
m_sizer_point.setX(x);
m_sizer_point.setY(py); // point at top of graph..
this->setCursor(Qt::ClosedHandCursor);
} else { // send event to graph..
m_global_point_clicked=QPoint(x,y);
m_point_clicked=QPoint (x-titleWidth,y-py);
m_selected_graph=m_graphs[i];
QMouseEvent e(event->type(),m_point_clicked,event->button(),event->buttons(),event->modifiers());
m_graph_index=i;
m_button_down=true;
m_horiz_travel=0;
m_graphs[i]->mousePressEvent(&e);
}
} else if ((y >= py + h) && (y <= py + h + graphSpacer + 1)) {
this->setCursor(Qt::SplitVCursor); this->setCursor(Qt::SplitVCursor);
m_sizer_dragging=true; m_sizer_dragging=true;
m_sizer_index=i; m_sizer_index=i;
m_sizer_point.setX(x); m_sizer_point.setX(x);
m_sizer_point.setY(y); m_sizer_point.setY(y);
//qDebug() << "Sizer clicked" << i; //qDebug() << "Sizer clicked" << i;
} else if ((y >= py) && (y < py + h)) {
//qDebug() << "Clicked" << i;
if (x < titleWidth+20) { // clicked on title to drag graph..
m_graph_dragging=true;
m_tooltip->cancel();
redraw();
m_graph_index=i;
m_sizer_point.setX(x);
m_sizer_point.setY(py); // point at top of graph..
this->setCursor(Qt::ClosedHandCursor);
}
{ // send event to graph..
m_point_clicked=QPoint(event->x(),event->y());
//QMouseEvent e(event->type(),m_point_clicked,event->button(),event->buttons(),event->modifiers());
m_button_down=true;
m_horiz_travel=0;
m_graph_index=i;
m_selected_graph=m_graphs[i];
m_graphs[i]->mousePressEvent(event);
}
} }
} }
@ -3515,7 +3614,36 @@ void gGraphView::mousePressEvent(QMouseEvent * event)
void gGraphView::mouseReleaseEvent(QMouseEvent * event) void gGraphView::mouseReleaseEvent(QMouseEvent * event)
{ {
this->setCursor(Qt::ArrowCursor);
int x=event->x();
int y=event->y();
float py = -m_offsetY;
float h;
for (int i=0; i < m_graphs.size(); i++) {
if (m_graphs[i]->isEmpty() || (!m_graphs[i]->visible()))
continue;
h=m_graphs[i]->height() * m_scaleY;
if (py > height())
break; // we are done.. can't draw anymore
if ((y >= py + h -1) && (y < (py + h + graphSpacer))) {
this->setCursor(Qt::SplitVCursor);
} else if ((y >= py+1) && (y <= py + h)) {
// if (!m_sizer_dragging && !m_graph_dragging) {
// m_graphs[i]->mouseReleaseEvent(event);
// }
if (x >= titleWidth+10)
this->setCursor(Qt::ArrowCursor);
else
this->setCursor(Qt::OpenHandCursor);
}
}
if (m_sizer_dragging) { if (m_sizer_dragging) {
m_sizer_dragging=false; m_sizer_dragging=false;
@ -3523,27 +3651,26 @@ void gGraphView::mouseReleaseEvent(QMouseEvent * event)
} }
if (m_graph_dragging) { if (m_graph_dragging) {
m_graph_dragging=false; m_graph_dragging=false;
// not sure why the cursor code doesn't catch this..
if (x >= titleWidth+10)
this->setCursor(Qt::ArrowCursor);
else
this->setCursor(Qt::OpenHandCursor);
return; return;
} }
// The graph that got the button press gets the release event
if (m_button_down) { if (m_button_down) {
m_button_down=false; m_button_down=false;
int x1=m_global_point_clicked.x()-event->x(); m_graphs[m_graph_index]->mouseReleaseEvent(event);
int y1=m_global_point_clicked.y()-event->y();
QPoint p(m_point_clicked.x()-x1,m_point_clicked.y()-y1);
QMouseEvent e(event->type(),p,event->button(),event->buttons(),event->modifiers());
m_graphs[m_graph_index]->mouseReleaseEvent(&e);
} }
//int x=event->x();
//int y=event->y();
} }
void gGraphView::mouseDoubleClickEvent(QMouseEvent * event) void gGraphView::mouseDoubleClickEvent(QMouseEvent * event)
{ {
mousePressEvent(event); mousePressEvent(event);
return;
/* int x=event->x(); int x=event->x();
int y=event->y(); int y=event->y();
float py=-m_offsetY; float py=-m_offsetY;
@ -3561,6 +3688,7 @@ void gGraphView::mouseDoubleClickEvent(QMouseEvent * event)
if ((y >= py) && (y <= py + h)) { if ((y >= py) && (y <= py + h)) {
if (x < titleWidth) { if (x < titleWidth) {
// What to do when double clicked on the graph title ?? // What to do when double clicked on the graph title ??
m_graphs[i]->mouseDoubleClickEvent(event);
} else { } else {
// send event to graph.. // send event to graph..
m_graphs[i]->mouseDoubleClickEvent(event); m_graphs[i]->mouseDoubleClickEvent(event);
@ -3572,7 +3700,7 @@ void gGraphView::mouseDoubleClickEvent(QMouseEvent * event)
} }
py+=h; py+=h;
py+=graphSpacer; // do we want the extra spacer down the bottom? py+=graphSpacer; // do we want the extra spacer down the bottom?
} */ }
} }
void gGraphView::wheelEvent(QWheelEvent * event) void gGraphView::wheelEvent(QWheelEvent * event)
{ {

49
sleepyhead/Graphs/gGraphView.h
View File

@ -17,6 +17,7 @@
#include <QWaitCondition> #include <QWaitCondition>
#include <QPixmap> #include <QPixmap>
#include <Graphs/glcommon.h> #include <Graphs/glcommon.h>
#include <QRect>
#define MIN(a,b) (((a)<(b)) ? (a) : (b)); #define MIN(a,b) (((a)<(b)) ? (a) : (b));
@ -271,6 +272,7 @@ enum LayerPosition { LayerLeft, LayerRight, LayerTop, LayerBottom, LayerCenter,
class Layer class Layer
{ {
friend class gGraph; friend class gGraph;
friend class LayerGroup;
public: public:
Layer(ChannelID code); Layer(ChannelID code);
virtual ~Layer(); virtual ~Layer();
@ -304,9 +306,6 @@ public:
//! \brief Return this layers physical maximum Yaxis value //! \brief Return this layers physical maximum Yaxis value
virtual EventDataType Maxy() { return m_maxy; } virtual EventDataType Maxy() { return m_maxy; }
//! \brief Set this layers physical minimum date boundary //! \brief Set this layers physical minimum date boundary
virtual void setMinX(qint64 val) { m_minx=val; } virtual void setMinX(qint64 val) { m_minx=val; }
@ -363,6 +362,7 @@ public:
void addref() { m_refcount++; } void addref() { m_refcount++; }
bool unref() { m_refcount--; if (m_refcount<=0) return true; return false; } bool unref() { m_refcount--; if (m_refcount<=0) return true; return false; }
protected: protected:
//! \brief Add a GLBuffer (vertex) object customized to this layer //! \brief Add a GLBuffer (vertex) object customized to this layer
void addGLBuf(GLBuffer *buf) { mgl_buffers.push_back(buf); } void addGLBuf(GLBuffer *buf) { mgl_buffers.push_back(buf); }
@ -380,23 +380,24 @@ protected:
short m_Y; short m_Y;
short m_order; // order for positioning.. short m_order; // order for positioning..
LayerPosition m_position; LayerPosition m_position;
QRect m_rect;
//! \brief A vector containing all this layers custom drawing buffers //! \brief A vector containing all this layers custom drawing buffers
QVector<GLBuffer *> mgl_buffers; QVector<GLBuffer *> mgl_buffers;
QVector<gVertexBuffer *> mv_buffers; QVector<gVertexBuffer *> mv_buffers;
//! \brief Mouse wheel moved somewhere over this layer //! \brief Mouse wheel moved somewhere over this layer
virtual bool wheelEvent(QWheelEvent * event) { Q_UNUSED(event); return false; } virtual bool wheelEvent(QWheelEvent * event, gGraph * graph) { Q_UNUSED(event); Q_UNUSED(graph); return false; }
//! \brief Mouse moved somewhere over this layer //! \brief Mouse moved somewhere over this layer
virtual bool mouseMoveEvent(QMouseEvent * event) { Q_UNUSED(event); return false; } virtual bool mouseMoveEvent(QMouseEvent * event, gGraph * graph) { Q_UNUSED(event); Q_UNUSED(graph); return false; }
//! \brief Mouse left or right button pressed somewhere on this layer //! \brief Mouse left or right button pressed somewhere on this layer
virtual bool mousePressEvent(QMouseEvent * event) { Q_UNUSED(event); return false; } virtual bool mousePressEvent(QMouseEvent * event, gGraph * graph) { Q_UNUSED(event); Q_UNUSED(graph); return false; }
//! \brief Mouse button released that was originally pressed somewhere on this layer //! \brief Mouse button released that was originally pressed somewhere on this layer
virtual bool mouseReleaseEvent(QMouseEvent * event) { Q_UNUSED(event); return false; } virtual bool mouseReleaseEvent(QMouseEvent * event, gGraph * graph) { Q_UNUSED(event); Q_UNUSED(graph); return false; }
//! \brief Mouse button double clicked somewhere on this layer //! \brief Mouse button double clicked somewhere on this layer
virtual bool mouseDoubleClickEvent(QMouseEvent * event) { Q_UNUSED(event); return false; } virtual bool mouseDoubleClickEvent(QMouseEvent * event, gGraph * graph) { Q_UNUSED(event); Q_UNUSED(graph); return false; }
//! \brief A key was pressed on the keyboard while the graph area was focused. //! \brief A key was pressed on the keyboard while the graph area was focused.
virtual bool keyPressEvent(QKeyEvent * event) { Q_UNUSED(event); return false; } virtual bool keyPressEvent(QKeyEvent * event, gGraph * graph) { Q_UNUSED(event); Q_UNUSED(graph); return false; }
}; };
/*! \class LayerGroup /*! \class LayerGroup
@ -438,6 +439,24 @@ public:
protected: protected:
//! \brief Contains all Layer objects in this group //! \brief Contains all Layer objects in this group
QVector<Layer *> layers; QVector<Layer *> layers;
//! \brief Mouse wheel moved somewhere over this LayerGroup
virtual bool wheelEvent(QWheelEvent * event, gGraph * graph);
//! \brief Mouse moved somewhere over this LayerGroup
virtual bool mouseMoveEvent(QMouseEvent * event, gGraph * graph);
//! \brief Mouse left or right button pressed somewhere on this LayerGroup
virtual bool mousePressEvent(QMouseEvent * event, gGraph * graph);
//! \brief Mouse button released that was originally pressed somewhere on this LayerGroup
virtual bool mouseReleaseEvent(QMouseEvent * event, gGraph * graph);
//! \brief Mouse button double clicked somewhere on this layerGroup
virtual bool mouseDoubleClickEvent(QMouseEvent * event, gGraph * graph);
//! \brief A key was pressed on the keyboard while the graph area was focused.
virtual bool keyPressEvent(QKeyEvent * event, gGraph * graph);
}; };
class gGraph; class gGraph;
@ -499,6 +518,7 @@ protected:
QImage m_image; QImage m_image;
GLuint m_textureID; GLuint m_textureID;
bool m_invalidate; bool m_invalidate;
protected slots: protected slots:
//! \brief Timeout to hide tooltip, and redraw without it. //! \brief Timeout to hide tooltip, and redraw without it.
@ -691,7 +711,7 @@ public:
virtual void paint(int originX, int originY, int width, int height); virtual void paint(int originX, int originY, int width, int height);
//! \brief Gives the supplied data to the main ToolTip object for display //! \brief Gives the supplied data to the main ToolTip object for display
void ToolTip(QString text, int x, int y, int timeout=2000); void ToolTip(QString text, int x, int y, int timeout=0);
//! \brief Public version of updateGL(), to redraw all graphs.. Not for normal use //! \brief Public version of updateGL(), to redraw all graphs.. Not for normal use
void redraw(); void redraw();
@ -723,6 +743,8 @@ public:
//! \brief Returns the main gGraphView objects gVertexBuffer quads list. //! \brief Returns the main gGraphView objects gVertexBuffer quads list.
gVertexBuffer * quads(); gVertexBuffer * quads();
const inline QRect & rect() { return m_rect; }
// //! \brief Returns the main gGraphView objects gVertexBuffer stippled line list. // //! \brief Returns the main gGraphView objects gVertexBuffer stippled line list.
//GLShortBuffer * stippled(); //GLShortBuffer * stippled();
@ -731,7 +753,6 @@ public:
short left,right,top,bottom; // dirty magin hacks.. short left,right,top,bottom; // dirty magin hacks..
Layer * getLineChart(); Layer * getLineChart();
QRect m_lastbounds;
QTimer * timer; QTimer * timer;
// This gets set to true to force a redraw of the yAxis tickers when graphs are resized. // This gets set to true to force a redraw of the yAxis tickers when graphs are resized.
@ -790,6 +811,8 @@ protected:
bool m_enforceMinY,m_enforceMaxY; bool m_enforceMinY,m_enforceMaxY;
bool m_showTitle; bool m_showTitle;
bool m_printing; bool m_printing;
QRect m_rect;
signals: signals:
protected slots: protected slots:
@ -887,9 +910,7 @@ public:
void deselect(); void deselect();
QPoint pointClicked() { return m_point_clicked; } QPoint pointClicked() { return m_point_clicked; }
QPoint globalPointClicked() { return m_global_point_clicked; }
void setPointClicked(QPoint p) { m_point_clicked=p; } void setPointClicked(QPoint p) { m_point_clicked=p; }
void setGlobalPointClicked(QPoint p) { m_global_point_clicked=p; }
//! \brief Set a redraw timer for ms milliseconds, clearing any previous redraw timer. //! \brief Set a redraw timer for ms milliseconds, clearing any previous redraw timer.
void timedRedraw(int ms); void timedRedraw(int ms);
@ -1072,7 +1093,7 @@ protected:
bool m_button_down; bool m_button_down;
QPoint m_point_clicked; QPoint m_point_clicked;
QPoint m_global_point_clicked;
QPoint m_sizer_point; QPoint m_sizer_point;
int m_horiz_travel; int m_horiz_travel;

58
sleepyhead/Graphs/gLineChart.cpp
View File

@ -49,34 +49,48 @@ void gLineChart::SetDay(Day *d)
m_minx=0,m_maxx=0; m_minx=0,m_maxx=0;
m_miny=0,m_maxy=0; m_miny=0,m_maxy=0;
if (!d) return; if (!d)
return;
qint64 t64; qint64 t64;
EventDataType tmp;
EventDataType min=99999999,max=-999999999,tmp; bool first=true;
for (int j=0;j<m_codes.size();j++) { for (int j=0;j<m_codes.size();j++) {
ChannelID code=m_codes[j]; ChannelID code=m_codes[j];
for (int i=0;i<d->size();i++) { for (int i=0;i<d->size();i++) {
Session *sess=d->getSessions()[i]; Session *sess=d->getSessions()[i];
if (!sess->channelExists(code)) continue; if (!sess->channelExists(code)) continue;
if (code==CPAP_FLG) {
int i=5;
}
if (first) {
m_miny=sess->physMin(code);
m_maxy=sess->physMax(code);
m_minx=sess->first(code);
m_maxx=sess->last(code);
first=false;
} else {
tmp=sess->physMin(code);
if (m_miny > tmp)
m_miny=tmp;
tmp=sess->Min(code); tmp=sess->physMax(code);
if (min > tmp) min=tmp; if (m_maxy < tmp)
m_maxy=tmp;
tmp=sess->Max(code); t64=sess->first(code);
if (max < tmp) max=tmp; if (m_minx > t64)
m_minx=t64;
t64=sess->first(code); t64=sess->last(code);
if (!m_minx || (m_minx > t64)) m_minx=t64; if (m_maxx < t64)
m_maxx=t64;
t64=sess->last(code); }
if (!m_maxx || (m_maxx < t64)) m_maxx=t64;
} }
} }
m_miny=min;
m_maxy=max;
//if (m_code==CPAP_Leak) { //if (m_code==CPAP_Leak) {
// subtract_offset=profile.cpap.[IntentionalLeak].toDouble(); // subtract_offset=profile.cpap.[IntentionalLeak].toDouble();
@ -102,6 +116,10 @@ EventDataType gLineChart::Maxy()
// Time Domain Line Chart // Time Domain Line Chart
void gLineChart::paint(gGraph & w,int left, int top, int width, int height) void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
{ {
if (w.title()=="Flow Limit") {
int i=5;
}
if (!m_visible) if (!m_visible)
return; return;
@ -113,8 +131,6 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
if (width<0) if (width<0)
return; return;
// lines=w.lines(); // lines=w.lines();
EventDataType miny,maxy; EventDataType miny,maxy;
double minx,maxx; double minx,maxx;
@ -367,7 +383,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
for (int i=idx;i<siz;i+=sam,ptr+=sam) { for (int i=idx;i<siz;i+=sam,ptr+=sam) {
time+=rate; time+=rate;
// This is much faster than QVector access. // This is much faster than QVector access.
data=*ptr; data=*ptr + el.offset();
data *= gain; data *= gain;
// Scale the time scale X to pixel scale X // Scale the time scale X to pixel scale X
@ -446,7 +462,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
// } // }
// Prime first point // Prime first point
data=*ptr * gain; data=(*ptr+el.offset()) * gain;
lastpx=xst+((time - minx) * xmult); lastpx=xst+((time - minx) * xmult);
lastpy=yst-((data - miny) * ymult); lastpy=yst-((data - miny) * ymult);
@ -454,7 +470,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
ptr+=sam; ptr+=sam;
time+=rate; time+=rate;
data=*ptr * gain; data=(*ptr + el.offset()) * gain;
px=xst+((time - minx) * xmult); // Scale the time scale X to pixel scale X px=xst+((time - minx) * xmult); // Scale the time scale X to pixel scale X
py=yst-((data - miny) * ymult); // Same for Y scale, with precomputed gain py=yst-((data - miny) * ymult); // Same for Y scale, with precomputed gain
@ -504,7 +520,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
tptr=el.rawTime() + idx; tptr=el.rawTime() + idx;
time=start + *tptr++; time=start + *tptr++;
data=*dptr++ * gain; data=(*dptr++ + el.offset()) * gain;
idx++; idx++;
@ -529,7 +545,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
if (square_plot) { if (square_plot) {
for (; dptr < eptr; dptr++) { for (; dptr < eptr; dptr++) {
time=start + *tptr++; time=start + *tptr++;
data=gain * *dptr; data=gain * (*dptr + el.offset());
px=xst+((time - minx) * xmult); // Scale the time scale X to pixel scale X px=xst+((time - minx) * xmult); // Scale the time scale X to pixel scale X
py=yst-((data - miny) * ymult); // Same for Y scale without precomputed gain py=yst-((data - miny) * ymult); // Same for Y scale without precomputed gain
@ -562,7 +578,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
for (; dptr < eptr; dptr++) { for (; dptr < eptr; dptr++) {
//for (int i=0;i<siz;i++) { //for (int i=0;i<siz;i++) {
time=start + *tptr++; time=start + *tptr++;
data=gain * *dptr; data=gain * (*dptr + el.offset());
px=xst+((time - minx) * xmult); // Scale the time scale X to pixel scale X px=xst+((time - minx) * xmult); // Scale the time scale X to pixel scale X
py=yst-((data - miny) * ymult); // Same for Y scale without precomputed gain py=yst-((data - miny) * ymult); // Same for Y scale without precomputed gain

32
sleepyhead/Graphs/gYAxis.cpp
View File

@ -9,12 +9,6 @@
#include "gYAxis.h" #include "gYAxis.h"
//#include "SleepLib/profiles.h" //#include "SleepLib/profiles.h"
gYSpacer::gYSpacer(int spacer)
:Layer(NoChannel)
{
Q_UNUSED(spacer)
}
gXGrid::gXGrid(QColor col) gXGrid::gXGrid(QColor col)
:Layer(NoChannel) :Layer(NoChannel)
{ {
@ -138,6 +132,7 @@ gYAxis::~gYAxis()
} }
void gYAxis::paint(gGraph & w,int left,int top, int width, int height) void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
{ {
int x,y;//,yh=0; int x,y;//,yh=0;
//Todo: clean this up as there is a lot of duplicate code between the sections //Todo: clean this up as there is a lot of duplicate code between the sections
@ -366,15 +361,28 @@ const QString gYAxis::Format(EventDataType v, int dp) {
return QString::number(v,'f',dp); return QString::number(v,'f',dp);
} }
bool gYAxis::mouseMoveEvent(QMouseEvent * event) bool gYAxis::mouseMoveEvent(QMouseEvent * event, gGraph * graph)
{ {
Q_UNUSED(event) int x=event->x();
//int x=event->x(); int y=event->y();
//int y=event->y(); if (!graph->units().isEmpty()) {
//qDebug() << "Hover at " << x << y; graph->ToolTip(graph->units(),x,y-20,0);
return false; graph->redraw();
}
return true;
} }
bool gYAxis::mouseDoubleClickEvent(QMouseEvent * event, gGraph * graph)
{
if (graph) {
int x=event->x();
int y=event->y();
qDebug() << "Mouse double clicked for" << graph->title() << x << y << m_rect;
}
Q_UNUSED(event);
return false;
}
const QString gYAxisTime::Format(EventDataType v, int dp) const QString gYAxisTime::Format(EventDataType v, int dp)
{ {

20
sleepyhead/Graphs/gYAxis.h
View File

@ -10,23 +10,6 @@
#include "gGraphView.h" #include "gGraphView.h"
/*! \class gYSpacer
\brief A dummy vertical spacer object
*/
class gYSpacer:public Layer
{
public:
gYSpacer(int spacer=20);
virtual void paint(gGraph & w,int left,int top, int width, int height) {
Q_UNUSED(w)
Q_UNUSED(left)
Q_UNUSED(top)
Q_UNUSED(width)
Q_UNUSED(height)
}
};
/*! \class gXGrid /*! \class gXGrid
\brief Draws the horizintal major/minor grids over graphs \brief Draws the horizintal major/minor grids over graphs
*/ */
@ -110,7 +93,8 @@ class gYAxis:public Layer
QColor m_line_color; QColor m_line_color;
QColor m_text_color; QColor m_text_color;
gVertexBuffer * lines; gVertexBuffer * lines;
virtual bool mouseMoveEvent(QMouseEvent * event); virtual bool mouseMoveEvent(QMouseEvent * event,gGraph * graph);
virtual bool mouseDoubleClickEvent(QMouseEvent * event, gGraph * graph);
QImage m_image; QImage m_image;
GLuint m_textureID; GLuint m_textureID;

13
sleepyhead/Graphs/gspacer.cpp Normal file
View File

@ -0,0 +1,13 @@
/*
graph spacer Implementation
Copyright (c)2013 Mark Watkins <jedimark@users.sourceforge.net>
License: GPL
*/
#include "gspacer.h"
gSpacer::gSpacer(int space)
:Layer(NoChannel)
{
m_space=space;
}

33
sleepyhead/Graphs/gspacer.h Normal file
View File

@ -0,0 +1,33 @@
/*
graph spacer Header
Copyright (c)2011 Mark Watkins <jedimark@users.sourceforge.net>
License: GPL
*/
#ifndef GSPACER_H
#define GSPACER_H
#include "gGraphView.h"
/*! \class gSpacer
\brief A dummy graph spacer layer object
*/
class gSpacer:public Layer
{
public:
gSpacer(int space=20); // orientation?
virtual void paint(gGraph & g,int left,int top, int width, int height) {
Q_UNUSED(g)
Q_UNUSED(left)
Q_UNUSED(top)
Q_UNUSED(width)
Q_UNUSED(height)
}
int space() { return m_space; }
protected:
int m_space;
};
#endif // GSPACER_H

48
sleepyhead/SleepLib/day.cpp
View File

@ -451,6 +451,7 @@ qint64 Day::last(ChannelID code)
} }
return date; return date;
} }
EventDataType Day::Min(ChannelID code) EventDataType Day::Min(ChannelID code)
{ {
EventDataType min=0; EventDataType min=0;
@ -472,6 +473,29 @@ EventDataType Day::Min(ChannelID code)
return min; return min;
} }
EventDataType Day::physMin(ChannelID code)
{
EventDataType min=0;
EventDataType tmp;
bool first=true;
for (QList<Session *>::iterator s=sessions.begin();s!=sessions.end();s++) {
if (!(*s)->enabled()) continue;
// MW: I meant to check this instead.
if (!(*s)->m_min.contains(code))
continue;
tmp=(*s)->physMin(code);
if (first) {
min=tmp;
first=false;
} else {
if (tmp<min) min=tmp;
}
}
return min;
}
bool Day::hasData(ChannelID code, SummaryType type) bool Day::hasData(ChannelID code, SummaryType type)
{ {
bool has=false; bool has=false;
@ -544,6 +568,30 @@ EventDataType Day::Max(ChannelID code)
} }
return max; return max;
} }
EventDataType Day::physMax(ChannelID code)
{
EventDataType max=0;
EventDataType tmp;
bool first=true;
for (QList<Session *>::iterator s=sessions.begin();s!=sessions.end();s++) {
if (!(*s)->enabled())
continue;
// MW: I meant to check this instead.
if (!(*s)->m_max.contains(code))
continue;
tmp=(*s)->physMax(code);
if (first) {
max=tmp;
first=false;
} else {
if (tmp>max) max=tmp;
}
}
return max;
}
EventDataType Day::cph(ChannelID code) EventDataType Day::cph(ChannelID code)
{ {
double sum=0; double sum=0;

6
sleepyhead/SleepLib/day.h
View File

@ -47,6 +47,12 @@ public:
//! \brief Returns the Maximum of all sessions' events for this day //! \brief Returns the Maximum of all sessions' events for this day
EventDataType Max(ChannelID code); EventDataType Max(ChannelID code);
//! \brief Returns the Minimum of all this sessions' events for this day
EventDataType physMin(ChannelID code);
//! \brief Returns the Maximum of all sessions' events for this day
EventDataType physMax(ChannelID code);
//! \brief Returns the Count-per-hour of all sessions' events for this day //! \brief Returns the Count-per-hour of all sessions' events for this day
EventDataType cph(ChannelID code); EventDataType cph(ChannelID code);

24
sleepyhead/SleepLib/event.cpp
View File

@ -29,6 +29,20 @@ EventList::EventList(EventListType et,EventDataType gain, EventDataType offset,
EventList::~EventList() EventList::~EventList()
{ {
} }
void EventList::clear()
{
m_min2=m_min=999999999;
m_max2=m_max=-999999999;
m_update_minmax=true;
m_first=m_last=0;
m_count=0;
m_data.clear();
m_data2.clear();
m_time.clear();
}
qint64 EventList::time(quint32 i) qint64 EventList::time(quint32 i)
{ {
if (m_type==EVL_Event) { if (m_type==EVL_Event) {
@ -55,8 +69,12 @@ void EventList::AddEvent(qint64 time, EventStoreType data)
EventDataType val=EventDataType(data)*m_gain; // ignoring m_offset EventDataType val=EventDataType(data)*m_gain; // ignoring m_offset
if (m_update_minmax) { if (m_update_minmax) {
if (m_min>val) m_min=val; if (m_count==0) {
else if (m_max<val) m_max=val; m_max=m_min=val;
} else {
if (m_min>val) m_min=val;
if (m_max<val) m_max=val;
}
} }
if (!m_first) { if (!m_first) {
@ -167,7 +185,7 @@ void EventList::AddWaveform(qint64 start, qint16 * data, int recs, qint64 durati
//if (m_offset; //if (m_offset;
for (sp=data; sp<ep; sp++) { for (sp=data; sp<ep; sp++) {
*dp++=raw=*sp; *dp++=raw=*sp;
val=EventDataType(*sp)*gain; val=EventDataType(*sp)*gain+m_offset;
if (min > val) min=val; if (min > val) min=val;
if (max < val) max=val; if (max < val) max=val;
} }

3
sleepyhead/SleepLib/event.h
View File

@ -25,6 +25,9 @@ public:
EventList(EventListType et,EventDataType gain=1.0, EventDataType offset=0.0, EventDataType min=0.0, EventDataType max=0.0, double rate=0.0,bool second_field=false); EventList(EventListType et,EventDataType gain=1.0, EventDataType offset=0.0, EventDataType min=0.0, EventDataType max=0.0, double rate=0.0,bool second_field=false);
~EventList(); ~EventList();
//! \brief Wipe the event list so it can be reused
void clear();
/*! \brief Add an event starting at time, containing data to this event list /*! \brief Add an event starting at time, containing data to this event list
Note, data2 is only used if second_field is specified in the constructor */ Note, data2 is only used if second_field is specified in the constructor */
void AddEvent(qint64 time, EventStoreType data); void AddEvent(qint64 time, EventStoreType data);

16
sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -647,6 +647,20 @@ bool PRS1Loader::ParseSummary(Machine *mach, qint32 sequence, quint32 timestamp,
session->setCph(CPAP_RERA,float(rc/hours)); session->setCph(CPAP_RERA,float(rc/hours));
session->setCph(CPAP_FlowLimit,float(fc/hours)); session->setCph(CPAP_FlowLimit,float(fc/hours));
} }
// Set recommended Graph values..
session->setPhysMax(CPAP_LeakTotal,120);
session->setPhysMin(CPAP_LeakTotal,0);
session->setPhysMax(CPAP_Pressure,25);
session->setPhysMin(CPAP_Pressure,4);
session->setPhysMax(CPAP_IPAP,25);
session->setPhysMin(CPAP_IPAP,4);
session->setPhysMax(CPAP_EPAP,25);
session->setPhysMin(CPAP_EPAP,4);
session->setPhysMax(CPAP_PS,25);
session->setPhysMin(CPAP_PS,0);
new_sessions[sequence]=session; new_sessions[sequence]=session;
return true; return true;
} }
@ -950,6 +964,7 @@ bool PRS1Loader::Parse002v5(qint32 sequence, quint32 timestamp, unsigned char *b
session->m_valuesummary[CPAP_Pressure].clear(); session->m_valuesummary[CPAP_Pressure].clear();
session->m_valuesummary.erase(session->m_valuesummary.find(CPAP_Pressure)); session->m_valuesummary.erase(session->m_valuesummary.find(CPAP_Pressure));
return true; return true;
} }
@ -971,7 +986,6 @@ bool PRS1Loader::Parse002(qint32 sequence, quint32 timestamp, unsigned char *buf
Session *session=new_sessions[sequence]; Session *session=new_sessions[sequence];
session->updateFirst(t); session->updateFirst(t);
EventList * OA=session->AddEventList(CPAP_Obstructive, EVL_Event); EventList * OA=session->AddEventList(CPAP_Obstructive, EVL_Event);
EventList * HY=session->AddEventList(CPAP_Hypopnea, EVL_Event); EventList * HY=session->AddEventList(CPAP_Hypopnea, EVL_Event);
EventList * CSR=session->AddEventList(CPAP_CSR, EVL_Event); EventList * CSR=session->AddEventList(CPAP_CSR, EVL_Event);

218
sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -1358,41 +1358,41 @@ int ResmedLoader::Open(QString & path,Profile *profile)
// The following only happens when the STR.edf file is not up to date.. // The following only happens when the STR.edf file is not up to date..
// This will only happen when the user fails to back up their SDcard properly. // This will only happen when the user fails to back up their SDcard properly.
// Basically takes a guess. // Basically takes a guess.
bool dodgy=false; // bool dodgy=false;
if (!sess->settings.contains(CPAP_Mode)) { // if (!sess->settings.contains(CPAP_Mode)) {
//The following is a lame assumption if 50th percentile == max, then it's CPAP // //The following is a lame assumption if 50th percentile == max, then it's CPAP
EventDataType max=sess->Max(CPAP_Pressure); // EventDataType max=sess->Max(CPAP_Pressure);
EventDataType p50=sess->percentile(CPAP_Pressure,0.60); // EventDataType p50=sess->percentile(CPAP_Pressure,0.60);
EventDataType p502=sess->percentile(CPAP_MaskPressure,0.60); // EventDataType p502=sess->percentile(CPAP_MaskPressure,0.60);
p50=qMax(p50, p502); // p50=qMax(p50, p502);
if (max==0) { // if (max==0) {
dodgy=true; // dodgy=true;
} else if (qAbs(max-p50)<1.8) { // } else if (qAbs(max-p50)<1.8) {
max=round(max*10.0)/10.0; // max=round(max*10.0)/10.0;
sess->settings[CPAP_Mode]=MODE_CPAP; // sess->settings[CPAP_Mode]=MODE_CPAP;
if (max<1) { // if (max<1) {
int i=5; // int i=5;
} // }
sess->settings[CPAP_PressureMin]=max; // sess->settings[CPAP_PressureMin]=max;
EventDataType epr=round(sess->Max(CPAP_EPAP)*10.0)/10.0; // EventDataType epr=round(sess->Max(CPAP_EPAP)*10.0)/10.0;
int i=max-epr; // int i=max-epr;
sess->settings[CPAP_PresReliefType]=PR_EPR; // sess->settings[CPAP_PresReliefType]=PR_EPR;
prmode=(i>0) ? 0 : 1; // prmode=(i>0) ? 0 : 1;
sess->settings[CPAP_PresReliefMode]=prmode; // sess->settings[CPAP_PresReliefMode]=prmode;
sess->settings[CPAP_PresReliefSet]=i; // sess->settings[CPAP_PresReliefSet]=i;
} else { // } else {
// It's not cpap, so just take the highest setting for this machines history. // // It's not cpap, so just take the highest setting for this machines history.
// This may fail if the missing str data is at the beginning of a fresh import. // // This may fail if the missing str data is at the beginning of a fresh import.
CPAPMode mode=(CPAPMode)(int)PROFILE.calcSettingsMax(CPAP_Mode,MT_CPAP,sess->machine()->FirstDay(),sess->machine()->LastDay()); // CPAPMode mode=(CPAPMode)(int)PROFILE.calcSettingsMax(CPAP_Mode,MT_CPAP,sess->machine()->FirstDay(),sess->machine()->LastDay());
if (mode<MODE_APAP) mode=MODE_APAP; // if (mode<MODE_APAP) mode=MODE_APAP;
sess->settings[CPAP_Mode]=mode; // sess->settings[CPAP_Mode]=mode;
// Assuming 10th percentile should cover for ramp/warmup // // Assuming 10th percentile should cover for ramp/warmup
sess->settings[CPAP_PressureMin]=sess->percentile(CPAP_Pressure,0.10); // sess->settings[CPAP_PressureMin]=sess->percentile(CPAP_Pressure,0.10);
sess->settings[CPAP_PressureMax]=sess->Max(CPAP_Pressure); // sess->settings[CPAP_PressureMax]=sess->Max(CPAP_Pressure);
} // }
} // }
//Rather than take a dodgy guess, EPR settings can take a hit, and this data can simply be missed.. //Rather than take a dodgy guess, EPR settings can take a hit, and this data can simply be missed..
// Add the session to the machine & profile objects // Add the session to the machine & profile objects
@ -1831,7 +1831,9 @@ bool ResmedLoader::LoadBRP(Session *sess,EDFParser &edf)
long recs=es.nr*edf.GetNumDataRecords(); long recs=es.nr*edf.GetNumDataRecords();
ChannelID code; ChannelID code;
if (es.label=="Flow") { if (es.label=="Flow") {
es.gain*=60; es.gain*=60.0;
es.physical_minimum*=60.0;
es.physical_maximum*=60.0;
es.physical_dimension="L/M"; es.physical_dimension="L/M";
code=CPAP_FlowRate; code=CPAP_FlowRate;
} else if (es.label.startsWith("Mask Pres")) { } else if (es.label.startsWith("Mask Pres")) {
@ -1848,11 +1850,17 @@ bool ResmedLoader::LoadBRP(Session *sess,EDFParser &edf)
a->AddWaveform(edf.startdate,es.data,recs,duration); a->AddWaveform(edf.startdate,es.data,recs,duration);
sess->setMin(code,a->Min()); sess->setMin(code,a->Min());
sess->setMax(code,a->Max()); sess->setMax(code,a->Max());
sess->setPhysMin(code,es.physical_minimum);
sess->setPhysMax(code,es.physical_maximum);
} }
return true; return true;
} }
EventList * ResmedLoader::ToTimeDelta(Session *sess,EDFParser &edf, EDFSignal & es, ChannelID code, long recs, qint64 duration,EventDataType min,EventDataType max,bool square) void ResmedLoader::ToTimeDelta(Session *sess,EDFParser &edf, EDFSignal & es, ChannelID code, long recs, qint64 duration,EventDataType t_min,EventDataType t_max,bool square)
{ {
if (t_min==t_max) {
t_min=es.physical_minimum;
t_max=es.physical_maximum;
}
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
QElapsedTimer time; QElapsedTimer time;
time.start(); time.start();
@ -1862,7 +1870,7 @@ EventList * ResmedLoader::ToTimeDelta(Session *sess,EDFParser &edf, EDFSignal &
double rate=(duration/recs); // milliseconds per record double rate=(duration/recs); // milliseconds per record
double tt=edf.startdate; double tt=edf.startdate;
//sess->UpdateFirst(tt); //sess->UpdateFirst(tt);
EventDataType c,last; EventStoreType c,last;
int startpos=0; int startpos=0;
@ -1874,28 +1882,92 @@ EventList * ResmedLoader::ToTimeDelta(Session *sess,EDFParser &edf, EDFSignal &
qint16 * eptr=sptr+recs; qint16 * eptr=sptr+recs;
sptr+=startpos; sptr+=startpos;
EventDataType min=t_max,max=t_min,tmp;
EventList *el=NULL; EventList *el=NULL;
if (recs>startpos+1) { if (recs>startpos+1) {
el=sess->AddEventList(code,EVL_Event,es.gain,es.offset,min,max);
c=last=*sptr++; // Prime last with a good starting value
el->AddEvent(tt,last); do {
last=*sptr++;
tmp=EventDataType(last) * es.gain;
if ((tmp >= t_min) && (tmp <= t_max)) {
min=tmp;
max=tmp;
el=sess->AddEventList(code,EVL_Event,es.gain,es.offset,0,0);
el->AddEvent(tt,last);
tt+=rate;
break;
}
tt+=rate;
} while (sptr < eptr);
if (!el)
return;
for (; sptr < eptr; sptr++) { //int i=startpos;i<recs;i++) { for (; sptr < eptr; sptr++) { //int i=startpos;i<recs;i++) {
c=*sptr; //es.data[i]; c=*sptr; //es.data[i];
if (last!=c) { if (last!=c) {
if (square) el->AddEvent(tt,last); // square waves look better on some charts. if (square) {
el->AddEvent(tt,c); tmp=EventDataType(last) * es.gain;
if ((tmp >= t_min) && (tmp <= t_max)) {
if (tmp < min)
min=tmp;
if (tmp > max)
max=tmp;
el->AddEvent(tt,last);
} else {
// Out of bounds value, start a new eventlist
if (el->count()>1) {
// that should be in session, not the eventlist.. handy for debugging though
el->setDimension(es.physical_dimension);
el=sess->AddEventList(code,EVL_Event,es.gain,es.offset,0,0);
} else {
el->clear(); // reuse the object
}
}
}
tmp=EventDataType(c) * es.gain;
if (tmp<0) {
int i=5;
}
if ((tmp >= t_min) && (tmp <= t_max)) {
if (tmp < min)
min=tmp;
if (tmp > max)
max=tmp;
el->AddEvent(tt,c);
} else {
if (el->count()>1) {
el->setDimension(es.physical_dimension);
// Create and attach new EventList
el=sess->AddEventList(code,EVL_Event,es.gain,es.offset,0,0);
} else el->clear();
}
} }
tt+=rate; tt+=rate;
last=c; last=c;
} }
el->AddEvent(tt,c); tmp=EventDataType(c) * es.gain;
if ((tmp >= t_min) && (tmp <= t_max)) {
el->AddEvent(tt,c);
}
sess->setMin(code,min);
sess->setMax(code,max);
sess->setPhysMin(code,es.physical_minimum);
sess->setPhysMax(code,es.physical_maximum);
sess->updateLast(tt); sess->updateLast(tt);
} }
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
qint64 t=time.nsecsElapsed(); qint64 t=time.nsecsElapsed();
int cnt=el->count(); int cnt=el->count();
@ -1911,7 +1983,7 @@ EventList * ResmedLoader::ToTimeDelta(Session *sess,EDFParser &edf, EDFSignal &
} }
#endif #endif
return el; //return el;
} }
bool ResmedLoader::LoadSAD(Session *sess,EDFParser &edf) bool ResmedLoader::LoadSAD(Session *sess,EDFParser &edf)
{ {
@ -1941,10 +2013,15 @@ bool ResmedLoader::LoadSAD(Session *sess,EDFParser &edf)
} }
} }
if (hasdata) { if (hasdata) {
EventList *a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); if (code==OXI_Pulse) {
if (a) { ToTimeDelta(sess,edf,es, code,recs,duration);
sess->setMin(code,a->Min()); sess->setPhysMax(code,180);
sess->setMax(code,a->Max()); sess->setPhysMin(code,18);
} else if (code==OXI_SPO2) {
es.physical_minimum=60;
ToTimeDelta(sess,edf,es, code,recs,duration);
sess->setPhysMax(code,100);
sess->setPhysMin(code,60);
} }
} }
@ -1975,40 +2052,59 @@ bool ResmedLoader::LoadPLD(Session *sess,EDFParser &edf)
//qDebug() << "EVE:" << es.digital_maximum << es.digital_minimum << es.physical_maximum << es.physical_minimum << es.gain; //qDebug() << "EVE:" << es.digital_maximum << es.digital_minimum << es.physical_maximum << es.physical_minimum << es.gain;
if (es.label=="Snore Index") { if (es.label=="Snore Index") {
code=CPAP_Snore; code=CPAP_Snore;
a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); ToTimeDelta(sess,edf,es, code,recs,duration,es.digital_maximum);
} else if (es.label.startsWith("Therapy Pres")) { } else if (es.label.startsWith("Therapy Pres")) {
code=CPAP_Pressure; //TherapyPressure; code=CPAP_Pressure; //TherapyPressure;
a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); es.physical_maximum=25;
es.physical_minimum=4;
ToTimeDelta(sess,edf,es, code,recs,duration,0,0);
} else if (es.label=="Insp Pressure") { } else if (es.label=="Insp Pressure") {
code=CPAP_IPAP; code=CPAP_IPAP;
sess->settings[CPAP_Mode]=MODE_BIPAP; sess->settings[CPAP_Mode]=MODE_BIPAP;
a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); es.physical_maximum=25;
es.physical_minimum=4;
ToTimeDelta(sess,edf,es, code,recs,duration,0,0);
} else if ((es.label=="MV") || (es.label=="VM")){ } else if ((es.label=="MV") || (es.label=="VM")){
code=CPAP_MinuteVent; code=CPAP_MinuteVent;
a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); ToTimeDelta(sess,edf,es, code,recs,duration,0,0);
} else if ((es.label=="RR") || (es.label=="AF") || (es.label=="FR")) { } else if ((es.label=="RR") || (es.label=="AF") || (es.label=="FR")) {
code=CPAP_RespRate; code=CPAP_RespRate;
a=sess->AddEventList(code,EVL_Waveform,es.gain,es.offset,0,0,rate); a=sess->AddEventList(code,EVL_Waveform,es.gain,es.offset,0,0,rate);
a->AddWaveform(edf.startdate,es.data,recs,duration); a->AddWaveform(edf.startdate,es.data,recs,duration);
} else if ((es.label=="Vt") || (es.label=="VC")) { } else if ((es.label=="Vt") || (es.label=="VC")) {
code=CPAP_TidalVolume; code=CPAP_TidalVolume;
es.physical_maximum=es.physical_minimum=0;
es.gain*=1000.0; es.gain*=1000.0;
a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); es.physical_maximum*=1000.0;
es.physical_minimum*=1000.0;
// es.digital_maximum*=1000.0;
// es.digital_minimum*=1000.0;
ToTimeDelta(sess,edf,es, code,recs,duration,0,0);
} else if ((es.label=="Leak") || (es.label.startsWith("Leck")) || (es.label.startsWith("Lekk"))) { } else if ((es.label=="Leak") || (es.label.startsWith("Leck")) || (es.label.startsWith("Lekk"))) {
code=CPAP_Leak; code=CPAP_Leak;
es.gain*=60; es.gain*=60;
es.physical_maximum*=60;
es.physical_minimum*=60;
// es.digital_maximum*=60.0;
// es.digital_minimum*=60.0;
es.physical_dimension="L/M"; es.physical_dimension="L/M";
a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0,true); ToTimeDelta(sess,edf,es, code,recs,duration,0,0,true);
sess->setPhysMax(code,120.0);
sess->setPhysMin(code,0);
} else if (es.label=="FFL Index") { } else if (es.label=="FFL Index") {
code=CPAP_FLG; code=CPAP_FLG;
a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); ToTimeDelta(sess,edf,es, code,recs,duration,0,0);
} else if (es.label.startsWith("Mask Pres")) { } else if (es.label.startsWith("Mask Pres")) {
code=CPAP_MaskPressure; code=CPAP_MaskPressure;
a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); es.physical_maximum=25;
es.physical_minimum=4;
ToTimeDelta(sess,edf,es, code,recs,duration,0,0);
} else if (es.label.startsWith("Exp Press")) { } else if (es.label.startsWith("Exp Press")) {
code=CPAP_EPAP;//ExpiratoryPressure code=CPAP_EPAP;//ExpiratoryPressure
a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); es.physical_maximum=25;
es.physical_minimum=4;
ToTimeDelta(sess,edf,es, code,recs,duration,0,0);
} else if (es.label.startsWith("I:E")) { } else if (es.label.startsWith("I:E")) {
code=CPAP_IE;//I:E ratio? code=CPAP_IE;//I:E ratio?
a=sess->AddEventList(code,EVL_Waveform,es.gain,es.offset,0,0,rate); a=sess->AddEventList(code,EVL_Waveform,es.gain,es.offset,0,0,rate);
@ -2032,10 +2128,10 @@ bool ResmedLoader::LoadPLD(Session *sess,EDFParser &edf)
} else if (es.label=="") { } else if (es.label=="") {
if (emptycnt==0) { if (emptycnt==0) {
code=RMS9_E01; code=RMS9_E01;
a=ToTimeDelta(sess,edf,es, code,recs,duration); ToTimeDelta(sess,edf,es, code,recs,duration);
} else if (emptycnt==1) { } else if (emptycnt==1) {
code=RMS9_E02; code=RMS9_E02;
a=ToTimeDelta(sess,edf,es, code,recs,duration); ToTimeDelta(sess,edf,es, code,recs,duration);
} else { } else {
qDebug() << "Unobserved Empty Signal " << es.label; qDebug() << "Unobserved Empty Signal " << es.label;
} }
@ -2047,6 +2143,8 @@ bool ResmedLoader::LoadPLD(Session *sess,EDFParser &edf)
if (a) { if (a) {
sess->setMin(code,a->Min()); sess->setMin(code,a->Min());
sess->setMax(code,a->Max()); sess->setMax(code,a->Max());
sess->setPhysMin(code,es.physical_minimum);
sess->setPhysMax(code,es.physical_maximum);
a->setDimension(es.physical_dimension); a->setDimension(es.physical_dimension);
} }
} }

2
sleepyhead/SleepLib/loader_plugins/resmed_loader.h
View File

@ -189,7 +189,7 @@ public:
virtual const QString & ClassName() { return resmed_class_name; } virtual const QString & ClassName() { return resmed_class_name; }
//! \brief Converts EDFSignal data to time delta packed EventList, and adds to Session //! \brief Converts EDFSignal data to time delta packed EventList, and adds to Session
EventList * ToTimeDelta(Session *sess,EDFParser &edf, EDFSignal & es, ChannelID code, long recs,qint64 duration,EventDataType min=0,EventDataType max=0,bool square=false); void ToTimeDelta(Session *sess,EDFParser &edf, EDFSignal & es, ChannelID code, long recs,qint64 duration,EventDataType min=0,EventDataType max=0,bool square=false);
//! \brief Create Machine record, and index it by serial number //! \brief Create Machine record, and index it by serial number
Machine *CreateMachine(QString serial,Profile *profile); Machine *CreateMachine(QString serial,Profile *profile);

44
sleepyhead/SleepLib/session.cpp
View File

@ -24,7 +24,7 @@ const quint16 filetype_data=1;
// This is the uber important database version for SleepyHeads internal storage // This is the uber important database version for SleepyHeads internal storage
// Increment this after stuffing with Session's save & load code. // Increment this after stuffing with Session's save & load code.
const quint16 summary_version=11; const quint16 summary_version=12;
const quint16 events_version=10; const quint16 events_version=10;
Session::Session(Machine * m,SessionID session) Session::Session(Machine * m,SessionID session)
@ -145,6 +145,8 @@ bool Session::StoreSummary(QString filename)
out << m_wavg; out << m_wavg;
out << m_min; out << m_min;
out << m_max; out << m_max;
out << m_physmin;
out << m_physmax;
out << m_cph; out << m_cph;
out << m_sph; out << m_sph;
out << m_firstchan; out << m_firstchan;
@ -263,6 +265,7 @@ bool Session::LoadSummary(QString filename)
code=schema::channel[i.key()].id(); code=schema::channel[i.key()].id();
m_max[code]=i.value(); m_max[code]=i.value();
} }
ztmp.clear(); ztmp.clear();
in >> ztmp; // cph in >> ztmp; // cph
for (QHash<QString,EventDataType>::iterator i=ztmp.begin();i!=ztmp.end();i++) { for (QHash<QString,EventDataType>::iterator i=ztmp.begin();i!=ztmp.end();i++) {
@ -306,6 +309,11 @@ bool Session::LoadSummary(QString filename)
} }
in >> m_min; in >> m_min;
in >> m_max; in >> m_max;
// Added 24/10/2013 by MW to support physical graph min/max values
if (version>=12) {
in >> m_physmin;
in >> m_physmax;
}
in >> m_cph; in >> m_cph;
in >> m_sph; in >> m_sph;
in >> m_firstchan; in >> m_firstchan;
@ -894,6 +902,40 @@ EventDataType Session::Max(ChannelID id)
m_max[id]=max; m_max[id]=max;
return max; return max;
} }
////
EventDataType Session::physMin(ChannelID id)
{
QHash<ChannelID,EventDataType>::iterator i=m_physmin.find(id);
if (i!=m_physmin.end())
return i.value();
QHash<ChannelID,QVector<EventList *> >::iterator j=eventlist.find(id);
if (j==eventlist.end()) {
m_physmin[id]=0;
return 0;
}
EventDataType min=round(Min(id));
m_physmin[id]=min;
return min;
}
EventDataType Session::physMax(ChannelID id)
{
QHash<ChannelID,EventDataType>::iterator i=m_physmax.find(id);
if (i!=m_physmax.end())
return i.value();
QHash<ChannelID,QVector<EventList *> >::iterator j=eventlist.find(id);
if (j==eventlist.end()) {
m_physmax[id]=0;
return 0;
}
EventDataType max=round(Max(id)+0.5);
m_physmax[id]=max;
return max;
}
qint64 Session::first(ChannelID id) qint64 Session::first(ChannelID id)
{ {
qint64 drift=qint64(PROFILE.cpap->clockDrift())*1000L; qint64 drift=qint64(PROFILE.cpap->clockDrift())*1000L;

33
sleepyhead/SleepLib/session.h
View File

@ -136,8 +136,15 @@ public:
QHash<ChannelID,double> m_sum; QHash<ChannelID,double> m_sum;
QHash<ChannelID,EventDataType> m_avg; QHash<ChannelID,EventDataType> m_avg;
QHash<ChannelID,EventDataType> m_wavg; QHash<ChannelID,EventDataType> m_wavg;
QHash<ChannelID,EventDataType> m_min;
QHash<ChannelID,EventDataType> m_min; // The actual minimum
QHash<ChannelID,EventDataType> m_max; QHash<ChannelID,EventDataType> m_max;
// This could go in channels, but different machines interpret it differently
// Under the new SleepyLib data Device model this can be done, but unfortunately not here..
QHash<ChannelID,EventDataType> m_physmin; // The physical minimum for graph display purposes
QHash<ChannelID,EventDataType> m_physmax; // The physical maximum
QHash<ChannelID,EventDataType> m_cph; // Counts per hour (eg AHI) QHash<ChannelID,EventDataType> m_cph; // Counts per hour (eg AHI)
QHash<ChannelID,EventDataType> m_sph; // % indice (eg % night in CSR) QHash<ChannelID,EventDataType> m_sph; // % indice (eg % night in CSR)
QHash<ChannelID,quint64> m_firstchan; QHash<ChannelID,quint64> m_firstchan;
@ -158,6 +165,23 @@ public:
void setSum(ChannelID id,EventDataType val) { m_sum[id]=val; } void setSum(ChannelID id,EventDataType val) { m_sum[id]=val; }
void setMin(ChannelID id,EventDataType val) { m_min[id]=val; } void setMin(ChannelID id,EventDataType val) { m_min[id]=val; }
void setMax(ChannelID id,EventDataType val) { m_max[id]=val; } void setMax(ChannelID id,EventDataType val) { m_max[id]=val; }
void setPhysMin(ChannelID id,EventDataType val) { m_physmin[id]=val; }
void setPhysMax(ChannelID id,EventDataType val) { m_physmax[id]=val; }
void updateMin(ChannelID id,EventDataType val) {
QHash<ChannelID,EventDataType>::iterator i=m_min.find(id);
if (i==m_min.end())
m_min[id]=val;
else if (i.value() > val)
i.value() = val;
}
void updateMax(ChannelID id,EventDataType val) {
QHash<ChannelID,EventDataType>::iterator i=m_max.find(id);
if (i==m_max.end())
m_max[id]=val;
else if (i.value() < val)
i.value() = val;
}
void setAvg(ChannelID id,EventDataType val) { m_avg[id]=val; } void setAvg(ChannelID id,EventDataType val) { m_avg[id]=val; }
void setWavg(ChannelID id,EventDataType val) { m_wavg[id]=val; } void setWavg(ChannelID id,EventDataType val) { m_wavg[id]=val; }
// void setMedian(ChannelID id,EventDataType val) { m_med[id]=val; } // void setMedian(ChannelID id,EventDataType val) { m_med[id]=val; }
@ -182,7 +206,6 @@ public:
//! \brief Returns the maximum of events of type id between time range //! \brief Returns the maximum of events of type id between time range
EventDataType rangeMax(ChannelID id, qint64 first,qint64 last); EventDataType rangeMax(ChannelID id, qint64 first,qint64 last);
//! \brief Returns (and caches) the Sum of all events of type id //! \brief Returns (and caches) the Sum of all events of type id
double sum(ChannelID id); double sum(ChannelID id);
@ -198,6 +221,12 @@ public:
//! \brief Returns (and caches) the Maximum of all events of type id //! \brief Returns (and caches) the Maximum of all events of type id
EventDataType Max(ChannelID id); EventDataType Max(ChannelID id);
//! \brief Returns (and caches) the Minimum of all events of type id
EventDataType physMin(ChannelID id);
//! \brief Returns (and caches) the Maximum of all events of type id
EventDataType physMax(ChannelID id);
//! \brief Returns (and caches) the 90th Percentile of all events of type id //! \brief Returns (and caches) the 90th Percentile of all events of type id
EventDataType p90(ChannelID id); EventDataType p90(ChannelID id);

3
sleepyhead/daily.cpp
View File

@ -195,7 +195,8 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
//fg->AddLayer((new gFlagsLine(PRS1_0B,COLOR_DarkGreen,tr("U0B")))); //fg->AddLayer((new gFlagsLine(PRS1_0B,COLOR_DarkGreen,tr("U0B"))));
SF->setBlockZoom(true); SF->setBlockZoom(true);
SF->AddLayer(new gShadowArea()); SF->AddLayer(new gShadowArea());
SF->AddLayer(new gYSpacer(),LayerLeft,gYAxis::Margin);
SF->AddLayer(new gFlagsLabelArea(fg),LayerLeft,gYAxis::Margin);
//SF->AddLayer(new gFooBar(),LayerBottom,0,1); //SF->AddLayer(new gFooBar(),LayerBottom,0,1);
SF->AddLayer(new gXAxis(COLOR_Text,false),LayerBottom,0,20); //gXAxis::Margin); SF->AddLayer(new gXAxis(COLOR_Text,false),LayerBottom,0,20); //gXAxis::Margin);

2
sleepyhead/mainwindow.cpp
View File

@ -1077,7 +1077,7 @@ void MainWindow::RestartApplication(bool force_login,bool change_datafolder)
if (QProcess::startDetached("/usr/bin/open",args)) { if (QProcess::startDetached("/usr/bin/open",args)) {
QApplication::instance()->exit(); QApplication::instance()->exit();
} else QMessageBox::warning(this,tr("Gah!"),tr("If you can read this, the restart command didn't work. Your going to have to do it yourself manually."),QMessageBox::Ok); } else QMessageBox::warning(NULL,tr("Gah!"),tr("If you can read this, the restart command didn't work. Your going to have to do it yourself manually."),QMessageBox::Ok);
#else #else
apppath=QApplication::instance()->applicationFilePath(); apppath=QApplication::instance()->applicationFilePath();

2
sleepyhead/mainwindow.h
View File

@ -121,7 +121,7 @@ public:
If force_login is set, it will return to the login menu even if it's set to skip If force_login is set, it will return to the login menu even if it's set to skip
*/ */
void RestartApplication(bool force_login=false,bool change_datafolder=false); static void RestartApplication(bool force_login=false,bool change_datafolder=false);
//! \brief Self explainitory, selects the Oximetry Tab //! \brief Self explainitory, selects the Oximetry Tab
void selectOximetryTab(); void selectOximetryTab();

21
sleepyhead/newprofile.ui
View File

@ -390,9 +390,6 @@
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_6"> <layout class="QHBoxLayout" name="horizontalLayout_6">
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="QDoubleSpinBox" name="heightEdit"> <widget class="QDoubleSpinBox" name="heightEdit">
<property name="decimals"> <property name="decimals">
@ -880,6 +877,12 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="cancelButton"> <widget class="QPushButton" name="cancelButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>&amp;Cancel</string> <string>&amp;Cancel</string>
</property> </property>
@ -890,6 +893,12 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="backButton"> <widget class="QPushButton" name="backButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>&amp;Back</string> <string>&amp;Back</string>
</property> </property>
@ -900,6 +909,12 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="nextButton"> <widget class="QPushButton" name="nextButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>&amp;Next</string> <string>&amp;Next</string>
</property> </property>

14
sleepyhead/profileselect.cpp
View File

@ -18,6 +18,7 @@
#include "ui_profileselect.h" #include "ui_profileselect.h"
#include "SleepLib/profiles.h" #include "SleepLib/profiles.h"
#include "newprofile.h" #include "newprofile.h"
#include "mainwindow.h"
ProfileSelect::ProfileSelect(QWidget *parent) : ProfileSelect::ProfileSelect(QWidget *parent) :
QDialog(parent), QDialog(parent),
@ -65,6 +66,14 @@ ProfileSelect::ProfileSelect(QWidget *parent) :
popupMenu->addAction(tr("Edit Profile"),this,SLOT(editProfile())); popupMenu->addAction(tr("Edit Profile"),this,SLOT(editProfile()));
popupMenu->addSeparator(); popupMenu->addSeparator();
popupMenu->addAction(tr("Delete Profile"),this,SLOT(deleteProfile())); popupMenu->addAction(tr("Delete Profile"),this,SLOT(deleteProfile()));
ui->labelAppName->setText(STR_TR_SleepyHead);
ui->labelVersion->setText("v"+VersionString+" "+ReleaseStatus);
// if (GIT_BRANCH!="master")
// ui->labelBuild->setText(GIT_BRANCH);
// else ui->labelBuild->setText(QString());
ui->labelFolder->setText(GetAppRoot());
ui->labelFolder->setToolTip("Current SleepyHead data folder\n"+GetAppRoot());
} }
ProfileSelect::~ProfileSelect() ProfileSelect::~ProfileSelect()
@ -247,3 +256,8 @@ void ProfileSelect::on_listView_customContextMenuRequested(const QPoint &pos)
{ {
popupMenu->popup(QWidget::mapToGlobal(pos)); popupMenu->popup(QWidget::mapToGlobal(pos));
} }
void ProfileSelect::on_pushButton_clicked()
{
MainWindow::RestartApplication(false,true);
}

2
sleepyhead/profileselect.h
View File

@ -43,6 +43,8 @@ private slots:
void on_listView_customContextMenuRequested(const QPoint &pos); void on_listView_customContextMenuRequested(const QPoint &pos);
void on_pushButton_clicked();
private: private:
Ui::ProfileSelect *ui; Ui::ProfileSelect *ui;
QString m_selectedProfile; QString m_selectedProfile;

234
sleepyhead/profileselect.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>386</width>
<height>300</height> <height>251</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -18,51 +18,215 @@
<normaloff>:/icons/bob-v3.0.png</normaloff>:/icons/bob-v3.0.png</iconset> <normaloff>:/icons/bob-v3.0.png</normaloff>:/icons/bob-v3.0.png</iconset>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <property name="spacing">
<widget class="QListView" name="listView"> <number>0</number>
<property name="contextMenuPolicy"> </property>
<enum>Qt::CustomContextMenu</enum> <property name="margin">
</property> <number>0</number>
</widget> </property>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>8</number>
</property>
<property name="leftMargin">
<number>10</number>
</property>
<property name="topMargin">
<number>12</number>
</property>
<property name="rightMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>12</number>
</property>
<item> <item>
<widget class="QPushButton" name="quitButton"> <widget class="QListView" name="listView">
<property name="text"> <property name="contextMenuPolicy">
<string>&amp;Quit</string> <enum>Qt::CustomContextMenu</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="orientation"> <property name="spacing">
<enum>Qt::Horizontal</enum> <number>6</number>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="margin">
<size> <number>0</number>
<width>40</width>
<height>20</height>
</size>
</property> </property>
</spacer> <item>
</item> <widget class="QPushButton" name="selectButton">
<item> <property name="sizePolicy">
<widget class="QPushButton" name="newProfileButton"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<property name="text"> <horstretch>0</horstretch>
<string>New Profile</string> <verstretch>0</verstretch>
</property> </sizepolicy>
</widget> </property>
</item> <property name="toolTip">
<item> <string>Start with the selected user profile.</string>
<widget class="QPushButton" name="selectButton"> </property>
<property name="text"> <property name="text">
<string>&amp;Select User</string> <string>&amp;Select User</string>
</property> </property>
</widget> <property name="icon">
<iconset resource="Resources.qrc">
<normaloff>:/icons/forward.png</normaloff>:/icons/forward.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="newProfileButton">
<property name="toolTip">
<string>Create a new user profile.</string>
</property>
<property name="text">
<string>New Profile</string>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton">
<property name="toolTip">
<string>Choose a different SleepyHead data folder.</string>
</property>
<property name="text">
<string>&amp;Different Folder</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="labelAppName">
<property name="font">
<font>
<pointsize>15</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>SleepyHead</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="labelVersion">
<property name="text">
<string>[version]</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="quitButton">
<property name="toolTip">
<string>Click here if you didn't want to start SleepyHead.</string>
</property>
<property name="text">
<string>&amp;Quit</string>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Folder:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="labelFolder">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>The current location of SleepyHead data store.</string>
</property>
<property name="text">
<string>[data directory]</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<resources> <resources>

8
sleepyhead/sessionbar.cpp
View File

@ -101,7 +101,8 @@ void SessionBar::mousePressEvent(QMouseEvent * ev)
{ {
SegType mn=min(); SegType mn=min();
SegType mx=max(); SegType mx=max();
Q_ASSERT(mx > mn); if (mx < mn)
return;
SegType total=mx-mn; SegType total=mx-mn;
double px=double(width()-5) / double(total); double px=double(width()-5) / double(total);
@ -134,7 +135,8 @@ void SessionBar::mouseMoveEvent(QMouseEvent * ev)
{ {
SegType mn=min(); SegType mn=min();
SegType mx=max(); SegType mx=max();
Q_ASSERT(mx > mn); if (mx < mn)
return;
SegType total=mx-mn; SegType total=mx-mn;
double px=double(width()-5) / double(total); double px=double(width()-5) / double(total);
@ -169,7 +171,7 @@ void SessionBar::paintEvent(QPaintEvent *)
SegType mn=min(); SegType mn=min();
SegType mx=max(); SegType mx=max();
if (mx > mn) if (mx < mn)
return; return;
SegType total=mx-mn; SegType total=mx-mn;

6
sleepyhead/sleepyhead.pro
View File

@ -118,7 +118,8 @@ SOURCES += main.cpp\
SleepLib/loader_plugins/mseries_loader.cpp \ SleepLib/loader_plugins/mseries_loader.cpp \
reports.cpp \ reports.cpp \
summary.cpp \ summary.cpp \
sessionbar.cpp sessionbar.cpp \
Graphs/gspacer.cpp
HEADERS += \ HEADERS += \
SleepLib/machine.h \ SleepLib/machine.h \
@ -164,7 +165,8 @@ HEADERS += \
SleepLib/loader_plugins/mseries_loader.h \ SleepLib/loader_plugins/mseries_loader.h \
reports.h \ reports.h \
summary.h \ summary.h \
sessionbar.h sessionbar.h \
Graphs/gspacer.h
FORMS += \ FORMS += \