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: add events to detailed profile view

Browse source 
Export events to detailed dive view and add events to the profile.
Events names must appear on mouse hover.

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-04 14:37:08 +03:00 • committed by Dirk Hohndel
parent f7f8c0b1b2
commit 11d2364c12
2 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
save-html.c
View file

@ -17,7 +17,7 @@ void put_HTML_bookmarks(struct membuffer *b, struct dive *dive)
put_string(b, "\"events\":["); put_string(b, "\"events\":[");
while (ev) { while (ev) {
put_format(b, "{\"name\":\"%s\",", ev->name); put_format(b, "{\"name\":\"%s\",", ev->name);
put_format(b, "\"time\":\"%d:%02d min\",},", FRACTION(ev->time.seconds, 60)); put_format(b, "\"time\":\"%d\",},", ev->time.seconds);
ev = ev->next; ev = ev->next;
} }
put_string(b, "],"); put_string(b, "],");

35
theme/list_lib.js
View file

@ -822,7 +822,7 @@ Return the HTML string for a bookmark entry in the table.
*/ */
function get_bookmark_HTML(event) function get_bookmark_HTML(event)
{ {
return '<tr><td class="Cyl">' + event.name + '</td><td class="Cyl">' + event.time + '</td></tr>'; return '<tr><td class="Cyl">' + event.name + '</td><td class="Cyl">' + int_to_time(event.time) + '</td></tr>';
} }
/** /**
@ -878,6 +878,14 @@ function mm_to_meter(mm)
return mm / (1000); return mm / (1000);
} }
function format_two_digit(n){
return n > 9 ? "" + n: "0" + n;
}
function int_to_time (n){
return Math.floor((n) /60) +":"+ format_two_digit((n) % (60))+" min";
}
var plot1; var plot1;
/** /**
@ -889,6 +897,7 @@ function canvas_draw()
document.getElementById("chart1").innerHTML = ""; document.getElementById("chart1").innerHTML = "";
var d1 = new Array(); var d1 = new Array();
var d2 = new Array(); var d2 = new Array();
var d3 = new Array();
for (var i = 0; i < items[dive_id].samples.length; i++) { for (var i = 0; i < items[dive_id].samples.length; i++) {
d1.push([ d1.push([
items[dive_id].samples[i][0] / 60, items[dive_id].samples[i][0] / 60,
@ -901,9 +910,18 @@ function canvas_draw()
]); ]);
} }
} }
for (var i = 0; i < items[dive_id].events.length; i++) {
//var x = get_sample(items[dive_id].events[i].time);
d3.push([
items[dive_id].events[i].time / 60,
0,
//-1 * mm_to_meter(items[dive_id].samples[x][1])
]);
}
plot1 = $.jqplot('chart1', [ plot1 = $.jqplot('chart1', [
d1, d1,
d2 d2,
d3
], ],
{ {
grid : { grid : {
@ -912,7 +930,13 @@ function canvas_draw()
background : 'rgba(0,0,0,0)' background : 'rgba(0,0,0,0)'
}, },
highlighter : { highlighter : {
show : true show : true,
tooltipContentEditor: function(str, seriesIndex, pointIndex, jqPlot) {
if(seriesIndex===2)
return items[dive_id].events[pointIndex].name;
else
return str;
}
}, },
seriesDefaults : { seriesDefaults : {
shadowAlpha : 0.1, shadowAlpha : 0.1,
@ -936,6 +960,11 @@ function canvas_draw()
}, },
yaxis : 'y2axis', yaxis : 'y2axis',
}, },
{
showLine:false,
markerOptions: { size: 10, style:"o" },
pointLabels: { show:false, } ,
},
], ],
axes : { axes : {
xaxis : { xaxis : {