![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 4c988be46b5153689f1461c966e6bbfbcfae99c9..d5a098c391d91ef390ea47a3aa8d32f65a241311 100644 (file)
#include <display/nr-arena-shape.h>
#include "display/curve.h"
#include <libnr/nr-pixops.h>
-#include <libnr/nr-matrix-ops.h>
-#include <libnr/nr-matrix-fns.h>
#include <libnr/nr-blit.h>
#include <libnr/nr-convert2geom.h>
#include <2geom/pathvector.h>
#include "display/nr-filter.h"
#include <typeinfo>
#include <cairo.h>
+#include "preferences.h"
+#include "svg/svg-device-color.h"
#include <glib.h>
#include "svg/svg.h"
@@ -229,7 +229,7 @@ nr_arena_shape_set_child_position(NRArenaItem *item, NRArenaItem *child, NRArena
void nr_arena_shape_update_stroke(NRArenaShape *shape, NRGC* gc, NRRectL *area);
void nr_arena_shape_update_fill(NRArenaShape *shape, NRGC *gc, NRRectL *area, bool force_shape = false);
-void nr_arena_shape_add_bboxes(NRArenaShape* shape, Geom::Rect &bbox);
+void nr_arena_shape_add_bboxes(NRArenaShape* shape, Geom::OptRect &bbox);
/**
* Updates the arena shape 'item' and all of its children, including the markers.
static guint
nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, guint reset)
{
- Geom::Rect boundingbox;
+ Geom::OptRect boundingbox;
NRArenaShape *shape = NR_ARENA_SHAPE(item);
@@ -255,10 +255,15 @@ nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, g
if (state & NR_ARENA_ITEM_STATE_BBOX) {
if (shape->curve) {
boundingbox = bounds_exact_transformed(shape->curve->get_pathvector(), gc->transform);
- item->bbox.x0 = (gint32)(boundingbox[0][0] - 1.0F);
- item->bbox.y0 = (gint32)(boundingbox[1][0] - 1.0F);
- item->bbox.x1 = (gint32)(boundingbox[0][1] + 1.9999F);
- item->bbox.y1 = (gint32)(boundingbox[1][1] + 1.9999F);
+ /// \todo just write item->bbox = boundingbox
+ if (boundingbox) {
+ item->bbox.x0 = (gint32)((*boundingbox)[0][0] - 1.0F);
+ item->bbox.y0 = (gint32)((*boundingbox)[1][0] - 1.0F);
+ item->bbox.x1 = (gint32)((*boundingbox)[0][1] + 1.9999F);
+ item->bbox.y1 = (gint32)((*boundingbox)[1][1] + 1.9999F);
+ } else {
+ item->bbox = NR_RECT_L_EMPTY;
+ }
}
if (beststate & NR_ARENA_ITEM_STATE_BBOX) {
for (NRArenaItem *child = shape->markers; child != NULL; child = child->next) {
@@ -271,43 +276,44 @@ nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, g
shape->delayed_shp=true;
shape->ctm = gc->transform;
- boundingbox[0][0] = boundingbox[1][0] = NR_HUGE;
- boundingbox[0][1] = boundingbox[1][1] = -NR_HUGE;
+ boundingbox = Geom::OptRect();
bool outline = (NR_ARENA_ITEM(shape)->arena->rendermode == Inkscape::RENDERMODE_OUTLINE);
if (shape->curve) {
boundingbox = bounds_exact_transformed(shape->curve->get_pathvector(), gc->transform);
- if (shape->_stroke.paint.type() != NRArenaShape::Paint::NONE || outline) {
+ if (boundingbox && (shape->_stroke.paint.type() != NRArenaShape::Paint::NONE || outline)) {
float width, scale;
scale = gc->transform.descrim();
width = MAX(0.125, shape->_stroke.width * scale);
if ( fabs(shape->_stroke.width * scale) > 0.01 ) { // sinon c'est 0=oon veut pas de bord
- boundingbox.expandBy(width);
+ boundingbox->expandBy(width);
}
// those pesky miters, now
float miterMax=width*shape->_stroke.mitre_limit;
if ( miterMax > 0.01 ) {
// grunt mode. we should compute the various miters instead (one for each point on the curve)
- boundingbox.expandBy(miterMax);
+ boundingbox->expandBy(miterMax);
}
}
+ }
+
+ /// \todo just write item->bbox = boundingbox
+ if (boundingbox) {
+ shape->approx_bbox.x0 = (gint32)((*boundingbox)[0][0] - 1.0F);
+ shape->approx_bbox.y0 = (gint32)((*boundingbox)[1][0] - 1.0F);
+ shape->approx_bbox.x1 = (gint32)((*boundingbox)[0][1] + 1.9999F);
+ shape->approx_bbox.y1 = (gint32)((*boundingbox)[1][1] + 1.9999F);
} else {
+ shape->approx_bbox = NR_RECT_L_EMPTY;
}
- shape->approx_bbox.x0 = (gint32)(boundingbox[0][0] - 1.0F);
- shape->approx_bbox.y0 = (gint32)(boundingbox[1][0] - 1.0F);
- shape->approx_bbox.x1 = (gint32)(boundingbox[0][1] + 1.9999F);
- shape->approx_bbox.y1 = (gint32)(boundingbox[1][1] + 1.9999F);
if ( area && nr_rect_l_test_intersect_ptr(area, &shape->approx_bbox) ) shape->delayed_shp=false;
/* Release state data */
- if (TRUE || !Geom::transform_equalp(gc->transform, shape->ctm, NR_EPSILON)) {
- /* Concept test */
- if (shape->fill_shp) {
- delete shape->fill_shp;
- shape->fill_shp = NULL;
- }
+ if (shape->fill_shp) {
+ delete shape->fill_shp;
+ shape->fill_shp = NULL;
}
if (shape->stroke_shp) {
delete shape->stroke_shp;
@@ -339,23 +345,28 @@ nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, g
nr_arena_shape_update_stroke(shape, gc, area);
nr_arena_shape_update_fill(shape, gc, area);
- boundingbox[0][0] = boundingbox[0][1] = boundingbox[1][0] = boundingbox[1][1] = 0.0;
+ boundingbox = Geom::OptRect();
nr_arena_shape_add_bboxes(shape, boundingbox);
- shape->approx_bbox.x0 = (gint32)(boundingbox[0][0] - 1.0F);
- shape->approx_bbox.y0 = (gint32)(boundingbox[1][0] - 1.0F);
- shape->approx_bbox.x1 = (gint32)(boundingbox[0][1] + 1.9999F);
- shape->approx_bbox.y1 = (gint32)(boundingbox[1][1] + 1.9999F);
+ /// \todo just write shape->approx_bbox = boundingbox
+ if (boundingbox) {
+ shape->approx_bbox.x0 = (gint32)((*boundingbox)[0][0] - 1.0F);
+ shape->approx_bbox.y0 = (gint32)((*boundingbox)[1][0] - 1.0F);
+ shape->approx_bbox.x1 = (gint32)((*boundingbox)[0][1] + 1.9999F);
+ shape->approx_bbox.y1 = (gint32)((*boundingbox)[1][1] + 1.9999F);
+ } else {
+ shape->approx_bbox = NR_RECT_L_EMPTY;
+ }
}
- if (boundingbox.isEmpty())
+ if (!boundingbox)
return NR_ARENA_ITEM_STATE_ALL;
- item->bbox.x0 = (gint32)(boundingbox[0][0] - 1.0F);
- item->bbox.y0 = (gint32)(boundingbox[1][0] - 1.0F);
- item->bbox.x1 = (gint32)(boundingbox[0][1] + 1.0F);
- item->bbox.y1 = (gint32)(boundingbox[1][1] + 1.0F);
- nr_arena_request_render_rect(item->arena, &item->bbox);
+ /// \todo just write item->bbox = boundingbox
+ item->bbox.x0 = (gint32)((*boundingbox)[0][0] - 1.0F);
+ item->bbox.y0 = (gint32)((*boundingbox)[1][0] - 1.0F);
+ item->bbox.x1 = (gint32)((*boundingbox)[0][1] + 1.0F);
+ item->bbox.y1 = (gint32)((*boundingbox)[1][1] + 1.0F);
item->render_opacity = TRUE;
if ( shape->_fill.paint.type() == NRArenaShape::Paint::SERVER ) {
nr_arena_shape_update_fill(NRArenaShape *shape, NRGC *gc, NRRectL *area, bool force_shape)
{
if ((shape->_fill.paint.type() != NRArenaShape::Paint::NONE || force_shape) &&
-// ((shape->curve->get_length() > 2) || (SP_CURVE_BPATH(shape->curve)[1].code == NR_CURVETO)) ) { // <-- this used to be the old code, i think it has to determine that the path has a sort of 'internal region' where fill would occur
has_inner_area(shape->curve->get_pathvector()) ) {
- if (TRUE || !shape->fill_shp) {
+
Geom::Matrix cached_to_new = Geom::identity();
int isometry = 0;
if ( shape->cached_fill ) {
@@ -522,7 +532,6 @@ nr_arena_shape_update_fill(NRArenaShape *shape, NRGC *gc, NRRectL *area, bool fo
shape->fill_shp->needEdgesSorting();
}
shape->delayed_shp |= shape->cached_fpartialy;
- }
}
}
void
-nr_arena_shape_add_bboxes(NRArenaShape* shape, Geom::Rect &bbox)
+nr_arena_shape_add_bboxes(NRArenaShape* shape, Geom::OptRect &bbox)
{
/* TODO: are these two if's mutually exclusive? ( i.e. "shape->stroke_shp <=> !shape->fill_shp" )
* if so, then this can be written much more compact ! */
// cairo outline rendering:
static unsigned int
-cairo_arena_shape_render_outline(cairo_t *ct, NRArenaItem *item, boost::optional<Geom::Rect> area)
+cairo_arena_shape_render_outline(cairo_t *ct, NRArenaItem *item, Geom::OptRect area)
{
NRArenaShape *shape = NR_ARENA_SHAPE(item);
if (!shape->style) return item->state;
bool outline = (NR_ARENA_ITEM(shape)->arena->rendermode == Inkscape::RENDERMODE_OUTLINE);
+ bool print_colors = (NR_ARENA_ITEM(shape)->arena->rendermode == Inkscape::RENDERMODE_PRINT_COLORS_PREVIEW);
if (outline) { // cairo outline rendering
@@ -866,7 +876,22 @@ nr_arena_shape_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock
}
}
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+
SPStyle const *style = shape->style;
+ bool render_cyan = prefs->getBool("/options/printcolorspreview/cyan", true);
+ bool render_magenta = prefs->getBool("/options/printcolorspreview/magenta", true);
+ bool render_yellow = prefs->getBool("/options/printcolorspreview/yellow", true);
+ bool render_black = prefs->getBool("/options/printcolorspreview/black", true);
+
+ float rgb_v[3];
+ float cmyk_v[4];
+#define FLOAT_TO_UINT8(f) (int(f*255))
+#define RGBA_R(v) ((v) >> 24)
+#define RGBA_G(v) (((v) >> 16) & 0xff)
+#define RGBA_B(v) (((v) >> 8) & 0xff)
+#define RGBA_A(v) ((v) & 0xff)
+
if (shape->fill_shp) {
NRPixBlock m;
guint32 rgba;
@@ -886,12 +911,24 @@ nr_arena_shape_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock
if (shape->_fill.paint.type() == NRArenaShape::Paint::NONE) {
// do not render fill in any way
} else if (shape->_fill.paint.type() == NRArenaShape::Paint::COLOR) {
+
+ const SPColor* fill_color = &shape->_fill.paint.color();
if ( item->render_opacity ) {
- rgba = shape->_fill.paint.color().toRGBA32( shape->_fill.opacity *
- SP_SCALE24_TO_FLOAT(style->opacity.value) );
+ rgba = fill_color->toRGBA32( shape->_fill.opacity *
+ SP_SCALE24_TO_FLOAT(style->opacity.value) );
} else {
- rgba = shape->_fill.paint.color().toRGBA32( shape->_fill.opacity );
+ rgba = fill_color->toRGBA32( shape->_fill.opacity );
+ }
+
+ if (print_colors){
+ sp_color_rgb_to_cmyk_floatv (cmyk_v, RGBA_R(rgba)/256.0, RGBA_G(rgba)/256.0, RGBA_B(rgba)/256.0);
+ sp_color_cmyk_to_rgb_floatv (rgb_v, render_cyan ? cmyk_v[0] : 0,
+ render_magenta ? cmyk_v[1] : 0,
+ render_yellow ? cmyk_v[2] : 0,
+ render_black ? cmyk_v[3] : 0);
+ rgba = (FLOAT_TO_UINT8(rgb_v[0])<<24) + (FLOAT_TO_UINT8(rgb_v[1])<<16) + (FLOAT_TO_UINT8(rgb_v[2])<<8) + 0xff;
}
+
nr_blit_pixblock_mask_rgba32(pb, &m, rgba);
pb->empty = FALSE;
} else if (shape->_fill.paint.type() == NRArenaShape::Paint::SERVER) {
@@ -922,14 +959,25 @@ nr_arena_shape_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock
nr_pixblock_render_shape_mask_or(m, shape->stroke_shp);
m.empty = FALSE;
- if ( item->render_opacity ) {
- rgba = shape->_stroke.paint.color().toRGBA32( shape->_stroke.opacity *
- SP_SCALE24_TO_FLOAT(style->opacity.value) );
- } else {
- rgba = shape->_stroke.paint.color().toRGBA32( shape->_stroke.opacity );
- }
- nr_blit_pixblock_mask_rgba32(pb, &m, rgba);
- pb->empty = FALSE;
+ const SPColor* stroke_color = &shape->_stroke.paint.color();
+ if ( item->render_opacity ) {
+ rgba = stroke_color->toRGBA32( shape->_stroke.opacity *
+ SP_SCALE24_TO_FLOAT(style->opacity.value) );
+ } else {
+ rgba = stroke_color->toRGBA32( shape->_stroke.opacity );
+ }
+
+ if (print_colors){
+ sp_color_rgb_to_cmyk_floatv (cmyk_v, RGBA_R(rgba)/256.0, RGBA_G(rgba)/256.0, RGBA_B(rgba)/256.0);
+ sp_color_cmyk_to_rgb_floatv (rgb_v, render_cyan ? cmyk_v[0] : 0,
+ render_magenta ? cmyk_v[1] : 0,
+ render_yellow ? cmyk_v[2] : 0,
+ render_black ? cmyk_v[3] : 0);
+ rgba = (FLOAT_TO_UINT8(rgb_v[0])<<24) + (FLOAT_TO_UINT8(rgb_v[1])<<16) + (FLOAT_TO_UINT8(rgb_v[2])<<8) + 0xff;
+ }
+
+ nr_blit_pixblock_mask_rgba32(pb, &m, rgba);
+ pb->empty = FALSE;
nr_pixblock_release(&m);
if (style->filter.set && style->getFilter()) {
if (!shape->filter) {
int primitives = sp_filter_primitive_count(SP_FILTER(style->getFilter()));
- shape->filter = new NR::Filter(primitives);
+ shape->filter = new Inkscape::Filters::Filter(primitives);
}
sp_filter_build_renderer(SP_FILTER(style->getFilter()), shape->filter);
} else {