From: Linus Torvalds Date: Wed, 21 Sep 2011 15:21:14 +0000 (-0700) Subject: Fix up printing some more X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=74988c86de775f0fc8e5f0e366130bcdab5d33ac;p=ext%2Fsubsurface.git Fix up printing some more This makes things slightly prettier and adds back the depth and duration details to the printout. Still a few known problems: font choice, and the depth/duration thing can end up overlapping with a long location name. But it looks pretty good on the whole. Signed-off-by: Linus Torvalds --- diff --git a/print.c b/print.c index 265a7e6..f0ea544 100644 --- a/print.c +++ b/print.c @@ -86,16 +86,52 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h) tm = gmtime(&dive->when); len = snprintf(buffer, sizeof(buffer), - "%s%s, %s %d, %d %d:%02d\n", + "" + "%s%s, %s %d, %d %d:%02d" + "\n", divenr, weekday(tm->tm_wday), monthname(tm->tm_mon), tm->tm_mday, tm->tm_year + 1900, tm->tm_hour, tm->tm_min); - len = add_quoted_string(buffer, sizeof(buffer), len, dive->location); - len = add_quoted_string(buffer, sizeof(buffer), len, dive->notes); + /* + * Leave an empty line even if no location: otherwise the notes can + * overrun the depth/duration information. + */ + if (dive->location) + len = add_quoted_string(buffer, sizeof(buffer), len, dive->location); + else + len = add_char(buffer, sizeof(buffer), len, '\n'); + + if (dive->notes) { + len = add_char(buffer, sizeof(buffer), len, '\n'); + len = add_quoted_string(buffer, sizeof(buffer), len, dive->notes); + } + + pango_layout_set_justify(layout, 1); + pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END); + pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT); + pango_layout_set_markup(layout, buffer, len); + cairo_move_to(cr, 0, 0); + pango_cairo_show_layout(cr, layout); + + /* + * This is still problematic: a long dive location will clash + * with the depth/duration information. Need to mask that or + * create a box or something. + */ + snprintf(buffer, sizeof(buffer), + "" + "Max depth: %d ft\n" + "Duration: %d:%02d" + "", + to_feet(dive->maxdepth), + dive->duration.seconds / 60, + dive->duration.seconds % 60); + + pango_layout_set_alignment(layout, PANGO_ALIGN_RIGHT); pango_layout_set_markup(layout, buffer, -1); cairo_move_to(cr, 0, 0); @@ -110,7 +146,9 @@ static void show_dive_profile(struct dive *dive, cairo_t *cr, double w, double h .printer = 1, .cr = cr }; + cairo_save(cr); plot(&gc, w, h, dive); + cairo_restore(cr); } static void print(int divenr, cairo_t *cr, double x, double y, double w, double h)