diff --git a/SleepyHeadQT.pro b/SleepyHeadQT.pro index f3eba43e..19bfd425 100644 --- a/SleepyHeadQT.pro +++ b/SleepyHeadQT.pro @@ -56,7 +56,8 @@ SOURCES += main.cpp\ Graphs/gSegmentChart.cpp \ Graphs/gSessionTime.cpp \ qextserialport/qextserialport.cpp \ - Graphs/gSplitter.cpp + Graphs/gSplitter.cpp \ + preferencesdialog.cpp unix:SOURCES += qextserialport/posix_qextserialport.cpp unix:!macx:SOURCES += qextserialport/qextserialenumerator_unix.cpp @@ -106,14 +107,16 @@ HEADERS += \ qextserialport/qextserialport_global.h \ qextserialport/qextserialport.h \ qextserialport/qextserialenumerator.h \ - Graphs/gSplitter.h + Graphs/gSplitter.h \ + preferencesdialog.h FORMS += \ daily.ui \ overview.ui \ mainwindow.ui \ - oximetry.ui + oximetry.ui \ + preferencesdialog.ui RESOURCES += \ Resources.qrc diff --git a/daily.cpp b/daily.cpp index a130ab79..5619c3a1 100644 --- a/daily.cpp +++ b/daily.cpp @@ -57,6 +57,7 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw) ui->graphSizer->addWidget(GraphLayout,1); ui->graphSizer->setMargin(0); + ui->graphSizer->setContentsMargins(0,0,0,0); splitter=new QVBoxLayout(GraphLayout); splitter->setMargin(0); splitter->setContentsMargins(0,0,0,0); @@ -559,6 +560,7 @@ void Daily::Load(QDate date) //splitter->setMinimumHeight(0); NoData->setText(tr("No data for ")+date.toString(Qt::SystemLocaleLongDate)); NoData->show(); + for (int i=0;isetVisible(false); Graphs[i]->hide(); @@ -599,6 +601,7 @@ void Daily::Load(QDate date) GraphLayout->setMinimumHeight(vis*default_height); + //splitter->setMinimumHeight(0); //splitter->setMinimumHeight(vis*default_height); //if (vis>4) { @@ -607,7 +610,7 @@ void Daily::Load(QDate date) // } // splitter->blockSignals(true); - //splitter->layout(); + splitter->layout(); ui->scrollArea->setUpdatesEnabled(true); ui->scrollArea->update(); //ui->scrollArea->update(); diff --git a/mainwindow.cpp b/mainwindow.cpp index cad38742..92fb45bc 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -17,6 +17,7 @@ #include "SleepLib/loader_plugins/cms50_loader.h" #include "SleepLib/loader_plugins/zeo_loader.h" #include "SleepLib/loader_plugins/resmed_loader.h" +#include "preferencesdialog.h" #include "Graphs/glcommon.h" @@ -60,7 +61,6 @@ MainWindow::MainWindow(QWidget *parent) : daily=NULL; //overview=NULL; //oximetry=NULL; - qstatusbar=ui->statusbar; qprogress=new QProgressBar(this); qprogress->setMaximum(100); @@ -352,3 +352,11 @@ void MainWindow::on_action_Reset_Graph_Layout_triggered() { if (daily) daily->ResetGraphLayout(); } + +void MainWindow::on_action_Preferences_triggered() +{ + PreferencesDialog pd(this); + if (pd.exec()==PreferencesDialog::Accepted) { + qDebug() << "Preferences Accepted"; + } +} diff --git a/mainwindow.h b/mainwindow.h index 4081463c..35d1de30 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -80,6 +80,8 @@ private slots: void on_action_Reset_Graph_Layout_triggered(); + void on_action_Preferences_triggered(); + private: Ui::MainWindow *ui; Daily * daily; @@ -87,7 +89,6 @@ private: Oximetry * oximetry; bool first_load; Profile *profile; - }; #endif // MAINWINDOW_H diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp new file mode 100644 index 00000000..1c20a76b --- /dev/null +++ b/preferencesdialog.cpp @@ -0,0 +1,14 @@ +#include "preferencesdialog.h" +#include "ui_preferencesdialog.h" + +PreferencesDialog::PreferencesDialog(QWidget *parent) : + QDialog(parent), + ui(new Ui::PreferencesDialog) +{ + ui->setupUi(this); +} + +PreferencesDialog::~PreferencesDialog() +{ + delete ui; +} diff --git a/preferencesdialog.h b/preferencesdialog.h new file mode 100644 index 00000000..87ace507 --- /dev/null +++ b/preferencesdialog.h @@ -0,0 +1,22 @@ +#ifndef PREFERENCESDIALOG_H +#define PREFERENCESDIALOG_H + +#include + +namespace Ui { + class PreferencesDialog; +} + +class PreferencesDialog : public QDialog +{ + Q_OBJECT + +public: + explicit PreferencesDialog(QWidget *parent = 0); + ~PreferencesDialog(); + +private: + Ui::PreferencesDialog *ui; +}; + +#endif // PREFERENCESDIALOG_H diff --git a/preferencesdialog.ui b/preferencesdialog.ui new file mode 100644 index 00000000..383174b0 --- /dev/null +++ b/preferencesdialog.ui @@ -0,0 +1,281 @@ + + + PreferencesDialog + + + Qt::ApplicationModal + + + + 0 + 0 + 501 + 292 + + + + Preferences + + + false + + + + 4 + + + 4 + + + + + 0 + + + + &Sessions + + + + + + + + Day Split Time + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Sessions before this time will go to the previous calendar day. +You must restart SleepyHead to see these changes, +unless you haven't imported any data yet. + + + QAbstractSpinBox::UpDownArrows + + + + 12 + 0 + 0 + 2000 + 1 + 1 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Turn this off if your worried about SleepyHead consuming too much memory. +It will be faster changing to days you've already been to if you leave it on. + + + Retain event data in memory + + + + + + + + + + + Combine Sessions + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + 0 + 0 + + + + Sessions shorter than this value will be kept together on the same day. +You must restart SleepyHead to see these changes, +unless you haven't imported any data yet. + + + 0 + + + 240 + + + 15 + + + 60 + + + Qt::Horizontal + + + false + + + false + + + QSlider::TicksAbove + + + 15 + + + + + + + QFrame::Box + + + + + + + + + + + + + Ignore Short Sessions + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + Sessions shorter than this will not be imported. +Changing this value only affects future imports. + + + 60 + + + 5 + + + Qt::Horizontal + + + QSlider::TicksAbove + + + 5 + + + + + + + QFrame::Box + + + + + + + + + + + Qt::Vertical + + + + 20 + 30 + + + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + false + + + + + + + + + buttonBox + accepted() + PreferencesDialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + PreferencesDialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + +