Support for Imperial units on MacDive log import

The cylinder size is treated as metric as the samples received indicate
it would be so.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2013-02-07 21:20:03 +02:00 committed by Dirk Hohndel
parent 3150c1a6e8
commit b85d5a36fc

View file

@ -114,12 +114,18 @@
</xsl:if> </xsl:if>
<xsl:if test="pressureStart != ''"> <xsl:if test="pressureStart != ''">
<xsl:attribute name="start"> <xsl:attribute name="start">
<xsl:value-of select="concat(pressureStart, ' bar')"/> <xsl:call-template name="pressureConvert">
<xsl:with-param name="number" select="pressureStart"/>
<xsl:with-param name="units" select="$units"/>
</xsl:call-template>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:if test="pressureEnd != ''"> <xsl:if test="pressureEnd != ''">
<xsl:attribute name="end"> <xsl:attribute name="end">
<xsl:value-of select="concat(pressureEnd, ' bar')"/> <xsl:call-template name="pressureConvert">
<xsl:with-param name="number" select="pressureEnd"/>
<xsl:with-param name="units" select="$units"/>
</xsl:call-template>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:if test="tankSize != ''"> <xsl:if test="tankSize != ''">
@ -129,7 +135,10 @@
</xsl:if> </xsl:if>
<xsl:if test="workingPressure != ''"> <xsl:if test="workingPressure != ''">
<xsl:attribute name="workpressure"> <xsl:attribute name="workpressure">
<xsl:value-of select="concat(workingPressure, ' bar')"/> <xsl:call-template name="pressureConvert">
<xsl:with-param name="number" select="workingPressure"/>
<xsl:with-param name="units" select="$units"/>
</xsl:call-template>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
</cylinder> </cylinder>
@ -242,6 +251,22 @@
</dive> </dive>
</xsl:template> </xsl:template>
<!-- convert pressure to bars -->
<xsl:template name="pressureConvert">
<xsl:param name="number"/>
<xsl:param name="units"/>
<xsl:choose>
<xsl:when test="$units = 'Imperial'">
<xsl:value-of select="concat(round($number div 14.5037738007), ' bar')"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="concat($number, ' bar')"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<!-- end convert pressure -->
<!-- convert time in seconds to minutes:seconds --> <!-- convert time in seconds to minutes:seconds -->
<xsl:template name="timeConvert"> <xsl:template name="timeConvert">
<xsl:param name="timeSec"/> <xsl:param name="timeSec"/>