mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow unit selection on known CSV import

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 2014-12-30 17:02:42 +02:00 committed by Dirk Hohndel
parent 37b8257e09
commit 3416278da4
2 changed files with 56 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt-ui/divelogimportdialog.cpp
View file

@ -162,10 +162,8 @@ void DiveLogImportDialog::on_knownImports_currentIndexChanged(int index)
{ {
if (specialCSV.contains(index)) { if (specialCSV.contains(index)) {
ui->groupBox_3->setEnabled(false); ui->groupBox_3->setEnabled(false);
ui->CSVUnits->setEnabled(false);
} else { } else {
ui->groupBox_3->setEnabled(true); ui->groupBox_3->setEnabled(true);
ui->CSVUnits->setEnabled(true);
} }
if (index == 0) if (index == 0)
return; return;

63
xslt/subsurfacecsv.xslt
View file

@ -124,12 +124,26 @@
</xsl:variable> </xsl:variable>
<xsl:if test="$max != ''"> <xsl:if test="$max != ''">
<xsl:attribute name="max"> <xsl:attribute name="max">
<xsl:value-of select="$max"/> <xsl:choose>
<xsl:when test="$units = 0">
<xsl:value-of select="$max"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="concat(format-number((substring-before($max, ' ') * 0.3048), '#.##'), ' m')"/>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:if test="$mean != ''"> <xsl:if test="$mean != ''">
<xsl:attribute name="mean"> <xsl:attribute name="mean">
<xsl:value-of select="$mean"/> <xsl:choose>
<xsl:when test="$units = 0">
<xsl:value-of select="$mean"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="concat(format-number((substring-before($mean, ' ') * 0.3048), '#.##'), ' m')"/>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
</depth> </depth>
@ -149,12 +163,26 @@
</xsl:variable> </xsl:variable>
<xsl:if test="$air != ''"> <xsl:if test="$air != ''">
<xsl:attribute name="air"> <xsl:attribute name="air">
<xsl:value-of select="$air"/> <xsl:choose>
<xsl:when test="$units = 0">
<xsl:value-of select="$air"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="concat(format-number((substring-before($air, ' ') - 32) * 5 div 9, '0.0'), ' C')"/>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:if test="$water != ''"> <xsl:if test="$water != ''">
<xsl:attribute name="water"> <xsl:attribute name="water">
<xsl:value-of select="$water"/> <xsl:choose>
<xsl:when test="$units = 0">
<xsl:value-of select="$water"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="concat(format-number((substring-before($water, ' ') - 32) * 5 div 9, '0.0'), ' C')"/>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
</divetemperature> </divetemperature>
@ -197,12 +225,26 @@
</xsl:if> </xsl:if>
<xsl:if test="$start != ''"> <xsl:if test="$start != ''">
<xsl:attribute name="start"> <xsl:attribute name="start">
<xsl:value-of select="$start"/> <xsl:choose>
<xsl:when test="$units = 0">
<xsl:value-of select="$start"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="concat(format-number((substring-before($start, ' ') div 14.5037738007), '#'), ' bar')"/>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:if test="$end != ''"> <xsl:if test="$end != ''">
<xsl:attribute name="end"> <xsl:attribute name="end">
<xsl:value-of select="$end"/> <xsl:choose>
<xsl:when test="$units = 0">
<xsl:value-of select="$end"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="concat(format-number((substring-before($end, ' ') div 14.5037738007), '#'), ' bar')"/>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:if test="$o2 != ''"> <xsl:if test="$o2 != ''">
@ -297,7 +339,14 @@
<xsl:if test="$weight != ''"> <xsl:if test="$weight != ''">
<weightsystem description="unknown"> <weightsystem description="unknown">
<xsl:attribute name="weight"> <xsl:attribute name="weight">
<xsl:value-of select="$weight"/> <xsl:choose>
<xsl:when test="$units = 0">
<xsl:value-of select="$weight"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="concat(format-number((substring-before($weight, ' ') * 0.453592), '#.##'), ' kg')"/>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute> </xsl:attribute>
</weightsystem> </weightsystem>
</xsl:if> </xsl:if>