diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-05 09:12:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-05 09:12:54 -0700 |
| commit | 5f79a804b925a8ffbcf933bb6fae4f764b518c8e (patch) | |
| tree | 43e5d9dd7c7434966038789c0b2d0e28a7650e30 /save-xml.c | |
| parent | 0f832f15d1a5c4a9877fa4d568daa6e87241ca97 (diff) | |
| download | subsurface-5f79a804b925a8ffbcf933bb6fae4f764b518c8e.tar.gz | |
Sanitize and fix cylinder pressure overview
Doing per-dive cylinder start/end pressures is insane, when we can have
up to eight cylinders. The cylinder start/end pressure cannot be per
dive, it needs to be per cylinder.
This makes the save format cleaner too, we have all the cylinder data in
just one place.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'save-xml.c')
| -rw-r--r-- | save-xml.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/save-xml.c b/save-xml.c index f629b452e..ddee64e2d 100644 --- a/save-xml.c +++ b/save-xml.c @@ -133,8 +133,6 @@ static void save_overview(FILE *f, struct dive *dive) show_temperature(f, dive->watertemp, " <watertemp>", "</watertemp>\n"); show_duration(f, dive->duration, " <duration>", "</duration>\n"); show_duration(f, dive->surfacetime, " <surfacetime>", "</surfacetime>\n"); - show_pressure(f, dive->beginning_pressure, " <cylinderstartpressure>", "</cylinderstartpressure>\n"); - show_pressure(f, dive->end_pressure, " <cylinderendpressure>", "</cylinderendpressure>\n"); show_utf8(f, dive->location, " <location>","</location>\n"); show_utf8(f, dive->notes, " <notes>","</notes>\n"); } @@ -149,9 +147,11 @@ static void save_cylinder_info(FILE *f, struct dive *dive) const char *description = cylinder->type.description; int o2 = cylinder->gasmix.o2.permille; int he = cylinder->gasmix.he.permille; + int start = cylinder->start.mbar; + int end = cylinder->end.mbar; /* No cylinder information at all? */ - if (!o2 && !volume) + if (!o2 && !volume && !start && !end) return; fprintf(f, " <cylinder"); if (o2) { @@ -163,6 +163,8 @@ static void save_cylinder_info(FILE *f, struct dive *dive) show_milli(f, " size='", volume, " l", "'"); if (description) fprintf(f, " description='%s'", description); + show_pressure(f, cylinder->start, " start='", "'"); + show_pressure(f, cylinder->end, " end='", "'"); fprintf(f, " />\n"); } } |