ResMed STR.edf summary parser, and Purge rework

sleepyhead/Graphs/gSummaryChart.cpp

@@ -256,7 +256,7 @@ void SummaryChart::SetDay(Day *nullday)
                             break;
 
                         case ST_CPH:
-                            tmp = day->cph(code);
+                            tmp = day->count(code) / day->hours();
                             break;
 
                         case ST_SPH:

sleepyhead/SleepLib/day.cpp

@@ -767,7 +767,7 @@ int Day::count(ChannelID code)
     for (QList<Session *>::iterator it = sessions.begin(); it != end; ++it) {
         Session & sess = *(*it);
 
-        if (sess.enabled()) {
+        if (sess.enabled() && sess.channelDataExists(code)) {
             sum += sess.count(code);
         }
     }

sleepyhead/SleepLib/loader_plugins/resmed_loader.h

@@ -101,6 +101,103 @@ struct EDFSignal {
     int pos;
 };
 
+struct STRRecord
+{
+    STRRecord() {
+        maskon = 0;
+        maskoff = 0;
+        maskdur = 0;
+        maskevents = -1;
+        mode = -1;
+        set_pressure = -1;
+        epap = -1;
+        max_pressure = -1;
+        min_pressure = -1;
+        max_epap = -1;
+        min_epap = -1;
+        max_ps = -1;
+        min_ps = -1;
+        ps = -1;
+        ipap = -1;
+        max_ipap = -1;
+        min_ipap = -1;
+        epr = -1;
+        epr_set = -1;
+        sessionid = 0;
+
+        ahi = -1;
+        ai = -1;
+        hi = -1;
+        uai = -1;
+        cai = -1;
+
+        leakmed = -1;
+        leak95 = -1;
+        leakmax = -1;
+        date=QDate();
+    }
+    STRRecord(const STRRecord & copy) {
+        maskon = copy.maskon;
+        maskoff = copy.maskoff;
+        maskdur = copy.maskdur;
+        maskevents = copy.maskevents;
+        mode = copy.mode;
+        set_pressure = copy.set_pressure;
+        epap = copy.epap;
+        max_pressure = copy.max_pressure;
+        min_pressure = copy.min_pressure;
+        max_ps = copy.max_ps;
+        min_ps = copy.min_ps;
+        ps = copy.ps;
+        max_epap = copy.max_epap;
+        min_epap = copy.min_epap;
+        ipap = copy.ipap;
+        max_ipap = copy.max_ipap;
+        min_ipap = copy.min_ipap;
+        epr = copy.epr;
+        epr_set = copy.epr_set;
+        sessionid = copy.sessionid;
+        ahi = copy.ahi;
+        ai = copy.ai;
+        hi = copy.hi;
+        uai = copy.uai;
+        cai = copy.cai;
+        date = copy.date;
+        leakmed = copy.leakmed;
+        leak95 = copy.leak95;
+        leakmax = copy.leakmax;
+    }
+    quint32 maskon;
+    quint32 maskoff;
+    EventDataType maskdur;
+    EventDataType maskevents;
+    EventDataType mode;
+    EventDataType set_pressure;
+    EventDataType max_pressure;
+    EventDataType min_pressure;
+    EventDataType epap;
+    EventDataType max_ps;
+    EventDataType min_ps;
+    EventDataType ps;
+    EventDataType max_epap;
+    EventDataType min_epap;
+    EventDataType ipap;
+    EventDataType max_ipap;
+    EventDataType min_ipap;
+    EventDataType epr;
+    EventDataType epr_set;
+    quint32 sessionid;
+    EventDataType ahi;
+    EventDataType ai;
+    EventDataType hi;
+    EventDataType uai;
+    EventDataType cai;
+    EventDataType leakmed;
+    EventDataType leak95;
+    EventDataType leakmax;
+    QDate date;
+};
+
 /*! \class EDFParser
     \author Mark Watkins <jedimark64_at_users.sourceforge.net>
     \brief Parse an EDF+ data file into a list of EDFSignal's
@@ -127,11 +224,13 @@ class EDFParser
     QVector<EDFSignal> edfsignals;
 
     //! \brief An by-name indexed into the EDFSignal data
-    QHash<QString, EDFSignal *> lookup;
+    QStringList signal_labels;
+
+    QList<EDFSignal *> signal;
 
     //! \brief Look up signal names by SleepLib ChannelID.. A little "ResMed"ified.. :/
     EDFSignal *lookupSignal(ChannelID);
-    EDFSignal *lookupName(QString name);
+    EDFSignal *lookupLabel(QString name);
 
     //! \brief Returns the number of signals contained in this EDF file
     long GetNumSignals() { return num_signals; }
@@ -220,9 +319,15 @@ class ResmedLoader : public MachineLoader
     //! This contains the Pressure, Leak, Respiratory Rate, Minute Ventilation, Tidal Volume, etc..
     bool LoadPLD(Session *sess, EDFParser &edf);
 
+    void ParseSTR(Machine *mach, QStringList strfiles);
+
+
     QString backup(QString file, QString backup_path, bool compress = false);
 
     QMap<SessionID, QStringList> sessfiles;
+    QMap<quint32, STRRecord> strsess;
+    QMap<QDate, QList<STRRecord *> > strdate;
+
 #ifdef DEBUG_EFFICIENCY
     QHash<ChannelID, qint64> channel_efficiency;
     QHash<ChannelID, qint64> channel_time;

sleepyhead/SleepLib/machine.cpp

@@ -528,7 +528,7 @@ PositionSensor::~PositionSensor()
 }
 
 
-ChannelID NoChannel, SESSION_ENABLED;
+ChannelID NoChannel, SESSION_ENABLED, CPAP_SummaryOnly;
 ChannelID CPAP_IPAP, CPAP_IPAPLo, CPAP_IPAPHi, CPAP_EPAP, CPAP_EPAPLo, CPAP_EPAPHi, CPAP_Pressure,
           CPAP_PS, CPAP_Mode, CPAP_AHI,
           CPAP_PressureMin, CPAP_PressureMax, CPAP_RampTime, CPAP_RampPressure, CPAP_Obstructive,
@@ -544,7 +544,7 @@ ChannelID CPAP_IPAP, CPAP_IPAPLo, CPAP_IPAPHi, CPAP_EPAP, CPAP_EPAPLo, CPAP_EPAP
           CPAP_Test2;
 
 
-ChannelID RMS9_E01, RMS9_E02, RMS9_EPR, RMS9_EPRSet, RMS9_SetPressure;
+ChannelID RMS9_E01, RMS9_E02, RMS9_EPR, RMS9_EPRSet, RMS9_SetPressure, RMS9_MaskOnTime;
 ChannelID INTP_SmartFlex;
 ChannelID INTELLIPAP_Unknown1, INTELLIPAP_Unknown2;
 

sleepyhead/SleepLib/machine_common.h

@@ -85,7 +85,7 @@ enum MCDataType
 { MC_bool = 0, MC_int, MC_long, MC_float, MC_double, MC_string, MC_datetime };
 
 
-extern ChannelID NoChannel, SESSION_ENABLED;
+extern ChannelID NoChannel, SESSION_ENABLED, CPAP_SummaryOnly;
 extern ChannelID CPAP_IPAP, CPAP_IPAPLo, CPAP_IPAPHi, CPAP_EPAP, CPAP_EPAPLo, CPAP_EPAPHi,
        CPAP_Pressure, CPAP_PS, CPAP_PSMin, CPAP_PSMax,
        CPAP_Mode, CPAP_AHI,
@@ -100,7 +100,7 @@ extern ChannelID CPAP_IPAP, CPAP_IPAPLo, CPAP_IPAPHi, CPAP_EPAP, CPAP_EPAPLo, CP
        CPAP_UserFlag1, CPAP_UserFlag2, CPAP_UserFlag3, CPAP_BrokenSummary, CPAP_BrokenWaveform, CPAP_RDI,
        CPAP_PresReliefSet, CPAP_PresReliefMode, CPAP_PresReliefType, CPAP_Test1, CPAP_Test2;
 
-extern ChannelID RMS9_E01, RMS9_E02, RMS9_EPR, RMS9_EPRSet, RMS9_SetPressure;
+extern ChannelID RMS9_E01, RMS9_E02, RMS9_EPR, RMS9_EPRSet, RMS9_SetPressure, RMS9_MaskOnTime;
 extern ChannelID INTP_SmartFlex;
 extern ChannelID PRS1_00, PRS1_01, PRS1_08, PRS1_0A, PRS1_0B, PRS1_0C, PRS1_0E, PRS1_0F, CPAP_LargeLeak,
        PRS1_12,

sleepyhead/SleepLib/profiles.cpp

@@ -482,10 +482,16 @@ void Profile::RemoveSession(Session *sess)
                     }
                 }
 
+                if (day->size() == 0) {
+                    di.value().removeAll(day);
+                    delete day;
+                }
+
                 // day->setFirst(first);
                 // day->setLast(last);
                 return;
             }
+
         }
     }
 }

sleepyhead/SleepLib/schema.cpp

@@ -380,6 +380,15 @@ void init()
                         QObject::tr("Upright angle in degrees"),  QObject::tr("Inclination"),  STR_UNIT_Degrees,
                         DEFAULT,  QColor("dark magenta")));
 
+    schema::channel.add(GRP_CPAP, new Channel(RMS9_MaskOnTime = 0x1025, SETTING,    SESSION,
+                        "MaskOnTime",      QObject::tr("Mask On Time"),
+                        QObject::tr("Time started according to str.edf"),  QObject::tr("Mask On Time"),  STR_UNIT_Unknown,
+                        DEFAULT,  Qt::black));
+
+    schema::channel.add(GRP_CPAP, new Channel(CPAP_SummaryOnly = 0x1026, SETTING,    SESSION,
+                        "SummaryOnly",      QObject::tr("Summary Only"),
+                        QObject::tr("CPAP Session contains summary data onlyf"),  QObject::tr("Summary Only"),  STR_UNIT_Unknown,
+                        DEFAULT,  Qt::black));
 
 
     NoChannel = 0;

sleepyhead/SleepLib/session.cpp

@@ -103,6 +103,24 @@ bool Session::OpenEvents()
     return s_events_loaded = true;
 }
 
+bool Session::Destroy()
+{
+    QString path = PROFILE.Get(s_machine->properties[STR_PROP_Path]);
+
+    PROFILE.RemoveSession(this);
+    s_machine->sessionlist.erase(s_machine->sessionlist.find(s_session));
+
+    QDir dir(path);
+    QString base;
+    base.sprintf("%08lx", s_session);
+    base = path + "/" + base;
+
+    dir.remove(base + ".000");
+    dir.remove(base + ".001");
+
+    return !dir.exists(base + ".000") && !dir.exists(base + ".001");
+}
+
 bool Session::Store(QString path)
 // Storing Session Data in our format
 // {DataDir}/{MachineID}/{SessionID}.{ext}
@@ -866,7 +884,9 @@ void Session::UpdateSummaries()
     for (; c != ev_end; c++) {
         id = c.key();
 
-        if (schema::channel[id].type() == schema::DATA) {
+
+        schema::ChanType ctype = schema::channel[id].type();
+        if (ctype != schema::SETTING) {
             //sum(id); // avg calculates this and cnt.
             if (c.value().size() > 0) {
                 EventList *el = c.value()[0];
@@ -1510,9 +1530,11 @@ int Session::count(ChannelID id)
 
     int sum = 0;
     int evec_size=evec.size();
+    if (evec_size == 0)
+        return 0;
 
-    for (int i = 0; i < evec_size; i++) {
+    for (int i = 0; i < evec_size; ++i) {
-        sum += evec[i]->count();
+        sum += evec.at(i)->count();
     }
 
     m_cnt[id] = sum;

sleepyhead/SleepLib/session.h

@@ -72,6 +72,7 @@ class Session
         return s_session;
     }
 
+
     //! \brief Returns whether or not session is being used.
     bool enabled();
 
@@ -134,12 +135,21 @@ class Session
         return s_changed;
     }
 
+
     //! \brief Contains all the EventLists, indexed by ChannelID
     QHash<ChannelID, QVector<EventList *> > eventlist;
 
     //! \brief Sessions Settings List, contianing single settings for this session.
     QHash<ChannelID, QVariant> settings;
 
+    QVariant setting(ChannelID) {
+        QHash<ChannelID, QVariant>::iterator it = settings.find(CPAP_SummaryOnly);
+        if (it != settings.end()) {
+            return (*it);
+        }
+        return QVariant();
+    }
+
     // Session caches
     QHash<ChannelID, int> m_cnt;
     QHash<ChannelID, double> m_sum;
@@ -300,7 +310,19 @@ class Session
 
     //! \brief Returns this sessions MachineID
     Machine *machine() { return s_machine; }
-  protected:
+
+    bool Destroy();
+
+    void wipeSummary() {
+        s_first = s_last = 0;
+        s_enabled = true;
+        m_cph.clear();
+        m_sum.clear();
+        m_cnt.clear();
+    }
+
+    const QString & eventFile() { return s_eventfile; }
+protected:
     SessionID s_session;
 
     Machine *s_machine;
@@ -314,6 +336,8 @@ class Session
     bool s_events_loaded;
     char s_enabled;
     QString s_eventfile;
+
+
 };
 
 

sleepyhead/daily.cpp

@@ -1219,6 +1219,10 @@ void Daily::Load(QDate date)
 
     if (!PROFILE.session->cacheSessions()) {
         // Getting trashed on purge last day...
+
+        // lastcpapday can get purged and be invalid
+
+
         if (lastcpapday && (lastcpapday!=cpap)) {
             for (QList<Session *>::iterator s=lastcpapday->begin();s!=lastcpapday->end();++s) {
                 (*s)->TrashEvents();

sleepyhead/mainwindow.cpp

@@ -304,6 +304,26 @@ void MainWindow::Notify(QString s, QString title, int ms)
     }
 }
 
+void MainWindow::PopulatePurgeMenu()
+{
+    QList<QAction *> actions = ui->menu_Purge_CPAP_Data->actions();
+    for (int i=0; i < actions.size(); i++) {
+        ui->menu_Purge_CPAP_Data->disconnect(ui->menu_Purge_CPAP_Data, SIGNAL(triggered(QAction*)), this, SLOT(on_actionPurgeMachine(QAction *)));
+    }
+    ui->menu_Purge_CPAP_Data->clear();
+    QList<Machine *> machines = PROFILE.GetMachines(MT_CPAP);
+    for (int i=0; i < machines.size(); ++i) {
+        Machine *mach = machines.at(i);
+        QString name =  mach->properties[STR_PROP_Brand]+" "+
+                        mach->properties[STR_PROP_Model]+" "+
+                        mach->properties[STR_PROP_Serial];
+        QAction * action = new QAction(name, ui->menu_Purge_CPAP_Data);
+        action->setData(mach->GetClass()+":"+mach->properties[STR_PROP_Serial]);
+        ui->menu_Purge_CPAP_Data->addAction(action);
+        ui->menu_Purge_CPAP_Data->connect(ui->menu_Purge_CPAP_Data, SIGNAL(triggered(QAction*)), this, SLOT(on_actionPurgeMachine(QAction*)));
+    }
+}
+
 void MainWindow::Startup()
 {
     qDebug() << STR_TR_SleepyHeadVersion.toLocal8Bit().data() << "built with Qt" << QT_VERSION_STR <<
@@ -320,6 +340,8 @@ void MainWindow::Startup()
     // profile is a global variable set in main after login
     PROFILE.LoadMachineData();
 
+    PopulatePurgeMenu();
+
     SnapshotGraph = new gGraphView(this, daily->graphView());
 
     // the following are platform overides for the UsePixmapCache preference settings
@@ -614,13 +636,28 @@ void MainWindow::on_action_Import_Data_triggered()
 #else
         const QString documentsFolder = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
 #endif
+
+
         w.setDirectory(documentsFolder);
         w.setFileMode(QFileDialog::Directory);
         w.setOption(QFileDialog::ShowDirsOnly, true);
-        w.setOption(QFileDialog::DontUseNativeDialog,true);
+
-//#if defined(Q_OS_MAC) && (QT_VERSION < QT_VERSION_CHECK(4,8,0))
+        // This doesn't work on WinXP
-//        // Fix for tetragon, 10.6 barfs up Qt's custom dialog
+
-//        w.setOption(QFileDialog::DontUseNativeDialog, true);
+#ifdef Q_OS_MAC
+#if (QT_VERSION < QT_VERSION_CHECK(4,8,0))
+        // Fix for tetragon, 10.6 barfs up Qt's custom dialog
+        w.setOption(QFileDialog::DontUseNativeDialog, true);
+#else
+        w.setOption(QFileDialog::DontUseNativeDialog,false);
+#endif // version check
+
+#elif Q_OS_UNIX
+        w.setOption(QFileDialog::DontUseNativeDialog,false);
+#elif Q_OS_WIN
+        // check the Os version.. winxp chokes
+        w.setOption(QFileDialog::DontUseNativeDialog, true);
+#endif
 //#else
 //        w.setOption(QFileDialog::DontUseNativeDialog, false);
 
@@ -692,6 +729,7 @@ void MainWindow::on_action_Import_Data_triggered()
     } else {
         mainwin->Notify(tr("Import Problem\n\nCouldn't find any new Machine Data at the locations given"));
     }
+    PopulatePurgeMenu();
 }
 QMenu *MainWindow::CreateMenu(QString title)
 {
@@ -1659,8 +1697,6 @@ void MainWindow::on_actionPurge_Current_Day_triggered()
             delete sess;
         }
 
-
-
         QList<Day *> &dl = PROFILE.daylist[date];
         QList<Day *>::iterator it;//=dl.begin();
 
@@ -1679,39 +1715,99 @@ void MainWindow::on_actionPurge_Current_Day_triggered()
     getDaily()->LoadDate(date);
 }
 
-void MainWindow::on_actionAll_Data_for_current_CPAP_machine_triggered()
+void MainWindow::on_actionPurgeMachine(QAction *action)
 {
-    QDate date = getDaily()->getDate();
+    QString data = action->data().toString();
-    Day *day = PROFILE.GetDay(date, MT_CPAP);
+    QString cls = data.section(":",0,0);
-    Machine *m;
+    QString serial = data.section(":", 1);
-
+    QList<Machine *> machines = PROFILE.GetMachines(MT_CPAP);
-    if (day) {
+    Machine * mach = nullptr;
-        m = day->machine;
+    for (int i=0; i < machines.size(); ++i) {
-
+        Machine * m = machines.at(i);
-        if (!m) {
+        if ((m->GetClass() == cls) && (m->properties[STR_PROP_Serial] == serial)) {
-            qDebug() << "Gah!! no machine to purge";
+            mach = m;
-            return;
+            break;
-        }
-
-        if (QMessageBox::question(this,
-                                  tr("Are you sure?"),
-                                  tr("Are you sure you want to purge all CPAP data for the following machine:\n\n") +
-                                  m->properties[STR_PROP_Brand] + " " + m->properties[STR_PROP_Model] + " " +
-                                  m->properties[STR_PROP_ModelNumber] + " (" + m->properties[STR_PROP_Serial] + ")",
-                                  QMessageBox::Yes | QMessageBox::No,
-                                  QMessageBox::No) == QMessageBox::Yes) {
-
-
-            if (m->Purge(3478216)) {
-                // Turn on automatic re-import
-                // Note: I deliberately haven't added a Profile help for this
-                PROFILE.Save();
-            }
-            // delete or not to delete.. this needs to delete later.. :/
-            //delete m;
-            RestartApplication();
         }
     }
+    if (!mach) return;
+    purgeMachine(mach);
+}
+
+void MainWindow::purgeMachine(Machine * mach)
+{
+
+    if (QMessageBox::question(this,
+                              STR_MessageBox_Question,
+                              tr("Are you sure you want to purge all CPAP data for the following machine:\n\n") +
+                              mach->properties[STR_PROP_Brand] + " " + mach->properties[STR_PROP_Model] + " " +
+                              mach->properties[STR_PROP_ModelNumber] + " (" + mach->properties[STR_PROP_Serial] + ")",
+                              QMessageBox::Yes | QMessageBox::No,
+                              QMessageBox::No) == QMessageBox::No) {
+        return;
+    }
+
+    QHash<SessionID, Session *>::iterator it;
+    QHash<SessionID, Session *>::iterator s_end = mach->sessionlist.end();
+    QList<Session *> sessions;
+    for (it = mach->sessionlist.begin(); it != s_end; ++it) {
+        Session * sess = *it;
+        sessions.push_back(sess);
+    }
+    bool success = true;
+    for (int i=0; i < sessions.size(); ++i) {
+        Session * sess = sessions[i];
+        if (!sess->Destroy()) {
+            qDebug() << "Could not destroy "+mach->GetClass()+" ("+mach->properties[STR_PROP_Serial]+") session" << sess->session();
+            success = false;
+        } else {
+            mach->sessionlist.erase(mach->sessionlist.find(sess->session()));
+        }
+        delete sess;
+    }
+    if (success) {
+        mach->sessionlist.clear();
+        mach->day.clear();
+
+    } else {
+        QMessageBox::warning(this, STR_MessageBox_Error,
+                             tr("Not all session data could be removed, you have to delete the following folder manually.")
+                             +"\n\n"+
+                             QDir::toNativeSeparators(PROFILE.Get(mach->properties[STR_PROP_Path])), QMessageBox::Ok, QMessageBox::Ok);
+        if (overview) { overview->ReloadGraphs(); }
+        if (daily) {
+            daily->clearLastDay(); // otherwise Daily will crash
+            daily->LoadDate(daily->getDate());
+        }
+        GenerateStatistics();
+        return;
+    }
+
+    if (overview) { overview->ReloadGraphs(); }
+    if (daily) {
+        daily->clearLastDay(); // otherwise Daily will crash
+        daily->LoadDate(daily->getDate());
+    }
+    GenerateStatistics();
+    QApplication::processEvents();
+
+    if (QMessageBox::question(this,
+                              STR_MessageBox_Question,
+                              tr("Machine data has been successfully purged.") + "\n\n" +
+                              tr("Would you like to reimport from the backup folder?") + "\n\n" +
+                              QDir::toNativeSeparators(PROFILE.Get(mach->properties[STR_PROP_BackupPath])),
+                              QMessageBox::Yes | QMessageBox::No,
+                              QMessageBox::Yes) == QMessageBox::No) {
+        PROFILE.machlist.erase(PROFILE.machlist.find(mach->id()));
+        delete mach;
+    } else {
+        importCPAP(PROFILE.Get(mach->properties[STR_PROP_BackupPath]),tr("Please wait, importing..."));
+        if (overview) { overview->ReloadGraphs(); }
+        if (daily) {
+            daily->LoadDate(daily->getDate());
+        }
+    }
+    GenerateStatistics();
+    PROFILE.Save();
 }
 
 void MainWindow::keyPressEvent(QKeyEvent *event)

sleepyhead/mainwindow.h

@@ -257,9 +257,6 @@ class MainWindow : public QMainWindow
     //! \brief Destroy the CPAP data for the currently selected day, so it can be freshly imported again
     void on_actionPurge_Current_Day_triggered();
 
-    //! \brief Destroy ALL the CPAP data for the currently selected machine, so it can be freshly imported again
-    void on_actionAll_Data_for_current_CPAP_machine_triggered();
-
     void on_action_Sidebar_Toggle_toggled(bool arg1);
 
     void on_recordsBox_linkClicked(const QUrl &arg1);
@@ -311,6 +308,9 @@ class MainWindow : public QMainWindow
 
     void on_reportModeStandard_clicked();
 
+    void on_actionPurgeMachine(QAction *action);
+
+
 private:
     int importCPAP(const QString &path, const QString &message);
     void importCPAPBackups();
@@ -335,6 +335,13 @@ private:
     QString bookmarkFilter;
     bool m_restartRequired;
     volatile bool m_inRecalculation;
+
+    void PopulatePurgeMenu();
+
+    //! \brief Destroy ALL the CPAP data for the selected machine
+    void purgeMachine(Machine *);
+
+
 };
 
 #endif // MAINWINDOW_H

sleepyhead/mainwindow.ui

@@ -3125,18 +3125,16 @@ border-radius: 10px;
       <property name="title">
        <string>&amp;Purge CPAP Data</string>
       </property>
-      <addaction name="actionPurge_Current_Day"/>
       <addaction name="separator"/>
-      <addaction name="actionAll_Data_for_current_CPAP_machine"/>
      </widget>
      <addaction name="menu_Purge_CPAP_Data"/>
+     <addaction name="actionPurge_Current_Day"/>
     </widget>
     <addaction name="actionImport_ZEO_Data"/>
     <addaction name="actionImport_Somnopose_Data"/>
     <addaction name="actionImport_RemStar_MSeries_Data"/>
     <addaction name="separator"/>
     <addaction name="action_Rebuild_Oximetry_Index"/>
-    <addaction name="separator"/>
     <addaction name="menu_Advanced"/>
     <addaction name="separator"/>
    </widget>
@@ -3304,7 +3302,7 @@ border-radius: 10px;
   </action>
   <action name="actionPurge_Current_Day">
    <property name="text">
-    <string>&amp;Current Selected Day</string>
+    <string>Purge &amp;Current Selected Day</string>
    </property>
   </action>
   <action name="actionAll_Data_for_current_CPAP_machine">