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

When starting with an empty data file and downloading dives, number them

Browse source 
We have been very careful not to mess with the numbering that a user may
intend - but one obvious case where we should automatically number the
dives appears to be the first time download from a dive computer. Right
now all dives show up with number '0' and that's just really ugly and a
bad experience for a first time user.

With this change if a user starts with an empty data file and downloads
dives from a computer for the first time, Subsurface will give them
numbers starting with '1'.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2012-12-05 09:34:00 -08:00
parent 10e64f0e17
commit 0141b69d0a
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
main.c
View file

@ -55,6 +55,10 @@ const char *monthname(int mon)
* *
* But we only do it if: * But we only do it if:
* *
* - there are no dives in the dive table
*
* OR
*
* - the last dive in the old dive table was numbered * - the last dive in the old dive table was numbered
* *
* - all the new dives are strictly at the end (so the * - all the new dives are strictly at the end (so the
@ -79,7 +83,7 @@ static void try_to_renumber(struct dive *last, int preexisting)
* we're going to expect the user to do a manual * we're going to expect the user to do a manual
* renumbering. * renumbering.
*/ */
if (get_dive(preexisting-1) != last) if (preexisting && get_dive(preexisting-1) != last)
return; return;
/* /*
@ -95,7 +99,10 @@ static void try_to_renumber(struct dive *last, int preexisting)
/* /*
* Ok, renumber.. * Ok, renumber..
*/ */
if (last)
nr = last->number; nr = last->number;
else
nr = 0;
for (i = preexisting; i < dive_table.nr; i++) { for (i = preexisting; i < dive_table.nr; i++) {
struct dive *dive = get_dive(i); struct dive *dive = get_dive(i);
dive->number = ++nr; dive->number = ++nr;
@ -150,8 +157,8 @@ void report_dives(gboolean is_imported, gboolean prefer_imported)
dive_table.dives[i]->downloaded = FALSE; dive_table.dives[i]->downloaded = FALSE;
if (is_imported) { if (is_imported) {
/* Was the previous dive table state numbered? */ /* If there are dives in the table, are they numbered */
if (last && last->number) if (!last || last->number)
try_to_renumber(last, preexisting); try_to_renumber(last, preexisting);
/* did we add dives to the dive table? */ /* did we add dives to the dive table? */