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

diff --git a/print.c b/print.c
index 8d3bc61..d8373e5 100644
--- a/print.c
+++ b/print.c
@@ -11,6 +11,15 @@
 #define FONT_SMALL (FONT_NORMAL / 1.2)
 #define FONT_LARGE (FONT_NORMAL * 1.2)
 
+#define OPTIONCALLBACK(name, option) \
+static void name(GtkWidget *w, gpointer data) \
+{ \
+	option = GTK_TOGGLE_BUTTON(w)->active; \
+}
+
+OPTIONCALLBACK(print_profiles_toggle, visible_cols.print_profiles)
+
+
 static void set_font(PangoLayout *layout, PangoFontDescription *font, double size, int align)
 {
 	pango_font_description_set_size(font, size * PANGO_SCALE);
@@ -26,10 +35,12 @@ 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];
+	char buffer[80], divenr[20], *people;
 
 	maxwidth = w * PANGO_SCALE;
 	maxheight = h * PANGO_SCALE * 0.9;
@@ -42,7 +53,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",
@@ -59,19 +69,21 @@ 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: %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,
-		dive->buddy ? :"");
+		decimals, depth, unit,
+		(dive->duration.seconds+59) / 60,
+		people);
 
 	set_font(layout, font, FONT_SMALL, PANGO_ALIGN_RIGHT);
 	pango_layout_set_text(layout, buffer, -1);
@@ -104,8 +116,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;
 
@@ -124,12 +136,13 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h, P
 
 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 = {
 		.printer = 1,
 		.cr = cr
 	};
 	cairo_save(cr);
-	plot(&gc, w, h, dive);
+	plot(&gc, &drawing_area, dive);
 	cairo_restore(cr);
 }
 
@@ -161,6 +174,28 @@ 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)
+{
+	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_text(dive, cr, w*2, h*2, font);
+
+	cairo_restore(cr);
+}
+
 static void draw_page(GtkPrintOperation *operation,
 			GtkPrintContext *context,
 			gint page_nr,
@@ -188,8 +223,71 @@ static void draw_page(GtkPrintOperation *operation,
 	pango_font_description_free(font);
 }
 
+static void draw_page_table(GtkPrintOperation *operation,
+			GtkPrintContext *context,
+			gint page_nr,
+			gpointer user_data)
+{
+	int nr;
+	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)/15;
+
+	nr = page_nr*15;
+	int i;
+	for (i = 0; i < 15; i++) {
+		print_table(nr+i, cr, 0,   0+h*i, w, h, font);
+	}
+
+	pango_font_description_free(font);
+}
+
 static void begin_print(GtkPrintOperation *operation, gpointer user_data)
 {
+	int pages;
+	if (visible_cols.print_profiles){
+		pages = (dive_table.nr + 5) / 6;
+		gtk_print_operation_set_n_pages(operation, pages);
+	} else {
+		pages = (dive_table.nr + 9) / 15;
+		gtk_print_operation_set_n_pages(operation, pages);
+	}
+}
+
+static GtkWidget *print_dialog(GtkPrintOperation *operation, gpointer user_data)
+{
+	GtkWidget *vbox, *button, *frame, *box;
+	gtk_print_operation_set_custom_tab_label(operation, "Dive details");
+
+	vbox = gtk_vbox_new(TRUE, 5);
+
+	frame = gtk_frame_new("Print options");
+	gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 1);
+
+	box = gtk_hbox_new(FALSE, 1);
+	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);
+	g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(print_profiles_toggle), NULL);
+
+	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);
+	} else {
+		g_signal_connect(operation, "draw_page", G_CALLBACK(draw_page_table), NULL);
+	}
 }
 
 static GtkPrintSettings *settings = NULL;
@@ -204,10 +302,9 @@ void do_print(void)
 	print = gtk_print_operation_new();
 	if (settings != NULL)
 		gtk_print_operation_set_print_settings(print, settings);
-	pages = (dive_table.nr + 5) / 6;
-	gtk_print_operation_set_n_pages(print, pages);
+	g_signal_connect(print, "create-custom-widget", G_CALLBACK(print_dialog), NULL);
+	g_signal_connect(print, "custom-widget-apply", G_CALLBACK(print_dialog_apply), NULL);
 	g_signal_connect(print, "begin_print", G_CALLBACK(begin_print), NULL);
-	g_signal_connect(print, "draw_page", G_CALLBACK(draw_page), NULL);
 	res = gtk_print_operation_run(print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
 					 GTK_WINDOW(main_window), NULL);
 	if (res == GTK_PRINT_OPERATION_RESULT_APPLY) {