mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Generate UDDF waypoints for in-between events
This patch generates a waypoint for events occurring between profile samples. It approximates the depth of the crafted waypoint linearly between the recorded sample depths. Fixes #385 Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia
Dirk Hohndel
parent
23786f0d4d
commit
683227d2aa
1 changed files with 165 additions and 71 deletions
|
|
@ -185,33 +185,132 @@
|
|||
</xsl:if>
|
||||
</informationbeforedive>
|
||||
|
||||
<!-- We get sample interval from the time between first and second
|
||||
sample to include all events in the existing samples.
|
||||
-->
|
||||
<xsl:variable name="timefirst">
|
||||
<xsl:call-template name="time2sec">
|
||||
<xsl:with-param name="time">
|
||||
<xsl:value-of select="./divecomputer[1]/sample[1]/@time"/>
|
||||
</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
</xsl:variable>
|
||||
<xsl:variable name="timesecond">
|
||||
<xsl:call-template name="time2sec">
|
||||
<xsl:with-param name="time">
|
||||
<xsl:value-of select="./divecomputer[1]/sample[2]/@time"/>
|
||||
</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
</xsl:variable>
|
||||
<xsl:variable name="delta">
|
||||
<xsl:value-of select="$timesecond - $timefirst"/>
|
||||
</xsl:variable>
|
||||
|
||||
<samples>
|
||||
<xsl:for-each select="./divecomputer[1]/sample">
|
||||
|
||||
<!-- Position of previous waypoint -->
|
||||
<xsl:variable name="position">
|
||||
<xsl:value-of select="position() - 1"/>
|
||||
</xsl:variable>
|
||||
|
||||
<!-- Times of surrounding waypoints -->
|
||||
<xsl:variable name="timefirst">
|
||||
<xsl:call-template name="time2sec">
|
||||
<xsl:with-param name="time">
|
||||
<xsl:value-of select="//sample[position() = $position]/@time"/>
|
||||
</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
</xsl:variable>
|
||||
<xsl:variable name="timesecond">
|
||||
<xsl:call-template name="time2sec">
|
||||
<xsl:with-param name="time">
|
||||
<xsl:value-of select="./@time"/>
|
||||
</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
</xsl:variable>
|
||||
|
||||
<!-- Time difference between surrounding waypoints -->
|
||||
<xsl:variable name="delta">
|
||||
<xsl:choose>
|
||||
<xsl:when test="$timefirst >= 0">
|
||||
<xsl:value-of select="$timesecond - $timefirst"/>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:value-of select="0"/>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
|
||||
<!-- Depths of surrounding waypoints -->
|
||||
<xsl:variable name="depthfirst">
|
||||
<xsl:call-template name="depth2mm">
|
||||
<xsl:with-param name="depth">
|
||||
<xsl:value-of select="//sample[position() = $position]/@depth"/>
|
||||
</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
</xsl:variable>
|
||||
<xsl:variable name="depthsecond">
|
||||
<xsl:call-template name="depth2mm">
|
||||
<xsl:with-param name="depth">
|
||||
<xsl:value-of select="./@depth"/>
|
||||
</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
</xsl:variable>
|
||||
|
||||
<!-- Approximated waypoints -->
|
||||
<xsl:variable name="timesec">
|
||||
<xsl:call-template name="time2sec">
|
||||
<xsl:with-param name="time">
|
||||
<xsl:value-of select="./@time"/>
|
||||
</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
</xsl:variable>
|
||||
|
||||
<!-- Crafting waypoints for events in-between samples -->
|
||||
<xsl:for-each select="preceding-sibling::event[substring-before(@time, ':') * 60 + substring-before(substring-after(@time, ':'), ' ')<$timesec and substring-before(@time, ':') * 60 + substring-before(substring-after(@time, ':'), ' ')>($timesec - $delta)]">
|
||||
<waypoint>
|
||||
<depth>
|
||||
<xsl:call-template name="approximatedepth">
|
||||
<xsl:with-param name="timefirst">
|
||||
<xsl:value-of select="$timefirst"/>
|
||||
</xsl:with-param>
|
||||
<xsl:with-param name="timesecond">
|
||||
<xsl:value-of select="$timesecond"/>
|
||||
</xsl:with-param>
|
||||
<xsl:with-param name="depthfirst">
|
||||
<xsl:value-of select="$depthfirst"/>
|
||||
</xsl:with-param>
|
||||
<xsl:with-param name="depthsecond">
|
||||
<xsl:value-of select="$depthsecond"/>
|
||||
</xsl:with-param>
|
||||
<xsl:with-param name="timeevent">
|
||||
<xsl:call-template name="time2sec">
|
||||
<xsl:with-param name="time">
|
||||
<xsl:value-of select="@time"/>
|
||||
</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
</depth>
|
||||
|
||||
<divetime>
|
||||
<xsl:call-template name="time2sec">
|
||||
<xsl:with-param name="time">
|
||||
<xsl:value-of select="@time"/>
|
||||
</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
</divetime>
|
||||
|
||||
<xsl:if test="@name = 'gaschange'">
|
||||
<switchmix>
|
||||
<xsl:attribute name="ref">
|
||||
<xsl:value-of select="@value"/>
|
||||
</xsl:attribute>
|
||||
</switchmix>
|
||||
</xsl:if>
|
||||
|
||||
<xsl:if test="@name = 'heading'">
|
||||
<heading>
|
||||
<xsl:value-of select="@value"/>
|
||||
</heading>
|
||||
</xsl:if>
|
||||
|
||||
<xsl:if test="not(@name = 'heading') and not(@name = 'gaschange')">
|
||||
<alarm>
|
||||
<xsl:value-of select="@name"/>
|
||||
</alarm>
|
||||
</xsl:if>
|
||||
|
||||
</waypoint>
|
||||
</xsl:for-each>
|
||||
<!-- Approximated waypoints -->
|
||||
|
||||
<!-- Recorded waypoints and events occurring at the exact same time -->
|
||||
<waypoint>
|
||||
<depth>
|
||||
<xsl:value-of select="substring-before(./@depth, ' ')"/>
|
||||
</depth>
|
||||
|
||||
<divetime>
|
||||
<xsl:call-template name="time2sec">
|
||||
<xsl:with-param name="time">
|
||||
|
|
@ -219,72 +318,43 @@
|
|||
</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
</divetime>
|
||||
|
||||
<xsl:if test="./@pressure != ''">
|
||||
<tankpressure>
|
||||
<xsl:value-of select="substring-before(./@pressure, ' ') * 100000"/>
|
||||
</tankpressure>
|
||||
</xsl:if>
|
||||
|
||||
<xsl:if test="./@temp != ''">
|
||||
<temperature>
|
||||
<xsl:value-of select="format-number(substring-before(./@temp, ' ') + 273.15, '0.00')"/>
|
||||
</temperature>
|
||||
</xsl:if>
|
||||
|
||||
<!-- We need to look up if there is an event at the time we
|
||||
are handling currently. And then translate that event
|
||||
to the one in UDDF specification.
|
||||
-->
|
||||
<xsl:variable name="time">
|
||||
<xsl:call-template name="time2sec">
|
||||
<xsl:with-param name="time">
|
||||
<xsl:value-of select="./@time"/>
|
||||
</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
<xsl:value-of select="@time"/>
|
||||
</xsl:variable>
|
||||
|
||||
<!-- Event is included in waypoint when:
|
||||
sample_time - $delta < event_time <= sample_time
|
||||
|
||||
This should include all the events that occurred
|
||||
between the samples. This also introduces inaccuracy in
|
||||
the timestamp of events, but it is either that or a
|
||||
crafted waypoint, with inaccurate depth.
|
||||
-->
|
||||
<xsl:if test="preceding-sibling::event[substring-before(@time, ':') * 60 + substring-before(substring-after(@time, ':'), ' ')<=$time and substring-before(@time, ':') * 60 + substring-before(substring-after(@time, ':'), ' ')>($time - $delta) and @name='gaschange']/@name">
|
||||
|
||||
<!-- Gas change is a reference to the gases section, as
|
||||
the gases index was pure o2 value, we can directly
|
||||
use Subsurfaces reference here.
|
||||
-->
|
||||
<xsl:for-each select="preceding-sibling::event[substring-before(@time, ':') * 60 + substring-before(substring-after(@time, ':'), ' ')<=$time and substring-before(@time, ':') * 60 + substring-before(substring-after(@time, ':'), ' ')>($time - $delta) and @name='gaschange']/@value">
|
||||
<switchmix>
|
||||
<xsl:attribute name="ref">
|
||||
<xsl:value-of select="."/>
|
||||
</xsl:attribute>
|
||||
</switchmix>
|
||||
</xsl:for-each>
|
||||
</xsl:if>
|
||||
|
||||
<xsl:if test="preceding-sibling::event[substring-before(@time, ':') * 60 + substring-before(substring-after(@time, ':'), ' ')<=$time and substring-before(@time, ':') * 60 + substring-before(substring-after(@time, ':'), ' ')>($time - $delta) and @name='heading']/@name">
|
||||
<xsl:for-each select="preceding-sibling::event[substring-before(@time, ':') * 60 + substring-before(substring-after(@time, ':'), ' ')<=$time and substring-before(@time, ':') * 60 + substring-before(substring-after(@time, ':'), ' ')>($time - $delta) and @name='heading']/@value">
|
||||
<heading>
|
||||
<xsl:for-each select="preceding-sibling::event[@time = $time and @name='gaschange']/@value">
|
||||
<switchmix>
|
||||
<xsl:attribute name="ref">
|
||||
<xsl:value-of select="."/>
|
||||
</heading>
|
||||
</xsl:for-each>
|
||||
</xsl:if>
|
||||
</xsl:attribute>
|
||||
</switchmix>
|
||||
</xsl:for-each>
|
||||
|
||||
<!-- We'll just print the alarm text from our event name
|
||||
as is, deco and surface are specified in UDDF
|
||||
specification but the rest is not recognized and
|
||||
there is no equivalent available.
|
||||
-->
|
||||
<xsl:if test="preceding-sibling::event[substring-before(@time, ':') * 60 + substring-before(substring-after(@time, ':'), ' ')<=$time and substring-before(@time, ':') * 60 + substring-before(substring-after(@time, ':'), ' ')>($time - $delta) and not(@name='heading' or @name='gaschange')]/@name">
|
||||
<xsl:for-each select="preceding-sibling::event[substring-before(@time, ':') * 60 + substring-before(substring-after(@time, ':'), ' ')<=$time and substring-before(@time, ':') * 60 + substring-before(substring-after(@time, ':'), ' ')>($time - $delta) and not(@name='heading' or @name='gaschange')]/@name">
|
||||
<alarm>
|
||||
<xsl:value-of select="."/>
|
||||
</alarm>
|
||||
</xsl:for-each>
|
||||
</xsl:if>
|
||||
<xsl:for-each select="preceding-sibling::event[@time = $time and @name='heading']/@value">
|
||||
<heading>
|
||||
<xsl:value-of select="."/>
|
||||
</heading>
|
||||
</xsl:for-each>
|
||||
|
||||
<xsl:for-each select="preceding-sibling::event[@time = $time and not(@name='heading' or @name='gaschange')]/@name">
|
||||
<alarm>
|
||||
<xsl:value-of select="."/>
|
||||
</alarm>
|
||||
</xsl:for-each>
|
||||
<!-- Recorded waypoints -->
|
||||
</waypoint>
|
||||
</xsl:for-each>
|
||||
</samples>
|
||||
|
|
@ -392,4 +462,28 @@
|
|||
|
||||
</dive>
|
||||
</xsl:template>
|
||||
|
||||
|
||||
<!-- Approximate waypoint depth.
|
||||
Parameters:
|
||||
timefirst Time of the previous waypoint in seconds
|
||||
timesecond Time of the current waypoint in seconds
|
||||
depthfirst Depth of the first waypoint in mm
|
||||
depthsecond Depth of the second waypoint in mm
|
||||
timeevent Time of the event
|
||||
|
||||
Returns: Depth approximation of event in m
|
||||
-->
|
||||
|
||||
<xsl:template name="approximatedepth">
|
||||
<xsl:param name="timefirst"/>
|
||||
<xsl:param name="timesecond"/>
|
||||
<xsl:param name="depthfirst"/>
|
||||
<xsl:param name="depthsecond"/>
|
||||
<xsl:param name="timeevent"/>
|
||||
|
||||
<xsl:value-of select="format-number((($timeevent - $timefirst) div ($timesecond - $timefirst) * ($depthsecond - $depthfirst) + $depthfirst) div 1000, '#.##')"/>
|
||||
|
||||
</xsl:template>
|
||||
|
||||
</xsl:stylesheet>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue