Alternative Unintentional Leak Calculation with Preferences

sleepyhead/Resources.qrc

@@ -49,5 +49,7 @@
         <file>icons/prs1_60s.png</file>
         <file>icons/dreamstation.png</file>
         <file>icons/airsense10.png</file>
+        <file>icons/aircurve.png</file>
+        <file>icons/prs1_960.png</file>
     </qresource>
 </RCC>

sleepyhead/SleepLib/calcs.cpp

@@ -1504,10 +1504,6 @@ void zMaskProfile::updatePressureMin()
 
 EventDataType zMaskProfile::calcLeak(EventStoreType pressure)
 {
-//    if (maxP == minP) {
-//        return pressuremin[pressure];
-//    }
-//    EventDataType leak = (pressure - minP) * (m_factor) + minL;
 
     // Average mask leak minimum at pressure 4 = 20.167
     // Average mask slope = 1.76
@@ -1515,9 +1511,29 @@ EventDataType zMaskProfile::calcLeak(EventStoreType pressure)
     // Min/max leak at pressure 4 = 18 - 22
     // Min/max leak at pressure 20 = 42 - 54
 
+    float leak = 0.0;
 
+    if (p_profile->cpap->customMaskProfile()) {
+        float lpm4 = p_profile->cpap->custom4cmH2OLeaks();
+        float lpm20 = p_profile->cpap->custom20cmH2OLeaks();
+
+        float lpm = lpm20 - lpm4;
+        float ppm = lpm / 16.0;
+
+        float p = (pressure/10.0f) - 4.0;
+
+        leak = p * ppm + lpm4;
+    } else {
+        if (maxP == minP) {
+            leak = pressuremin[pressure];
+        } else {
+            leak = (pressure - minP) * (m_factor) + minL;
+        }
+
+//        leak = (pressure/10.0 - 4.0) * 1.76 + 20.167;
+    }
     // Generic Average of Masks from a SpreadSheet... will add two sliders to tweak this between the ranges later
-    EventDataType leak = (pressure/10.0 - 4.0) * 1.76 + 20.167;
+//    EventDataType
 
     return leak;
 }

sleepyhead/SleepLib/common.cpp

@@ -275,6 +275,8 @@ QString STR_TR_PrRelief; // Pressure Relief
 QString STR_TR_Bookmarks;
 QString STR_TR_SleepyHead;
 
+QString STR_TR_Default;
+
 QString STR_TR_Mode;
 QString STR_TR_Model;
 QString STR_TR_Brand;
@@ -378,6 +380,9 @@ void initializeStrings()
     STR_TR_Oximeter = QObject::tr("Oximeter");
     STR_TR_EventFlags = QObject::tr("Event Flags");
 
+
+    STR_TR_Default = QObject::tr("Default");
+
     // Machine type names.
     STR_TR_CPAP = QObject::tr("CPAP");    // Constant Positive Airway Pressure
     STR_TR_BIPAP = QObject::tr("BiPAP");  // Bi-Level Positive Airway Pressure

sleepyhead/SleepLib/common.h

@@ -190,6 +190,7 @@ extern QString STR_Empty_Brick;
 extern QString STR_Empty_NoGraphs;
 extern QString STR_Empty_SummaryOnly;
 
+extern QString STR_TR_Default;
 
 
 extern QString STR_TR_BMI;         // Short form of Body Mass Index

sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp

@@ -984,13 +984,13 @@ ResmedLoader::ResmedLoader()
 {
     const QString RMS9_ICON = ":/icons/rms9.png";
     const QString RM10_ICON = ":/icons/airsense10.png";
-    const QString RM10C_ICON = ":/icons/airsense10.png";
+    const QString RM10C_ICON = ":/icons/aircurve.png";
 
     m_pixmaps[STR_ResMed_S9] = QPixmap(RMS9_ICON);
     m_pixmap_paths[STR_ResMed_S9] = RMS9_ICON;
     m_pixmaps[STR_ResMed_AirSense10] = QPixmap(RM10_ICON);
     m_pixmap_paths[STR_ResMed_AirSense10] = RM10_ICON;
-    m_pixmaps[STR_ResMed_AirCurve10] = QPixmap(RM10_ICON);
+    m_pixmaps[STR_ResMed_AirCurve10] = QPixmap(RM10C_ICON);
     m_pixmap_paths[STR_ResMed_AirCurve10] = RM10_ICON;
     m_type = MT_CPAP;
 }

sleepyhead/SleepLib/preferences.cpp

@@ -185,8 +185,12 @@ bool Preferences::Open(QString filename)
         return false;
     }
 
-    if (!doc.setContent(&file)) {
+    QString errorMsg;
+    int errorLine;
+    int errorColumn;
+    if (!doc.setContent(&file,false, &errorMsg, &errorLine, &errorColumn)) {
         qWarning() << "Invalid XML Content in" << QDir::toNativeSeparators(p_filename);
+        qWarning() << "Error:" << errorMsg << "in line" << errorLine << ":" << errorColumn;
         return false;
     }
 

sleepyhead/SleepLib/profiles.cpp

@@ -120,7 +120,7 @@ QString Profile::checkLock()
     return lockhost;
 }
 
-bool Profile::Open(QString filename)
+bool Profile::Load(QString filename)
 {
     p_profile = this;
 
@@ -131,9 +131,9 @@ bool Profile::Open(QString filename)
         qDebug() << "Profile" << filename << "all ready open";
         return true;
     }
-    bool b = Preferences::Open(filename);
 
-    m_opened=true;
+    bool b = Open(filename);
+
     doctor = new DoctorInfo(this);
     user = new UserInfo(this);
     cpap = new CPAPSettings(this);
@@ -141,6 +141,8 @@ bool Profile::Open(QString filename)
     appearance = new AppearanceSettings(this);
     session = new SessionSettings(this);
     general = new UserSettings(this);
+
+    m_opened=true;
     return b;
 }
 
@@ -906,7 +908,7 @@ Profile *Create(QString name)
 
     //path+="/"+name;
     p_profile = new Profile(path);
-    p_profile->Open();
+    p_profile->Load();
     profiles[name] = p_profile;
     p_profile->user->setUserName(name);
     //p_profile->Set("Realname",realname);

sleepyhead/SleepLib/profiles.h

@@ -48,7 +48,7 @@ class Profile : public Preferences
     virtual ~Profile();
 
     //! \brief Open profile, parse profile.xml file, and initialize helper classes
-    virtual bool Open(QString filename = "");
+    virtual bool Load(QString filename = "");
 
     //! \brief Parse machines.xml
     bool OpenMachines();
@@ -305,6 +305,10 @@ const QString STR_CS_ClockDrift = "ClockDrift";
 const QString STR_CS_LeakRedline = "LeakRedline";
 const QString STR_CS_ShowLeakRedline = "ShowLeakRedline";
 
+const QString STR_CS_CustomMaskProfile = "CustomMaskProfile";
+const QString STR_CS_4cmH2OLeaks = "Custom4cmH2OLeaks";
+const QString STR_CS_20cmH2OLeaks = "Custom20cmH2OLeaks";
+
 // ImportSettings Strings
 const QString STR_IS_DaySplitTime = "DaySplitTime";
 const QString STR_IS_PreloadSummaries = "PreloadSummaries";
@@ -566,6 +570,10 @@ class CPAPSettings : public ProfileSettings
         initPref(STR_CS_AutoImport, false);
         initPref(STR_CS_BrickWarning, true);
 
+        initPref(STR_CS_CustomMaskProfile, false);
+        initPref(STR_CS_4cmH2OLeaks, 20.167);
+        initPref(STR_CS_20cmH2OLeaks, 48.333);
+
         initPref(STR_CS_ClockDrift, (int)0);
         m_clock_drift = getPref(STR_CS_ClockDrift).toInt();
     }
