X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=save-xml.c;h=ddee64e2d1bfd13e97e118863f922eda4fef42d6;hb=5f79a804b925a8ffbcf933bb6fae4f764b518c8e;hp=a1553193d63965212a13f16def8be0f323b0a011;hpb=f7fb74f3a78b4fbf561eb91548cf3e355af9b8b1;p=ext%2Fsubsurface.git
diff --git a/save-xml.c b/save-xml.c
index a155319..ddee64e 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -9,23 +9,42 @@
#define FRACTION(n,x) ((unsigned)(n)/(x)),((unsigned)(n)%(x))
-static void show_temperature(FILE *f, temperature_t temp, const char *pre, const char *post)
+static void show_milli(FILE *f, const char *pre, int value, const char *unit, const char *post)
{
- if (temp.mkelvin) {
- int mcelsius = temp.mkelvin - 273150;
- const char *sign ="";
- if (mcelsius < 0) {
- sign = "-";
- mcelsius = - mcelsius;
- }
- fprintf(f, "%s%s%u.%03u C%s", pre, sign, FRACTION(mcelsius, 1000), post);
+ int i;
+ char buf[4];
+ unsigned v;
+
+ fputs(pre, f);
+ v = value;
+ if (value < 0) {
+ putc('-', f);
+ v = -value;
+ }
+ for (i = 2; i >= 0; i--) {
+ buf[i] = (v % 10) + '0';
+ v /= 10;
+ }
+ buf[3] = 0;
+ if (buf[2] == '0') {
+ buf[2] = 0;
+ if (buf[1] == '0')
+ buf[1] = 0;
}
+
+ fprintf(f, "%u.%s%s%s", v, buf, unit, post);
+}
+
+static void show_temperature(FILE *f, temperature_t temp, const char *pre, const char *post)
+{
+ if (temp.mkelvin)
+ show_milli(f, pre, temp.mkelvin - 273150, " C", post);
}
static void show_depth(FILE *f, depth_t depth, const char *pre, const char *post)
{
if (depth.mm)
- fprintf(f, "%s%u.%03u m%s", pre, FRACTION(depth.mm, 1000), post);
+ show_milli(f, pre, depth.mm, " m", post);
}
static void show_duration(FILE *f, duration_t duration, const char *pre, const char *post)
@@ -37,7 +56,7 @@ static void show_duration(FILE *f, duration_t duration, const char *pre, const c
static void show_pressure(FILE *f, pressure_t pressure, const char *pre, const char *post)
{
if (pressure.mbar)
- fprintf(f, "%s%u.%03u bar%s", pre, FRACTION(pressure.mbar, 1000), post);
+ show_milli(f, pre, pressure.mbar, " bar", post);
}
/*
@@ -114,39 +133,50 @@ 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");
}
-static void save_gasmix(FILE *f, struct dive *dive)
+static void save_cylinder_info(FILE *f, struct dive *dive)
{
int i;
- for (i = 0; i < MAX_MIXES; i++) {
- gasmix_t *mix = dive->gasmix+i;
- int o2 = mix->o2.permille, he = mix->he.permille;
- int n2 = 1000 - o2 - he;
-
- if (!mix->o2.permille)
+ for (i = 0; i < MAX_CYLINDERS; i++) {
+ cylinder_t *cylinder = dive->cylinder+i;
+ int volume = cylinder->type.size.mliter;
+ 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 && !start && !end)
return;
- fprintf(f, " he.permille)
- fprintf(f, " he='%u.%u%%'", FRACTION(he, 10));
- fprintf(f, " n2='%u.%u%%' />\n", FRACTION(n2, 10));
+ fprintf(f, " start, " start='", "'");
+ show_pressure(f, cylinder->end, " end='", "'");
+ fprintf(f, " />\n");
}
}
static void save_sample(FILE *f, struct sample *sample)
{
- fprintf(f, " time.seconds,60),
- FRACTION(sample->depth.mm, 1000));
+ fprintf(f, " time.seconds,60));
+ show_milli(f, " depth='", sample->depth.mm, " m", "'");
show_temperature(f, sample->temperature, " temp='", "'");
- show_pressure(f, sample->tankpressure, " pressure='", "'");
- if (sample->tankindex)
- fprintf(f, " tankindex='%d'", sample->tankindex);
+ show_pressure(f, sample->cylinderpressure, " pressure='", "'");
+ if (sample->cylinderindex)
+ fprintf(f, " cylinderindex='%d'", sample->cylinderindex);
fprintf(f, " />\n");
}
@@ -159,7 +189,7 @@ static void save_dive(FILE *f, struct dive *dive)
tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec);
save_overview(f, dive);
- save_gasmix(f, dive);
+ save_cylinder_info(f, dive);
for (i = 0; i < dive->samples; i++)
save_sample(f, dive->sample+i);
fprintf(f, "\n");
@@ -182,4 +212,5 @@ void save_dives(const char *filename)
for (i = 0; i < dive_table.nr; i++)
save_dive(f, get_dive(i));
fprintf(f, "\n");
+ fclose(f);
}