diff --git a/oscar/SleepLib/appsettings.h b/oscar/SleepLib/appsettings.h index 420af546..8f5859f2 100644 --- a/oscar/SleepLib/appsettings.h +++ b/oscar/SleepLib/appsettings.h @@ -28,7 +28,8 @@ 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_GraphSnapshots = "EnableGraphSnapshots"; // Obsolete, replaced by ShowPieChart +const QString STR_AS_ShowPieChart = "EnablePieChart"; const QString STR_AS_Animations = "AnimationsAndTransitions"; const QString STR_AS_SquareWave = "SquareWavePlots"; const QString STR_AS_OverlayType = "OverlayType"; @@ -80,7 +81,8 @@ public: initPref(STR_AS_DailyPanelWidth, 250.0); initPref(STR_AS_RightPanelWidth, 230.0); m_antiAliasing=initPref(STR_AS_AntiAliasing, true).toBool(); - initPref(STR_AS_GraphSnapshots, true); +// initPref(STR_AS_GraphSnapshots, true); + initPref(STR_AS_ShowPieChart, false); m_animations = initPref(STR_AS_Animations, true).toBool(); m_squareWavePlots = initPref(STR_AS_SquareWave, false).toBool(); initPref(STR_AS_AllowYAxisScaling, true); @@ -151,7 +153,7 @@ public: //! \brief Returns true if AntiAliasing (the graphical smoothing method) is enabled inline bool antiAliasing() const { return m_antiAliasing; } //! \brief Returns true if renderPixmap function is in use, which takes snapshots of graphs - bool graphSnapshots() const { return getPref(STR_AS_GraphSnapshots).toBool(); } + bool showPieChart() const { return getPref(STR_AS_ShowPieChart).toBool(); } //! \brief Returns true if Graphical animations & Transitions will be drawn bool animations() const { return m_animations; } //! \brief Returns true if PixmapCaching acceleration will be used @@ -200,7 +202,7 @@ public: //! \brief Set to true to turn on AntiAliasing (the graphical smoothing method) void setAntiAliasing(bool aa) { setPref(STR_AS_AntiAliasing, m_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); } + void setShowPieChart(bool gs) { setPref(STR_AS_ShowPieChart, gs); } //! \brief Set to true if Graphical animations & Transitions will be drawn void setAnimations(bool anim) { setPref(STR_AS_Animations, m_animations=anim); } //! \brief Set to true to use Pixmap Caching of Text and other graphics caching speedup techniques diff --git a/oscar/SleepLib/preferences.h b/oscar/SleepLib/preferences.h index 65c8688f..1535ce5e 100644 --- a/oscar/SleepLib/preferences.h +++ b/oscar/SleepLib/preferences.h @@ -86,6 +86,15 @@ class Preferences } } + //! \brief Rename a preference + void Rename (QString oldname, QString newname) { + if (contains(oldname)) { + QVariant val = Get(oldname); + Set(newname, val); + Erase(oldname); + } + } + //! \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 //! \returns true if succesful diff --git a/oscar/SleepLib/session.cpp b/oscar/SleepLib/session.cpp index 0fc8841a..b9f83b02 100644 --- a/oscar/SleepLib/session.cpp +++ b/oscar/SleepLib/session.cpp @@ -620,6 +620,9 @@ bool Session::LoadSummary() } if (version >= 18) { in >> s_noSettings; +// qDebug() << "Session::LoadSummary" << s_session << "[" +// << QDateTime::fromTime_t(s_session).toString("MM/dd/yyyy hh:mm:ss") +// << "] s_noSettings" << s_noSettings << "size" << settings.size(); } else { s_noSettings = (settings.size() == 0); } diff --git a/oscar/daily.cpp b/oscar/daily.cpp index 5e171d33..3935d78a 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -179,9 +179,9 @@ Daily::Daily(QWidget *parent,gGraphView * shared) SF->setPinned(true); ChannelID cpapcodes[] = { - CPAP_FlowRate, CPAP_MaskPressure, CPAP_Pressure, CPAP_Leak, CPAP_Snore, CPAP_FLG, CPAP_RespRate, - CPAP_TidalVolume, CPAP_MinuteVent,CPAP_PTB, CPAP_RespEvent, CPAP_Ti, CPAP_Te, - /* CPAP_IE, */ ZEO_SleepStage, POS_Inclination, POS_Orientation, CPAP_Test1 + CPAP_FlowRate, CPAP_Pressure, CPAP_Leak, CPAP_FLG, CPAP_Snore, CPAP_TidalVolume, + CPAP_MaskPressure, CPAP_RespRate, CPAP_MinuteVent, CPAP_PTB, CPAP_RespEvent, CPAP_Ti, CPAP_Te, + /* CPAP_IE, */ ZEO_SleepStage, POS_Inclination, POS_Orientation, CPAP_Test1 }; int cpapsize = sizeof(cpapcodes) / sizeof(ChannelID); @@ -1477,7 +1477,7 @@ void Daily::Load(QDate date) html+="\n"; // Show Event Breakdown pie chart - if ((hours > 0) && AppSetting->graphSnapshots()) { // AHI Pie Chart + if ((hours > 0) && AppSetting->showPieChart()) { // 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) { html+=""; html+=QString("").arg(tr("Event Breakdown")); diff --git a/oscar/main.cpp b/oscar/main.cpp index f375fe50..1d7b7c96 100644 --- a/oscar/main.cpp +++ b/oscar/main.cpp @@ -493,7 +493,7 @@ int main(int argc, char *argv[]) { /////////////////////////////////////////////////////////////////////////////////////////// - // Initialize preferences system (Don't use p_pref before this point) + // Initialize preferences system (Don't use p_pref before this point!) /////////////////////////////////////////////////////////////////////////////////////////// p_pref = new Preferences("Preferences"); p_pref->Open(); @@ -506,11 +506,8 @@ int main(int argc, char *argv[]) { validateAllFonts(); setApplicationFont(); -// Clean up some legacy crap -// QFile lf(p_pref->Get("{home}/Layout.xml")); -// if (lf.exists()) { -// lf.remove(); -// } + // one-time translate GraphSnapshots to ShowPieChart + p_pref->Rename(STR_AS_GraphSnapshots, STR_AS_ShowPieChart); p_pref->Erase(STR_AppName); p_pref->Erase(STR_GEN_SkipLogin); diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index 4fe1bb7a..7f2da0ca 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -122,7 +122,8 @@ void MainWindow::SetupGUI() ui->action_Preferences->setShortcuts(QKeySequence::Preferences); #endif - ui->actionToggle_Line_Cursor->setChecked(AppSetting->lineCursorMode()); + ui->actionLine_Cursor->setChecked(AppSetting->lineCursorMode()); + ui->actionPie_Chart->setChecked(AppSetting->showPieChart()); ui->actionDebug->setChecked(AppSetting->showDebug()); ui->actionShow_Performance_Counters->setChecked(AppSetting->showPerformance()); @@ -210,6 +211,10 @@ void MainWindow::SetupGUI() ui->action_Sidebar_Toggle->setChecked(b); ui->toolBox->setVisible(b); + ui->actionPie_Chart->setChecked(AppSetting->showPieChart()); + + ui->actionDaily_Calendar->setChecked(AppSetting->calendarVisible()); + on_tabWidget_currentChanged(0); #ifndef REMSTAR_M_SUPPORT @@ -2451,7 +2456,7 @@ void MainWindow::on_importButton_clicked() } -void MainWindow::on_actionToggle_Line_Cursor_toggled(bool b) +void MainWindow::on_actionLine_Cursor_toggled(bool b) { AppSetting->setLineCursorMode(b); if (ui->tabWidget->currentWidget() == daily) { @@ -2461,6 +2466,14 @@ void MainWindow::on_actionToggle_Line_Cursor_toggled(bool b) } } +void MainWindow::on_actionPie_Chart_toggled(bool visible) +{ + AppSetting->setShowPieChart(visible); + if (daily && ui->tabWidget->currentWidget() == daily) { + daily->ReloadGraphs(); + } +} + void MainWindow::on_actionLeft_Daily_Sidebar_toggled(bool visible) { if (daily) daily->setSidebarVisible(visible); diff --git a/oscar/mainwindow.h b/oscar/mainwindow.h index 25fe95bf..a5253ec4 100644 --- a/oscar/mainwindow.h +++ b/oscar/mainwindow.h @@ -305,12 +305,14 @@ class MainWindow : public QMainWindow void on_importButton_clicked(); - void on_actionToggle_Line_Cursor_toggled(bool arg1); + void on_actionLine_Cursor_toggled(bool arg1); void on_actionLeft_Daily_Sidebar_toggled(bool arg1); void on_actionDaily_Calendar_toggled(bool arg1); + void on_actionPie_Chart_toggled(bool arg1); + void on_actionExport_Journal_triggered(); void on_actionShow_Performance_Counters_toggled(bool arg1); diff --git a/oscar/mainwindow.ui b/oscar/mainwindow.ui index c5048eb3..5062cf99 100644 --- a/oscar/mainwindow.ui +++ b/oscar/mainwindow.ui @@ -2838,7 +2838,8 @@ p, li { white-space: pre-wrap; } - + + @@ -2932,6 +2933,9 @@ p, li { white-space: pre-wrap; } View &Daily + + Show Daily view + F5 @@ -2940,6 +2944,9 @@ p, li { white-space: pre-wrap; } View &Overview + + Show Overview view + F6 @@ -2980,6 +2987,9 @@ p, li { white-space: pre-wrap; } &Maximize Toggle + + Maximize window + F11 @@ -2999,6 +3009,9 @@ p, li { white-space: pre-wrap; } &Reset Graph Layout + + Reset sizes of graphs + @@ -3061,6 +3074,9 @@ p, li { white-space: pre-wrap; } Right &Sidebar + + Show Right Sidebar + F10 @@ -3073,7 +3089,7 @@ p, li { white-space: pre-wrap; } View Statistics - View Statistics + Show Statistics view F4 @@ -3114,7 +3130,7 @@ p, li { white-space: pre-wrap; } Current Days - + true @@ -3140,6 +3156,9 @@ p, li { white-space: pre-wrap; } Daily Sidebar + + Show Daily Left Sidebar + F8 @@ -3154,6 +3173,9 @@ p, li { white-space: pre-wrap; } Daily Calendar + + Show Daily Calendar + F9 @@ -3191,6 +3213,23 @@ p, li { white-space: pre-wrap; } System Information + + + true + + + false + + + Toggle &Pie Chart + + + Show Pie Chart on Daily page + + + Ctrl+P + + diff --git a/oscar/preferencesdialog.cpp b/oscar/preferencesdialog.cpp index 9ce13106..9aa0b1bf 100644 --- a/oscar/preferencesdialog.cpp +++ b/oscar/preferencesdialog.cpp @@ -210,7 +210,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : ui->useAntiAliasing->setChecked(AppSetting->antiAliasing()); ui->usePixmapCaching->setChecked(AppSetting->usePixmapCaching()); ui->useSquareWavePlots->setChecked(AppSetting->squareWavePlots()); - ui->enableGraphSnapshots->setChecked(AppSetting->graphSnapshots()); +// ui->enableGraphSnapshots->setChecked(AppSetting->graphSnapshots()); ui->graphTooltips->setChecked(AppSetting->graphTooltips()); ui->allowYAxisScaling->setChecked(AppSetting->allowYAxisScaling()); @@ -808,7 +808,7 @@ bool PreferencesDialog::Save() AppSetting->setAntiAliasing(ui->useAntiAliasing->isChecked()); AppSetting->setUsePixmapCaching(ui->usePixmapCaching->isChecked()); AppSetting->setSquareWavePlots(ui->useSquareWavePlots->isChecked()); - AppSetting->setGraphSnapshots(ui->enableGraphSnapshots->isChecked()); +// AppSetting->setGraphSnapshots(ui->enableGraphSnapshots->isChecked()); AppSetting->setLineThickness(float(ui->lineThicknessSlider->value()) / 2.0); profile->general->setSkipEmptyDays(ui->skipEmptyDays->isChecked()); diff --git a/oscar/preferencesdialog.ui b/oscar/preferencesdialog.ui index 64e72200..892b5a0c 100644 --- a/oscar/preferencesdialog.ui +++ b/oscar/preferencesdialog.ui @@ -57,7 +57,7 @@ - 1 + 0 @@ -2651,20 +2651,6 @@ Try it and see if you like it. - - - - Allows graphs to be "screenshotted" for display purposes. -The Event Breakdown PIE chart uses this method, as does -the printing code. -Unfortunately some older computers/versions of Qt can cause -this application to be unstable with this feature enabled. - - - Show event breakdown pie chart - - - diff --git a/oscar/welcome.cpp b/oscar/welcome.cpp index 03d102c1..7a3c54b3 100644 --- a/oscar/welcome.cpp +++ b/oscar/welcome.cpp @@ -68,6 +68,13 @@ void Welcome::refreshPage() ui->oximetryButton->setEnabled(b); // looks like this was omitted from the list (gts 7/4/2019) ui->overviewButton->setEnabled(b); ui->statisticsButton->setEnabled(b); + + ui->importButton->repaint(); + ui->dailyButton->repaint(); + ui->overviewButton->repaint(); + ui->statisticsButton->repaint(); + ui->oximetryButton->repaint(); + mainwin->EnableTabs(b); /** MainWindow::ui->tabWidget->setTabEnabled(2, b);********* need to find some other way
 
%1