mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 06:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

In summary printout, show divemaster if there was no buddy

Browse source 
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-09-22 08:09:21 -07:00
parent d94fb7ca6b
commit 1d36085b41
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
print.c
View file

@ -31,7 +31,7 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h, P
int len, decimals, width, height, maxwidth, maxheight;
PangoLayout *layout;
struct tm *tm;
char buffer[1024], divenr[20];
char buffer[80], divenr[20], *people;
maxwidth = w * PANGO_SCALE;
maxheight = h * PANGO_SCALE * 0.9;
@ -44,7 +44,6 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h, P
if (dive->number)
snprintf(divenr, sizeof(divenr), "Dive #%d - ", dive->number);
tm = gmtime(&dive->when);
len = snprintf(buffer, sizeof(buffer),
"%s%s, %s %d, %d %d:%02d",
@ -61,11 +60,13 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h, P
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.
*/
people = dive->buddy;
if (!people || !*people) {
people = dive->divemaster;
if (!people)
people = "";
}
depth = get_depth_units(dive->maxdepth.mm, &decimals, &unit);
snprintf(buffer, sizeof(buffer),
"Max depth: %.*f %s\n"
@ -73,7 +74,7 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h, P
"%s",
decimals, depth, unit,
(dive->duration.seconds+59) / 60,
dive->buddy ? :"");
people);
set_font(layout, font, FONT_SMALL, PANGO_ALIGN_RIGHT);
pango_layout_set_text(layout, buffer, -1);