@@ -599,6 +607,10 @@ class CPAPSettings : public ProfileSettings
     bool autoImport() const { return getPref(STR_CS_AutoImport).toBool(); }
     bool brickWarning() const { return getPref(STR_CS_BrickWarning).toBool(); }
 
+    bool customMaskProfile() const { return getPref(STR_CS_CustomMaskProfile).toBool(); }
+    double custom4cmH2OLeaks() const { return getPref(STR_CS_4cmH2OLeaks).toDouble(); }
+    double custom20cmH2OLeaks() const { return getPref(STR_CS_20cmH2OLeaks).toDouble(); }
+
     //Setters
     void setMode(CPAPMode mode) { setPref(STR_CS_PrescribedMode, (int)mode); }
     void setMinPressure(double pressure) { setPref(STR_CS_PrescribedMinPressure, pressure); }
@@ -632,6 +644,10 @@ class CPAPSettings : public ProfileSettings
     void setAutoImport(bool b) { setPref(STR_CS_AutoImport, b); }
     void setBrickWarning(bool b) { setPref(STR_CS_BrickWarning, b); }
 
+    void setCustomMaskProfile(bool b) { setPref(STR_CS_CustomMaskProfile, b); }
+    void setCustom4cmH2OLeaks(double val) { setPref(STR_CS_4cmH2OLeaks, val); }
+    void setCustom20cmH2OLeaks(double val) { setPref(STR_CS_20cmH2OLeaks, val); }
+
   public:
     int m_clock_drift;
 };

sleepyhead/mainwindow.cpp

@@ -2411,6 +2411,8 @@ void MainWindow::doReprocessEvents()
 
                 if (sess->machine()->loaderName() != STR_MACH_PRS1) {
                     sess->destroyEvent(CPAP_LargeLeak);
+                } else {
+                    sess->destroyEvent(CPAP_Leak);
                 }
 
                 sess->SetChanged(true);

sleepyhead/preferencesdialog.cpp

@@ -16,6 +16,7 @@
 #include <QTextStream>
 #include <QCalendarWidget>
 #include <QMenuBar>
+#include <cmath>
 
 #include "preferencesdialog.h"
 #include "common_gui.h"
@@ -217,6 +218,21 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
 
     ui->showUserFlagsInPie->setChecked(profile->cpap->userEventPieChart());
 
