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

HTML: Fix event value fields.

Browse source 
- The gas event values can contain o2 and he mix in gas change events.
- Give a '-' value for events that don't have any sensible values.
- Show event value if event type is heading or gaschange.

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Gehad elrobey 2014-07-26 16:29:16 +02:00 • committed by Dirk Hohndel
parent 0416a09a1e
commit bfc919b1c3
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
save-html.c
View file

@ -37,6 +37,7 @@ void put_HTML_bookmarks(struct membuffer *b, struct dive *dive)
while (ev) {
put_format(b, "{\"name\":\"%s\",", ev->name);
put_format(b, "\"value\":\"%d\",", ev->value);
put_format(b, "\"type\":\"%d\",", ev->type);
put_format(b, "\"time\":\"%d\",},", ev->time.seconds);
ev = ev->next;
}

15
theme/list_lib.js
View file

@ -769,12 +769,25 @@ function get_cylinders_HTML(dive)
return result;
}
function get_event_value(event)
{
if (event.type == 11 || event.type == 25) { // gas change
var he = event.value >> 16;
var o2 = event.value & 0xffff;
return 'He: ' + he + ' - O2: ' + o2;
}
if (event.type == 23) { // heading
event.value;
}
return '-';
}
/**
Return the HTML string for a bookmark entry in the table.
*/
function get_bookmark_HTML(event)
{
return '<tr><td class="Cyl">' + event.name + '</td><td class="Cyl">' + int_to_time(event.time) + '</td><td class="Cyl">' + event.value + '</td></tr>';
return '<tr><td class="Cyl">' + event.name + '</td><td class="Cyl">' + int_to_time(event.time) + '</td><td class="Cyl">' + get_event_value(event) + '</td></tr>';
}
/**