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

1.1.0

Browse Source
This commit is contained in:
Mark Watkins 2018-04-22 12:06:48 +00:00
parent 297dc5fc46
commit dc5ec0046f
59 changed files with 2363 additions and 1488 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -1,4 +1,6 @@
SleepyHead v1.0 branch SleepyHead v1.1 branch
*Warning*, backup your SleepyHeadData directory before using this branch as there will be no going backwards
SleepyHead is cross platform, opensource sleep tracking program for reviewing CPAP and Oximetry data, SleepyHead is cross platform, opensource sleep tracking program for reviewing CPAP and Oximetry data,
which are devices used in the treatment of Sleep Disorders like Obstructive Sleep Apnea. which are devices used in the treatment of Sleep Disorders like Obstructive Sleep Apnea.

14
sleepyhead/Graphs/MinutesAtPressure.cpp
View File

@ -224,6 +224,8 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
double s2; double s2;
int widest_YAxis = 0; int widest_YAxis = 0;
float lineThickness = AppSetting->lineThickness();
int mouseOverKey = 0; int mouseOverKey = 0;
if (ipap.min_pressure > 0) { if (ipap.min_pressure > 0) {
double xp,yp; double xp,yp;
@ -308,7 +310,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
graph.renderText(label, left, top+5 ); graph.renderText(label, left, top+5 );
xstep /= 5.0; xstep /= 5.0;
painter.setPen(QPen(ichan.defaultColor(), p_profile->appearance->lineThickness())); painter.setPen(QPen(ichan.defaultColor(), lineThickness));
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -330,7 +332,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
if (i == mouseOverKey) { if (i == mouseOverKey) {
painter.setPen(QPen(Qt::black)); painter.setPen(QPen(Qt::black));
painter.drawRect(xp, yp-4, 8, 8); painter.drawRect(xp, yp-4, 8, 8);
painter.setPen(QPen(ichan.defaultColor(), p_profile->appearance->lineThickness())); painter.setPen(QPen(ichan.defaultColor(), lineThickness));
} }
painter.drawLine(xp, lastyp, xp+xstep, yp); painter.drawLine(xp, lastyp, xp+xstep, yp);
@ -413,7 +415,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
QColor col = chan.defaultColor(); QColor col = chan.defaultColor();
col.setAlpha(40); col.setAlpha(40);
painter.setPen(col); painter.setPen(col);
painter.setPen(QPen(col, p_profile->appearance->lineThickness())); painter.setPen(QPen(col, lineThickness));
xp = left; xp = left;
@ -468,7 +470,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
QColor col = chan.defaultColor(); QColor col = chan.defaultColor();
col.setAlpha(50); col.setAlpha(50);
painter.setPen(col); painter.setPen(col);
painter.setPen(QPen(col, p_profile->appearance->lineThickness())); painter.setPen(QPen(col, lineThickness));
xp = left; xp = left;
@ -514,7 +516,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
*/ */
if (epap.min_pressure) { if (epap.min_pressure) {
painter.setPen(QPen(echan.defaultColor(), p_profile->appearance->lineThickness())); painter.setPen(QPen(echan.defaultColor(), lineThickness));
s2 = double(epap.times[qMax(min,0)]/60.0); s2 = double(epap.times[qMax(min,0)]/60.0);
xp=left, lastyp = bottom - (s2 * ystep); xp=left, lastyp = bottom - (s2 * ystep);
@ -527,7 +529,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
if (i == mouseOverKey) { if (i == mouseOverKey) {
painter.setPen(QPen(Qt::black)); painter.setPen(QPen(Qt::black));
painter.drawRect(xp, yp-4, 8, 8); painter.drawRect(xp, yp-4, 8, 8);
painter.setPen(QPen(echan.defaultColor(), p_profile->appearance->lineThickness())); painter.setPen(QPen(echan.defaultColor(), lineThickness));
} }
yp = bottom - qMax((double(p1) * ystep), 0.0); yp = bottom - qMax((double(p1) * ystep), 0.0);

8
sleepyhead/Graphs/gFlagsLine.cpp
View File

@ -217,7 +217,7 @@ bool gFlagsGroup::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
graph->timedRedraw(0); graph->timedRedraw(0);
// } // }
if (!p_profile->appearance->graphTooltips()) { if (!AppSetting->graphTooltips()) {
return false; return false;
} }
@ -306,6 +306,8 @@ void gFlagsLine::paint(QPainter &painter, gGraph &w, const QRegion &region)
QColor color=schema::channel[m_code].defaultColor(); QColor color=schema::channel[m_code].defaultColor();
QBrush brush(color); QBrush brush(color);
int tooltipTimeout = AppSetting->tooltipTimeout();
bool hover = false; bool hover = false;
for (QList<Session *>::iterator s = m_day->begin(); s != m_day->end(); s++) { for (QList<Session *>::iterator s = m_day->begin(); s != m_day->end(); s++) {
if (!(*s)->enabled()) { if (!(*s)->enabled()) {
@ -384,7 +386,7 @@ void gFlagsLine::paint(QPainter &painter, gGraph &w, const QRegion &region)
lab += QObject::tr(" (%3 sec)").arg(m).arg(s); lab += QObject::tr(" (%3 sec)").arg(m).arg(s);
} }
GetTextExtent(lab, x, y); GetTextExtent(lab, x, y);
w.ToolTip(lab, x2 - 10, bartop + (3 * w.printScaleY()), TT_AlignRight, p_profile->general->tooltipTimeout()); w.ToolTip(lab, x2 - 10, bartop + (3 * w.printScaleY()), TT_AlignRight, tooltipTimeout);
} }
} }
@ -412,7 +414,7 @@ void gFlagsLine::paint(QPainter &painter, gGraph &w, const QRegion &region)
QString lab = QString("%1 (%2)").arg(schema::channel[m_code].fullname()).arg(*dptr); QString lab = QString("%1 (%2)").arg(schema::channel[m_code].fullname()).arg(*dptr);
GetTextExtent(lab, x, y); GetTextExtent(lab, x, y);
w.ToolTip(lab, x1 - 10, bartop + (3 * w.printScaleY()), TT_AlignRight, p_profile->general->tooltipTimeout()); w.ToolTip(lab, x1 - 10, bartop + (3 * w.printScaleY()), TT_AlignRight, tooltipTimeout);
} }
vlines.append(QLine(x1, bartop, x1, bottom)); vlines.append(QLine(x1, bartop, x1, bottom));

12
sleepyhead/Graphs/gGraph.cpp
View File

