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

Change GraphSnapshots to ShowPieChart in code, UI, and preferences. Convert any existing GraphSnapshots preferences to ShowPieChart.

Browse Source
This commit is contained in:
Seeker4 2019-07-14 20:25:49 -07:00
parent 48b4d754b3
commit 11f2fb5d3f
5 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
oscar/SleepLib/appsettings.h
View File

@ -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

2
oscar/daily.cpp
View File

@ -1477,7 +1477,7 @@ void Daily::Load(QDate date)
html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\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+="<tr><td align=center>&nbsp;</td></tr>";
html+=QString("<tr><td align=center><b>%1</b></td></tr>").arg(tr("Event Breakdown"));

9
oscar/main.cpp
View File

@ -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);

8
oscar/mainwindow.cpp
View File

@ -123,7 +123,7 @@ void MainWindow::SetupGUI()
#endif
ui->actionLine_Cursor->setChecked(AppSetting->lineCursorMode());
ui->actionPie_Chart->setChecked(AppSetting->graphSnapshots());
ui->actionPie_Chart->setChecked(AppSetting->showPieChart());
ui->actionDebug->setChecked(AppSetting->showDebug());
ui->actionShow_Performance_Counters->setChecked(AppSetting->showPerformance());
@ -211,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
@ -2464,7 +2468,7 @@ void MainWindow::on_actionLine_Cursor_toggled(bool b)
void MainWindow::on_actionPie_Chart_toggled(bool visible)
{
AppSetting->setGraphSnapshots(visible);
AppSetting->setShowPieChart(visible);
if (daily && ui->tabWidget->currentWidget() == daily) {
daily->ReloadGraphs();
}

7
oscar/mainwindow.ui
View File

@ -3068,6 +3068,9 @@ p, li { white-space: pre-wrap; }
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="text">
<string>Right &amp;Sidebar</string>
</property>
@ -3148,7 +3151,7 @@ p, li { white-space: pre-wrap; }
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="text">
<string>Daily Sidebar</string>
@ -3165,7 +3168,7 @@ p, li { white-space: pre-wrap; }
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="text">
<string>Daily Calendar</string>