Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[10003] trunk
|
From: <hez...@us...> - 2009-05-25 17:41:29
|
Revision: 10003
http://plplot.svn.sourceforge.net/plplot/?rev=10003&view=rev
Author: hezekiahcarty
Date: 2009-05-25 17:41:11 +0000 (Mon, 25 May 2009)
Log Message:
-----------
Add offscreen/raster rendering support in the Cairo driver for plimage and plimagefr
Modified Paths:
--------------
trunk/drivers/cairo.c
trunk/include/plplot.h
trunk/src/plimage.c
Modified: trunk/drivers/cairo.c
===================================================================
--- trunk/drivers/cairo.c 2009-05-24 16:10:28 UTC (rev 10002)
+++ trunk/drivers/cairo.c 2009-05-25 17:41:11 UTC (rev 10003)
@@ -73,18 +73,23 @@
static int text_anti_aliasing;
static int graphics_anti_aliasing;
static int external_drawable;
+static int rasterize_image;
static DrvOpt cairo_options[] = {{"text_clipping", DRV_INT, &text_clipping, "Use text clipping (text_clipping=0|1)"},
{"text_anti_aliasing", DRV_INT, &text_anti_aliasing, "Set desired text anti-aliasing (text_anti_aliasing=0|1|2|3). The numbers are in the same order as the cairo_antialias_t enumeration documented at http://cairographics.org/manual/cairo-cairo-t.html#cairo-antialias-t)"},
{"graphics_anti_aliasing", DRV_INT, &graphics_anti_aliasing, "Set desired graphics anti-aliasing (graphics_anti_aliasing=0|1|2|3). The numbers are in the same order as the cairo_antialias_t enumeration documented at http://cairographics.org/manual/cairo-cairo-t.html#cairo-antialias-t"},
{"external_drawable", DRV_INT, &external_drawable, "Plot to external X drawable"},
+ {"rasterize_image", DRV_INT, &rasterize_image, "Raster or vector image rendering (rasterize_image=0|1)"},
{NULL, DRV_INT, NULL, NULL}};
typedef struct {
cairo_surface_t *cairoSurface;
cairo_t *cairoContext;
+ cairo_surface_t *cairoSurface_raster;
+ cairo_t *cairoContext_raster;
short text_clipping;
short text_anti_aliasing;
short graphics_anti_aliasing;
+ short rasterize_image;
double downscale;
char *pangoMarkupString;
short upDown;
@@ -211,6 +216,9 @@
static void poly_line(PLStream *, short *, short *, PLINT);
static void filled_polygon(PLStream *pls, short *xa, short *ya, PLINT npts);
static void rotate_cairo_surface(PLStream *, float, float, float, float, float, float);
+/* Rasterization of plotted material */
+static void start_raster(PLStream*);
+static void end_raster(PLStream*);
/* PLplot interface functions */
@@ -224,6 +232,84 @@
void plD_polyline_cairo (PLStream *, short *, short *, PLINT);
/*----------------------------------------------------------------------
+ start_raster()
+
+ Set up off-screen rasterized rendering
+ ----------------------------------------------------------------------*/
+
+void start_raster(PLStream *pls)
+{
+ PLCairo *aStream;
+ cairo_surface_t *tmp_sfc;
+ cairo_t *tmp_context;
+
+ aStream = (PLCairo *)pls->dev;
+
+ /* Do not use the external surface if the user says not to */
+ if (!aStream->rasterize_image)
+ return;
+
+ /* Create an image surface and context for the offscreen rendering */
+ aStream->cairoSurface_raster =
+ cairo_image_surface_create(CAIRO_FORMAT_ARGB32, pls->xlength, pls->ylength);
+ aStream->cairoContext_raster = cairo_create(aStream->cairoSurface_raster);
+
+ /* Disable antialiasing for the raster surface. The output seems to look
+ better that way. */
+ cairo_set_antialias(aStream->cairoContext_raster, CAIRO_ANTIALIAS_NONE);
+
+ /* Swap the raster and main plot surfaces and contexts */
+ tmp_sfc = aStream->cairoSurface;
+ tmp_context = aStream->cairoContext;
+ aStream->cairoSurface = aStream->cairoSurface_raster;
+ aStream->cairoContext = aStream->cairoContext_raster;
+ /* Save the main plot surface and context for when we are finished */
+ aStream->cairoSurface_raster = tmp_sfc;
+ aStream->cairoContext_raster = tmp_context;
+}
+
+/*----------------------------------------------------------------------
+ end_raster()
+
+ Finish off-screen rasterized rendering and copy the result on to the
+ main plot surface.
+ ----------------------------------------------------------------------*/
+
+void end_raster(PLStream *pls)
+{
+ PLCairo *aStream;
+ cairo_surface_t *tmp_sfc;
+ cairo_t *tmp_context;
+
+ aStream = (PLCairo *)pls->dev;
+
+ /* Do not use the external surface if the user says not to */
+ if (!aStream->rasterize_image)
+ return;
+
+ /* Some Cairo devices support delayed device setup (eg: xcairo with
+ external drawable and extcairo with an external context). */
+ if (aStream->cairoContext == NULL)
+ plexit("Can not plot to a Cairo device with no context");
+
+ /* Restore the main plot surface and context for future plotting */
+ tmp_sfc = aStream->cairoSurface;
+ tmp_context = aStream->cairoContext;
+ aStream->cairoSurface = aStream->cairoSurface_raster;
+ aStream->cairoContext = aStream->cairoContext_raster;
+ aStream->cairoSurface_raster = tmp_sfc;
+ aStream->cairoContext_raster = tmp_context;
+
+ /* Blit the raster surface on to the main plot */
+ cairo_set_source_surface(aStream->cairoContext, aStream->cairoSurface_raster, 0.0, 0.0);
+ cairo_paint(aStream->cairoContext);
+
+ /* Free the now extraneous surface and context */
+ cairo_destroy(aStream->cairoContext_raster);
+ cairo_surface_destroy(aStream->cairoSurface_raster);
+}
+
+/*----------------------------------------------------------------------
plD_bop_cairo()
Set up for the next page.
@@ -394,6 +480,12 @@
case PLESC_END_TEXT: /* finish a string of text */
text_end_cairo(pls, (EscText *) ptr);
break;
+ case PLESC_START_RASTERIZE: /* Start offscreen/rasterized rendering */
+ start_raster(pls);
+ break;
+ case PLESC_END_RASTERIZE: /* End offscreen/rasterized rendering */
+ end_raster(pls);
+ break;
}
}
@@ -943,8 +1035,9 @@
speed for a modern cairo stack.*/
aStream->text_clipping = 1;
text_clipping = 1;
- text_anti_aliasing = 0; // use 'default' text aliasing by default
- graphics_anti_aliasing = 0; // use 'default' graphics aliasing by default
+ text_anti_aliasing = 0; /* use 'default' text aliasing by default */
+ graphics_anti_aliasing = 0; /* use 'default' graphics aliasing by default */
+ rasterize_image = 1; /* Enable rasterization by default */
/* Check for cairo specific options */
plParseDrvOpts(cairo_options);
@@ -954,9 +1047,10 @@
aStream->text_clipping = 0;
}
- /* Record users desired text and graphics aliasing */
+ /* Record users desired text and graphics aliasing and rasterization */
aStream->text_anti_aliasing = text_anti_aliasing;
aStream->graphics_anti_aliasing = graphics_anti_aliasing;
+ aStream->rasterize_image = rasterize_image;
return aStream;
}
Modified: trunk/include/plplot.h
===================================================================
--- trunk/include/plplot.h 2009-05-24 16:10:28 UTC (rev 10002)
+++ trunk/include/plplot.h 2009-05-25 17:41:11 UTC (rev 10003)
@@ -269,6 +269,8 @@
#define PLESC_TEXT_CHAR 29 /* render a character of text */
#define PLESC_CONTROL_CHAR 30 /* handle a text control character (super/subscript, etc.) */
#define PLESC_END_TEXT 31 /* finish a drawing a line of text */
+#define PLESC_START_RASTERIZE 32 /* start rasterized rendering */
+#define PLESC_END_RASTERIZE 33 /* end rasterized rendering */
/* Alternative unicode text handling control characters */
#define PLTEXT_FONTCHANGE 0 /* font change in the text stream */
Modified: trunk/src/plimage.c
===================================================================
--- trunk/src/plimage.c 2009-05-24 16:10:28 UTC (rev 10002)
+++ trunk/src/plimage.c 2009-05-25 17:41:11 UTC (rev 10003)
@@ -101,6 +101,7 @@
/* The color to use in the fill */
PLFLT color;
+ plP_esc(PLESC_START_RASTERIZE, NULL);
for (ix = 0; ix < nx ; ix++) {
for (iy = 0; iy < ny ; iy++) {
/* Only plot values within in appropriate range */
@@ -134,6 +135,7 @@
plfill(4, xf, yf);
}
}
+ plP_esc(PLESC_END_RASTERIZE, NULL);
}
void
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
