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

Create Clinical TAB in preference menu

Browse Source
This commit is contained in:
LoudSnorer 2023-05-28 13:25:11 -04:00
parent 759221f1f0
commit b2b8006b2e
4 changed files with 172 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
oscar/Graphs/gOverviewGraph.cpp
View File

@ -559,10 +559,6 @@ void gOverviewGraph::paint(QPainter &painter, gGraph &w, const QRegion &region)
float compliance_hours = 0;
if (p_profile->cpap->showComplianceInfo()) {
compliance_hours = p_profile->cpap->complianceHours();
}
int incompliant = 0;
Day *day;
EventDataType hours;
@ -1008,15 +1004,6 @@ jumpnext:
}*/
a += QString(QObject::tr("Days: %1")).arg(total_days, 0);
if (p_profile->cpap->showComplianceInfo()) {
if (ishours && incompliant > 0) {
a += " "+QString(QObject::tr("Low Usage Days: %1")).arg(incompliant, 0)+
" "+QString(QObject::tr("(%1% compliant, defined as > %2 hours)")).
arg((1.0 / daynum) * (total_days - incompliant) * 100.0, 0, 'f', 2).arg(compliance_hours, 0, 'f', 1);
}
}
//GetTextExtent(a,x,y);
//legendx-=30+x;
//w.renderText(a,px+24,py+5);

4
oscar/SleepLib/profiles.h
View File

