/* PSPP - a program for statistical analysis.
- Copyright (C) 2009, 2010 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
#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"
#include <pango/pangocairo.h>
#include <stdlib.h>
-#include "gl/error.h"
#include "gl/intprops.h"
#include "gl/minmax.h"
#include "gl/xalloc.h"
#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
int line_space; /* Space between lines. */
int line_width; /* Width of lines. */
+ double bg_red, bg_green, bg_blue; /* Background color */
+ double fg_red, fg_green, fg_blue; /* Foreground color */
+
/* Internal state. */
struct render_params *params;
int char_width, char_height;
return driver_option_get (d, options, key, default_value);
}
+/* Parse color information specified by KEY into {RED,GREEN,BLUE}.
+ Currently, the input string must be of the form "#RRRRGGGGBBBB"
+ Future implementations might allow things like "yellow" and
+ "sky-blue-ultra-brown"
+*/
+static void
+parse_color (struct output_driver *d, struct string_map *options,
+ const char *key, const char *default_value,
+ double *dred, double *dgreen, double *dblue)
+{
+ int red, green, blue;
+ char *string = parse_string (opt (d, options, key, default_value));
+
+ if (3 != sscanf (string, "#%04x%04x%04x", &red, &green, &blue))
+ {
+ /* If the parsed option string fails, then try the default value */
+ if ( 3 != sscanf (default_value, "#%04x%04x%04x", &red, &green, &blue))
+ {
+ /* ... and if that fails set everything to zero */
+ red = green = blue = 0;
+ }
+ }
+
+ free (string);
+
+ /* Convert 16 bit ints to float */
+ *dred = red / (double) 0xFFFF;
+ *dgreen = green / (double) 0xFFFF;
+ *dblue = blue / (double) 0xFFFF;
+}
+
static PangoFontDescription *
parse_font (struct output_driver *d, struct string_map *options,
const char *key, const char *default_value,
desc = pango_font_description_from_string (string);
if (desc == NULL)
{
- error (0, 0, _("\"%s\": bad font specification"), string);
+ msg (MW, _("`%s': bad font specification"), string);
/* Fall back to DEFAULT_VALUE, which had better be a valid font
description. */
return desc;
}
-static struct xr_driver *
-xr_allocate (const char *name, int device_type, struct string_map *o)
+
+static void
+apply_options (struct xr_driver *xr, struct string_map *o)
{
- int paper_width, paper_length;
- struct output_driver *d;
- struct xr_driver *xr;
- int font_points;
+ struct output_driver *d = &xr->driver;
- xr = xzalloc (sizeof *xr);
- d = &xr->driver;
- output_driver_init (d, &cairo_driver_class, name, device_type);
+ 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);
+ }
- font_points = parse_int (opt (d, o, "font-size", "10000"),
- 1000, 1000000);
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",
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;
+ parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &xr->bg_red, &xr->bg_green, &xr->bg_blue);
+ parse_color (d, o, "foreground-color", "#000000000000", &xr->fg_red, &xr->fg_green, &xr->fg_blue);
+
parse_paper_size (opt (d, o, "paper-size", ""), &paper_width, &paper_length);
xr->left_margin = parse_dimension (opt (d, o, "left-margin", ".5in"));
xr->right_margin = parse_dimension (opt (d, o, "right-margin", ".5in"));
xr->width = paper_width - xr->left_margin - xr->right_margin;
xr->length = paper_length - xr->top_margin - xr->bottom_margin;
-
- return xr;
}
-static bool
-xr_is_72dpi (cairo_t *cr)
+static struct xr_driver *
+xr_allocate (const char *name, int device_type, struct string_map *o)
{
- cairo_surface_type_t type;
- cairo_surface_t *surface;
+ struct xr_driver *xr = xzalloc (sizeof *xr);
+ struct output_driver *d = &xr->driver;
- surface = cairo_get_target (cr);
- type = cairo_surface_get_type (surface);
- return type == CAIRO_SURFACE_TYPE_PDF || type == CAIRO_SURFACE_TYPE_PS;
+ output_driver_init (d, &cairo_driver_class, name, device_type);
+
+ apply_options (xr, o);
+
+ return xr;
}
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++)
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);
xr->char_height = MAX (xr->char_height, char_height);
}
- g_object_unref (G_OBJECT (context));
-
if (xr->params == NULL)
{
int single_width, double_width;
}
}
+ cairo_set_source_rgb (xr->cairo, xr->fg_red, xr->fg_green, xr->fg_blue);
+
return true;
}
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;
status = cairo_surface_status (surface);
if (status != CAIRO_STATUS_SUCCESS)
{
- error (0, 0, _("error opening output file \"%s\": %s"),
+ msg (ME, _("error opening output file `%s': %s"),
file_name, cairo_status_to_string (status));
cairo_surface_destroy (surface);
goto error;
if (xr->width / xr->char_width < MIN_WIDTH)
{
- error (0, 0, _("The defined page is not wide enough to hold at least %d "
+ msg (ME, _("The defined page is not wide enough to hold at least %d "
"characters in the default font. In fact, there's only "
"room for %d characters."),
MIN_WIDTH,
if (xr->length / xr->char_height < MIN_LENGTH)
{
- error (0, 0, _("The defined page is not long enough to hold at least %d "
+ msg (ME, _("The defined page is not long enough to hold at least %d "
"lines in the default font. In fact, there's only "
"room for %d lines."),
MIN_LENGTH,
cairo_surface_finish (cairo_get_target (xr->cairo));
status = cairo_status (xr->cairo);
if (status != CAIRO_STATUS_SUCCESS)
- error (0, 0, _("error drawing output for %s driver: %s"),
+ msg (ME, _("error drawing output for %s driver: %s"),
output_driver_get_name (driver),
cairo_status_to_string (status));
cairo_destroy (xr->cairo);
static struct render_page *
xr_render_table_item (struct xr_driver *xr, const struct table_item *item,
- int *caption_heightp)
+ int *caption_widthp, int *caption_heightp)
{
const char *caption = table_item_get_caption (item);
if (caption != NULL)
{
/* XXX doesn't do well with very large captions */
+ int min_width, max_width;
struct table_cell cell;
+
xr_init_caption_cell (caption, &cell);
- *caption_heightp = xr_measure_cell_height (xr, &cell, xr->width);
+
+ xr_measure_cell_width (xr, &cell, &min_width, &max_width);
+ *caption_widthp = MIN (max_width, xr->width);
+ *caption_heightp = xr_measure_cell_height (xr, &cell, *caption_widthp);
}
else
*caption_heightp = 0;
{
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))
{
xr_driver_next_page (struct xr_driver *xr, cairo_t *cairo)
{
if (cairo != NULL)
- cairo_translate (cairo,
- xr_to_pt (xr->left_margin),
- xr_to_pt (xr->top_margin));
+ {
+ cairo_save (cairo);
+ cairo_set_source_rgb (cairo, xr->bg_red, xr->bg_green, xr->bg_blue);
+ cairo_rectangle (cairo, 0, 0, xr->width, xr->length);
+ cairo_fill (cairo);
+ cairo_restore (cairo);
+
+ cairo_translate (cairo,
+ xr_to_pt (xr->left_margin),
+ xr_to_pt (xr->top_margin));
+ }
xr->page_number++;
xr->cairo = cairo;
*height = h;
}
}
+
+static void
+xr_draw_title (struct xr_driver *xr, const char *title,
+ int title_width, int title_height)
+{
+ struct table_cell cell;
+ int bb[TABLE_N_AXES][2];
+
+ xr_init_caption_cell (title, &cell);
+ bb[H][0] = 0;
+ bb[H][1] = title_width;
+ bb[V][0] = 0;
+ bb[V][1] = title_height;
+ xr_draw_cell (xr, &cell, bb, bb);
+}
\f
-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 =
{
struct xr_rendering
{
+ struct output_item *item;
+
/* Table items. */
struct render_page *page;
struct xr_driver *xr;
+ int title_width;
int title_height;
-
- /* Chart items. */
- struct chart_item *chart;
};
#define CHART_WIDTH 500
#define CHART_HEIGHT 375
+
+
struct xr_driver *
xr_driver_create (cairo_t *cairo, struct string_map *options)
{
struct table_item *table_item;
struct xr_rendering *r;
- table_item = table_item_create (table_from_string (0, text), NULL);
+ table_item = table_item_create (table_from_string (TAB_LEFT, text), NULL);
r = xr_rendering_create (xr, &table_item->output_item, cr);
table_item_unref (table_item);
return r;
}
+void
+xr_rendering_apply_options (struct xr_rendering *xr, struct string_map *o)
+{
+ if (is_table_item (xr->item))
+ apply_options (xr->xr, o);
+}
+
struct xr_rendering *
xr_rendering_create (struct xr_driver *xr, const struct output_item *item,
cairo_t *cr)
else if (is_table_item (item))
{
r = xzalloc (sizeof *r);
+ r->item = output_item_ref (item);
r->xr = xr;
xr_set_cairo (xr, cr);
r->page = xr_render_table_item (xr, to_table_item (item),
- &r->title_height);
+ &r->title_width, &r->title_height);
}
else if (is_chart_item (item))
{
r = xzalloc (sizeof *r);
- r->chart = to_chart_item (output_item_ref (item));
+ r->item = output_item_ref (item);
}
return r;
void
xr_rendering_measure (struct xr_rendering *r, int *w, int *h)
{
- if (r->chart == NULL)
+ if (is_table_item (r->item))
{
- *w = render_page_get_size (r->page, H) / 1024;
- *h = (render_page_get_size (r->page, V) + r->title_height) / 1024;
+ int w0 = render_page_get_size (r->page, H);
+ int w1 = r->title_width;
+ *w = MAX (w0, w1) / XR_POINT;
+ *h = (render_page_get_size (r->page, V) + r->title_height) / XR_POINT;
}
else
{
}
}
+static void xr_draw_chart (const struct chart_item *, cairo_t *,
+ double x, double y, double width, double height);
+
/* Draws onto CR at least the region of R that is enclosed in (X,Y)-(X+W,Y+H),
and possibly some additional parts. */
void
xr_rendering_draw (struct xr_rendering *r, cairo_t *cr,
int x, int y, int w, int h)
{
- if (r->chart == NULL)
+ if (is_table_item (r->item))
{
struct xr_driver *xr = r->xr;
xr_set_cairo (xr, cr);
- xr->y = 0;
- render_page_draw_region (r->page,
- x * 1024, y * 1024, w * 1024, h * 1024);
+
+ if (r->title_height > 0)
+ {
+ xr->y = 0;
+ xr_draw_title (xr, table_item_get_caption (to_table_item (r->item)),
+ r->title_width, r->title_height);
+ }
+
+ xr->y = r->title_height;
+ 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 (r->chart, cr, 0, 0, CHART_WIDTH, CHART_HEIGHT);
+ xr_draw_chart (to_chart_item (r->item), cr,
+ 0, 0, CHART_WIDTH, CHART_HEIGHT);
}
-void
+static void
xr_draw_chart (const struct chart_item *chart_item, cairo_t *cr,
double x, double y, double width, double height)
{
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);
surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, length);
cr = cairo_create (surface);
- cairo_save (cr);
- cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
- cairo_rectangle (cr, 0, 0, width, length);
- cairo_fill (cr);
- cairo_restore (cr);
-
cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
xr_draw_chart (item, cr, 0.0, 0.0, width, length);
status = cairo_surface_write_to_png (surface, file_name);
if (status != CAIRO_STATUS_SUCCESS)
- error (0, 0, _("error writing output file \"%s\": %s"),
+ msg (ME, _("error writing output file `%s': %s"),
file_name, cairo_status_to_string (status));
cairo_destroy (cr);
if (ts->caption_height)
{
if (xr->cairo)
- {
- struct table_cell cell;
- int bb[TABLE_N_AXES][2];
-
- xr_init_caption_cell (table_item_get_caption (ts->table_item),
- &cell);
- bb[H][0] = 0;
- bb[H][1] = xr->width;
- bb[V][0] = 0;
- bb[V][1] = ts->caption_height;
- xr_draw_cell (xr, &cell, bb, bb);
- }
+ xr_draw_title (xr, table_item_get_caption (ts->table_item),
+ xr->width, ts->caption_height);
+
xr->y += ts->caption_height;
ts->caption_height = 0;
}
{
struct xr_table_state *ts;
struct render_page *page;
+ int caption_width;
ts = xmalloc (sizeof *ts);
ts->fsm.render = xr_table_render;
if (xr->y > 0)
xr->y += xr->char_height;
- page = xr_render_table_item (xr, table_item, &ts->caption_height);
+ page = xr_render_table_item (xr, table_item,
+ &caption_width, &ts->caption_height);
xr->params->size[V] = xr->length - ts->caption_height;
render_break_init (&ts->x_break, page, H);