From dc157c26572e9a2c5344ffe7fa4d9cee3461f5aa Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Tue, 15 Nov 2011 17:53:22 +1000
Subject: [PATCH] Fix for Daily export trashing open records, plus added
 progress bar to export process

---
 daily.h       |  1 +
 exportcsv.cpp | 13 ++++++++++++-
 exportcsv.ui  |  9 ++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/daily.h b/daily.h
index 8674a27c..c3c45b07 100644
--- a/daily.h
+++ b/daily.h
@@ -42,6 +42,7 @@ public:
     gGraphView *SharedWidget() { return GraphView; }
     void RedrawGraphs();
     void LoadDate(QDate date);
+    QDate getDate() { return previous_date; }
 private slots:
 
     void on_calendar_currentPageChanged(int year, int month);
diff --git a/exportcsv.cpp b/exportcsv.cpp
index 722f6187..7002f185 100644
--- a/exportcsv.cpp
+++ b/exportcsv.cpp
@@ -7,6 +7,9 @@
 #include "SleepLib/day.h"
 #include "exportcsv.h"
 #include "ui_exportcsv.h"
+#include "mainwindow.h"
+
+extern MainWindow *mainwin;
 
 ExportCSV::ExportCSV(QWidget *parent) :
     QDialog(parent),
@@ -160,7 +163,14 @@ void ExportCSV::on_exportButton_clicked()
     header+=newline;
     file.write(header.toAscii());
     QDate date=ui->startDate->date();
+    Daily *daily=mainwin->getDaily();
+    QDate daily_date=daily->getDate();
+
+    ui->progressBar->setValue(0);
+    ui->progressBar->setMaximum(PROFILE.daylist.count());
+
     do {
+        ui->progressBar->setValue(ui->progressBar->value()+1);
         Day *day=PROFILE.GetDay(date,MT_CPAP);
         if (day) {
             QString data;
@@ -241,7 +251,8 @@ void ExportCSV::on_exportButton_clicked()
                             }
                         }
                     }
-                    sess->TrashEvents();
+                    if (daily_date!=date)
+                        sess->TrashEvents();
                 }
             }
         }
diff --git a/exportcsv.ui b/exportcsv.ui
index 85626d11..9be98a71 100644
--- a/exportcsv.ui
+++ b/exportcsv.ui
@@ -82,7 +82,7 @@
      </property>
     </widget>
    </item>
-   <item row="11" column="0" colspan="2">
+   <item row="12" column="0" colspan="2">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <spacer name="horizontalSpacer">
@@ -260,6 +260,13 @@
      </property>
     </spacer>
    </item>
+   <item row="11" column="0" colspan="2">
+    <widget class="QProgressBar" name="progressBar">
+     <property name="value">
+      <number>24</number>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>