From 490e98dadfc71a318a934f4196821be69c4b6342 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 28 Aug 2012 15:50:00 +0200 Subject: [PATCH] Work on the printing of the dives, first attempt to print as table. With this commit, the user can choose between two printing modes: - pretty print (with or without the dive profile) - table print (which is nothing less than a table formating containing the information) Signed-off-by: Pierre-Yves Chibon --- display-gtk.h | 1 - display.h | 5 + print.c | 265 ++++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 249 insertions(+), 22 deletions(-) diff --git a/display-gtk.h b/display-gtk.h index 85ebae3..dd7e2c4 100644 --- a/display-gtk.h +++ b/display-gtk.h @@ -19,7 +19,6 @@ typedef struct { gboolean nitrox; gboolean sac; gboolean otu; - gboolean print_profiles; } visible_cols_t; typedef enum { diff --git a/display.h b/display.h index 341b161..d054b69 100644 --- a/display.h +++ b/display.h @@ -26,4 +26,9 @@ extern void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_are extern void init_profile_background(struct graphics_context *gc); extern void attach_tooltip(int x, int y, int w, int h, const char *text); +struct options { + enum { PRETTY, TABLE } type; + gboolean print_profiles; +}; + #endif diff --git a/print.c b/print.c index 5083f42..5a1a784 100644 --- a/print.c +++ b/print.c @@ -11,16 +11,19 @@ #define FONT_SMALL (FONT_NORMAL / 1.2) #define FONT_LARGE (FONT_NORMAL * 1.2) -#define OPTIONCALLBACK(name, option) \ +static struct options print_options; + +#define PRETTYOPTIONCALLBACK(name, option) \ static void name(GtkWidget *w, gpointer data) \ { \ option = GTK_TOGGLE_BUTTON(w)->active; \ } -OPTIONCALLBACK(print_profiles_toggle, visible_cols.print_profiles) +PRETTYOPTIONCALLBACK(print_profiles_toggle, print_options.print_profiles) -static void set_font(PangoLayout *layout, PangoFontDescription *font, double size, int align) +static void set_font(PangoLayout *layout, PangoFontDescription *font, + double size, int align) { pango_font_description_set_size(font, size * PANGO_SCALE); pango_layout_set_font_description(layout, font); @@ -33,7 +36,8 @@ static void set_font(PangoLayout *layout, PangoFontDescription *font, double siz * You know what? Maybe somebody can do a real Pango layout thing. * This is hacky. */ -static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h, PangoFontDescription *font) +static void show_dive_text(struct dive *dive, cairo_t *cr, double w, + double h, PangoFontDescription *font) { double depth; const char *unit; @@ -134,7 +138,103 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h, P g_object_unref(layout); } -static void show_dive_profile(struct dive *dive, cairo_t *cr, double w, double h) +static void show_table_header(cairo_t *cr, double w, double h, + PangoFontDescription *font) +{ + int len, width, height, maxwidth, maxheight; + PangoLayout *layout; + char buffer[160]; + + maxwidth = w * PANGO_SCALE; + maxheight = h * PANGO_SCALE * 0.9; + + layout = pango_cairo_create_layout(cr); + pango_layout_set_width(layout, maxwidth); + pango_layout_set_height(layout, maxheight); + + len = snprintf(buffer, sizeof(buffer), + "Dive# - Date - Depth - Time - Master" + " Buddy -- Location"); + + set_font(layout, font, FONT_LARGE, PANGO_ALIGN_LEFT); + pango_layout_set_text(layout, buffer, len); + pango_layout_get_size(layout, &width, &height); + + //cairo_move_to(cr, 0, 0); + pango_cairo_show_layout(cr, layout); +} + +static void show_dive_table(struct dive *dive, cairo_t *cr, double w, + double h, PangoFontDescription *font) +{ + double depth; + const char *unit; + int len, decimals, width, height, maxwidth, maxheight; + PangoLayout *layout; + struct tm *tm; + char buffer[160], divenr[20]; + + maxwidth = w * PANGO_SCALE; + maxheight = h * PANGO_SCALE * 0.9; + + layout = pango_cairo_create_layout(cr); + pango_layout_set_width(layout, maxwidth); + pango_layout_set_height(layout, maxheight); + + *divenr = 0; + if (dive->number) + snprintf(divenr, sizeof(divenr), "#%d -", dive->number); + + depth = get_depth_units(dive->maxdepth.mm, &decimals, &unit); + + tm = gmtime(&dive->when); + len = snprintf(buffer, sizeof(buffer), + "%s %s, %s %d, %d %dh%02d - %.*f %s - %d min - %s %s -- %s", + divenr, + weekday(tm->tm_wday), + monthname(tm->tm_mon), + tm->tm_mday, tm->tm_year + 1900, + tm->tm_hour, tm->tm_min, + decimals, + depth, + unit, + (dive->duration.seconds+59) / 60, + dive->divemaster ? : " ", + dive->buddy ? : " ", + dive->location ? : " " + ); + + set_font(layout, font, FONT_NORMAL, PANGO_ALIGN_LEFT); + pango_layout_set_text(layout, buffer, len); + pango_layout_get_size(layout, &width, &height); + + cairo_move_to(cr, 0, 0); + pango_cairo_show_layout(cr, layout); + + ///* + //* Show the dive notes + //*/ + if (dive->notes) { + /* Move down by the size of the location (x2) */ + height = height * 1.3; + cairo_translate(cr, 20, height / (double) PANGO_SCALE); + maxheight -= height; + + /* Use the full width and remaining height for notes */ + pango_layout_set_height(layout, maxheight); + pango_layout_set_width(layout, maxwidth); + pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR); + pango_layout_set_justify(layout, 1); + pango_layout_set_text(layout, dive->notes, -1); + + cairo_move_to(cr, 0, 0); + pango_cairo_show_layout(cr, layout); + } + g_object_unref(layout); +} + +static void show_dive_profile(struct dive *dive, cairo_t *cr, double w, + double h) { cairo_rectangle_int_t drawing_area = { w/20.0, h/20.0, w, h}; struct graphics_context gc = { @@ -146,7 +246,8 @@ static void show_dive_profile(struct dive *dive, cairo_t *cr, double w, double h cairo_restore(cr); } -static void print(int divenr, cairo_t *cr, double x, double y, double w, double h, PangoFontDescription *font) +static void print(int divenr, cairo_t *cr, double x, double y, double w, + double h, PangoFontDescription *font) { struct dive *dive; @@ -174,7 +275,8 @@ static void print(int divenr, cairo_t *cr, double x, double y, double w, double cairo_restore(cr); } -static void print_table(int divenr, cairo_t *cr, double x, double y, double w, double h, PangoFontDescription *font) +static void print_pretty_table(int divenr, cairo_t *cr, double x, double y, + double w, double h, PangoFontDescription *font) { struct dive *dive; @@ -196,6 +298,47 @@ static void print_table(int divenr, cairo_t *cr, double x, double y, double w, d cairo_restore(cr); } +static void print_table_header(cairo_t *cr, double x, double y, + double w, double h, PangoFontDescription *font) +{ + cairo_save(cr); + cairo_translate(cr, x, y); + + /* Plus 5% on all sides */ + cairo_translate(cr, w/20, h/20); + w *= 0.9; h *= 0.9; + + /* We actually want to scale the text and the lines now */ + cairo_scale(cr, 0.5, 0.5); + + show_table_header(cr, w*2, h*2, font); + + cairo_restore(cr); +} + +static void print_table(int divenr, cairo_t *cr, double x, double y, + double w, double h, PangoFontDescription *font) +{ + struct dive *dive; + + dive = get_dive(divenr); + if (!dive) + return; + cairo_save(cr); + cairo_translate(cr, x, y); + + /* Plus 5% on all sides */ + cairo_translate(cr, w/20, h/20); + w *= 0.9; h *= 0.9; + + /* We actually want to scale the text and the lines now */ + cairo_scale(cr, 0.5, 0.5); + + show_dive_table(dive, cr, w*2, h*2, font); + + cairo_restore(cr); +} + static void draw_page(GtkPrintOperation *operation, GtkPrintContext *context, gint page_nr, @@ -223,7 +366,7 @@ static void draw_page(GtkPrintOperation *operation, pango_font_description_free(font); } -static void draw_page_table(GtkPrintOperation *operation, +static void draw_pretty_table(GtkPrintOperation *operation, GtkPrintContext *context, gint page_nr, gpointer user_data) @@ -242,7 +385,34 @@ static void draw_page_table(GtkPrintOperation *operation, nr = page_nr*15; int i; for (i = 0; i < 15; i++) { - print_table(nr+i, cr, 0, 0+h*i, w, h, font); + print_pretty_table(nr+i, cr, 0, 0+h*i, w, h, font); + } + + pango_font_description_free(font); +} + +static void draw_table(GtkPrintOperation *operation, + GtkPrintContext *context, + gint page_nr, + gpointer user_data) +{ + int nr; + int n_dive_per_page = 25; + cairo_t *cr; + double w, h; + PangoFontDescription *font; + + cr = gtk_print_context_get_cairo_context(context); + font = pango_font_description_from_string("Sans"); + + w = gtk_print_context_get_width(context); + h = gtk_print_context_get_height(context)/(n_dive_per_page+1); + + nr = page_nr*n_dive_per_page; + print_table_header(cr, 0, 0+h, w, h, font); + int i; + for (i = 0; i < n_dive_per_page; i++) { + print_table(nr+i, cr, 0, h*1.5+h*i, w, h, font); } pango_font_description_free(font); @@ -250,43 +420,97 @@ static void draw_page_table(GtkPrintOperation *operation, static void begin_print(GtkPrintOperation *operation, gpointer user_data) { + int dives_per_page = 1; + if (print_options.type == PRETTY) { + if (print_options.print_profiles){ + dives_per_page = 6; + } else { + dives_per_page = 15; + } + } else { + dives_per_page = 25; + } int pages; - if (visible_cols.print_profiles){ - pages = (dive_table.nr + 5) / 6; + pages = (dive_table.nr + dives_per_page - 1) / dives_per_page; gtk_print_operation_set_n_pages(operation, pages); +} + +static void update_print_window(GtkWidget *w) { + if (print_options.type == TABLE) { + // type == table - disable the profile option + gtk_widget_set_sensitive(w, FALSE); } else { - pages = (dive_table.nr + 9) / 15; - gtk_print_operation_set_n_pages(operation, pages); + // type == pretty - enable the profile option + gtk_widget_set_sensitive(w, TRUE); } } +#define OPTIONCALLBACK(name, type, value) \ +static void name(GtkWidget *w, gpointer data) \ +{\ + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) \ + print_options.type = value; \ + update_print_window(data); \ +} + +OPTIONCALLBACK(set_pretty, type, PRETTY) +OPTIONCALLBACK(set_table, type, TABLE) + static GtkWidget *print_dialog(GtkPrintOperation *operation, gpointer user_data) { - GtkWidget *vbox, *button, *frame, *box; + GtkWidget *vbox, *button, *radio1, *radio2, *frame, *box; gtk_print_operation_set_custom_tab_label(operation, "Dive details"); vbox = gtk_vbox_new(TRUE, 5); + frame = gtk_frame_new("Print type"); + gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 1); + + box = gtk_hbox_new(FALSE, 2); + gtk_container_add(GTK_CONTAINER(frame), box); + + radio1 = gtk_radio_button_new_with_label (NULL, "Pretty print"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio1), + print_options.type == PRETTY); + radio2 = gtk_radio_button_new_with_label_from_widget ( + GTK_RADIO_BUTTON (radio1), "Table print"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio2), + print_options.type == TABLE); + gtk_box_pack_start (GTK_BOX (box), radio1, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (box), radio2, TRUE, TRUE, 0); + + frame = gtk_frame_new("Print options"); gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 1); - box = gtk_hbox_new(FALSE, 1); + box = gtk_hbox_new(FALSE, 3); gtk_container_add(GTK_CONTAINER(frame), box); + button = gtk_check_button_new_with_label("Show profiles"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), visible_cols.print_profiles); - gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 6); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), print_options.print_profiles); + gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 2); g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(print_profiles_toggle), NULL); + g_signal_connect(radio1, "toggled", G_CALLBACK(set_pretty), button); + g_signal_connect(radio2, "toggled", G_CALLBACK(set_table), button); + gtk_widget_show_all(vbox); return vbox; } static void print_dialog_apply(GtkPrintOperation *operation, GtkWidget *widget, gpointer user_data) { - if (visible_cols.print_profiles){ - g_signal_connect(operation, "draw_page", G_CALLBACK(draw_page), NULL); + if (print_options.type == PRETTY) { + if (print_options.print_profiles){ + g_signal_connect(operation, "draw_page", + G_CALLBACK(draw_page), NULL); + } else { + g_signal_connect(operation, "draw_page", + G_CALLBACK(draw_pretty_table), NULL); + } } else { - g_signal_connect(operation, "draw_page", G_CALLBACK(draw_page_table), NULL); + g_signal_connect(operation, "draw_page", + G_CALLBACK(draw_table), NULL); } } @@ -294,7 +518,6 @@ static GtkPrintSettings *settings = NULL; void do_print(void) { - int pages; GtkPrintOperation *print; GtkPrintOperationResult res; -- 2.45.2