+
+    bool b;
+    ui->customMaskProfileGroupbox->setChecked(b=profile->cpap->customMaskProfile());
+
+    ui->maskLeaks4Slider->setValue(profile->cpap->custom4cmH2OLeaks()*10.0);
+    ui->maskLeaks20Slider->setValue(profile->cpap->custom20cmH2OLeaks()*10.0);
+
+//    if (b) {
+//        ui->maskLeaks4Label->setText(tr("%1 %2").arg(profile->cpap->custom4cmH2OLeaks(), 5, 'f', 1).arg(STR_UNIT_LPM));
+//        ui->maskLeaks20Label->setText(tr("%1 %2").arg(profile->cpap->custom20cmH2OLeaks(), 5, 'f', 1).arg(STR_UNIT_LPM));
+//    } else {
+//        ui->maskLeaks4Label->setText(STR_TR_Default);
+//        ui->maskLeaks20Label->setText(STR_TR_Default);
+//    }
+
     /*    QLocale locale=QLocale::system();
         QString shortformat=locale.dateFormat(QLocale::ShortFormat);
         if (!shortformat.toLower().contains("yyyy")) {
@@ -776,6 +792,17 @@ bool PreferencesDialog::Save()
 
     profile->cpap->setUserEventDuplicates(ui->userEventDuplicates->isChecked());
 
+
+    if ((ui->customMaskProfileGroupbox->isChecked() != profile->cpap->customMaskProfile())
+      || (fabs((ui->maskLeaks4Slider->value()/10.0)-profile->cpap->custom4cmH2OLeaks())>.1)
+      || (fabs((ui->maskLeaks20Slider->value()/10.0)-profile->cpap->custom20cmH2OLeaks())>.1)) {
+           recalc_events = true;
+    }
+
+    profile->cpap->setCustomMaskProfile(ui->customMaskProfileGroupbox->isChecked());
+    profile->cpap->setCustom4cmH2OLeaks(double(ui->maskLeaks4Slider->value()) / 10.0f);
+    profile->cpap->setCustom20cmH2OLeaks(double(ui->maskLeaks20Slider->value()) / 10.0f);
+
     PREF[STR_GEN_SkipLogin] = ui->skipLoginScreen->isChecked();
 
     PREF[STR_GEN_UpdatesAutoCheck] = ui->automaticallyCheckUpdates->isChecked();
@@ -1134,3 +1161,28 @@ void PreferencesDialog::on_waveView_doubleClicked(const QModelIndex &index)
 
     }
 }
+
+void PreferencesDialog::on_maskLeaks4Slider_sliderMoved(int position)
+{
+}
+
+void PreferencesDialog::on_customMaskProfileGroupbox_toggled(bool arg1)
+{
+    if (arg1) {
+    } else {
+    }
+}
+
+void PreferencesDialog::on_maskLeaks20Slider_sliderMoved(int position)
+{
+}
+
+void PreferencesDialog::on_maskLeaks4Slider_valueChanged(int value)
+{
+    ui->maskLeaks4Label->setText(tr("%1 %2").arg(value/10.0f, 5,'f',1).arg(STR_UNIT_LPM));
+}
+
+void PreferencesDialog::on_maskLeaks20Slider_valueChanged(int value)
+{
+    ui->maskLeaks20Label->setText(tr("%1 %2").arg(value/10.0f, 5,'f',1).arg(STR_UNIT_LPM));
+}

sleepyhead/preferencesdialog.h

@@ -87,6 +87,16 @@ class PreferencesDialog : public QDialog
 
     void on_waveView_doubleClicked(const QModelIndex &index);
 
+    void on_maskLeaks4Slider_sliderMoved(int position);
+
+    void on_customMaskProfileGroupbox_toggled(bool arg1);
+
+    void on_maskLeaks20Slider_sliderMoved(int position);
+
+    void on_maskLeaks4Slider_valueChanged(int value);
+
+    void on_maskLeaks20Slider_valueChanged(int value);
+
 private:
     void InitChanInfo();
     void InitWaveInfo();

sleepyhead/profileselect.cpp

@@ -134,7 +134,7 @@ void ProfileSelect::editProfile()
 
     if (!profile) { return; }
     if (!profile->isOpen()) {
-        profile->Open();
+        profile->Load();
     }
 
     bool reallyEdit = false;
@@ -212,7 +212,7 @@ void ProfileSelect::deleteProfile()
 
     Profile * profile = Profiles::profiles[name];
     p_profile = profile;
-    if (!profile->Open()) {
+    if (!profile->Load()) {
         QMessageBox::warning(this, STR_MessageBox_Error,
             QString(tr("Could not open profile.. You will need to delete this profile directory manually")+
             "\n\n"+tr("You will find it under the following location:")+"\n\n%1").arg(QDir::toNativeSeparators(GetAppRoot() + "/Profiles/" + profile->user->userName())), QMessageBox::Ok);
@@ -338,7 +338,7 @@ void ProfileSelect::on_listView_activated(const QModelIndex &index)
         }
 
         p_profile = profile;
-        profile->Open();
+        profile->Load();
         // Do this in case user renames the directory (otherwise it won't load)
         // Essentially makes the folder name the user name, but whatever..
         // TODO: Change the profile editor one day to make it rename the actual folder