FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'add-info-stats-page' of git://github.com/dirkhh/subsurface

Browse Source 
* 'add-info-stats-page' of git://github.com/dirkhh/subsurface:
  Fix typo that broke min SAC calculation
  Surface interval is calculated from the END of previous dive
This commit is contained in:
Linus Torvalds 2011-11-02 14:20:28 -07:00
commit 3c69c9b935
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
statistics.c
View File

@ -83,7 +83,7 @@ static void process_all_dives(struct dive *dive, struct dive **prev_dive)
dp->duration.seconds * dp->sac) / sac_time ;
if (dp->sac > info_stat.max_sac.mliter)
info_stat.max_sac.mliter = dp->sac;
if (info_stat.min_sac.mliter == 0 || dp->sac < info_stat.max_sac.mliter)
if (info_stat.min_sac.mliter == 0 || dp->sac < info_stat.min_sac.mliter)
info_stat.min_sac.mliter = dp->sac;
}
}
@ -132,7 +132,8 @@ void show_dive_stats(struct dive *dive)
set_label(info_stat_w.date, buf);
set_label(info_stat_w.dive_time, "%d min", (dive->duration.seconds + 30) / 60);
if (prev_dive)
set_label(info_stat_w.surf_intv, get_time_string(dive->when - prev_dive->when, 4));
set_label(info_stat_w.surf_intv,
get_time_string(dive->when - (prev_dive->when + prev_dive->duration.seconds), 4));
else
set_label(info_stat_w.surf_intv, "unknown");
value = get_depth_units(dive->maxdepth.mm, &decimals, &unit);