From 74a8492e9bc5bb5650f554e69f6796e4931a98a5 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Tue, 15 Nov 2011 11:48:52 +1000
Subject: [PATCH 1/2] Fix: ExportCSV wasn't writing individual sessions
---
exportcsv.cpp | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/exportcsv.cpp b/exportcsv.cpp
index fbe32b6d..4793d88f 100644
--- a/exportcsv.cpp
+++ b/exportcsv.cpp
@@ -2,6 +2,7 @@
#include <QLocale>
#include <QMessageBox>
#include <QCalendarWidget>
+#include <QTextCharFormat>
#include "SleepLib/profiles.h"
#include "SleepLib/day.h"
#include "exportcsv.h"
@@ -194,15 +195,15 @@ void ExportCSV::on_exportButton_clicked()
float ahi=sess->count(CPAP_Obstructive)+sess->count(CPAP_Hypopnea)+sess->count(CPAP_Apnea)+sess->count(CPAP_ClearAirway);
ahi/=sess->hours();
data+=sep+QString::number(ahi,'f',3);
- for (int i=0;i<countlist.size();i++)
- data+=sep+QString::number(sess->count(countlist.at(i)));
- for (int i=0;i<avglist.size();i++)
- data+=sep+QString::number(day->wavg(avglist.at(i)));
- for (int i=0;i<p90list.size();i++)
- data+=sep+QString::number(day->p90(p90list.at(i)));
+ for (int j=0;j<countlist.size();j++)
+ data+=sep+QString::number(sess->count(countlist.at(j)));
+ for (int j=0;j<avglist.size();j++)
+ data+=sep+QString::number(day->wavg(avglist.at(j)));
+ for (int j=0;j<p90list.size();j++)
+ data+=sep+QString::number(day->p90(p90list.at(j)));
+ data+=newline;
+ file.write(data.toAscii());
}
- data+=newline;
- file.write(data.toAscii());
} else if (ui->rb1_details->isChecked()) {
QStringList all=countlist;
all.append(avglist);
From 1534fe50bd1a68cfd9fcf598cb78268c2d5faf63 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Tue, 15 Nov 2011 12:14:44 +1000
Subject: [PATCH 2/2] Help About fix for missing windows revision, Changed
export Summary to Daily
---
exportcsv.ui | 2 +-
mainwindow.cpp | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/exportcsv.ui b/exportcsv.ui
index 970292e9..85626d11 100644
--- a/exportcsv.ui
+++ b/exportcsv.ui
@@ -53,7 +53,7 @@
<item>
<widget class="QRadioButton" name="rb1_Summary">
<property name="text">
- <string>Summary</string>
+ <string>Daily</string>
</property>
<property name="checked">
<bool>true</bool>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index d9920b1f..433f04cc 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -343,12 +343,15 @@ void MainWindow::on_webView_loadProgress(int progress)
void MainWindow::on_action_About_triggered()
{
- QString msg=tr("<html><body><div align='center'><h2>SleepyHead v%1.%2.%3</h2>Build Date: %4 %5<br/>Revision: %6<hr>"
+ QString gitrev=QString(GIT_REVISION);
+ if (!gitrev.isEmpty()) gitrev="Revision: "+gitrev;
+
+ QString msg=tr("<html><body><div align='center'><h2>SleepyHead v%1.%2.%3</h2>Build Date: %4 %5<br/>%6<hr>"
"Copyright ©2011 Mark Watkins (jedimark) <br> \n"
"<a href='http://sleepyhead.sourceforge.net'>http://sleepyhead.sourceforge.net</a> <hr>"
"This software is released under the GNU Public License <br>"
"<i>This software comes with absolutely no warranty, either express of implied. It comes with no guarantee of fitness for any particular purpose. No guarantees are made regarding the accuracy of any data this program displays."
- "</div></body></html>").arg(major_version).arg(minor_version).arg(revision_number).arg(__DATE__).arg(__TIME__).arg(GIT_REVISION);
+ "</div></body></html>").arg(major_version).arg(minor_version).arg(revision_number).arg(__DATE__).arg(__TIME__).arg(gitrev);
QMessageBox msgbox(QMessageBox::Information,tr("About SleepyHead"),"",QMessageBox::Ok,this);
msgbox.setTextFormat(Qt::RichText);
msgbox.setText(msg);