From a0096f3a6b2f8723b9f020ac53b22c432c5a61c7 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 13 Sep 2011 19:49:48 -0700 Subject: [PATCH] Make the printout look different Not *better* mint you. Just different. I suck at graphs. Signed-off-by: Linus Torvalds --- display.h | 1 + print.c | 9 +++------ profile.c | 45 +++++++++++++++++++++++++++++++++------------ 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/display.h b/display.h index 759f7f0..bc97119 100644 --- a/display.h +++ b/display.h @@ -27,6 +27,7 @@ extern void do_print(void); * can't use it, and instead have this butt-ugly wrapper thing.. */ struct graphics_context { + int printer; cairo_t *cr; double maxx, maxy; double leftx, rightx; diff --git a/print.c b/print.c index c2114d5..0fe958a 100644 --- a/print.c +++ b/print.c @@ -11,7 +11,7 @@ static void draw_page(GtkPrintOperation *operation, cairo_t *cr; PangoLayout *layout; double w, h; - struct graphics_context gc = { 0 }; + struct graphics_context gc = { .printer = 1 }; cr = gtk_print_context_get_cairo_context(context); gc.cr = cr; @@ -21,11 +21,8 @@ static void draw_page(GtkPrintOperation *operation, w = gtk_print_context_get_width(context); h = gtk_print_context_get_height(context); - /* Do the profile on the top third of the page.. */ - cairo_set_source_rgb(cr, 0, 0, 0); - cairo_rectangle(cr, 0, 0, w, h/3); - cairo_fill(cr); - plot(&gc, w, h/3, current_dive); + /* Do the profile on the top half of the page.. */ + plot(&gc, w, h/2, current_dive); pango_cairo_show_layout(cr,layout); g_object_unref(layout); diff --git a/profile.c b/profile.c index 796b318..2ddc933 100644 --- a/profile.c +++ b/profile.c @@ -40,6 +40,23 @@ static void line_to(struct graphics_context *gc, double x, double y) cairo_line_to(gc->cr, SCALE(gc, x, y)); } +static void set_source_rgba(struct graphics_context *gc, double r, double g, double b, double a) +{ + if (gc->printer) { + a = 1; + if (r+g+b > 1) + r = g = b = 0; + else + r = g = b = 1; + } + cairo_set_source_rgba(gc->cr, r, g, b, a); +} + +static void set_source_rgb(struct graphics_context *gc, double r, double g, double b) +{ + set_source_rgba(gc, r, g, b, 1); +} + #define ROUND_UP(x,y) ((((x)+(y)-1)/(y))*(y)) /* @@ -107,13 +124,13 @@ static void plot_text(struct graphics_context *gc, const text_render_options_t * cairo_rel_move_to(cr, dx, dy); cairo_text_path(cr, buffer); - cairo_set_source_rgb(cr, 0, 0, 0); + set_source_rgb(gc, 0, 0, 0); cairo_stroke(cr); move_to(gc, x, y); cairo_rel_move_to(cr, dx, dy); - cairo_set_source_rgb(cr, tro->r, tro->g, tro->b); + set_source_rgb(gc, tro->r, tro->g, tro->b); cairo_show_text(cr, buffer); } @@ -207,6 +224,8 @@ static void plot_minmax_profile_minute(struct graphics_context *gc, struct plot_ static void plot_minmax_profile(struct graphics_context *gc, struct plot_info *pi) { + if (gc->printer) + return; plot_minmax_profile_minute(gc, pi, 2, 0.1); plot_minmax_profile_minute(gc, pi, 1, 0.1); plot_minmax_profile_minute(gc, pi, 0, 0.1); @@ -240,7 +259,7 @@ static void plot_depth_profile(struct dive *dive, struct graphics_context *gc, s case FEET: marker = 9144; break; /* 30 ft */ } - cairo_set_source_rgba(cr, 1, 1, 1, 0.5); + set_source_rgba(gc, 1, 1, 1, 0.5); for (i = marker; i < maxdepth; i += marker) { move_to(gc, 0, i); line_to(gc, 1, i); @@ -248,7 +267,7 @@ static void plot_depth_profile(struct dive *dive, struct graphics_context *gc, s cairo_stroke(cr); /* Show mean depth */ - cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.40); + set_source_rgba(gc, 1, 0.2, 0.2, 0.40); move_to(gc, 0, dive->meandepth.mm); line_to(gc, 1, dive->meandepth.mm); cairo_stroke(cr); @@ -259,7 +278,7 @@ static void plot_depth_profile(struct dive *dive, struct graphics_context *gc, s plot_minmax_profile(gc, pi); entry = pi->entry; - cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.80); + set_source_rgba(gc, 1, 0.2, 0.2, 0.80); begins = entry->sec; move_to(gc, entry->sec, entry->val); for (i = 1; i < pi->nr; i++) { @@ -274,9 +293,11 @@ static void plot_depth_profile(struct dive *dive, struct graphics_context *gc, s line_to(gc, MIN(sec,maxtime), 0); line_to(gc, begins, 0); cairo_close_path(cr); - cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.20); - cairo_fill_preserve(cr); - cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.80); + if (!gc->printer) { + set_source_rgba(gc, 1, 0.2, 0.2, 0.20); + cairo_fill_preserve(cr); + } + set_source_rgba(gc, 1, 0.2, 0.2, 0.80); cairo_stroke(cr); } @@ -349,7 +370,7 @@ static void plot_temperature_profile(struct dive *dive, struct graphics_context if (!setup_temperature_limits(dive, gc)) return; - cairo_set_source_rgba(cr, 0.2, 0.2, 1.0, 0.8); + set_source_rgba(gc, 0.2, 0.2, 1.0, 0.8); for (i = 0; i < dive->samples; i++) { struct sample *sample = dive->sample+i; int mkelvin = sample->temperature.mkelvin; @@ -672,7 +693,7 @@ void plot(struct graphics_context *gc, int w, int h, struct dive *dive) plot_info(dive, gc); /* Bounding box last */ - cairo_set_source_rgb(gc->cr, 1, 1, 1); + set_source_rgb(gc, 1, 1, 1); move_to(gc, 0, 0); line_to(gc, 0, 1); line_to(gc, 1, 1); @@ -685,14 +706,14 @@ void plot(struct graphics_context *gc, int w, int h, struct dive *dive) static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data) { struct dive *dive = current_dive; - struct graphics_context gc; + struct graphics_context gc = { .printer = 0 }; int w,h; w = widget->allocation.width; h = widget->allocation.height; gc.cr = gdk_cairo_create(widget->window); - cairo_set_source_rgb(gc.cr, 0, 0, 0); + set_source_rgb(&gc, 0, 0, 0); cairo_paint(gc.cr); if (dive) -- 2.45.2