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

Merge branch 'master' of ssh://git.code.sf.net/p/sleepyhead/code

Browse Source
This commit is contained in:
Mark Watkins 2014-04-15 13:20:05 +10:00
commit a1991e658a
4 changed files with 437 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

215
sleepyhead/Graphs/gGraphView.cpp
View File

@ -20,29 +20,28 @@
#include <QGLFramebufferObject> #include <QGLFramebufferObject>
#include <QPixmapCache> #include <QPixmapCache>
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
#include <QWindow> # include <QWindow>
#endif #endif
#include "mainwindow.h"
#include "Graphs/gYAxis.h" #include "Graphs/gYAxis.h"
#include "Graphs/gFlagsLine.h" #include "Graphs/gFlagsLine.h"
#include "gLineChart.h" #include "gLineChart.h"
extern MainWindow *mainwin;
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
#define USE_RENDERTEXT # define USE_RENDERTEXT
#include "OpenGL/glu.h" # include "OpenGL/glu.h"
#else #else
#include "GL/glu.h" # include "GL/glu.h"
#endif #endif
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
// Only works in 4.8 // Only works in 4.8
#include <QElapsedTimer> # include <QElapsedTimer>
#endif #endif
#include "mainwindow.h"
extern MainWindow *mainwin;
// for profiling purposes, a count of lines drawn in a single frame // for profiling purposes, a count of lines drawn in a single frame
int lines_drawn_this_frame=0; int lines_drawn_this_frame=0;
@ -70,77 +69,83 @@ QHash<QString, QImage *> images;
// Must be called from a thread inside the application. // Must be called from a thread inside the application.
void InitGraphs() void InitGraphs()
{ {
if (!_graph_init) { if (_graph_init)
return;
if (!PREF.contains("Fonts_Graph_Name")) { if (!PREF.contains("Fonts_Graph_Name")) {
PREF["Fonts_Graph_Name"]="Sans Serif"; PREF["Fonts_Graph_Name"] = "Sans Serif";
PREF["Fonts_Graph_Size"]=10; PREF["Fonts_Graph_Size"] = 10;
PREF["Fonts_Graph_Bold"]=false; PREF["Fonts_Graph_Bold"] = false;
PREF["Fonts_Graph_Italic"]=false; PREF["Fonts_Graph_Italic"] = false;
}
if (!PREF.contains("Fonts_Title_Name")) {
PREF["Fonts_Title_Name"]="Sans Serif";
PREF["Fonts_Title_Size"]=14;
PREF["Fonts_Title_Bold"]=true;
PREF["Fonts_Title_Italic"]=false;
}
if (!PREF.contains("Fonts_Big_Name")) {
PREF["Fonts_Big_Name"]="Serif";
PREF["Fonts_Big_Size"]=35;
PREF["Fonts_Big_Bold"]=false;
PREF["Fonts_Big_Italic"]=false;
}
defaultfont=new QFont(PREF["Fonts_Graph_Name"].toString(),
PREF["Fonts_Graph_Size"].toInt(),
PREF["Fonts_Graph_Bold"].toBool() ? QFont::Bold : QFont::Normal,
PREF["Fonts_Graph_Italic"].toBool()
);
mediumfont=new QFont(PREF["Fonts_Title_Name"].toString(),
PREF["Fonts_Title_Size"].toInt(),
PREF["Fonts_Title_Bold"].toBool() ? QFont::Bold : QFont::Normal,
PREF["Fonts_Title_Italic"].toBool()
);
bigfont=new QFont(PREF["Fonts_Big_Name"].toString(),
PREF["Fonts_Big_Size"].toInt(),
PREF["Fonts_Big_Bold"].toBool() ? QFont::Bold : QFont::Normal,
PREF["Fonts_Big_Italic"].toBool()
);
defaultfont->setStyleHint(QFont::AnyStyle,QFont::OpenGLCompatible);
mediumfont->setStyleHint(QFont::AnyStyle,QFont::OpenGLCompatible);
bigfont->setStyleHint(QFont::AnyStyle,QFont::OpenGLCompatible);
//images["mask"]=new QImage(":/icons/mask.png");
images["oximeter"]=new QImage(":/icons/cubeoximeter.png");
images["smiley"]=new QImage(":/icons/smileyface.png");
//images["sad"]=new QImage(":/icons/sadface.png");
images["sheep"]=new QImage(":/icons/sheep.png");
images["brick"]=new QImage(":/icons/brick.png");
images["nographs"]=new QImage(":/icons/nographs.png");
images["nodata"]=new QImage(":/icons/nodata.png");
_graph_init=true;
} }
if (!PREF.contains("Fonts_Title_Name")) {
PREF["Fonts_Title_Name"] = "Sans Serif";
PREF["Fonts_Title_Size"] = 14;
PREF["Fonts_Title_Bold"] = true;
PREF["Fonts_Title_Italic"] = false;
}
if (!PREF.contains("Fonts_Big_Name")) {
PREF["Fonts_Big_Name"] = "Serif";
PREF["Fonts_Big_Size"] = 35;
PREF["Fonts_Big_Bold"] = false;
PREF["Fonts_Big_Italic"] = false;
}
defaultfont = new QFont(PREF["Fonts_Graph_Name"].toString(),
PREF["Fonts_Graph_Size"].toInt(),
PREF["Fonts_Graph_Bold"].toBool() ? QFont::Bold : QFont::Normal,
PREF["Fonts_Graph_Italic"].toBool()
);
mediumfont = new QFont(PREF["Fonts_Title_Name"].toString(),
PREF["Fonts_Title_Size"].toInt(),
PREF["Fonts_Title_Bold"].toBool() ? QFont::Bold : QFont::Normal,
PREF["Fonts_Title_Italic"].toBool()
);
bigfont = new QFont(PREF["Fonts_Big_Name"].toString(),
PREF["Fonts_Big_Size"].toInt(),
PREF["Fonts_Big_Bold"].toBool() ? QFont::Bold : QFont::Normal,
PREF["Fonts_Big_Italic"].toBool()
);
defaultfont->setStyleHint(QFont::AnyStyle, QFont::OpenGLCompatible);
mediumfont->setStyleHint(QFont::AnyStyle, QFont::OpenGLCompatible);
bigfont->setStyleHint(QFont::AnyStyle, QFont::OpenGLCompatible);
//images["mask"] = new QImage(":/icons/mask.png");
images["oximeter"] = new QImage(":/icons/cubeoximeter.png");
images["smiley"] = new QImage(":/icons/smileyface.png");
//images["sad"] = new QImage(":/icons/sadface.png");
images["sheep"] = new QImage(":/icons/sheep.png");
images["brick"] = new QImage(":/icons/brick.png");
images["nographs"] = new QImage(":/icons/nographs.png");
images["nodata"] = new QImage(":/icons/nodata.png");
_graph_init=true;
} }
void DoneGraphs() void DoneGraphs()
{ {
if (_graph_init) { if (!_graph_init)
delete defaultfont; return;
delete bigfont;
delete mediumfont; delete defaultfont;
for (QHash<QString,QImage *>::iterator i=images.begin();i!=images.end();i++) { delete bigfont;
delete i.value(); delete mediumfont;
}
if (fbo) { // Clear the frame buffer object for (QHash<QString,QImage *>::iterator i = images.begin(); i != images.end(); i++)
if (fbo->isBound()) fbo->release(); delete i.value();
delete fbo;
fbo=NULL; // Clear the frame buffer object.
fbo_unsupported=true; // just in case shutdown order gets messed up if (fbo) {
} if (fbo->isBound())
_graph_init=false; fbo->release();
delete fbo;
fbo = NULL;
fbo_unsupported = true; // just in case shutdown order gets messed up
} }
_graph_init=false;
} }
void GetTextExtent(QString text, int & width, int & height, QFont *font) void GetTextExtent(QString text, int & width, int & height, QFont *font)
@ -176,18 +181,6 @@ inline quint32 swaporder(quint32 color)
((color & 0xFF) << 16)); ((color & 0xFF) << 16));
} }
gVertexBuffer::gVertexBuffer(int max,int type)
:m_max(max), m_type(type), m_cnt(0), m_size(1), m_scissor(false), m_stippled(false), m_stipple(0xffff)
{
buffer=(gVertex *)calloc(max,sizeof(gVertex));
m_blendfunc1=GL_SRC_ALPHA;
m_blendfunc2=GL_ONE_MINUS_SRC_ALPHA;
m_antialias=m_forceantialias=false;
}
gVertexBuffer::~gVertexBuffer()
{
free(buffer);
}
void gVertexBuffer::setColor(QColor col) void gVertexBuffer::setColor(QColor col)
{ {
m_color=swaporder(col.rgba()); m_color=swaporder(col.rgba());
@ -456,24 +449,6 @@ void gVertexBuffer::unsafe_add(GLshort x1, GLshort y1, GLshort x2, GLshort y2, G
m_cnt+=4; m_cnt+=4;
} }
GLBuffer::GLBuffer(int max,int type, bool stippled)
:m_max(max), m_type(type), m_stippled(stippled)
{
m_scissor=false;
m_antialias=true;
m_forceantialias=false;
m_cnt=0;
m_colcnt=0;
m_size=1;
m_blendfunc1=GL_SRC_ALPHA;
m_blendfunc2=GL_ONE_MINUS_SRC_ALPHA;
}
GLBuffer::~GLBuffer()
{
}
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
// GLFloatBuffer // GLFloatBuffer
@ -828,29 +803,13 @@ void gToolTip::paint() //actually paints it.
painter.end(); painter.end();
} }
void gToolTip::timerDone() void gToolTip::timerDone()
{ {
m_visible=false; m_visible=false;
m_graphview->redraw(); m_graphview->redraw();
} }
Layer::Layer(ChannelID code)
{
m_code = code;
m_visible = true;
m_movable = false;
m_day=NULL;
m_miny=m_maxy=0;
m_minx=m_maxx=0;
m_physminy=m_physmaxy=0;
m_order=0;
m_width=m_height=0;
m_X=m_Y=0;
m_position=LayerCenter;
m_refcount=0;
}
Layer::~Layer() Layer::~Layer()
{ {
for (int i=0;i<mgl_buffers.size();i++) { for (int i=0;i<mgl_buffers.size();i++) {
@ -919,10 +878,6 @@ void Layer::setLayout(LayerPosition position, short width, short height, short o
m_order=order; m_order=order;
} }
LayerGroup::LayerGroup() :
Layer(NoChannel)
{
}
LayerGroup::~LayerGroup() LayerGroup::~LayerGroup()
{ {
for (int i=0;i<layers.size();i++) for (int i=0;i<layers.size();i++)
@ -4272,16 +4227,6 @@ void gGraphView::deselect()
} }
} }
MyScrollBar::MyScrollBar(QWidget * parent)
:QScrollBar(parent)
{
}
void MyScrollBar::SendWheelEvent(QWheelEvent * e)
{
wheelEvent(e);
}
const quint32 gvmagic=0x41756728; const quint32 gvmagic=0x41756728;
const quint16 gvversion=2; const quint16 gvversion=2;

540
sleepyhead/Graphs/gGraphView.h
View File

File diff suppressed because it is too large Load Diff

14
sleepyhead/mainwindow.cpp
View File

@ -227,12 +227,20 @@ MainWindow::~MainWindow()
} }
void MainWindow::Notify(QString s,QString title,int ms) void MainWindow::Notify(QString s, QString title, int ms)
{ {
if (systray) { if (systray) {
systray->showMessage(title,s,QSystemTrayIcon::Information,ms); // 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;
char *desktop = getenv("DESKTOP_SESSION");
if (desktop && !strncmp(desktop, "gnome", 5))
msg += "\n";
systray->showMessage(title, msg, QSystemTrayIcon::Information, ms);
} else { } else {
ui->statusbar->showMessage(s,ms); ui->statusbar->showMessage(s, ms);
} }
} }

