From 5f79a804b925a8ffbcf933bb6fae4f764b518c8e Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 5 Sep 2011 09:12:54 -0700 Subject: 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 --- save-xml.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'save-xml.c') 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, " ", "\n"); show_duration(f, dive->duration, " ", "\n"); show_duration(f, dive->surfacetime, " ", "\n"); - show_pressure(f, dive->beginning_pressure, " ", "\n"); - show_pressure(f, dive->end_pressure, " ", "\n"); show_utf8(f, dive->location, " ","\n"); show_utf8(f, dive->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, " start, " start='", "'"); + show_pressure(f, cylinder->end, " end='", "'"); fprintf(f, " />\n"); } } -- cgit v1.2.3-70-g09d2