Fix Purge Current CPAP Day not removing files correctly

sleepyhead/SleepLib/session.cpp

@@ -119,15 +119,18 @@ bool Session::OpenEvents()
 
 bool Session::Destroy()
 {
-    QString path = s_machine->getDataPath();
+    QDir dir;
-
-    QDir dir(path);
     QString base;
     base.sprintf("%08lx", s_session);
-    base = path + "/" + base;
 
-    dir.remove(base + ".000");
+    QString summaryfile = s_machine->getSummariesPath() + base + ".000";
-    dir.remove(base + ".001");
+    QString eventfile = s_machine->getEventsPath() + base + ".001";
+    if (!dir.remove(summaryfile)) {
+        qDebug() << "Could not delete" << summaryfile;
+    }
+    if (!dir.remove(eventfile)) {
+        qDebug() << "Could not delete" << eventfile;
+    }
 
     return s_machine->unlinkSession(this); //!dir.exists(base + ".000") && !dir.exists(base + ".001");
 }

sleepyhead/mainwindow.cpp

@@ -2039,6 +2039,11 @@ void MainWindow::on_actionPurge_Current_Day_triggered()
             impfile.close();
         }
 
+        QFile rxcache(p_profile->Get("{" + STR_GEN_DataFolder + "}/RXChanges.cache" ));
+        rxcache.remove();
+
+        QFile sumfile(cpap->getDataPath()+"Summaries.xml.gz");
+        sumfile.remove();
 
 //        m->day.erase(m->day.find(date));
 
@@ -2047,6 +2052,7 @@ void MainWindow::on_actionPurge_Current_Day_triggered()
             sess->Destroy();
             delete sess;
         }
+
     }
     day = p_profile->GetDay(date, MT_CPAP);
 

sleepyhead/reports.cpp

@@ -1,6 +1,6 @@
 /* Reports/Printing Module
  *
- * Copyright (c) 2011 Mark Watkins <jedimark@users.sourceforge.net>
+ * Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License. See the file COPYING in the main directory of the Linux
@@ -9,8 +9,6 @@
 #include <QMessageBox>
 #include <QtPrintSupport/qprinter.h>
 #include <QtPrintSupport/qprintdialog.h>
-// #include <QPrinter>
-//#include <QPrintDialog>
 #include <QTextDocument>
 #include <QProgressBar>
 #include <QApplication>
@@ -55,7 +53,8 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
 
             if (book_start.size() > 0) {
                 if (QMessageBox::question(mainwin, STR_TR_Bookmarks,
-                                          QObject::tr("Would you like to show bookmarked areas in this report?"), QMessageBox::Yes,
+                                          QObject::tr("Would you like to show bookmarked areas in this report?"),
+                                          QMessageBox::Yes,
                                           QMessageBox::No) == QMessageBox::Yes) {
                     print_bookmarks = true;
                 }
@@ -193,9 +192,6 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
             QString submodel;
             cpapinfo += STR_TR_Machine + ": ";
 
-//            if (cpap->machine->properties.find(STR_PROP_SubModel) != cpap->machine->properties.end()) {
-//                submodel = "\n" + cpap->machine->info.modeproperties[STR_PROP_SubModel];
-//            }
 
             cpapinfo += cpap->brand() + " " + cpap->series() + " " + cpap->model() + submodel + "\n";
 
@@ -240,8 +236,7 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
                 stats = QObject::tr("AHI\t%1\n").arg(ahi, 0, 'f', 2);
             }
 
-            QRectF bounds = painter.boundingRect(QRectF(0, 0, virt_width, 0), stats,
+            QRectF bounds = painter.boundingRect(QRectF(0, 0, virt_width, 0), stats, QTextOption(Qt::AlignRight));
-                                                 QTextOption(Qt::AlignRight));
             painter.drawText(bounds, stats, QTextOption(Qt::AlignRight));
 
 
@@ -281,8 +276,8 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
             } else if (cpap->loaderName() == STR_MACH_ResMed) {
                 stats += QObject::tr("UAI=%1 ").arg(uai, 0, 'f', 2);
             } else if (cpap->loaderName() == STR_MACH_Intellipap) {
-                stats += QObject::tr("NRI=%1 LKI=%2 EPI=%3").arg(nri, 0, 'f', 2).arg(lki, 0, 'f', 2).arg(exp, 0,
+                stats += QObject::tr("NRI=%1 LKI=%2 EPI=%3")
-                         'f', 2);
+                        .arg(nri, 0, 'f', 2).arg(lki, 0, 'f', 2).arg(exp, 0,'f', 2);
             }
 
             bounds = painter.boundingRect(QRectF(0, top + ttop, virt_width, 0), stats,
@@ -294,17 +289,18 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
                 stats = "";
 
                 if (journal->settings.contains(Journal_Weight)) {
-                    stats += STR_TR_Weight + QString(" %1 ").arg(weightString(
+                    stats += STR_TR_Weight + QString(" %1 ").
-                                 journal->settings[Journal_Weight].toDouble()));
+                            arg(weightString(journal->settings[Journal_Weight].toDouble()));
                 }
 
                 if (journal->settings.contains(Journal_BMI)) {
-                    stats += STR_TR_BMI + QString(" %1 ").arg(journal->settings[Journal_BMI].toDouble(), 0, 'f', 2);
+                    stats += STR_TR_BMI + QString(" %1 ").
+                            arg(journal->settings[Journal_BMI].toDouble(), 0, 'f', 2);
                 }
 
                 if (journal->settings.contains(Journal_ZombieMeter)) {
-                    stats += STR_TR_Zombie + QString(" %1/10 ").arg(journal->settings[Journal_ZombieMeter].toDouble(),
+                    stats += STR_TR_Zombie + QString(" %1/10 ").
-                             0, 'f', 0);
+                            arg(journal->settings[Journal_ZombieMeter].toDouble(), 0, 'f', 0);
                 }
 
                 if (!stats.isEmpty()) {
@@ -349,8 +345,9 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
     } else if (name == STR_TR_Overview) {
         QDateTime first = QDateTime::fromTime_t((*gv)[0]->min_x / 1000L);
         QDateTime last = QDateTime::fromTime_t((*gv)[0]->max_x / 1000L);
-        QString ovinfo = QObject::tr("Reporting from %1 to %2").arg(first.date().toString(
+        QString ovinfo = QObject::tr("Reporting from %1 to %2").
-                             Qt::SystemLocaleShortDate)).arg(last.date().toString(Qt::SystemLocaleShortDate));
+                arg(first.date().toString(Qt::SystemLocaleShortDate)).
+                arg(last.date().toString(Qt::SystemLocaleShortDate));
         QRectF bounds = painter.boundingRect(QRectF(0, top, virt_width, 0), ovinfo,
                                              QTextOption(Qt::AlignHCenter));
         painter.drawText(bounds, ovinfo, QTextOption(Qt::AlignHCenter));