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

CSV import: import dive number if defined

Browse source 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2016-05-02 20:11:37 +03:00 • committed by Dirk Hohndel
parent 7ec83ef02a
commit 304af311f0
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
desktop-widgets/divelogimportdialog.cpp
View file

@ -724,6 +724,8 @@ int DiveLogImportDialog::setup_csv_params(QStringList r, char **params, int pnr)
params[pnr++] = intdup(ui->DateFormat->currentIndex()); params[pnr++] = intdup(ui->DateFormat->currentIndex());
params[pnr++] = strdup("starttimeField"); params[pnr++] = strdup("starttimeField");
params[pnr++] = intdup(r.indexOf(tr("Time"))); params[pnr++] = intdup(r.indexOf(tr("Time")));
params[pnr++] = strdup("numberField");
params[pnr++] = intdup(r.indexOf(tr("Dive #")));
params[pnr++] = strdup("timeField"); params[pnr++] = strdup("timeField");
params[pnr++] = intdup(r.indexOf(tr("Sample time"))); params[pnr++] = intdup(r.indexOf(tr("Sample time")));
params[pnr++] = strdup("depthField"); params[pnr++] = strdup("depthField");
@ -825,7 +827,7 @@ void DiveLogImportDialog::on_buttonBox_accepted()
sample->tts.seconds *= 60; sample->tts.seconds *= 60;
} }
} else { } else {
char *params[45]; char *params[47];
int pnr = 0; int pnr = 0;
pnr = setup_csv_params(r, params, pnr); pnr = setup_csv_params(r, params, pnr);
@ -892,7 +894,7 @@ void DiveLogImportDialog::on_buttonBox_accepted()
parse_manual_file(fileNames[i].toUtf8().data(), params, pnr - 1); parse_manual_file(fileNames[i].toUtf8().data(), params, pnr - 1);
} else { } else {
char *params[45]; char *params[47];
int pnr = 0; int pnr = 0;
pnr = setup_csv_params(r, params, pnr); pnr = setup_csv_params(r, params, pnr);

9
xslt/csv2xml.xslt
View file

@ -101,6 +101,15 @@
</xsl:choose> </xsl:choose>
</xsl:attribute> </xsl:attribute>
<xsl:if test="$numberField >= 0">
<xsl:attribute name="number">
<xsl:call-template name="getFieldByIndex">
<xsl:with-param name="index" select="$numberField"/>
<xsl:with-param name="line" select="substring-after(substring-after(., $lf), $lf)"/>
</xsl:call-template>
</xsl:attribute>
</xsl:if>
<!-- If the dive is CCR, create oxygen and diluent cylinders --> <!-- If the dive is CCR, create oxygen and diluent cylinders -->
<xsl:if test="$po2Field >= 0 or $setpointField >= 0 or $o2sensor1Field >= 0 or $o2sensor2Field >= 0 or $o2sensor3Field >= 0"> <xsl:if test="$po2Field >= 0 or $setpointField >= 0 or $o2sensor1Field >= 0 or $o2sensor2Field >= 0 or $o2sensor3Field >= 0">