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

Renamed to ComplianceMode and enforced Compliance Mode has not knowledge of disable sessions

Browse Source
This commit is contained in:
LoudSnorer 2023-05-27 09:07:04 -04:00
parent d511d1b8d4
commit f4b7093e76
10 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar/SleepLib/appsettings.cpp
View File

@ -27,7 +27,7 @@ AppWideSetting::AppWideSetting(Preferences *pref) : PrefSettings(pref)
// initPref(STR_AS_GraphSnapshots, true);
initPref(STR_AS_IncludeSerial, false);
initPref(STR_AS_MonochromePrinting, false);
initPref(STR_AS_AllowDisableSessions, false);
initPref(STR_AS_ComplianceMode, true);
initPref(STR_AS_ShowPieChart, false);
m_animations = initPref(STR_AS_Animations, true).toBool();
m_squareWavePlots = initPref(STR_AS_SquareWave, false).toBool();

6
oscar/SleepLib/appsettings.h
View File

@ -46,7 +46,7 @@ const QString STR_AS_UsePixmapCaching = "UsePixmapCaching";
const QString STR_AS_AllowYAxisScaling = "AllowYAxisScaling";
const QString STR_AS_IncludeSerial = "IncludeSerial";
const QString STR_AS_MonochromePrinting = "PrintBW";
const QString STR_AS_AllowDisableSessions = "AllowDisableSessions";
const QString STR_AS_ComplianceMode = "ComplianceMode";
const QString STR_AS_GraphTooltips = "GraphTooltips";
const QString STR_AS_LineThickness = "LineThickness";
const QString STR_AS_LineCursorMode = "LineCursorMode";
@ -139,7 +139,7 @@ public:
//! \brief Whether to print reports in black and white, which can be more legible on non-color printers
bool monochromePrinting() const { return getPref(STR_AS_MonochromePrinting).toBool(); }
//! \Allow disabling of sessions
bool allowDisableSessions() const { return getPref(STR_AS_AllowDisableSessions).toBool(); }
bool complianceMode() const { return getPref(STR_AS_ComplianceMode).toBool(); }
//! \brief Whether to show graph tooltips
inline bool graphTooltips() const { return m_graphTooltips; }
//! \brief Pen width of line plots
@ -199,7 +199,7 @@ public:
void setIncludeSerial(bool b) { setPref(STR_AS_IncludeSerial, b); }
//! \brief Sets whether to print reports in black and white, which can be more legible on non-color printers
void setMonochromePrinting(bool b) { setPref(STR_AS_MonochromePrinting, b); }
void setAllowDisableSessions(bool b) { setPref(STR_AS_AllowDisableSessions,b); }
void setComplianceMode(bool b) { setPref(STR_AS_ComplianceMode,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, m_graphTooltips=b); }
//! \brief Sets the type of overlay flags (which are displayed over the Flow Waveform)

2
oscar/SleepLib/session.cpp
View File

@ -93,7 +93,7 @@ void Session::TrashEvents()
bool Session::enabled(bool realValues) const
{
if (!AppSetting->allowDisableSessions() && !realValues) return true;
if (AppSetting->complianceMode() && !realValues) return true;
return s_enabled;
}

12
oscar/daily.cpp
View File