@ -60,7 +60,7 @@ bool InitGraphGlobals()
if (!PREF.contains("Fonts_Title_Name")) { if (!PREF.contains("Fonts_Title_Name")) {
PREF["Fonts_Title_Name"] = "Sans Serif"; PREF["Fonts_Title_Name"] = "Sans Serif";
PREF["Fonts_Title_Size"] = 14; PREF["Fonts_Title_Size"] = 12;
PREF["Fonts_Title_Bold"] = true; PREF["Fonts_Title_Bold"] = true;
PREF["Fonts_Title_Italic"] = false; PREF["Fonts_Title_Italic"] = false;
} }
@ -131,7 +131,7 @@ gGraph::gGraph(QString name, gGraphView *graphview, QString title, QString units
m_visible(true) m_visible(true)
{ {
if (height == 0) { if (height == 0) {
height = p_profile->appearance->graphHeight(); height = AppSetting->graphHeight();
Q_UNUSED(height) Q_UNUSED(height)
} }
@ -514,9 +514,9 @@ QPixmap gGraph::renderPixmap(int w, int h, bool printing)
QPixmap pm(w,h); QPixmap pm(w,h);
bool pixcaching = p_profile->appearance->usePixmapCaching(); bool pixcaching = AppSetting->usePixmapCaching();
graphView()->setUsePixmapCache(false); graphView()->setUsePixmapCache(false);
p_profile->appearance->setUsePixmapCaching(false); AppSetting->setUsePixmapCaching(false);
QPainter painter(&pm); QPainter painter(&pm);
painter.fillRect(0,0,w,h,QBrush(QColor(Qt::white))); painter.fillRect(0,0,w,h,QBrush(QColor(Qt::white)));
QRegion region(0,0,w,h); QRegion region(0,0,w,h);
@ -525,7 +525,7 @@ QPixmap gGraph::renderPixmap(int w, int h, bool printing)
painter.end(); painter.end();
graphView()->setUsePixmapCache(pixcaching); graphView()->setUsePixmapCache(pixcaching);
p_profile->appearance->setUsePixmapCaching(pixcaching); AppSetting->setUsePixmapCaching(pixcaching);
graphView()->setPrintScaleX(1); graphView()->setPrintScaleX(1);
graphView()->setPrintScaleY(1); graphView()->setPrintScaleY(1);
@ -567,7 +567,7 @@ void gGraph::ResetBounds()
void gGraph::ToolTip(QString text, int x, int y, ToolTipAlignment align, int timeout) void gGraph::ToolTip(QString text, int x, int y, ToolTipAlignment align, int timeout)
{ {
if (timeout <= 0) { if (timeout <= 0) {
timeout = p_profile->general->tooltipTimeout(); timeout = AppSetting->tooltipTimeout();
} }
m_graphview->m_tooltip->display(text, x, y, align, timeout); m_graphview->m_tooltip->display(text, x, y, align, timeout);

26
sleepyhead/Graphs/gGraphView.cpp
View File

@ -104,7 +104,7 @@ h+=m_spacer*2; */
void gToolTip::display(QString text, int x, int y, ToolTipAlignment align, int timeout) void gToolTip::display(QString text, int x, int y, ToolTipAlignment align, int timeout)
{ {
if (timeout <= 0) { if (timeout <= 0) {
timeout = p_profile->general->tooltipTimeout(); timeout = AppSetting->tooltipTimeout();
} }
m_alignment = align; m_alignment = align;
@ -355,7 +355,7 @@ gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
m_limbo = false; m_limbo = false;
m_fadedir = false; m_fadedir = false;
m_blockUpdates = false; m_blockUpdates = false;
use_pixmap_cache = p_profile->appearance->usePixmapCaching(); use_pixmap_cache = AppSetting->usePixmapCaching();
pin_graph = nullptr; pin_graph = nullptr;
// pixmapcache.setCacheLimit(10240*2); // pixmapcache.setCacheLimit(10240*2);
@ -633,7 +633,7 @@ void gGraphView::dumpInfo()
bool gGraphView::usePixmapCache() bool gGraphView::usePixmapCache()
{ {
//use_pixmap_cache is an overide setting //use_pixmap_cache is an overide setting
return p_profile->appearance->usePixmapCaching(); return AppSetting->usePixmapCaching();
} }
#define CACHE_DRAWTEXT #define CACHE_DRAWTEXT
@ -644,7 +644,7 @@ void gGraphView::DrawTextQue(QPainter &painter)
int w, h; int w, h;
// not sure if global antialiasing would be better.. // not sure if global antialiasing would be better..
//painter.setRenderHint(QPainter::TextAntialiasing, p_profile->appearance->antiAliasing()); //painter.setRenderHint(QPainter::TextAntialiasing, AppSetting->antiAliasing());
int items = m_textque.size(); int items = m_textque.size();
for (int i = 0; i < items; ++i) { for (int i = 0; i < items; ++i) {
TextQue &q = m_textque[i]; TextQue &q = m_textque[i];
@ -1427,7 +1427,7 @@ void gGraphView::paintGL()
painter.drawText(rec, Qt::AlignHCenter | Qt::AlignBottom, txt); painter.drawText(rec, Qt::AlignHCenter | Qt::AlignBottom, txt);
} }
if (p_profile->appearance->lineCursorMode()) { if (AppSetting->lineCursorMode()) {
emit updateCurrentTime(graphs_drawn ? m_currenttime : 0.0F); emit updateCurrentTime(graphs_drawn ? m_currenttime : 0.0F);
} else { } else {
emit updateRange(graphs_drawn ? m_minx : 0.0F, m_maxx); emit updateRange(graphs_drawn ? m_minx : 0.0F, m_maxx);
@ -1442,7 +1442,7 @@ void gGraphView::paintGL()
static int rp = 0; static int rp = 0;
// Show FPS and draw time // Show FPS and draw time
if (m_showsplitter && p_profile->general->showPerformance()) { if (m_showsplitter && AppSetting->showPerformance()) {
QString ss; QString ss;
qint64 ela = time.nsecsElapsed(); qint64 ela = time.nsecsElapsed();
double ms = double(ela) / 1000000.0; double ms = double(ela) / 1000000.0;
@ -1790,7 +1790,7 @@ void gGraphView::mouseMoveEvent(QMouseEvent *event)
if (i<count) { if (i<count) {
ChannelID code=fg->visibleLayers()[i]->code(); ChannelID code=fg->visibleLayers()[i]->code();
QString ttip=schema::channel[code].description(); QString ttip=schema::channel[code].description();
m_tooltip->display(ttip,x,y-20,p_profile->general->tooltipTimeout()); m_tooltip->display(ttip,x,y-20,AppSetting->tooltipTimeout());
redraw(); redraw();
//qDebug() << code << ttip; //qDebug() << code << ttip;
} }
@ -1801,7 +1801,7 @@ void gGraphView::mouseMoveEvent(QMouseEvent *event)
} }
} else { } else {
if (!m_graphs[i]->units().isEmpty()) { if (!m_graphs[i]->units().isEmpty()) {
m_tooltip->display(m_graphs[i]->units(),x,y-20,p_profile->general->tooltipTimeout()); m_tooltip->display(m_graphs[i]->units(),x,y-20,AppSetting->tooltipTimeout());
redraw(); redraw();
} }
} }
@ -2897,7 +2897,7 @@ void gGraphView::wheelEvent(QWheelEvent *event)
return; return;
if (event->modifiers() == Qt::NoModifier) { if (event->modifiers() == Qt::NoModifier) {
int scrollDampening = p_profile->general->scrollDampening(); int scrollDampening = AppSetting->scrollDampening();
if (event->orientation() == Qt::Vertical) { // Vertical Scrolling if (event->orientation() == Qt::Vertical) { // Vertical Scrolling
if (horizScrollTime.elapsed() < scrollDampening) { if (horizScrollTime.elapsed() < scrollDampening) {
@ -3116,7 +3116,7 @@ void gGraphView::keyPressEvent(QKeyEvent *event)
} }
if (event->key() == Qt::Key_F3) { if (event->key() == Qt::Key_F3) {
p_profile->appearance->setLineCursorMode(!p_profile->appearance->lineCursorMode()); AppSetting->setLineCursorMode(!AppSetting->lineCursorMode());
timedRedraw(0); timedRedraw(0);
} }
if ((event->key() == Qt::Key_F1)) { if ((event->key() == Qt::Key_F1)) {
@ -3130,7 +3130,7 @@ void gGraphView::keyPressEvent(QKeyEvent *event)
if (event->key() == Qt::Key_PageUp) { if (event->key() == Qt::Key_PageUp) {
if (m_scrollbar) { if (m_scrollbar) {
m_offsetY -= p_profile->appearance->graphHeight() * 3 * m_scaleY; m_offsetY -= AppSetting->graphHeight() * 3 * m_scaleY;
m_scrollbar->setValue(m_offsetY); m_scrollbar->setValue(m_offsetY);
m_offsetY = m_scrollbar->value(); m_offsetY = m_scrollbar->value();
redraw(); redraw();
@ -3138,7 +3138,7 @@ void gGraphView::keyPressEvent(QKeyEvent *event)
return; return;
} else if (event->key() == Qt::Key_PageDown) { } else if (event->key() == Qt::Key_PageDown) {
if (m_scrollbar) { if (m_scrollbar) {
m_offsetY += p_profile->appearance->graphHeight() * 3 * m_scaleY; //p_profile->appearance->graphHeight(); m_offsetY += AppSetting->graphHeight() * 3 * m_scaleY;
if (m_offsetY < 0) { m_offsetY = 0; } if (m_offsetY < 0) { m_offsetY = 0; }
@ -3277,7 +3277,7 @@ void gGraphView::timedRedraw(int ms)
} }
void gGraphView::resetLayout() void gGraphView::resetLayout()
{ {
int default_height = p_profile->appearance->graphHeight(); int default_height = AppSetting->graphHeight();
for (int i = 0; i < m_graphs.size(); i++) { for (int i = 0; i < m_graphs.size(); i++) {
if (m_graphs[i]) m_graphs[i]->setHeight(default_height); if (m_graphs[i]) m_graphs[i]->setHeight(default_height);

18
sleepyhead/Graphs/gLineChart.cpp
View File

@ -227,7 +227,7 @@ skipcheck:
lob = new gLineOverlayBar(code, chan->defaultColor(), chan->label(), FT_Span); lob = new gLineOverlayBar(code, chan->defaultColor(), chan->label(), FT_Span);
} }
if (lob != nullptr) { if (lob != nullptr) {
lob->setOverlayDisplayType(((m_codes[0] == CPAP_FlowRate))? (OverlayDisplayType)p_profile->appearance->overlayType() : ODT_TopAndBottom); lob->setOverlayDisplayType(((m_codes[0] == CPAP_FlowRate))? (OverlayDisplayType)AppSetting->overlayType() : ODT_TopAndBottom);
lob->SetDay(m_day); lob->SetDay(m_day);
flags[code] = lob; flags[code] = lob;
} }
@ -476,7 +476,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
} }
bool linecursormode = p_profile->appearance->lineCursorMode(); bool linecursormode = AppSetting->lineCursorMode();
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// Display Line Cursor // Display Line Cursor
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
@ -538,7 +538,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
painter.setClipRect(left, top, width, height+1); painter.setClipRect(left, top, width, height+1);
painter.setClipping(true); painter.setClipping(true);
painter.setRenderHint(QPainter::Antialiasing, p_profile->appearance->antiAliasing()); painter.setRenderHint(QPainter::Antialiasing, AppSetting->antiAliasing());
painter.setFont(*defaultfont); painter.setFont(*defaultfont);
bool showDottedLines = true; bool showDottedLines = true;
@ -554,6 +554,8 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
Session * sess = nullptr; Session * sess = nullptr;
ChannelID code; ChannelID code;
float lineThickness = AppSetting->lineThickness()+0.001F;
for (int gi = 0; gi < m_codes.size(); gi++) { for (int gi = 0; gi < m_codes.size(); gi++) {
code = m_codes[gi]; code = m_codes[gi];
schema::Channel &chan = schema::channel[code]; schema::Channel &chan = schema::channel[code];
@ -572,7 +574,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
dot.visible = true; dot.visible = true;
QColor color = chan.calc[dot.type].color; QColor color = chan.calc[dot.type].color;
color.setAlpha(200); color.setAlpha(200);
painter.setPen(QPen(QBrush(color), p_profile->appearance->lineThickness(), Qt::DotLine)); painter.setPen(QPen(QBrush(color), lineThickness, Qt::DotLine));
EventDataType y=top + height + 1 - ((dot.value - miny) * ymult); EventDataType y=top + height + 1 - ((dot.value - miny) * ymult);
painter.drawLine(left + 1, y, left + 1 + width, y); painter.drawLine(left + 1, y, left + 1 + width, y);
@ -875,7 +877,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
} }
} }
painter.setPen(QPen(chan.defaultColor(), p_profile->appearance->lineThickness())); painter.setPen(QPen(chan.defaultColor(), lineThickness));
painter.drawLines(lines); painter.drawLines(lines);
w.graphView()->lines_drawn_this_frame += lines.count(); w.graphView()->lines_drawn_this_frame += lines.count();
lines.clear(); lines.clear();
@ -999,7 +1001,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
} }
} }
} }
painter.setPen(QPen(chan.defaultColor(),p_profile->appearance->lineThickness())); painter.setPen(QPen(chan.defaultColor(), lineThickness));
painter.drawLines(lines); painter.drawLines(lines);
w.graphView()->lines_drawn_this_frame+=lines.count(); w.graphView()->lines_drawn_this_frame+=lines.count();
lines.clear(); lines.clear();
@ -1011,7 +1013,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
} }
// painter.setPen(QPen(m_colors[gi],p_profile->appearance->lineThickness())); // painter.setPen(QPen(m_colors[gi],lineThickness));
// painter.drawLines(lines); // painter.drawLines(lines);
// w.graphView()->lines_drawn_this_frame+=lines.count(); // w.graphView()->lines_drawn_this_frame+=lines.count();
// lines.clear(); // lines.clear();
@ -1131,7 +1133,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
int cnt = 0; int cnt = 0;
// Draw the linechart overlays // Draw the linechart overlays
if (m_day && (p_profile->appearance->lineCursorMode() || (m_codes[0]==CPAP_FlowRate))) { if (m_day && (AppSetting->lineCursorMode() || (m_codes[0]==CPAP_FlowRate))) {
QHash<ChannelID, gLineOverlayBar *>::iterator fit; QHash<ChannelID, gLineOverlayBar *>::iterator fit;
bool blockhover = false; bool blockhover = false;

6
sleepyhead/Graphs/gLineOverlay.cpp
View File

@ -83,6 +83,8 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
qint64 drift = 0; qint64 drift = 0;
//bool hover = false; //bool hover = false;
int tooltipTimeout = AppSetting->tooltipTimeout();
// For each session, process it's eventlist // For each session, process it's eventlist
for (QList<Session *>::iterator s = m_day->begin(); s != m_day->end(); s++) { for (QList<Session *>::iterator s = m_day->begin(); s != m_day->end(); s++) {
@ -237,7 +239,7 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
QString lab = QString("%1 (%2)").arg(schema::channel[m_code].fullname()).arg(raw); QString lab = QString("%1 (%2)").arg(schema::channel[m_code].fullname()).arg(raw);
GetTextExtent(lab, x, y); GetTextExtent(lab, x, y);
w.ToolTip(lab, x1 - 10, start_py + 24 + (3 * w.printScaleY()), TT_AlignRight, p_profile->general->tooltipTimeout()); w.ToolTip(lab, x1 - 10, start_py + 24 + (3 * w.printScaleY()), TT_AlignRight, AppSetting->tooltipTimeout());
//painter.fillRect(x1 - (x / 2) - x, start_py + 14 + (3 * w.printScaleY()), x+4,y+4, QBrush(QColor(255,255,255,245))); //painter.fillRect(x1 - (x / 2) - x, start_py + 14 + (3 * w.printScaleY()), x+4,y+4, QBrush(QColor(255,255,255,245)));
// painter.setPen(QPen(Qt::gray,1)); // painter.setPen(QPen(Qt::gray,1));
@ -276,7 +278,7 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
QString lab = QString("%1 (%2)").arg(schema::channel[m_code].fullname()).arg(raw); QString lab = QString("%1 (%2)").arg(schema::channel[m_code].fullname()).arg(raw);
GetTextExtent(lab, x, y, defaultfont); GetTextExtent(lab, x, y, defaultfont);
w.ToolTip(lab, x1 - 10, start_py + 24 + (3 * w.printScaleY()), TT_AlignRight, p_profile->general->tooltipTimeout()); w.ToolTip(lab, x1 - 10, start_py + 24 + (3 * w.printScaleY()), TT_AlignRight, tooltipTimeout);
// painter.fillRect(x1 - (x / 2) - x, start_py + 14 + (3 * w.printScaleY()), x+4,y+4, QBrush(QColor(255,255,255,245))); // painter.fillRect(x1 - (x / 2) - x, start_py + 14 + (3 * w.printScaleY()), x+4,y+4, QBrush(QColor(255,255,255,245)));
// painter.setPen(QPen(Qt::gray,1)); // painter.setPen(QPen(Qt::gray,1));

2
sleepyhead/Graphs/gSessionTimesChart.cpp
View File

@ -1188,14 +1188,12 @@ void gAHIChart::customCalc(Day *day, QVector<SummaryChartSlice> &list)
ahi_avg += ahi_cnt; ahi_avg += ahi_cnt;
total_hours += hours; total_hours += hours;
total_days++; total_days++;
qDebug() << "Leaving gAHIChart::customCalc - ahi_avg: " << ahi_avg << " total_days: " << total_days ;
} }
void gAHIChart::afterDraw(QPainter & /*painter */, gGraph &graph, QRect rect) void gAHIChart::afterDraw(QPainter & /*painter */, gGraph &graph, QRect rect)
{ {
if (totaldays == nousedays) return; if (totaldays == nousedays) return;
//int size = idx_end - idx_start; //int size = idx_end - idx_start;
qDebug() << "Entering gAHIChart::afterDraw - ahi_avg: " << ahi_avg << " total_days: " << total_days ;
bool skip = true; bool skip = true;
float med = 0; float med = 0;

16
sleepyhead/Graphs/gSummaryChart.cpp
View File

@ -395,7 +395,7 @@ void SummaryChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
GraphType graphtype = m_graphtype; GraphType graphtype = m_graphtype;
if (graphtype == GT_LINE || graphtype == GT_POINTS) { if (graphtype == GT_LINE || graphtype == GT_POINTS) {
bool pts = p_profile->appearance->overviewLinechartMode() == OLC_Lines; bool pts = AppSetting->overviewLinechartMode() == OLC_Lines;
graphtype = pts ? GT_POINTS : GT_LINE; graphtype = pts ? GT_POINTS : GT_LINE;
} }
@ -494,7 +494,7 @@ void SummaryChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
lastdaygood = true; lastdaygood = true;
// Display Line Cursor // Display Line Cursor
if (p_profile->appearance->lineCursorMode()) { if (AppSetting->lineCursorMode()) {
qint64 time = lcursor; qint64 time = lcursor;
double xmult = double(width) / xx; double xmult = double(width) / xx;
@ -569,6 +569,8 @@ void SummaryChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
QColor summaryColor = QColor("dark gray"); QColor summaryColor = QColor("dark gray");
float lineThickness = AppSetting->lineThickness();
for (qint64 Q = minx; Q <= maxx + ms_per_day; Q += ms_per_day) { for (qint64 Q = minx; Q <= maxx + ms_per_day; Q += ms_per_day) {
zd = Q / ms_per_day; zd = Q / ms_per_day;
d = m_values.find(zd); d = m_values.find(zd);
@ -778,14 +780,14 @@ void SummaryChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
if (lastdaygood) { if (lastdaygood) {
if (lastY[j] != py2) { // vertical line if (lastY[j] != py2) { // vertical line
painter.setPen(QPen(col2,p_profile->appearance->lineThickness())); painter.setPen(QPen(col2, lineThickness));
painter.drawLine(lastX[j], lastY[j], px, py2); painter.drawLine(lastX[j], lastY[j], px, py2);
} }
painter.setPen(QPen(col1,p_profile->appearance->lineThickness())); painter.setPen(QPen(col1, lineThickness));
painter.drawLine(px, py2, px2, py2); painter.drawLine(px, py2, px2, py2);
} else { } else {
painter.setPen(QPen(col1,p_profile->appearance->lineThickness())); painter.setPen(QPen(col1, lineThickness));
painter.drawLine(x1, py2, x2, py2); painter.drawLine(x1, py2, x2, py2);
} }
@ -808,10 +810,10 @@ void SummaryChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
} }
if (lastdaygood) { if (lastdaygood) {
painter.setPen(QPen(col2,p_profile->appearance->lineThickness())); painter.setPen(QPen(col2, lineThickness));
painter.drawLine(lastX[j] - barw / 2, lastY[j], px2 - barw / 2, py2); painter.drawLine(lastX[j] - barw / 2, lastY[j], px2 - barw / 2, py2);
} else { } else {
painter.setPen(QPen(col1,p_profile->appearance->lineThickness())); painter.setPen(QPen(col1, lineThickness));
painter.drawLine(px + barw / 2 - 1, py2, px + barw / 2 + 1, py2); painter.drawLine(px + barw / 2 - 1, py2, px + barw / 2 + 1, py2);
} }

2
sleepyhead/Graphs/gYAxis.cpp
View File

@ -295,7 +295,7 @@ const QString gYAxis::Format(EventDataType v, int dp)
bool gYAxis::mouseMoveEvent(QMouseEvent *event, gGraph *graph) bool gYAxis::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
{ {
if (!p_profile->appearance->graphTooltips()) { if (!AppSetting->graphTooltips()) {
return false; return false;
} }

1
sleepyhead/Resources.qrc
View File

@ -52,5 +52,6 @@
<file>icons/aircurve.png</file> <file>icons/aircurve.png</file>
<file>icons/prs1_960.png</file> <file>icons/prs1_960.png</file>
<file>icons/daily.png</file> <file>icons/daily.png</file>
<file>icons/dv64.png</file>
</qresource> </qresource>
</RCC> </RCC>

197
sleepyhead/SleepLib/appsettings.h Normal file
View File

@ -0,0 +1,197 @@
/* SleepLib AppSettings Header
*
* This file for all settings related stuff to clean up Preferences & Profiles.
*
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.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 APPSETTINGS_H
#define APPSETTINGS_H
#include "preferences.h"
#include "common.h"
class Preferences;
enum OverviewLinechartModes { OLC_Bartop, OLC_Lines };
// ApplicationWideSettings Strings
const QString STR_CS_UserEventPieChart = "UserEventPieChart";
const QString STR_IS_Multithreading = "EnableMultithreading";
const QString STR_AS_GraphHeight = "GraphHeight";
const QString STR_AS_DailyPanelWidth = "DailyPanelWidth";
const QString STR_AS_RightPanelWidth = "RightPanelWidth";
const QString STR_AS_AntiAliasing = "UseAntiAliasing";
const QString STR_AS_GraphSnapshots = "EnableGraphSnapshots";
const QString STR_AS_Animations = "AnimationsAndTransitions";
const QString STR_AS_SquareWave = "SquareWavePlots";
const QString STR_AS_OverlayType = "OverlayType";
const QString STR_AS_OverviewLinechartMode = "OverviewLinechartMode";
const QString STR_AS_UsePixmapCaching = "UsePixmapCaching";
const QString STR_AS_AllowYAxisScaling = "AllowYAxisScaling";
const QString STR_AS_GraphTooltips = "GraphTooltips";
const QString STR_AS_LineThickness = "LineThickness";
const QString STR_AS_LineCursorMode = "LineCursorMode";
const QString STR_AS_CalendarVisible = "CalendarVisible";
const QString STR_AS_RightSidebarVisible = "RightSidebarVisible";
const QString STR_US_TooltipTimeout = "TooltipTimeout";
const QString STR_US_ScrollDampening = "ScrollDampening";
const QString STR_US_ShowDebug = "ShowDebug";
const QString STR_US_ShowPerformance = "ShowPerformance";
const QString STR_US_ShowSerialNumbers = "ShowSerialNumbers";
const QString STR_US_OpenTabAtStart = "OpenTabAtStart";
const QString STR_US_OpenTabAfterImport = "OpenTabAfterImport";
const QString STR_US_AutoLaunchImport = "AutoLaunchImport";
const QString STR_US_RemoveCardReminder = "RemoveCardReminder";
const QString STR_IS_CacheSessions = "MemoryHog";
class AppWideSetting: public PrefSettings
{
public:
AppWideSetting(Preferences *pref)
: PrefSettings(pref)
{
initPref(STR_IS_Multithreading, idealThreads() > 1);
initPref(STR_US_ShowPerformance, false);
initPref(STR_US_ShowDebug, false);
initPref(STR_AS_CalendarVisible, true);
initPref(STR_US_ScrollDampening, (int)50);
initPref(STR_US_TooltipTimeout, (int)2500);
initPref(STR_AS_GraphHeight, 180.0);
initPref(STR_AS_DailyPanelWidth, 350.0);
initPref(STR_AS_RightPanelWidth, 230.0);
initPref(STR_AS_AntiAliasing, true);
initPref(STR_AS_GraphSnapshots, true);
initPref(STR_AS_Animations, true);
initPref(STR_AS_SquareWave, false);
initPref(STR_AS_AllowYAxisScaling, true);
initPref(STR_AS_GraphTooltips, true);
initPref(STR_AS_UsePixmapCaching, false);
initPref(STR_AS_OverlayType, ODT_Bars);
initPref(STR_AS_OverviewLinechartMode, OLC_Bartop);
initPref(STR_AS_LineThickness, 1.0);
initPref(STR_AS_LineCursorMode, true);
initPref(STR_AS_RightSidebarVisible, true);
initPref(STR_CS_UserEventPieChart, false);
initPref(STR_US_ShowSerialNumbers, false);
initPref(STR_US_OpenTabAtStart, 1);
initPref(STR_US_OpenTabAfterImport, 0);
initPref(STR_US_AutoLaunchImport, false);
initPref(STR_IS_CacheSessions, false);
initPref(STR_US_RemoveCardReminder, true);
initPref(STR_GEN_Profile, "");
}
QString profileName() const { return getPref(STR_GEN_Profile).toString(); }
bool autoLaunchImport() const { return getPref(STR_US_AutoLaunchImport).toBool(); }
bool cacheSessions() const { return getPref(STR_IS_CacheSessions).toBool(); }
bool multithreading() const { return getPref(STR_IS_Multithreading).toBool(); }
bool showDebug() const { return getPref(STR_US_ShowDebug).toBool(); }
bool showPerformance() const { return getPref(STR_US_ShowPerformance).toBool(); }
//! \brief Whether to show the calendar
bool calendarVisible() const { return getPref(STR_AS_CalendarVisible).toBool(); }
int scrollDampening() const { return getPref(STR_US_ScrollDampening).toInt(); }
int tooltipTimeout() const { return getPref(STR_US_TooltipTimeout).toInt(); }
//! \brief Returns the normal (unscaled) height of a graph
int graphHeight() const { return getPref(STR_AS_GraphHeight).toInt(); }
//! \brief Returns the normal (unscaled) height of a graph
int dailyPanelWidth() const { return getPref(STR_AS_DailyPanelWidth).toInt(); }
//! \brief Returns the normal (unscaled) height of a graph
int rightPanelWidth() const { return getPref(STR_AS_RightPanelWidth).toInt(); }
//! \brief Returns true if AntiAliasing (the graphical smoothing method) is enabled
bool antiAliasing() const { return getPref(STR_AS_AntiAliasing).toBool(); }
//! \brief Returns true if renderPixmap function is in use, which takes snapshots of graphs
bool graphSnapshots() const { return getPref(STR_AS_GraphSnapshots).toBool(); }
//! \brief Returns true if Graphical animations & Transitions will be drawn
bool animations() const { return getPref(STR_AS_Animations).toBool(); }
//! \brief Returns true if PixmapCaching acceleration will be used
bool usePixmapCaching() const { return getPref(STR_AS_UsePixmapCaching).toBool(); }
//! \brief Returns true if Square Wave plots are preferred (where possible)
bool squareWavePlots() const { return getPref(STR_AS_SquareWave).toBool(); }
//! \brief Whether to allow double clicking on Y-Axis labels to change vertical scaling mode
bool allowYAxisScaling() const { return getPref(STR_AS_AllowYAxisScaling).toBool(); }
//! \brief Whether to show graph tooltips
bool graphTooltips() const { return getPref(STR_AS_GraphTooltips).toBool(); }
//! \brief Pen width of line plots
float lineThickness() const { return getPref(STR_AS_LineThickness).toFloat(); }
//! \brief Whether to show line cursor
bool lineCursorMode() const { return getPref(STR_AS_LineCursorMode).toBool(); }
//! \brief Whether to show the right sidebar
bool rightSidebarVisible() const { return getPref(STR_AS_RightSidebarVisible).toBool(); }
//! \brief Returns the type of overlay flags (which are displayed over the Flow Waveform)
OverlayDisplayType overlayType() const {
return (OverlayDisplayType)getPref(STR_AS_OverlayType).toInt();
}
//! \brief Returns the display type of Overview pages linechart
OverviewLinechartModes overviewLinechartMode() const {
return (OverviewLinechartModes)getPref(STR_AS_OverviewLinechartMode).toInt();
}
bool userEventPieChart() const { return getPref(STR_CS_UserEventPieChart).toBool(); }
bool showSerialNumbers() const { return getPref(STR_US_ShowSerialNumbers).toBool(); }
int openTabAtStart() const { return getPref(STR_US_OpenTabAtStart).toInt(); }
int openTabAfterImport() const { return getPref(STR_US_OpenTabAfterImport).toInt(); }
bool removeCardReminder() const { return getPref(STR_US_RemoveCardReminder).toBool(); }
void setProfileName(QString name) { setPref(STR_GEN_Profile, name); }
void setAutoLaunchImport(bool b) { setPref(STR_US_AutoLaunchImport, b); }
void setCacheSessions(bool c) { setPref(STR_IS_CacheSessions, c); }
void setMultithreading(bool enabled) { setPref(STR_IS_Multithreading, enabled); }
void setShowDebug(bool b) { setPref(STR_US_ShowDebug, b); }
void setShowPerformance(bool b) { setPref(STR_US_ShowPerformance, b); }
//! \brief Sets whether to display the (Daily View) Calendar
void setCalendarVisible(bool b) { setPref(STR_AS_CalendarVisible, b); }
void setScrollDampening(int i) { setPref(STR_US_ScrollDampening, i); }
void setTooltipTimeout(int i) { setPref(STR_US_TooltipTimeout, i); }
//! \brief Set the normal (unscaled) height of a graph.
void setGraphHeight(int height) { setPref(STR_AS_GraphHeight, height); }
//! \brief Set the normal (unscaled) height of a graph.
void setDailyPanelWidth(int width) { setPref(STR_AS_DailyPanelWidth, width); }
//! \brief Set the normal (unscaled) height of a graph.
void setRightPanelWidth(int width) { setPref(STR_AS_RightPanelWidth, width); }
//! \brief Set to true to turn on AntiAliasing (the graphical smoothing method)
void setAntiAliasing(bool aa) { setPref(STR_AS_AntiAliasing, aa); }
//! \brief Set to true if renderPixmap functions are in use, which takes snapshots of graphs.
void setGraphSnapshots(bool gs) { setPref(STR_AS_GraphSnapshots, gs); }
//! \brief Set to true if Graphical animations & Transitions will be drawn
void setAnimations(bool anim) { setPref(STR_AS_Animations, anim); }
//! \brief Set to true to use Pixmap Caching of Text and other graphics caching speedup techniques
void setUsePixmapCaching(bool b) { setPref(STR_AS_UsePixmapCaching, b); }
//! \brief Set whether or not to useSquare Wave plots (where possible)
void setSquareWavePlots(bool sw) { setPref(STR_AS_SquareWave, sw); }
//! \brief Sets the type of overlay flags (which are displayed over the Flow Waveform)
void setOverlayType(OverlayDisplayType od) { setPref(STR_AS_OverlayType, (int)od); }
//! \brief Sets whether to allow double clicking on Y-Axis labels to change vertical scaling mode
void setAllowYAxisScaling(bool b) { setPref(STR_AS_AllowYAxisScaling, b); }
//! \brief Sets whether to allow double clicking on Y-Axis labels to change vertical scaling mode
void setGraphTooltips(bool b) { setPref(STR_AS_GraphTooltips, b); }
//! \brief Sets the type of overlay flags (which are displayed over the Flow Waveform)
void setOverviewLinechartMode(OverviewLinechartModes od) {
setPref(STR_AS_OverviewLinechartMode, (int)od);
}
//! \brief Set the pen width of line plots.
void setLineThickness(float size) { setPref(STR_AS_LineThickness, size); }
//! \brief Sets whether to display Line Cursor
void setLineCursorMode(bool b) { setPref(STR_AS_LineCursorMode, b); }
//! \brief Sets whether to display the right sidebar
void setRightSidebarVisible(bool b) { setPref(STR_AS_RightSidebarVisible, b); }
void setUserEventPieChart(bool b) { setPref(STR_CS_UserEventPieChart, b); }
void setShowSerialNumbers(bool enabled) { setPref(STR_US_ShowSerialNumbers, enabled); }
void setOpenTabAtStart(int idx) { setPref(STR_US_OpenTabAtStart, idx); }
void setOpenTabAfterImport(int idx) { setPref(STR_US_OpenTabAfterImport, idx); }
void setRemoveCardReminder(bool b) { setPref(STR_US_RemoveCardReminder, b); }
};
extern AppWideSetting *AppSetting;
#endif // APPSETTINGS_H

6
sleepyhead/SleepLib/common.cpp
View File

@ -8,13 +8,13 @@
#include <QDateTime> #include <QDateTime>
#include <QDir> #include <QDir>
#include <QThread>
#include <zlib.h> #include <zlib.h>
#include "profiles.h" #include "profiles.h"
// Used by internal settings // Used by internal settings
const QString getDeveloperName() const QString getDeveloperName()
{ {
return STR_DeveloperName; return STR_DeveloperName;
@ -32,6 +32,8 @@ const QString getDefaultAppRoot()
return approot; return approot;
} }
int idealThreads() { return QThread::idealThreadCount(); }
qint64 timezoneOffset() qint64 timezoneOffset()
{ {
static bool ok = false; static bool ok = false;
@ -174,6 +176,7 @@ QString STR_TR_Plethy; // Plethysomogram
QString STR_TR_Pressure; QString STR_TR_Pressure;
QString STR_TR_Daily; QString STR_TR_Daily;
QString STR_TR_Profile;
QString STR_TR_Overview; QString STR_TR_Overview;
QString STR_TR_Oximetry; QString STR_TR_Oximetry;
@ -376,6 +379,7 @@ void initializeStrings()
STR_TR_Pressure = QObject::tr("Pressure"); STR_TR_Pressure = QObject::tr("Pressure");
STR_TR_Daily = QObject::tr("Daily"); STR_TR_Daily = QObject::tr("Daily");
STR_TR_Profile = QObject::tr("Profile");
STR_TR_Overview = QObject::tr("Overview"); STR_TR_Overview = QObject::tr("Overview");
STR_TR_Oximetry = QObject::tr("Oximetry"); STR_TR_Oximetry = QObject::tr("Oximetry");

6
sleepyhead/SleepLib/common.h
View File

@ -1,4 +1,4 @@
/* Common code and junk /* Common code and junk
* *
* Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -12,6 +12,7 @@
#include <QString> #include <QString>
#include <QColor> #include <QColor>
#include <QObject> #include <QObject>
#include <QThread>
#if QT_VERSION >= QT_VERSION_CHECK(4,8,0) #if QT_VERSION >= QT_VERSION_CHECK(4,8,0)
@ -45,6 +46,8 @@ struct ValueCount {
double p; double p;
}; };
extern int idealThreads();
void copyPath(QString src, QString dst); void copyPath(QString src, QString dst);
@ -206,6 +209,7 @@ extern QString STR_TR_Plethy; // Plethysomogram
extern QString STR_TR_Pressure; extern QString STR_TR_Pressure;
extern QString STR_TR_Daily; extern QString STR_TR_Daily;
extern QString STR_TR_Profile;
extern QString STR_TR_Overview; extern QString STR_TR_Overview;
extern QString STR_TR_Oximetry; extern QString STR_TR_Oximetry;

2
sleepyhead/SleepLib/journal.cpp
View File

@ -57,7 +57,7 @@ JournalEntry::JournalEntry(QDate date)
// more then one.. report this. // more then one.. report this.
} }
} }
jmach = MachineLoader::CreateMachine(info, machid); jmach = p_profile->CreateMachine(info, machid);
} }
m_date = date; m_date = date;

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

@ -265,7 +265,7 @@ int CMS50Loader::doImportMode()
MachineInfo info = newInfo(); MachineInfo info = newInfo();
info.model = cms50dplus ? QObject::tr("CMS50D+") : QObject::tr("CMS50E/F"); info.model = cms50dplus ? QObject::tr("CMS50D+") : QObject::tr("CMS50E/F");
info.serial = QString(); info.serial = QString();
Machine * mach = CreateMachine(info); Machine * mach = p_profile->CreateMachine(info);
Q_UNUSED(mach); Q_UNUSED(mach);

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

@ -126,7 +126,7 @@ int FPIconLoader::Open(QString path)
for (int i = 0; i < SerialNumbers.size(); i++) { for (int i = 0; i < SerialNumbers.size(); i++) {
MachineInfo info = newInfo(); MachineInfo info = newInfo();
info.serial = SerialNumbers[i]; info.serial = SerialNumbers[i];
m = CreateMachine(info); m = p_profile->CreateMachine(info);
npath = newpath + "/" + info.serial; npath = newpath + "/" + info.serial;

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

@ -1,4 +1,4 @@
/* SleepLib (DeVilbiss) Intellipap Loader Implementation /* SleepLib (DeVilbiss) Intellipap Loader Implementation
* *
* Notes: Intellipap DV54 requires the SmartLink attachment to access this data. * Notes: Intellipap DV54 requires the SmartLink attachment to access this data.
* *
@ -29,9 +29,13 @@ Intellipap::~Intellipap()
IntellipapLoader::IntellipapLoader() IntellipapLoader::IntellipapLoader()
{ {
const QString INTELLIPAP_ICON = ":/icons/intellipap.png"; const QString INTELLIPAP_ICON = ":/icons/intellipap.png";
const QString DV6_ICON = ":/icons/dv64.png";
QString s = newInfo().series; QString s = newInfo().series;
m_pixmap_paths[s] = INTELLIPAP_ICON; m_pixmap_paths[s] = INTELLIPAP_ICON;
m_pixmaps[s] = QPixmap(INTELLIPAP_ICON); m_pixmaps[s] = QPixmap(INTELLIPAP_ICON);
m_pixmap_paths["DV6"] = DV6_ICON;
m_pixmaps["DV6"] = QPixmap(DV6_ICON);
m_buffer = nullptr; m_buffer = nullptr;
m_type = MT_CPAP; m_type = MT_CPAP;
@ -236,7 +240,7 @@ int IntellipapLoader::OpenDV5(QString path)
} }
if (!info.serial.isEmpty()) { if (!info.serial.isEmpty()) {
mach = CreateMachine(info); mach = p_profile->CreateMachine(info);
} }
if (!mach) { if (!mach) {
@ -781,7 +785,7 @@ int IntellipapLoader::OpenDV6(QString path)
//////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
// Creates Machine database record if it doesn't exist already // Creates Machine database record if it doesn't exist already
//////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
Machine *mach = CreateMachine(info); Machine *mach = p_profile->CreateMachine(info);
if (mach == nullptr) { if (mach == nullptr) {
return -1; return -1;
} }

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

@ -592,7 +592,7 @@ int PRS1Loader::OpenMachine(QString path)
// Which is needed to get the right machine record.. // Which is needed to get the right machine record..
Machine *m = CreateMachine(info); Machine *m = p_profile->CreateMachine(info);
// This time supply the machine object so it can populate machine properties.. // This time supply the machine object so it can populate machine properties..
PeekProperties(m->info, propertyfile, m); PeekProperties(m->info, propertyfile, m);
@ -726,7 +726,7 @@ int PRS1Loader::OpenMachine(QString path)
int tasks = countTasks(); int tasks = countTasks();
runTasks(p_profile->session->multithreading()); runTasks(AppSetting->multithreading());
finishAddingSessions(); finishAddingSessions();
return m->unsupported() ? -1 : tasks; return m->unsupported() ? -1 : tasks;

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

@ -1948,7 +1948,7 @@ int ResmedLoader::scanFiles(Machine * mach, QString datalog_path)
// Run the tasks... // Run the tasks...
int c = countTasks(); int c = countTasks();
runTasks(p_profile->session->multithreading()); runTasks(AppSetting->multithreading());
newSkipFiles.append(skipfiles.keys()); newSkipFiles.append(skipfiles.keys());
impfile.remove(); impfile.remove();
@ -2083,7 +2083,7 @@ int ResmedLoader::Open(QString path)
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
// Create machine object (unless it's already registered) // Create machine object (unless it's already registered)
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
Machine *m = CreateMachine(info); Machine *m = p_profile->CreateMachine(info);
bool create_backups = p_profile->session->backupCardData(); bool create_backups = p_profile->session->backupCardData();
bool compress_backups = p_profile->session->compressBackupData(); bool compress_backups = p_profile->session->compressBackupData();

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

@ -105,7 +105,7 @@ int SomnoposeLoader::OpenFile(QString filename)
bool first = true; bool first = true;
MachineInfo info = newInfo(); MachineInfo info = newInfo();
Machine *mach = CreateMachine(info); Machine *mach = p_profile->CreateMachine(info);
Session *sess = nullptr; Session *sess = nullptr;
SessionID sid; SessionID sid;

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

@ -130,7 +130,7 @@ int WeinmannLoader::Open(QString path)
MachineInfo info = newInfo(); MachineInfo info = newInfo();
info.serial = "141819"; info.serial = "141819";
Machine * mach = CreateMachine(info); Machine * mach = p_profile->CreateMachine(info);
int WeekComplianceOffset = index["WeekComplianceOffset"]; int WeekComplianceOffset = index["WeekComplianceOffset"];

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

@ -118,7 +118,7 @@ int ZEOLoader::OpenFile(QString filename)
QStringList SG, DSG; QStringList SG, DSG;
MachineInfo info = newInfo(); MachineInfo info = newInfo();
Machine *mach = CreateMachine(info); Machine *mach = p_profile->CreateMachine(info);
int idxZQ = header.indexOf("ZQ"); int idxZQ = header.indexOf("ZQ");

34
sleepyhead/SleepLib/machine.cpp
View File

@ -1,4 +1,4 @@
/* SleepLib Machine Class Implementation /* SleepLib Machine Class Implementation
* *
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -49,9 +49,16 @@ Machine::Machine(MachineID id)
srand(time(nullptr)); srand(time(nullptr));
MachineID temp; MachineID temp;
bool found;
// Keep trying until we get a unique machineID for this profile
do { do {
temp = rand(); temp = rand();
} while (p_profile->machlist.find(temp) != p_profile->machlist.end());
found = false;
for (int i=0;i<p_profile->m_machlist.size(); ++i) {
if (p_profile->m_machlist.at(i)->id() == temp) found = true;
}
} while (found);
m_id = temp; m_id = temp;
@ -115,12 +122,19 @@ bool Machine::saveSessionInfo()
bool Machine::loadSessionInfo() bool Machine::loadSessionInfo()
{ {
// SessionInfo basically just contains a list of all sessions and their enabled status,
// so the enabling/reenabling doesn't require a summary rewrite every time.
if (info.type == MT_JOURNAL) if (info.type == MT_JOURNAL)
return true; return true;
QHash<SessionID, Session *>::iterator s; QHash<SessionID, Session *>::iterator s;
QFile file(getDataPath() + "Sessions.info"); QFile file(getDataPath() + "Sessions.info");
if (!file.open(QFile::ReadOnly)) { if (!file.open(QFile::ReadOnly)) {
// No session.info file present, so let's create one...
// But first check for legacy SESSION_ENABLED field in session settings
for (s = sessionlist.begin(); s!= sessionlist.end(); ++s) { for (s = sessionlist.begin(); s!= sessionlist.end(); ++s) {
Session * sess = s.value(); Session * sess = s.value();
QHash<ChannelID, QVariant>::iterator it = sess->settings.find(SESSION_ENABLED); QHash<ChannelID, QVariant>::iterator it = sess->settings.find(SESSION_ENABLED);
@ -131,6 +145,8 @@ bool Machine::loadSessionInfo()
} }
sess->setEnabled(b); // Extract from session settings and save.. sess->setEnabled(b); // Extract from session settings and save..
} }
// Now write the file
saveSessionInfo(); saveSessionInfo();
return true; return true;
} }
@ -146,12 +162,15 @@ bool Machine::loadSessionInfo()
in >> ft16; in >> ft16;
in >> version; in >> version;
// Legacy crud
if (version == 1) { if (version == 1) {
// was available channels // was available channels
QHash<ChannelID, bool> crap; QHash<ChannelID, bool> crap;
in >> crap; in >> crap;
} }
// Read in size record, followed by size * [SessionID, bool] pairs containing the enable status.
int size; int size;
in >> size; in >> size;
@ -588,6 +607,7 @@ bool Machine::Load()
QFile::copy(path+filename, summarypath+filename); QFile::copy(path+filename, summarypath+filename);
QFile::remove(path+filename); QFile::remove(path+filename);
} }
// Copy old Event files to folder // Copy old Event files to folder
filters.clear(); filters.clear();
filters << "*.001"; filters << "*.001";
@ -596,7 +616,7 @@ bool Machine::Load()
size = filelist.size(); size = filelist.size();
if (size > 0) { if (size > 0) {
if (!dir.exists(eventpath)) dir.mkpath(eventpath); if (!dir.exists(eventpath)) dir.mkpath(eventpath);
for (int i=0; i< filelist.size(); i++) { for (int i=0; i< size; i++) {
if ((i % 50) == 0) { // This is slow.. :-/ if ((i % 50) == 0) { // This is slow.. :-/
if (progress) { progress->setValue((float(i) / float(size) * 100.0)); } if (progress) { progress->setValue((float(i) / float(size) * 100.0)); }
@ -689,7 +709,7 @@ void Machine::queSaveList(Session * sess)
sess->UpdateSummaries(); sess->UpdateSummaries();
sess->Store(getDataPath()); sess->Store(getDataPath());
if (!p_profile->session->cacheSessions()) { if (!AppSetting->cacheSessions()) {
sess->TrashEvents(); sess->TrashEvents();
} }
@ -719,7 +739,7 @@ Session *Machine::popSaveList()
void Machine::StartSaveThreads() void Machine::StartSaveThreads()
{ {
m_savelist.clear(); m_savelist.clear();
if (!p_profile->session->multithreading()) return; if (!AppSetting->multithreading()) return;
QString path = getDataPath(); QString path = getDataPath();
@ -822,7 +842,7 @@ void SaveTask::run()
void Machine::queTask(ImportTask * task) void Machine::queTask(ImportTask * task)
{ {
// Okay... what was this turned off??? // Okay... what was this turned off???
if (p_profile->session->multithreading()) { if (AppSetting->multithreading()) {
m_tasklist.push_back(task); m_tasklist.push_back(task);
return; return;
} }
@ -979,7 +999,7 @@ bool Machine::LoadSummary(QProgressBar * progress)
for (it = sess_order.begin(); it != it_end; ++it, ++cnt) { for (it = sess_order.begin(); it != it_end; ++it, ++cnt) {
if ((cnt % 100) == 0) { if ((cnt % 100) == 0) {
progress->setValue(cnt); progress->setValue(cnt);
QApplication::processEvents(); //QApplication::processEvents();
} }
Session * sess = it.value(); Session * sess = it.value();
if (!AddSession(sess)) { if (!AddSession(sess)) {

1
sleepyhead/SleepLib/machine.h
View File

@ -88,6 +88,7 @@ class Machine
//! \brief Load all Machine summary data //! \brief Load all Machine summary data
bool Load(); bool Load();
bool LoadSummary(QProgressBar * progress); bool LoadSummary(QProgressBar * progress);
//! \brief Save all Sessions where changed bit is set. //! \brief Save all Sessions where changed bit is set.

98
sleepyhead/SleepLib/machine_loader.cpp
View File

@ -58,96 +58,8 @@ MachineLoader * lookupLoader(QString loaderName)
return nullptr; return nullptr;
} }
QHash<QString, QHash<QString, Machine *> > MachineList;
void MachineLoader::removeMachine(Machine * m)
{
m_machlist.removeAll(m);
QHash<QString, QHash<QString, Machine *> >::iterator mlit = MachineList.find(m->loaderName());
if (mlit != MachineList.end()) {
QHash<QString, Machine *>::iterator mit = mlit.value().find(m->serial());
if (mit != mlit.value().end()) {
mlit.value().erase(mit);
}
}
}
Machine * MachineLoader::lookupMachine(QString serial)
{
QHash<QString, QHash<QString, Machine *> >::iterator mlit = MachineList.find(loaderName());
if (mlit != MachineList.end()) {
QHash<QString, Machine *>::iterator mit = mlit.value().find(serial);
if (mit != mlit.value().end()) {
return mit.value();
}
}
return nullptr;
}
Machine * MachineLoader::CreateMachine(MachineInfo info, MachineID id)
{
Q_ASSERT(p_profile != nullptr);
Machine *m = nullptr;
QHash<QString, QHash<QString, Machine *> >::iterator mlit = MachineList.find(info.loadername);
if (mlit != MachineList.end()) {
QHash<QString, Machine *>::iterator mit = mlit.value().find(info.serial);
if (mit != mlit.value().end()) {
mit.value()->setInfo(info); // update info
return mit.value();
}
}
// Before we create, find any lost folder to get the old ID
if ((id == 0) && ((info.type == MT_OXIMETER) || (info.type == MT_JOURNAL) || (info.type == MT_POSITION)|| (info.type == MT_SLEEPSTAGE))) {
QString dataPath = p_profile->Get("{" + STR_GEN_DataFolder + "}/");
QDir dir(dataPath);
QStringList namefilter(QString(info.loadername+"_*"));
QStringList files = dir.entryList(namefilter, QDir::Dirs);
if (files.size() > 0) {
QString idstr = files[0].section("_",-1);
bool ok;
id = idstr.toInt(&ok, 16);
}
}
switch (info.type) {
case MT_CPAP:
m = new CPAP(id);
break;
case MT_SLEEPSTAGE:
m = new SleepStage(id);
break;
case MT_OXIMETER:
m = new Oximeter(id);
break;
case MT_POSITION:
m = new PositionSensor(id);
break;
case MT_JOURNAL:
m = new Machine(id);
m->setType(MT_JOURNAL);
break;
default:
m = new Machine(id);
break;
}
m->setInfo(info);
qDebug() << "Create" << info.loadername << "Machine" << (info.serial.isEmpty() ? m->hexid() : info.serial);
MachineList[info.loadername][info.serial] = m;
p_profile->AddMachine(m);
return m;
}
void RegisterLoader(MachineLoader *loader) void RegisterLoader(MachineLoader *loader)
@ -177,9 +89,9 @@ MachineLoader::MachineLoader() :QObject(nullptr)
MachineLoader::~MachineLoader() MachineLoader::~MachineLoader()
{ {
for (QList<Machine *>::iterator m = m_machlist.begin(); m != m_machlist.end(); m++) { // for (QList<Machine *>::iterator m = m_machlist.begin(); m != m_machlist.end(); m++) {
delete *m; // delete *m;
} // }
} }
void MachineLoader::finishAddingSessions() void MachineLoader::finishAddingSessions()
@ -196,13 +108,13 @@ void MachineLoader::finishAddingSessions()
new_sessions.clear(); new_sessions.clear();
QHash<QString, QHash<QString, Machine *> >::iterator mlit = MachineList.find(loaderName()); /* QHash<QString, QHash<QString, Machine *> >::iterator mlit = MachineList.find(loaderName());
if (mlit != MachineList.end()) { if (mlit != MachineList.end()) {
for(QHash<QString, Machine *>::iterator mit = mlit.value().begin(); mit!=mlit.value().end(); ++mit) { for(QHash<QString, Machine *>::iterator mit = mlit.value().begin(); mit!=mlit.value().end(); ++mit) {
mit.value()->SaveSummary(); mit.value()->SaveSummary();
} }
} } */
} }

8
sleepyhead/SleepLib/machine_loader.h
View File

@ -49,9 +49,6 @@ class MachineLoader: public QObject
//! \brief Override to returns the Version number of this MachineLoader //! \brief Override to returns the Version number of this MachineLoader
virtual int Version() = 0; virtual int Version() = 0;
static Machine * CreateMachine(MachineInfo info, MachineID id = 0);
Machine * lookupMachine(QString serial);
// !\\brief Used internally by loaders, override to return base MachineInfo record // !\\brief Used internally by loaders, override to return base MachineInfo record
virtual MachineInfo newInfo() { return MachineInfo(); } virtual MachineInfo newInfo() { return MachineInfo(); }
@ -90,8 +87,6 @@ class MachineLoader: public QObject
QMutex sessionMutex; QMutex sessionMutex;
QMutex saveMutex; QMutex saveMutex;
void removeMachine(Machine * m);
virtual void initChannels() {} virtual void initChannels() {}
QPixmap & getPixmap(QString series) { QPixmap & getPixmap(QString series) {
QHash<QString, QPixmap>::iterator it = m_pixmaps.find(series); QHash<QString, QPixmap>::iterator it = m_pixmaps.find(series);
@ -113,14 +108,11 @@ signals:
void machineUnsupported(Machine *); void machineUnsupported(Machine *);
protected: protected:
//! \brief Contains a list of Machine records known by this loader
QList<Machine *> m_machlist;
static QPixmap * genericCPAPPixmap; static QPixmap * genericCPAPPixmap;
MachineType m_type; MachineType m_type;
QString m_class; QString m_class;
Profile *m_profile;
int m_currenttask; int m_currenttask;
int m_totaltasks; int m_totaltasks;

30
sleepyhead/SleepLib/preferences.cpp
View File

@ -1,4 +1,4 @@
/* SleepLib Preferences Implementation /* SleepLib Preferences Implementation
* *
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -301,7 +301,29 @@ bool Preferences::Open(QString filename)
} }
root = root.nextSiblingElement(); root = root.nextSiblingElement();
ExtraLoad(root);
//////////////////////////////////////////////////////////////////////////////////////
// This is a dirty hack to clean up a legacy issue
// The old Profile system used to have machines in Profile.xml
// We need to clean up this mistake up here, because C++ polymorphism won't otherwise
// let us open properly in constructor
//////////////////////////////////////////////////////////////////////////////////////
if ((p_name == "Profile") && (root.tagName().toLower() == "machines")) {
// Save this sucker
QDomDocument doc("Machines");
doc.appendChild(root);
QFile file(p_path+"/machines.xml");
// Don't do anything if machines.xml already exists.. the user ran the old version!
if (!file.exists()) {
file.open(QFile::WriteOnly);
file.write(doc.toByteArray());
file.close();
}
}
return true; return true;
} }
@ -338,8 +360,6 @@ bool Preferences::Save(QString filename)
root.appendChild(cn); root.appendChild(cn);
} }
droot.appendChild(ExtraSave(doc));
QFile file(p_filename); QFile file(p_filename);
if (!file.open(QIODevice::WriteOnly)) { if (!file.open(QIODevice::WriteOnly)) {
@ -354,3 +374,5 @@ bool Preferences::Save(QString filename)
} }
AppWideSetting *AppSetting = nullptr;

43
sleepyhead/SleepLib/preferences.h
View File

@ -1,4 +1,4 @@
/* SleepLib Preferences Header /* SleepLib Preferences Header
* *
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -84,22 +84,15 @@ class Preferences
} }
} }
//! \brief Derive from this to handle Loading of any custom XML sections
virtual void ExtraLoad(QDomElement &root) { root = root; }
//! \brief Derive from this to handle Saving of any custom XML sections
//! \return Must return a QDomElement to be inserted into the generated XML
virtual QDomElement ExtraSave(QDomDocument &doc) { doc = doc; QDomElement e; return e; }
//! \brief Opens, processes the XML for this Preferences group, loading all preferences stored therein. //! \brief Opens, processes the XML for this Preferences group, loading all preferences stored therein.
//! \note If filename is empty, it will use the one specified in the constructor //! \note If filename is empty, it will use the one specified in the constructor
//! \returns true if succesful //! \returns true if succesful
virtual bool Open(QString filename = ""); bool Open(QString filename = "");
//! \brief Saves all preferences to XML file. //! \brief Saves all preferences to XML file.
//! \note If filename is empty, it will use the one specified in the constructor //! \note If filename is empty, it will use the one specified in the constructor
//! \returns true if succesful //! \returns true if succesful
virtual bool Save(QString filename = ""); bool Save(QString filename = "");
//! \note Sets a comment string whici will be stored in the XML //! \note Sets a comment string whici will be stored in the XML
void SetComment(const QString &str) { void SetComment(const QString &str) {
@ -137,8 +130,34 @@ class Preferences
//! \brief Main Preferences Object used throughout the application //! \brief Main Preferences Object used throughout the application
extern Preferences PREF; extern Preferences PREF;
//! \brief Layout Preferences Object used throughout the application // Parent class for subclasses that manipulate the profile.
extern Preferences LAYOUT; class PrefSettings
{
public:
PrefSettings(Preferences *pref)
: m_pref(pref)
{ }
inline void setPref(QString name, QVariant value) {
(*m_pref)[name] = value;
}
inline void initPref(QString name, QVariant value) {
m_pref->init(name, value);
}
inline QVariant getPref(QString name) const {
return (*m_pref)[name];
}
void setPrefObject(Preferences *pref) {
m_pref = pref;
}
public:
Preferences *m_pref;
};
#include "appsettings.h"
#endif // PREFERENCES_H #endif // PREFERENCES_H

455
sleepyhead/SleepLib/profiles.cpp
View File

@ -1,4 +1,4 @@
/* SleepLib Profiles Implementation /* SleepLib Profiles Implementation
* *
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -14,6 +14,8 @@
#include <QProcess> #include <QProcess>
#include <QByteArray> #include <QByteArray>
#include <QHostInfo> #include <QHostInfo>
#include <QApplication>
#include <QSettings>
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
@ -24,8 +26,8 @@
#include "machine_loader.h" #include "machine_loader.h"
#include <QApplication>
#include "mainwindow.h" #include "mainwindow.h"
#include "translation.h"
extern MainWindow *mainwin; extern MainWindow *mainwin;
Preferences *p_pref; Preferences *p_pref;
@ -53,24 +55,28 @@ Profile::Profile(QString path)
} }
p_filename = p_path + p_name + STR_ext_XML; p_filename = p_path + p_name + STR_ext_XML;
machlist.clear(); m_machlist.clear();
doctor = nullptr; Open(p_filename);
user = nullptr;
cpap = nullptr; Set(STR_GEN_DataFolder, QString("{home}/Profiles/{UserName}"));
oxi = nullptr;
appearance = nullptr; doctor = new DoctorInfo(this);
session = nullptr; user = new UserInfo(this);
general = nullptr; cpap = new CPAPSettings(this);
oxi = new OxiSettings(this);
appearance = new AppearanceSettings(this);
session = new SessionSettings(this);
general = new UserSettings(this);
OpenMachines();
m_opened=true;
} }
Profile::~Profile() Profile::~Profile()
{ {
QString lockfile=p_path+"/lockfile"; removeLock();
QFile file(lockfile);
file.remove();
if (m_opened) {
delete user; delete user;
delete doctor; delete doctor;
delete cpap; delete cpap;
@ -79,11 +85,9 @@ Profile::~Profile()
delete session; delete session;
delete general; delete general;
// delete machine objects...
for (QHash<MachineID, Machine *>::iterator it = machlist.begin(); it != machlist.end(); it++) { for (int i=0; i<m_machlist.size(); ++i) {
delete it.value(); delete m_machlist[i];
}
m_opened=false;
} }
for (QMap<QDate, Day *>::iterator d = daylist.begin(); d != daylist.end(); d++) { for (QMap<QDate, Day *>::iterator d = daylist.begin(); d != daylist.end(); d++) {
@ -95,7 +99,7 @@ Profile::~Profile()
bool Profile::Save(QString filename) bool Profile::Save(QString filename)
{ {
if (m_opened) { if (m_opened) {
return Preferences::Save(filename) && p_profile->StoreMachines(); return Preferences::Save(filename) && StoreMachines();
} else return false; } else return false;
} }
@ -120,34 +124,6 @@ QString Profile::checkLock()
return lockhost; return lockhost;
} }
bool Profile::Load(QString filename)
{
p_profile = this;
if (filename.isEmpty()) {
filename=p_filename;
}
if (m_opened) {
qDebug() << "Profile" << filename << "all ready open";
return true;
}
bool b = Open(filename);
this->Set(STR_GEN_DataFolder, QString("{home}/Profiles/{UserName}"));
doctor = new DoctorInfo(this);
user = new UserInfo(this);
cpap = new CPAPSettings(this);
oxi = new OxiSettings(this);
appearance = new AppearanceSettings(this);
session = new SessionSettings(this);
general = new UserSettings(this);
m_opened=true;
return b;
}
const QString STR_PROP_Brand = "brand"; const QString STR_PROP_Brand = "brand";
const QString STR_PROP_Model = "model"; const QString STR_PROP_Model = "model";
const QString STR_PROP_Series = "series"; const QString STR_PROP_Series = "series";
@ -157,20 +133,20 @@ const QString STR_PROP_Serial = "serial";
const QString STR_PROP_DataVersion = "dataversion"; const QString STR_PROP_DataVersion = "dataversion";
const QString STR_PROP_LastImported = "lastimported"; const QString STR_PROP_LastImported = "lastimported";
bool Profile::OpenMachines() void Profile::addLock()
{ {
if (m_machopened)
return true;
if (!m_opened) {
Open();
}
QFile lockfile(p_path+"lockfile"); QFile lockfile(p_path+"lockfile");
lockfile.open(QFile::WriteOnly); lockfile.open(QFile::WriteOnly);
QByteArray ba; QByteArray ba;
ba.append(QHostInfo::localHostName()); ba.append(QHostInfo::localHostName());
lockfile.write(ba); lockfile.write(ba);
lockfile.close(); lockfile.close();
}
bool Profile::OpenMachines()
{
if (m_machopened)
return true;
QString filename = p_path+"machines.xml"; QString filename = p_path+"machines.xml";
QFile file(filename); QFile file(filename);
@ -198,7 +174,7 @@ bool Profile::OpenMachines()
QString pKey = elem.tagName(); QString pKey = elem.tagName();
if (pKey.toLower() != "machine") { if (pKey.toLower() != "machine") {
qWarning() << "Profile::ExtraLoad() pKey!=\"machine\""; qWarning() << "Profile::OpenMachines() pKey!=\"machine\"";
elem = elem.nextSiblingElement(); elem = elem.nextSiblingElement();
continue; continue;
} }
@ -251,33 +227,31 @@ bool Profile::OpenMachines()
} }
} }
Machine *m = nullptr; Machine *m = nullptr;
m = MachineLoader::CreateMachine(info, m_id); // Create Machine needs a profile passed to it..
//m->setId(m_id);
m = CreateMachine(info, m_id);
if (m) m->properties = prop; if (m) m->properties = prop;
elem = elem.nextSiblingElement(); elem = elem.nextSiblingElement();
} }
m_machopened = true; m_machopened = true;
return true; return true;
} }
bool Profile::StoreMachines() bool Profile::StoreMachines()
{ {
QDomDocument doc("Machines"); QDomDocument doc("Machines");
QDomElement elem = ExtraSave(doc);
doc.appendChild(elem);
QDomElement mach = doc.createElement("machines"); QDomElement mach = doc.createElement("machines");
for (QHash<MachineID, Machine *>::iterator i = machlist.begin(); i != machlist.end(); i++) { for (int i=0; i<m_machlist.size(); ++i) {
Machine *m = m_machlist[i];
QDomElement me = doc.createElement("machine"); QDomElement me = doc.createElement("machine");
Machine *m = i.value();
me.setAttribute("id", (int)m->id()); me.setAttribute("id", (int)m->id());
me.setAttribute("type", (int)m->type()); me.setAttribute("type", (int)m->type());
me.setAttribute("class", m->loaderName()); me.setAttribute("class", m->loaderName());
@ -285,7 +259,7 @@ bool Profile::StoreMachines()
QDomElement pe = doc.createElement("properties"); QDomElement pe = doc.createElement("properties");
me.appendChild(pe); me.appendChild(pe);
for (QHash<QString, QString>::iterator j = i.value()->properties.begin(); j != i.value()->properties.end(); j++) { for (QHash<QString, QString>::iterator j = m->properties.begin(); j != m->properties.end(); j++) {
QDomElement pp = doc.createElement(j.key()); QDomElement pp = doc.createElement(j.key());
pp.appendChild(doc.createTextNode(j.value())); pp.appendChild(doc.createTextNode(j.value()));
pe.appendChild(pp); pe.appendChild(pp);
@ -569,13 +543,28 @@ void Profile::DataFormatError(Machine *m)
return; return;
} }
void Profile::UnloadMachineData()
{
Q_ASSERT(m_machopened);
QMap<QDate, Day *>::iterator it;
for (it = daylist.begin(); it != daylist.end(); ++it) {
delete it.value();
}
daylist.clear();
for (int i=0; i<m_machlist.size(); ++i) {
Machine *m = m_machlist[i];
m->sessionlist.clear();
m->day.clear();
}
removeLock();
}
void Profile::LoadMachineData() void Profile::LoadMachineData()
{ {
if (!m_machopened) OpenMachines(); addLock();
QHash<MachineID, QMap<QDate, QHash<ChannelID, EventDataType> > > cache;
for (QHash<MachineID, Machine *>::iterator i = machlist.begin(); i != machlist.end(); i++) { for (int i=0; i<m_machlist.size();++i) {
Machine *m = i.value(); Machine *m = m_machlist[i];
MachineLoader *loader = lookupLoader(m); MachineLoader *loader = lookupLoader(m);
@ -594,44 +583,106 @@ void Profile::LoadMachineData()
m->Load(); m->Load();
} }
} }
loadChannels();
} }
void Profile::removeMachine(Machine * m)
/**
* @brief Upgrade Machine XML section from old "profile.xml"
* @param root
*/
void Profile::ExtraLoad(QDomElement &root)
{ {
if (root.tagName().toLower() != "machines") { m_machlist.removeAll(m);
// Good! QHash<QString, QHash<QString, Machine *> >::iterator mlit = MachineList.find(m->loaderName());
return;
if (mlit != MachineList.end()) {
QHash<QString, Machine *>::iterator mit = mlit.value().find(m->serial());
if (mit != mlit.value().end()) {
mlit.value().erase(mit);
}
} }
// Save this sucker
QDomDocument doc("Machines");
doc.appendChild(root);
QFile file(p_path+"/machines.xml");
// Don't do anything if machines.xml already exists.. the user ran the old version!
if (file.exists()) return;
file.open(QFile::WriteOnly);
file.write(doc.toByteArray());
file.close();
} }
Machine * Profile::lookupMachine(QString serial, QString loadername)
{
QHash<QString, QHash<QString, Machine *> >::iterator mlit = MachineList.find(loadername);
if (mlit != MachineList.end()) {
QHash<QString, Machine *>::iterator mit = mlit.value().find(serial);
if (mit != mlit.value().end()) {
return mit.value();
}
}
return nullptr;
}
Machine * Profile::CreateMachine(MachineInfo info, MachineID id)
{
Machine *m = nullptr;
QHash<QString, QHash<QString, Machine *> >::iterator mlit = MachineList.find(info.loadername);
if (mlit != MachineList.end()) {
QHash<QString, Machine *>::iterator mit = mlit.value().find(info.serial);
if (mit != mlit.value().end()) {
mit.value()->setInfo(info); // update info
return mit.value();
}
}
// Before we create, find any lost folder to get the old ID
if ((id == 0) && ((info.type == MT_OXIMETER) || (info.type == MT_JOURNAL) || (info.type == MT_POSITION)|| (info.type == MT_SLEEPSTAGE))) {
QString dataPath = Get("{" + STR_GEN_DataFolder + "}/");
QDir dir(dataPath);
QStringList namefilter(QString(info.loadername+"_*"));
QStringList files = dir.entryList(namefilter, QDir::Dirs);
if (files.size() > 0) {
QString idstr = files[0].section("_",-1);
bool ok;
id = idstr.toInt(&ok, 16);
}
}
switch (info.type) {
case MT_CPAP:
m = new CPAP(id);
break;
case MT_SLEEPSTAGE:
m = new SleepStage(id);
break;
case MT_OXIMETER:
m = new Oximeter(id);
break;
case MT_POSITION:
m = new PositionSensor(id);
break;
case MT_JOURNAL:
m = new Machine(id);
m->setType(MT_JOURNAL);
break;
default:
m = new Machine(id);
break;
}
m->setInfo(info);
qDebug() << "Added" << info.loadername << "Machine Record" << (info.serial.isEmpty() ? m->hexid() : info.serial);
MachineList[info.loadername][info.serial] = m;
AddMachine(m);
return m;
}
void Profile::AddMachine(Machine *m) void Profile::AddMachine(Machine *m)
{ {
if (!m) { if (!m) {
qWarning() << "Empty Machine in Profile::AddMachine()"; qWarning() << "Empty Machine in Profile::AddMachine()";
return; return;
} }
m_machlist.append(m);
machlist[m->id()] = m;
} }
void Profile::DelMachine(Machine *m) void Profile::DelMachine(Machine *m)
@ -641,8 +692,7 @@ void Profile::DelMachine(Machine *m)
return; return;
} }
m->loader()->removeMachine(m); removeMachine(m);
machlist.erase(machlist.find(m->id()));
} }
Day *Profile::addDay(QDate date) Day *Profile::addDay(QDate date)
@ -788,19 +838,18 @@ MachineLoader *GetLoader(QString name)
QList<Machine *> Profile::GetMachines(MachineType t) QList<Machine *> Profile::GetMachines(MachineType t)
{ {
QList<Machine *> vec; QList<Machine *> vec;
QHash<MachineID, Machine *>::iterator i;
QHash<MachineID, Machine *>::iterator machlist_end=machlist.end();
for (i = machlist.begin(); i != machlist_end; i++) { for (int i=0; i<m_machlist.size(); ++i) {
if (!i.value()) { Machine * m = m_machlist[i];
qWarning() << "Profile::GetMachines() i->second == nullptr"; if (!m) {
qWarning() << "Profile::GetMachines() m == nullptr";
continue; continue;
} }
MachineType mt = i.value()->type(); MachineType mt = m->type();
if ((t == MT_UNKNOWN) || (mt == t)) { if ((t == MT_UNKNOWN) || (mt == t)) {
vec.push_back(i.value()); vec.push_back(m);
} }
} }
@ -879,14 +928,10 @@ QMap<QString, Profile *> profiles;
void Done() void Done()
{ {
PREF.Save(); PREF.Save();
LAYOUT.Save();
p_profile->Save();
delete p_profile;
profiles.clear(); profiles.clear();
delete p_pref; delete p_pref;
delete p_layout; delete AppSetting;
DestroyLoaders(); DestroyLoaders();
} }
@ -910,7 +955,6 @@ Profile *Create(QString name)
//path+="/"+name; //path+="/"+name;
p_profile = new Profile(path); p_profile = new Profile(path);
p_profile->Load();
profiles[name] = p_profile; profiles[name] = p_profile;
p_profile->user->setUserName(name); p_profile->user->setUserName(name);
//p_profile->Set("Realname",realname); //p_profile->Set("Realname",realname);
@ -945,6 +989,8 @@ void saveProfileList()
QDomElement root = doc.createElement("profiles"); QDomElement root = doc.createElement("profiles");
doc.appendChild(root); doc.appendChild(root);
root.appendChild(doc.createComment("This file is created during Profile Scan for cloud access convenience, it's not used by Desktop version of SleepyHead."));
QMap<QString, Profile *>::iterator it; QMap<QString, Profile *>::iterator it;
for (it = profiles.begin(); it != profiles.end(); ++it) { for (it = profiles.begin(); it != profiles.end(); ++it) {
@ -963,6 +1009,35 @@ void saveProfileList()
file.close(); file.close();
} }
int CleanupProfile(Profile *prof)
{
// Migrate old per Profile settings that should have been put in program main preferences.
QStringList migrateList;
migrateList << STR_IS_Multithreading << STR_US_ShowPerformance << STR_US_ShowDebug
<< STR_US_ScrollDampening << STR_AS_CalendarVisible << STR_IS_CacheSessions
<< STR_AS_LineCursorMode << STR_AS_RightSidebarVisible << STR_AS_DailyPanelWidth
<< STR_US_ShowPerformance << STR_AS_GraphHeight << STR_AS_GraphSnapshots
<< STR_AS_AntiAliasing << STR_AS_LineThickness << STR_AS_UsePixmapCaching
<< STR_AS_SquareWave << STR_AS_RightPanelWidth << STR_US_TooltipTimeout
<< STR_AS_Animations << STR_AS_AllowYAxisScaling << STR_AS_GraphTooltips
<< STR_CS_UserEventPieChart << STR_AS_OverlayType << STR_AS_OverviewLinechartMode;
int cnt = 0;
for (int i=0; i<migrateList.length(); ++i) {
const QString &prf = migrateList.at(i);
if (prof->contains(prf)) {
qDebug() << "Migrating profile preference" << prf;
PREF[prf] = (*prof)[prf];
prof->Erase(prf);
cnt++;
}
}
if (cnt > 0) {
qDebug() << "Migrated" << cnt << "preferences for profile" << (*prof)[STR_UI_UserName];
prof->Save();
}
return cnt;
}
/** /**
* @brief Scan Profile directory loading user profiles * @brief Scan Profile directory loading user profiles
@ -986,6 +1061,8 @@ void Scan()
QFileInfoList list = dir.entryInfoList(); QFileInfoList list = dir.entryInfoList();
int cleanup = 0;
// Iterate through subdirectories and load profiles.. // Iterate through subdirectories and load profiles..
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
QFileInfo fi = list.at(i); QFileInfo fi = list.at(i);
@ -994,8 +1071,15 @@ void Scan()
//prof->Open(); //prof->Open();
profiles[fi.fileName()] = prof; profiles[fi.fileName()] = prof;
// Migrate any old settings
cleanup += CleanupProfile(prof);
} }
if (cleanup > 0) {
qDebug() << "Saving preferences after migration";
PREF.Save();
}
// Update profiles.xml for mobile version // Update profiles.xml for mobile version
saveProfileList(); saveProfileList();
} }
@ -1791,11 +1875,8 @@ QDate Profile::LastGoodDay(MachineType mt)
bool Profile::channelAvailable(ChannelID code) bool Profile::channelAvailable(ChannelID code)
{ {
QHash<MachineID, Machine *>::iterator it; for (int i=0; i<m_machlist.size(); ++i) {
QHash<MachineID, Machine *>::iterator machlist_end=machlist.end(); Machine * mach = m_machlist[i];
for (it = machlist.begin(); it != machlist_end; it++) {
Machine * mach = it.value();
if (mach->hasChannel(code)) if (mach->hasChannel(code))
return true; return true;
} }
@ -1833,3 +1914,145 @@ bool Profile::hasChannel(ChannelID code)
return found; return found;
} }
const quint16 chandata_version = 1;
void Profile::saveChannels()
{
QString filename = Get("{DataFolder}/") + "channels.dat";
QFile f(filename);
qDebug() << "Saving Channel States";
f.open(QFile::WriteOnly);
QDataStream out(&f);
out.setVersion(QDataStream::Qt_4_6);
out.setByteOrder(QDataStream::LittleEndian);
out << (quint32)magic;
out << (quint16)chandata_version;
QSettings settings(getDeveloperName(), getAppName());
(*p_profile)[STR_PREF_Language] = settings.value(LangSetting, "").toString();
quint16 size = schema::channel.channels.size();
out << size;
QHash<ChannelID, schema::Channel *>::iterator it;
QHash<ChannelID, schema::Channel *>::iterator it_end = schema::channel.channels.end();
for (it = schema::channel.channels.begin(); it != it_end; ++it) {
schema::Channel * chan = it.value();
out << it.key();
out << chan->code();
out << chan->enabled();
out << chan->defaultColor();
out << chan->fullname();
out << chan->label();
out << chan->description();
out << chan->lowerThreshold();
out << chan->lowerThresholdColor();
out << chan->upperThreshold();
out << chan->upperThresholdColor();
out << chan->showInOverview();
}
f.close();
}
void Profile::loadChannels()
{
bool changing_language = false;
QString filename = Get("{DataFolder}/") + "channels.dat";
QFile f(filename);
if (!f.open(QFile::ReadOnly)) {
return;
}
qDebug() << "Loading channel.dat States";
QDataStream in(&f);
in.setVersion(QDataStream::Qt_4_6);
in.setByteOrder(QDataStream::LittleEndian);
quint32 mag;
in >> mag;
if (magic != mag) {
qDebug() << "LoadChannels: Faulty data";
return;
}
quint16 version;
in >> version;
QSettings settings(getDeveloperName(), getAppName());
QString language = Get(STR_PREF_Language);
if (settings.value(LangSetting, "").toString() != language) {
qDebug() << "Language change detected, resetting default channel names";
changing_language = true;
}
quint16 size;
in >> size;
QString name;
ChannelID code;
bool enabled;
QColor color;
EventDataType lowerThreshold;
QColor lowerThresholdColor;
EventDataType upperThreshold;
QColor upperThresholdColor;
QString fullname;
QString label;
QString description;
bool showOverview = false;
for (int i=0; i < size; i++) {
in >> code;
schema::Channel * chan = &schema::channel[code];
in >> name;
if (chan->code() != name) {
qDebug() << "Looking up channel" << name << "by name, as it's ChannedID must have changed";
chan = &schema::channel[name];
}
in >> enabled;
in >> color;
in >> fullname;
in >> label;
in >> description;
in >> lowerThreshold;
in >> lowerThresholdColor;
in >> upperThreshold;
in >> upperThresholdColor;
if (version >= 1) {
in >> showOverview;
}
if (chan->isNull()) {
qDebug() << "loadChannels has no idea about channel" << name;
if (in.atEnd()) return;
continue;
}
chan->setEnabled(enabled);
chan->setDefaultColor(color);
// Don't import channel descriptions if event renaming is turned off. (helps pick up new translations)
if (changing_language) {
// Nothing
} else {
chan->setFullname(fullname);
chan->setLabel(label);
chan->setDescription(description);
}
chan->setLowerThreshold(lowerThreshold);
chan->setLowerThresholdColor(lowerThresholdColor);
chan->setUpperThreshold(upperThreshold);
chan->setUpperThresholdColor(upperThresholdColor);
chan->setShowInOverview(showOverview);
if (in.atEnd()) return;
}
f.close();
}

254
sleepyhead/SleepLib/profiles.h
View File

@ -1,4 +1,4 @@
/* SleepLib Profiles Header /* SleepLib Profiles Header
* *
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -23,7 +23,6 @@ class Machine;
enum Gender { GenderNotSpecified, Male, Female }; enum Gender { GenderNotSpecified, Male, Female };
enum MaskType { Mask_Unknown, Mask_NasalPillows, Mask_Hybrid, Mask_StandardNasal, Mask_FullFace }; enum MaskType { Mask_Unknown, Mask_NasalPillows, Mask_Hybrid, Mask_StandardNasal, Mask_FullFace };
enum OverviewLinechartModes { OLC_Bartop, OLC_Lines };
class DoctorInfo; class DoctorInfo;
class UserInfo; class UserInfo;
@ -33,6 +32,7 @@ class CPAPSettings;
class AppearanceSettings; class AppearanceSettings;
class SessionSettings; class SessionSettings;
/*! /*!
\class Profile \class Profile
\author Mark Watkins \author Mark Watkins
@ -47,9 +47,6 @@ class Profile : public Preferences
virtual ~Profile(); virtual ~Profile();
//! \brief Open profile, parse profile.xml file, and initialize helper classes
virtual bool Load(QString filename = "");
//! \brief Parse machines.xml //! \brief Parse machines.xml
bool OpenMachines(); bool OpenMachines();
bool StoreMachines(); bool StoreMachines();
@ -60,6 +57,8 @@ class Profile : public Preferences
//! \brief Removes a lockfile //! \brief Removes a lockfile
bool removeLock(); bool removeLock();
void addLock();
//! \brief Save Profile object (This is an extension to Preference::Save(..)) //! \brief Save Profile object (This is an extension to Preference::Save(..))
virtual bool Save(QString filename = ""); virtual bool Save(QString filename = "");
@ -72,6 +71,9 @@ class Profile : public Preferences
//! \brief Loads all machine (summary) data belonging to this profile //! \brief Loads all machine (summary) data belonging to this profile
void LoadMachineData(); void LoadMachineData();
//! \brief Unloads all machine (summary) data for this profile to free up memory;
void UnloadMachineData();
//! \brief Barf because data format has changed. This does a purge of CPAP data for machine *m //! \brief Barf because data format has changed. This does a purge of CPAP data for machine *m
void DataFormatError(Machine *m); void DataFormatError(Machine *m);
@ -182,8 +184,6 @@ class Profile : public Preferences
Day * findSessionDay(Session * session); Day * findSessionDay(Session * session);
// XML load components
virtual void ExtraLoad(QDomElement &root);
//! \brief Looks for the first date containing a day record matching machinetype //! \brief Looks for the first date containing a day record matching machinetype
QDate FirstDay(MachineType mt = MT_UNKNOWN); QDate FirstDay(MachineType mt = MT_UNKNOWN);
@ -206,8 +206,13 @@ class Profile : public Preferences
//! \brief QMap of day records (iterates in order). //! \brief QMap of day records (iterates in order).
QMap<QDate, Day *> daylist; QMap<QDate, Day *> daylist;
//! \brief List of machines, indexed by MachineID. void removeMachine(Machine *);
QHash<MachineID, Machine *> machlist; Machine * lookupMachine(QString serial, QString loadername);
Machine * CreateMachine(MachineInfo info, MachineID id = 0);
void loadChannels();
void saveChannels();
bool is_first_day; bool is_first_day;
@ -218,6 +223,7 @@ class Profile : public Preferences
AppearanceSettings *appearance; AppearanceSettings *appearance;
UserSettings *general; UserSettings *general;
SessionSettings *session; SessionSettings *session;
QList<Machine *> m_machlist;
protected: protected:
QDate m_first; QDate m_first;
@ -225,18 +231,37 @@ class Profile : public Preferences
bool m_opened; bool m_opened;
bool m_machopened; bool m_machopened;
QHash<QString, QHash<QString, Machine *> > MachineList;
}; };
class MachineLoader; class MachineLoader;
extern MachineLoader *GetLoader(QString name); extern MachineLoader *GetLoader(QString name);
extern Preferences *p_pref; extern Preferences *p_pref;
extern Preferences *p_layout;
extern Profile *p_profile; extern Profile *p_profile;
// these are bad and must change // these are bad and must change
#define PREF (*p_pref) #define PREF (*p_pref)
#define LAYOUT (*p_layout)
//! \brief Returns a count of all files & directories in a supplied folder
int dirCount(QString path);
namespace Profiles {
extern QMap<QString, Profile *> profiles;
void Scan(); // Initialize and load Profile
void Done(); // Save all Profile objects and clear list
int CleanupProfile(Profile *prof);
Profile *Create(QString name);
Profile *Get(QString name);
Profile *Get();
}
// DoctorInfo Strings // DoctorInfo Strings
const QString STR_DI_Name = "DoctorName"; const QString STR_DI_Name = "DoctorName";
@ -288,7 +313,6 @@ const QString STR_CS_UntreatedAHI = "UntreatedAHI";
const QString STR_CS_Notes = "CPAPNotes"; const QString STR_CS_Notes = "CPAPNotes";
const QString STR_CS_DateDiagnosed = "DateDiagnosed"; const QString STR_CS_DateDiagnosed = "DateDiagnosed";
const QString STR_CS_UserEventFlagging = "UserEventFlagging"; const QString STR_CS_UserEventFlagging = "UserEventFlagging";
const QString STR_CS_UserEventPieChart = "UserEventPieChart";
const QString STR_CS_AutoImport = "AutoImport"; const QString STR_CS_AutoImport = "AutoImport";
const QString STR_CS_BrickWarning = "BrickWarning"; const QString STR_CS_BrickWarning = "BrickWarning";
@ -312,10 +336,8 @@ const QString STR_CS_20cmH2OLeaks = "Custom20cmH2OLeaks";
// ImportSettings Strings // ImportSettings Strings
const QString STR_IS_DaySplitTime = "DaySplitTime"; const QString STR_IS_DaySplitTime = "DaySplitTime";
const QString STR_IS_PreloadSummaries = "PreloadSummaries"; const QString STR_IS_PreloadSummaries = "PreloadSummaries";
const QString STR_IS_CacheSessions = "MemoryHog";
const QString STR_IS_CombineCloseSessions = "CombineCloserSessions"; const QString STR_IS_CombineCloseSessions = "CombineCloserSessions";
const QString STR_IS_IgnoreShorterSessions = "IgnoreShorterSessions"; const QString STR_IS_IgnoreShorterSessions = "IgnoreShorterSessions";
const QString STR_IS_Multithreading = "EnableMultithreading";
const QString STR_IS_BackupCardData = "BackupCardData"; const QString STR_IS_BackupCardData = "BackupCardData";
const QString STR_IS_CompressBackupData = "CompressBackupData"; const QString STR_IS_CompressBackupData = "CompressBackupData";
const QString STR_IS_CompressSessionData = "CompressSessionData"; const QString STR_IS_CompressSessionData = "CompressSessionData";
@ -323,76 +345,26 @@ const QString STR_IS_IgnoreOlderSessions = "IgnoreOlderSessions";
const QString STR_IS_IgnoreOlderSessionsDate = "IgnoreOlderSessionsDate"; const QString STR_IS_IgnoreOlderSessionsDate = "IgnoreOlderSessionsDate";
const QString STR_IS_LockSummarySessions = "LockSummarySessions"; const QString STR_IS_LockSummarySessions = "LockSummarySessions";
// AppearanceSettings Strings
const QString STR_AS_GraphHeight = "GraphHeight";
const QString STR_AS_DailyPanelWidth = "DailyPanelWidth";
const QString STR_AS_RightPanelWidth = "RightPanelWidth";
const QString STR_AS_AntiAliasing = "UseAntiAliasing";
const QString STR_AS_GraphSnapshots = "EnableGraphSnapshots";
const QString STR_AS_Animations = "AnimationsAndTransitions";
const QString STR_AS_SquareWave = "SquareWavePlots";
const QString STR_AS_OverlayType = "OverlayType";
const QString STR_AS_OverviewLinechartMode = "OverviewLinechartMode";
const QString STR_AS_UsePixmapCaching = "UsePixmapCaching";
const QString STR_AS_AllowYAxisScaling = "AllowYAxisScaling";
const QString STR_AS_GraphTooltips = "GraphTooltips";
const QString STR_AS_LineThickness = "LineThickness";
const QString STR_AS_LineCursorMode = "LineCursorMode";
const QString STR_AS_CalendarVisible = "CalendarVisible";
const QString STR_AS_RightSidebarVisible = "RightSidebarVisible";
// UserSettings Strings // UserSettings Strings
const QString STR_US_UnitSystem = "UnitSystem"; const QString STR_US_UnitSystem = "UnitSystem";
const QString STR_US_EventWindowSize = "EventWindowSize"; const QString STR_US_EventWindowSize = "EventWindowSize";
const QString STR_US_SkipEmptyDays = "SkipEmptyDays"; const QString STR_US_SkipEmptyDays = "SkipEmptyDays";
const QString STR_US_RebuildCache = "RebuildCache"; const QString STR_US_RebuildCache = "RebuildCache";
const QString STR_US_ShowDebug = "ShowDebug";
const QString STR_US_ShowPerformance = "ShowPerformance";
const QString STR_US_LinkGroups = "LinkGroups"; const QString STR_US_LinkGroups = "LinkGroups";
const QString STR_US_CalculateRDI = "CalculateRDI"; const QString STR_US_CalculateRDI = "CalculateRDI";
const QString STR_US_ShowSerialNumbers = "ShowSerialNumbers";
const QString STR_US_PrefCalcMiddle = "PrefCalcMiddle"; const QString STR_US_PrefCalcMiddle = "PrefCalcMiddle";
const QString STR_US_PrefCalcPercentile = "PrefCalcPercentile"; const QString STR_US_PrefCalcPercentile = "PrefCalcPercentile";
const QString STR_US_PrefCalcMax = "PrefCalcMax"; const QString STR_US_PrefCalcMax = "PrefCalcMax";
const QString STR_US_TooltipTimeout = "TooltipTimeout";
const QString STR_US_ScrollDampening = "ScrollDampening";
const QString STR_US_ShowUnknownFlags = "ShowUnknownFlags"; const QString STR_US_ShowUnknownFlags = "ShowUnknownFlags";
const QString STR_US_StatReportMode = "StatReportMode"; const QString STR_US_StatReportMode = "StatReportMode";
const QString STR_US_LastOverviewRange = "LastOverviewRange"; const QString STR_US_LastOverviewRange = "LastOverviewRange";
// Parent class for subclasses that manipulate the profile. class DoctorInfo : public PrefSettings
class ProfileSettings
{
public:
ProfileSettings(Profile *profile)
: m_profile(profile)
{ }
inline void setPref(QString name, QVariant value) {
(*m_profile)[name] = value;
}
inline void initPref(QString name, QVariant value) {
m_profile->init(name, value);
}
inline QVariant getPref(QString name) const {
return (*m_profile)[name];
}
void setProfile(Profile *profile) {
m_profile = profile;
}
public:
Profile *m_profile;
};
class DoctorInfo : public ProfileSettings
{ {
public: public:
DoctorInfo(Profile *profile) DoctorInfo(Profile *profile)
: ProfileSettings(profile) : PrefSettings(profile)
{ {
initPref(STR_DI_Name, QString()); initPref(STR_DI_Name, QString());
initPref(STR_DI_Phone, QString()); initPref(STR_DI_Phone, QString());
@ -421,11 +393,11 @@ class DoctorInfo : public ProfileSettings
/*! \class UserInfo /*! \class UserInfo
\brief Profile Options relating to the User Information \brief Profile Options relating to the User Information
*/ */
class UserInfo : public ProfileSettings class UserInfo : public PrefSettings
{ {
public: public:
UserInfo(Profile *profile) UserInfo(Profile *profile)
: ProfileSettings(profile) : PrefSettings(profile)
{ {
initPref(STR_UI_DOB, QDate(1970, 1, 1)); initPref(STR_UI_DOB, QDate(1970, 1, 1));
initPref(STR_UI_FirstName, QString()); initPref(STR_UI_FirstName, QString());
@ -486,12 +458,12 @@ class UserInfo : public ProfileSettings
/*! \class OxiSettings /*! \class OxiSettings
\brief Profile Options relating to the Oximetry settings \brief Profile Options relating to the Oximetry settings
*/ */
class OxiSettings : public ProfileSettings class OxiSettings : public PrefSettings
{ {
public: public:
//! \brief Create OxiSettings object given Profile *p, and initialize the defaults //! \brief Create OxiSettings object given Profile *p, and initialize the defaults
OxiSettings(Profile *profile) OxiSettings(Profile *profile)
: ProfileSettings(profile) : PrefSettings(profile)
{ {
initPref(STR_OS_EnableOximetry, false); initPref(STR_OS_EnableOximetry, false);
initPref(STR_OS_DefaultDevice, QString()); initPref(STR_OS_DefaultDevice, QString());
@ -536,11 +508,11 @@ class OxiSettings : public ProfileSettings
/*! \class CPAPSettings /*! \class CPAPSettings
\brief Profile Options relating to the CPAP settings \brief Profile Options relating to the CPAP settings
*/ */
class CPAPSettings : public ProfileSettings class CPAPSettings : public PrefSettings
{ {
public: public:
CPAPSettings(Profile *profile) CPAPSettings(Profile *profile)
: ProfileSettings(profile) : PrefSettings(profile)
{ {
initPref(STR_CS_ComplianceHours, 4); initPref(STR_CS_ComplianceHours, 4);
initPref(STR_CS_ShowCompliance, true); initPref(STR_CS_ShowCompliance, true);
@ -565,7 +537,6 @@ class CPAPSettings : public ProfileSettings
initPref(STR_CS_AHIReset, false); initPref(STR_CS_AHIReset, false);
initPref(STR_CS_LeakRedline, 24.0); initPref(STR_CS_LeakRedline, 24.0);
initPref(STR_CS_ShowLeakRedline, true); initPref(STR_CS_ShowLeakRedline, true);
initPref(STR_CS_UserEventPieChart, false);
initPref(STR_CS_ResyncFromUserFlagging, false); initPref(STR_CS_ResyncFromUserFlagging, false);
initPref(STR_CS_AutoImport, false); initPref(STR_CS_AutoImport, false);
initPref(STR_CS_BrickWarning, true); initPref(STR_CS_BrickWarning, true);
@ -602,7 +573,6 @@ class CPAPSettings : public ProfileSettings
int clockDrift() const { return m_clock_drift; } int clockDrift() const { return m_clock_drift; }
EventDataType leakRedline() const { return getPref(STR_CS_LeakRedline).toFloat(); } EventDataType leakRedline() const { return getPref(STR_CS_LeakRedline).toFloat(); }
bool showLeakRedline() const { return getPref(STR_CS_ShowLeakRedline).toBool(); } bool showLeakRedline() const { return getPref(STR_CS_ShowLeakRedline).toBool(); }
bool userEventPieChart() const { return getPref(STR_CS_UserEventPieChart).toBool(); }
bool resyncFromUserFlagging() const { return getPref(STR_CS_ResyncFromUserFlagging).toBool(); } bool resyncFromUserFlagging() const { return getPref(STR_CS_ResyncFromUserFlagging).toBool(); }
bool autoImport() const { return getPref(STR_CS_AutoImport).toBool(); } bool autoImport() const { return getPref(STR_CS_AutoImport).toBool(); }
bool brickWarning() const { return getPref(STR_CS_BrickWarning).toBool(); } bool brickWarning() const { return getPref(STR_CS_BrickWarning).toBool(); }
@ -639,7 +609,6 @@ class CPAPSettings : public ProfileSettings
} }
void setLeakRedline(EventDataType value) { setPref(STR_CS_LeakRedline, value); } void setLeakRedline(EventDataType value) { setPref(STR_CS_LeakRedline, value); }
void setShowLeakRedline(bool reset) { setPref(STR_CS_ShowLeakRedline, reset); } void setShowLeakRedline(bool reset) { setPref(STR_CS_ShowLeakRedline, reset); }
void setUserEventPieChart(bool b) { setPref(STR_CS_UserEventPieChart, b); }
void setResyncFromUserFlagging(bool b) { setPref(STR_CS_ResyncFromUserFlagging, b); } void setResyncFromUserFlagging(bool b) { setPref(STR_CS_ResyncFromUserFlagging, b); }
void setAutoImport(bool b) { setPref(STR_CS_AutoImport, b); } void setAutoImport(bool b) { setPref(STR_CS_AutoImport, b); }
void setBrickWarning(bool b) { setPref(STR_CS_BrickWarning, b); } void setBrickWarning(bool b) { setPref(STR_CS_BrickWarning, b); }
@ -655,18 +624,16 @@ class CPAPSettings : public ProfileSettings
/*! \class ImportSettings /*! \class ImportSettings
\brief Profile Options relating to the Import process \brief Profile Options relating to the Import process
*/ */
class SessionSettings : public ProfileSettings class SessionSettings : public PrefSettings
{ {
public: public:
SessionSettings(Profile *profile) SessionSettings(Profile *profile)
: ProfileSettings(profile) : PrefSettings(profile)
{ {
initPref(STR_IS_DaySplitTime, QTime(12, 0, 0)); initPref(STR_IS_DaySplitTime, QTime(12, 0, 0));
initPref(STR_IS_CacheSessions, false);
initPref(STR_IS_PreloadSummaries, false); initPref(STR_IS_PreloadSummaries, false);
initPref(STR_IS_CombineCloseSessions, 240); initPref(STR_IS_CombineCloseSessions, 240);
initPref(STR_IS_IgnoreShorterSessions, 5); initPref(STR_IS_IgnoreShorterSessions, 5);
initPref(STR_IS_Multithreading, QThread::idealThreadCount() > 1);
initPref(STR_IS_BackupCardData, true); initPref(STR_IS_BackupCardData, true);
initPref(STR_IS_CompressBackupData, false); initPref(STR_IS_CompressBackupData, false);
initPref(STR_IS_CompressSessionData, false); initPref(STR_IS_CompressSessionData, false);
@ -677,11 +644,9 @@ class SessionSettings : public ProfileSettings
} }
QTime daySplitTime() const { return getPref(STR_IS_DaySplitTime).toTime(); } QTime daySplitTime() const { return getPref(STR_IS_DaySplitTime).toTime(); }
bool cacheSessions() const { return getPref(STR_IS_CacheSessions).toBool(); }
bool preloadSummaries() const { return getPref(STR_IS_PreloadSummaries).toBool(); } bool preloadSummaries() const { return getPref(STR_IS_PreloadSummaries).toBool(); }
double combineCloseSessions() const { return getPref(STR_IS_CombineCloseSessions).toDouble(); } double combineCloseSessions() const { return getPref(STR_IS_CombineCloseSessions).toDouble(); }
double ignoreShortSessions() const { return getPref(STR_IS_IgnoreShorterSessions).toDouble(); } double ignoreShortSessions() const { return getPref(STR_IS_IgnoreShorterSessions).toDouble(); }
bool multithreading() const { return getPref(STR_IS_Multithreading).toBool(); }
bool compressSessionData() const { return getPref(STR_IS_CompressSessionData).toBool(); } bool compressSessionData() const { return getPref(STR_IS_CompressSessionData).toBool(); }
bool compressBackupData() const { return getPref(STR_IS_CompressBackupData).toBool(); } bool compressBackupData() const { return getPref(STR_IS_CompressBackupData).toBool(); }
bool backupCardData() const { return getPref(STR_IS_BackupCardData).toBool(); } bool backupCardData() const { return getPref(STR_IS_BackupCardData).toBool(); }
@ -690,11 +655,9 @@ class SessionSettings : public ProfileSettings
bool lockSummarySessions() const { return getPref(STR_IS_LockSummarySessions).toBool(); } bool lockSummarySessions() const { return getPref(STR_IS_LockSummarySessions).toBool(); }
void setDaySplitTime(QTime time) { setPref(STR_IS_DaySplitTime, time); } void setDaySplitTime(QTime time) { setPref(STR_IS_DaySplitTime, time); }
void setCacheSessions(bool c) { setPref(STR_IS_CacheSessions, c); }
void setPreloadSummaries(bool b) { setPref(STR_IS_PreloadSummaries, b); } void setPreloadSummaries(bool b) { setPref(STR_IS_PreloadSummaries, b); }
void setCombineCloseSessions(double val) { setPref(STR_IS_CombineCloseSessions, val); } void setCombineCloseSessions(double val) { setPref(STR_IS_CombineCloseSessions, val); }
void setIgnoreShortSessions(double val) { setPref(STR_IS_IgnoreShorterSessions, val); } void setIgnoreShortSessions(double val) { setPref(STR_IS_IgnoreShorterSessions, val); }
void setMultithreading(bool enabled) { setPref(STR_IS_Multithreading, enabled); }
void setBackupCardData(bool enabled) { setPref(STR_IS_BackupCardData, enabled); } void setBackupCardData(bool enabled) { setPref(STR_IS_BackupCardData, enabled); }
void setCompressBackupData(bool enabled) { setPref(STR_IS_CompressBackupData, enabled); } void setCompressBackupData(bool enabled) { setPref(STR_IS_CompressBackupData, enabled); }
void setCompressSessionData(bool enabled) { setPref(STR_IS_CompressSessionData, enabled); } void setCompressSessionData(bool enabled) { setPref(STR_IS_CompressSessionData, enabled); }
@ -707,128 +670,38 @@ class SessionSettings : public ProfileSettings
/*! \class AppearanceSettings /*! \class AppearanceSettings
\brief Profile Options relating to Visual Appearance \brief Profile Options relating to Visual Appearance
*/ */
class AppearanceSettings : public ProfileSettings class AppearanceSettings : public PrefSettings
{ {
public: public:
//! \brief Create AppearanceSettings object given Profile *p, and initialize the defaults //! \brief Create AppearanceSettings object given Profile *p, and initialize the defaults
AppearanceSettings(Profile *profile) AppearanceSettings(Profile *profile)
: ProfileSettings(profile) : PrefSettings(profile)
{ {
initPref(STR_AS_GraphHeight, 180.0);
initPref(STR_AS_DailyPanelWidth, 350.0);
initPref(STR_AS_RightPanelWidth, 230.0);
initPref(STR_AS_AntiAliasing, true);
initPref(STR_AS_GraphSnapshots, true);
initPref(STR_AS_Animations, true);
initPref(STR_AS_SquareWave, false);
initPref(STR_AS_AllowYAxisScaling, true);
initPref(STR_AS_GraphTooltips, true);
initPref(STR_AS_UsePixmapCaching, false);
initPref(STR_AS_OverlayType, ODT_Bars);
initPref(STR_AS_OverviewLinechartMode, OLC_Bartop);
initPref(STR_AS_LineThickness, 1.0);
initPref(STR_AS_LineCursorMode, true);
initPref(STR_AS_CalendarVisible, true);
initPref(STR_AS_RightSidebarVisible, true);
} }
//! \brief Returns the normal (unscaled) height of a graph
int graphHeight() const { return getPref(STR_AS_GraphHeight).toInt(); }
//! \brief Returns the normal (unscaled) height of a graph
int dailyPanelWidth() const { return getPref(STR_AS_DailyPanelWidth).toInt(); }
//! \brief Returns the normal (unscaled) height of a graph
int rightPanelWidth() const { return getPref(STR_AS_RightPanelWidth).toInt(); }
//! \brief Returns true if AntiAliasing (the graphical smoothing method) is enabled
bool antiAliasing() const { return getPref(STR_AS_AntiAliasing).toBool(); }
//! \brief Returns true if renderPixmap function is in use, which takes snapshots of graphs
bool graphSnapshots() const { return getPref(STR_AS_GraphSnapshots).toBool(); }
//! \brief Returns true if Graphical animations & Transitions will be drawn
bool animations() const { return getPref(STR_AS_Animations).toBool(); }
//! \brief Returns true if PixmapCaching acceleration will be used
bool usePixmapCaching() const { return getPref(STR_AS_UsePixmapCaching).toBool(); }
//! \brief Returns true if Square Wave plots are preferred (where possible)
bool squareWavePlots() const { return getPref(STR_AS_SquareWave).toBool(); }
//! \brief Whether to allow double clicking on Y-Axis labels to change vertical scaling mode
bool allowYAxisScaling() const { return getPref(STR_AS_AllowYAxisScaling).toBool(); }
//! \brief Whether to show graph tooltips
bool graphTooltips() const { return getPref(STR_AS_GraphTooltips).toBool(); }
//! \brief Pen width of line plots
float lineThickness() const { return getPref(STR_AS_LineThickness).toFloat(); }
//! \brief Whether to show line cursor
bool lineCursorMode() const { return getPref(STR_AS_LineCursorMode).toBool(); }
//! \brief Whether to show the calendar
bool calendarVisible() const { return getPref(STR_AS_CalendarVisible).toBool(); }
//! \brief Whether to show the right sidebar
bool rightSidebarVisible() const { return getPref(STR_AS_RightSidebarVisible).toBool(); }
//! \brief Returns the type of overlay flags (which are displayed over the Flow Waveform)
OverlayDisplayType overlayType() const {
return (OverlayDisplayType)getPref(STR_AS_OverlayType).toInt();
}
//! \brief Returns the display type of Overview pages linechart
OverviewLinechartModes overviewLinechartMode() const {
return (OverviewLinechartModes)getPref(STR_AS_OverviewLinechartMode).toInt();
}
//! \brief Set the normal (unscaled) height of a graph.
void setGraphHeight(int height) { setPref(STR_AS_GraphHeight, height); }
//! \brief Set the normal (unscaled) height of a graph.
void setDailyPanelWidth(int width) { setPref(STR_AS_DailyPanelWidth, width); }
//! \brief Set the normal (unscaled) height of a graph.
void setRightPanelWidth(int width) { setPref(STR_AS_RightPanelWidth, width); }
//! \brief Set to true to turn on AntiAliasing (the graphical smoothing method)
void setAntiAliasing(bool aa) { setPref(STR_AS_AntiAliasing, aa); }
//! \brief Set to true if renderPixmap functions are in use, which takes snapshots of graphs.
void setGraphSnapshots(bool gs) { setPref(STR_AS_GraphSnapshots, gs); }
//! \brief Set to true if Graphical animations & Transitions will be drawn
void setAnimations(bool anim) { setPref(STR_AS_Animations, anim); }
//! \brief Set to true to use Pixmap Caching of Text and other graphics caching speedup techniques
void setUsePixmapCaching(bool b) { setPref(STR_AS_UsePixmapCaching, b); }
//! \brief Set whether or not to useSquare Wave plots (where possible)
void setSquareWavePlots(bool sw) { setPref(STR_AS_SquareWave, sw); }
//! \brief Sets the type of overlay flags (which are displayed over the Flow Waveform)
void setOverlayType(OverlayDisplayType od) { setPref(STR_AS_OverlayType, (int)od); }
//! \brief Sets whether to allow double clicking on Y-Axis labels to change vertical scaling mode
void setAllowYAxisScaling(bool b) { setPref(STR_AS_AllowYAxisScaling, b); }
//! \brief Sets whether to allow double clicking on Y-Axis labels to change vertical scaling mode
void setGraphTooltips(bool b) { setPref(STR_AS_GraphTooltips, b); }
//! \brief Sets the type of overlay flags (which are displayed over the Flow Waveform)
void setOverviewLinechartMode(OverviewLinechartModes od) {
setPref(STR_AS_OverviewLinechartMode, (int)od);
}
//! \brief Set the pen width of line plots.
void setLineThickness(float size) { setPref(STR_AS_LineThickness, size); }
//! \brief Sets whether to display Line Cursor
void setLineCursorMode(bool b) { setPref(STR_AS_LineCursorMode, b); }
//! \brief Sets whether to display the (Daily View) Calendar
void setCalendarVisible(bool b) { setPref(STR_AS_CalendarVisible, b); }
//! \brief Sets whether to display the right sidebar
void setRightSidebarVisible(bool b) { setPref(STR_AS_RightSidebarVisible, b); }
}; };
/*! \class UserSettings /*! \class UserSettings
\brief Profile Options relating to General User Settings \brief Profile Options relating to General User Settings
*/ */
class UserSettings : public ProfileSettings class UserSettings : public PrefSettings
{ {
public: public:
UserSettings(Profile *profile) UserSettings(Profile *profile)
: ProfileSettings(profile) : PrefSettings(profile)
{ {
initPref(STR_US_UnitSystem, US_Metric); initPref(STR_US_UnitSystem, US_Metric);
initPref(STR_US_EventWindowSize, 4.0); initPref(STR_US_EventWindowSize, 4.0);
initPref(STR_US_SkipEmptyDays, true); initPref(STR_US_SkipEmptyDays, true);
initPref(STR_US_RebuildCache, false); // FIXME: jedimark: can't remember... initPref(STR_US_RebuildCache, false); // FIXME: jedimark: can't remember...
initPref(STR_US_ShowDebug, false);
initPref(STR_US_ShowPerformance, false);
initPref(STR_US_CalculateRDI, false); initPref(STR_US_CalculateRDI, false);
initPref(STR_US_ShowSerialNumbers, false);
initPref(STR_US_PrefCalcMiddle, (int)0); initPref(STR_US_PrefCalcMiddle, (int)0);
initPref(STR_US_PrefCalcPercentile, (double)95.0); initPref(STR_US_PrefCalcPercentile, (double)95.0);
initPref(STR_US_PrefCalcMax, (int)0); initPref(STR_US_PrefCalcMax, (int)0);
initPref(STR_US_TooltipTimeout, (int)2500);
initPref(STR_US_ScrollDampening, (int)50);
initPref(STR_US_StatReportMode, 0); initPref(STR_US_StatReportMode, 0);
initPref(STR_US_ShowUnknownFlags, false); initPref(STR_US_ShowUnknownFlags, false);
initPref(STR_US_LastOverviewRange, 4); initPref(STR_US_LastOverviewRange, 4);
@ -838,15 +711,10 @@ class UserSettings : public ProfileSettings
double eventWindowSize() const { return getPref(STR_US_EventWindowSize).toDouble(); } double eventWindowSize() const { return getPref(STR_US_EventWindowSize).toDouble(); }
bool skipEmptyDays() const { return getPref(STR_US_SkipEmptyDays).toBool(); } bool skipEmptyDays() const { return getPref(STR_US_SkipEmptyDays).toBool(); }
bool rebuildCache() const { return getPref(STR_US_RebuildCache).toBool(); } bool rebuildCache() const { return getPref(STR_US_RebuildCache).toBool(); }
bool showDebug() const { return getPref(STR_US_ShowDebug).toBool(); }
bool showPerformance() const { return getPref(STR_US_ShowPerformance).toBool(); }
bool calculateRDI() const { return getPref(STR_US_CalculateRDI).toBool(); } bool calculateRDI() const { return getPref(STR_US_CalculateRDI).toBool(); }
bool showSerialNumbers() const { return getPref(STR_US_ShowSerialNumbers).toBool(); }
int prefCalcMiddle() const { return getPref(STR_US_PrefCalcMiddle).toInt(); } int prefCalcMiddle() const { return getPref(STR_US_PrefCalcMiddle).toInt(); }
double prefCalcPercentile() const { return getPref(STR_US_PrefCalcPercentile).toDouble(); } double prefCalcPercentile() const { return getPref(STR_US_PrefCalcPercentile).toDouble(); }
int prefCalcMax() const { return getPref(STR_US_PrefCalcMax).toInt(); } int prefCalcMax() const { return getPref(STR_US_PrefCalcMax).toInt(); }
int tooltipTimeout() const { return getPref(STR_US_TooltipTimeout).toInt(); }
int scrollDampening() const { return getPref(STR_US_ScrollDampening).toInt(); }
int statReportMode() const { return getPref(STR_US_StatReportMode).toInt(); } int statReportMode() const { return getPref(STR_US_StatReportMode).toInt(); }
bool showUnknownFlags() const { return getPref(STR_US_ShowUnknownFlags).toBool(); } bool showUnknownFlags() const { return getPref(STR_US_ShowUnknownFlags).toBool(); }
int lastOverviewRange() const { return getPref(STR_US_LastOverviewRange).toInt(); } int lastOverviewRange() const { return getPref(STR_US_LastOverviewRange).toInt(); }
@ -855,35 +723,15 @@ class UserSettings : public ProfileSettings
void setEventWindowSize(double size) { setPref(STR_US_EventWindowSize, size); } void setEventWindowSize(double size) { setPref(STR_US_EventWindowSize, size); }
void setSkipEmptyDays(bool skip) { setPref(STR_US_SkipEmptyDays, skip); } void setSkipEmptyDays(bool skip) { setPref(STR_US_SkipEmptyDays, skip); }
void setRebuildCache(bool rebuild) { setPref(STR_US_RebuildCache, rebuild); } void setRebuildCache(bool rebuild) { setPref(STR_US_RebuildCache, rebuild); }
void setShowDebug(bool b) { setPref(STR_US_ShowDebug, b); }
void setShowPerformance(bool b) { setPref(STR_US_ShowPerformance, b); }
void setCalculateRDI(bool rdi) { setPref(STR_US_CalculateRDI, rdi); } void setCalculateRDI(bool rdi) { setPref(STR_US_CalculateRDI, rdi); }
void setShowSerialNumbers(bool enabled) { setPref(STR_US_ShowSerialNumbers, enabled); }
void setPrefCalcMiddle(int i) { setPref(STR_US_PrefCalcMiddle, i); } void setPrefCalcMiddle(int i) { setPref(STR_US_PrefCalcMiddle, i); }
void setPrefCalcPercentile(double p) { setPref(STR_US_PrefCalcPercentile, p); } void setPrefCalcPercentile(double p) { setPref(STR_US_PrefCalcPercentile, p); }
void setPrefCalcMax(int i) { setPref(STR_US_PrefCalcMax, i); } void setPrefCalcMax(int i) { setPref(STR_US_PrefCalcMax, i); }
void setTooltipTimeout(int i) { setPref(STR_US_TooltipTimeout, i); }
void setScrollDampening(int i) { setPref(STR_US_ScrollDampening, i); }
void setStatReportMode(int i) { setPref(STR_US_StatReportMode, i); } void setStatReportMode(int i) { setPref(STR_US_StatReportMode, i); }
void setShowUnknownFlags(bool b) { setPref(STR_US_ShowUnknownFlags, b); } void setShowUnknownFlags(bool b) { setPref(STR_US_ShowUnknownFlags, b); }
void setLastOverviewRange(int i) { setPref(STR_US_LastOverviewRange, i); } void setLastOverviewRange(int i) { setPref(STR_US_LastOverviewRange, i); }
}; };
//! \brief Returns a count of all files & directories in a supplied folder
int dirCount(QString path);
namespace Profiles {
extern QMap<QString, Profile *> profiles;
void Scan(); // Initialize and load Profile
void Done(); // Save all Profile objects and clear list
Profile *Create(QString name);
Profile *Get(QString name);
Profile *Get();
}
#endif // PROFILES_H #endif // PROFILES_H

3
sleepyhead/SleepLib/schema.cpp
View File

@ -1018,6 +1018,9 @@ void ChannelList::add(QString group, Channel *chan)
bool ChannelList::Save(QString filename) bool ChannelList::Save(QString filename)
{ {
if (!p_profile)
return false;
qDebug() << "Saving Channels.xml"; qDebug() << "Saving Channels.xml";
if (filename.isEmpty()) { if (filename.isEmpty()) {
filename = p_profile->Get("{DataFolder}/") + "channels.xml"; filename = p_profile->Get("{DataFolder}/") + "channels.xml";

9
sleepyhead/UpdaterWindow.cpp
View File

@ -279,11 +279,12 @@ int checkVersionStatus(QString statusstr)
return v; return v;
} }
if (statusstr.compare("testing", Qt::CaseInsensitive) == 0) return 0; if ((statusstr.compare("testing", Qt::CaseInsensitive) == 0) || (statusstr.compare("unstable", Qt::CaseInsensitive) == 0)) return 0;
else if (statusstr.compare("beta", Qt::CaseInsensitive) == 0) return 1; else if ((statusstr.compare("beta", Qt::CaseInsensitive) == 0) || (statusstr.compare("untamed", Qt::CaseInsensitive) == 0)) return 1;
else if (statusstr.compare("rc", Qt::CaseInsensitive) == 0) return 2; else if ((statusstr.compare("rc", Qt::CaseInsensitive) == 0) || (statusstr.compare("almost", Qt::CaseInsensitive) == 0)) return 2;
else if (statusstr.compare("r", Qt::CaseInsensitive) == 0) return 3; else if ((statusstr.compare("r", Qt::CaseInsensitive) == 0) || (statusstr.compare("stable", Qt::CaseInsensitive) == 0)) return 3;
// anything else is considered a test build
return 0; return 0;
} }
struct VersionStruct { struct VersionStruct {

2
sleepyhead/build_number.h
View File

@ -1 +1 @@
const int build_number = 2; const int build_number = 0;

77
sleepyhead/common_gui.cpp
View File

@ -1,4 +1,4 @@
/* Common GUI Functions Implementation /* Common GUI Functions Implementation
* *
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -6,12 +6,87 @@
* License. See the file COPYING in the main directory of the Linux * License. See the file COPYING in the main directory of the Linux
* distribution for more details. */ * distribution for more details. */
#include <QGLWidget>
#include <QOpenGLFunctions>
#include <QDebug>
#include "SleepLib/common.h"
#include "common_gui.h" #include "common_gui.h"
#ifndef BUILD_WITH_MSVC #ifndef BUILD_WITH_MSVC
# include <unistd.h> # include <unistd.h>
#endif #endif
QString getOpenGLVersionString()
{
static QString glversion;
if (glversion.isEmpty()) {
QGLWidget w;
w.makeCurrent();
#if QT_VERSION < QT_VERSION_CHECK(5,4,0)
glversion = QString(QLatin1String(reinterpret_cast<const char*>(glGetString(GL_VERSION))));
#else
QOpenGLFunctions f;
f.initializeOpenGLFunctions();
glversion = QString(QLatin1String(reinterpret_cast<const char*>(f.glGetString(GL_VERSION))));
#endif
qDebug() << "OpenGL Version:" << glversion;
}
return glversion;
}
float getOpenGLVersion()
{
QString glversion = getOpenGLVersionString();
glversion = glversion.section(" ",0,0);
bool ok;
float v = glversion.toFloat(&ok);
if (!ok) {
QString tmp = glversion.section(".",0,1);
v = tmp.toFloat(&ok);
if (!ok) {
// just look at major, we are only interested in whether we have OpenGL 2.0 anyway
tmp = glversion.section(".",0,0);
v = tmp.toFloat(&ok);
}
}
return v;
}
QString getGraphicsEngine()
{
QString gfxEngine = QString();
#ifdef BROKEN_OPENGL_BUILD
gfxEngine = CSTR_GFX_BrokenGL;
#else
QString glversion = getOpenGLVersionString();
if (glversion.contains(CSTR_GFX_ANGLE)) {
gfxEngine = CSTR_GFX_ANGLE;
} else {
gfxEngine = CSTR_GFX_OpenGL;
}
#endif
return gfxEngine;
}
QString getBranchVersion()
{
QString version = STR_TR_AppVersion;
version += " [";
#ifdef GIT_REVISION
if (QString(GIT_BRANCH) != "master") {
version += QString(GIT_BRANCH)+"-";
}
version += QString(GIT_REVISION) +" ";
#endif
version += getGraphicsEngine()+"]";
return version;
}
#if (QT_VERSION >= QT_VERSION_CHECK(4,8,0)) #if (QT_VERSION >= QT_VERSION_CHECK(4,8,0))
// Qt 4.8 makes this a whole lot easier // Qt 4.8 makes this a whole lot easier
Qt::DayOfWeek firstDayOfWeekFromLocale() Qt::DayOfWeek firstDayOfWeekFromLocale()

6
sleepyhead/common_gui.h
View File

@ -1,4 +1,4 @@
/* Common GUI Functions Header /* Common GUI Functions Header
* *
* Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -15,6 +15,10 @@
//! \brief Gets the first day of week from the system locale, to show in the calendars. //! \brief Gets the first day of week from the system locale, to show in the calendars.
Qt::DayOfWeek firstDayOfWeekFromLocale(); Qt::DayOfWeek firstDayOfWeekFromLocale();
QString getBranchVersion();
const QString CSTR_GFX_ANGLE = "ANGLE"; const QString CSTR_GFX_ANGLE = "ANGLE";
const QString CSTR_GFX_OpenGL = "OpenGL"; const QString CSTR_GFX_OpenGL = "OpenGL";
const QString CSTR_GFX_BrokenGL = "BrokenGL"; const QString CSTR_GFX_BrokenGL = "BrokenGL";

25
sleepyhead/daily.cpp
View File

@ -59,7 +59,8 @@ void Daily::setSidebarVisible(bool visible)
{ {
QList<int> a; QList<int> a;
int panel_width = visible ? p_profile->appearance->dailyPanelWidth() : 0;
int panel_width = visible ? AppSetting->dailyPanelWidth() : 0;
a.push_back(panel_width); a.push_back(panel_width);
a.push_back(this->width() - panel_width); a.push_back(this->width() - panel_width);
ui->splitter_2->setStretchFactor(1,1); ui->splitter_2->setStretchFactor(1,1);
@ -147,7 +148,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
layout->addWidget(GraphView,1); layout->addWidget(GraphView,1);
layout->addWidget(scrollbar,0); layout->addWidget(scrollbar,0);
int default_height = p_profile->appearance->graphHeight(); int default_height = AppSetting->graphHeight();
gGraph *GAHI = nullptr, gGraph *GAHI = nullptr,
// *TAP = nullptr, // *TAP = nullptr,
@ -208,7 +209,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
evseg->AddSlice(CPAP_NRI,QColor(0x00,0x80,0x40,0xff),STR_TR_NR); evseg->AddSlice(CPAP_NRI,QColor(0x00,0x80,0x40,0xff),STR_TR_NR);
evseg->AddSlice(CPAP_FlowLimit,QColor(0x40,0x40,0x40,0xff),STR_TR_FL); evseg->AddSlice(CPAP_FlowLimit,QColor(0x40,0x40,0x40,0xff),STR_TR_FL);
evseg->AddSlice(CPAP_SensAwake,QColor(0x40,0xC0,0x40,0xff),STR_TR_SA); evseg->AddSlice(CPAP_SensAwake,QColor(0x40,0xC0,0x40,0xff),STR_TR_SA);
if (p_profile->cpap->userEventPieChart()) { if (AppSetting->userEventPieChart()) {
evseg->AddSlice(CPAP_UserFlag1,QColor(0xe0,0xe0,0xe0,0xff),tr("UF1")); evseg->AddSlice(CPAP_UserFlag1,QColor(0xe0,0xe0,0xe0,0xff),tr("UF1"));
evseg->AddSlice(CPAP_UserFlag2,QColor(0xc0,0xc0,0xe0,0xff),tr("UF2")); evseg->AddSlice(CPAP_UserFlag2,QColor(0xc0,0xc0,0xe0,0xff),tr("UF2"));
} }
@ -257,7 +258,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
// FRW->AddLayer(AddOXI(new gLineOverlayBar(OXI_SPO2Drop, COLOR_SPO2Drop, STR_TR_O2))); // FRW->AddLayer(AddOXI(new gLineOverlayBar(OXI_SPO2Drop, COLOR_SPO2Drop, STR_TR_O2)));
bool square=p_profile->appearance->squareWavePlots(); bool square=AppSetting->squareWavePlots();
gLineChart *pc=new gLineChart(CPAP_Pressure, square); gLineChart *pc=new gLineChart(CPAP_Pressure, square);
graphlist[schema::channel[CPAP_Pressure].code()]->AddLayer(pc); graphlist[schema::channel[CPAP_Pressure].code()]->AddLayer(pc);
@ -404,8 +405,8 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
GraphView->setEmptyText(STR_Empty_NoData); GraphView->setEmptyText(STR_Empty_NoData);
previous_date=QDate(); previous_date=QDate();
ui->calButton->setChecked(p_profile->appearance->calendarVisible() ? Qt::Checked : Qt::Unchecked); ui->calButton->setChecked(AppSetting->calendarVisible() ? Qt::Checked : Qt::Unchecked);
on_calButton_toggled(p_profile->appearance->calendarVisible()); on_calButton_toggled(AppSetting->calendarVisible());
GraphView->resetLayout(); GraphView->resetLayout();
GraphView->LoadSettings("Daily"); GraphView->LoadSettings("Daily");
@ -586,13 +587,13 @@ void Daily::ReloadGraphs()
void Daily::hideSpaceHogs() void Daily::hideSpaceHogs()
{ {
if (p_profile->appearance->calendarVisible()) { if (AppSetting->calendarVisible()) {
ui->calendarFrame->setVisible(false); ui->calendarFrame->setVisible(false);
} }
} }
void Daily::showSpaceHogs() void Daily::showSpaceHogs()
{ {
if (p_profile->appearance->calendarVisible()) { if (AppSetting->calendarVisible()) {
ui->calendarFrame->setVisible(true); ui->calendarFrame->setVisible(true);
} }
} }
@ -1365,7 +1366,7 @@ void Daily::Load(QDate date)
posit = day->machine(MT_POSITION); posit = day->machine(MT_POSITION);
} }
if (!p_profile->session->cacheSessions()) { if (!AppSetting->cacheSessions()) {
// Getting trashed on purge last day... // Getting trashed on purge last day...
// lastcpapday can get purged and be invalid // lastcpapday can get purged and be invalid
@ -1573,7 +1574,7 @@ void Daily::Load(QDate date)
html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n"; html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
// Show Event Breakdown pie chart // Show Event Breakdown pie chart
if ((hours > 0) && p_profile->appearance->graphSnapshots()) { // AHI Pie Chart if ((hours > 0) && AppSetting->graphSnapshots()) { // AHI Pie Chart
if ((values[CPAP_Obstructive] + values[CPAP_Hypopnea] + values[CPAP_ClearAirway] + values[CPAP_Apnea] + values[CPAP_RERA] + values[CPAP_FlowLimit] + values[CPAP_SensAwake])>0) { if ((values[CPAP_Obstructive] + values[CPAP_Hypopnea] + values[CPAP_ClearAirway] + values[CPAP_Apnea] + values[CPAP_RERA] + values[CPAP_FlowLimit] + values[CPAP_SensAwake])>0) {
html+="<tr><td align=center>&nbsp;</td></tr>"; html+="<tr><td align=center>&nbsp;</td></tr>";
html+=QString("<tr><td align=center><b>%1</b></td></tr>").arg(tr("Event Breakdown")); html+=QString("<tr><td align=center><b>%1</b></td></tr>").arg(tr("Event Breakdown"));
@ -2126,7 +2127,7 @@ void Daily::on_calButton_toggled(bool checked)
{ {
bool b=checked; bool b=checked;
ui->calendarFrame->setVisible(b); ui->calendarFrame->setVisible(b);
p_profile->appearance->setCalendarVisible(b); AppSetting->setCalendarVisible(b);
if (!b) { if (!b) {
ui->calButton->setArrowType(Qt::DownArrow); ui->calButton->setArrowType(Qt::DownArrow);
@ -2571,5 +2572,5 @@ void Daily::on_splitter_2_splitterMoved(int, int)
{ {
int size = ui->splitter_2->sizes()[0]; int size = ui->splitter_2->sizes()[0];
if (size == 0) return; if (size == 0) return;
p_profile->appearance->setDailyPanelWidth(size); AppSetting->setDailyPanelWidth(size);
} }

17
sleepyhead/docs/release_notes.html
View File

@ -1,4 +1,19 @@
<!DOCTYPE ChangeLog> <!DOCTYPE html>
<b>Changes and fixes in v1.1.0-unstable-0</b>
<version number="1.1.0-unstable-0">
<list>
<li>Added brand new live Profile switcher</li>
<li>[DeVilbiss] Added DV6 Import capability (Thanks Heynes and Brian)</li>
<li>[PR Dreamstation] Added spuport for 960T F5V3 machines</li>
<li>Fix language change glitch affecting Channel names</li>
<li>Fix a few miscellanious crash conditions</li>
<li>Cleaned up Welcome page removing what could be constituted as dodgy advice</li>
<li>Added Afrikaans language support</li>
<li>Applied a bunch of bugfixes that were provided by the community (Thanks Pholy, h-uchiy, François Revol & Kevin Lewis)</li>
</list>
</version>
<br/>
<b>Changes and fixes in v1.0.0-beta-2</b> <b>Changes and fixes in v1.0.0-beta-2</b>
<version number="1.0.0-beta-2"> <version number="1.0.0-beta-2">
<list> <list>

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 60 KiB

113
sleepyhead/main.cpp
View File

@ -1,4 +1,4 @@
/* SleepyHead Main /* SleepyHead Main
* *
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -101,7 +101,7 @@ void release_notes()
QString html = "<html>" QString html = "<html>"
"<head><meta charset=\"UTF-8\"></head>" //"<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head>"
"<body>"; "<body>";
//"<h2><p>"+QObject::tr("Greetings!")+"</p></h2>"; //"<h2><p>"+QObject::tr("Greetings!")+"</p></h2>";
@ -119,8 +119,6 @@ void release_notes()
html += changeLog; html += changeLog;
html += "</body></html>"; html += "</body></html>";
//QUrl("qrc:/docs/release_notes.html") //QUrl("qrc:/docs/release_notes.html")
// Should read these from online!!! with language code // Should read these from online!!! with language code
@ -159,7 +157,6 @@ void MigrateSettings()
QSettings oldcopy(getDeveloperName(), getAppName()+"-Testing"); QSettings oldcopy(getDeveloperName(), getAppName()+"-Testing");
if (oldcopy.contains("Migrated")) { return; } if (oldcopy.contains("Migrated")) { return; }
//QString oldfile = oldcopy.fileName();
QStringList keys = oldcopy.allKeys(); QStringList keys = oldcopy.allKeys();
@ -186,7 +183,7 @@ int main(int argc, char *argv[])
QGL::setPreferredPaintEngine(QPaintEngine::OpenGL); QGL::setPreferredPaintEngine(QPaintEngine::OpenGL);
#endif #endif
bool force_login_screen = false; bool dont_load_profile = false;
bool force_data_dir = false; bool force_data_dir = false;
bool changing_language = false; bool changing_language = false;
QString load_profile = ""; QString load_profile = "";
@ -204,7 +201,7 @@ int main(int argc, char *argv[])
changing_language = true; changing_language = true;
for (int i = 1; i < args.size(); i++) { for (int i = 1; i < args.size(); i++) {
if (args[i] == "-l") { force_login_screen = true; } if (args[i] == "-l") { dont_load_profile = true; }
else if (args[i] == "-d") { force_data_dir = true; } else if (args[i] == "-d") { force_data_dir = true; }
else if (args[i] == "-language") { else if (args[i] == "-language") {
changing_language = true; changing_language = true;
@ -235,12 +232,6 @@ int main(int argc, char *argv[])
a.setApplicationName(STR_TR_SleepyHead); a.setApplicationName(STR_TR_SleepyHead);
// Do reset strings if they selected the same langauge again..
// if (settings.value(LangSetting, "").toString() == lastlanguage) {
// // don't reset if they selected the same language again
// changing_language = false;
// }
//////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////
// OpenGL Detection // OpenGL Detection
//////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////
@ -377,6 +368,7 @@ retry_directory:
//////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////
p_pref = new Preferences("Preferences"); p_pref = new Preferences("Preferences");
PREF.Open(); PREF.Open();
AppSetting = new AppWideSetting(p_pref);
initialize(); initialize();
PRS1Loader::Register(); PRS1Loader::Register();
@ -391,21 +383,14 @@ retry_directory:
schema::setOrders(); schema::setOrders();
p_layout = new Preferences("Layout"); // Clean up some legacy crap
QString layout = PREF.Get("{home}/Layout.xml");
LAYOUT.Open(); QFile lf(layout);
if (lf.exists()) {
// Scan for user profiles lf.remove();
Profiles::Scan(); }
PREF.Erase(STR_AppName);
PREF.Erase(STR_GEN_SkipLogin);
//qRegisterMetaType<Preference>("Preference");
PREF["AppName"] = STR_TR_SleepyHead;
// Skip login screen, unless asked not to on the command line
bool skip_login = PREF.ExistsAndTrue(STR_GEN_SkipLogin);
if (force_login_screen) { skip_login = false; }
// Todo: Make a wrapper for Preference settings, like Profile settings have.. // Todo: Make a wrapper for Preference settings, like Profile settings have..
QDateTime lastchecked, today = QDateTime::currentDateTime(); QDateTime lastchecked, today = QDateTime::currentDateTime();
@ -434,16 +419,6 @@ retry_directory:
} }
} }
if (!Profiles::profiles.size()) {
// Show New User wizard..
NewProfile newprof(0);
if (newprof.exec() == NewProfile::Rejected) {
return 0;
}
release_notes();
} else {
if (PREF.contains(STR_PREF_VersionString)) { if (PREF.contains(STR_PREF_VersionString)) {
int vc = compareVersion(PREF[STR_PREF_VersionString].toString()); int vc = compareVersion(PREF[STR_PREF_VersionString].toString());
@ -452,8 +427,11 @@ retry_directory:
check_updates = false; check_updates = false;
} else if (vc > 0) { } else if (vc > 0) {
if (QMessageBox::warning(nullptr, STR_MessageBox_Error, QObject::tr("The version of SleepyHead you just ran is OLDER than the one used to create this data (%1).").arg(PREF[STR_PREF_VersionString].toString()) +"\n\n"+ if (QMessageBox::warning(nullptr, STR_MessageBox_Error,
QObject::tr("It is likely that doing this will cause data corruption, are you sure you want to do this?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No) { QObject::tr("The version of SleepyHead you just ran is OLDER than the one used to create this data (%1).").
arg(PREF[STR_PREF_VersionString].toString()) +"\n\n"+
QObject::tr("It is likely that doing this will cause data corruption, are you sure you want to do this?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No) {
return 0; return 0;
} }
@ -461,42 +439,8 @@ retry_directory:
} }
} }
ProfileSelect profsel(0);
if (load_profile.size()) {
profsel.QuickLogin();
p_profile = Profiles::Get(load_profile);
if (!p_profile) {
NewProfile newprof(0, &load_profile);
if (newprof.exec() == NewProfile::Rejected) {
return 0;
}
}
} else if (skip_login) {
profsel.QuickLogin();
if (profsel.result() == ProfileSelect::Rejected) {
exit(1);
}
p_profile = Profiles::Get(PREF[STR_GEN_Profile].toString());
} else { p_profile = nullptr; }
if (!p_profile) {
if (profsel.exec() == ProfileSelect::Rejected) {
exit(1);
}
}
}
PREF[STR_PREF_VersionString] = VersionString; PREF[STR_PREF_VersionString] = VersionString;
p_profile = Profiles::Get(PREF[STR_GEN_Profile].toString());
qDebug() << "Opened Profile" << p_profile->user->userName();
// int id=QFontDatabase::addApplicationFont(":/fonts/FreeSans.ttf"); // int id=QFontDatabase::addApplicationFont(":/fonts/FreeSans.ttf");
// QFontDatabase fdb; // QFontDatabase fdb;
// QStringList ffam=fdb.families(); // QStringList ffam=fdb.families();
@ -504,8 +448,15 @@ retry_directory:
// qDebug() << "Loaded Font: " << (*i); // qDebug() << "Loaded Font: " << (*i);
// } // }
if (!PREF.contains("Fonts_Application_Name")) { if (!PREF.contains("Fonts_Application_Name")) {
PREF["Fonts_Application_Name"] = "Sans Serif"; #ifdef Q_OS_WIN
// Windows default Sans Serif interpretation sucks
// Segoe UI is better, but that requires OS/font detection
PREF["Fonts_Application_Name"] = "Arial";
#else
PREF["Fonts_Application_Name"] = QFontDatabase::systemFont(QFontDatabase::GeneralFont).family();
#endif
PREF["Fonts_Application_Size"] = 10; PREF["Fonts_Application_Size"] = 10;
PREF["Fonts_Application_Bold"] = false; PREF["Fonts_Application_Bold"] = false;
PREF["Fonts_Application_Italic"] = false; PREF["Fonts_Application_Italic"] = false;
@ -519,12 +470,18 @@ retry_directory:
qDebug() << "Selected Font" << QApplication::font().family(); qDebug() << "Selected Font" << QApplication::font().family();
// Must be initialized AFTER profile creation // Scan for user profiles
Profiles::Scan();
if (!dont_load_profile) {
// TODO: set the don't automatically load profile AppSetting
}
Q_UNUSED(changing_language)
MainWindow w; MainWindow w;
mainwin = &w; mainwin = &w;
loadChannels(changing_language);
if (check_updates) { mainwin->CheckForUpdates(); } if (check_updates) { mainwin->CheckForUpdates(); }
w.show(); w.show();

570
sleepyhead/mainwindow.cpp
View File

@ -1,4 +1,4 @@
/* SleepyHead MainWindow Implementation /* SleepyHead MainWindow Implementation
* *
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -6,8 +6,7 @@
* License. See the file COPYING in the main directory of the Linux * License. See the file COPYING in the main directory of the Linux
* distribution for more details. */ * distribution for more details. */
#include <QGLContext> #include <QHostInfo>
#include <QFileDialog> #include <QFileDialog>
#include <QMessageBox> #include <QMessageBox>
#include <QResource> #include <QResource>
@ -31,13 +30,12 @@
#include <QTranslator> #include <QTranslator>
#include <QPushButton> #include <QPushButton>
#include <QCalendarWidget> #include <QCalendarWidget>
#include <cmath>
#include "common_gui.h" #include "common_gui.h"
#include "version.h" #include "version.h"
#include <cmath>
// Custom loaders that don't autoscan.. // Custom loaders that don't autoscan..
#include <SleepLib/loader_plugins/zeo_loader.h> #include <SleepLib/loader_plugins/zeo_loader.h>
#include <SleepLib/loader_plugins/somnopose_loader.h> #include <SleepLib/loader_plugins/somnopose_loader.h>
@ -69,98 +67,19 @@ QProgressBar *qprogress;
QLabel *qstatus; QLabel *qstatus;
QStatusBar *qstatusbar; QStatusBar *qstatusbar;
extern Profile *profile;
QString getOpenGLVersionString()
{
static QString glversion;
if (glversion.isEmpty()) {
QGLWidget w;
w.makeCurrent();
#if QT_VERSION < QT_VERSION_CHECK(5,4,0)
glversion = QString(QLatin1String(reinterpret_cast<const char*>(glGetString(GL_VERSION))));
#else
QOpenGLFunctions f;
f.initializeOpenGLFunctions();
glversion = QString(QLatin1String(reinterpret_cast<const char*>(f.glGetString(GL_VERSION))));
#endif
qDebug() << "OpenGL Version:" << glversion;
}
return glversion;
}
float getOpenGLVersion()
{
QString glversion = getOpenGLVersionString();
glversion = glversion.section(" ",0,0);
bool ok;
float v = glversion.toFloat(&ok);
if (!ok) {
QString tmp = glversion.section(".",0,1);
v = tmp.toFloat(&ok);
if (!ok) {
// just look at major, we are only interested in whether we have OpenGL 2.0 anyway
tmp = glversion.section(".",0,0);
v = tmp.toFloat(&ok);
}
}
return v;
}
QString getGraphicsEngine()
{
QString gfxEngine = QString();
#ifdef BROKEN_OPENGL_BUILD
gfxEngine = CSTR_GFX_BrokenGL;
#else
QString glversion = getOpenGLVersionString();
if (glversion.contains(CSTR_GFX_ANGLE)) {
gfxEngine = CSTR_GFX_ANGLE;
} else {
gfxEngine = CSTR_GFX_OpenGL;
}
#endif
return gfxEngine;
}
void MainWindow::logMessage(QString msg)
{
ui->logText->appendPlainText(msg);
}
MainWindow::MainWindow(QWidget *parent) : MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
ui(new Ui::MainWindow) ui(new Ui::MainWindow)
{ {
Q_ASSERT(p_profile != nullptr);
ui->setupUi(this); ui->setupUi(this);
if (logger) { if (logger) {
connect(logger, SIGNAL(outputLog(QString)), this, SLOT(logMessage(QString))); connect(logger, SIGNAL(outputLog(QString)), this, SLOT(logMessage(QString)));
} }
QString version = STR_TR_AppVersion; QString version = getBranchVersion();
#ifndef TEST_BUILD setWindowTitle(STR_TR_SleepyHead + QString(" %1").arg(version));
ui->warningLabel->hide();
#endif
version += " [";
#ifdef GIT_REVISION
if (QString(GIT_BRANCH) != "master") {
version += QString(GIT_BRANCH)+"-";
}
version += QString(GIT_REVISION) +" ";
#endif
version += getGraphicsEngine()+"]";
this->setWindowTitle(STR_TR_SleepyHead + QString(" %1 (" + tr("Profile") + ": %2)").arg(version).arg(PREF[STR_GEN_Profile].toString()));
qDebug() << STR_TR_SleepyHead << VersionString << "built with Qt" << QT_VERSION_STR << "on" << __DATE__ << __TIME__; qDebug() << STR_TR_SleepyHead << VersionString << "built with Qt" << QT_VERSION_STR << "on" << __DATE__ << __TIME__;
@ -168,8 +87,6 @@ MainWindow::MainWindow(QWidget *parent) :
qDebug() << "This build has been created especially for computers with older graphics hardware.\n"; qDebug() << "This build has been created especially for computers with older graphics hardware.\n";
#endif #endif
//ui->tabWidget->setCurrentIndex(1);
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
ui->action_About->setMenuRole(QAction::ApplicationSpecificRole); ui->action_About->setMenuRole(QAction::ApplicationSpecificRole);
@ -181,27 +98,20 @@ MainWindow::MainWindow(QWidget *parent) :
#endif #endif
#endif #endif
//#ifdef LOCK_RESMED_SESSIONS ui->actionToggle_Line_Cursor->setChecked(AppSetting->lineCursorMode());
// QList<Machine *> machines = p_profile->GetMachines(MT_CPAP); ui->actionDebug->setChecked(AppSetting->showDebug());
// for (QList<Machine *>::iterator it = machines.begin(); it != machines.end(); ++it) { ui->actionShow_Performance_Counters->setChecked(AppSetting->showPerformance());
// QString mclass=(*it)->loaderName();
// if (mclass == STR_MACH_ResMed) {
// qDebug() << "ResMed machine found.. locking Session splitting capabilities";
// // Have to sacrifice these features to get access to summary data.
// p_profile->session->setCombineCloseSessions(0);
// p_profile->session->setDaySplitTime(QTime(12,0,0));
// p_profile->session->setIgnoreShortSessions(false);
// break;
// }
// }
//#endif
ui->actionToggle_Line_Cursor->setChecked(p_profile->appearance->lineCursorMode());
overview = nullptr; overview = nullptr;
daily = nullptr; daily = nullptr;
prefdialog = nullptr; prefdialog = nullptr;
profileSelector = nullptr;
ui->oximetryButton->setDisabled(true);
ui->dailyButton->setDisabled(true);
ui->overviewButton->setDisabled(true);
ui->statisticsButton->setDisabled(true);
ui->importButton->setDisabled(true);
m_inRecalculation = false; m_inRecalculation = false;
m_restartRequired = false; m_restartRequired = false;
@ -215,7 +125,6 @@ MainWindow::MainWindow(QWidget *parent) :
ui->statusbar->addPermanentWidget(qstatus, 0); ui->statusbar->addPermanentWidget(qstatus, 0);
ui->statusbar->addPermanentWidget(qprogress, 1); ui->statusbar->addPermanentWidget(qprogress, 1);
ui->actionDebug->setChecked(p_profile->general->showDebug());
QTextCharFormat format = ui->statStartDate->calendarWidget()->weekdayTextFormat(Qt::Saturday); QTextCharFormat format = ui->statStartDate->calendarWidget()->weekdayTextFormat(Qt::Saturday);
format.setForeground(QBrush(Qt::black, Qt::SolidPattern)); format.setForeground(QBrush(Qt::black, Qt::SolidPattern));
@ -233,7 +142,12 @@ MainWindow::MainWindow(QWidget *parent) :
ui->statStartDate->setVisible(false); ui->statStartDate->setVisible(false);
ui->reportModeRange->setVisible(false); ui->reportModeRange->setVisible(false);
switch(p_profile->general->statReportMode()) { int srm = 0;
if (p_profile) {
srm = p_profile->general->statReportMode();
}
switch(srm) {
case 0: case 0:
ui->reportModeStandard->setChecked(true); ui->reportModeStandard->setChecked(true);
break; break;
@ -246,33 +160,36 @@ MainWindow::MainWindow(QWidget *parent) :
ui->statStartDate->setVisible(true); ui->statStartDate->setVisible(true);
break; break;
default: default:
if (p_profile) {
p_profile->general->setStatReportMode(0); p_profile->general->setStatReportMode(0);
} }
if (!p_profile->general->showDebug()) { break;
}
if (!AppSetting->showDebug()) {
ui->logText->hide(); ui->logText->hide();
} }
ui->actionShow_Performance_Counters->setChecked(p_profile->general->showPerformance());
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
p_profile->appearance->setAntiAliasing(false); //p_profile->appearance->setAntiAliasing(false);
#endif #endif
//ui->action_Link_Graph_Groups->setChecked(p_profile->general->linkGroups()); //ui->action_Link_Graph_Groups->setChecked(p_profile->general->linkGroups());
first_load = true; first_load = true;
// Using the dirty registry here. :( // Initialise sleepyHead app registry stuff
QSettings settings(getDeveloperName(), getAppName()); QSettings settings(getDeveloperName(), getAppName());
// Load previous Window geometry (this is currently broken on Mac as of Qt5.2.1) // Load previous Window geometry (this is currently broken on Mac as of Qt5.2.1)
restoreGeometry(settings.value("MainWindow/geometry").toByteArray()); restoreGeometry(settings.value("MainWindow/geometry").toByteArray());
daily = new Daily(ui->tabWidget, nullptr); profileSelector = new ProfileSelector(ui->tabWidget);
ui->tabWidget->insertTab(2, daily, STR_TR_Daily); ui->tabWidget->insertTab(0, profileSelector, STR_TR_Profile);
// Profiles haven't been loaded here...
profileSelector->updateProfileList();
// Start with the Summary Tab // Start with the new Profile Tab
ui->tabWidget->setCurrentWidget(ui->statisticsTab); // setting this to daily shows the cube during loading.. ui->tabWidget->setCurrentWidget(profileSelector); // setting this to daily shows the cube during loading..
// Nifty Notification popups in System Tray (uses Growl on Mac) // Nifty Notification popups in System Tray (uses Growl on Mac)
if (QSystemTrayIcon::isSystemTrayAvailable() && QSystemTrayIcon::supportsMessages()) { if (QSystemTrayIcon::isSystemTrayAvailable() && QSystemTrayIcon::supportsMessages()) {
@ -293,16 +210,10 @@ MainWindow::MainWindow(QWidget *parent) :
} }
ui->toolBox->setCurrentIndex(0); ui->toolBox->setCurrentIndex(0);
bool b = p_profile->appearance->rightSidebarVisible(); bool b = AppSetting->rightSidebarVisible();
ui->action_Sidebar_Toggle->setChecked(b); ui->action_Sidebar_Toggle->setChecked(b);
ui->toolBox->setVisible(b); ui->toolBox->setVisible(b);
daily->graphView()->redraw();
if (p_profile->cpap->AHIWindow() < 30.0) {
p_profile->cpap->setAHIWindow(60.0);
}
ui->recordsBox->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); ui->recordsBox->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
ui->statisticsView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); ui->statisticsView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks); ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
@ -325,26 +236,12 @@ MainWindow::MainWindow(QWidget *parent) :
qsrand(QDateTime::currentDateTime().toTime_t()); qsrand(QDateTime::currentDateTime().toTime_t());
// Translators, these are only temporary messages, don't bother unless you really want to.. // Setup to run a few last minute things before shutdown.
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 you 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("Make sure you're 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(""));
wtimer.setParent(this);
warnidx = 0;
wtimer.singleShot(0, this, SLOT(on_changeWarningMessage()));
connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(on_aboutToQuit())); connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(on_aboutToQuit()));
QList<int> a; QList<int> a;
int panel_width = p_profile->appearance->rightPanelWidth();
int panel_width = AppSetting->rightPanelWidth();
a.push_back(this->width() - panel_width); a.push_back(this->width() - panel_width);
a.push_back(panel_width); a.push_back(panel_width);
ui->mainsplitter->setSizes(a); ui->mainsplitter->setSizes(a);
@ -352,173 +249,27 @@ MainWindow::MainWindow(QWidget *parent) :
ui->mainsplitter->setStretchFactor(1,0); ui->mainsplitter->setStretchFactor(1,0);
} }
void MainWindow::on_changeWarningMessage() void MainWindow::logMessage(QString msg)
{ {
int i=warnidx++ % warnmsg.size(); ui->logText->appendPlainText(msg);
QString warning = "<html><head/><body><p>"+warnmsg[i]+"</p></body></html>";
ui->warningLabel->setText(warning);
wtimer.singleShot(10000, this, SLOT(on_changeWarningMessage()));
}
quint16 chandata_version = 1;
void saveChannels()
{
QString filename = p_profile->Get("{DataFolder}/") + "channels.dat";
QFile f(filename);
qDebug() << "Saving Channel States";
f.open(QFile::WriteOnly);
QDataStream out(&f);
out.setVersion(QDataStream::Qt_4_6);
out.setByteOrder(QDataStream::LittleEndian);
out << (quint32)magic;
out << (quint16)chandata_version;
quint16 size = schema::channel.channels.size();
out << size;
QHash<ChannelID, schema::Channel *>::iterator it;
QHash<ChannelID, schema::Channel *>::iterator it_end = schema::channel.channels.end();
for (it = schema::channel.channels.begin(); it != it_end; ++it) {
schema::Channel * chan = it.value();
out << it.key();
out << chan->code();
out << chan->enabled();
out << chan->defaultColor();
out << chan->fullname();
out << chan->label();
out << chan->description();
out << chan->lowerThreshold();
out << chan->lowerThresholdColor();
out << chan->upperThreshold();
out << chan->upperThresholdColor();
out << chan->showInOverview();
}
f.close();
}
void loadChannels(bool changing_language)
{
QString filename = p_profile->Get("{DataFolder}/") + "channels.dat";
QFile f(filename);
if (!f.open(QFile::ReadOnly)) {
return;
}
qDebug() << "Loading Channel States";
QDataStream in(&f);
in.setVersion(QDataStream::Qt_4_6);
in.setByteOrder(QDataStream::LittleEndian);
quint32 mag;
in >> mag;
if (magic != mag) {
qDebug() << "LoadChannels: Faulty data";
return;
}
quint16 version;
in >> version;
if (version < chandata_version) {
return;
//upgrade here..
}
quint16 size;
in >> size;
QString name;
ChannelID code;
bool enabled;
QColor color;
EventDataType lowerThreshold;
QColor lowerThresholdColor;
EventDataType upperThreshold;
QColor upperThresholdColor;
QString fullname;
QString label;
QString description;
bool showOverview = false;
for (int i=0; i < size; i++) {
in >> code;
schema::Channel * chan = &schema::channel[code];
in >> name;
if (chan->code() != name) {
qDebug() << "Looking up channel" << name << "by name, as it's ChannedID must have changed";
chan = &schema::channel[name];
}
in >> enabled;
in >> color;
in >> fullname;
in >> label;
in >> description;
in >> lowerThreshold;
in >> lowerThresholdColor;
in >> upperThreshold;
in >> upperThresholdColor;
if (version >= 1) {
in >> showOverview;
}
if (chan->isNull()) {
qDebug() << "loadChannels has no idea about channel" << name;
if (in.atEnd()) return;
continue;
}
chan->setEnabled(enabled);
chan->setDefaultColor(color);
// Don't import channel descriptions if event renaming is turned off. (helps pick up new translations)
if (changing_language) {
// Nothing
} else {
chan->setFullname(fullname);
chan->setLabel(label);
chan->setDescription(description);
}
chan->setLowerThreshold(lowerThreshold);
chan->setLowerThresholdColor(lowerThresholdColor);
chan->setUpperThreshold(upperThreshold);
chan->setUpperThresholdColor(upperThresholdColor);
chan->setShowInOverview(showOverview);
if (in.atEnd()) return;
}
f.close();
} }
void MainWindow::on_aboutToQuit() void MainWindow::on_aboutToQuit()
{ {
Notify(QObject::tr("Don't forget to place your datacard back in your CPAP machine"), QObject::tr("SleepyHead Reminder")); if (systraymenu) delete systraymenu;
QApplication::processEvents();
QThread::msleep(1000);
} }
void MainWindow::closeEvent(QCloseEvent * event) void MainWindow::closeEvent(QCloseEvent * event)
{ {
if (p_profile) {
saveChannels(); CloseProfile();
}
schema::channel.Save(); schema::channel.Save();
if (daily) { if (AppSetting->removeCardReminder()) {
daily->close(); Notify(QObject::tr("Don't forget to place your datacard back in your CPAP machine"), QObject::tr("SleepyHead Reminder"));
daily->deleteLater(); QApplication::processEvents();
} QThread::msleep(1000);
if (overview) {
overview->close();
overview->deleteLater();
} }
// Shutdown and Save the current User profile // Shutdown and Save the current User profile
@ -560,12 +311,12 @@ void MainWindow::Notify(QString s, QString title, int ms)
title = tr("%1 %2").arg(STR_TR_SleepyHead).arg(STR_TR_AppVersion); title = tr("%1 %2").arg(STR_TR_SleepyHead).arg(STR_TR_AppVersion);
} }
if (systray) { if (systray) {
// GNOME3's systray hides the last line of the displayed Qt message.
// As a workaround, add an extra line to bump the message back
// into the visible area.
QString msg = s; QString msg = s;
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
// GNOME3's systray hides the last line of the displayed Qt message.
// As a workaround, add an extra line to bump the message back
// into the visible area.
char *desktop = getenv("DESKTOP_SESSION"); char *desktop = getenv("DESKTOP_SESSION");
if (desktop && !strncmp(desktop, "gnome", 5)) { if (desktop && !strncmp(desktop, "gnome", 5)) {
@ -652,13 +403,82 @@ void MainWindow::PopulatePurgeMenu()
QString GenerateWelcomeHTML(); QString GenerateWelcomeHTML();
void MainWindow::Startup() void MainWindow::OpenProfile(QString profileName)
{ {
Profile * prof = Profiles::profiles[profileName];
if (p_profile) {
if ((prof != p_profile)) {
CloseProfile();
} else {
// Already open
return;
}
}
if (!prof) return;
// TODO: Check profile password
// Check Lockfile
QString lockhost = prof->checkLock();
if (!lockhost.isEmpty()) {
if (lockhost.compare(QHostInfo::localHostName()) == 0) {
// Localhost has it locked..
if (QMessageBox::warning(nullptr, STR_MessageBox_Warning,
QObject::tr("There is a lockfile already present for profile '%1'.").arg(prof->user->userName())+"\n\n"+
QObject::tr("You can only work with one instance of an individual SleepyHead profile at a time.")+"\n\n"+
QObject::tr("Please close any other instances of SleepyHead running with this profile before proceeding.")+"\n\n"+
QObject::tr("If no other instances of SleepyHead are running, (eg, it crashed last time!), it is safe to ignore this message."),
QMessageBox::Cancel |QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel) {
return;
}
} else {
if (QMessageBox::warning(nullptr, STR_MessageBox_Warning,
QObject::tr("There is a lockfile already present for this profile '%1', claimed on '%2'.").arg(prof->user->userName()).arg(lockhost)+"\n\n"+
QObject::tr("You can only work with one instance of an individual SleepyHead profile at a time.")+"\n\n"+
QObject::tr("If you are using cloud storage, make sure SleepyHead is closed and syncing has completed first on the other computer before proceeding."),
QMessageBox::Cancel |QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel) {
return;
}
}
prof->removeLock();
}
qstatus->setText(tr("Loading Data")); qstatus->setText(tr("Loading Data"));
qprogress->show(); qprogress->show();
//qstatusbar->showMessage(tr("Loading Data"),0);
// profile is a global variable set in main after login p_profile = prof;
#ifdef LOCK_RESMED_SESSIONS
QList<Machine *> machines = p_profile->GetMachines(MT_CPAP);
for (QList<Machine *>::iterator it = machines.begin(); it != machines.end(); ++it) {
QString mclass=(*it)->loaderName();
if (mclass == STR_MACH_ResMed) {
qDebug() << "ResMed machine found.. locking Session splitting capabilities";
// Have to sacrifice these features to get access to summary data.
p_profile->session->setCombineCloseSessions(0);
p_profile->session->setDaySplitTime(QTime(12,0,0));
p_profile->session->setIgnoreShortSessions(false);
p_profile->session->setLockSummarySessions(true);
break;
}
}
#endif
// Todo: move this to AHIWIndow check to profile Load function...
if (p_profile->cpap->AHIWindow() < 30.0) {
p_profile->cpap->setAHIWindow(60.0);
}
if (p_profile->p_preferences[STR_PREF_ReimportBackup].toBool()) {
importCPAPBackups();
p_profile->p_preferences[STR_PREF_ReimportBackup]=false;
}
p_profile->LoadMachineData(); p_profile->LoadMachineData();
QList<MachineLoader *> loaders = GetLoaders(); QList<MachineLoader *> loaders = GetLoaders();
@ -666,44 +486,78 @@ void MainWindow::Startup()
connect(loaders.at(i), SIGNAL(machineUnsupported(Machine*)), this, SLOT(MachineUnsupported(Machine*))); connect(loaders.at(i), SIGNAL(machineUnsupported(Machine*)), this, SLOT(MachineUnsupported(Machine*)));
} }
PopulatePurgeMenu();
// SnapshotGraph = new gGraphView(this, daily->graphView());
// // 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();
overview = new Overview(ui->tabWidget, daily->graphView());
ui->tabWidget->insertTab(3, overview, STR_TR_Overview);
// GenerateStatistics();
ui->statStartDate->setDate(p_profile->FirstDay()); ui->statStartDate->setDate(p_profile->FirstDay());
ui->statEndDate->setDate(p_profile->LastDay()); ui->statEndDate->setDate(p_profile->LastDay());
if (overview) { overview->ReloadGraphs(); } // Reload everything profile related
Q_ASSERT(!daily);
daily = new Daily(ui->tabWidget, nullptr);
ui->tabWidget->insertTab(2, daily, STR_TR_Daily);
daily->ReloadGraphs();
Q_ASSERT(!overview);
overview = new Overview(ui->tabWidget, daily->graphView());
ui->tabWidget->insertTab(3, overview, STR_TR_Overview);
overview->ReloadGraphs();
// Should really create welcome and statistics here, but they need redoing later anyway to kill off webkit
ui->tabWidget->setCurrentWidget(ui->welcomeTab);
GenerateStatistics();
PopulatePurgeMenu();
AppSetting->setProfileName(p_profile->user->userName());
mainwin->setWindowTitle(STR_TR_SleepyHead + QString(" %1 (" + tr("Profile") + ": %2)").arg(getBranchVersion()).arg(AppSetting->profileName()));
profileSelector->updateProfileHighlight(profileName);
ui->oximetryButton->setDisabled(false);
ui->dailyButton->setDisabled(false);
ui->overviewButton->setDisabled(false);
ui->statisticsButton->setDisabled(false);
ui->importButton->setDisabled(false);
qprogress->hide(); qprogress->hide();
qstatus->setText(""); qstatus->setText("");
if (p_profile->p_preferences[STR_PREF_ReimportBackup].toBool()) { }
importCPAPBackups();
p_profile->p_preferences[STR_PREF_ReimportBackup]=false;
}
ui->tabWidget->setCurrentWidget(ui->welcomeTab);
void MainWindow::CloseProfile()
{
if (daily) { if (daily) {
daily->ReloadGraphs(); daily->Unload();
// daily->populateSessionWidget(); daily->clearLastDay(); // otherwise Daily will crash
delete daily;
daily = nullptr;
}
if (overview) {
delete overview;
overview = nullptr;
} }
p_profile->StoreMachines();
p_profile->UnloadMachineData();
p_profile->saveChannels();
p_profile->Save();
p_profile->removeLock();
p_profile = nullptr;
}
void MainWindow::Startup()
{
QString lastProfile = AppSetting->profileName();
if (Profiles::profiles.contains(lastProfile)) {
OpenProfile(lastProfile);
ui->tabWidget->setCurrentIndex(AppSetting->openTabAtStart());
if (AppSetting->autoLaunchImport()) {
on_importButton_clicked();
}
} else {
ui->tabWidget->setCurrentWidget(profileSelector);
}
} }
int MainWindow::importCPAP(ImportPath import, const QString &message) int MainWindow::importCPAP(ImportPath import, const QString &message)
@ -749,9 +603,14 @@ int MainWindow::importCPAP(ImportPath import, const QString &message)
qprogress->setVisible(false); qprogress->setVisible(false);
delete popup; delete popup;
if (AppSetting->openTabAfterImport()>0) {
ui->tabWidget->setCurrentIndex(AppSetting->openTabAfterImport());
}
// Now what was this for???
disconnect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(on_aboutToQuit())); disconnect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(on_aboutToQuit()));
connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(on_aboutToQuit())); connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(on_aboutToQuit()));
return c; return c;
} }
@ -759,12 +618,17 @@ void MainWindow::finishCPAPImport()
{ {
p_profile->StoreMachines(); p_profile->StoreMachines();
GenerateStatistics(); GenerateStatistics();
profileSelector->updateProfileList();
if (overview) { overview->ReloadGraphs(); } if (overview) { overview->ReloadGraphs(); }
if (daily) { if (daily) {
// daily->populateSessionWidget(); // daily->populateSessionWidget();
daily->ReloadGraphs(); daily->ReloadGraphs();
} }
if (AppSetting->openTabAfterImport()>0) {
ui->tabWidget->setCurrentIndex(AppSetting->openTabAfterImport());
}
} }
void MainWindow::importCPAPBackups() void MainWindow::importCPAPBackups()
@ -1353,8 +1217,10 @@ void MainWindow::on_urlBar_activated(const QString &arg1)
void MainWindow::on_dailyButton_clicked() void MainWindow::on_dailyButton_clicked()
{ {
if (daily) {
ui->tabWidget->setCurrentWidget(daily); ui->tabWidget->setCurrentWidget(daily);
daily->RedrawGraphs(); daily->RedrawGraphs();
}
} }
void MainWindow::JumpDaily() void MainWindow::JumpDaily()
{ {
@ -1363,7 +1229,9 @@ void MainWindow::JumpDaily()
void MainWindow::on_overviewButton_clicked() void MainWindow::on_overviewButton_clicked()
{ {
if (overview) {
ui->tabWidget->setCurrentWidget(overview); ui->tabWidget->setCurrentWidget(overview);
}
} }
void MainWindow::on_webView_loadFinished(bool arg1) void MainWindow::on_webView_loadFinished(bool arg1)
@ -1524,13 +1392,12 @@ void MainWindow::on_action_About_triggered()
//spawn browser with paypal site. //spawn browser with paypal site.
} }
disconnect(&webview, SIGNAL(linkClicked(const QUrl &)), this, disconnect(&webview, SIGNAL(linkClicked(const QUrl &)), this, SLOT(aboutBoxLinkClicked(const QUrl &)));
SLOT(aboutBoxLinkClicked(const QUrl &)));
} }
void MainWindow::on_actionDebug_toggled(bool checked) void MainWindow::on_actionDebug_toggled(bool checked)
{ {
p_profile->general->setShowDebug(checked); AppSetting->setShowDebug(checked);
logger->strlock.lock(); logger->strlock.lock();
if (checked) { if (checked) {
@ -1552,6 +1419,10 @@ void MainWindow::on_action_Reset_Graph_Layout_triggered()
void MainWindow::on_action_Preferences_triggered() void MainWindow::on_action_Preferences_triggered()
{ {
//MW: TODO: This will crash if attempted to enter while still loading.. //MW: TODO: This will crash if attempted to enter while still loading..
if (!p_profile) {
mainwin->Notify(tr("Please open a profile first."));
return;
}
if (m_inRecalculation) { if (m_inRecalculation) {
mainwin->Notify(tr("Access to Preferences has been blocked until recalculation completes.")); mainwin->Notify(tr("Access to Preferences has been blocked until recalculation completes."));
@ -1584,8 +1455,10 @@ QDateTime datetimeDialog(QDateTime datetime, QString message);
void MainWindow::on_oximetryButton_clicked() void MainWindow::on_oximetryButton_clicked()
{ {
if (p_profile) {
OximeterImport oxiimp(this); OximeterImport oxiimp(this);
oxiimp.exec(); oxiimp.exec();
}
} }
void MainWindow::CheckForUpdates() void MainWindow::CheckForUpdates()
@ -1723,7 +1596,7 @@ void MainWindow::on_actionPrint_Report_triggered()
void MainWindow::on_action_Edit_Profile_triggered() void MainWindow::on_action_Edit_Profile_triggered()
{ {
NewProfile *newprof = new NewProfile(this); NewProfile *newprof = new NewProfile(this);
QString name =PREF[STR_GEN_Profile].toString(); QString name = AppSetting->profileName();
newprof->edit(name); newprof->edit(name);
newprof->setWindowModality(Qt::ApplicationModal); newprof->setWindowModality(Qt::ApplicationModal);
newprof->setModal(true); newprof->setModal(true);
@ -2023,14 +1896,6 @@ void MainWindow::RestartApplication(bool force_login, QString cmdline)
#endif #endif
} }
void MainWindow::on_actionChange_User_triggered()
{
p_profile->Save();
PREF.Save();
RestartApplication(true);
}
void MainWindow::on_actionPurge_Current_Day_triggered() void MainWindow::on_actionPurge_Current_Day_triggered()
{ {
QDate date = getDaily()->getDate(); QDate date = getDaily()->getDate();
@ -2259,7 +2124,7 @@ void MainWindow::keyPressEvent(QKeyEvent *event)
void MainWindow::on_action_Sidebar_Toggle_toggled(bool visible) void MainWindow::on_action_Sidebar_Toggle_toggled(bool visible)
{ {
ui->toolBox->setVisible(visible); ui->toolBox->setVisible(visible);
p_profile->appearance->setRightSidebarVisible(visible); AppSetting->setRightSidebarVisible(visible);
} }
void MainWindow::on_recordsBox_linkClicked(const QUrl &linkurl) void MainWindow::on_recordsBox_linkClicked(const QUrl &linkurl)
@ -2282,8 +2147,10 @@ void MainWindow::on_recordsBox_linkClicked(const QUrl &linkurl)
overview->setRange(d1, d2); overview->setRange(d1, d2);
ui->tabWidget->setCurrentWidget(overview); ui->tabWidget->setCurrentWidget(overview);
} else if (link == "import") { } else if (link == "import") {
if (data == "cpap") on_importButton_clicked(); // Don't run the importer directly from here because it destroys the object that called this function..
if (data == "oximeter") on_oximetryButton_clicked(); // Schedule it instead
if (data == "cpap") QTimer::singleShot(0, mainwin, SLOT(on_importButton_clicked()));
if (data == "oximeter") QTimer::singleShot(0, mainwin, SLOT(on_oximetryButton_clicked()));
} else if (link == "statistics") { } else if (link == "statistics") {
ui->tabWidget->setCurrentWidget(ui->statisticsTab); ui->tabWidget->setCurrentWidget(ui->statisticsTab);
} }
@ -2583,9 +2450,11 @@ void MainWindow::on_actionChange_Language_triggered()
void MainWindow::on_actionChange_Data_Folder_triggered() void MainWindow::on_actionChange_Data_Folder_triggered()
{ {
if (p_profile) {
p_profile->Save(); p_profile->Save();
PREF.Save();
p_profile->removeLock(); p_profile->removeLock();
}
PREF.Save();
RestartApplication(false, "-d"); RestartApplication(false, "-d");
} }
@ -2651,7 +2520,9 @@ void MainWindow::GenerateStatistics()
void MainWindow::on_statisticsButton_clicked() void MainWindow::on_statisticsButton_clicked()
{ {
if (p_profile) {
ui->tabWidget->setCurrentWidget(ui->statisticsTab); ui->tabWidget->setCurrentWidget(ui->statisticsTab);
}
} }
void MainWindow::on_statisticsView_linkClicked(const QUrl &arg1) void MainWindow::on_statisticsView_linkClicked(const QUrl &arg1)
@ -2733,7 +2604,7 @@ void MainWindow::on_importButton_clicked()
void MainWindow::on_actionToggle_Line_Cursor_toggled(bool b) void MainWindow::on_actionToggle_Line_Cursor_toggled(bool b)
{ {
p_profile->appearance->setLineCursorMode(b); AppSetting->setLineCursorMode(b);
if (ui->tabWidget->currentWidget() == getDaily()) { if (ui->tabWidget->currentWidget() == getDaily()) {
getDaily()->graphView()->timedRedraw(0); getDaily()->graphView()->timedRedraw(0);
} else if (ui->tabWidget->currentWidget() == getOverview()) { } else if (ui->tabWidget->currentWidget() == getOverview()) {
@ -2770,7 +2641,7 @@ void MainWindow::on_actionExport_Journal_triggered()
void MainWindow::on_actionShow_Performance_Counters_toggled(bool arg1) void MainWindow::on_actionShow_Performance_Counters_toggled(bool arg1)
{ {
p_profile->general->setShowPerformance(arg1); AppSetting->setShowPerformance(arg1);
} }
void MainWindow::on_actionExport_CSV_triggered() void MainWindow::on_actionExport_CSV_triggered()
@ -2788,7 +2659,7 @@ void MainWindow::on_actionExport_Review_triggered()
void MainWindow::on_mainsplitter_splitterMoved(int, int) void MainWindow::on_mainsplitter_splitterMoved(int, int)
{ {
p_profile->appearance->setRightPanelWidth(ui->mainsplitter->sizes()[1]); AppSetting->setRightPanelWidth(ui->mainsplitter->sizes()[1]);
} }
#include "translation.h" #include "translation.h"
@ -2798,3 +2669,8 @@ void MainWindow::on_actionReport_a_Bug_triggered()
QString language = settings.value(LangSetting).toString(); QString language = settings.value(LangSetting).toString();
QDesktopServices::openUrl(QUrl(QString("https://sleepyhead.jedimark.net/report_bugs.php?lang=%1&version=%2&platform=%3").arg(language).arg(VersionString).arg(PlatformString))); QDesktopServices::openUrl(QUrl(QString("https://sleepyhead.jedimark.net/report_bugs.php?lang=%1&version=%2&platform=%3").arg(language).arg(VersionString).arg(PlatformString)));
} }
void MainWindow::on_profilesButton_clicked()
{
ui->tabWidget->setCurrentWidget(profileSelector);
}

16
sleepyhead/mainwindow.h
View File

@ -1,4 +1,4 @@
/* SleepyHead MainWindow Headers /* SleepyHead MainWindow Headers
* *
* Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -18,6 +18,7 @@
#include "daily.h" #include "daily.h"
#include "overview.h" #include "overview.h"
#include "profileselector.h"
#include "preferencesdialog.h" #include "preferencesdialog.h"
extern Profile *profile; extern Profile *profile;
@ -66,9 +67,6 @@ class Daily;
class Report; class Report;
class Overview; class Overview;
void loadChannels(bool changing_language=false);
void saveChannels();
/*! \class MainWindow /*! \class MainWindow
\author Mark Watkins \author Mark Watkins
@ -95,6 +93,8 @@ class MainWindow : public QMainWindow
//! \brief Start the automatic update checker process //! \brief Start the automatic update checker process
void CheckForUpdates(); void CheckForUpdates();
void CloseProfile();
void OpenProfile(QString name);
/*! \fn Notify(QString s,int ms=5000, QString title="SleepyHead v"+VersionString()); /*! \fn Notify(QString s,int ms=5000, QString title="SleepyHead v"+VersionString());
\brief Pops up a message box near the system tray \brief Pops up a message box near the system tray
@ -251,9 +251,6 @@ class MainWindow : public QMainWindow
*/ */
void on_action_Rebuild_Oximetry_Index_triggered(); void on_action_Rebuild_Oximetry_Index_triggered();
//! \brief Log out, by effectively forcing a restart
void on_actionChange_User_triggered();
//! \brief Destroy the CPAP data for the currently selected day, so it can be freshly imported again //! \brief Destroy the CPAP data for the currently selected day, so it can be freshly imported again
void on_actionPurge_Current_Day_triggered(); void on_actionPurge_Current_Day_triggered();
@ -320,8 +317,6 @@ class MainWindow : public QMainWindow
void on_importButton_clicked(); void on_importButton_clicked();
void on_changeWarningMessage();
void on_actionToggle_Line_Cursor_toggled(bool arg1); void on_actionToggle_Line_Cursor_toggled(bool arg1);
void on_actionLeft_Daily_Sidebar_toggled(bool arg1); void on_actionLeft_Daily_Sidebar_toggled(bool arg1);
@ -341,6 +336,8 @@ class MainWindow : public QMainWindow
void on_actionReport_a_Bug_triggered(); void on_actionReport_a_Bug_triggered();
void on_profilesButton_clicked();
private: private:
void importCPAPBackups(); void importCPAPBackups();
void finishCPAPImport(); void finishCPAPImport();
@ -352,6 +349,7 @@ private:
Ui::MainWindow *ui; Ui::MainWindow *ui;
Daily *daily; Daily *daily;
Overview *overview; Overview *overview;
ProfileSelector *profileSelector;
bool first_load; bool first_load;
PreferencesDialog *prefdialog; PreferencesDialog *prefdialog;
QTime logtime; QTime logtime;

115
sleepyhead/mainwindow.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>687</width> <width>1023</width>
<height>361</height> <height>804</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -958,42 +958,14 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="warningLabel"> <widget class="QWebView" name="welcomeView" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>14</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">background-color: red;
color: yellow;</string>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Warning: &lt;/span&gt;This is pre-release software, some parts of this program may not yet function as intended.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignHCenter|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
<widget class="QWebView" name="welcomeView">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="url"> <property name="url" stdset="0">
<url> <url>
<string>about:blank</string> <string>about:blank</string>
</url> </url>
@ -1023,14 +995,14 @@ color: yellow;</string>
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QWebView" name="statisticsView"> <widget class="QWebView" name="statisticsView" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="url"> <property name="url" stdset="0">
<url> <url>
<string>about:blank</string> <string>about:blank</string>
</url> </url>
@ -1293,7 +1265,7 @@ color: yellow;</string>
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QWebView" name="webView"> <widget class="QWebView" name="webView" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -1312,7 +1284,7 @@ color: yellow;</string>
<height>200</height> <height>200</height>
</size> </size>
</property> </property>
<property name="url"> <property name="url" stdset="0">
<url> <url>
<string>qrc:/docs/index.html</string> <string>qrc:/docs/index.html</string>
</url> </url>
@ -1472,7 +1444,7 @@ QToolBox::tab:selected {
<number>1</number> <number>1</number>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>2</number> <number>0</number>
</property> </property>
<property name="tabSpacing"> <property name="tabSpacing">
<number>0</number> <number>0</number>
@ -1482,8 +1454,8 @@ QToolBox::tab:selected {
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>95</width> <width>175</width>
<height>606</height> <height>680</height>
</rect> </rect>
</property> </property>
<property name="palette"> <property name="palette">
@ -1591,6 +1563,50 @@ QToolBox::tab:selected {
<string>Navigation</string> <string>Navigation</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QToolButton" name="profilesButton">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true">QToolButton {
background: transparent;
border: 2px solid transparent; border-radius: 30px;
}
QToolButton:hover {
border: 2px solid #56789a; border-radius: 30px;
}
QToolButton:pressed {
background-color: #8080ff;
border: 2px solid #56789a; border-radius: 30px;
}</string>
</property>
<property name="text">
<string>Profiles</string>
</property>
<property name="icon">
<iconset resource="Resources.qrc">
<normaloff>:/icons/go-home.png</normaloff>:/icons/go-home.png</iconset>
</property>
<property name="iconSize">
<size>
<width>64</width>
<height>64</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item> <item>
<widget class="QToolButton" name="statisticsButton"> <widget class="QToolButton" name="statisticsButton">
<property name="sizePolicy"> <property name="sizePolicy">
@ -1896,8 +1912,8 @@ border: 2px solid #56789a; border-radius: 30px;
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>77</width> <width>175</width>
<height>236</height> <height>680</height>
</rect> </rect>
</property> </property>
<property name="palette"> <property name="palette">
@ -2929,7 +2945,7 @@ border-radius: 10px;
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QWebView" name="bookmarkView"> <widget class="QWebView" name="bookmarkView" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -3030,7 +3046,7 @@ border-radius: 10px;
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background: rgb(163, 190, 255)</string> <string notr="true">background: rgb(163, 190, 255)</string>
</property> </property>
<property name="url"> <property name="url" stdset="0">
<url> <url>
<string>about:blank</string> <string>about:blank</string>
</url> </url>
@ -3044,8 +3060,8 @@ border-radius: 10px;
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>77</width> <width>175</width>
<height>236</height> <height>680</height>
</rect> </rect>
</property> </property>
<property name="mouseTracking"> <property name="mouseTracking">
@ -3078,7 +3094,7 @@ border-radius: 10px;
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QWebView" name="recordsBox"> <widget class="QWebView" name="recordsBox" native="true">
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>10</pointsize>
@ -3087,7 +3103,7 @@ border-radius: 10px;
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background: rgb(163, 190, 255)</string> <string notr="true">background: rgb(163, 190, 255)</string>
</property> </property>
<property name="url"> <property name="url" stdset="0">
<url> <url>
<string>about:blank</string> <string>about:blank</string>
</url> </url>
@ -3106,8 +3122,8 @@ border-radius: 10px;
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>687</width> <width>1023</width>
<height>22</height> <height>21</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -3137,7 +3153,6 @@ border-radius: 10px;
<addaction name="menuExp_ort_CSV_Data"/> <addaction name="menuExp_ort_CSV_Data"/>
<addaction name="actionExport_Journal"/> <addaction name="actionExport_Journal"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionChange_User"/>
<addaction name="actionChange_Data_Folder"/> <addaction name="actionChange_Data_Folder"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="action_Exit"/> <addaction name="action_Exit"/>

9
sleepyhead/newprofile.cpp
View File

@ -1,4 +1,4 @@
/* Create New Profile Implementation /* Create New Profile Implementation
* *
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -91,9 +91,7 @@ NewProfile::NewProfile(QWidget *parent, const QString *user) :
f.close(); f.close();
} }
ui->AppTitle->setText("SleepyHead v" + VersionString); ui->releaseStatus->setText("v" + VersionString);
//ui->releaseStatus->setText(ReleaseStatus);
ui->textBrowser->setHtml(getIntroHTML()); ui->textBrowser->setHtml(getIntroHTML());
} }
@ -264,8 +262,7 @@ void NewProfile::on_nextButton_clicked()
profile->user->setHeight(v); profile->user->setHeight(v);
//profile->user->setUserName(username); //profile->user->setUserName(username);
PREF[STR_GEN_Profile] = username; AppSetting->setProfileName(username);
this->accept(); this->accept();
} }

68
sleepyhead/newprofile.ui
View File

@ -40,7 +40,7 @@
<item> <item>
<widget class="QStackedWidget" name="stackedWidget"> <widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="welcomePage"> <widget class="QWidget" name="welcomePage">
<layout class="QVBoxLayout" name="verticalLayout_8"> <layout class="QVBoxLayout" name="verticalLayout_8">
@ -91,7 +91,7 @@
<widget class="QWidget" name="userPage"> <widget class="QWidget" name="userPage">
<layout class="QVBoxLayout" name="verticalLayout_9"> <layout class="QVBoxLayout" name="verticalLayout_9">
<property name="spacing"> <property name="spacing">
<number>-1</number> <number>6</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>8</number> <number>8</number>
@ -115,7 +115,7 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_10"> <layout class="QVBoxLayout" name="verticalLayout_10">
<property name="spacing"> <property name="spacing">
<number>-1</number> <number>6</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>8</number> <number>8</number>
@ -226,7 +226,7 @@
<number>8</number> <number>8</number>
</property> </property>
<property name="spacing"> <property name="spacing">
<number>-1</number> <number>6</number>
</property> </property>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QCheckBox" name="DSTcheckbox"> <widget class="QCheckBox" name="DSTcheckbox">
@ -300,7 +300,7 @@
<widget class="QWidget" name="personalPage"> <widget class="QWidget" name="personalPage">
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing"> <property name="spacing">
<number>-1</number> <number>6</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>8</number> <number>8</number>
@ -321,10 +321,10 @@
</property> </property>
<layout class="QFormLayout" name="formLayout_6"> <layout class="QFormLayout" name="formLayout_6">
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>-1</number> <number>6</number>
</property> </property>
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>-1</number> <number>6</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>8</number> <number>8</number>
@ -360,6 +360,9 @@
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_7">
<property name="toolTip">
<string>It's totally ok to fib or skip this, but your rough age is needed to enhance accuracy of certain calculations.</string>
</property>
<property name="text"> <property name="text">
<string>D.O.B.</string> <string>D.O.B.</string>
</property> </property>
@ -376,6 +379,9 @@
</item> </item>
<item> <item>
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Biological (birth) gender is sometimes needed to enhance the accuracy of a few calculations, feel free to leave this blank and skip any of them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text"> <property name="text">
<string>Gender</string> <string>Gender</string>
</property> </property>
@ -475,10 +481,10 @@
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property> </property>
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>-1</number> <number>6</number>
</property> </property>
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>-1</number> <number>6</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>8</number> <number>8</number>
@ -550,7 +556,7 @@
<widget class="QWidget" name="cpapPage"> <widget class="QWidget" name="cpapPage">
<layout class="QVBoxLayout" name="verticalLayout_7"> <layout class="QVBoxLayout" name="verticalLayout_7">
<property name="spacing"> <property name="spacing">
<number>-1</number> <number>6</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>8</number> <number>8</number>
@ -574,10 +580,10 @@
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property> </property>
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>-1</number> <number>6</number>
</property> </property>
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>-1</number> <number>6</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>8</number> <number>8</number>
@ -682,7 +688,7 @@
<widget class="QWidget" name="doctorPage"> <widget class="QWidget" name="doctorPage">
<layout class="QVBoxLayout" name="verticalLayout_6"> <layout class="QVBoxLayout" name="verticalLayout_6">
<property name="spacing"> <property name="spacing">
<number>-1</number> <number>6</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>8</number> <number>8</number>
@ -706,10 +712,10 @@
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property> </property>
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>-1</number> <number>6</number>
</property> </property>
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>-1</number> <number>6</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>8</number> <number>8</number>
@ -832,6 +838,25 @@
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label_2">
<property name="maximumSize">
<size>
<width>128</width>
<height>128</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="Resources.qrc">:/docs/sheep.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
<item> <item>
<widget class="QLabel" name="AppTitle"> <widget class="QLabel" name="AppTitle">
<property name="sizePolicy"> <property name="sizePolicy">
@ -871,19 +896,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="Resources.qrc">:/docs/sheep.png</pixmap>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
</widget>
</item>
<item> <item>
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer_2">
<property name="orientation"> <property name="orientation">

2
sleepyhead/overview.cpp
View File

@ -446,7 +446,7 @@ void Overview::closeEvent(QCloseEvent *event)
gGraph *Overview::createGraph(QString code, QString name, QString units, YTickerType yttype) gGraph *Overview::createGraph(QString code, QString name, QString units, YTickerType yttype)
{ {
int default_height = p_profile->appearance->graphHeight(); int default_height = AppSetting->graphHeight();
gGraph *g = new gGraph(code, GraphView, name, units, default_height, 0); gGraph *g = new gGraph(code, GraphView, name, units, default_height, 0);
gYAxis *yt; gYAxis *yt;

4
sleepyhead/oximeterimport.cpp
View File

@ -474,7 +474,7 @@ void OximeterImport::on_liveImportButton_clicked()
} }
MachineInfo info = oximodule->newInfo(); MachineInfo info = oximodule->newInfo();
Machine *mach = oximodule->CreateMachine(info); Machine *mach = p_profile->CreateMachine(info);
connect(oximodule, SIGNAL(updatePlethy(QByteArray)), this, SLOT(on_updatePlethy(QByteArray))); connect(oximodule, SIGNAL(updatePlethy(QByteArray)), this, SLOT(on_updatePlethy(QByteArray)));
ui->liveConnectLabel->setText(tr("Live Oximetery Mode")); ui->liveConnectLabel->setText(tr("Live Oximetery Mode"));
@ -842,7 +842,7 @@ void OximeterImport::on_saveButton_clicked()
// this can move to SerialOximeter class process function... // this can move to SerialOximeter class process function...
MachineInfo info = oximodule->newInfo(); MachineInfo info = oximodule->newInfo();
Machine * mach = oximodule->CreateMachine(info); Machine * mach = p_profile->CreateMachine(info);
SessionID sid = ui->dateTimeEdit->dateTime().toUTC().toTime_t(); SessionID sid = ui->dateTimeEdit->dateTime().toUTC().toTime_t();
quint64 start = quint64(sid) * 1000L; quint64 start = quint64(sid) * 1000L;

126
sleepyhead/preferencesdialog.cpp
View File

@ -1,4 +1,4 @@
/* SleepyHead Preferences Dialog Implementation /* SleepyHead Preferences Dialog Implementation
* *
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -48,19 +48,29 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
channeltype[schema::MINOR_FLAG] = tr("Minor Flag"); channeltype[schema::MINOR_FLAG] = tr("Minor Flag");
channeltype[schema::SPAN] = tr("Span"); channeltype[schema::SPAN] = tr("Span");
channeltype[schema::UNKNOWN] = tr("Always Minor"); channeltype[schema::UNKNOWN] = tr("Always Minor");
bool haveResMed = false;
QList<Machine *> machines = profile->GetMachines(MT_CPAP);
for (QList<Machine *>::iterator it = machines.begin(); it != machines.end(); ++it) {
const QString & mclass=(*it)->loaderName();
if (mclass == STR_MACH_ResMed) {
haveResMed = true;
break;
}
}
//#ifdef LOCK_RESMED_SESSIONS #ifdef LOCK_RESMED_SESSIONS
// QList<Machine *> machines = p_profile->GetMachines(MT_CPAP); // Remove access to session splitting options and show ResMed users a notice instead
// for (QList<Machine *>::iterator it = machines.begin(); it != machines.end(); ++it) { ui->ResMedWarning->setText(tr("<p><b>Please Note:</b> SleepyHead's advanced session splitting capabilities are not possible with <b>ResMed</b> machines due to a limitation in the way their settings and summary data is stored, and therefore they have been disabled for this profile.</p><p>On ResMed machines, days will <b>split at noon</b> like in ResMed's commercial software.</p>"));
// const QString & mclass=(*it)->loaderName(); ui->ResMedWarning->setVisible(haveResMed);
// if (mclass == STR_MACH_ResMed) {
// ui->combineSlider->setEnabled(false); if (haveResMed) {
// ui->IgnoreSlider->setEnabled(false); ui->sessionSplitWidget->setVisible(!haveResMed);
// ui->timeEdit->setEnabled(false); profile->session->setDaySplitTime(QTime(12,0,0));
// break; profile->session->setIgnoreShortSessions(0);
// } profile->session->setCombineCloseSessions(0);
// } profile->session->setLockSummarySessions(true);
//#endif }
#endif
QLocale locale = QLocale::system(); QLocale locale = QLocale::system();
QString shortformat = locale.dateFormat(QLocale::ShortFormat); QString shortformat = locale.dateFormat(QLocale::ShortFormat);
@ -100,6 +110,10 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
int val = profile->session->combineCloseSessions(); int val = profile->session->combineCloseSessions();
ui->combineSlider->setValue(val); ui->combineSlider->setValue(val);
ui->openingTabCombo->setCurrentIndex(AppSetting->openTabAtStart());
ui->importTabCombo->setCurrentIndex(AppSetting->openTabAfterImport());
if (val > 0) { if (val > 0) {
ui->combineLCD->display(val); ui->combineLCD->display(val);
} else { ui->combineLCD->display(STR_TR_Off); } } else { ui->combineLCD->display(STR_TR_Off); }
@ -137,18 +151,18 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
ui->bigFontBold->setChecked(bigfont->weight() == QFont::Bold); ui->bigFontBold->setChecked(bigfont->weight() == QFont::Bold);
ui->bigFontItalic->setChecked(bigfont->italic()); ui->bigFontItalic->setChecked(bigfont->italic());
ui->lineThicknessSlider->setValue(profile->appearance->lineThickness()*2); ui->lineThicknessSlider->setValue(AppSetting->lineThickness()*2.0);
ui->resyncMachineDetectedEvents->setChecked(profile->cpap->resyncFromUserFlagging()); ui->resyncMachineDetectedEvents->setChecked(profile->cpap->resyncFromUserFlagging());
ui->useAntiAliasing->setChecked(profile->appearance->antiAliasing()); ui->useAntiAliasing->setChecked(AppSetting->antiAliasing());
ui->usePixmapCaching->setChecked(profile->appearance->usePixmapCaching()); ui->usePixmapCaching->setChecked(AppSetting->usePixmapCaching());
ui->useSquareWavePlots->setChecked(profile->appearance->squareWavePlots()); ui->useSquareWavePlots->setChecked(AppSetting->squareWavePlots());
ui->enableGraphSnapshots->setChecked(profile->appearance->graphSnapshots()); ui->enableGraphSnapshots->setChecked(AppSetting->graphSnapshots());
ui->graphTooltips->setChecked(profile->appearance->graphTooltips()); ui->graphTooltips->setChecked(AppSetting->graphTooltips());
ui->allowYAxisScaling->setChecked(profile->appearance->allowYAxisScaling()); ui->allowYAxisScaling->setChecked(AppSetting->allowYAxisScaling());
ui->skipLoginScreen->setChecked(PREF[STR_GEN_SkipLogin].toBool()); ui->autoLaunchImporter->setChecked(AppSetting->autoLaunchImport());
ui->allowEarlyUpdates->setChecked(PREF[STR_PREF_AllowEarlyUpdates].toBool()); ui->allowEarlyUpdates->setChecked(PREF[STR_PREF_AllowEarlyUpdates].toBool());
int s = profile->cpap->clockDrift(); int s = profile->cpap->clockDrift();
@ -161,10 +175,11 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
ui->skipEmptyDays->setChecked(profile->general->skipEmptyDays()); ui->skipEmptyDays->setChecked(profile->general->skipEmptyDays());
ui->showUnknownFlags->setChecked(profile->general->showUnknownFlags()); ui->showUnknownFlags->setChecked(profile->general->showUnknownFlags());
ui->enableMultithreading->setChecked(profile->session->multithreading()); ui->enableMultithreading->setChecked(AppSetting->multithreading());
ui->cacheSessionData->setChecked(profile->session->cacheSessions()); ui->removeCardNotificationCheckbox->setChecked(AppSetting->removeCardReminder());
ui->cacheSessionData->setChecked(AppSetting->cacheSessions());
ui->preloadSummaries->setChecked(profile->session->preloadSummaries()); ui->preloadSummaries->setChecked(profile->session->preloadSummaries());
ui->animationsAndTransitionsCheckbox->setChecked(profile->appearance->animations()); ui->animationsAndTransitionsCheckbox->setChecked(AppSetting->animations());
ui->complianceCheckBox->setChecked(profile->cpap->showComplianceInfo()); ui->complianceCheckBox->setChecked(profile->cpap->showComplianceInfo());
ui->complianceHours->setValue(profile->cpap->complianceHours()); ui->complianceHours->setValue(profile->cpap->complianceHours());
@ -173,11 +188,11 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
float f = profile->general->prefCalcPercentile(); float f = profile->general->prefCalcPercentile();
ui->prefCalcPercentile->setValue(f); ui->prefCalcPercentile->setValue(f);
ui->tooltipTimeoutSlider->setValue(profile->general->tooltipTimeout()); ui->tooltipTimeoutSlider->setValue(AppSetting->tooltipTimeout());
on_tooltipTimeoutSlider_valueChanged(ui->tooltipTimeoutSlider->value()); on_tooltipTimeoutSlider_valueChanged(ui->tooltipTimeoutSlider->value());
//ui->tooltipMS->display(profile->general->tooltipTimeout()); //ui->tooltipMS->display(profile->general->tooltipTimeout());
ui->scrollDampeningSlider->setValue(profile->general->scrollDampening() / 10); ui->scrollDampeningSlider->setValue(AppSetting->scrollDampening() / 10);
on_scrollDampeningSlider_valueChanged(ui->scrollDampeningSlider->value()); on_scrollDampeningSlider_valueChanged(ui->scrollDampeningSlider->value());
bool bcd = profile->session->backupCardData(); bool bcd = profile->session->backupCardData();
@ -188,7 +203,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
ui->ignoreOlderSessionsCheck->setChecked(profile->session->ignoreOlderSessions()); ui->ignoreOlderSessionsCheck->setChecked(profile->session->ignoreOlderSessions());
ui->ignoreOlderSessionsDate->setDate(profile->session->ignoreOlderSessionsDate().date()); ui->ignoreOlderSessionsDate->setDate(profile->session->ignoreOlderSessionsDate().date());
ui->graphHeight->setValue(profile->appearance->graphHeight()); ui->graphHeight->setValue(AppSetting->graphHeight());
ui->automaticallyCheckUpdates->setChecked(PREF[STR_GEN_UpdatesAutoCheck].toBool()); ui->automaticallyCheckUpdates->setChecked(PREF[STR_GEN_UpdatesAutoCheck].toBool());
@ -199,8 +214,8 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
RefreshLastChecked(); RefreshLastChecked();
} else { ui->updateLastChecked->setText("Never"); } } else { ui->updateLastChecked->setText("Never"); }
ui->overlayFlagsCombo->setCurrentIndex(profile->appearance->overlayType()); ui->overlayFlagsCombo->setCurrentIndex(AppSetting->overlayType());
ui->overviewLinecharts->setCurrentIndex(profile->appearance->overviewLinechartMode()); ui->overviewLinecharts->setCurrentIndex(AppSetting->overviewLinechartMode());
ui->ahiGraphWindowSize->setEnabled(false); ui->ahiGraphWindowSize->setEnabled(false);
ui->ahiGraphWindowSize->setValue(profile->cpap->AHIWindow()); ui->ahiGraphWindowSize->setValue(profile->cpap->AHIWindow());
@ -214,7 +229,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
ui->userEventDuplicates->setChecked(profile->cpap->userEventDuplicates()); ui->userEventDuplicates->setChecked(profile->cpap->userEventDuplicates());
ui->userEventDuplicates->setVisible(false); ui->userEventDuplicates->setVisible(false);
ui->showUserFlagsInPie->setChecked(profile->cpap->userEventPieChart()); ui->showUserFlagsInPie->setChecked(AppSetting->userEventPieChart());
bool b; bool b;
ui->calculateUnintentionalLeaks->setChecked(b=profile->cpap->calculateUnintentionalLeaks()); ui->calculateUnintentionalLeaks->setChecked(b=profile->cpap->calculateUnintentionalLeaks());
@ -628,7 +643,7 @@ bool PreferencesDialog::Save()
if (ui->ahiGraphZeroReset->isChecked() != profile->cpap->AHIReset()) { recalc_events = true; } if (ui->ahiGraphZeroReset->isChecked() != profile->cpap->AHIReset()) { recalc_events = true; }
if (ui->useSquareWavePlots->isChecked() != profile->appearance->squareWavePlots()) { if (ui->useSquareWavePlots->isChecked() != AppSetting->squareWavePlots()) {
needs_restart = true; needs_restart = true;
} }
@ -642,7 +657,7 @@ bool PreferencesDialog::Save()
needs_restart = true; needs_restart = true;
} }
if (profile->cpap->userEventPieChart() != ui->showUserFlagsInPie->isChecked()) { if (AppSetting->userEventPieChart() != ui->showUserFlagsInPie->isChecked()) {
// lazy.. fix me // lazy.. fix me
needs_restart = true; needs_restart = true;
} }
@ -687,7 +702,7 @@ bool PreferencesDialog::Save()
} }
if (recalc_events) { if (recalc_events) {
if (p_profile->countDays(MT_CPAP, p_profile->FirstDay(), p_profile->LastDay()) > 0) { if (profile->countDays(MT_CPAP, profile->FirstDay(), profile->LastDay()) > 0) {
if (QMessageBox::question(this, tr("Data Reindex Required"), if (QMessageBox::question(this, tr("Data Reindex Required"),
tr("A data reindexing proceedure is required to apply these changes. This operation may take a couple of minutes to complete.\n\nAre you sure you want to make these changes?"), tr("A data reindexing proceedure is required to apply these changes. This operation may take a couple of minutes to complete.\n\nAre you sure you want to make these changes?"),
QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) { QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) {
@ -707,28 +722,33 @@ bool PreferencesDialog::Save()
schema::channel[OXI_Pulse].setUpperThreshold(ui->flagPulseAbove->value()); schema::channel[OXI_Pulse].setUpperThreshold(ui->flagPulseAbove->value());
profile->cpap->setUserEventPieChart(ui->showUserFlagsInPie->isChecked()); AppSetting->setUserEventPieChart(ui->showUserFlagsInPie->isChecked());
profile->session->setLockSummarySessions(ui->LockSummarySessionSplitting->isChecked()); profile->session->setLockSummarySessions(ui->LockSummarySessionSplitting->isChecked());
profile->appearance->setAllowYAxisScaling(ui->allowYAxisScaling->isChecked()); AppSetting->setOpenTabAtStart(ui->openingTabCombo->currentIndex());
profile->appearance->setGraphTooltips(ui->graphTooltips->isChecked()); AppSetting->setOpenTabAfterImport(ui->importTabCombo->currentIndex());
profile->appearance->setAntiAliasing(ui->useAntiAliasing->isChecked()); AppSetting->setAllowYAxisScaling(ui->allowYAxisScaling->isChecked());
profile->appearance->setUsePixmapCaching(ui->usePixmapCaching->isChecked()); AppSetting->setGraphTooltips(ui->graphTooltips->isChecked());
profile->appearance->setSquareWavePlots(ui->useSquareWavePlots->isChecked());
profile->appearance->setGraphSnapshots(ui->enableGraphSnapshots->isChecked()); AppSetting->setAntiAliasing(ui->useAntiAliasing->isChecked());
profile->appearance->setLineThickness(float(ui->lineThicknessSlider->value()) / 2.0); AppSetting->setUsePixmapCaching(ui->usePixmapCaching->isChecked());
AppSetting->setSquareWavePlots(ui->useSquareWavePlots->isChecked());
AppSetting->setGraphSnapshots(ui->enableGraphSnapshots->isChecked());
AppSetting->setLineThickness(float(ui->lineThicknessSlider->value()) / 2.0);
profile->general->setSkipEmptyDays(ui->skipEmptyDays->isChecked()); profile->general->setSkipEmptyDays(ui->skipEmptyDays->isChecked());
profile->general->setTooltipTimeout(ui->tooltipTimeoutSlider->value()); AppSetting->setTooltipTimeout(ui->tooltipTimeoutSlider->value());
profile->general->setScrollDampening(ui->scrollDampeningSlider->value() * 10); AppSetting->setScrollDampening(ui->scrollDampeningSlider->value() * 10);
profile->general->setShowUnknownFlags(ui->showUnknownFlags->isChecked()); profile->general->setShowUnknownFlags(ui->showUnknownFlags->isChecked());
profile->session->setMultithreading(ui->enableMultithreading->isChecked()); AppSetting->setMultithreading(ui->enableMultithreading->isChecked());
profile->session->setCacheSessions(ui->cacheSessionData->isChecked()); AppSetting->setRemoveCardReminder(ui->removeCardNotificationCheckbox->isChecked());
AppSetting->setCacheSessions(ui->cacheSessionData->isChecked());
profile->session->setPreloadSummaries(ui->preloadSummaries->isChecked()); profile->session->setPreloadSummaries(ui->preloadSummaries->isChecked());
profile->appearance->setAnimations(ui->animationsAndTransitionsCheckbox->isChecked()); AppSetting->setAnimations(ui->animationsAndTransitionsCheckbox->isChecked());
profile->cpap->setShowLeakRedline(ui->showLeakRedline->isChecked()); profile->cpap->setShowLeakRedline(ui->showLeakRedline->isChecked());
profile->cpap->setLeakRedline(ui->leakRedlineSpinbox->value()); profile->cpap->setLeakRedline(ui->leakRedlineSpinbox->value());
@ -736,8 +756,8 @@ bool PreferencesDialog::Save()
profile->cpap->setShowComplianceInfo(ui->complianceCheckBox->isChecked()); profile->cpap->setShowComplianceInfo(ui->complianceCheckBox->isChecked());
profile->cpap->setComplianceHours(ui->complianceHours->value()); profile->cpap->setComplianceHours(ui->complianceHours->value());
if (ui->graphHeight->value() != profile->appearance->graphHeight()) { if (ui->graphHeight->value() != AppSetting->graphHeight()) {
profile->appearance->setGraphHeight(ui->graphHeight->value()); AppSetting->setGraphHeight(ui->graphHeight->value());
mainwin->getDaily()->ResetGraphLayout(); mainwin->getDaily()->ResetGraphLayout();
mainwin->getOverview()->ResetGraphLayout(); mainwin->getOverview()->ResetGraphLayout();
} }
@ -760,8 +780,8 @@ bool PreferencesDialog::Save()
int s = ui->clockDriftHours->value() * 3600 + ui->clockDriftMinutes->value() * 60 + ui->clockDriftSeconds->value(); int s = ui->clockDriftHours->value() * 3600 + ui->clockDriftMinutes->value() * 60 + ui->clockDriftSeconds->value();
profile->cpap->setClockDrift(s); profile->cpap->setClockDrift(s);
profile->appearance->setOverlayType((OverlayDisplayType)ui->overlayFlagsCombo->currentIndex()); AppSetting->setOverlayType((OverlayDisplayType)ui->overlayFlagsCombo->currentIndex());
profile->appearance->setOverviewLinechartMode((OverviewLinechartModes)ui->overviewLinecharts->currentIndex()); AppSetting->setOverviewLinechartMode((OverviewLinechartModes)ui->overviewLinecharts->currentIndex());
profile->oxi->setSpO2DropPercentage(ui->spo2Drop->value()); profile->oxi->setSpO2DropPercentage(ui->spo2Drop->value());
profile->oxi->setSpO2DropDuration(ui->spo2DropTime->value()); profile->oxi->setSpO2DropDuration(ui->spo2DropTime->value());
@ -796,7 +816,7 @@ bool PreferencesDialog::Save()
profile->cpap->setCustom4cmH2OLeaks(double(ui->maskLeaks4Slider->value()) / 10.0f); profile->cpap->setCustom4cmH2OLeaks(double(ui->maskLeaks4Slider->value()) / 10.0f);
profile->cpap->setCustom20cmH2OLeaks(double(ui->maskLeaks20Slider->value()) / 10.0f); profile->cpap->setCustom20cmH2OLeaks(double(ui->maskLeaks20Slider->value()) / 10.0f);
PREF[STR_GEN_SkipLogin] = ui->skipLoginScreen->isChecked(); AppSetting->setAutoLaunchImport(ui->autoLaunchImporter->isChecked());
PREF[STR_GEN_UpdatesAutoCheck] = ui->automaticallyCheckUpdates->isChecked(); PREF[STR_GEN_UpdatesAutoCheck] = ui->automaticallyCheckUpdates->isChecked();
PREF[STR_GEN_UpdateCheckFrequency] = ui->updateCheckEvery->value(); PREF[STR_GEN_UpdateCheckFrequency] = ui->updateCheckEvery->value();
@ -852,13 +872,13 @@ bool PreferencesDialog::Save()
//qDebug() << "TODO: Save channels.xml to update channel data"; //qDebug() << "TODO: Save channels.xml to update channel data";
PREF.Save(); PREF.Save();
p_profile->Save(); profile->Save();
if (recalc_events) { if (recalc_events) {
// send a signal instead? // send a signal instead?
mainwin->reprocessEvents(needs_restart); mainwin->reprocessEvents(needs_restart);
} else if (needs_restart) { } else if (needs_restart) {
p_profile->removeLock(); profile->removeLock();
mainwin->RestartApplication(); mainwin->RestartApplication();
} else { } else {
mainwin->getDaily()->LoadDate(mainwin->getDaily()->getDate()); mainwin->getDaily()->LoadDate(mainwin->getDaily()->getDate());

314
sleepyhead/preferencesdialog.ui
View File

@ -9,8 +9,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>856</width> <width>848</width>
<height>656</height> <height>646</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -57,7 +57,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="importTab"> <widget class="QWidget" name="importTab">
<attribute name="title"> <attribute name="title">
@ -80,7 +80,7 @@
<number>4</number> <number>4</number>
</property> </property>
<item> <item>
<widget class="QGroupBox" name="groupBox_6"> <widget class="QGroupBox" name="sessionSplitGroupBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum"> <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -95,21 +95,27 @@
<number>4</number> <number>4</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>4</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>4</number> <number>4</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>4</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>4</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="ResMedWarning">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Attention ResMed users:&lt;/span&gt; There are some pitfalls you may want to consider before trying to split sessions away from ResMed's 12:00 noon day model, click &lt;a href=&quot;http://sleepyhead.sf.net/wiki/index.php/Resmed_Session_Splitting&quot;&gt;here&lt;/a&gt; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string notr="true">[ResMed warning message]</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
@ -119,6 +125,27 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QWidget" name="sessionSplitWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<item> <item>
@ -230,6 +257,9 @@
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="bottomMargin">
<number>4</number>
</property>
<item> <item>
<widget class="QSlider" name="IgnoreSlider"> <widget class="QSlider" name="IgnoreSlider">
<property name="toolTip"> <property name="toolTip">
@ -271,6 +301,9 @@ p, li { white-space: pre-wrap; }
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="bottomMargin">
<number>4</number>
</property>
<item> <item>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
@ -345,6 +378,9 @@ p, li { white-space: pre-wrap; }
</layout> </layout>
</widget> </widget>
</item> </item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="groupBox_7"> <widget class="QGroupBox" name="groupBox_7">
<property name="sizePolicy"> <property name="sizePolicy">
@ -531,13 +567,13 @@ SleepyHead can keep a copy of this data if you ever need to reinstall.
<string>Memory and Startup Options</string> <string>Memory and Startup Options</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_14"> <layout class="QGridLayout" name="gridLayout_14">
<item row="0" column="0"> <item row="1" column="1">
<widget class="QCheckBox" name="preloadSummaries"> <widget class="QCheckBox" name="automaticImport">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes starting SleepyHead a bit slower, by pre-loading all the summary data in advance, which speeds up overview browsing and a few other calculations later on. &lt;/p&gt;&lt;p&gt;If you have a large amount of data, it might be worth keeping this switched off, but if you typically like to view &lt;span style=&quot; font-style:italic;&quot;&gt;everything&lt;/span&gt; in overview, all the summary data still has to be loaded anyway. &lt;/p&gt;&lt;p&gt;Note this setting doesn't affect waveform and event data, which is always demand loaded as needed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cuts down on any unimportant confirmation dialogs during import.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Pre-Load all summary data at startup</string> <string>Import without asking for confirmation</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -551,26 +587,39 @@ SleepyHead can keep a copy of this data if you ever need to reinstall.
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="0" column="0">
<widget class="QCheckBox" name="automaticImport"> <widget class="QCheckBox" name="preloadSummaries">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cuts down on any unimportant confirmation dialogs during import.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes starting SleepyHead a bit slower, by pre-loading all the summary data in advance, which speeds up overview browsing and a few other calculations later on. &lt;/p&gt;&lt;p&gt;If you have a large amount of data, it might be worth keeping this switched off, but if you typically like to view &lt;span style=&quot; font-style:italic;&quot;&gt;everything&lt;/span&gt; in overview, all the summary data still has to be loaded anyway. &lt;/p&gt;&lt;p&gt;Note this setting doesn't affect waveform and event data, which is always demand loaded as needed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Import without asking for confirmation</string> <string>Pre-Load all summary data at startup</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QCheckBox" name="skipLoginScreen"> <widget class="QCheckBox" name="autoLaunchImporter">
<property name="toolTip"> <property name="toolTip">
<string>Bypass the login screen and load the most recent User Profile</string> <string>Bypass the login screen and load the most recent User Profile</string>
</property> </property>
<property name="text"> <property name="text">
<string>Skip user selection screen</string> <string>Auto-Launch CPAP Importer after application start-up</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -1661,7 +1710,7 @@ as this is the only value available on summary-only days.</string>
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'.SF NS Text'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; font-weight:600;&quot;&gt;Syncing Oximetry and CPAP Data&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; font-weight:600;&quot;&gt;Syncing Oximetry and CPAP Data&lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;CMS50 data imported from SpO2Review (from .spoR files) or the serial import method does &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; font-weight:600; text-decoration: underline;&quot;&gt;not&lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt; have the correct timestamp needed to sync.&lt;/span&gt;&lt;/p&gt; &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;CMS50 data imported from SpO2Review (from .spoR files) or the serial import method does &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; font-weight:600; text-decoration: underline;&quot;&gt;not&lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt; have the correct timestamp needed to sync.&lt;/span&gt;&lt;/p&gt;
@ -1887,6 +1936,13 @@ Mainly affects the importer.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1">
<widget class="QCheckBox" name="removeCardNotificationCheckbox">
<property name="text">
<string>Show Remove Card reminder notification on SleepyHead shutdown</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -2146,7 +2202,101 @@ p, li { white-space: pre-wrap; }
<string>Graph Settings</string> <string>Graph Settings</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<item row="3" column="0"> <item row="1" column="1">
<widget class="QLabel" name="label_40">
<property name="text">
<string>On Opening</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="openingTabCombo">
<property name="toolTip">
<string>Which tab to open at startup. (Note: It will default to Profile if there is no open Profile)</string>
</property>
<property name="currentText">
<string>Profile</string>
</property>
<item>
<property name="text">
<string>Profile</string>
</property>
</item>
<item>
<property name="text">
<string>Welcome</string>
</property>
</item>
<item>
<property name="text">
<string>Daily</string>
</property>
</item>
<item>
<property name="text">
<string>Overview</string>
</property>
</item>
<item>
<property name="text">
<string>Statistics</string>
</property>
</item>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_51">
<property name="text">
<string>Switch Tabs</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QComboBox" name="importTabCombo">
<item>
<property name="text">
<string>No change</string>
</property>
</item>
<item>
<property name="text">
<string>Welcome</string>
</property>
</item>
<item>
<property name="text">
<string>Daily</string>
</property>
</item>
<item>
<property name="text">
<string>Overview</string>
</property>
</item>
<item>
<property name="text">
<string>Statistics</string>
</property>
</item>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_44">
<property name="text">
<string>After Import</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_26"> <widget class="QLabel" name="label_26">
<property name="text"> <property name="text">
<string>Graph Height</string> <string>Graph Height</string>
@ -2156,7 +2306,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_18"> <widget class="QLabel" name="label_18">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@ -2172,7 +2322,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="7" column="0">
<widget class="QLabel" name="label_48"> <widget class="QLabel" name="label_48">
<property name="text"> <property name="text">
<string>Line Thickness</string> <string>Line Thickness</string>
@ -2182,7 +2332,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" colspan="2"> <item row="3" column="1" colspan="2">
<widget class="QComboBox" name="overlayFlagsCombo"> <widget class="QComboBox" name="overlayFlagsCombo">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -2206,7 +2356,7 @@ p, li { white-space: pre-wrap; }
</item> </item>
</widget> </widget>
</item> </item>
<item row="4" column="1" colspan="2"> <item row="7" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_10"> <layout class="QHBoxLayout" name="horizontalLayout_10">
<item> <item>
<widget class="QSlider" name="lineThicknessSlider"> <widget class="QSlider" name="lineThicknessSlider">
@ -2232,7 +2382,17 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</item> </item>
<item row="6" column="0"> <item row="8" column="0">
<widget class="QLabel" name="label_45">
<property name="text">
<string>Tooltip Timeout</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_46"> <widget class="QLabel" name="label_46">
<property name="text"> <property name="text">
<string>Scroll Dampening</string> <string>Scroll Dampening</string>
@ -2242,7 +2402,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1" colspan="2"> <item row="8" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_17"> <layout class="QHBoxLayout" name="horizontalLayout_17">
<item> <item>
<widget class="QSlider" name="tooltipTimeoutSlider"> <widget class="QSlider" name="tooltipTimeoutSlider">
@ -2302,17 +2462,53 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</item> </item>
<item row="5" column="0"> <item row="6" column="2">
<widget class="QLabel" name="label_45"> <widget class="QCheckBox" name="graphTooltips">
<property name="text"> <property name="text">
<string>Tooltip Timeout</string> <string>Graph Tooltips</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1" colspan="2"> <item row="5" column="1" colspan="2">
<widget class="QComboBox" name="overviewLinecharts">
<item>
<property name="text">
<string>Bar Tops</string>
</property>
</item>
<item>
<property name="text">
<string>Line Chart</string>
</property>
</item>
</widget>
</item>
<item row="6" column="1">
<widget class="QSpinBox" name="graphHeight">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Default display height of graphs in pixels</string>
</property>
<property name="minimum">
<number>50</number>
</property>
<property name="maximum">
<number>600</number>
</property>
<property name="singleStep">
<number>10</number>
</property>
<property name="value">
<number>180</number>
</property>
</widget>
</item>
<item row="9" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_16"> <layout class="QHBoxLayout" name="horizontalLayout_16">
<item> <item>
<widget class="QSlider" name="scrollDampeningSlider"> <widget class="QSlider" name="scrollDampeningSlider">
@ -2369,53 +2565,7 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</item> </item>
<item row="3" column="1"> <item row="5" column="0">
<widget class="QSpinBox" name="graphHeight">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Default display height of graphs in pixels</string>
</property>
<property name="minimum">
<number>50</number>
</property>
<property name="maximum">
<number>600</number>
</property>
<property name="singleStep">
<number>10</number>
</property>
<property name="value">
<number>180</number>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QCheckBox" name="graphTooltips">
<property name="text">
<string>Graph Tooltips</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QComboBox" name="overviewLinecharts">
<item>
<property name="text">
<string>Bar Tops</string>
</property>
</item>
<item>
<property name="text">
<string>Line Chart</string>
</property>
</item>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_47"> <widget class="QLabel" name="label_47">
<property name="text"> <property name="text">
<string>Overview Linecharts</string> <string>Overview Linecharts</string>
@ -2425,7 +2575,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1"> <item row="11" column="1">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>

61
sleepyhead/profileselect.cpp
View File

@ -1,4 +1,4 @@
/* Profile Select Implementation (Login Screen) /* Profile Select Implementation (Login Screen)
* *
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -43,11 +43,11 @@ ProfileSelect::ProfileSelect(QWidget *parent) :
ui->listView->setFont(font); ui->listView->setFont(font);
QFontMetrics fm(font); QFontMetrics fm(font);
for (QMap<QString, Profile *>::iterator p = Profiles::profiles.begin(); QMap<QString, Profile *>::iterator p;
p != Profiles::profiles.end(); p++) { for (p = Profiles::profiles.begin(); p != Profiles::profiles.end(); p++) {
name = p.key(); name = p.key();
if (PREF.contains(STR_GEN_Profile) && (name == PREF[STR_GEN_Profile].toString())) { if (AppSetting->profileName() == name) {
sel = i; sel = i;
} }
@ -86,13 +86,6 @@ ProfileSelect::ProfileSelect(QWidget *parent) :
m_tries = 0; m_tries = 0;
/*PREF["SkipLogin"]=false;
if ((i==1) && PREF["SkipLogin"].toBool()) {
if (!Profiles::profiles.contains(name))
PREF[STR_GEN_Profile]=name;
QTimer::singleShot(0,this,SLOT(earlyExit()));
hide();
} */
popupMenu = new QMenu(this); popupMenu = new QMenu(this);
popupMenu->addAction(tr("Open Profile"), this, SLOT(openProfile())); popupMenu->addAction(tr("Open Profile"), this, SLOT(openProfile()));
popupMenu->addAction(tr("Edit Profile"), this, SLOT(editProfile())); popupMenu->addAction(tr("Edit Profile"), this, SLOT(editProfile()));
@ -133,9 +126,6 @@ void ProfileSelect::editProfile()
Profile *profile = Profiles::Get(name); Profile *profile = Profiles::Get(name);
if (!profile) { return; } if (!profile) { return; }
if (!profile->isOpen()) {
profile->Load();
}
bool reallyEdit = false; bool reallyEdit = false;
@ -212,12 +202,13 @@ void ProfileSelect::deleteProfile()
Profile * profile = Profiles::profiles[name]; Profile * profile = Profiles::profiles[name];
p_profile = profile; p_profile = profile;
if (!profile->Load()) { // Hmmmmm.....
QMessageBox::warning(this, STR_MessageBox_Error, // if (!profile->Load()) {
QString(tr("Could not open profile.. You will need to delete this profile directory manually")+ // QMessageBox::warning(this, STR_MessageBox_Error,
"\n\n"+tr("You will find it under the following location:")+"\n\n%1").arg(QDir::toNativeSeparators(GetAppRoot() + "/Profiles/" + profile->user->userName())), QMessageBox::Ok); // QString(tr("Could not open profile.. You will need to delete this profile directory manually")+
return; // "\n\n"+tr("You will find it under the following location:")+"\n\n%1").arg(QDir::toNativeSeparators(GetAppRoot() + "/Profiles/" + profile->user->userName())), QMessageBox::Ok);
} // return;
// }
bool reallydelete = false; bool reallydelete = false;
if (profile->user->hasPassword()) { if (profile->user->hasPassword()) {
QDialog dialog(this, Qt::Dialog); QDialog dialog(this, Qt::Dialog);
@ -310,35 +301,7 @@ void ProfileSelect::on_listView_activated(const QModelIndex &index)
if (!profile) { return; } if (!profile) { return; }
if (!profile->isOpen()) { if (!profile->isOpen()) {
QString lockhost = profile->checkLock();
if (!lockhost.isEmpty()) {
if (lockhost.compare(QHostInfo::localHostName()) == 0) {
// Localhost has it locked..
if (QMessageBox::warning(nullptr, STR_MessageBox_Warning,
QObject::tr("There is a lockfile already present for profile '%1'.").arg(name)+"\n\n"+
QObject::tr("You can only work with one instance of an individual SleepyHead profile at a time.")+"\n\n"+
QObject::tr("Please close any other instances of SleepyHead running with this profile before proceeding.")+"\n\n"+
QObject::tr("If no other instances of SleepyHead are running, (eg, it crashed last time!), it is safe to ignore this message."),
QMessageBox::Cancel |QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel) {
return;
}
} else {
if (QMessageBox::warning(nullptr, STR_MessageBox_Warning,
QObject::tr("There is a lockfile already present for this profile '%1', claimed on '%2'.").arg(name).arg(lockhost)+"\n\n"+
QObject::tr("You can only work with one instance of an individual SleepyHead profile at a time.")+"\n\n"+
QObject::tr("If you are using cloud storage, make sure SleepyHead is closed and syncing has completed first on the other computer before proceeding."),
QMessageBox::Cancel |QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel) {
return;
}
}
profile->removeLock();
}
p_profile = profile; p_profile = profile;
profile->Load();
// Do this in case user renames the directory (otherwise it won't load) // Do this in case user renames the directory (otherwise it won't load)
// Essentially makes the folder name the user name, but whatever.. // Essentially makes the folder name the user name, but whatever..
// TODO: Change the profile editor one day to make it rename the actual folder // TODO: Change the profile editor one day to make it rename the actual folder
@ -366,7 +329,7 @@ void ProfileSelect::on_listView_activated(const QModelIndex &index)
if (profile->user->checkPassword(e->text())) { if (profile->user->checkPassword(e->text())) {
m_selectedProfile = name; m_selectedProfile = name;
PREF[STR_GEN_Profile] = name; AppSetting->setProfileName(name);
accept(); accept();
return; return;
} }

5
sleepyhead/profileselect.ui
View File

@ -139,6 +139,9 @@ background: white;
<property name="sizeAdjustPolicy"> <property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::AdjustToContents</enum> <enum>QAbstractScrollArea::AdjustToContents</enum>
</property> </property>
<property name="alternatingRowColors">
<bool>true</bool>
</property>
<property name="verticalScrollMode"> <property name="verticalScrollMode">
<enum>QAbstractItemView::ScrollPerPixel</enum> <enum>QAbstractItemView::ScrollPerPixel</enum>
</property> </property>
@ -162,7 +165,7 @@ background: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(255,
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing"> <property name="spacing">
<number>-1</number> <number>6</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>16</number> <number>16</number>

257
sleepyhead/profileselector.cpp Normal file
View File

@ -0,0 +1,257 @@

#include "profileselector.h"
#include "ui_profileselector.h"
#include "SleepLib/profiles.h"
#include "daily.h"
#include "overview.h"
#include "statistics.h"
#include "mainwindow.h"
#include "newprofile.h"
extern MainWindow * mainwin;
MySortFilterProxyModel2::MySortFilterProxyModel2(QObject *parent)
: QSortFilterProxyModel(parent)
{
}
bool MySortFilterProxyModel2::filterAcceptsRow(int sourceRow,
const QModelIndex &sourceParent) const
{
QModelIndex index0 = sourceModel()->index(sourceRow, 0, sourceParent);
QModelIndex index1 = sourceModel()->index(sourceRow, 1, sourceParent);
QModelIndex index2 = sourceModel()->index(sourceRow, 2, sourceParent);
QModelIndex index5 = sourceModel()->index(sourceRow, 5, sourceParent);
return (sourceModel()->data(index0).toString().contains(filterRegExp())
|| sourceModel()->data(index1).toString().contains(filterRegExp())
|| sourceModel()->data(index2).toString().contains(filterRegExp())
|| sourceModel()->data(index5).toString().contains(filterRegExp())
);
}
ProfileSelector::ProfileSelector(QWidget *parent) :
QWidget(parent),
ui(new Ui::ProfileSelector)
{
ui->setupUi(this);
model = nullptr;
proxy = nullptr;
ui->versionLabel->setText(VersionString);
}
ProfileSelector::~ProfileSelector()
{
delete ui;
}
void ProfileSelector::updateProfileList()
{
QString name;
int w=0;
if (proxy) delete proxy;
if (model) delete model;
const int columns = 6;
model = new QStandardItemModel(0, columns, this);
model->setHeaderData(0, Qt::Horizontal, tr("Profile"));
model->setHeaderData(1, Qt::Horizontal, tr("Ventilator Brand"));
model->setHeaderData(2, Qt::Horizontal, tr("Ventilator Model"));
model->setHeaderData(3, Qt::Horizontal, tr("Other Data"));
model->setHeaderData(4, Qt::Horizontal, tr("Last Imported"));
model->setHeaderData(5, Qt::Horizontal, tr("Name"));
ui->profileView->setStyleSheet("QHeaderView::section { background-color:lightgrey }");
int row = 0;
int sel = -1;
QFontMetrics fm(ui->profileView->font());
QMap<QString, Profile *>::iterator pi;
for (pi = Profiles::profiles.begin(); pi != Profiles::profiles.end(); pi++) {
Profile *prof = pi.value();
name = pi.key();
if (AppSetting->profileName() == name) {
sel = row;
}
Machine * mach = prof->GetMachine(MT_CPAP); // only interested in last cpap machine...
if (!mach) {
qDebug() << "Couldn't find machine info for" << name;
}
model->insertRows(row, 1, QModelIndex());
// Problem: Can't access profile details until it's loaded.
QString usersname;
if (!prof->user->lastName().isEmpty()) {
usersname = tr("%1, %2").arg(prof->user->lastName()).arg(prof->user->firstName());
}
model->setData(model->index(row, 0, QModelIndex()), name);
model->setData(model->index(row, 0, QModelIndex()), name, Qt::UserRole+2);
model->setData(model->index(row, 5, QModelIndex()), usersname);
if (mach) {
model->setData(model->index(row, 1, QModelIndex()), mach->brand());
model->setData(model->index(row, 2, QModelIndex()), mach->series()+" "+mach->model());
model->setData(model->index(row, 4, QModelIndex()), mach->lastImported().toString(Qt::SystemLocaleShortDate));
}
QBrush bg = QColor(Qt::black);
if (prof == p_profile) {
bg = QBrush(Qt::red);
}
for (int i=0; i<columns; i++) {
model->setData(model->index(row, i, QModelIndex()), bg, Qt::ForegroundRole);
}
QRect rect = fm.boundingRect(name);
if (rect.width() > w) w = rect.width();
// Profile fonts arern't loaded yet.. Using generic font.
//item->setFont(font);
//model->appendRow(item);
row++;
}
w+=20;
// ui->profileView->setMinimumWidth(w);
proxy = new MySortFilterProxyModel2(this);
proxy->setSourceModel(model);
proxy->setSortCaseSensitivity(Qt::CaseInsensitive);
ui->profileView->setModel(proxy);
ui->profileView->setSelectionBehavior(QAbstractItemView::SelectRows);
ui->profileView->setSelectionMode(QAbstractItemView::SingleSelection);
QHeaderView *headerView = ui->profileView->horizontalHeader();
headerView->setStretchLastSection(true);
headerView->setSectionResizeMode(QHeaderView::Stretch);
QPalette* palette = new QPalette();
palette->setColor(QPalette::Highlight,QColor("#3a7fc2"));
palette->setColor(QPalette::HighlightedText, QColor("white"));
ui->profileView->setPalette(*palette);
}
void ProfileSelector::updateProfileHighlight(QString name)
{
QBrush bg = QColor(Qt::black);
for (int row=0;row < model->rowCount(); row++) {
for (int i=0; i<model->columnCount(); i++) {
model->setData(model->index(row, i, QModelIndex()), bg, Qt::ForegroundRole);
}
}
bg = QBrush(Qt::red);
for (int row=0;row < proxy->rowCount(); row++) {
if (proxy->data(proxy->index(row, 0, QModelIndex())).toString().compare(name)==0) {
for (int i=0; i<proxy->columnCount(); i++) {
proxy->setData(proxy->index(row, i, QModelIndex()), bg, Qt::ForegroundRole);
}
break;
}
}
}
void ProfileSelector::SelectProfile(QString profname)
{
qDebug() << "Selecting new profile" << profname;
Profile * prof = Profiles::profiles[profname];
if (prof != p_profile) {
// Unselect everything in ProfileView
mainwin->OpenProfile(profname);
updateProfileHighlight(profname);
}
}
void ProfileSelector::on_profileView_doubleClicked(const QModelIndex &index)
{
QModelIndex idx = proxy->index(index.row(), 0, QModelIndex());
QString profname = proxy->data(idx, Qt::UserRole+2).toString();
SelectProfile(profname);
}
void ProfileSelector::on_profileFilter_textChanged(const QString &arg1)
{
QRegExp regExp("*"+arg1+"*", Qt::CaseInsensitive, QRegExp::Wildcard);
proxy->setFilterRegExp(regExp);
}
void ProfileSelector::on_buttonOpenProfile_clicked()
{
if (ui->profileView->currentIndex().isValid()) {
QString name = proxy->data(proxy->index(ui->profileView->currentIndex().row(), 0, QModelIndex()), Qt::UserRole+2).toString();
qDebug() << "Opening" << name;
SelectProfile(name);
}
}
void ProfileSelector::on_buttonEditProfile_clicked()
{
if (ui->profileView->currentIndex().isValid()) {
QString name = proxy->data(proxy->index(ui->profileView->currentIndex().row(), 0, QModelIndex()), Qt::UserRole+2).toString();
qDebug() << "Editing" << name;
Profile * prof = Profiles::profiles[name];
//SelectProfile(name); // may not be necessary...
NewProfile *newprof = new NewProfile(this);
newprof->edit(name);
newprof->setWindowModality(Qt::ApplicationModal);
newprof->setModal(true);
if (newprof->exec() != NewProfile::Rejected) {
QString usersname;
if (!prof->user->lastName().isEmpty()) {
usersname = tr("%1, %2").arg(prof->user->lastName()).arg(prof->user->firstName());
}
proxy->setData(proxy->index(ui->profileView->currentIndex().row(), 5, QModelIndex()), usersname);
}
delete newprof;
}
}
void ProfileSelector::on_buttonNewProfile_clicked()
{
if (p_profile)
mainwin->CloseProfile();
NewProfile *newprof = new NewProfile(this);
newprof->skipWelcomeScreen();
newprof->setWindowModality(Qt::ApplicationModal);
newprof->setModal(true);
if (newprof->exec() == NewProfile::Accepted) {
updateProfileList();
p_profile = Profiles::Get(AppSetting->profileName());
Q_ASSERT(p_profile != nullptr);
QString name = p_profile->user->userName();
p_profile = nullptr;
SelectProfile(name);
}
delete newprof;
}
void ProfileSelector::on_buttonDestroyProfile_clicked()
{
if (ui->profileView->currentIndex().isValid()) {
QString name = proxy->data(proxy->index(ui->profileView->currentIndex().row(), 0, QModelIndex()), Qt::UserRole+2).toString();
qDebug() << "Destroying" << name;
}
}

53
sleepyhead/profileselector.h Normal file
View File

@ -0,0 +1,53 @@
#ifndef PROFILESELECTOR_H
#define PROFILESELECTOR_H
#include <QWidget>
#include <QStandardItemModel>
#include <QSortFilterProxyModel>
namespace Ui {
class ProfileSelector;
}
class MySortFilterProxyModel2:public QSortFilterProxyModel
{
Q_OBJECT
public:
MySortFilterProxyModel2(QObject *parent = 0);
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
};
class ProfileSelector : public QWidget
{
Q_OBJECT
public:
explicit ProfileSelector(QWidget *parent = 0);
~ProfileSelector();
void updateProfileList();
void SelectProfile(QString profname);
void updateProfileHighlight(QString name);
private slots:
void on_profileView_doubleClicked(const QModelIndex &index);
void on_profileFilter_textChanged(const QString &arg1);
void on_buttonOpenProfile_clicked();
void on_buttonEditProfile_clicked();
void on_buttonNewProfile_clicked();
void on_buttonDestroyProfile_clicked();
private:
Ui::ProfileSelector *ui;
QStandardItemModel *model;
MySortFilterProxyModel2 *proxy;
};
#endif // PROFILESELECTOR_H

214
sleepyhead/profileselector.ui Normal file
View File

@ -0,0 +1,214 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ProfileSelector</class>
<widget class="QWidget" name="ProfileSelector">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>912</width>
<height>696</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout_1">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_1">
<item>
<widget class="QLabel" name="filterLabel">
<property name="text">
<string>Filter:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="profileFilter"/>
</item>
<item>
<widget class="QToolButton" name="resetFilterButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="Resources.qrc">
<normaloff>:/icons/refresh.png</normaloff>:/icons/refresh.png</iconset>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QTableView" name="profileView">
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
<property name="alternatingRowColors">
<bool>true</bool>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
<property name="cornerButtonEnabled">
<bool>false</bool>
</property>
<attribute name="horizontalHeaderCascadingSectionResizes">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QFrame" name="frame_2">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="SleepyHeadLogo">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>128</width>
<height>128</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="Resources.qrc">:/icons/bob-v3.0.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="SleepyHeadLabel">
<property name="font">
<font>
<pointsize>13</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>SleepyHead</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="versionLabel">
<property name="font">
<font>
<italic>false</italic>
</font>
</property>
<property name="text">
<string>Version</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonOpenProfile">
<property name="text">
<string>&amp;Open Profile</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonEditProfile">
<property name="text">
<string>&amp;Edit Profile</string>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonNewProfile">
<property name="text">
<string>&amp;New Profile</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>339</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="buttonDestroyProfile">
<property name="text">
<string>Destroy Profile</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources>
<include location="Resources.qrc"/>
</resources>
<connections/>
</ui>

12
sleepyhead/reports.cpp
View File

@ -64,7 +64,7 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
QPrinter *printer; QPrinter *printer;
bool aa_setting = p_profile->appearance->antiAliasing(); bool aa_setting = AppSetting->antiAliasing();
bool force_antialiasing = aa_setting; bool force_antialiasing = aa_setting;
@ -391,8 +391,8 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
} }
qint64 st = savest, et = saveet; qint64 st = savest, et = saveet;
bool lineCursorMode = p_profile->appearance->lineCursorMode(); bool lineCursorMode = AppSetting->lineCursorMode();
p_profile->appearance->setLineCursorMode(false); AppSetting->setLineCursorMode(false);
if (name == STR_TR_Daily) { if (name == STR_TR_Daily) {
if (!print_bookmarks) { if (!print_bookmarks) {
@ -587,7 +587,7 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
top += bounds.height(); top += bounds.height();
} else { top += normal_height / 2; } } else { top += normal_height / 2; }
p_profile->appearance->setAntiAliasing(force_antialiasing); AppSetting->setAntiAliasing(force_antialiasing);
int tmb = g->m_marginbottom; int tmb = g->m_marginbottom;
g->m_marginbottom = 0; g->m_marginbottom = 0;
@ -601,7 +601,7 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
//g->showTitle(true); //g->showTitle(true);
//painter.endNativePainting(); //painter.endNativePainting();
g->m_marginbottom = tmb; g->m_marginbottom = tmb;
p_profile->appearance->setAntiAliasing(aa_setting); AppSetting->setAntiAliasing(aa_setting);
if (!pm.isNull()) { if (!pm.isNull()) {
@ -629,6 +629,6 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
painter.end(); painter.end();
delete printer; delete printer;
mainwin->Notify(QObject::tr("SleepyHead has finished sending the job to the printer.")); mainwin->Notify(QObject::tr("SleepyHead has finished sending the job to the printer."));
p_profile->appearance->setLineCursorMode(lineCursorMode); AppSetting->setLineCursorMode(lineCursorMode);
} }

13
sleepyhead/sleepyhead.pro
View File

@ -28,8 +28,7 @@ contains(DEFINES, BrokenGL) {
} }
QT += opengl QT += opengl
#The following forces ResMed session locking.. it *may* not be necessary.. I'm still trying to assess this properly. #ResMed summary data design is SHIT... SleepyHead *MUST* follow ResMed's idiocy.
#Blah blah.. this isn't connected anymore.. just leaving it until I have the energy to clean it up
DEFINES += LOCK_RESMED_SESSIONS DEFINES += LOCK_RESMED_SESSIONS
#CONFIG += c++11 #CONFIG += c++11
@ -163,7 +162,8 @@ SOURCES += \
Graphs/MinutesAtPressure.cpp \ Graphs/MinutesAtPressure.cpp \
SleepLib/journal.cpp \ SleepLib/journal.cpp \
SleepLib/progressdialog.cpp \ SleepLib/progressdialog.cpp \
SleepLib/loader_plugins/cms50f37_loader.cpp SleepLib/loader_plugins/cms50f37_loader.cpp \
profileselector.cpp
HEADERS += \ HEADERS += \
common_gui.h \ common_gui.h \
@ -225,7 +225,9 @@ HEADERS += \
SleepLib/journal.h \ SleepLib/journal.h \
SleepLib/progressdialog.h \ SleepLib/progressdialog.h \
SleepLib/loader_plugins/cms50f37_loader.h \ SleepLib/loader_plugins/cms50f37_loader.h \
build_number.h build_number.h \
profileselector.h \
SleepLib/appsettings.h
FORMS += \ FORMS += \
daily.ui \ daily.ui \
@ -238,7 +240,8 @@ FORMS += \
newprofile.ui \ newprofile.ui \
exportcsv.ui \ exportcsv.ui \
UpdaterWindow.ui \ UpdaterWindow.ui \
oximeterimport.ui oximeterimport.ui \
profileselector.ui
RESOURCES += \ RESOURCES += \
Resources.qrc Resources.qrc

2
sleepyhead/statistics.cpp
View File

@ -41,7 +41,7 @@ QDataStream & operator>>(QDataStream & in, RXItem & rx)
MachineLoader * loader = GetLoader(loadername); MachineLoader * loader = GetLoader(loadername);
if (loader) { if (loader) {
rx.machine = loader->lookupMachine(serial); rx.machine = p_profile->lookupMachine(serial, loadername);
} else { } else {
qDebug() << "Bad machine object" << loadername << serial; qDebug() << "Bad machine object" << loadername << serial;
rx.machine = nullptr; rx.machine = nullptr;

4
sleepyhead/version.h
View File

@ -13,10 +13,10 @@
#include "build_number.h" #include "build_number.h"
const int major_version = 1; // incompatible API changes const int major_version = 1; // incompatible API changes
const int minor_version = 0; // new features that don't break things const int minor_version = 1; // new features that don't break things
const int revision_number = 0; // bugfixes, revisions const int revision_number = 0; // bugfixes, revisions
const QString ReleaseStatus = "unstable"; // testing/nightly/unstable, beta/untamed, rc/almost, r/stable
const QString ReleaseStatus = "beta";
const QString VersionString = QString("%1.%2.%3-%4-%5").arg(major_version).arg(minor_version).arg(revision_number).arg(ReleaseStatus).arg(build_number); const QString VersionString = QString("%1.%2.%3-%4-%5").arg(major_version).arg(minor_version).arg(revision_number).arg(ReleaseStatus).arg(build_number);
#ifdef Q_OS_MAC #ifdef Q_OS_MAC

9
sleepyhead/welcome.cpp
View File

@ -1,4 +1,4 @@
/* Welcome Page Implementation /* Welcome Page Implementation
* *
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -10,6 +10,7 @@
#include <QString> #include <QString>
#include <QApplication> #include <QApplication>
#include <QFont> #include <QFont>
#include <cmath>
#include "SleepLib/profiles.h" #include "SleepLib/profiles.h"
@ -89,7 +90,7 @@ QString GenerateWelcomeHTML()
"<body leftmargin=0 topmargin=5 rightmargin=0>"; "<body leftmargin=0 topmargin=5 rightmargin=0>";
html += "<div align=center><table border=0 height=100% width=99%>"; html += "<div align=center><table border=0 height=100% width=99%>";
html += QString("<tr><td colspan=2 align=center>") + html += QString("<tr><td colspan=4 align=center>") +
"<img src='qrc:/icons/bob-v3.0.png' height=100px>" "<img src='qrc:/icons/bob-v3.0.png' height=100px>"
"<h1>" + QObject::tr("Welcome to SleepyHead") + "</h1>" + "<h1>" + QObject::tr("Welcome to SleepyHead") + "</h1>" +
@ -97,7 +98,7 @@ QString GenerateWelcomeHTML()
"<table cellpadding=4 border=0>"; "<table cellpadding=4 border=0>";
int cols=2; int cols=2;
if (havecpapdata || haveoximeterdata) cols=4; if (havecpapdata || haveoximeterdata) cols=5;
html+=QString("<tr><td colspan=%1 align=center>").arg(cols)+ html+=QString("<tr><td colspan=%1 align=center>").arg(cols)+
@ -148,7 +149,7 @@ QString GenerateWelcomeHTML()
html+="</td><td align=center><table cellpadding=4 class=curved2 title=\""+QObject::tr("Click this box to see this in daily view.")+"\"><tr>"+ html+="</td><td align=center><table cellpadding=4 class=curved2 title=\""+QObject::tr("Click this box to see this in daily view.")+"\"><tr>"+
QString("<td align=center onmouseover='ChangeColor(this, \"#efefa0\");' onmouseout='ChangeColor(this, \"#ffffc0\");' onclick='alert(\"daily=%1\");'>").arg(date.toString(Qt::ISODate))+"<b>"+ QString("<td align=center onmouseover='ChangeColor(this, \"#efefa0\");' onmouseout='ChangeColor(this, \"#ffffc0\");' onclick='alert(\"daily=%1\");'>").arg(date.toString(Qt::ISODate))+"<b>"+
QObject::tr("The last time you used your %1...").arg(cpap->brand()+" "+cpap->model())+"</b><br/>"; QObject::tr("The last time you used your %1...").arg(cpap->brand()+" "+cpap->series()+" "+cpap->model())+"</b><br/>";
int daysto = date.daysTo(QDate::currentDate()); int daysto = date.daysTo(QDate::currentDate());
QString daystring; QString daystring;