@ -309,7 +309,6 @@ const QString STR_OS_OxiDiscardThreshold = "OxiDiscardThreshold";
// CPAPSettings Strings
const QString STR_CS_ComplianceHours = "ComplianceHours";
const QString STR_CS_ShowCompliance = "ShowCompliance";
const QString STR_CS_ShowLeaksMode = "ShowLeaksMode";
const QString STR_CS_MaskStartDate = "MaskStartDate";
const QString STR_CS_MaskDescription = "MaskDescription";
@ -560,7 +559,6 @@ class CPAPSettings : public PrefSettings
: PrefSettings(profile)
{
m_complianceHours = initPref(STR_CS_ComplianceHours, 4.0f).toFloat();
initPref(STR_CS_ShowCompliance, true);
initPref(STR_CS_ShowLeaksMode, 0);
// TODO: jedimark: Check if this date is initiliazed yet
initPref(STR_CS_MaskStartDate, QDate());
@ -597,7 +595,6 @@ class CPAPSettings : public PrefSettings
//Getters
double complianceHours() const { return m_complianceHours; }
bool showComplianceInfo() const { return getPref(STR_CS_ShowCompliance).toBool(); }
int leakMode() const { return getPref(STR_CS_ShowLeaksMode).toInt(); }
QDate maskStartDate() const { return getPref(STR_CS_MaskStartDate).toDate(); }
QString maskDescription() const { return getPref(STR_CS_MaskDescription).toString(); }
@ -635,7 +632,6 @@ class CPAPSettings : public PrefSettings
void setNotes(QString notes) { setPref(STR_CS_Notes, notes); }
void setDateDiagnosed(QDate date) { setPref(STR_CS_DateDiagnosed, date); }
void setComplianceHours(EventDataType hours) { setPref(STR_CS_ComplianceHours, m_complianceHours=hours); }
void setShowComplianceInfo(bool b) { setPref(STR_CS_ShowCompliance, b); }
void setLeakMode(int leakmode) { setPref(STR_CS_ShowLeaksMode, (int)leakmode); }
void setMaskStartDate(QDate date) { setPref(STR_CS_MaskStartDate, date); }
void setMaskType(MaskType masktype) { setPref(STR_CS_MaskType, (int)masktype); }

8
oscar/preferencesdialog.cpp
View File

@ -7,6 +7,9 @@
* License. See the file COPYING in the main directory of the source code
* for more details. */
#define TEST_MACROS_ENABLEDoff
#include <test_macros.h>
#include <QLabel>
#include <QColorDialog>
#include <QMessageBox>
@ -220,6 +223,9 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
ui->includeSerial->setChecked(AppSetting->includeSerial());
ui->monochromePrinting->setChecked(AppSetting->monochromePrinting());
ui->clinicalMode->setChecked(AppSetting->clinicalMode());
// clinicalMode and allowDisabledSessions are radio buttons and must be set to opposite values. Once clinicalMode is used.
// Radio Buttons illustrate the operating mode.
ui->allowDisabledSessions->setChecked(!AppSetting->clinicalMode());
ui->autoLaunchImporter->setChecked(AppSetting->autoLaunchImport());
#ifndef NO_CHECKUPDATES
@ -262,7 +268,6 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
ui->cacheSessionData->setChecked(AppSetting->cacheSessions());
ui->preloadSummaries->setChecked(profile->session->preloadSummaries());
ui->animationsAndTransitionsCheckbox->setChecked(AppSetting->animations());
ui->complianceCheckBox->setChecked(profile->cpap->showComplianceInfo());
ui->complianceHours->setValue(profile->cpap->complianceHours());
ui->prefCalcMiddle->setCurrentIndex(profile->general->prefCalcMiddle());
@ -858,7 +863,6 @@ bool PreferencesDialog::Save()
profile->cpap->setShowLeakRedline(ui->showLeakRedline->isChecked());
profile->cpap->setLeakRedline(ui->leakRedlineSpinbox->value());
profile->cpap->setShowComplianceInfo(ui->complianceCheckBox->isChecked());
profile->cpap->setComplianceHours(ui->complianceHours->value());
if (ui->graphHeight->value() != AppSetting->graphHeight()) {

208
oscar/preferencesdialog.ui
View File

@ -1201,13 +1201,6 @@ A value of 20% works well for detecting apneas. </string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="complianceCheckBox">
<property name="text">
<string>Compliance defined as</string>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QSpinBox" name="ahiGraphWindowSize">
<property name="sizePolicy">
@ -1285,31 +1278,6 @@ Defaults to 60 minutes.. Highly recommend it's left at this value.</string>
</property>
</widget>
</item>
<item row="1" column="2" colspan="2">
<widget class="QDoubleSpinBox" name="complianceHours">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Regard days with under this usage as &quot;incompliant&quot;. 4 hours is usually considered compliant.</string>
</property>
<property name="suffix">
<string> hours</string>
</property>
<property name="decimals">
<number>1</number>
</property>
<property name="maximum">
<double>8.000000000000000</double>
</property>
<property name="value">
<double>4.000000000000000</double>
</property>
</widget>
</item>
<item row="0" column="2" colspan="2">
<widget class="QComboBox" name="eventIndexCombo">
<property name="sizePolicy">
@ -1513,6 +1481,172 @@ as this is the only value available on summary-only days.</string>
</item>
</layout>
</widget>
<widget class="QWidget" name="ClinicalTab">
<attribute name="title">
<string>Clinical</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout_Z12">
<property name="spacing">
<number>4</number>
</property>
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<property name="visible" stdset="0">
<bool>false</bool>
</property>
<item>
<widget class="QGroupBox" name="clinicalGroupBox">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>Clinical Settings</string>
</property>
<property name="checkable">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_Z2">
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>8</number>
</property>
<property name="rightMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>4</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="2" column="0">
<widget class="QLabel" name="label_56">
<property name="text">
<string>Compliance defined as</string>
</property>
<property name="toolTip">
<string>Regard days with under this usage as &quot;incompliant&quot;. 4 hours is usually considered compliant.</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="3">
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="4" column="0">
<widget class="QPushButton" name="resetClinicalDefaults">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Reset &amp;Defaults</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox_Z4">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Select Oscar Operating Mode </string>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<widget class="QRadioButton" name="clinicalMode">
<property name="text">
<string>Clinical Mode</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Clinical Mode does not allow disabled sessions.\nDisabled Session are not used for graphing or Statistics.</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="allowDisabledSessions">
<property name="text">
<string>Allow Disabled Sessions</string>
</property>
<property name="toolTip">
<string>Clinical Mode does not allow disabled sessions.\nDisabled Session are not used for graphing or Statistics.</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="complianceHours">
<property name="suffix">
<string> Hours</string>
</property>
<property name="decimals">
<number>1</number>
</property>
<property name="maximum">
<double>8.000000000000000</double>
</property>
<property name="value">
<double>4.000000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QTextEdit" name="textEdit">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Changing the Oscar Operating Mode requires a reload of the user's profile.&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Data will be saved and restored.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="oximetryTab">
<attribute name="title">
<string>&amp;Oximetry</string>
@ -2756,16 +2890,6 @@ Try it and see if you like it.</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="clinicalMode">
<property name="toolTip">
<string>Clinical Mode does not allow disabled sessions.\nDisabled Session are not used for graphing or Statistics.</string>
</property>
<property name="text">
<string>Clinical Mode</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">