X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=print.c;h=0346cca74bf48d3addb5f977d343f80970b29bd2;hb=51486040686592965bd7a70cf52767350cfde5f6;hp=8d3bc6150cc6514d1d6d8f5d40f37dcfeeb89c56;hpb=184eecf7c0dbcbdecba097411828afaac30773aa;p=ext%2Fsubsurface.git

diff --git a/print.c b/print.c
index 8d3bc61..0346cca 100644
--- a/print.c
+++ b/print.c
@@ -26,7 +26,9 @@ static void set_font(PangoLayout *layout, PangoFontDescription *font, double siz
  */
 static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h, PangoFontDescription *font)
 {
-	int len, width, height, maxwidth, maxheight;
+	double depth;
+	const char *unit;
+	int len, decimals, width, height, maxwidth, maxheight;
 	PangoLayout *layout;
 	struct tm *tm;
 	char buffer[1024], divenr[20];
@@ -64,13 +66,13 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h, P
 	 * with the depth/duration information. Need to mask that or
 	 * create a box or something.
 	 */
+	depth = get_depth_units(dive->maxdepth.mm, &decimals, &unit);
 	snprintf(buffer, sizeof(buffer),
-		"Max depth: %d ft\n"
-		"Duration: %d:%02d\n"
+		"Max depth: %.*f %s\n"
+		"Duration: %d min\n"
 		"%s",
-		to_feet(dive->maxdepth),
-		dive->duration.seconds / 60,
-		dive->duration.seconds % 60,
+		decimals, depth, unit,
+		(dive->duration.seconds+59) / 60,
 		dive->buddy ? :"");
 
 	set_font(layout, font, FONT_SMALL, PANGO_ALIGN_RIGHT);
@@ -104,8 +106,8 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h, P
 	 * Show the dive notes
 	 */
 	if (dive->notes) {
-		/* Move down by the size of the location (1.5) */
-		height = height * 3 / 2;
+		/* Move down by the size of the location (x2) */
+		height = height * 2;
 		cairo_translate(cr, 0, height / (double) PANGO_SCALE);
 		maxheight -= height;