mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-08 01:06:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Picture handling: parse XML data

Browse source 
Using XML data files we can now save picture data and load it back in
again. The corresponding code for save-git and load-git is still missing.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-06-08 17:42:15 -07:00
parent 1604299a5b
commit 98e1b36a98
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
parse-xml.c
View file

@ -98,6 +98,7 @@ static struct divecomputer *cur_dc;
static struct dive *cur_dive; static struct dive *cur_dive;
static dive_trip_t *cur_trip = NULL; static dive_trip_t *cur_trip = NULL;
static struct sample *cur_sample; static struct sample *cur_sample;
static struct picture *cur_picture;
static struct { static struct {
int active; int active;
duration_t time; duration_t time;
@ -1034,6 +1035,14 @@ static void gps_location(char *buffer, struct dive *dive)
dive->longitude = parse_degrees(end, &end); dive->longitude = parse_degrees(end, &end);
} }
static void gps_picture_location(char *buffer, struct picture *pic)
{
char *end;
pic->latitude = parse_degrees(buffer, &end);
pic->longitude = parse_degrees(end, &end);
}
/* We're in the top-level dive xml. Try to convert whatever value to a dive value */ /* We're in the top-level dive xml. Try to convert whatever value to a dive value */
static void try_to_fill_dive(struct dive *dive, const char *name, char *buf) static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
{ {
@ -1073,6 +1082,12 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
if (match_dc_data_fields(&dive->dc, name, buf)) if (match_dc_data_fields(&dive->dc, name, buf))
return; return;
if (MATCH("filename.picture", utf8_string, &cur_picture->filename))
return;
if (MATCH("offset.picture", get_index, &cur_picture->offset))
return;
if (MATCH("gps.picture", gps_picture_location, cur_picture))
return;
if (MATCH("cylinderstartpressure", pressure, &dive->cylinder[0].start)) if (MATCH("cylinderstartpressure", pressure, &dive->cylinder[0].start))
return; return;
if (MATCH("cylinderendpressure", pressure, &dive->cylinder[0].end)) if (MATCH("cylinderendpressure", pressure, &dive->cylinder[0].end))
@ -1284,6 +1299,17 @@ static void event_end(void)
cur_event.active = 0; cur_event.active = 0;
} }
static void picture_start(void)
{
cur_picture = alloc_picture();
}
static void picture_end(void)
{
dive_add_picture(cur_dive, cur_picture);
cur_picture = NULL;
}
static void cylinder_start(void) static void cylinder_start(void)
{ {
} }
@ -1523,6 +1549,7 @@ static struct nesting {
{ "divecomputer", divecomputer_start, divecomputer_end }, { "divecomputer", divecomputer_start, divecomputer_end },
{ "P", sample_start, sample_end }, { "P", sample_start, sample_end },
{ "userid", userid_start, userid_stop}, { "userid", userid_start, userid_stop},
{ "picture", picture_start, picture_end },
/* Import type recognition */ /* Import type recognition */
{ "Divinglog", DivingLog_importer }, { "Divinglog", DivingLog_importer },