mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add second CSV export with dive details

Browse source 
This is intended to export all the details that someone might copy from a
paper logbook. We need a matching import template to make this simple.

This hasn't been well tested, I'm sure it will break when elements and
attributes are missing.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-12-21 17:53:18 -08:00
parent 1ba4137fec
commit 74f5842f0c
5 changed files with 135 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qt-ui/divelogexportdialog.cpp
View file

@ -272,6 +272,10 @@ void DiveLogExportDialog::on_buttonBox_accepted()
stylesheet = "xml2csv.xslt"; stylesheet = "xml2csv.xslt";
filename = QFileDialog::getSaveFileName(this, tr("Export CSV file as"), lastDir, filename = QFileDialog::getSaveFileName(this, tr("Export CSV file as"), lastDir,
tr("CSV files (*.csv *.CSV)")); tr("CSV files (*.csv *.CSV)"));
} else if (ui->exportCSVDetails->isChecked()) {
stylesheet = "xml2manualcsv.xslt";
filename = QFileDialog::getSaveFileName(this, tr("Export CSV file as"), lastDir,
tr("CSV files (*.csv *.CSV)"));
} else if (ui->exportDivelogs->isChecked()) { } else if (ui->exportDivelogs->isChecked()) {
DivelogsDeWebServices::instance()->prepareDivesForUpload(ui->exportSelected->isChecked()); DivelogsDeWebServices::instance()->prepareDivesForUpload(ui->exportSelected->isChecked());
} else if (ui->exportDiveshare->isChecked()) { } else if (ui->exportDiveshare->isChecked()) {

16
qt-ui/divelogexportdialog.ui
View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>507</width> <width>507</width>
<height>413</height> <height>423</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -166,7 +166,17 @@
<item> <item>
<widget class="QRadioButton" name="exportCSV"> <widget class="QRadioButton" name="exportCSV">
<property name="text"> <property name="text">
<string>CSV</string> <string>CSV samples</string>
</property>
<attribute name="buttonGroup">
<string notr="true">exportGroup</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="exportCSVDetails">
<property name="text">
<string>CSV dive details</string>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string notr="true">exportGroup</string> <string notr="true">exportGroup</string>
@ -440,7 +450,7 @@
</connection> </connection>
</connections> </connections>
<buttongroups> <buttongroups>
<buttongroup name="buttonGroup"/>
<buttongroup name="exportGroup"/> <buttongroup name="exportGroup"/>
<buttongroup name="buttonGroup"/>
</buttongroups> </buttongroups>
</ui> </ui>

3
save-xml.c
View file

@ -647,6 +647,9 @@ int export_dives_xslt(const char *filename, const bool selected, const char *exp
xmlDoc *transformed; xmlDoc *transformed;
int res = 0; int res = 0;
if (verbose)
fprintf(stderr, "export_dives_xslt with stylesheet %s\n", export_xslt);
if (!filename) if (!filename)
return report_error("No filename for export"); return report_error("No filename for export");

1
subsurface.qrc
View file

@ -42,6 +42,7 @@
<file>xslt/udcf.xslt</file> <file>xslt/udcf.xslt</file>
<file>xslt/uddf-export.xslt</file> <file>xslt/uddf-export.xslt</file>
<file>xslt/xml2csv.xslt</file> <file>xslt/xml2csv.xslt</file>
<file>xslt/xml2manualcsv.xslt</file>
<file>xslt/uddf.xslt</file> <file>xslt/uddf.xslt</file>
<file>xslt/sensuscsv.xslt</file> <file>xslt/sensuscsv.xslt</file>
<file>xslt/manualcsv2xml.xslt</file> <file>xslt/manualcsv2xml.xslt</file>

114
xslt/xml2manualcsv.xslt Normal file
View file

@ -0,0 +1,114 @@
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:strip-space elements="*"/>
<xsl:output method="text" encoding="UTF-8"/>
<xsl:variable name="fs">,</xsl:variable>
<xsl:template match="/divelog/dives">
<xsl:value-of select="concat('&quot;dive number&quot;', $fs, '&quot;date&quot;', $fs, '&quot;time&quot;', $fs, '&quot;duration&quot;', $fs, '&quot;maxdepth&quot;', $fs, '&quot;avgdepth&quot;', $fs, '&quot;airtemp&quot;', $fs, '&quot;watertemp&quot;', $fs, '&quot;startpressure&quot;', $fs, '&quot;endpressure&quot;', $fs, '&quot;location&quot;', $fs, '&quot;gps&quot;', $fs, '&quot;divemaster&quot;', $fs, '&quot;buddy&quot;', $fs, '&quot;suit&quot;', $fs, '&quot;rating&quot;', $fs, '&quot;visibility&quot;', $fs, '&quot;notes&quot;')"/>
<xsl:text>
</xsl:text>
<xsl:apply-templates select="dive|trip/dive"/>
</xsl:template>
<xsl:template match="dive">
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="@number"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="$fs"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="@date"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="$fs"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="@time"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="$fs"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="@duration"/>
<xsl:text>&quot;</xsl:text>
<xsl:apply-templates select="divecomputer/depth"/>
<xsl:apply-templates select="divetemperature"/>
<xsl:apply-templates select="cylinder"/>
<xsl:apply-templates select="location"/>
<xsl:apply-templates select="divemaster"/>
<xsl:apply-templates select="buddy"/>
<xsl:apply-templates select="suit"/>
<xsl:value-of select="$fs"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="@rating"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="$fs"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="@visibility"/>
<xsl:text>&quot;</xsl:text>
<xsl:apply-templates select="notes"/>
<xsl:text>
</xsl:text>
</xsl:template>
<xsl:template match="divecomputer/depth">
<xsl:value-of select="$fs"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="@max"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="$fs"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="@mean"/>
<xsl:text>&quot;</xsl:text>
</xsl:template>
<xsl:template match="divetemperature">
<xsl:value-of select="$fs"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="@air"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="$fs"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="@water"/>
<xsl:text>&quot;</xsl:text>
</xsl:template>
<xsl:template match="cylinder">
<xsl:value-of select="$fs"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="@start"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="$fs"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="@end"/>
<xsl:text>&quot;</xsl:text>
</xsl:template>
<xsl:template match="location">
<xsl:value-of select="$fs"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="."/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="$fs"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="@gps"/>
<xsl:text>&quot;</xsl:text>
</xsl:template>
<xsl:template match="divemaster">
<xsl:value-of select="$fs"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="."/>
<xsl:text>&quot;</xsl:text>
</xsl:template>
<xsl:template match="buddy">
<xsl:value-of select="$fs"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="."/>
<xsl:text>&quot;</xsl:text>
</xsl:template>
<xsl:template match="suit">
<xsl:value-of select="$fs"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="."/>
<xsl:text>&quot;</xsl:text>
</xsl:template>
<xsl:template match="notes">
<xsl:value-of select="$fs"/>
<xsl:text>&quot;</xsl:text>
<xsl:value-of select="."/>
<xsl:text>&quot;</xsl:text>
</xsl:template>
</xsl:stylesheet>