56
sleepyhead/preferencesdialog.cpp
View File

@ -31,6 +31,9 @@ extern QFont * mediumfont;
extern QFont * bigfont; extern QFont * bigfont;
extern MainWindow * mainwin; extern MainWindow * mainwin;
typedef QMessageBox::StandardButton StandardButton;
typedef QMessageBox::StandardButtons StandardButtons;
MaskProfile masks[]={ MaskProfile masks[]={
{Mask_Unknown,QObject::tr("Unspecified"),{{4,25},{8,25},{12,25},{16,25},{20,25}}}, {Mask_Unknown,QObject::tr("Unspecified"),{{4,25},{8,25},{12,25},{16,25},{20,25}}},
{Mask_NasalPillows,QObject::tr("Nasal Pillows"),{{4,20},{8,29},{12,37},{16,43},{20,49}}}, {Mask_NasalPillows,QObject::tr("Nasal Pillows"),{{4,20},{8,29},{12,37},{16,43},{20,49}}},
@ -781,34 +784,45 @@ void PreferencesDialog::resetGraphModel()
void PreferencesDialog::on_resetGraphButton_clicked() void PreferencesDialog::on_resetGraphButton_clicked()
{ {
if (QMessageBox::question(this,tr("Confirmation"),tr("Are you sure you want to reset your graph preferences to the defaults?"),QMessageBox::Yes,QMessageBox::No)==QMessageBox::Yes) { QString title = tr("Confirmation");
gGraphView *gv[3]; QString text = tr("Are you sure you want to reset your graph preferences to the defaults?");
gv[0]=mainwin->getDaily()->graphView(); StandardButtons buttons = QMessageBox::Yes | QMessageBox::No;
gv[1]=mainwin->getOverview()->graphView(); StandardButton defaultButton = QMessageBox::No;
gv[2]=mainwin->getOximetry()->graphView();
for (int j=0;j<3;j++) {
if (gv[j]!=NULL) {
for (int i=0;i<gv[j]->size();i++) {
gGraph *g=(*(gv[j]))[i];
g->setRecMaxY(0);
g->setRecMinY(0);
g->setVisible(true);
}
gv[j]->updateScale();
}
}
resetGraphModel();
ui->graphView->update();
}
}
// Display confirmation dialog.
StandardButton choice = QMessageBox::question(this, title, text, buttons, defaultButton);
if (choice == QMessageBox::No)
return;
gGraphView *views[3];
views[0] = mainwin->getDaily()->graphView();
views[1] = mainwin->getOverview()->graphView();
views[2] = mainwin->getOximetry()->graphView();
// Iterate over all graph containers.
for (unsigned j = 0; j < 3; j++) {
gGraphView *view = views[j];
if (!view)
continue;
// Iterate over all contained graphs.
for (unsigned i = 0; i < view->size(); i++) {
gGraph *g = (*view)[i];
g->setRecMaxY(0); // FIXME: should be g->reset(), but need other patches to land.
g->setRecMinY(0);
g->setVisible(true);
}
view->updateScale();
}
resetGraphModel();
ui->graphView->update();
}
/*void PreferencesDialog::on_genOpWidget_itemActivated(QListWidgetItem *item) /*void PreferencesDialog::on_genOpWidget_itemActivated(QListWidgetItem *item)
{ {
item->setCheckState(item->checkState()==Qt::Checked ? Qt::Unchecked : Qt::Checked); item->setCheckState(item->checkState()==Qt::Checked ? Qt::Unchecked : Qt::Checked);
} */ } */
void PreferencesDialog::on_maskTypeCombo_activated(int index) void PreferencesDialog::on_maskTypeCombo_activated(int index)
{ {
if (index<num_masks) { if (index<num_masks) {