mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
Multi cylinder support for CSV export
Fixes #2830 Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
This commit is contained in:
Miika Turkia
Dirk Hohndel
parent
19cdab52b3
commit
889f36a57c
1 changed files with 92 additions and 84 deletions
|
|
@ -38,17 +38,19 @@
|
||||||
$fs)"/>
|
$fs)"/>
|
||||||
|
|
||||||
<!-- Print cylinder info according to the amount of cylinders in dive -->
|
<!-- Print cylinder info according to the amount of cylinders in dive -->
|
||||||
<xsl:value-of select="concat(
|
<xsl:for-each select="dive/cylinder">
|
||||||
'"cylinder size (cuft)"',
|
<xsl:value-of select="concat(
|
||||||
$fs,
|
'"cylinder size (cuft)"',
|
||||||
'"startpressure (psi)"',
|
$fs,
|
||||||
$fs,
|
'"startpressure (psi)"',
|
||||||
'"endpressure (psi)"',
|
$fs,
|
||||||
$fs,
|
'"endpressure (psi)"',
|
||||||
'"o2 (%)"',
|
$fs,
|
||||||
$fs,
|
'"o2 (%)"',
|
||||||
'"he (%)"',
|
$fs,
|
||||||
$fs)"/>
|
'"he (%)"',
|
||||||
|
$fs)"/>
|
||||||
|
</xsl:for-each>
|
||||||
|
|
||||||
<!-- Print rest of the header -->
|
<!-- Print rest of the header -->
|
||||||
<xsl:value-of select="concat(
|
<xsl:value-of select="concat(
|
||||||
|
|
@ -98,17 +100,19 @@
|
||||||
$fs)"/>
|
$fs)"/>
|
||||||
|
|
||||||
<!-- Print cylinder info according to the amount of cylinders in dive -->
|
<!-- Print cylinder info according to the amount of cylinders in dive -->
|
||||||
<xsl:value-of select="concat(
|
<xsl:for-each select="dive/cylinder">
|
||||||
'"cylinder size (l)"',
|
<xsl:value-of select="concat(
|
||||||
$fs,
|
'"cylinder size (l)"',
|
||||||
'"startpressure (bar)"',
|
$fs,
|
||||||
$fs,
|
'"startpressure (bar)"',
|
||||||
'"endpressure (bar)"',
|
$fs,
|
||||||
$fs,
|
'"endpressure (bar)"',
|
||||||
'"o2 (%)"',
|
$fs,
|
||||||
$fs,
|
'"o2 (%)"',
|
||||||
'"he (%)"',
|
$fs,
|
||||||
$fs)"/>
|
'"he (%)"',
|
||||||
|
$fs)"/>
|
||||||
|
</xsl:for-each>
|
||||||
|
|
||||||
<!-- Print rest of the header -->
|
<!-- Print rest of the header -->
|
||||||
<xsl:value-of select="concat(
|
<xsl:value-of select="concat(
|
||||||
|
|
@ -225,68 +229,71 @@
|
||||||
</xsl:otherwise>
|
</xsl:otherwise>
|
||||||
</xsl:choose>
|
</xsl:choose>
|
||||||
|
|
||||||
<xsl:choose>
|
<xsl:for-each select="cylinder">
|
||||||
<xsl:when test="cylinder[1]/@start|cylinder[1]/@end != ''">
|
<xsl:choose>
|
||||||
<xsl:apply-templates select="cylinder[1]"/>
|
<xsl:when test="@start|@end != ''">
|
||||||
</xsl:when>
|
<xsl:apply-templates select="."/>
|
||||||
<xsl:otherwise>
|
</xsl:when>
|
||||||
<xsl:value-of select="$fs"/>
|
<xsl:otherwise>
|
||||||
<xsl:text>"</xsl:text>
|
<xsl:value-of select="$fs"/>
|
||||||
<xsl:choose>
|
<xsl:text>"</xsl:text>
|
||||||
<xsl:when test="$units = 1">
|
<xsl:choose>
|
||||||
<xsl:value-of select="concat(format-number((substring-before(cylinder[1]/@size, ' ') div 14.7 * 3000) * 0.035315, '#.#'), '')"/>
|
<xsl:when test="$units = 1">
|
||||||
</xsl:when>
|
<xsl:value-of select="concat(format-number((substring-before(@size, ' ') div 14.7 * 3000) * 0.035315, '#.#'), '')"/>
|
||||||
<xsl:otherwise>
|
</xsl:when>
|
||||||
<xsl:value-of select="substring-before(cylinder[1]/@size, ' ')"/>
|
<xsl:otherwise>
|
||||||
</xsl:otherwise>
|
<xsl:value-of select="substring-before(@size, ' ')"/>
|
||||||
</xsl:choose>
|
</xsl:otherwise>
|
||||||
<xsl:text>"</xsl:text>
|
</xsl:choose>
|
||||||
<xsl:value-of select="$fs"/>
|
<xsl:text>"</xsl:text>
|
||||||
<xsl:text>"</xsl:text>
|
<xsl:value-of select="$fs"/>
|
||||||
<xsl:choose>
|
<xsl:text>"</xsl:text>
|
||||||
<xsl:when test="$units = 1">
|
<xsl:choose>
|
||||||
<xsl:choose>
|
<xsl:when test="$units = 1">
|
||||||
<xsl:when test="substring-before(divecomputer[1]/sample[@pressure]/@pressure, ' ') > 0">
|
<xsl:choose>
|
||||||
<xsl:value-of select="concat(format-number((substring-before(divecomputer[1]/sample[@pressure]/@pressure, ' ') * 14.5037738007), '#'), '')"/>
|
<xsl:when test="substring-before(../divecomputer[1]/sample[@pressure]/@pressure, ' ') > 0">
|
||||||
</xsl:when>
|
<xsl:value-of select="concat(format-number((substring-before(../divecomputer[1]/sample[@pressure]/@pressure, ' ') * 14.5037738007), '#'), '')"/>
|
||||||
<xsl:otherwise>
|
</xsl:when>
|
||||||
<xsl:value-of select="''"/>
|
<xsl:otherwise>
|
||||||
</xsl:otherwise>
|
<xsl:value-of select="''"/>
|
||||||
</xsl:choose>
|
</xsl:otherwise>
|
||||||
</xsl:when>
|
</xsl:choose>
|
||||||
<xsl:otherwise>
|
</xsl:when>
|
||||||
<xsl:value-of select="substring-before(divecomputer[1]/sample[@pressure]/@pressure, ' ')"/>
|
<xsl:otherwise>
|
||||||
</xsl:otherwise>
|
<xsl:value-of select="substring-before(../divecomputer[1]/sample[@pressure]/@pressure, ' ')"/>
|
||||||
</xsl:choose>
|
</xsl:otherwise>
|
||||||
<xsl:text>"</xsl:text>
|
</xsl:choose>
|
||||||
<xsl:value-of select="$fs"/>
|
<xsl:text>"</xsl:text>
|
||||||
<xsl:text>"</xsl:text>
|
<xsl:value-of select="$fs"/>
|
||||||
<xsl:choose>
|
<xsl:text>"</xsl:text>
|
||||||
<xsl:when test="$units = 1">
|
<xsl:choose>
|
||||||
<xsl:choose>
|
<xsl:when test="$units = 1">
|
||||||
<xsl:when test="substring-before(divecomputer[1]/sample[@pressure][last()]/@pressure, ' ') > 0">
|
<xsl:choose>
|
||||||
<xsl:value-of select="concat(format-number((substring-before(divecomputer[1]/sample[@pressure][last()]/@pressure, ' ') * 14.5037738007), '#'), '')"/>
|
<xsl:when test="substring-before(../divecomputer[1]/sample[@pressure][last()]/@pressure, ' ') > 0">
|
||||||
</xsl:when>
|
<xsl:value-of select="concat(format-number((substring-before(../divecomputer[1]/sample[@pressure][last()]/@pressure, ' ') * 14.5037738007), '#'), '')"/>
|
||||||
<xsl:otherwise>
|
</xsl:when>
|
||||||
<xsl:value-of select="''"/>
|
<xsl:otherwise>
|
||||||
</xsl:otherwise>
|
<xsl:value-of select="''"/>
|
||||||
</xsl:choose>
|
</xsl:otherwise>
|
||||||
</xsl:when>
|
</xsl:choose>
|
||||||
<xsl:otherwise>
|
</xsl:when>
|
||||||
<xsl:value-of select="substring-before(divecomputer[1]/sample[@pressure][last()]/@pressure, ' ')"/>
|
<xsl:otherwise>
|
||||||
</xsl:otherwise>
|
<xsl:value-of select="substring-before(../divecomputer[1]/sample[@pressure][last()]/@pressure, ' ')"/>
|
||||||
</xsl:choose>
|
</xsl:otherwise>
|
||||||
<xsl:text>"</xsl:text>
|
</xsl:choose>
|
||||||
<xsl:value-of select="$fs"/>
|
<xsl:text>"</xsl:text>
|
||||||
<xsl:text>"</xsl:text>
|
<xsl:value-of select="$fs"/>
|
||||||
<xsl:value-of select="substring-before(cylinder[1]/@o2, '%')"/>
|
<xsl:text>"</xsl:text>
|
||||||
<xsl:text>"</xsl:text>
|
<xsl:value-of select="substring-before(@o2, '%')"/>
|
||||||
<xsl:value-of select="$fs"/>
|
<xsl:text>"</xsl:text>
|
||||||
<xsl:text>"</xsl:text>
|
<xsl:value-of select="$fs"/>
|
||||||
<xsl:value-of select="substring-before(cylinder[1]/@he, '%')"/>
|
<xsl:text>"</xsl:text>
|
||||||
<xsl:text>"</xsl:text>
|
<xsl:value-of select="substring-before(@he, '%')"/>
|
||||||
</xsl:otherwise>
|
<xsl:text>"</xsl:text>
|
||||||
</xsl:choose>
|
</xsl:otherwise>
|
||||||
|
</xsl:choose>
|
||||||
|
</xsl:for-each>
|
||||||
|
|
||||||
<xsl:choose>
|
<xsl:choose>
|
||||||
<!-- Old location format -->
|
<!-- Old location format -->
|
||||||
<xsl:when test="location != ''">
|
<xsl:when test="location != ''">
|
||||||
|
|
@ -469,6 +476,7 @@
|
||||||
<xsl:value-of select="substring-before(@he, '%')"/>
|
<xsl:value-of select="substring-before(@he, '%')"/>
|
||||||
<xsl:text>"</xsl:text>
|
<xsl:text>"</xsl:text>
|
||||||
</xsl:template>
|
</xsl:template>
|
||||||
|
|
||||||
<xsl:template match="location">
|
<xsl:template match="location">
|
||||||
<xsl:value-of select="$fs"/>
|
<xsl:value-of select="$fs"/>
|
||||||
<xsl:text>"</xsl:text>
|
<xsl:text>"</xsl:text>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue