![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index a45c24a19e5c414ca55ee68b7b0c6eedb579daf3..02e398c453c45703b2e02f01e11e3c9fd9da8cb2 100644 (file)
--- a/src/flood-context.cpp
+++ b/src/flood-context.cpp
#include "snap.h"
#include "desktop.h"
#include "desktop-style.h"
+#include "message-stack.h"
#include "message-context.h"
-#include "pixmaps/cursor-rect.xpm"
+#include "pixmaps/cursor-paintbucket.xpm"
#include "flood-context.h"
#include "sp-metrics.h"
#include <glibmm/i18n.h>
{
SPEventContext *event_context = SP_EVENT_CONTEXT(flood_context);
- event_context->cursor_shape = cursor_rect_xpm;
- event_context->hot_x = 4;
- event_context->hot_y = 4;
+ event_context->cursor_shape = cursor_paintbucket_xpm;
+ event_context->hot_x = 11;
+ event_context->hot_y = 30;
event_context->xp = 0;
event_context->yp = 0;
event_context->tolerance = 0;
return px + (x + y * width) * 4;
}
-static void try_add_to_queue(std::queue<NR::Point> *fill_queue, guchar *px, int x, int y, int width) {
+static bool compare_pixels(unsigned char *a, unsigned char *b, int tolerance) {
+ int diff = 0;
+ for (int i = 0; i < 4; i++) {
+ diff += (int)abs(a[i] - b[i]);
+ }
+ return ((diff / 4) <= tolerance);
+}
+
+static bool try_add_to_queue(std::queue<NR::Point> *fill_queue, guchar *px, guchar *trace_px, unsigned char *orig, int x, int y, int width, int tolerance, bool fill_switch) {
unsigned char *t = get_pixel(px, x, y, width);
- if (t[3] == 0) {
- fill_queue->push(NR::Point(x, y));
+ if (compare_pixels(t, orig, tolerance)) {
+ unsigned char *trace_t = get_pixel(trace_px, x, y, width);
+ if (trace_t[3] != 255) {
+ if (fill_switch) {
+ fill_queue->push(NR::Point(x, y));
+ }
+ }
+ return false;
}
+ return true;
}
static void do_trace(GdkPixbuf *px, SPDesktop *desktop, NR::Matrix transform) {
Inkscape::XML::Node *pathRepr = xml_doc->createElement("svg:path");
/* Set style */
- sp_desktop_apply_style_tool (desktop, pathRepr, "tools.flood", false);
+ sp_desktop_apply_style_tool (desktop, pathRepr, "tools.paintbucket", false);
NArtBpath *bpath = sp_svg_read_path(result.getPathData().c_str());
Path *path = bpath_to_Path(bpath);
@@ -321,14 +337,30 @@ static void do_trace(GdkPixbuf *px, SPDesktop *desktop, NR::Matrix transform) {
delete expanded_path;
pathRepr->setAttribute("d", str);
g_free(str);
-
+
layer_repr->addChild(pathRepr, NULL);
SPObject *reprobj = document->getObjectByRepr(pathRepr);
if (reprobj) {
sp_item_write_transform(SP_ITEM(reprobj), pathRepr, transform, NULL);
+
+ // premultiply the item transform by the accumulated parent transform in the paste layer
+ NR::Matrix local = sp_item_i2doc_affine(SP_GROUP(desktop->currentLayer()));
+ if (!local.test_identity()) {
+ gchar const *t_str = pathRepr->attribute("transform");
+ NR::Matrix item_t (NR::identity());
+ if (t_str)
+ sp_svg_transform_read(t_str, &item_t);
+ item_t *= local.inverse();
+ // (we're dealing with unattached repr, so we write to its attr instead of using sp_item_set_transform)
+ gchar *affinestr=sp_svg_transform_write(item_t);
+ pathRepr->setAttribute("transform", affinestr);
+ g_free(affinestr);
+ }
+
Inkscape::Selection *selection = sp_desktop_selection(desktop);
selection->set(reprobj);
+ pathRepr->setPosition(-1);
}
Inkscape::GC::release(pathRepr);
@@ -348,19 +380,31 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
SPItem *document_root = SP_ITEM(SP_DOCUMENT_ROOT(document));
NR::Rect bbox = document_root->invokeBbox(NR::identity());
- if (bbox.isEmpty()) { return; }
+ if (bbox.isEmpty()) {
+ desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("<b>Area is not bounded</b>, cannot fill."));
+ return;
+ }
+
+ double zoom_scale = desktop->current_zoom();
+ double padding = 1.6;
+
+ NR::Rect screen = desktop->get_display_area();
- int width = (int)ceil(bbox.extent(NR::X));
- int height = (int)ceil(bbox.extent(NR::Y));
+ int width = (int)ceil(screen.extent(NR::X) * zoom_scale * padding);
+ int height = (int)ceil(screen.extent(NR::Y) * zoom_scale * padding);
- NR::Point origin(bbox.min()[NR::X], bbox.min()[NR::Y]);
+ NR::Point origin(screen.min()[NR::X],
+ sp_document_height(document) - screen.extent(NR::Y) - screen.min()[NR::Y]);
+
+ origin[NR::X] = origin[NR::X] + (screen.extent(NR::X) * ((1 - padding) / 2));
+ origin[NR::Y] = origin[NR::Y] + (screen.extent(NR::Y) * ((1 - padding) / 2));
- NR::scale scale(width / (bbox.extent(NR::X)), height / (bbox.extent(NR::Y)));
+ NR::scale scale(zoom_scale, zoom_scale);
NR::Matrix affine = scale * NR::translate(-origin * scale);
/* Create ArenaItems and set transform */
NRArenaItem *root = sp_item_invoke_show(SP_ITEM(sp_document_root(document)), arena, dkey, SP_ITEM_SHOW_DISPLAY);
- nr_arena_item_set_transform(root, affine);
+ nr_arena_item_set_transform(NR_ARENA_ITEM(root), affine);
NRGC gc(NULL);
nr_matrix_set_identity(&gc.transform);
@@ -373,60 +417,72 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
nr_arena_item_invoke_update(root, &final_bbox, &gc, NR_ARENA_ITEM_STATE_ALL, NR_ARENA_ITEM_STATE_NONE);
-// /* Set up pixblocks */
guchar *px = g_new(guchar, 4 * width * height);
memset(px, 0x00, 4 * width * height);
- guchar *trace_px = g_new(guchar, 4 * width * height);
- memset(trace_px, 0x00, 4 * width * height);
-
NRPixBlock B;
nr_pixblock_setup_extern( &B, NR_PIXBLOCK_MODE_R8G8B8A8N,
final_bbox.x0, final_bbox.y0, final_bbox.x1, final_bbox.y1,
px, 4 * width, FALSE, FALSE );
- nr_arena_item_invoke_render( root, &final_bbox, &B, NR_ARENA_ITEM_RENDER_NO_CACHE );
-
+ nr_arena_item_invoke_render(NULL, root, &final_bbox, &B, NR_ARENA_ITEM_RENDER_NO_CACHE );
nr_pixblock_release(&B);
+
+ // Hide items
+ sp_item_invoke_hide(SP_ITEM(sp_document_root(document)), dkey);
+
nr_arena_item_unref(root);
nr_object_unref((NRObject *) arena);
- double zoom_scale = desktop->current_zoom();
-
NR::Point pw = NR::Point(event->button.x / zoom_scale, sp_document_height(document) + (event->button.y / zoom_scale)) * affine;
pw[NR::X] = (int)MIN(width - 1, MAX(0, pw[NR::X]));
pw[NR::Y] = (int)MIN(height - 1, MAX(0, pw[NR::Y]));
+ guchar *trace_px = g_new(guchar, 4 * width * height);
+ memset(trace_px, 0x00, 4 * width * height);
+
std::queue<NR::Point> fill_queue;
fill_queue.push(pw);
bool aborted = false;
int y_limit = height - 1;
+ unsigned char orig_color[4];
+ unsigned char *orig_px = get_pixel(px, (int)pw[NR::X], (int)pw[NR::Y], width);
+ for (int i = 0; i < 4; i++) { orig_color[i] = orig_px[i]; }
+
+ int tolerance = (255 * prefs_get_int_attribute_limited("tools.paintbucket", "tolerance", 1, 0, 100)) / 100;
+
while (!fill_queue.empty() && !aborted) {
NR::Point cp = fill_queue.front();
fill_queue.pop();
unsigned char *s = get_pixel(px, (int)cp[NR::X], (int)cp[NR::Y], width);
- // nothing at this point
- if (s[3] == 0) {
+ // same color at this point
+ if (compare_pixels(s, orig_color, tolerance)) {
int left = (int)cp[NR::X];
int right = (int)cp[NR::X] + 1;
int x = (int)cp[NR::X];
int y = (int)cp[NR::Y];
+ bool top_fill = true;
+ bool bottom_fill = true;
+
if (y > 0) {
- try_add_to_queue(&fill_queue, px, x, y - 1, width);
+ top_fill = try_add_to_queue(&fill_queue, px, trace_px, orig_color, x, y - 1, width, tolerance, top_fill);
} else {
aborted = true; break;
}
if (y < y_limit) {
- try_add_to_queue(&fill_queue, px, x, y + 1, width);
+ bottom_fill = try_add_to_queue(&fill_queue, px, trace_px, orig_color, x, y + 1, width, tolerance, bottom_fill);
} else {
aborted = true; break;
}
+ bool default_top_fill = top_fill;
+ bool default_bottom_fill = bottom_fill;
+
unsigned char *t, *trace_t;
bool ok = false;
@@ -435,12 +491,12 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
// go left
if (left >= 0) {
t = get_pixel(px, left, y, width);
- if (t[3] == 0) {
- t[0] = 255; t[3] = 255;
+ if (compare_pixels(t, orig_color, tolerance)) {
+ for (int i = 0; i < 4; i++) { t[i] = 255 - t[i]; }
trace_t = get_pixel(trace_px, left, y, width);
- trace_t[0] = 255; trace_t[3] = 255;
- if (y > 0) { try_add_to_queue(&fill_queue, px, left, y - 1, width); }
- if (y < y_limit) { try_add_to_queue(&fill_queue, px, left, y + 1, width); }
+ trace_t[3] = 255;
+ if (y > 0) { top_fill = try_add_to_queue(&fill_queue, px, trace_px, orig_color, left, y - 1, width, tolerance, top_fill); }
+ if (y < y_limit) { bottom_fill = try_add_to_queue(&fill_queue, px, trace_px, orig_color, left, y + 1, width, tolerance, bottom_fill); }
left--; ok = true;
}
} else {
@@ -448,17 +504,20 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
}
} while (ok);
+ top_fill = default_top_fill;
+ bottom_fill = default_bottom_fill;
+
do {
ok = false;
- // go left
+ // go right
if (right < width) {
t = get_pixel(px, right, y, width);
- if (t[3] == 0) {
- t[0] = 255; t[3] = 255;
+ if (compare_pixels(t, orig_color, tolerance)) {
+ for (int i = 0; i < 4; i++) { t[i] = 255 - t[i]; }
trace_t = get_pixel(trace_px, right, y, width);
- trace_t[0] = 255; trace_t[3] = 255;
- if (y > 0) { try_add_to_queue(&fill_queue, px, right, y - 1, width); }
- if (y < y_limit) { try_add_to_queue(&fill_queue, px, right, y + 1, width); }
+ trace_t[3] = 255;
+ if (y > 0) { top_fill = try_add_to_queue(&fill_queue, px, trace_px, orig_color, right, y - 1, width, tolerance, top_fill); }
+ if (y < y_limit) { bottom_fill = try_add_to_queue(&fill_queue, px, trace_px, orig_color, right, y + 1, width, tolerance, bottom_fill); }
right++; ok = true;
}
} else {
@@ -472,6 +531,7 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
if (aborted) {
g_free(trace_px);
+ desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("<b>Area is not bounded</b>, cannot fill."));
return;
}
@@ -486,7 +546,9 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
do_trace(pixbuf, desktop, inverted_affine);
- sp_document_done(document, SP_VERB_CONTEXT_FLOOD, _("Flood fill"));
+ g_free(trace_px);
+
+ sp_document_done(document, SP_VERB_CONTEXT_PAINTBUCKET, _("Fill bounded area"));
}
static gint sp_flood_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event)
@@ -495,10 +557,6 @@ static gint sp_flood_context_item_handler(SPEventContext *event_context, SPItem
switch (event->type) {
case GDK_BUTTON_PRESS:
- if ( event->button.button == 1 ) {
- sp_flood_do_flood_fill(event_context, event);
- ret = TRUE;
- }
break;
// motion and release are always on root (why?)
default:
static gint sp_flood_context_root_handler(SPEventContext *event_context, GdkEvent *event)
{
+ SPDesktop *desktop = event_context->desktop;
+
gint ret = FALSE;
switch (event->type) {
case GDK_BUTTON_PRESS:
@@ -523,6 +583,22 @@ static gint sp_flood_context_root_handler(SPEventContext *event_context, GdkEven
ret = TRUE;
}
break;
+ case GDK_KEY_PRESS:
+ switch (get_group0_keyval (&event->key)) {
+ case GDK_Up:
+ case GDK_Down:
+ case GDK_KP_Up:
+ case GDK_KP_Down:
+ // prevent the zoom field from activation
+ if (!MOD__CTRL_ONLY)
+ ret = TRUE;
+ break;
+ case GDK_Escape:
+ sp_desktop_selection(desktop)->clear();
+ default:
+ break;
+ }
+ break;
default:
break;
}
sp_canvas_end_forced_full_redraws(desktop->canvas);
sp_desktop_selection(desktop)->set(rc->item);
- sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_RECT,
- _("Create floodangle"));
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_PAINTBUCKET,
+ _("Fill bounded area"));
rc->item = NULL;
}