mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-01 06:30:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'sacplot' of git://git.hohndel.org/subsurface

Browse source 
* 'sacplot' of git://git.hohndel.org/subsurface:
  Fix error when gaschange event is one second before next sample
This commit is contained in:
Linus Torvalds 2011-11-19 13:22:21 -08:00
commit e8230c9d13
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
profile.c
View file

@ -669,10 +669,7 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
if (!last_entry) {
last = i;
last_entry = entry;
if (first_plot) {
/* don't start with a sac of 0, so just calculate the first one */
sac = GET_LOCAL_SAC(entry, pi->entry + i + 1, dive);
}
sac = GET_LOCAL_SAC(entry, pi->entry + i + 1, dive);
} else {
int j;
sac = 0;
@ -1144,8 +1141,13 @@ static struct plot_info *create_plot_info(struct dive *dive, int nr_samples, str
while (ev && ev->time.seconds < sample->time.seconds) {
/* insert two fake plot info structures for the end of
* the old tank and the start of the new tank */
entry->sec = ev->time.seconds;
(entry+1)->sec = ev->time.seconds + 1;
if (ev->time.seconds == sample->time.seconds - 1) {
entry->sec = ev->time.seconds - 1;
(entry+1)->sec = ev->time.seconds;
} else {
entry->sec = ev->time.seconds;
(entry+1)->sec = ev->time.seconds + 1;
}
/* we need a fake depth - let's interpolate */
if (i) {
entry->depth = sample->depth.mm -