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

New Graph QMenu magic and new icons

Browse Source
This commit is contained in:
Mark Watkins 2014-08-17 22:56:05 +10:00
parent df450a1845
commit b45e7efed5
124 changed files with 1958 additions and 917 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
sleepyhead/Graphs/MinutesAtPressure.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* MinutesAtPressure Graph Implementation
/* MinutesAtPressure Graph Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -29,6 +26,7 @@ MinutesAtPressure::MinutesAtPressure() :Layer(NoChannel)
m_remap = nullptr;
m_minpressure = 3;
m_maxpressure = 30;
m_minimum_height = 0;
}
MinutesAtPressure::~MinutesAtPressure()
{
@ -83,7 +81,7 @@ void MinutesAtPressure::SetDay(Day *day)
m_minpressure = qMax(float(4), floor(minpressure));
m_maxpressure = ceil(maxpressure);
const int minimum_cells = 16;
const int minimum_cells = 12;
int c = m_maxpressure - m_minpressure;
@ -94,8 +92,12 @@ void MinutesAtPressure::SetDay(Day *day)
m_maxpressure = m_minpressure + minimum_cells;
}
QFontMetrics FM(*defaultfont);
QList<ChannelID> chans = day->getSortedMachineChannels(schema::SPAN | schema::FLAG | schema::MINOR_FLAG);
m_minimum_height = (chans.size()+3) * FM.height() - 5;
}
m_empty = false;
m_recalculating = false;
m_lastminx = 0;
@ -103,6 +105,12 @@ void MinutesAtPressure::SetDay(Day *day)
m_empty = !m_day || !(m_day->channelExists(CPAP_Pressure) || m_day->channelExists(CPAP_EPAP));
}
int MinutesAtPressure::minimumHeight()
{
return m_minimum_height;
}
bool MinutesAtPressure::isEmpty()
{
@ -119,10 +127,20 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
int cells = m_maxpressure-m_minpressure+1;
int top = rect.top()-10;
float width = rect.width();
float height = rect.height();
float left = rect.left();
float pix = width / float(cells);
int numchans = chans.size();
int cells_high = numchans + 2;
//height += 10;
float hix = height / cells_high;
m_minx = graph.min_x;
m_maxx = graph.max_x;
@ -133,7 +151,6 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
m_lastmaxx = m_maxx;
QMap<EventStoreType, int>::iterator it;
int top = rect.top()+1;
painter.setFont(*defaultfont);
painter.setPen(Qt::black);
@ -143,55 +160,49 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
QMap<EventStoreType, int>::iterator times_end = times.end();
QPoint mouse = graph.graphView()->currentMousePos();
float ypos = top;
QString text = schema::channel[m_presChannel].label();
QRectF rec(left - gYAxis::Margin, top, gYAxis::Margin,0);
rec = painter.boundingRect(rec, Qt::AlignTop | Qt::AlignRight, text);
rec.moveRight(left-4);
graph.renderText(text, rec, Qt::AlignRight | Qt::AlignVCenter);
int titleWidth = graph.graphView()->titleWidth;
int marginWidth = gYAxis::Margin;
QString text = schema::channel[m_presChannel].label();
QRectF rec(titleWidth-4, ypos, marginWidth, hix);
rec.moveRight(left - 4);
// graph.renderText(text, rec, Qt::AlignRight | Qt::AlignVCenter);
//painter.drawText(rec, Qt::AlignRight | Qt::AlignVCenter, text);
if (rec.contains(mouse)) {
QString text = schema::channel[m_presChannel].description();
graph.ToolTip(text, mouse.x() + 10, mouse.y(), TT_AlignLeft);
}
double tmph = rec.height();
int w,h;
GetTextExtent(text, w,h);
graph.renderText(text, (left-4) - w, ypos + hix/2.0 + float(h)/2.0);
text = STR_UNIT_Minutes;
QRectF rec2(left - gYAxis::Margin, top + rec.height(), gYAxis::Margin, 0);
rec2 = painter.boundingRect(rec2, Qt::AlignTop | Qt::AlignRight, text);
rec2.moveRight(left-4);
//painter.drawText(rec2, Qt::AlignRight | Qt::AlignVCenter, text);
graph.renderText(text, rec2, Qt::AlignRight | Qt::AlignVCenter);
rec = QRectF(titleWidth-4, ypos+hix, marginWidth, hix);
rec.moveRight(left - 4);
tmph += rec2.height();
GetTextExtent(text, w,h);
graph.renderText(text, (left-4) - w, ypos + hix + hix/2.0 + float(h)/2.0);
// graph.renderText(text, rec, Qt::AlignRight | Qt::AlignVCenter);
float xpos = left;
for (it = times.begin(); it != times_end; ++it) {
QString text = QString::number(it.key());
QString value = QString("%1").arg(float(it.value()) / 60.0, 5, 'f', 1);
QRectF rec(xpos, top, pix-1, 0);
rec = painter.boundingRect(rec, Qt::AlignTop | Qt::AlignLeft, text);
rec = painter.boundingRect(rec, Qt::AlignTop | Qt::AlignLeft, value);
rec.setWidth(pix - 1);
QRectF rec(xpos, top, pix-1, hix);
painter.fillRect(rec, QColor("orange"));
graph.renderText(text, rec, Qt::AlignCenter);
//painter.drawText(rec, Qt::AlignCenter, text);
rec.moveTop(top + rec.height());
rec.moveTop(top + hix);
graph.renderText(value, rec, Qt::AlignCenter);
//painter.drawText(rec, Qt::AlignCenter, value);
xpos += pix;
}
ypos = top + tmph;
left = rect.left();
float hh = rec.height();
ypos += hix * 2;
// left = rect.left();
QHash<ChannelID, QMap<EventStoreType, EventDataType> >::iterator eit;
QHash<ChannelID, QMap<EventStoreType, EventDataType> >::iterator ev_end = events.end();
@ -199,7 +210,6 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
int row = 0;
int numchans = chans.size();
for (int i=0; i< numchans; ++i) {
ChannelID code = chans.at(i);
@ -214,19 +224,20 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
QMap<EventStoreType, EventDataType>::iterator eit_end = eit.value().end();
QString text = chan.label();
QRectF rec2(xpos - gYAxis::Margin, ypos, gYAxis::Margin, hh);
rec2 = painter.boundingRect(rec2, Qt::AlignRight | Qt::AlignVCenter, text);
rec2.moveRight(left-4);
rec = QRectF(titleWidth, ypos, marginWidth, hix);
rec.moveRight(xpos - 4);
if (rec2.contains(mouse)) {
if (rec.contains(mouse)) {
QString text = chan.fullname();
if (type == schema::SPAN) {
text += "\n"+QObject::tr("(% of time)");
}
graph.ToolTip(text, mouse.x() + 10, mouse.y(), TT_AlignLeft);
}
graph.renderText(text, rec2, Qt::AlignRight | Qt::AlignVCenter);
//painter.drawText(rec2, Qt::AlignRight | Qt::AlignVCenter, text);
GetTextExtent(text, w,h);
graph.renderText(text, (left-4) - w, ypos + hix/2.0 + float(h)/2.0);
for (it = times.begin(), vit = eit.value().begin(); vit != eit_end; ++vit, ++it) {
float minutes = float(it.value()) / 60.0;
@ -241,7 +252,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
value = (minutes > 0.000001) ? (100/minutes) * (value / 60.0) : 0;
}
QRectF rec(xpos, ypos, pix-1, hh);
QRectF rec(xpos, ypos, pix-1, hix);
if ((row & 1) == 0) {
painter.fillRect(rec, QColor(245,245,255,240));
}
@ -252,7 +263,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
xpos += pix;
}
ypos += hh;
ypos += hix;
row++;
}
@ -429,8 +440,6 @@ skip:
// }
QMutexLocker timelock(&map->timelock);
map->times = times;
map->events = events;
@ -457,7 +466,11 @@ void MinutesAtPressure::recalculate(gGraph * graph)
QThreadPool * tp = QThreadPool::globalInstance();
// tp->reserveThread();
while(!tp->tryStart(m_remap));
if (graph->printing()) {
m_remap->run();
} else {
while(!tp->tryStart(m_remap));
}
// Start recalculating in another thread, organize a callback to redraw when done..

7
sleepyhead/Graphs/MinutesAtPressure.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* Minutes At Pressure Graph Header
/* Minutes At Pressure Graph Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -42,6 +39,7 @@ public:
virtual void SetDay(Day *d);
virtual bool isEmpty();
virtual int minimumHeight();
//! Draw filled rectangles behind Event Flag's, and an outlines around them all, Calls the individual paint for each gFlagLine
virtual void paint(QPainter &painter, gGraph &w, const QRegion &region);
@ -58,6 +56,7 @@ protected:
QMutex mutex;
bool m_empty;
int m_minimum_height;
qint64 m_lastminx;
qint64 m_lastmaxx;

20
sleepyhead/Graphs/gFlagsLine.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gFlagsLine Implementation
/* gFlagsLine Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -38,6 +35,8 @@ gFlagsGroup::gFlagsGroup()
gFlagsGroup::~gFlagsGroup()
{
}
qint64 gFlagsGroup::Minx()
{
if (m_day) {
@ -136,6 +135,13 @@ void gFlagsGroup::SetDay(Day *d)
m_barh = 0;
}
bool gFlagsGroup::isEmpty()
{
if (m_day) {
return !(m_day->hasEnabledSessions()) || m_empty;
}
return m_empty;
}
void gFlagsGroup::paint(QPainter &painter, gGraph &g, const QRegion &region)
{
@ -194,9 +200,9 @@ void gFlagsGroup::paint(QPainter &painter, gGraph &g, const QRegion &region)
bool gFlagsGroup::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
{
if (p_profile->appearance->lineCursorMode()) {
//if (p_profile->appearance->lineCursorMode()) {
graph->timedRedraw(0);
}
// }
if (!p_profile->appearance->graphTooltips()) {
return false;
@ -215,7 +221,7 @@ bool gFlagsGroup::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
QString ttip = schema::channel[fl->code()].fullname() + "\n" +
schema::channel[fl->code()].description();
graph->ToolTip(ttip, event->x()+15, event->y(), TT_AlignLeft);
graph->timedRedraw(30);
graph->timedRedraw(0);
}
}

7
sleepyhead/Graphs/gFlagsLine.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gFlagsLine Header
/* gFlagsLine Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -90,7 +87,7 @@ class gFlagsGroup: public LayerGroup
virtual void SetDay(Day *);
//! Returns true if none of the gFlagLine objects contain any data for this day
virtual bool isEmpty() { return m_empty; }
virtual bool isEmpty();
//! Returns the count of visible flag line entries
int count() { return lvisible.size(); }

5
sleepyhead/Graphs/gFooBar.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gFooBar Implementation
/* gFooBar Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/Graphs/gFooBar.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gFooBar Header
/* gFooBar Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

69
sleepyhead/Graphs/gGraph.cpp
View File

@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
/* gGraph Implemntation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -265,7 +264,7 @@ void gGraph::renderText(QString text, int x, int y, float angle, QColor color, Q
m_graphview->AddTextQue(text, x, y, angle, color, font, antialias);
}
void gGraph::renderText(QString text, QRectF rect, int flags, float angle, QColor color, QFont *font, bool antialias)
void gGraph::renderText(QString text, QRectF rect, quint32 flags, float angle, QColor color, QFont *font, bool antialias)
{
m_graphview->AddTextQue(text, rect, flags, angle, color, font, antialias);
}
@ -304,6 +303,7 @@ void gGraph::paint(QPainter &painter, const QRegion &region)
QString & txt = title();
graphView()->AddTextQue(txt, marginLeft() + title_x + 4, originY + height / 2 - y / 2, 90, Qt::black, mediumfont);
left += title_x;
} else { left = 0; }
@ -413,18 +413,15 @@ void gGraph::paint(QPainter &painter, const QRegion &region)
// quads()->add(originX + m_selection.x() + m_selection.width(), originY + height - bottom,
// originX + m_selection.x(), originY + height - bottom, col.rgba());
}
if (isPinned()) {
painter.drawPixmap(-5, originY-10, m_graphview->pin_icon);
}
}
QPixmap gGraph::renderPixmap(int w, int h, bool printing)
{
gGraphView *sg = mainwin->snapshotGraph();
if (!sg) {
return QPixmap();
}
// Pixmap caching screws up font sizes when printing
sg->setUsePixmapCache(false);
QFont *_defaultfont = defaultfont;
QFont *_mediumfont = mediumfont;
@ -438,54 +435,34 @@ QPixmap gGraph::renderPixmap(int w, int h, bool printing)
m_printing = printing;
if (printing) {
fa.setPixelSize(30);
fb.setPixelSize(35);
fc.setPixelSize(80);
sg->setPrintScaleX(3);
sg->setPrintScaleY(3);
fa.setPixelSize(28);
fb.setPixelSize(32);
fc.setPixelSize(70);
graphView()->setPrintScaleX(2.5);
graphView()->setPrintScaleY(2.2);
} else {
sg->setPrintScaleX(1);
sg->setPrintScaleY(1);
graphView()->setPrintScaleX(1);
graphView()->setPrintScaleY(1);
}
defaultfont = &fa;
mediumfont = &fb;
bigfont = &fc;
sg->hideSplitter();
gGraphView *tgv = m_graphview;
m_graphview = sg;
sg->setMinimumSize(w, h);
sg->setMaximumSize(w, h);
sg->setFixedSize(w, h);
float tmp = height();
setHeight(h);
sg->trashGraphs();
sg->addGraph(this);
sg->setScaleY(1.0);
// float dpr = sg->devicePixelRatio();
// sg->setDevicePixelRatio(1);
// bool b = sg->usePixmapCache();
QPixmap pm(w,h);
graphView()->setUsePixmapCache(false);
QPainter painter(&pm);
painter.fillRect(0,0,w,h,QBrush(QColor(Qt::white)));
sg->renderGraphs(painter);
QRegion region(0,0,w,h);
paint(painter, region);
DrawTextQue(painter);
graphView()->setUsePixmapCache(p_profile->appearance->usePixmapCaching());
painter.end();
// sg->setDevicePixelRatio(dpr);
//sg->doneCurrent();
sg->trashGraphs();
graphView()->setPrintScaleX(1);
graphView()->setPrintScaleY(1);
m_graphview = tgv;
setHeight(tmp);
defaultfont = _defaultfont;
mediumfont = _mediumfont;
@ -840,7 +817,7 @@ void gGraph::mouseMoveEvent(QMouseEvent *event)
//if (!nolayer) { // no mouse button
if (doredraw) {
m_graphview->timedRedraw(30);
m_graphview->timedRedraw(0);
}
//}

7
sleepyhead/Graphs/gGraph.h
View File

@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
/* gGraph Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -127,7 +126,7 @@ class gGraph : public QObject
void renderText(QString text, int x, int y, float angle = 0.0, QColor color = Qt::black, QFont *font = defaultfont, bool antialias = true);
//! \brief Queues text for gGraphView object to draw it, using given rect.
void renderText(QString text, QRectF rect, int flags = Qt::AlignCenter, float angle = 0.0, QColor color = Qt::black, QFont *font = defaultfont, bool antialias = true);
void renderText(QString text, QRectF rect, quint32 flags = Qt::AlignCenter, float angle = 0.0, QColor color = Qt::black, QFont *font = defaultfont, bool antialias = true);
//! \brief Rounds Y scale values to make them look nice..
// Applies the Graph Preference min/max settings.
@ -309,6 +308,8 @@ class gGraph : public QObject
inline bool blockSelect() const { return m_block_select; }
void setBlockSelect(bool b) { m_block_select = b; }
inline bool printing() const { return m_printing; }
protected:
//! \brief Mouse Wheel events
virtual void wheelEvent(QWheelEvent *event);

384
sleepyhead/Graphs/gGraphView.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gGraphView Implementation
/* gGraphView Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -39,6 +36,41 @@
extern MainWindow *mainwin;
extern QLabel *qstatus2;
#include <QApplication>
MyLabel::MyLabel(QWidget * parent):
QWidget(parent)
{
m_font = QApplication::font();
}
MyLabel::~MyLabel()
{
}
void MyLabel::setText(QString text) {
m_text = text;
repaint();
}
void MyLabel::setFont(QFont & font)
{
m_font=font;
}
void MyLabel::setAlignment(Qt::Alignment alignment) {
m_alignment = alignment;
repaint();
}
void MyLabel::paintEvent(QPaintEvent * event)
{
QRectF rect(event->rect());
QPainter painter(this);
painter.setFont(m_font);
painter.drawText(rect, m_alignment, m_text);
}
gToolTip::gToolTip(gGraphView *graphview)
: m_graphview(graphview)
@ -303,6 +335,7 @@ gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
m_blockUpdates = false;
use_pixmap_cache = p_profile->appearance->usePixmapCaching();
pin_graph = nullptr;
// pixmapcache.setCacheLimit(10240*2);
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
@ -314,6 +347,28 @@ gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
setAutoFillBackground(false);
setAutoBufferSwap(false);
#endif
context_menu = new QMenu(this);
pin_action = context_menu->addAction(QString(), this, SLOT(togglePin()));
pin_icon = QPixmap(":/icons/pushpin.png");
context_menu->addSeparator();
context_menu->addAction(tr("100% zoom level"), this, SLOT(resetZoom()));
context_menu->addAction(tr("Reset Graph Layout"), this, SLOT(resetLayout()));
context_menu->addSeparator();
plots_menu = context_menu->addMenu(tr("Plots"));
connect(plots_menu, SIGNAL(triggered(QAction*)), this, SLOT(onPlotsClicked(QAction*)));
lines_menu = context_menu->addMenu(tr("Dotted Lines"));
connect(lines_menu, SIGNAL(triggered(QAction*)), this, SLOT(onLinesClicked(QAction*)));
}
void gGraphView::togglePin()
{
if (pin_graph) {
pin_graph->setPinned(!pin_graph->isPinned());
timedRedraw(0);
}
}
void gGraphView::closeEvent(QCloseEvent * event)
@ -503,97 +558,99 @@ void gGraphView::DrawTextQue(QPainter &painter)
// Render graphs with QPainter or pixmap caching, depending on preferences
void gGraphView::DrawTextQue(QPainter &painter)
{
// process the text drawing queue
int m_textque_items = m_textque.size();
{
// process the text drawing queue
int m_textque_items = m_textque.size();
int h,w;
int h,w;
for (int i = 0; i < m_textque_items; ++i) {
TextQue &q = m_textque[i];
for (int i = 0; i < m_textque_items; ++i) {
const TextQue &q = m_textque.at(i);
// can do antialiased text via texture cache fine on mac
if (usePixmapCache()) {
// Generate the pixmap cache "key"
QString hstr = QString("%1:%2:%3").
arg(q.text).
arg(q.color.name()).
arg(q.font->pointSize());
// can do antialiased text via texture cache fine on mac
if (usePixmapCache()) {
// Generate the pixmap cache "key"
QString hstr = QString("%1:%2:%3").
arg(q.text).
arg(q.color.name()).
arg(q.font->pointSize());
QPixmap pm;
const int buf = 8;
if (!QPixmapCache::find(hstr, &pm)) {
QPixmap pm;
const int buf = 8;
if (!QPixmapCache::find(hstr, &pm)) {
QFontMetrics fm(*q.font);
// QRect rect=fm.tightBoundingRect(q.text);
w = fm.width(q.text);
h = fm.height()+buf;
QFontMetrics fm(*q.font);
// QRect rect=fm.tightBoundingRect(q.text);
w = fm.width(q.text);
h = fm.height()+buf;
pm=QPixmap(w, h);
pm.fill(Qt::transparent);
pm=QPixmap(w, h);
pm.fill(Qt::transparent);
QPainter imgpainter(&pm);
QPainter imgpainter(&pm);
imgpainter.setPen(q.color);
imgpainter.setPen(q.color);
imgpainter.setFont(*q.font);
imgpainter.setFont(*q.font);
imgpainter.setRenderHint(QPainter::TextAntialiasing, q.antialias);
imgpainter.drawText(0, h-buf, q.text);
imgpainter.end();
imgpainter.setRenderHint(QPainter::TextAntialiasing, q.antialias);
imgpainter.drawText(0, h-buf, q.text);
imgpainter.end();
QPixmapCache::insert(hstr, pm);
strings_drawn_this_frame++;
} else {
//cached
strings_cached_this_frame++;
}
h = pm.height();
w = pm.width();
if (q.angle != 0) {
float xxx = q.x - h - (h / 2);
float yyy = q.y + w / 2; // + buf / 2;
xxx+=4;
yyy+=4;
painter.translate(xxx, yyy);
painter.rotate(-q.angle);
painter.drawPixmap(QRect(0, h / 2, w, h), pm);
painter.rotate(+q.angle);
painter.translate(-xxx, -yyy);
} else {
painter.drawPixmap(QRect(q.x - buf / 2 + 4, q.y - h + buf, w, h), pm);
}
} else {
// Just draw the fonts..
painter.setPen(QColor(q.color));
painter.setFont(*q.font);
if (q.angle == 0) {
painter.drawText(q.x, q.y, q.text);
QPixmapCache::insert(hstr, pm);
strings_drawn_this_frame++;
} else {
//cached
strings_cached_this_frame++;
}
h = pm.height();
w = pm.width();
if (q.angle != 0) {
float xxx = q.x - h - (h / 2);
float yyy = q.y + w / 2; // + buf / 2;
xxx+=4;
yyy+=4;
painter.translate(xxx, yyy);
painter.rotate(-q.angle);
painter.drawPixmap(QRect(0, h / 2, w, h), pm);
painter.rotate(+q.angle);
painter.translate(-xxx, -yyy);
} else {
QRect r1(q.x - buf / 2 + 4, q.y - h + buf, w, h);
painter.drawPixmap(r1, pm);
}
} else {
// Just draw the fonts..
painter.setPen(QColor(q.color));
painter.setFont(*q.font);
w = painter.fontMetrics().width(q.text);
h = painter.fontMetrics().xHeight() + 2;
if (q.angle == 0) {
painter.drawText(q.x, q.y, q.text);
} else {
painter.setFont(*q.font);
w = painter.fontMetrics().width(q.text);
h = painter.fontMetrics().xHeight() + 2;
painter.translate(q.x, q.y);
painter.rotate(-q.angle);
painter.drawText(floor(-w / 2.0)-6, floor(-h / 2.0), q.text);
painter.rotate(+q.angle);
painter.translate(-q.x, -q.y);
}
strings_drawn_this_frame++;
painter.translate(q.x, q.y);
painter.rotate(-q.angle);
painter.drawText(floor(-w / 2.0), floor(-h / 2.0), q.text);
painter.rotate(+q.angle);
painter.translate(-q.x, -q.y);
}
strings_drawn_this_frame++;
//q.text.clear();
//q.text.squeeze();
}
//q.text.clear();
//q.text.squeeze();
m_textque.clear();
}
m_textque.clear();
////////////////////////////////////////////////////////////////////////
// Text Rectangle Queues..
////////////////////////////////////////////////////////////////////////
@ -601,7 +658,7 @@ void gGraphView::DrawTextQue(QPainter &painter)
float ww, hh;
for (int i = 0; i < items; ++i) {
TextQueRect &q = m_textqueRect[i];
const TextQueRect &q = m_textqueRect.at(i);
// can do antialiased text via texture cache fine on mac
if (usePixmapCache()) {
@ -612,17 +669,19 @@ void gGraphView::DrawTextQue(QPainter &painter)
arg(q.font->pointSize());
QPixmap pm;
const int buf = 8;
if (!QPixmapCache::find(hstr, &pm)) {
ww = q.rect.width();
hh = q.rect.height();
pm=QPixmap(ww, hh);
int aaw1 = pm.width();
pm.fill(Qt::transparent);
QPainter imgpainter(&pm);
int aaw2 = pm.width();
imgpainter.setPen(q.color);
imgpainter.setFont(*q.font);
@ -631,9 +690,11 @@ void gGraphView::DrawTextQue(QPainter &painter)
imgpainter.setRenderHint(QPainter::TextAntialiasing, true);
QRectF rect(0,0, ww, hh);
imgpainter.drawText(rect, q.flags, q.text);
int aaw3 = pm.width();
imgpainter.end();
QPixmapCache::insert(hstr, pm);
int aaw4 = pm.width();
strings_drawn_this_frame++;
} else {
//cached
@ -655,7 +716,8 @@ void gGraphView::DrawTextQue(QPainter &painter)
painter.rotate(+q.angle);
painter.translate(-xxx, -yyy);
} else {
painter.drawPixmap(QRect(q.rect.x(), q.rect.y(), ww, hh), pm);
//painter.drawPixmap(QPoint(q.rect.x(), q.rect.y()), pm);
painter.drawPixmap(q.rect,pm, QRect(0,0,ww,hh));
}
} else {
// Just draw the fonts..
@ -667,8 +729,8 @@ void gGraphView::DrawTextQue(QPainter &painter)
} else {
painter.setFont(*q.font);
w = painter.fontMetrics().width(q.text);
h = painter.fontMetrics().xHeight() + 2;
ww = painter.fontMetrics().width(q.text);
hh = painter.fontMetrics().xHeight() + 2;
painter.translate(q.rect.x(), q.rect.y());
painter.rotate(-q.angle);
@ -689,7 +751,7 @@ void gGraphView::DrawTextQue(QPainter &painter)
}
#endif
void gGraphView::AddTextQue(const QString &text, QRectF rect, int flags, float angle, QColor color, QFont *font, bool antialias)
void gGraphView::AddTextQue(const QString &text, QRectF rect, quint32 flags, float angle, QColor color, QFont *font, bool antialias)
{
#ifdef ENABLED_THREADED_DRAWING
text_mutex.lock();
@ -1305,6 +1367,32 @@ void gGraphView::paintGL()
redrawtimer->setSingleShot(true);
redrawtimer->start();
}
if (p_profile->appearance->lineCursorMode()) {
emit updateCurrentTime(m_currenttime);
} else {
emit updateRange(m_minx, m_maxx);
}
}
QString gGraphView::getRangeString()
{
QString fmt;
qint64 diff = m_maxx - m_minx;
if (diff > 86400000) {
} else if (diff > 60000) {
fmt = "HH:mm:ss";
} else {
fmt = "HH:mm:ss:zzz";
}
QDateTime st = QDateTime::fromMSecsSinceEpoch(m_minx);
QDateTime et = QDateTime::fromMSecsSinceEpoch(m_maxx);
QString txt = st.toString(QObject::tr("d MMM [ %1 - %2 ]").arg(fmt).arg(et.toString(fmt))) ;
return txt;
}
void gGraphView::leaveEvent(QEvent * event)
@ -1459,7 +1547,7 @@ void gGraphView::mouseMoveEvent(QMouseEvent *event)
this->setCursor(Qt::ArrowCursor);
} else {
m_tooltip->display("Double click title to pin / unpin\nClick and drag to reorder graphs", x + 10, y, TT_AlignLeft);
timedRedraw(30);
timedRedraw(0);
this->setCursor(Qt::OpenHandCursor);
}
@ -1512,7 +1600,7 @@ void gGraphView::mouseMoveEvent(QMouseEvent *event)
this->setCursor(Qt::ArrowCursor);
} else {
m_tooltip->display("Double click title to pin / unpin\nClick and drag to reorder graphs", x + 10, y, TT_AlignLeft);
timedRedraw(30);
timedRedraw(0);
this->setCursor(Qt::OpenHandCursor);
}
@ -1588,6 +1676,99 @@ void gGraphView::mouseMoveEvent(QMouseEvent *event)
}
Layer * gGraphView::findLayer(gGraph * graph, LayerType type)
{
for (int i=0; i< graph->layers().size(); i++) {
Layer * l = graph->layers()[i];
if (l->layerType() == type) {
return l;
}
}
return nullptr;
}
void gGraphView::populateMenu(gGraph * graph)
{
// First check for any linechart for this graph..
gLineChart * lc = dynamic_cast<gLineChart *>(findLayer(graph,LT_LineChart));
if (lc) {
lines_menu->clear();
for (int i=0; i < lc->m_dotlines.size(); i++) {
DottedLine & dot = lc->m_dotlines[i];
schema::Channel &chan = schema::channel[dot.code];
if (dot.available) {
QAction *action = lines_menu->addAction(chan.calc[dot.type].label());
action->setData(graph->name());
action->setCheckable(true);
action->setChecked(chan.calc[dot.type].enabled);
}
}
lines_menu->menuAction()->setVisible(true);
plots_menu->clear();
for (int i=0; i <lc->m_codes.size(); i++) {
ChannelID code = lc->m_codes[i];
if (lc->m_day && !lc->m_day->channelHasData(code)) continue;
QAction * action = plots_menu->addAction(schema::channel[code].label());
action->setData(QString("%1|%2").arg(graph->name()).arg(code));
action->setCheckable(true);
action->setChecked(lc->m_enabled[code]);
}
if (plots_menu->actions().size() > 0) {
plots_menu->menuAction()->setVisible(true);
}
} else {
lines_menu->clear();
lines_menu->menuAction()->setVisible(false);
plots_menu->clear();
plots_menu->menuAction()->setVisible(false);
}
}
void gGraphView::onPlotsClicked(QAction *action)
{
QString name = action->data().toString().section("|",0,0);
ChannelID code = action->data().toString().section("|",-1).toInt();
QHash<QString, gGraph *>::iterator it = m_graphsbyname.find(name);
if (it == m_graphsbyname.end()) return;
gGraph * graph = it.value();
gLineChart * lc = dynamic_cast<gLineChart *>(findLayer(graph, LT_LineChart));
if (!lc) return;
lc->m_enabled[code] = !lc->m_enabled[code];
graph->min_y = graph->MinY();
graph->max_y = graph->MaxY();
// lc->Miny();
// lc->Maxy();
}
void gGraphView::onLinesClicked(QAction *action)
{
QHash<QString, gGraph *>::iterator it = m_graphsbyname.find(action->data().toString());
if (it == m_graphsbyname.end()) return;
gGraph * graph = it.value();
gLineChart * lc = dynamic_cast<gLineChart *>(findLayer(graph, LT_LineChart));
if (!lc) return;
for (int i=0; i<lc->m_dotlines.size(); i++) {
DottedLine & dot = lc->m_dotlines[i];
schema::Channel &chan = schema::channel[dot.code];
if (chan.calc[dot.type].label() == action->text()) {
chan.calc[dot.type].enabled = !chan.calc[dot.type].enabled;
dot.enabled = !dot.enabled;
}
}
}
void gGraphView::mousePressEvent(QMouseEvent *event)
{
int x = event->x();
@ -1623,7 +1804,7 @@ void gGraphView::mousePressEvent(QMouseEvent *event)
done = true;
} else if ((y >= py) && (y < py + h)) {
//qDebug() << "Clicked" << i;
if (x < titleWidth + 20) {
if ((event->button() == Qt::LeftButton) && (x < titleWidth + 20)) {
// clicked on title to drag graph..
// Note: reorder has to be limited to pinned graphs.
m_graph_dragging = true;
@ -1634,9 +1815,15 @@ void gGraphView::mousePressEvent(QMouseEvent *event)
m_sizer_point.setX(x);
m_sizer_point.setY(py); // point at top of graph..
this->setCursor(Qt::ClosedHandCursor);
done=true;
} else if ((event->button() == Qt::RightButton) && (x < (titleWidth + gYAxis::Margin))) {
this->setCursor(Qt::ArrowCursor);
pin_action->setText(QObject::tr("Unpin %1 Graph").arg(g->title()));
pin_graph = g;
populateMenu(g);
context_menu->popup(event->globalPos());
done=true;
} else if (!g->blockSelect()) {
if (m_metaselect) {
if (m_selected_graph) {
m_selected_graph->m_selecting_area = false;
@ -1691,9 +1878,11 @@ void gGraphView::mousePressEvent(QMouseEvent *event)
m_sizer_point.setX(x);
m_sizer_point.setY(y);
//qDebug() << "Sizer clicked" << i;
done=true;
} else if ((y >= py) && (y < py + h)) {
//qDebug() << "Clicked" << i;
if (x < titleWidth + 20) { // clicked on title to drag graph..
if ((event->button() == Qt::LeftButton) && (x < (titleWidth + 20))) { // clicked on title to drag graph..
m_graph_dragging = true;
m_tooltip->cancel();
redraw();
@ -1701,6 +1890,15 @@ void gGraphView::mousePressEvent(QMouseEvent *event)
m_sizer_point.setX(x);
m_sizer_point.setY(py); // point at top of graph..
this->setCursor(Qt::ClosedHandCursor);
done=true;
} else if ((event->button() == Qt::RightButton) && (x < (titleWidth + gYAxis::Margin))) {
this->setCursor(Qt::ArrowCursor);
pin_action->setText(QObject::tr("Pin %1 Graph").arg(g->title()));
pin_graph = g;
populateMenu(g);
context_menu->popup(event->globalPos());
done=true;
} else if (!g->blockSelect()) {
if (m_metaselect) {
if (m_selected_graph) {
@ -1723,7 +1921,16 @@ void gGraphView::mousePressEvent(QMouseEvent *event)
}
py += h + graphSpacer;
done=true;
}
if (!done) {
// if (event->button() == Qt::RightButton) {
// this->setCursor(Qt::ArrowCursor);
// context_menu->popup(event->globalPos());
// done=true;
// }
}
}
void gGraphView::mouseReleaseEvent(QMouseEvent *event)
@ -1844,6 +2051,7 @@ void gGraphView::mouseReleaseEvent(QMouseEvent *event)
}
}
}
timedRedraw(0);
}
void gGraphView::keyReleaseEvent(QKeyEvent *event)
@ -2127,7 +2335,7 @@ void gGraphView::keyPressEvent(QKeyEvent *event)
int bk = (int)event->key()-Qt::Key_0;
m_metaselect = false;
timedRedraw(30);
timedRedraw(0);
}
if (event->key() == Qt::Key_F3) {

68
sleepyhead/Graphs/gGraphView.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gGraphView Header
/* gGraphView Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -21,6 +18,7 @@
#include <QPixmap>
#include <QRect>
#include <QPixmapCache>
#include <QMenu>
#ifndef BROKEN_OPENGL_BUILD
#include <QGLWidget>
@ -32,6 +30,24 @@
enum FlagType { FT_Bar, FT_Dot, FT_Span };
class MyLabel:public QWidget
{
public:
MyLabel(QWidget * parent);
virtual ~MyLabel();
void setText(QString text);
void setAlignment(Qt::Alignment alignment);
void setFont(QFont & font);
QFont & font() { return m_font; }
virtual void paintEvent(QPaintEvent * event);
QFont m_font;
QString m_text;
Qt::Alignment m_alignment;
};
class gGraphView;
const int textque_max = 512;
@ -75,8 +91,8 @@ struct TextQue {
struct TextQueRect {
TextQueRect() {
}
TextQueRect(QRectF rect, int flags, QString text, float angle, QColor color, QFont * font, bool antialias):
rect(rect), flags(flags), text(text), angle(angle), color(color), font(font), antialias(antialias)
TextQueRect(QRectF r, quint32 flags, QString text, float angle, QColor color, QFont * font, bool antialias):
rect(r), flags(flags), text(text), angle(angle), color(color), font(font), antialias(antialias)
{
}
TextQueRect(const TextQueRect & copy) {
@ -92,7 +108,7 @@ struct TextQueRect {
//! \variable contains the QRect containing the text object
QRectF rect;
//! \variable Qt alignment flags..
int flags;
quint32 flags;
//! \variable the actual text to draw
QString text;
//! \variable the angle in degrees for drawing rotated text
@ -221,6 +237,7 @@ class gGraphView
:public QGLWidget
#endif
{
friend class gGraph;
Q_OBJECT
public:
/*! \fn explicit gGraphView(QWidget *parent = 0,gGraphView * shared=0);
@ -329,7 +346,7 @@ class gGraphView
void updateSelectionTime();
//! \brief Add the Text information to the Text Drawing Queue (called by gGraphs renderText method)
void AddTextQue(const QString &text, QRectF rect, int flags, float angle = 0.0,
void AddTextQue(const QString &text, QRectF rect, quint32 flags, float angle = 0.0,
QColor color = Qt::black, QFont *font = defaultfont, bool antialias = true);
//! \brief Add the Text information to the Text Drawing Queue (called by gGraphs renderText method)
@ -360,9 +377,6 @@ class gGraphView
//! \brief Called on resize, fits graphs when too few to show, by scaling to fit screen size. Calls updateScrollBar()
void updateScale(); // update scale & Scrollbar
//! \brief Resets all contained graphs to have a uniform height.
void resetLayout();
//! \brief Returns a count of all visible, non-empty Graphs.
int visibleGraphs();
@ -415,12 +429,18 @@ class gGraphView
//! \brief The current time the mouse pointer is hovering over
inline double currentTime() { return m_currenttime; }
inline QString currentTimeString() { return m_currentTimeString; }
//! \brief Returns a context formatted text string with the currently selected time range
QString getRangeString();
Layer * findLayer(gGraph * graph, LayerType type);
void populateMenu(gGraph *);
QMenu * lines_menu;
QMenu * plots_menu;
inline void setCurrentTime(double time) {
m_currenttime = time;
QDateTime dt=QDateTime::fromMSecsSinceEpoch(time);
m_currentTimeString = dt.toString("MMM dd - HH:mm:ss:zzz");
}
inline QPoint currentMousePos() const { return m_mouse; }
@ -547,7 +567,6 @@ class gGraphView
QPoint m_mouse;
qint64 m_currenttime;
QString m_currentTimeString;
QTime m_animationStarted;
@ -556,6 +575,14 @@ class gGraphView
QPixmapCache pixmapcache;
QTime horizScrollTime, vertScrollTime;
QMenu * context_menu;
QAction * pin_action;
QPixmap pin_icon;
gGraph *pin_graph;
signals:
void updateCurrentTime(double);
void updateRange(double,double);
public slots:
//! \brief Callback from the ScrollBar, to change scroll position
@ -567,6 +594,17 @@ class gGraphView
//! \brief Call UpdateGL unless animation is in progress
void redraw();
//! \brief Resets all contained graphs to have a uniform height.
void resetLayout();
void resetZoom() {
ResetBounds(true);
}
void togglePin();
protected slots:
void onLinesClicked(QAction *);
void onPlotsClicked(QAction *);
};
#endif // GGRAPHVIEW_H

339
sleepyhead/Graphs/gLineChart.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gLineChart Implementation
/* gLineChart Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -23,6 +20,17 @@
#include "Graphs/gLineOverlay.h"
#define EXTRA_ASSERTS 1
QColor darken(QColor color, float p)
{
int r = qMin(int(color.red() * p), 255);
int g = qMin(int(color.green() * p), 255);
int b = qMin(int(color.blue() * p), 255);
return QColor(r,g,b, color.alpha());
}
gLineChart::gLineChart(ChannelID code, QColor col, bool square_plot, bool disable_accel)
: Layer(code), m_square_plot(square_plot), m_disable_accel(disable_accel)
{
@ -31,6 +39,7 @@ gLineChart::gLineChart(ChannelID code, QColor col, bool square_plot, bool disabl
m_report_empty = false;
lines.reserve(50000);
lasttime = 0;
m_layertype = LT_LineChart;
}
gLineChart::~gLineChart()
{
@ -63,6 +72,7 @@ bool gLineChart::isEmpty()
return true;
}
void gLineChart::SetDay(Day *d)
{
// Layer::SetDay(d);
@ -183,6 +193,30 @@ skipcheck:
flags[code] = lob;
}
}
m_dotlines.clear();
for (int i=0; i< m_codes.size(); i++) {
ChannelID code = m_codes[i];
schema::Channel & chan = schema::channel[code];
addDotLine(DottedLine(code, Calc_Max,chan.calc[Calc_Max].enabled));
if ((code != CPAP_FlowRate) && (code != CPAP_MaskPressure) && (code != CPAP_MaskPressureHi)) {
addDotLine(DottedLine(code, Calc_Perc,chan.calc[Calc_Perc].enabled));
addDotLine(DottedLine(code, Calc_Middle, chan.calc[Calc_Middle].enabled));
}
addDotLine(DottedLine(code, Calc_Min, chan.calc[Calc_Min].enabled));
}
if (m_codes[0] == CPAP_Leak) {
addDotLine(DottedLine(CPAP_Leak, Calc_UpperThresh, schema::channel[CPAP_Leak].calc[Calc_UpperThresh].enabled));
} else if (m_codes[0] == CPAP_FlowRate) {
addDotLine(DottedLine(CPAP_FlowRate, Calc_Zero, schema::channel[CPAP_FlowRate].calc[Calc_Zero].enabled));
}
if (m_day) {
for (int i=0; i < m_dotlines.size(); i++) {
m_dotlines[i].calc(m_day);
}
}
// for (int i=0; i< m_day->size(); ++i) {
// Session * sess = m_day->sessions.at(i);
@ -210,7 +244,7 @@ skipcheck:
// }
// }
QList<ChannelID> middles;
/* QList<ChannelID> middles;
middles.push_back(CPAP_RespRate);
middles.push_back(CPAP_TidalVolume);
@ -218,6 +252,8 @@ skipcheck:
middles.push_back(CPAP_Ti);
middles.push_back(CPAP_Te);
CPAPMode mode = (CPAPMode)m_day->settings_wavg(CPAP_Mode);
float perc = p_profile->general->prefCalcPercentile();
for (int i=0; i<m_codes.size(); ++i) {
@ -227,8 +263,8 @@ skipcheck:
if (mode == MODE_APAP) {
float f = m_day->percentile(code, perc / 100.0);
chan.setUpperThreshold(f);
chan.setUpperThresholdColor(Qt::black);
m_threshold.push_back(QString("%1% %2 %3").arg(perc, 0, 'f', 0).arg(chan.fullname()).arg(f,0,'f',2));
chan.setUpperThresholdColor(darken(schema::channel[CPAP_Pressure].defaultColor()));
m_threshold.push_back(QString("%1% %2 %3").arg(perc, 0, 'f', 0).arg(chan.label()).arg(f,0,'f',2));
} else {
chan.setUpperThreshold(0);
m_threshold.push_back(QString());
@ -237,8 +273,9 @@ skipcheck:
if (mode >= MODE_BILEVEL_AUTO_FIXED_PS) {
float f = m_day->percentile(code,perc / 100.0);
chan.setUpperThreshold(f);
chan.setUpperThresholdColor(Qt::black);
m_threshold.push_back(QString("%1% %2 %3").arg(perc, 0, 'f', 0).arg(chan.fullname()).arg(f,0,'f',2));
QColor color = darken(schema::channel[CPAP_IPAP].defaultColor());
chan.setUpperThresholdColor(color);
m_threshold.push_back(QString("%1% %2").arg(perc, 0, 'f', 0).arg(chan.label()));//.arg(f,0,'f',2));
} else {
chan.setUpperThreshold(0);
m_threshold.push_back(QString());
@ -247,41 +284,89 @@ skipcheck:
if ((mode >= MODE_BILEVEL_AUTO_FIXED_PS) && (mode != MODE_ASV)) {
float f = m_day->percentile(code,perc / 100.0);
chan.setUpperThreshold(f);
chan.setUpperThresholdColor(Qt::black);
m_threshold.push_back(QString("%1% %2 %3").arg(perc, 0, 'f', 0).arg(chan.fullname()).arg(f,0,'f',2));
QColor color = darken(schema::channel[CPAP_EPAP].defaultColor());
chan.setUpperThresholdColor(color);
m_threshold.push_back(QString("%1% %2").arg(perc, 0, 'f', 0).arg(chan.label()));//.arg(f,0,'f',2));
} else {
chan.setUpperThreshold(0);
m_threshold.push_back(QString());
}
} else if (code == CPAP_Leak) {
m_threshold.push_back(QObject::tr("%1 threshold").arg(chan.fullname()));
m_threshold.push_back(QObject::tr("%1 threshold").arg(chan.label()));
} else if (middles.contains(code)) {
float f = m_day->calcMiddle(code);
chan.setUpperThreshold(f);
chan.setUpperThresholdColor(Qt::black);
chan.setUpperThresholdColor(darken(schema::channel[code].defaultColor()));
m_threshold.push_back(m_day->calcMiddleLabel(code));
} else {
chan.setUpperThreshold(0);
m_threshold.push_back(QString());
}
}
}*/
}
EventDataType gLineChart::Miny()
{
int m = Layer::Miny();
int size = m_codes.size();
if (size == 0) return 0;
if (!m_day) return 0;
if (subtract_offset > 0) {
m -= subtract_offset;
bool first = false;
EventDataType min = 0, tmp;
if (m < 0) { m = 0; }
for (int i=0; i< size; ++i) {
ChannelID code = m_codes[i];
if (!m_enabled[code]) continue;
tmp = m_day->Min(code);
if (!first) {
min = tmp;
} else {
min = qMin(tmp, min);
}
}
if (!first) min = 0;
return m;
m_miny = min;
return min;
// int m = Layer::Miny();
// if (subtract_offset > 0) {
// m -= subtract_offset;
// if (m < 0) { m = 0; }
// }
// return m;
}
EventDataType gLineChart::Maxy()
{
return Layer::Maxy() - subtract_offset;
int size = m_codes.size();
if (size == 0) return 0;
if (!m_day) return 0;
bool first = false;
EventDataType max = 0, tmp;
for (int i=0; i< size; ++i) {
ChannelID code = m_codes[i];
if (!m_enabled[code]) continue;
tmp = m_day->Max(code);
if (!first) {
max = tmp;
first = true;
} else {
max = qMax(tmp, max);
}
}
if (!first) max = 0;
m_maxy = max;
return max;
// return Layer::Maxy() - subtract_offset;
}
bool gLineChart::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
@ -308,7 +393,7 @@ QString gLineChart::getMetaString(qint64 time)
ChannelID code = m_codes[i];
if (m_day->channelHasData(code)) {
val = m_day->lookupValue(code, time, m_square_plot);
lasttext += " "+QString("%1: %2 %3").arg(schema::channel[code].label()).arg(val,0,'f',2).arg(schema::channel[code].units());
lasttext += " "+QString("%1: %2").arg(schema::channel[code].label()).arg(val,0,'f',2); //.arg(schema::channel[code].units());
if (code == CPAP_IPAP) {
ipap = val;
@ -322,7 +407,7 @@ QString gLineChart::getMetaString(qint64 time)
}
if (addPS) {
val = ipap - epap;
lasttext += " "+QString("%1: %2 %3").arg(schema::channel[CPAP_PS].label()).arg(val,0,'f',2).arg(schema::channel[CPAP_PS].units());
lasttext += " "+QString("%1: %2").arg(schema::channel[CPAP_PS].label()).arg(val,0,'f',2);//.arg(schema::channel[CPAP_PS].units());
}
lasttime = time;
@ -381,6 +466,12 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
// the middle of minx and maxy does not have to be the center...
double logX = painter.device()->logicalDpiX();
double physX = painter.device()->physicalDpiX();
double ratioX = physX / logX * w.printScaleX();
double logY = painter.device()->logicalDpiY();
double physY = painter.device()->physicalDpiY();
double ratioY = physY / logY * w.printScaleY();
double xx = maxx - minx;
double xmult = double(width) / xx;
@ -407,8 +498,11 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
}
bool linecursormode = p_profile->appearance->lineCursorMode();
////////////////////////////////////////////////////////////////////////
// Display Line Cursor
if (p_profile->appearance->lineCursorMode()) {
////////////////////////////////////////////////////////////////////////
if (linecursormode) {
double time = w.currentTime();
if ((time > minx) && (time < maxx)) {
@ -421,12 +515,13 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
getMetaString(time);
}
QString text = w.graphView()->currentTimeString() + lasttext;
int wid, h;
GetTextExtent(text, wid, h);
w.renderText(text, left + width/2 - wid/2, top-h+5);
if (m_codes[0] != CPAP_FlowRate) {
QString text = lasttext;
int wid, h;
GetTextExtent(text, wid, h);
w.renderText(text, left , top-h+5); //+ width/2 - wid/2
}
}
EventDataType lastpx, lastpy;
@ -468,29 +563,66 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
painter.setRenderHint(QPainter::Antialiasing, p_profile->appearance->antiAliasing());
painter.setFont(*defaultfont);
bool showDottedLines = true;
int dotlinesize = m_dotlines.size();
// Unset Dotted lines visible status, so we only draw necessary labels later
for (int i=0; i < dotlinesize; i++) {
DottedLine & dot = m_dotlines[i];
dot.visible = false;
}
for (int gi = 0; gi < m_codes.size(); gi++) {
ChannelID code = m_codes[gi];
schema::Channel &chan = schema::channel[code];
if (chan.upperThreshold() > 0) {
QColor color = chan.upperThresholdColor();
color.setAlpha(100);
painter.setPen(QPen(QBrush(color),1,Qt::DotLine));
////////////////////////////////////////////////////////////////////////
// Draw the Channel Threshold dotted lines, and flow waveform centreline
////////////////////////////////////////////////////////////////////////
if (showDottedLines) {
for (int i=0; i < dotlinesize; i++) {
DottedLine & dot = m_dotlines[i];
if ((dot.code != code) || (!dot.enabled) || (!dot.available)) {
continue;
}
schema::Channel & chan = schema::channel[code];
EventDataType y=top + height + 1 - ((chan.upperThreshold() - miny) * ymult);
painter.drawLine(left + 1, y, left + 1 + width, y);
painter.drawText(left+4, y-2, m_threshold.at(gi));
}
if (chan.lowerThreshold() > 0) {
QColor color = chan.lowerThresholdColor();
color.setAlpha(100);
painter.setPen(QPen(QBrush(color),1,Qt::DotLine));
dot.visible = true;
QColor color = chan.calc[dot.type].color;
color.setAlpha(200);
painter.setPen(QPen(QBrush(color),1.5,Qt::DotLine));
EventDataType y=top + height + 1 - ((dot.value - miny) * ymult);
painter.drawLine(left + 1, y, left + 1 + width, y);
EventDataType y=top + height + 1 - ((chan.lowerThreshold() - miny) * ymult);
painter.drawLine(left+1, y, left + 1 + width, y);
painter.drawText(left+4, y-2, m_threshold.at(gi));
}
// if (chan.upperThreshold() > 0) {
// QColor color = chan.upperThresholdColor();
// color.setAlpha(200);
// painter.setPen(QPen(QBrush(color),1.5,Qt::DotLine));
// EventDataType y=top + height + 1 - ((chan.upperThreshold() - miny) * ymult);
// painter.drawLine(left + 1, y, left + 1 + width, y);
// }
// if (chan.lowerThreshold() > 0) {
// QColor color = chan.lowerThresholdColor();
// color.setAlpha(200);
// painter.setPen(QPen(QBrush(color),1.5 ,Qt::DotLine));
// EventDataType y=top + height + 1 - ((chan.lowerThreshold() - miny) * ymult);
// painter.drawLine(left+1, y, left + 1 + width, y);
// }
// if (chan.id() == CPAP_FlowRate) {
// QColor color(Qt::red);
// color.setAlpha(200);
// painter.setPen(QPen(QBrush(color),1.5 ,Qt::DotLine));
// EventDataType y=top + height + 1 - ((0 - miny) * ymult);
// painter.drawLine(left+1, y, left + 1 + width, y);
// }
}
if (!m_enabled[code]) continue;
lines.clear();
@ -927,38 +1059,109 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
// Draw Legends on the top line
////////////////////////////////////////////////////////////////////
QFontMetrics fm(*defaultfont);
int bw = fm.width('X');
int bh = fm.height() / 1.8;
if ((codepoints > 0)) {
QString text = schema::channel[code].label();
int wid, hi;
GetTextExtent(text, wid, hi);
legendx -= wid;
QRectF rec(0, rect.top()-3, 0,0);
rec = painter.boundingRect(rec, Qt::AlignBottom | Qt::AlignLeft, text);
rec.moveRight(legendx);
legendx -= rec.width();
painter.setClipping(false);
w.renderText(text, legendx, top - 4);
legendx -= bw /2;
painter.fillRect(legendx - bw, top - w.marginTop()-2, bh, w.marginTop()+1, QBrush(chan.defaultColor()));
painter.setPen(Qt::black);
painter.drawText(rec, Qt::AlignBottom | Qt::AlignRight, text);
painter.setPen(QPen(chan.defaultColor(), 1 * ratioY));
int linewidth = (10 * ratioX);
int yp = rec.top()+(rec.height()/2);
painter.drawLine(rec.left()-linewidth, yp , rec.left()-(2 * ratioX), yp);
painter.setClipping(true);
legendx -= bw*2;
}
}
if (!total_points) { // No Data?
if (m_report_empty) {
QString msg = QObject::tr("No Waveform Available");
int x, y;
GetTextExtent(msg, x, y, bigfont);
//DrawText(w,msg,left+(width/2.0)-(x/2.0),scry-w.GetBottomMargin()-height/2.0+y/2.0,0,Qt::gray,bigfont);
legendx -= linewidth + (2*ratioX);
}
}
painter.setClipping(false);
////////////////////////////////////////////////////////////////////
// Draw Channel Threshold legend markers
////////////////////////////////////////////////////////////////////
for (int i=0; i < dotlinesize; i++) {
DottedLine & dot = m_dotlines[i];
if (!dot.visible) continue;
ChannelID code = dot.code;
schema::Channel &chan = schema::channel[code];
int linewidth = (10 * ratioX);
QRectF rec(0, rect.top()-3, 0,0);
QString text = chan.calc[dot.type].label();
rec = painter.boundingRect(rec, Qt::AlignBottom | Qt::AlignLeft, text);
rec.moveRight(legendx);
legendx -= rec.width();
painter.setPen(Qt::black);
painter.drawText(rec, Qt::AlignBottom | Qt::AlignRight, text);
QColor color = chan.calc[dot.type].color;
color.setAlpha(200);
painter.setPen(QPen(QBrush(color),1 * ratioY,Qt::DotLine));
int yp = rec.top()+(rec.height()/2);
painter.drawLine(rec.left()-linewidth, yp , rec.left()-(2 * ratioX), yp);
legendx -= linewidth + (2*ratioX);
}
// for (int gi = 0; gi < m_codes.size(); gi++) {
// ChannelID code = m_codes[gi];
// schema::Channel &chan = schema::channel[code];
// int linewidth = (10 * ratioX);
// QRectF rec(0, rect.top()-3, 0,0);
// if (chan.upperThreshold() > 0) {
// QString text = m_threshold.at(gi);
// rec = painter.boundingRect(rec, Qt::AlignBottom | Qt::AlignLeft, text);
// rec.moveRight(legendx);
// legendx -= rec.width();
// painter.setPen(Qt::black);
// painter.drawText(rec, Qt::AlignBottom | Qt::AlignRight, text);
// QColor color = chan.upperThresholdColor();
// color.setAlpha(200);
// painter.setPen(QPen(QBrush(color),1 * ratioY,Qt::DotLine));
// int yp = rec.top()+(rec.height()/2);
// painter.drawLine(rec.left()-linewidth, yp , rec.left()-(2 * ratioX), yp);
// legendx -= linewidth + (2*ratioX);
// }
// if (chan.lowerThreshold() > 0) {
// QString text = m_threshold.at(gi);
// rec = painter.boundingRect(rec, Qt::AlignBottom | Qt::AlignLeft, text);
// rec.moveRight(legendx);
// legendx -= rec.width();
// painter.setPen(Qt::black);
// painter.drawText(rec, Qt::AlignBottom | Qt::AlignRight, text);
// QColor color = chan.lowerThresholdColor();
// color.setAlpha(200);
// painter.setPen(QPen(QBrush(color),1,Qt::DotLine));
// int yp = rec.top()+(rec.height()/2);
// painter.drawLine(rec.left()-linewidth, yp , rec.left()-(2 * ratioX), yp);
// legendx -= linewidth + (2*ratioX);
// }
// }
painter.setClipping(true);
if (!total_points) { // No Data?
// if (m_report_empty) {
QString msg = QObject::tr("Plots Disabled");
int x, y;
GetTextExtent(msg, x, y, bigfont);
w.renderText(msg, rect, Qt::AlignCenter, 0, Qt::gray, bigfont);
// DrawText(w,msg,left+(width/2.0)-(x/2.0),rect.top()-w.GetBottomMargin()-height/2.0+y/2.0,0,Qt::gray,bigfont);
// }
}
painter.setClipping(false);
// Calculate combined session times within selected area...
double first, last;
@ -1032,8 +1235,12 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
QObject::tr("AHI %1").arg(f,0,'f',2);// +" " +
// QObject::tr("Events %1").arg(cnt) + " " +
// QObject::tr("Hours %1").arg(hours,0,'f',2);
if (linecursormode) txt+=lasttext;
w.renderText(txt,left,top-4);
}
painter.setRenderHint(QPainter::Antialiasing, false);
}

52
sleepyhead/Graphs/gLineChart.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gLineChart Header
/* gLineChart Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -20,11 +17,55 @@
#include "SleepLib/day.h"
#include "Graphs/gLineOverlay.h"
enum DottedLineCalc {
DLC_Zero, DLC_Min, DLC_Mid, DLC_Perc, DLC_Max, DLC_UpperThresh, DLC_LowerThresh
};
QColor darken(QColor color, float p = 0.5);
struct DottedLine {
public:
DottedLine() {
code = NoChannel;
type = Calc_Zero;
value = 0;
enabled = true;
visible = false;
available = false;
}
DottedLine(const DottedLine & copy) {
code = copy.code;
type = copy.type;
value = copy.value;
available = copy.available;
enabled = copy.enabled;
visible = copy.visible;
}
DottedLine(ChannelID code, ChannelCalcType type, bool enabled = true, bool available = false):
code(code), type(type), enabled(enabled), available(available) {}
EventDataType calc(Day * day) {
Q_ASSERT(day != nullptr);
available = day->channelExists(code);
value = day->calc(code, type);
return value;
}
ChannelID code;
ChannelCalcType type;
EventDataType value;
bool enabled;
bool visible;
bool available;
};
/*! \class gLineChart
\brief Draws a 2D linechart from all Session data in a day. EVL_Waveforms typed EventLists are accelerated.
*/
class gLineChart: public Layer
{
friend class gGraphView;
public:
/*! \brief Creates a new 2D gLineChart Layer
\param code The Channel that gets drawn by this layer
@ -81,6 +122,9 @@ class gLineChart: public Layer
QString getMetaString(qint64 time);
void addDotLine(DottedLine dot) { m_dotlines.append(dot); }
QList<DottedLine> m_dotlines;
protected:
//! \brief Mouse moved over this layers area (shows the hover-over tooltips here)
virtual bool mouseMoveEvent(QMouseEvent *event, gGraph *graph);

5
sleepyhead/Graphs/gLineOverlay.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gLineOverlayBar Implementation
/* gLineOverlayBar Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/Graphs/gLineOverlay.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gLineOverlayBar Header
/* gLineOverlayBar Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/Graphs/gSegmentChart.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gSegmentChart Implementation
/* gSegmentChart Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/Graphs/gSegmentChart.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gSegmentChart Header
/* gSegmentChart Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/Graphs/gSessionTimesChart.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gSessionTimesChart Implementation
/* gSessionTimesChart Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/Graphs/gSessionTimesChart.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gSessionTimesChart Header
/* gSessionTimesChart Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/Graphs/gStatsLine.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gStatsLine Implementation
/* gStatsLine Implementation
*
* Copyright (c) 2011 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/Graphs/gStatsLine.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gStatsLine
/* gStatsLine
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

7
sleepyhead/Graphs/gSummaryChart.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gSummaryChart Implementation
/* gSummaryChart Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -28,7 +25,7 @@ SummaryChart::SummaryChart(QString label, GraphType type)
d1.setTimeSpec(Qt::UTC);
tz_offset = d2.secsTo(d1);
tz_hours = tz_offset / 3600.0;
m_layertype = LT_SummaryChart;
}
SummaryChart::~SummaryChart()
{

5
sleepyhead/Graphs/gSummaryChart.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gBarChart Header
/* gSummaryChart Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/Graphs/gXAxis.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gXAxis Implementation
/* gXAxis Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/Graphs/gXAxis.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gXAxis Header
/* gXAxis Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

7
sleepyhead/Graphs/gYAxis.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gYAxis Implementation
/* gYAxis Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -397,6 +394,8 @@ bool gYAxis::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
return false;
}
graph->timedRedraw(0);
int x = event->x();
int y = event->y();

5
sleepyhead/Graphs/gYAxis.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gYAxis Header
/* gYAxis Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

174
sleepyhead/Graphs/gdailysummary.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gDailySummary Graph Implementation
/* gDailySummary Graph Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -95,36 +92,71 @@ void gDailySummary::SetDay(Day *day)
if (y > flag_height) flag_height = y;
}
info_labels.clear();
info_values.clear();
info.clear();
info_background.clear();
settings.clear();
ahi = day->calcAHI();
QDateTime dt = QDateTime::fromMSecsSinceEpoch(day->first());
info_labels.append(QObject::tr("Date"));
info_values.append(dt.date().toString(Qt::LocaleDate));
info_labels.append(QObject::tr("Sleep"));
info_values.append(dt.time().toString());
QDateTime wake = QDateTime::fromMSecsSinceEpoch(day->last());
info_labels.append(QObject::tr("Wake"));
info_values.append(wake.time().toString());
CPAPMode mode = (CPAPMode)round(day->settings_wavg(CPAP_Mode));
info.append(QObject::tr("%1: %2").arg(STR_TR_AHI).arg(day->calcAHI(),0,'f',2));
info_background.append(QColor("orange"));
settings.append(day->machine->brand()+ " " + day->machine->series());
settings.append(day->machine->model()+ " " + day->machine->modelnumber());
settings.append(schema::channel[CPAP_Mode].option(mode));
if (mode == MODE_CPAP) {
EventDataType p = round(day->settings_max(CPAP_Pressure));
settings.append(QString("Fixed %1%2").arg(p,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
} else if (mode == MODE_APAP) {
EventDataType min = round(day->settings_min(CPAP_PressureMin));
EventDataType max = round(day->settings_max(CPAP_PressureMax));
settings.append(QString("Min Pressure %1%2").arg(min,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
settings.append(QString("Max Pressure %1%2").arg(max,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
} else if (mode == MODE_BILEVEL_AUTO_FIXED_PS) {
EventDataType min = round(day->settings_min(CPAP_EPAPLo));
EventDataType max = round(day->settings_max(CPAP_IPAPHi));
EventDataType ps = round(day->settings_max(CPAP_PS));
settings.append(QString("Min EPAP %1%2").arg(min,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
settings.append(QString("Max IPAP %1%2").arg(max,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
settings.append(QString("PS %1%2").arg(ps,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
} else if (mode == MODE_BILEVEL_FIXED) {
EventDataType min = round(day->settings_min(CPAP_EPAP));
EventDataType max = round(day->settings_max(CPAP_IPAP));
settings.append(QString("EPAP %1%2").arg(min,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
settings.append(QString("IPAP %1%2").arg(max,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
} else if (mode == MODE_BILEVEL_AUTO_VARIABLE_PS) {
EventDataType min = round(day->settings_min(CPAP_EPAPLo));
EventDataType max = round(day->settings_max(CPAP_IPAPHi));
EventDataType ps = round(day->settings_max(CPAP_PSMin));
EventDataType pshi = round(day->settings_max(CPAP_PSMax));
settings.append(QString("Min EPAP %1%2").arg(min,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
settings.append(QString("Max IPAP %1%2").arg(max,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
settings.append(QString("PS %1-%2%3").arg(ps,0,'f',2).arg(pshi,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
} else if (mode == MODE_ASV) {
EventDataType min = round(day->settings_min(CPAP_EPAP));
EventDataType ps = round(day->settings_max(CPAP_PSMin));
EventDataType pshi = round(day->settings_max(CPAP_PSMax));
settings.append(QString("EPAP %1%2").arg(min,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
settings.append(QString("PS %1-%2%3").arg(ps,0,'f',2).arg(pshi,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
}
settings.append(QObject::tr("Relief: %1").arg(day->getPressureRelief()));
int secs = hours * 3600.0;
int h = secs / 3600;
int m = secs / 60 % 60;
int s = secs % 60;
info_labels.append(QObject::tr("Hours"));
info_values.append(QString().sprintf("%ih, %im, %is",h,m,s));
info.append(QObject::tr("Hours: %1h, %2m, %3s").arg(h).arg(m).arg(s));
info_background.append(QColor("light blue"));
info_value_width = info_label_width = info_height = 0;
info_width = info_height = 0;
for (int i=0; i < info_labels.size(); ++i) {
GetTextExtent(info_labels.at(i), x, y, mediumfont);
for (int i=0; i < info.size(); ++i) {
GetTextExtent(info.at(i), x, y, mediumfont);
if (y > info_height) info_height = y;
if (x > info_label_width) info_label_width = x;
GetTextExtent(info_values.at(i), x, y, mediumfont);
if (y > info_height) info_height = y;
if (x > info_value_width) info_value_width = x;
if (x > info_width) info_width = x;
}
m_minimum_height = flag_values.size() * flag_height;
@ -186,19 +218,90 @@ void gDailySummary::paint(QPainter &painter, gGraph &w, const QRegion &region)
float row = top + 10;
float column = left+10;
rect1 = QRectF(column - 10, row -5, 0, 0);
painter.setFont(*mediumfont);
QString txt = QString::number(ahi, 'f', 2);
QString ahi = QString("%1: %2").arg(STR_TR_AHI).arg(txt);
rect1 = painter.boundingRect(rect1, Qt::AlignTop || Qt::AlignLeft, ahi);
rect1.setWidth(rect1.width()*2);
rect1.setHeight(rect1.height() * 1.5);
painter.fillRect(rect1, QColor("orange"));
painter.setPen(Qt::black);
painter.drawText(rect1, Qt::AlignCenter, ahi);
painter.drawRoundedRect(rect1, 5, 5);
column += rect1.width() + 10;
size = info.size();
float xpos = left + 10;;
float ypos = top + 10;
double maxwidth = 0 ;
for (int i=0; i< info.size(); ++i) {
rect1 = QRectF(xpos, ypos, 0, 0);
QString txt = info.at(i);
rect1 = painter.boundingRect(rect1, Qt::AlignTop || Qt::AlignLeft, txt);
rect1.setHeight(rect1.height() * 1.25);
maxwidth = qMax(rect1.width(), maxwidth);
ypos += rect1.height() + 5;
}
painter.setFont(*defaultfont);
float tpos = ypos+5;
for (int i=0; i< settings.size(); ++i) {
rect1 = QRectF(xpos, tpos, 0, 0);
QString txt = settings.at(i);
rect1 = painter.boundingRect(rect1, Qt::AlignTop || Qt::AlignLeft, txt);
rect1.setHeight(rect1.height() * 1.25);
maxwidth = qMax(rect1.width(), maxwidth);
tpos += rect1.height();
}
maxwidth *= 1.1;
QRectF rect3 = QRectF(xpos, tpos, 0, 0);
QString machinfo = QObject::tr("Machine Information");
rect3 = painter.boundingRect(rect1, Qt::AlignTop || Qt::AlignLeft, machinfo);
maxwidth = qMax(rect1.width(), maxwidth);
painter.drawRect(QRect(xpos, ypos + rect3.height()+4, maxwidth, tpos-ypos));
ypos = top + 10;
painter.setFont(*mediumfont);
for (int i=0; i< info.size(); ++i) {
rect1 = QRectF(xpos, ypos, 0, 0);
QString txt = info.at(i);
rect1 = painter.boundingRect(rect1, Qt::AlignTop || Qt::AlignLeft, txt);
rect1.setWidth(maxwidth);
rect1.setHeight(rect1.height() * 1.25);
painter.fillRect(rect1, QColor(info_background.at(i)));
painter.setPen(Qt::black);
painter.drawText(rect1, Qt::AlignCenter, txt);
painter.drawRoundedRect(rect1, 5, 5);
ypos += rect1.height() + 5;
}
rect3.moveTop(ypos+1);
rect3.setWidth(maxwidth);
QFont ffont = *defaultfont;
ffont.setBold(true);
painter.setFont(ffont);
painter.drawText(rect3, Qt::AlignCenter, machinfo);
painter.setFont(*defaultfont);
ypos += 6 + rect3.height();
for (int i=0; i< settings.size(); ++i) {
rect1 = QRectF(xpos, ypos, 0, 0);
QString txt = settings.at(i);
rect1 = painter.boundingRect(rect1, Qt::AlignTop || Qt::AlignLeft, txt);
rect1.setWidth(maxwidth);
rect1.setHeight(rect1.height() * 1.25);
// painter.fillRect(rect1, QColor("orange"));
painter.setPen(Qt::black);
painter.drawText(rect1, Qt::AlignCenter, txt);
// painter.drawRoundedRect(rect1, 5, 5);
ypos += rect1.height();
}
column += rect1.width() + 15;
size = flag_values.size();
int vis = 0;
@ -331,6 +434,7 @@ bool gDailySummary::mouseReleaseEvent(QMouseEvent *event, gGraph *graph)
bool gDailySummary::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
{
graph->timedRedraw(0);
Q_UNUSED(event)
Q_UNUSED(graph)
return true;

14
sleepyhead/Graphs/gdailysummary.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gDailySummary Graph Header
/* gDailySummary Graph Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -46,8 +43,10 @@ protected:
QList<QString> pie_labels;
EventDataType pie_total;
QList<QString> info_labels;
QList<QString> info_values;
QList<QString> settings;
QList<QString> info;
QList<QColor> info_background;
QList<QColor> info_foreground;
float flag_height;
float flag_label_width;
@ -56,8 +55,7 @@ protected:
double ahi;
int info_height;
int info_label_width;
int info_value_width;
int info_width;
int m_minimum_height;
bool m_empty;

5
sleepyhead/Graphs/glcommon.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* glcommon GL code & font stuff
/* glcommon GL code & font stuff
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/Graphs/glcommon.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* glcommon GL code & font stuff Header
/* glcommon GL code & font stuff Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/Graphs/gspacer.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* graph spacer Implementation
/* graph spacer Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/Graphs/gspacer.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* graph spacer Header
/* graph spacer Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

3
sleepyhead/Graphs/layer.cpp
View File

@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
/* Graph Layer Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

15
sleepyhead/Graphs/layer.h
View File

@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
/* Graph Layer Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -27,6 +26,8 @@ enum LayerPosition { LayerLeft, LayerRight, LayerTop, LayerBottom, LayerCenter,
enum ToolTipAlignment { TT_AlignCenter, TT_AlignLeft, TT_AlignRight };
enum LayerType { LT_Other = 0, LT_LineChart, LT_SummaryChart };
/*! \class Layer
\brief The base component for all individual Graph layers
*/
@ -49,10 +50,11 @@ class Layer
m_X(0), m_Y(0),
m_order(0),
m_position(LayerCenter),
m_recalculating(false)
m_recalculating(false),
m_layertype(LT_Other)
{ }
virtual void recalculate(gGraph * graph) { Q_UNUSED(graph)};
virtual void recalculate(gGraph * graph) { Q_UNUSED(graph)}
virtual ~Layer();
//! \brief This gets called on day selection, allowing this layer to precalculate any drawing data
@ -61,7 +63,9 @@ class Layer
//! \brief Set the ChannelID used in this layer
virtual void SetCode(ChannelID c) { m_code = c; }
//! \brief Return the ChannelID used in this layer
const ChannelID &code() { return m_code; }
const ChannelID & code() { return m_code; }
const LayerType & layerType() { return m_layertype; }
//! \brief returns true if this layer contains no data.
virtual bool isEmpty();
@ -174,6 +178,7 @@ class Layer
QRect m_rect;
bool m_mouseover;
volatile bool m_recalculating;
LayerType m_layertype;
public:
// //! \brief A vector containing all this layers custom drawing buffers

2
sleepyhead/Resources.qrc
View File

@ -49,5 +49,7 @@
<file>icons/cms50f.png</file>
<file>icons/rms9.png</file>
<file>icons/intellipap.png</file>
<file>icons/pushpin.png</file>
<file>icons/eye.png</file>
</qresource>
</RCC>

5
sleepyhead/SleepLib/calcs.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* Custom CPAP/Oximetry Calculations Header
/* Custom CPAP/Oximetry Calculations Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/calcs.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* Custom CPAP/Oximetry Calculations Header
/* Custom CPAP/Oximetry Calculations Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/common.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Common Functions
/* SleepLib Common Functions
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/common.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* Common code
/* Common code and junk
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

49
sleepyhead/SleepLib/day.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Day Class Implementation
/* SleepLib Day Class Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -80,24 +77,22 @@ QString Day::calcMiddleLabel(ChannelID code)
{
int c = p_profile->general->prefCalcMiddle();
if (c == 0) {
return QObject::tr("%1 %2").arg(STR_TR_Median).arg(schema::channel[code].fullname());
return QObject::tr("%1 %2").arg(STR_TR_Median).arg(schema::channel[code].label());
} else if (c == 1) {
return QObject::tr("%1 %2").arg(STR_TR_Average).arg(schema::channel[code].fullname());
return QObject::tr("%1 %2").arg(STR_TR_Average).arg(schema::channel[code].label());
} else {
return QObject::tr("%1 %2").arg(STR_TR_Average).arg(schema::channel[code].fullname());
return QObject::tr("%1 %2").arg(STR_TR_Average).arg(schema::channel[code].label());
}
}
QString Day::calcMaxLabel(ChannelID code)
{
return QObject::tr("%1 %2").arg(p_profile->general->prefCalcMax() ? QObject::tr("Peak") : QObject::tr("Maximum")).arg(schema::channel[code].fullname());
return QObject::tr("%1 %2").arg(p_profile->general->prefCalcMax() ? QObject::tr("Peak") : STR_TR_Max).arg(schema::channel[code].label());
}
QString Day::calcPercentileLabel(ChannelID code)
{
return QObject::tr("%1% %2").arg(p_profile->general->prefCalcPercentile(),0, 'f').arg(schema::channel[code].fullname());
return QObject::tr("%1% %2").arg(p_profile->general->prefCalcPercentile(),0, 'f',0).arg(schema::channel[code].label());
}
EventDataType Day::countInsideSpan(ChannelID span, ChannelID code)
{
QList<Session *>::iterator end = sessions.end();
@ -1098,3 +1093,35 @@ QString Day::getPressureSettings()
return STR_TR_Unknown;
}
EventDataType Day::calc(ChannelID code, ChannelCalcType type)
{
EventDataType value;
switch(type) {
case Calc_Min:
value = Min(code);
break;
case Calc_Middle:
value = calcMiddle(code);
break;
case Calc_Perc:
value = calcPercentile(code);
break;
case Calc_Max:
value = calcMax(code);
break;
case Calc_UpperThresh:
value = schema::channel[code].upperThreshold();
break;
case Calc_LowerThresh:
value = schema::channel[code].lowerThreshold();
break;
case Calc_Zero:
default:
value = 0;
break;
};
return value;
}

13
sleepyhead/SleepLib/day.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Day Class Header
/* SleepLib Day Class Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -235,9 +232,11 @@ class Day
EventDataType calcMiddle(ChannelID code);
EventDataType calcMax(ChannelID code);
EventDataType calcPercentile(ChannelID code);
QString calcMiddleLabel(ChannelID code);
QString calcMaxLabel(ChannelID code);
QString calcPercentileLabel(ChannelID code);
static QString calcMiddleLabel(ChannelID code);
static QString calcMaxLabel(ChannelID code);
static QString calcPercentileLabel(ChannelID code);
EventDataType calc(ChannelID code, ChannelCalcType type);
QList<Session *> sessions;

5
sleepyhead/SleepLib/event.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Event Class Implementation
/* SleepLib Event Class Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/event.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Event Class Header
/* SleepLib Event Class Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

302
sleepyhead/SleepLib/journal.cpp Normal file
View File

@ -0,0 +1,302 @@
/* SleepLib Journal Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of the Linux
* distribution for more details. */
#include "journal.h"
#include "machine_common.h"
#include <QDomDocument>
#include <QDomElement>
#include <QFile>
#include <QTextStream>
#include <QDir>
#include <QMessageBox>
const int journal_data_version = 1;
JournalEntry::JournalEntry(QDate date)
{
Machine * jmach = p_profile->GetMachine(MT_JOURNAL);
if (!jmach) {
MachineInfo info(MT_JOURNAL,0, "Journal", QObject::tr("Journal Data"), QString(), QString(), QString(), QObject::tr("SleepyHead"), QDateTime::currentDateTime(), journal_data_version);
// Using machine ID 1 rather than a random number, so in future, if profile.xml gets screwed up they'll get their data back..
// TODO: Perhaps search for unlinked journal folders here to save some anger and frustration? :P
MachineID machid = 1;
QString path = p_profile->Get("{" + STR_GEN_DataFolder + "}");
QDir dir(path);
QStringList filters;
filters << "Journal_*";
QStringList dirs = dir.entryList(filters,QDir::Dirs);
int journals = dirs.size();
if (journals > 0) {
QString tmp = dirs[0].section("_", -1);
bool ok;
machid = tmp.toUInt(&ok, 16);
if (!ok) {
QMessageBox::warning(nullptr, STR_MessageBox_Warning,
QObject::tr("SleepyHead found an old Journal folder, but it looks like it's been renamed:")+"\n\n"+
QString("%1").arg(dirs[0])+
QObject::tr("SleepyHead will not touch this folder, and will create a new one instead.")+"\n\n"+
QObject::tr("Please be careful when playing in SleepyHead's profile folders :-P"), QMessageBox::Ok);
// User renamed the folder.. report this
machid = 1;
}
if (journals > 1) {
QMessageBox::warning(nullptr, STR_MessageBox_Warning,
QObject::tr("For some reason, sleepyHead couldn't find a journal object record in your profile, but did find multiple Journal data folders.")+"\n\n"+
QObject::tr("SleepyHead picked only the first one of these, and will use it in future:")+"\n\n"+
QString("%1").arg(dirs[0])+
QObject::tr("If your old data is missing, copy the contents of all the other Journal_XXXXXXX folders to this one manually."), QMessageBox::Ok);
// more then one.. report this.
}
}
jmach = MachineLoader::CreateMachine(info, machid);
}
m_date = date;
session = nullptr;
day = p_profile->GetDay(date, MT_JOURNAL);
if (!day) {
session = day->sessions[0];
} else {
// Doesn't exist.. create a new one..
session = new Session(jmach,0);
qint64 st,et;
QDateTime dt(date,QTime(22,0)); // 10pm localtime
st=qint64(dt.toTime_t())*1000L;
et=st+3600000L;
session->set_first(st);
session->set_last(et);
// Let it live in memory...but not on disk unless data is changed...
jmach->AddSession(session);
}
}
JournalEntry::~JournalEntry()
{
if (session && session->IsChanged()) {
Save();
}
}
bool JournalEntry::Save()
{
if (session && session->IsChanged()) {
qDebug() << "Saving journal session for" << m_date;
// just need to write bookmarks, the rest are already stored in the session
QVariantList start;
QVariantList end;
QStringList notes;
int size = bookmarks.size();
for (int i=0; i<size; ++i) {
const Bookmark & bm = bookmarks.at(i);
start.append(bm.start);
end.append(bm.end);
notes.append(bm.notes);
}
session->settings[Bookmark_Start] = start;
session->settings[Bookmark_End] = end;
session->settings[Bookmark_Notes] = notes;
QString path = session->machine()->getDataPath();
QString filename = path + "/" + QString().sprintf("%08lx", session->session()) + ".000";
session->settings[LastUpdated] = QDateTime::currentDateTime().toTime_t();
session->StoreSummary(filename);
return true;
}
return false;
}
QString JournalEntry::notes()
{
QHash<ChannelID, QVariant>::iterator it;
if (session && ((it=session->settings.find(Journal_Notes)) != session->settings.end())) {
return it.value().toString();
}
return QString();
}
void JournalEntry::setNotes(QString notes)
{
if (!session) return;
session->settings[Journal_Notes] = notes;
session->SetChanged(true);
}
EventDataType JournalEntry::weight()
{
QHash<ChannelID, QVariant>::iterator it;
if (session && ((it = session->settings.find(Journal_Weight)) != session->settings.end())) {
return it.value().toFloat();
}
return 0;
}
void JournalEntry::setWeight(EventDataType weight)
{
if (!session) return;
session->settings[Journal_Weight] = weight;
session->SetChanged(true);
}
int JournalEntry::zombie()
{
QHash<ChannelID, QVariant>::iterator it;
if (session && ((it = session->settings.find(Journal_ZombieMeter)) != session->settings.end())) {
return it.value().toFloat();
}
return 0;
}
void JournalEntry::setZombie(int zombie)
{
if (!session) return;
session->settings[Journal_ZombieMeter] = zombie;
session->SetChanged(true);
}
QList<Bookmark> & JournalEntry::getBookmarks()
{
bookmarks.clear();
if (!session || !session->settings.contains(Bookmark_Start)) {
return bookmarks;
}
QVariantList start=session->settings[Bookmark_Start].toList();
QVariantList end=session->settings[Bookmark_End].toList();
QStringList notes=session->settings[Bookmark_Notes].toStringList();
int size = start.size();
for (int i=0; i < size; ++i) {
bookmarks.append(Bookmark(start.at(i).toLongLong(), end.at(i).toLongLong(), notes.at(i)));
}
return bookmarks;
}
void JournalEntry::addBookmark(qint64 start, qint64 end, QString note)
{
bookmarks.append(Bookmark(start,end,note));
session->SetChanged(true);
}
void JournalEntry::delBookmark(qint64 start, qint64 end)
{
bool removed;
do {
removed = false;
int size = bookmarks.size();
for (int i=0; i<size; ++i) {
const Bookmark & bm = bookmarks.at(i);
if ((bm.start == start) && (bm.end == end)) {
bookmarks.removeAt(i);
session->SetChanged(true); // make sure it gets saved later..
removed=true;
break;
}
}
} while (removed); // clean up any stupid duplicates just in case.. :P
// if I wanted to be nice above, I could add the note string to the search as well..
// (some users might be suprised to see the lot go with the same start and end index)
}
void BackupJournal(QString filename)
{
QDomDocument doc("SleepyHead Journal");
QDomElement droot = doc.createElement(STR_AppName);
doc.appendChild(droot);
QDomElement root = doc.createElement("Journal");
root.setAttribute("username", p_profile->user->userName());
droot.appendChild(root);
QDate first = p_profile->FirstDay(MT_JOURNAL);
QDate last = p_profile->LastDay(MT_JOURNAL);
QDate date = first.addDays(-1);
do {
date = date.addDays(1);
Day * journal = p_profile->GetDay(date, MT_JOURNAL);
if (!journal) continue;
Session * sess = journal->sessions[0];
if (!sess) continue;
QDomElement day = doc.createElement("day");
day.setAttribute("date", date.toString());
//notes.setAttribute("date", date.toString());
if (journal->settingExists(Journal_Notes)) {
QString notedata = sess->settings[Journal_Notes].toString();
QDomElement notes = doc.createElement("note");
notes.appendChild(doc.createCDATASection(notedata));
day.appendChild(notes);
}
if (journal->settingExists(Journal_Weight)) {
EventDataType weight = sess->settings[Journal_Weight].toFloat();
day.setAttribute("weight", weight);
}
if (journal->settingExists(Journal_ZombieMeter)) {
int zombie = sess->settings[Journal_ZombieMeter].toInt();
day.setAttribute("zombie", zombie);
}
if (journal->settingExists(LastUpdated)) {
QDateTime dt = sess->settings[LastUpdated].toDateTime();
day.setAttribute("lastupdated", dt.toTime_t());
}
if (journal->settingExists(Bookmark_Start)) {
QVariantList start=sess->settings[Bookmark_Start].toList();
QVariantList end=sess->settings[Bookmark_End].toList();
QStringList notes=sess->settings[Bookmark_Notes].toStringList();
QDomElement bookmarks = doc.createElement("bookmarks");
int size = start.size();
for (int i=0; i< size; i++) {
QDomElement bookmark = doc.createElement("bookmark");
bookmark.setAttribute("start",start.at(i).toString());
bookmark.setAttribute("end",end.at(i).toString());
bookmark.setAttribute("notes",notes.at(i));
bookmarks.appendChild(bookmark);
}
day.appendChild(bookmarks);
}
root.appendChild(day);
} while (date <= last);
QFile file(filename);
if (!file.open(QIODevice::WriteOnly)) {
return;
}
QTextStream ts(&file);
ts << doc.toString();
file.close();
}
DayController::DayController()
{
journal = nullptr;
cpap = nullptr;
oximeter = nullptr;
}
DayController::~DayController()
{
delete journal;
}
void DayController::setDate(QDate date)
{
if (journal) {
delete journal;
}
journal = new JournalEntry(date);
}

77
sleepyhead/SleepLib/journal.h Normal file
View File

@ -0,0 +1,77 @@
/* SleepLib Journal Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of the Linux
* distribution for more details. */
#ifndef JOURNAL_H
#define JOURNAL_H
#include "SleepLib/profiles.h"
void BackupJournal(QString filename);
class Bookmark {
public:
Bookmark() {
start = end = 0;
}
Bookmark(const Bookmark & copy) {
start = copy.start;
end = copy.end;
notes = copy.notes;
}
Bookmark(qint64 start, qint64 end, QString notes):
start(start), end(end), notes(notes) {}
qint64 start;
qint64 end;
QString notes;
};
class JournalEntry
{
public:
JournalEntry(QDate date);
~JournalEntry();
bool Save();
QString notes();
void setNotes(QString notes);
EventDataType weight();
void setWeight(EventDataType weight);
int zombie();
void setZombie(int zombie);
QList<Bookmark> & getBookmarks();
void addBookmark(qint64 start, qint64 end, QString note);
void delBookmark(qint64 start, qint64 end);
protected:
QDate m_date;
QList<Bookmark> bookmarks;
Day * day;
Session * session;
bool newsession;
};
class DayController
{
DayController();
~DayController();
void setDate(QDate date);
QDate m_date;
JournalEntry * journal;
Day * cpap;
Day * oximeter;
};
#endif // JOURNAL_H

5
sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib CMS50X Loader Implementation
/* SleepLib CMS50X Loader Implementation
*
* Copyright (c) 2011 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/loader_plugins/cms50_loader.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib CMS50X Loader Header
/* SleepLib CMS50X Loader Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Fisher & Paykel Icon Loader Implementation
/* SleepLib Fisher & Paykel Icon Loader Implementation
*
* Copyright (c) 2011 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/loader_plugins/icon_loader.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Fisher & Paykel Icon Loader Implementation
/* SleepLib Fisher & Paykel Icon Loader Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

4
sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp
View File

@ -1,7 +1,5 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
/* SleepLib (DeVilbiss) Intellipap Loader Implementation
*
* SleepLib (DeVilbiss) Intellipap Loader Implementation
* Notes: Intellipap requires the SmartLink attachment to access this data.
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>

5
sleepyhead/SleepLib/loader_plugins/intellipap_loader.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* Intellipap Loader Header
/* Intellipap Loader Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/loader_plugins/md300w1_loader.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib ChoiceMMed MD300W1 Oximeter Loader Implementation
/* SleepLib ChoiceMMed MD300W1 Oximeter Loader Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/loader_plugins/md300w1_loader.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib ChoiceMMed MD300W1 Oximeter Loader Header
/* SleepLib ChoiceMMed MD300W1 Oximeter Loader Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/loader_plugins/mseries_loader.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib RemStar M-Series Loader Implementation
/* SleepLib RemStar M-Series Loader Implementation
*
* Copyright (c) 2011 Mark Watkins <jedimark@users.sourceforge.net>
*

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

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib PRS1 Loader Implementation
/* SleepLib PRS1 Loader Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -1194,12 +1191,6 @@ bool PRS1Import::ParseSummaryF0()
// Tubing lock has no setting byte
// int SysOneResistance = (data[0x0a] & 7);
// bool SysOneResistanceOn = (data[0x0a] & 0x40) ? true : false;
// bool SysOneResistanceLock = (data[0x0a] & 0x80) ? true : false;
// int humidifier = (data[0x09] & 7);
// bool autoOn = (data[0x0b] & 0x40) ? true : false; //?
// Menu Options
session->settings[PRS1_SysLock] = (bool) (data[0x0a] & 0x80); // System One Resistance Lock Setting
session->settings[PRS1_SysOneResistSet] = (int)data[0x0a] & 7; // SYstem One Resistance setting value
@ -1249,9 +1240,7 @@ bool PRS1Import::ParseSummaryF0()
session->settings[PRS1_FlexMode] = (int)flexmode;
session->settings[PRS1_FlexLevel] = (int)flexlevel;
int duration = data[0x14] | data[0x15] << 8;
session->set_last(qint64(summary->timestamp+duration) * 1000L);
summary_duration = data[0x14] | data[0x15] << 8;
return true;
}
@ -1347,11 +1336,7 @@ bool PRS1Import::ParseSummaryF0V4()
session->settings[PRS1_HumidLevel] = (int)(data[0x0b] & 7); // Humidifier Value
// int duration = data[0x14] | data[0x15] << 8;
// session->set_last(qint64(summary->timestamp+duration) * 1000L);
summary_duration = data[0x14] | data[0x15] << 8;
return true;
}
@ -1375,7 +1360,7 @@ bool PRS1Import::ParseSummaryF3()
return true;
}
bool PRS1Import::ParseSummaryF5()
bool PRS1Import::ParseSummaryF5V0()
{
const unsigned char * data = (unsigned char *)summary->m_data.constData();
@ -1387,15 +1372,6 @@ bool PRS1Import::ParseSummaryF5()
CPAPMode cpapmode = MODE_UNKNOWN;
// switch (data[0x01]) { // PRS1 mode // 0 = CPAP, 2 = APAP
// case 0x00:
// cpapmode = MODE_CPAP;
// break;
// case 0x01:
// cpapmode = MODE_ASV;
// break;
// }
int imin_epap = data[0x3];
int imax_epap = data[0x4];
int imin_ps = data[0x5];
@ -1465,15 +1441,96 @@ bool PRS1Import::ParseSummaryF5()
session->settings[PRS1_HeatedTubing] = (bool)(data[0x0d] & 0x10); // Heated Hose??
session->settings[PRS1_HumidLevel] = (int)(data[0x0d] & 7); // Humidifier Value
int duration=data[0x18] | data[0x19] << 8;
session->set_last(qint64(summary->timestamp+duration) * 1000L);
summary_duration = data[0x18] | data[0x19] << 8;
return true;
}
bool PRS1Import::ParseSummaryF5V1()
{
const unsigned char * data = (unsigned char *)summary->m_data.constData();
if (data[0x00] > 0) {
return false;
}
session->set_first(qint64(summary->timestamp) * 1000L);
CPAPMode cpapmode = MODE_UNKNOWN;
int imin_epap = data[0x3];
int imax_epap = data[0x4];
int imin_ps = data[0x5];
int imax_ps = data[0x6];
int imax_pressure = data[0x2];
cpapmode = MODE_ASV_VARIABLE_EPAP;
session->settings[CPAP_Mode] = (int)cpapmode;
if (cpapmode == MODE_CPAP) {
session->settings[CPAP_Pressure] = imin_epap/10.0f;
} else if (cpapmode == MODE_BILEVEL_FIXED) {
session->settings[CPAP_EPAP] = imin_epap/10.0f;
session->settings[CPAP_IPAP] = imax_epap/10.0f;
} else if (cpapmode == MODE_ASV_VARIABLE_EPAP) {
int imax_ipap = imax_epap + imax_ps;
int imin_ipap = imin_epap + imin_ps;
session->settings[CPAP_EPAPLo] = imin_epap / 10.0f;
session->settings[CPAP_EPAPHi] = imax_epap / 10.0f;
session->settings[CPAP_IPAPLo] = imin_ipap / 10.0f;
session->settings[CPAP_IPAPHi] = imax_pressure / 10.0f;
session->settings[CPAP_PSMin] = imin_ps / 10.0f;
session->settings[CPAP_PSMax] = imax_ps / 10.0f;
}
quint8 flex = data[0x0c];
int flexlevel = flex & 0x03;
FlexMode flexmode = FLEX_Unknown;
flex &= 0xf8;
bool split = false;
if (flex & 0x40) { // This bit defines the Flex setting for the CPAP component of the Split night
split = true;
}
if (flex & 0x80) { // CFlex bit
if (flex & 0x10) {
flexmode = FLEX_RiseTime;
} else if (flex & 8) { // Plus bit
if (split || (cpapmode == MODE_CPAP)) {
flexmode = FLEX_CFlexPlus;
} else if (cpapmode == MODE_APAP) {
flexmode = FLEX_AFlex;
}
} else {
// CFlex bits refer to Rise Time on BiLevel machines
flexmode = (cpapmode >= MODE_BILEVEL_FIXED) ? FLEX_BiFlex : FLEX_CFlex;
}
} else flexmode = FLEX_None;
session->settings[PRS1_FlexMode] = (int)flexmode;
session->settings[PRS1_FlexLevel] = (int)flexlevel;
int ramp_time = data[0x0a];
EventDataType ramp_pressure = float(data[0x0b]) / 10.0;
session->settings[CPAP_RampTime] = (int)ramp_time;
session->settings[CPAP_RampPressure] = ramp_pressure;
session->settings[PRS1_HumidStatus] = (bool)(data[0x0d] & 0x80); // Humidifier Connected
session->settings[PRS1_HeatedTubing] = (bool)(data[0x0d] & 0x10); // Heated Hose??
session->settings[PRS1_HumidLevel] = (int)(data[0x0d] & 7); // Humidifier Value
summary_duration = data[0x18] | data[0x19] << 8;
return true;
}
bool PRS1Import::ParseSummary()
@ -1508,9 +1565,15 @@ bool PRS1Import::ParseSummary()
case 3:
return ParseSummaryF3();
case 5:
return ParseSummaryF5();
if (summary->familyVersion == 0) {
return ParseSummaryF5V0();
} else {
return ParseSummaryF5V1();
}
}
// Else machine is unsupported
const unsigned char * data = (unsigned char *)summary->m_data.constData();
//////////////////////////////////////////////////////////////////////////////////////////
@ -1782,7 +1845,8 @@ void PRS1Import::run()
if (session->last() < session->first()) {
// if last isn't set, duration couldn't be gained from summary, parsing events or waveforms..
// This session is dodgy, so kill it
session->really_set_last(session->first());
session->setSummaryOnly(true);
session->really_set_last(session->first()+(qint64(summary_duration) * 1000L));
}
session->SetChanged(true);

10
sleepyhead/SleepLib/loader_plugins/prs1_loader.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib PRS1 Loader Header
/* SleepLib PRS1 Loader Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -122,7 +119,8 @@ public:
bool ParseSummaryF0();
bool ParseSummaryF0V4();
bool ParseSummaryF3();
bool ParseSummaryF5();
bool ParseSummaryF5V0();
bool ParseSummaryF5V1();
//! \brief Parse a single data chunk from a .002 file containing event data for a standard system one machine
@ -136,6 +134,8 @@ protected:
PRS1Loader * loader;
SessionID sessionid;
Machine * mach;
int summary_duration;
};
/*! \class PRS1Loader

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

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib ResMed Loader Implementation
/* SleepLib ResMed Loader Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

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

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib RESMED Loader Header
/* SleepLib RESMED Loader Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/loader_plugins/somnopose_loader.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Somnopose Loader Implementation
/* SleepLib Somnopose Loader Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/loader_plugins/somnopose_loader.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Somnopose Loader Header
/* SleepLib Somnopose Loader Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

6
sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp
View File

@ -1,8 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib (DeVilbiss) Weinmann Loader Implementation
* Notes: Weinmann requires the SmartLink attachment to access this data.
/* SleepLib Weinmann SOMNOsoft/Balance Loader Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/loader_plugins/weinmann_loader.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* Weiman Loader Header
/* SleepLib Weinmann SOMNOsoft/Balance Loader Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/loader_plugins/zeo_loader.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib ZEO Loader Implementation
/* SleepLib ZEO Loader Implementation
*
* Copyright (c) 2011 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/loader_plugins/zeo_loader.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib ZEO Loader Header
/* SleepLib ZEO Loader Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

73
sleepyhead/SleepLib/machine.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Machine Class Implementation
/* SleepLib Machine Class Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -11,12 +8,18 @@
#include <QApplication>
#include <QDir>
#include <QProgressBar>
#include <QDebug>
#include <QString>
#include <QObject>
#include <QThreadPool>
#include <QDialog>
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QLabel>
#include <QProgressBar>
#include "mainwindow.h"
#include <time.h>
#include "machine.h"
@ -390,17 +393,68 @@ const QString Machine::getBackupPath()
return p_profile->Get("{" + STR_GEN_DataFolder + "}/" + info.loadername + "_" + (info.serial.isEmpty() ? hexid() : info.serial) + "/Backup/");
}
class ProgressDialog:public QDialog {
public:
explicit ProgressDialog(QWidget * parent);
virtual ~ProgressDialog();
void setMessage(QString msg) { waitmsg->setText(msg); }
void setPixmap(QPixmap &pixmap) { imglabel->setPixmap(pixmap); }
QProgressBar * progress;
protected:
QLabel * waitmsg;
QHBoxLayout *hlayout;
QLabel * imglabel;
QVBoxLayout * vlayout;
};
ProgressDialog::ProgressDialog(QWidget * parent):
QDialog(parent, Qt::SplashScreen)
{
waitmsg = new QLabel(QObject::tr("PLease Wait..."));
hlayout = new QHBoxLayout;
imglabel = new QLabel(this);
vlayout = new QVBoxLayout;
progress = new QProgressBar(this);
this->setLayout(vlayout);
vlayout->addLayout(hlayout);
hlayout->addWidget(imglabel);
hlayout->addWidget(waitmsg,1,Qt::AlignCenter);
vlayout->addWidget(progress,1);
progress->setMaximum(100);
}
ProgressDialog::~ProgressDialog()
{
}
bool Machine::Load()
{
QString path = getDataPath();
QDir dir(path);
qDebug() << "Loading " << QDir::toNativeSeparators(path);
qDebug() << "Loading Database" << QDir::toNativeSeparators(path);
if (!dir.exists() || !dir.isReadable()) {
return false;
}
ProgressDialog * popup = new ProgressDialog(nullptr);
QPixmap image(getCPAPPixmap(info.loadername));
if (!image.isNull()) {
image = image.scaled(64,64);
popup->setPixmap(image);
}
popup->setMessage(QObject::tr("Loading %1 data...").arg(info.brand));
popup->show();
QProgressBar * progress = popup->progress;
dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
dir.setSorting(QDir::Name);
@ -438,7 +492,7 @@ bool Machine::Load()
for (s = sessfiles.begin(); s != sessfiles.end(); s++) {
if ((++cnt % 50) == 0) { // This is slow.. :-/
if (qprogress) { qprogress->setValue((float(cnt) / float(size) * 100.0)); }
if (progress) { progress->setValue((float(cnt) / float(size) * 100.0)); }
QApplication::processEvents();
}
@ -455,7 +509,10 @@ bool Machine::Load()
}
}
if (qprogress) { qprogress->setValue(100); }
if (progress) { progress->setValue(100); }
QApplication::processEvents();
popup->hide();
delete popup;
return true;
}

5
sleepyhead/SleepLib/machine.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Machine Class Header
/* SleepLib Machine Class Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

9
sleepyhead/SleepLib/machine_common.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Common Machine Stuff
/* SleepLib Common Machine Stuff
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -39,8 +36,8 @@ ChannelID PRS1_00, PRS1_01, PRS1_08, PRS1_0A, PRS1_0B, PRS1_0C, PRS1_0E, PRS1_0F
ChannelID OXI_Pulse, OXI_SPO2, OXI_PulseChange, OXI_SPO2Drop, OXI_Plethy;
ChannelID Journal_Notes, Journal_Weight, Journal_BMI, Journal_ZombieMeter, Bookmark_Start,
Bookmark_End, Bookmark_Notes;
ChannelID Journal_Notes, Journal_Weight, Journal_BMI, Journal_ZombieMeter, LastUpdated,
Bookmark_Start, Bookmark_End, Bookmark_Notes;
ChannelID ZEO_SleepStage, ZEO_ZQ, ZEO_TotalZ, ZEO_TimeToZ, ZEO_TimeInWake, ZEO_TimeInREM,

7
sleepyhead/SleepLib/machine_common.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Common Machine Header
/* SleepLib Common Machine Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -163,7 +160,7 @@ extern ChannelID INTELLIPAP_Unknown1, INTELLIPAP_Unknown2;
extern ChannelID OXI_Pulse, OXI_SPO2, OXI_PulseChange, OXI_SPO2Drop, OXI_Plethy;
extern ChannelID Journal_Notes, Journal_Weight, Journal_BMI, Journal_ZombieMeter, Bookmark_Start,
Bookmark_End, Bookmark_Notes;
Bookmark_End, Bookmark_Notes, LastUpdated;
extern ChannelID ZEO_SleepStage, ZEO_ZQ, ZEO_TotalZ, ZEO_TimeToZ, ZEO_TimeInWake, ZEO_TimeInREM,
ZEO_TimeInLight, ZEO_TimeInDeep, ZEO_Awakenings,

5
sleepyhead/SleepLib/machine_loader.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Machine Loader Class Implementation
/* SleepLib Machine Loader Class Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/machine_loader.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib MachineLoader Base Class Header
/* SleepLib MachineLoader Base Class Header
*
* Copyright (c) 2011 Mark Watkins <jedimark@users.sourceforge.net>
*

7
sleepyhead/SleepLib/preferences.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Preferences Implementation
/* SleepLib Preferences Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -181,7 +178,7 @@ bool Preferences::Open(QString filename)
QDomDocument doc(p_name);
QFile file(p_filename);
qDebug() << "Scanning " << QDir::toNativeSeparators(p_filename);
qDebug() << "Reading " << QDir::toNativeSeparators(p_filename);
if (!file.open(QIODevice::ReadOnly)) {
qWarning() << "Could not open" << QDir::toNativeSeparators(p_filename);

5
sleepyhead/SleepLib/preferences.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Preferences Header
/* SleepLib Preferences Header
*
* Copyright (c) 2011 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/profiles.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Profiles Implementation
/* SleepLib Profiles Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/profiles.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Profiles Header
/* SleepLib Profiles Header
*
* Copyright (c) 2011 Mark Watkins <jedimark@users.sourceforge.net>
*

137
sleepyhead/SleepLib/schema.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* Schema Implementation (Parse Channel XML data)
/* Channel / Schema Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -23,6 +20,27 @@
#include "SleepLib/profiles.h"
QColor adjustcolor(QColor color, float ar=1.0, float ag=1.0, float ab=1.0)
{
int r = color.red();
int g = color.green();
int b = color.blue();
r += rand() & 64;
g += rand() & 64;
b += rand() & 64;
r = qMin(int(r * ar), 255);
g = qMin(int(g * ag), 255);
b = qMin(int(b * ab), 255);
return QColor(r,g,b, color.alpha());
}
QColor darken(QColor color, float p);
namespace schema {
@ -410,7 +428,7 @@ void init()
ch->addOption(0, STR_TR_Unknown);
ch->addOption(1, STR_TR_CPAP);
ch->addOption(2, STR_TR_APAP);
ch->addOption(2, QObject::tr("APAP (Variable)"));
ch->addOption(3, QObject::tr("Fixed Bi-Level"));
ch->addOption(4, QObject::tr("Auto Bi-Level (Fixed PS)"));
ch->addOption(5, QObject::tr("Auto Bi-Level (Variable PS)"));
@ -498,6 +516,7 @@ void init()
Journal_Weight = schema::channel["Weight"].id();
Journal_BMI = schema::channel["BMI"].id();
Journal_ZombieMeter = schema::channel["ZombieMeter"].id();
LastUpdated = schema::channel["LastUpdated"].id();
Bookmark_Start = schema::channel["BookmarkStart"].id();
Bookmark_End = schema::channel["BookmarkEnd"].id();
Bookmark_Notes = schema::channel["BookmarkNotes"].id();
@ -530,7 +549,6 @@ void resetChannels()
}
}
Channel::Channel(ChannelID id, ChanType type, ScopeType scope, QString code, QString fullname,
QString description, QString label, QString unit, DataType datatype, QColor color, int link):
m_id(id),
@ -551,6 +569,16 @@ Channel::Channel(ChannelID id, ChanType type, ScopeType scope, QString code, QSt
m_enabled(true),
m_order(255)
{
if (type == WAVEFORM) {
calc[Calc_Min] = ChannelCalc(id, Calc_Min, adjustcolor(color, 0.25, 1, 1.3), false);
calc[Calc_Middle] = ChannelCalc(id, Calc_Middle, adjustcolor(color, 1.3, 1, 1), false);
calc[Calc_Perc] = ChannelCalc(id, Calc_Perc, adjustcolor(color, 1.1, 1.2, 1), false);
calc[Calc_Max] = ChannelCalc(id, Calc_Max, adjustcolor(color, 0.5, 1.2, 1), false);
calc[Calc_Zero] = ChannelCalc(id, Calc_Zero, Qt::red, false);
calc[Calc_LowerThresh] = ChannelCalc(id, Calc_LowerThresh, Qt::blue, false);
calc[Calc_UpperThresh] = ChannelCalc(id, Calc_UpperThresh, Qt::red, false);
}
}
bool Channel::isNull()
{
@ -792,10 +820,103 @@ void ChannelList::add(QString group, Channel *chan)
bool ChannelList::Save(QString filename)
{
Q_UNUSED(filename)
return false;
if (filename.isEmpty()) {
filename = p_profile->Get("{DataFolder}/") + "channels.xml";
}
QDomDocument doc("channels");
QDomElement droot = doc.createElement(STR_AppName);
doc.appendChild(droot);
QDomElement root = doc.createElement("channels");
droot.appendChild(root);
QHash<QString, QHash<QString, Channel *> >::iterator git;
QHash<QString, QHash<QString, Channel *> >::iterator groups_end = groups.end();
for (git = groups.begin(); git != groups_end; ++git) {
QHash<QString, Channel *> & chanlist = git.value();
QHash<QString, Channel *>::iterator it;
QHash<QString, Channel *>::iterator chend = chanlist.end();
QDomElement grp = doc.createElement("group");
grp.setAttribute("name", git.key());
root.appendChild(grp);
for (it =chanlist.begin(); it!= chend; ++it) {
Channel * chan = it.value();
QDomElement cn = doc.createElement("channel");
cn.setAttribute("id", chan->id());
cn.setAttribute("code", it.key());
cn.setAttribute("label", chan->label());
cn.setAttribute("name", chan->fullname());
cn.setAttribute("description", chan->description());
cn.setAttribute("color", chan->defaultColor().name());
cn.setAttribute("upper", chan->upperThreshold());
cn.setAttribute("lower", chan->lowerThreshold());
cn.setAttribute("order", chan->order());
cn.setAttribute("type", chan->type());
cn.setAttribute("datatype", chan->datatype());
QHash<int, QString>::iterator op;
for (op = chan->m_options.begin(); op!=chan->m_options.end(); ++op) {
QDomElement c2 = doc.createElement("option");
c2.setAttribute("key", op.key());
c2.setAttribute("value", op.value());
cn.appendChild(c2);
}
//cn.appendChild(doc.createTextNode(i.value().toDateTime().toString("yyyy-MM-dd HH:mm:ss")));
grp.appendChild(cn);
}
}
QFile file(filename);
if (!file.open(QIODevice::WriteOnly)) {
return false;
}
QTextStream ts(&file);
ts << doc.toString();
file.close();
return true;
}
}
QString ChannelCalc::label()
{
QString lab = schema::channel[code].label();
QString m_label;
switch(type) {
case Calc_Min:
m_label = QString("%1 %2").arg(STR_TR_Min).arg(lab);
break;
case Calc_Middle:
m_label = Day::calcMiddleLabel(code);
break;
case Calc_Perc:
m_label = Day::calcPercentileLabel(code);
break;
case Calc_Max:
m_label = Day::calcMaxLabel(code);
break;
case Calc_Zero:
m_label = QObject::tr("Zero");
break;
case Calc_UpperThresh:
m_label = QString("%1 %2").arg(lab).arg(QObject::tr("Threshold"));
break;
case Calc_LowerThresh:
m_label = QString("%1 %2").arg(lab).arg(QObject::tr("Threshold"));
break;
}
return m_label;
}
//typedef schema::Channel * ChannelID;

40
sleepyhead/SleepLib/schema.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* Schema Header (Parse Channel XML data)
/* Schema Header (Parse Channel XML data)
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -27,6 +24,35 @@ const quint32 XGrid = 16;
const quint32 YGrid = 32;
}
enum ChannelCalcType {
Calc_Zero, Calc_Min, Calc_Middle, Calc_Perc, Calc_Max, Calc_UpperThresh, Calc_LowerThresh
};
struct ChannelCalc {
public:
ChannelCalc() {
code = 0;
enabled = false;
color = Qt::black;
type = Calc_Zero;
}
ChannelCalc(const ChannelCalc & copy) {
code = copy.code;
color = copy.color;
enabled = copy.enabled;
type = copy.type;
}
ChannelCalc(ChannelID code, ChannelCalcType type, QColor color, bool enabled):
code(code), type(type), color(color), enabled(enabled) {}
QString label();
ChannelID code;
ChannelCalcType type;
QColor color;
bool enabled;
};
namespace schema {
void resetChannels();
@ -112,6 +138,9 @@ class Channel
inline bool enabled() const { return m_enabled; }
void setEnabled(bool value) { m_enabled = value; }
QHash<ChannelCalcType, ChannelCalc> calc;
protected:
int m_id;
ChanType m_type;
@ -132,6 +161,7 @@ class Channel
QColor m_upperThresholdColor;
QColor m_lowerThresholdColor;
bool m_enabled;
short m_order;
};
@ -149,7 +179,7 @@ class ChannelList
bool Load(QString filename);
//! \brief Stores Channel list to XML file specified by filename
bool Save(QString filename);
bool Save(QString filename = QString());
void add(QString group, Channel *chan);

5
sleepyhead/SleepLib/serialoximeter.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Machine Loader Class Implementation
/* SleepLib Machine Loader Class Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/SleepLib/serialoximeter.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib MachineLoader Base Class Header
/* SleepLib MachineLoader Base Class Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

6
sleepyhead/SleepLib/session.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Session Implementation
/* SleepLib Session Implementation
* This stuff contains the base calculation smarts
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
@ -1018,6 +1015,7 @@ EventDataType Session::SearchValue(ChannelID code, qint64 time, bool square)
qint64 t2 = i2 * el->rate();
c = EventDataType(t2 - t1);
if (c == 0) return 0;
d = EventDataType(t2 - tt);
e = d/c;

6
sleepyhead/SleepLib/session.h
View File

@ -1,8 +1,6 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
/* SleepLib Session Header
*
* SleepLib Session Header
* This stuff contains the base calculation smarts
* This stuff contains the session calculation smarts
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/UpdaterWindow.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* UpdaterWindow
/* UpdaterWindow
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/UpdaterWindow.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* UpdaterWindow
/* UpdaterWindow
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/common_gui.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* Common GUI Functions Implementation
/* Common GUI Functions Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/common_gui.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* Common GUI Functions Header
/* Common GUI Functions Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

96
sleepyhead/daily.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* Daily Panel
/* Daily Panel
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -90,9 +87,15 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
layout->setMargin(0);
layout->setContentsMargins(0,0,0,0);
dateDisplay=new QLabel("",this);
dateDisplay=new MyLabel(this);
dateDisplay->setAlignment(Qt::AlignCenter);
dateDisplay->setTextFormat(Qt::RichText);
QFont font = dateDisplay->font();
font.setPointSizeF(font.pointSizeF()*1.3F);
dateDisplay->setFont(font);
QPalette palette = dateDisplay->palette();
palette.setColor(QPalette::Base, Qt::blue);
dateDisplay->setPalette(palette);
//dateDisplay->setTextFormat(Qt::RichText);
ui->sessionBarLayout->addWidget(dateDisplay,1);
// const bool sessbar_under_graphs=false;
@ -152,10 +155,10 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
const QString STR_GRAPH_DailySummary = "DailySummary";
const QString STR_GRAPH_TAP = "TimeAtPressure";
// gGraph * SG;
// graphlist[STR_GRAPH_DailySummary] = SG = new gGraph(STR_GRAPH_DailySummary, GraphView, QObject::tr("Summary"), QObject::tr("Summary of this daily information"), default_height);
// SG->AddLayer(new gFlagsLabelArea(nullptr),LayerLeft,gYAxis::Margin);
// SG->AddLayer(AddCPAP(new gDailySummary()));
gGraph * SG;
graphlist[STR_GRAPH_DailySummary] = SG = new gGraph(STR_GRAPH_DailySummary, GraphView, QObject::tr("Summary"), QObject::tr("Summary of this daily information"), default_height);
SG->AddLayer(new gLabelArea(nullptr),LayerLeft,gYAxis::Margin);
SG->AddLayer(AddCPAP(new gDailySummary()));
graphlist[STR_GRAPH_SleepFlags] = SF = new gGraph(STR_GRAPH_SleepFlags, GraphView, STR_TR_EventFlags, STR_TR_EventFlags, default_height);
SF->setPinned(true);
@ -283,7 +286,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
gLineChart *l;
l=new gLineChart(CPAP_FlowRate,COLOR_Black,false,false);
gLineOverlaySummary *los=new gLineOverlaySummary(tr("Selection AHI"),5,-4);
//gLineOverlaySummary *los=new gLineOverlaySummary(tr("Selection AHI"),5,-4);
AddCPAP(l);
gGraph *FRW = graphlist[schema::channel[CPAP_FlowRate].code()];
@ -477,6 +480,9 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
GraphView->resetLayout();
GraphView->LoadSettings("Daily");
connect(GraphView, SIGNAL(updateCurrentTime(double)), this, SLOT(on_LineCursorUpdate(double)));
connect(GraphView, SIGNAL(updateRange(double,double)), this, SLOT(on_RangeUpdate(double,double)));
}
@ -942,18 +948,12 @@ QString Daily::getSessionInformation(Day * cpap, Day * oxi, Day * stage, Day * p
bool corrupted_waveform=false;
QString tooltip;
html+=QString("<tr>"
"<td><b>"+STR_TR_On+"</b></td>"
"<td align=center><b>"+STR_TR_Date+"</b></td>"
"<td align=center><b>"+STR_TR_Start+"</b></td>"
"<td align=center><b>"+STR_TR_End+"</b></td>"
"<td align=left><b>"+tr("Duration")+"</b></td></tr>");
QList<Day *>::iterator di;
QString type;
for (di=list.begin();di!=list.end();di++) {
Day * day=*di;
html+="<tr><td align=left colspan=5><i>";
html+="<tr><td colspan=5 align=center><i>";
switch (day->machine_type()) {
case MT_CPAP: type="cpap";
html+=tr("CPAP Sessions");
@ -974,6 +974,12 @@ QString Daily::getSessionInformation(Day * cpap, Day * oxi, Day * stage, Day * p
break;
}
html+="</i></td></tr>\n";
html+=QString("<tr>"
"<th>"+STR_TR_On+"</th>"
"<th>"+STR_TR_Date+"</th>"
"<th>"+STR_TR_Start+"</th>"
"<th>"+STR_TR_End+"</th>"
"<th>"+tr("Duration")+"</th></tr>");
for (QList<Session *>::iterator s=day->begin();s!=day->end();++s) {
if ((day->machine_type()==MT_CPAP) &&
@ -986,12 +992,12 @@ QString Daily::getSessionInformation(Day * cpap, Day * oxi, Day * stage, Day * p
int h=len/3600;
int m=(len/60) % 60;
int s1=len % 60;
tooltip=day->machine->loaderName()+QString(":#%1").arg((*s)->session(),8,10,QChar('0'));
//tooltip=day->machine->loaderName()+QString(":#%1").arg((*s)->session(),8,10,QChar('0'));
#define DEBUG_SESSIONS
#ifdef DEBUG_SESSIONS
tooltip += " "+QString::number(len)+"s";
#endif
//#define DEBUG_SESSIONS
//#ifdef DEBUG_SESSIONS
// tooltip += " "+QString::number(len)+"s";
//#endif
// tooltip needs to lookup language.. :-/
Session *sess=*s;
@ -999,16 +1005,19 @@ QString Daily::getSessionInformation(Day * cpap, Day * oxi, Day * stage, Day * p
sess->settings[SESSION_ENABLED]=true;
}
bool b=sess->settings[SESSION_ENABLED].toBool();
html+=QString("<tr class='datarow'>"
html+=QString("<tr class='datarow'><td colspan=5><table>"
"<tr><td colspan=5 align=center>%2</td></tr>"
"<tr>"
"<td width=26><a href='toggle"+type+"session=%1'>"
"<img src='qrc:/icons/session-%4.png' width=24px></a></td>"
"<td align=center>%5</td>"
"<td align=center>%6</td>"
"<td align=center>%7</td>"
"<td align=left><a class=info href='"+type+"=%1'>%3<span>%2</span></a></td>"
"</tr>")
"<td align=left>%3</td></tr>"
"</table></td></tr>"
)
.arg((*s)->session())
.arg(tooltip)
.arg(QObject::tr("%1 Session #%2").arg((*s)->machine()->loaderName()).arg((*s)->session(),8,10,QChar('0')))
.arg(QString("%1h %2m %3s").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')).arg(s1,2,10,QChar('0')))
.arg((b ? "on" : "off"))
.arg(fd.date().toString(Qt::SystemLocaleShortDate))
@ -1836,6 +1845,7 @@ void Daily::Unload(QDate date)
}
}
if (journal->IsChanged()) {
journal->settings[LastUpdated]=QDateTime::currentDateTime();
// blah.. was updating overview graphs here.. Was too slow.
}
Machine *jm=p_profile->GetMachine(MT_JOURNAL);
@ -2017,6 +2027,26 @@ void Daily::RedrawGraphs()
GraphView->redraw();
}
void Daily::on_LineCursorUpdate(double time)
{
QDateTime dt = QDateTime::fromMSecsSinceEpoch(time);
QString txt = dt.toString("MMM dd HH:mm:ss:zzz");
dateDisplay->setText(txt);
}
void Daily::on_RangeUpdate(double minx, double maxx)
{
// static qint64 last_minx = 0;
// static qint64 last_maxx = 0;
//if ((last_minx != minx) || (last_maxx != maxx)) {
dateDisplay->setText(GraphView->getRangeString());
//}
// last_minx=minx;
// last_maxx=maxx;
}
void Daily::on_treeWidget_itemClicked(QTreeWidgetItem *item, int column)
{
Q_UNUSED(column);
@ -2242,6 +2272,7 @@ void Daily::update_Bookmarks()
journal->settings[Bookmark_Start]=start;
journal->settings[Bookmark_End]=end;
journal->settings[Bookmark_Notes]=notes;
journal->settings[LastUpdated]=QDateTime::currentDateTime();
journal->SetChanged(true);
BookmarksChanged=true;
mainwin->updateFavourites();
@ -2478,17 +2509,6 @@ void Daily::updateGraphCombo()
updateCube();
}
void Daily::on_zoomFullyOut_clicked()
{
GraphView->ResetBounds(true);
GraphView->redraw();
}
void Daily::on_resetLayoutButton_clicked()
{
GraphView->resetLayout();
}
void Daily::on_eventsCombo_activated(int index)
{
if (index<0)

20
sleepyhead/daily.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* Daily GUI Headers
/* Daily GUI Headers
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -146,6 +143,12 @@ public:
void hideSpaceHogs();
void showSpaceHogs();
QLabel * getDateDisplay();
public slots:
void on_LineCursorUpdate(double time);
void on_RangeUpdate(double minx, double maxx);
private slots:
void on_ReloadDay();
@ -245,10 +248,6 @@ private slots:
void on_toggleGraphs_clicked(bool checked);
void on_zoomFullyOut_clicked();
void on_resetLayoutButton_clicked();
/*! \fn on_weightSpinBox_editingFinished();
\brief Called when weight has changed.. Updates the BMI dislpay and journal objects.
@ -274,6 +273,8 @@ private slots:
void on_toggleEvents_clicked(bool checked);
protected:
virtual void closeEvent(QCloseEvent *);
virtual void showEvent(QShowEvent *);
@ -312,6 +313,7 @@ private:
void updateCube();
void updateGraphCombo();
QString getSessionInformation(Day *cpap, Day *oxi, Day *stage, Day *posit);
QString getMachineSettings(Day *cpap);
QString getStatisticsInfo(Day *cpap, Day *oxi, Day *pos);
@ -353,7 +355,7 @@ private:
QIcon * icon_off;
SessionBar * sessbar;
QLabel * dateDisplay;
MyLabel * dateDisplay;
MyWebView * webView;
Day * lastcpapday;

83
sleepyhead/daily.ui
View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>942</width>
<width>1211</width>
<height>666</height>
</rect>
</property>
@ -842,7 +842,7 @@ QToolButton:pressed {
<bool>true</bool>
</property>
<property name="currentIndex">
<number>1</number>
<number>2</number>
</property>
<property name="movable">
<bool>true</bool>
@ -1450,67 +1450,6 @@ QSlider::handle:horizontal {
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QToolButton" name="zoomFullyOut">
<property name="toolTip">
<string>Zoom fully out</string>
</property>
<property name="styleSheet">
<string notr="true">QToolButton {
background: transparent;
border-radius: 8px;
border: 2px solid transparent;
}
QToolButton:hover {
border: 2px solid #456789;
}
QToolButton:pressed {
border: 2px solid #456789;
background-color: #89abcd;
}</string>
</property>
<property name="text">
<string>100%</string>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="resetLayoutButton">
<property name="toolTip">
<string>Reset the graph heights to uniform sizes</string>
</property>
<property name="styleSheet">
<string notr="true">QToolButton {
background: transparent;
border-radius: 8px;
border: 2px solid transparent;
}
QToolButton:hover {
border: 2px solid #456789;
}
QToolButton:pressed {
border: 2px solid #456789;
background-color: #89abcd;
}</string>
</property>
<property name="text">
<string>Reset</string>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
<property name="arrowType">
<enum>Qt::NoArrow</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toggleEvents">
<property name="styleSheet">
@ -1530,7 +1469,7 @@ QToolButton:pressed {
}</string>
</property>
<property name="text">
<string>...</string>
<string>Flags</string>
</property>
<property name="checkable">
<bool>true</bool>
@ -1538,6 +1477,9 @@ QToolButton:pressed {
<property name="checked">
<bool>true</bool>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<property name="autoRaise">
<bool>false</bool>
</property>
@ -1547,15 +1489,12 @@ QToolButton:pressed {
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Flags:</string>
<widget class="QComboBox" name="eventsCombo">
<property name="maxVisibleItems">
<number>12</number>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="eventsCombo"/>
</item>
<item>
<layout class="QHBoxLayout" name="sessionBarLayout">
<property name="sizeConstraint">
@ -1582,13 +1521,13 @@ QToolButton:pressed {
}</string>
</property>
<property name="text">
<string/>
<string>Graphs</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonIconOnly</enum>
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<property name="autoRaise">
<bool>false</bool>

1
sleepyhead/docs/channels.xml
View File

@ -68,6 +68,7 @@ Important: One id code per item, DO NOT CHANGE ID NUMBERS!!!
<channel id="0x0807" class="data" name="ZombieMeter" details="How good you feel." label="Alive" unit="0-10" color="orange"/>
<channel id="0x0808" class="data" name="BookmarkStart" details="Session Bookmark Start" label="Bookmark Start" unit="duration" color="orange"/>
<channel id="0x0809" class="data" name="BookmarkEnd" details="Session Bookmark End" label="Bookmark End" unit="duration" color="orange"/>
<channel id="0x080a" class="data" scope="!day" name="LastUpdated" details="Last Updated" label="Last Updated" unit="timestamp" color="orange"/>
<channel id="0xd000" class="data" scope="!day" unique="true" name="Journal" details="Journal Notes" label="Journal" type="richtext"/>
</group>
<group name="PRS1">

5
sleepyhead/exportcsv.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* ExportCSV module implementation
/* ExportCSV module implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

5
sleepyhead/exportcsv.h
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* ExportCSV Module Header
/* ExportCSV Module Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*

BIN
sleepyhead/icons/edit-find.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 67 KiB

BIN
sleepyhead/icons/eye.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
sleepyhead/icons/help.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 80 KiB

BIN
sleepyhead/icons/overview.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 50 KiB

BIN
sleepyhead/icons/pushpin.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
sleepyhead/icons/sdcard-lock.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 78 KiB

BIN
sleepyhead/icons/sdcard.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 69 KiB

8
sleepyhead/logger.cpp
View File

@ -1,3 +1,11 @@
/* SleepyHead Logger module implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of the Linux
* distribution for more details. */
#include "logger.h"
QThreadPool * otherThreadPool = NULL;

6
sleepyhead/main.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* Main
/* SleepyHead Main
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -77,7 +74,6 @@ void setOrders() {
schema::channel[CPAP_UserFlag2].setOrder(257);
}
void release_notes()
{
QDialog relnotes;

46
sleepyhead/mainwindow.cpp
View File

@ -1,7 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* MainWindow Implementation
/* SleepyHead MainWindow Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
@ -318,12 +315,15 @@ MainWindow::MainWindow(QWidget *parent) :
// Translators, these are only temporary messages, don't bother unless you really want to..
warnmsg.push_back(tr("<b>Warning:</b> This pre-release build is meant for beta testers only. Please do <b>NOT</b> share outside the SleepyHead Testing Forum."));
warnmsg.push_back(tr("Please report bugs for this build to the SleepyHead Testing Forum, but first, check the release thread to ensure you are running the latest version."));
warnmsg.push_back(tr("<b>Warning:</b> This is a pre-release build, and may at times show unstable behaviour. It is intended for testing purposes."));
warnmsg.push_back(tr("If you experience CPAP chart/data errors after upgrading to a new version, try rebuilding your CPAP database from the Data menu."));
warnmsg.push_back(tr("Make sure your keep your SleepyHead data folder backed up when trying testing versions."));
warnmsg.push_back(tr("Please ensure you are running the latest version before reporting any bugs."));
warnmsg.push_back(tr("When reporting bugs, please make sure to supply the SleepyHead version number, operating system details and CPAP machine model."));
warnmsg.push_back(tr("<b>Warning:</b> This reports this software generates are not fit for compliance or medical diagnostic purposes."));
warnmsg.push_back(tr("Make sure your willing and able to supply a .zip of your CPAP data or a crash report before you think about filing a bug report."));
warnmsg.push_back(tr("Think twice before filing a bug report that already exists, PLEASE search first, as your likely not the first one to notice it!"));
warnmsg.push_back(tr("This red message line is intentional, and will not be a feature in the final version..."));
warnmsg.push_back(tr(""));
warnmsg.push_back(tr("These messages are only a temporary feature. Some people thought they were an error."));
wtimer.setParent(this);
warnidx = 0;
@ -465,6 +465,7 @@ void loadChannels()
void MainWindow::closeEvent(QCloseEvent * event)
{
saveChannels();
schema::channel.Save();
if (daily) {
daily->close();
@ -618,19 +619,20 @@ void MainWindow::Startup()
PopulatePurgeMenu();
SnapshotGraph = new gGraphView(this, daily->graphView());
// SnapshotGraph = new gGraphView(this, daily->graphView());
// Snapshot graphs mess up with pixmap cache
SnapshotGraph->setUsePixmapCache(false);
// // Snapshot graphs mess up with pixmap cache
// SnapshotGraph->setUsePixmapCache(false);
// SnapshotGraph->setFormat(daily->graphView()->format());
//SnapshotGraph->setMaximumSize(1024,512);
//SnapshotGraph->setMinimumSize(1024,512);
SnapshotGraph->hide();
// // SnapshotGraph->setFormat(daily->graphView()->format());
// //SnapshotGraph->setMaximumSize(1024,512);
// //SnapshotGraph->setMinimumSize(1024,512);
// SnapshotGraph->hide();
overview = new Overview(ui->tabWidget, daily->graphView());
ui->tabWidget->insertTab(3, overview, STR_TR_Overview);
// GenerateStatistics();
ui->statStartDate->setDate(p_profile->FirstDay());
@ -2650,3 +2652,17 @@ void MainWindow::on_actionDaily_Calendar_toggled(bool visible)
{
getDaily()->setCalendarVisible(visible);
}
void MainWindow::on_actionExport_Journal_triggered()
{
QString folder;
#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
folder = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
#else
folder = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
#endif
folder += QDir::separator() + tr("%1's Journal").arg(p_profile->user->userName()) + ".xml";
QString filename = QFileDialog::getSaveFileName(this, tr("Choose where to save journal"), folder, tr("XML Files (*.xml)"));
}

Some files were not shown because too many files have changed in this diff Show More