X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo.c;h=4bb601be22f4c66495e9e67a88af6b4e8fdc8ff4;hb=cd8cb77fd12c77417f7c50acc135de77afd335f1;hp=8156016cd415bd33fe97ed4176ed91e3d6299aab;hpb=ee7b576822f2fa5025e08eccf5c8e7728838c460;p=pspp diff --git a/src/output/cairo.c b/src/output/cairo.c index 8156016cd4..4bb601be22 100644 --- a/src/output/cairo.c +++ b/src/output/cairo.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,6 +32,7 @@ #include "output/charts/piechart.h" #include "output/charts/plot-hist.h" #include "output/charts/roc-chart.h" +#include "output/charts/spreadlevel-plot.h" #include "output/charts/scree.h" #include "output/driver-provider.h" #include "output/message-item.h" @@ -65,8 +66,7 @@ #define V TABLE_VERT /* Measurements as we present to the rest of PSPP. */ -#define XR_POINT PANGO_SCALE -#define XR_INCH (XR_POINT * 72) +#define XR_POINT 1000 /* Conversions to and from points. */ static double @@ -203,6 +203,8 @@ parse_color (struct output_driver *d, struct string_map *options, } } + free (string); + /* Convert 16 bit ints to float */ *dred = red / (double) 0xFFFF; *dgreen = green / (double) 0xFFFF; @@ -246,9 +248,18 @@ apply_options (struct xr_driver *xr, struct string_map *o) { struct output_driver *d = &xr->driver; - int paper_width, paper_length; + int paper_width, paper_length, i; int font_points = parse_int (opt (d, o, "font-size", "10000"), 1000, 1000000); + + for (i = 0; i < XR_N_FONTS; i++) + { + struct xr_font *font = &xr->fonts[i]; + + if (font->desc != NULL) + pango_font_description_free (font->desc); + } + xr->fonts[XR_FONT_FIXED].desc = parse_font (d, o, "fixed-font", "monospace", font_points); xr->fonts[XR_FONT_PROPORTIONAL].desc = parse_font (d, o, "prop-font", @@ -256,7 +267,7 @@ apply_options (struct xr_driver *xr, struct string_map *o) xr->fonts[XR_FONT_EMPHASIS].desc = parse_font (d, o, "emph-font", "serif italic", font_points); - xr->line_gutter = XR_POINT; + xr->line_gutter = parse_dimension (opt (d, o, "gutter", "3pt")); xr->line_space = XR_POINT; xr->line_width = XR_POINT / 2; xr->page_number = 0; @@ -287,40 +298,15 @@ xr_allocate (const char *name, int device_type, struct string_map *o) return xr; } -static bool -xr_is_72dpi (cairo_t *cr) -{ - cairo_surface_type_t type; - cairo_surface_t *surface; - - surface = cairo_get_target (cr); - type = cairo_surface_get_type (surface); - return type == CAIRO_SURFACE_TYPE_PDF || type == CAIRO_SURFACE_TYPE_PS; -} - static bool xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) { - PangoContext *context; - PangoFontMap *map; int i; xr->cairo = cairo; cairo_set_line_width (xr->cairo, xr_to_pt (xr->line_width)); - map = pango_cairo_font_map_get_default (); - context = pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP (map)); - if (xr_is_72dpi (cairo)) - { - /* Pango seems to always scale fonts according to the DPI specified - in the font map, even if the surface has a real DPI. The default - DPI is 96, so on a 72 DPI device fonts end up being 96/72 = 133% - of their desired size. We deal with this by fixing the resolution - here. Presumably there is a better solution, but what? */ - pango_cairo_context_set_resolution (context, 72.0); - } - xr->char_width = 0; xr->char_height = 0; for (i = 0; i < XR_N_FONTS; i++) @@ -328,7 +314,7 @@ xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) struct xr_font *font = &xr->fonts[i]; int char_width, char_height; - font->layout = pango_layout_new (context); + font->layout = pango_cairo_create_layout (cairo); pango_layout_set_font_description (font->layout, font->desc); pango_layout_set_text (font->layout, "0", 1); @@ -337,8 +323,6 @@ xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) xr->char_height = MAX (xr->char_height, char_height); } - g_object_unref (G_OBJECT (context)); - if (xr->params == NULL) { int single_width, double_width; @@ -374,14 +358,12 @@ xr_create (const char *file_name, enum settings_output_devices device_type, struct string_map *o, enum xr_output_type file_type) { enum { MIN_WIDTH = 3, MIN_LENGTH = 3 }; - struct output_driver *d; struct xr_driver *xr; cairo_surface_t *surface; cairo_status_t status; double width_pt, length_pt; xr = xr_allocate (file_name, device_type, o); - d = &xr->driver; width_pt = (xr->width + xr->left_margin + xr->right_margin) / 1000.0; length_pt = (xr->length + xr->top_margin + xr->bottom_margin) / 1000.0; @@ -541,6 +523,8 @@ xr_submit (struct output_driver *driver, const struct output_item *output_item) { struct xr_driver *xr = xr_driver_cast (driver); + output_driver_track_current_command (output_item, &xr->command_name); + xr_driver_output_item (xr, output_item); while (xr_driver_need_new_page (xr)) { @@ -912,9 +896,12 @@ xr_draw_title (struct xr_driver *xr, const char *title, xr_draw_cell (xr, &cell, bb, bb); } -struct output_driver_factory pdf_driver_factory = { "pdf", xr_pdf_create }; -struct output_driver_factory ps_driver_factory = { "ps", xr_ps_create }; -struct output_driver_factory svg_driver_factory = { "svg", xr_svg_create }; +struct output_driver_factory pdf_driver_factory = + { "pdf", "pspp.pdf", xr_pdf_create }; +struct output_driver_factory ps_driver_factory = + { "ps", "pspp.ps", xr_ps_create }; +struct output_driver_factory svg_driver_factory = + { "svg", "pspp.svg", xr_svg_create }; static const struct output_driver_class cairo_driver_class = { @@ -982,7 +969,8 @@ xr_rendering_create_text (struct xr_driver *xr, const char *text, cairo_t *cr) void xr_rendering_apply_options (struct xr_rendering *xr, struct string_map *o) { - apply_options (xr->xr, o); + if (is_table_item (xr->item)) + apply_options (xr->xr, o); } struct xr_rendering * @@ -1015,8 +1003,6 @@ xr_rendering_create (struct xr_driver *xr, const struct output_item *item, { r = xzalloc (sizeof *r); r->item = output_item_ref (item); - r->xr = xr; - xr_set_cairo (xr, cr); } return r; @@ -1029,8 +1015,8 @@ xr_rendering_measure (struct xr_rendering *r, int *w, int *h) { int w0 = render_page_get_size (r->page, H); int w1 = r->title_width; - *w = MAX (w0, w1) / 1024; - *h = (render_page_get_size (r->page, V) + r->title_height) / 1024; + *w = MAX (w0, w1) / XR_POINT; + *h = (render_page_get_size (r->page, V) + r->title_height) / XR_POINT; } else { @@ -1062,8 +1048,9 @@ xr_rendering_draw (struct xr_rendering *r, cairo_t *cr, } xr->y = r->title_height; - render_page_draw_region (r->page, x * 1024, (y * 1024) - r->title_height, - w * 1024, h * 1024); + render_page_draw_region (r->page, + x * XR_POINT, (y * XR_POINT) - r->title_height, + w * XR_POINT, h * XR_POINT); } else xr_draw_chart (to_chart_item (r->item), cr, @@ -1092,6 +1079,8 @@ xr_draw_chart (const struct chart_item *chart_item, cairo_t *cr, xrchart_draw_roc (chart_item, cr, &geom); else if (is_scree (chart_item)) xrchart_draw_scree (chart_item, cr, &geom); + else if (is_spreadlevel_plot_chart (chart_item)) + xrchart_draw_spreadlevel (chart_item, cr, &geom); else NOT_REACHED (); xrchart_geometry_free (cr, &geom);