#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)
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);
}
/*
fputs(post, f);
}
+static void save_depths(FILE *f, struct dive *dive)
+{
+ /* What's the point of this dive entry again? */
+ if (!dive->maxdepth.mm && !dive->meandepth.mm)
+ return;
+
+ fputs(" <depth", f);
+ show_depth(f, dive->maxdepth, " max='", "'");
+ show_depth(f, dive->meandepth, " mean='", "'");
+ fputs(" />\n", f);
+}
+
+static void save_temperatures(FILE *f, struct dive *dive)
+{
+ if (!dive->airtemp.mkelvin && !dive->watertemp.mkelvin)
+ return;
+ fputs(" <temperature", f);
+ show_temperature(f, dive->airtemp, " air='", "'");
+ show_temperature(f, dive->watertemp, " water='", "'");
+ fputs(" />\n", f);
+}
+
+static void show_location(FILE *f, struct dive *dive)
+{
+ char buffer[80];
+ const char *prefix = " <location>";
+ double latitude = dive->latitude;
+ double longitude = dive->longitude;
+
+ /*
+ * Ok, theoretically I guess you could dive at
+ * exactly 0,0. But we don't support that. So
+ * if you do, just fudge it a bit, and say that
+ * you dove a few meters away.
+ */
+ if (latitude || longitude) {
+ int len = snprintf(buffer, sizeof(buffer)-4,
+ " <location gps='%f %f'>",
+ latitude, longitude);
+ if (!dive->location) {
+ memcpy(&buffer[len-1], "/>\n", 4);
+ fputs(buffer, f);
+ return;
+ }
+ prefix = buffer;
+ }
+ show_utf8(f, dive->location, prefix,"</location>\n");
+}
+
static void save_overview(FILE *f, struct dive *dive)
{
- show_depth(f, dive->maxdepth, " <maxdepth>", "</maxdepth>\n");
- show_depth(f, dive->meandepth, " <meandepth>", "</meandepth>\n");
- show_temperature(f, dive->airtemp, " <airtemp>", "</airtemp>\n");
- show_temperature(f, dive->watertemp, " <watertemp>", "</watertemp>\n");
- show_duration(f, dive->duration, " <duration>", "</duration>\n");
+ save_depths(f, dive);
+ save_temperatures(f, dive);
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_location(f, dive);
+ show_utf8(f, dive->divemaster, " <divemaster>","</divemaster>\n");
+ show_utf8(f, dive->buddy, " <buddy>","</buddy>\n");
show_utf8(f, dive->notes, " <notes>","</notes>\n");
}
for (i = 0; i < MAX_CYLINDERS; i++) {
cylinder_t *cylinder = dive->cylinder+i;
int volume = cylinder->type.size.mliter;
- int pressure = cylinder->type.workingpressure.mbar;
+ 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) {
if (he)
fprintf(f, " he='%u.%u%%'", FRACTION(he, 10));
}
- if (volume) {
- fprintf(f, " size='%u.%03u l'", FRACTION(volume, 1000));
- if (pressure)
- fprintf(f, " workpressure='%u.%03u bar'", FRACTION(pressure, 1000));
- }
+ if (volume)
+ show_milli(f, " size='", volume, " l", "'");
+ show_pressure(f, cylinder->type.workingpressure, " workpressure='", "'");
+ if (description && *description)
+ fprintf(f, " description='%s'", description);
+ show_pressure(f, cylinder->start, " start='", "'");
+ show_pressure(f, cylinder->end, " end='", "'");
fprintf(f, " />\n");
}
}
static void save_sample(FILE *f, struct sample *sample)
{
- fprintf(f, " <sample time='%u:%02u min' depth='%u.%03u m'",
- FRACTION(sample->time.seconds,60),
- FRACTION(sample->depth.mm, 1000));
+ fprintf(f, " <sample time='%u:%02u min'", FRACTION(sample->time.seconds,60));
+ show_milli(f, " depth='", sample->depth.mm, " m", "'");
show_temperature(f, sample->temperature, " temp='", "'");
show_pressure(f, sample->cylinderpressure, " pressure='", "'");
if (sample->cylinderindex)
int i;
struct tm *tm = gmtime(&dive->when);
- fprintf(f, "<dive date='%04u-%02u-%02u' time='%02u:%02u:%02u'>\n",
- tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
+ fputs("<dive", f);
+ if (dive->number)
+ fprintf(f, " number='%d'", dive->number);
+ fprintf(f, " date='%04u-%02u-%02u'",
+ tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday);
+ fprintf(f, " time='%02u:%02u:%02u'",
tm->tm_hour, tm->tm_min, tm->tm_sec);
+ fprintf(f, " duration='%u:%02u min'>\n",
+ FRACTION(dive->duration.seconds, 60));
save_overview(f, dive);
save_cylinder_info(f, dive);
for (i = 0; i < dive->samples; i++)
return;
/* Flush any edits of current dives back to the dives! */
- flush_dive_info_changes();
+ update_dive(current_dive);
- fprintf(f, "<dives>\n<program name='diveclog' version='%d'></program>\n", VERSION);
+ fprintf(f, "<dives>\n<program name='subsurface' version='%d'></program>\n", VERSION);
for (i = 0; i < dive_table.nr; i++)
save_dive(f, get_dive(i));
fprintf(f, "</dives>\n");