FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HTML: Add total row to yearly statistics table.

Browse Source 
Add new row to the yearly statistics table containing the total. Total
values are calculated to some columns only, it doesn't make any sense to
add the total value to other columns (Temperature cols for example).

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Gehad elrobey 2014-08-07 16:11:23 +03:00 committed by Dirk Hohndel
parent 70cfe4f9eb
commit 3ebb62f153
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
qt-ui/divelogexportdialog.cpp
View File

@ -139,6 +139,12 @@ void DiveLogExportDialog::exportHTMLstatistics(const QString &filename)
QFile file(filename);
file.open(QIODevice::WriteOnly | QIODevice::Text);
QTextStream out(&file);
stats_t total_stats;
total_stats.selection_size = 0;
total_stats.total_time.seconds = 0;
int i = 0;
out << "divestat=[";
if (ui->exportStatistics->isChecked()) {
@ -160,13 +166,37 @@ void DiveLogExportDialog::exportHTMLstatistics(const QString &filename)
out << "\"MIN_TEMP\":\"" << get_temp_units(stats_yearly[i].min_temp, NULL) << "\",";
out << "\"MAX_TEMP\":\"" << get_temp_units(stats_yearly[i].max_temp, NULL) << "\",";
out << "},";
total_stats.selection_size += stats_yearly[i].selection_size;
total_stats.total_time.seconds += stats_yearly[i].total_time.seconds;
i++;
}
}
exportHTMLstatisticsTotal(out, &total_stats);
out << "]";
file.close();
}
void exportHTMLstatisticsTotal(QTextStream &out, stats_t *total_stats)
{
out << "{";
out << "\"YEAR\":\"Total\",";
out << "\"DIVES\":\"" << total_stats->selection_size << "\",";
out << "\"TOTAL_TIME\":\"" << get_time_string(total_stats->total_time.seconds, 0) << "\",";
out << "\"AVERAGE_TIME\":\"--\",";
out << "\"SHORTEST_TIME\":\"--\",";
out << "\"LONGEST_TIME\":\"--\",";
out << "\"AVG_DEPTH\":\"--\",";
out << "\"MIN_DEPTH\":\"--\",";
out << "\"MAX_DEPTH\":\"--\",";
out << "\"AVG_SAC\":\"--\",";
out << "\"MIN_SAC\":\"--\",";
out << "\"MAX_SAC\":\"--\",";
out << "\"AVG_TEMP\":\"--\",";
out << "\"MIN_TEMP\":\"--\",";
out << "\"MAX_TEMP\":\"--\",";
out << "},";
}
void DiveLogExportDialog::on_exportGroup_buttonClicked(QAbstractButton *button)
{
showExplanation();

6
qt-ui/divelogexportdialog.h
View File

@ -2,12 +2,18 @@
#define DIVELOGEXPORTDIALOG_H
#include <QDialog>
#include <QTextStream>
#include "helpers.h"
#include "statistics.h"
class QAbstractButton;
namespace Ui {
class DiveLogExportDialog;
}
void exportHTMLstatisticsTotal(QTextStream &out, stats_t *total_stats);
class DiveLogExportDialog : public QDialog {
Q_OBJECT