@ -578,10 +578,16 @@ void Daily::showEvent(QShowEvent *)
bool Daily::rejectToggleSessionEnable( Session*sess) {
if (!sess) return true;
if (!AppSetting->allowDisableSessions()) {
QMessageBox mbox(QMessageBox::Warning, tr("Disable Session"), tr(" Disabling Sessions is not enabled"), QMessageBox::Ok , this);
if (AppSetting->complianceMode())
{
#if 0
QMessageBox mbox(QMessageBox::Warning,
tr("Disable Session"), i
tr(" Disabling Sessions is not valid in Compilance Mode"),
QMessageBox::Ok , this);
mbox.exec();
return true;
#endif
return true;
}
bool enabled=sess->enabled();
if (enabled ) {

2
oscar/dailySearchTab.cpp
View File

@ -311,7 +311,7 @@ void DailySearchTab::populateControl() {
commandList->addItem(calculateMaxSize(tr("Daily Duration"),ST_DAILY_USAGE));
commandList->addItem(calculateMaxSize(tr("Session Duration" ),ST_SESSION_LENGTH));
commandList->addItem(calculateMaxSize(tr("Days Skipped"),ST_DAYS_SKIPPED));
if ( AppSetting->allowDisableSessions() ) {
if ( !AppSetting->complianceMode() ) {
commandList->addItem(calculateMaxSize(tr("Disabled Sessions"),ST_DISABLED_SESSIONS));
}
commandList->addItem(calculateMaxSize(tr("Number of Sessions"),ST_SESSIONS_QTY));

6
oscar/mainwindow.cpp
View File

@ -293,7 +293,7 @@ void MainWindow::SetupGUI()
#endif
setupRunning = false;
m_allowDisableSessions = AppSetting->allowDisableSessions();
m_complianceMode = AppSetting->complianceMode();
}
void MainWindow::logMessage(QString msg)
@ -1401,8 +1401,8 @@ void MainWindow::on_action_Preferences_triggered()
setApplicationFont();
if (m_allowDisableSessions != AppSetting->allowDisableSessions() ) {
m_allowDisableSessions = AppSetting->allowDisableSessions();
if (m_complianceMode != AppSetting->complianceMode() ) {
m_complianceMode = AppSetting->complianceMode();
reloadProfile();
};

2
oscar/mainwindow.h
View File

@ -404,7 +404,7 @@ private:
// gGraphView *SnapshotGraph;
QString bookmarkFilter;
bool m_restartRequired;
bool m_allowDisableSessions = false;
bool m_complianceMode = false;
volatile bool m_inRecalculation;
void PopulatePurgeMenu();

4
oscar/preferencesdialog.cpp
View File

@ -219,7 +219,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
ui->allowYAxisScaling->setChecked(AppSetting->allowYAxisScaling());
ui->includeSerial->setChecked(AppSetting->includeSerial());
ui->monochromePrinting->setChecked(AppSetting->monochromePrinting());
ui->allowDisableSessions->setChecked(AppSetting->allowDisableSessions());
ui->complianceMode->setChecked(AppSetting->complianceMode());
ui->autoLaunchImporter->setChecked(AppSetting->autoLaunchImport());
#ifndef NO_CHECKUPDATES
@ -832,7 +832,7 @@ bool PreferencesDialog::Save()
AppSetting->setAllowYAxisScaling(ui->allowYAxisScaling->isChecked());
AppSetting->setIncludeSerial(ui->includeSerial->isChecked());
AppSetting->setMonochromePrinting(ui->monochromePrinting->isChecked());
AppSetting->setAllowDisableSessions(ui->allowDisableSessions->isChecked());
AppSetting->setComplianceMode(ui->complianceMode->isChecked());
AppSetting->setGraphTooltips(ui->graphTooltips->isChecked());
AppSetting->setAntiAliasing(ui->useAntiAliasing->isChecked());

4
oscar/preferencesdialog.ui
View File

@ -2757,12 +2757,12 @@ Try it and see if you like it.</string>
</widget>
</item>
<item>
<widget class="QCheckBox" name="allowDisableSessions">
<widget class="QCheckBox" name="complianceMode">
<property name="toolTip">
<string>Allow sessions to be disabled.\nDisabled Session are not used for graphing or Statistics.</string>
</property>
<property name="text">
<string>Allow Disable Sessions</string>
<string>Compliance Mode</string>
</property>
</widget>
</item>

2
oscar/statistics.cpp
View File

@ -537,7 +537,7 @@ Statistics::Statistics(QObject *parent) :
QObject(parent)
{
rows.push_back(StatisticsRow(tr("CPAP Statistics"), SC_HEADING, MT_CPAP));
if (AppSetting->allowDisableSessions())
if (!AppSetting->complianceMode())
rows.push_back(StatisticsRow(tr("Warning: Disabled session data is excluded in this report"),SC_WARNING,MT_CPAP));
rows.push_back(StatisticsRow("", SC_DAYS, MT_CPAP));
rows.push_back(StatisticsRow("", SC_COLUMNHEADERS, MT_CPAP));