![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index d91c2d0b8ac54f0ca66fe651c54986efdc5b3dee..3d6bc1272923be5434e4ab64e0e5303591fc8298 100644 (file)
--- a/src/flood-context.cpp
+++ b/src/flood-context.cpp
#define __SP_FLOOD_CONTEXT_C__
/*
- * Flood fill drawing context
- *
- * Author:
- * Lauris Kaplinski <lauris@kaplinski.com>
- * bulia byak <buliabyak@users.sf.net>
- * John Bintz <jcoswell@coswellproductions.org>
- *
- * Copyright (C) 2006 Johan Engelen <johan@shouraizou.nl>
- * Copyright (C) 2000-2005 authors
- * Copyright (C) 2000-2001 Ximian, Inc.
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
+* Flood fill drawing context
+*
+* Author:
+* Lauris Kaplinski <lauris@kaplinski.com>
+* bulia byak <buliabyak@users.sf.net>
+* John Bintz <jcoswell@coswellproductions.org>
+*
+* Copyright (C) 2006 Johan Engelen <johan@shouraizou.nl>
+* Copyright (C) 2000-2005 authors
+* Copyright (C) 2000-2001 Ximian, Inc.
+*
+* Released under GNU GPL, read the file 'COPYING' for more information
+*/
#include "config.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>
#include "display/nr-arena.h"
#include "display/nr-arena-image.h"
#include "display/canvas-arena.h"
-#include "helper/png-write.h"
#include "libnr/nr-pixops.h"
#include "libnr/nr-matrix-rotate-ops.h"
#include "libnr/nr-matrix-translate-ops.h"
#include "sp-item.h"
#include "sp-root.h"
#include "sp-defs.h"
+#include "sp-path.h"
#include "splivarot.h"
#include "livarot/Path.h"
#include "livarot/Shape.h"
#include "libnr/n-art-bpath.h"
#include "svg/svg.h"
+#include "color.h"
#include "trace/trace.h"
#include "trace/potrace/inkscape-potrace.h"
static SPEventContextClass *parent_class;
-struct SPEBP {
- int width, height, sheight;
- guchar r, g, b, a;
- NRArenaItem *root; // the root arena item to show; it is assumed that all unneeded items are hidden
- guchar *px;
- unsigned (*status)(float, void *);
- void *data;
-};
-
GtkType sp_flood_context_get_type()
{
static GType type = 0;
{
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;
rc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack());
}
-/**
-Hide all items which are not listed in list, recursively, skipping groups and defs
-*/
static void
-hide_other_items_recursively(SPObject *o, GSList *list, unsigned dkey)
+merge_pixel_with_background (unsigned char *orig, unsigned char *bg,
+ unsigned char *base)
{
- if (SP_IS_ITEM(o)
- && !SP_IS_DEFS(o)
- && !SP_IS_ROOT(o)
- && !SP_IS_GROUP(o)
- && !g_slist_find(list, o))
- {
- sp_item_invoke_hide(SP_ITEM(o), dkey);
- }
-
- // recurse
- if (!g_slist_find(list, o)) {
- for (SPObject *child = sp_object_first_child(o) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
- hide_other_items_recursively(child, list, dkey);
- }
+ for (int i = 0; i < 3; i++) {
+ base[i] = (255 * (255 - bg[3])) / 255 + (bg[i] * bg[3]) / 255;
+ base[i] = (base[i] * (255 - orig[3])) / 255 + (orig[i] * orig[3]) / 255;
}
+ base[3] = 255;
}
inline unsigned char * get_pixel(guchar *px, int x, int y, int width) {
- return px + (x + y * width) * 4;
+ return px + (x + y * width) * 4;
+}
+
+enum PaintBucketChannels {
+ FLOOD_CHANNELS_RGB,
+ FLOOD_CHANNELS_R,
+ FLOOD_CHANNELS_G,
+ FLOOD_CHANNELS_B,
+ FLOOD_CHANNELS_H,
+ FLOOD_CHANNELS_S,
+ FLOOD_CHANNELS_L,
+ FLOOD_CHANNELS_ALPHA
+};
+
+GList * flood_channels_dropdown_items_list() {
+ GList *glist = NULL;
+
+ glist = g_list_append (glist, _("Visible Colors"));
+ glist = g_list_append (glist, _("Red"));
+ glist = g_list_append (glist, _("Green"));
+ glist = g_list_append (glist, _("Blue"));
+ glist = g_list_append (glist, _("Hue"));
+ glist = g_list_append (glist, _("Saturation"));
+ glist = g_list_append (glist, _("Lightness"));
+ glist = g_list_append (glist, _("Alpha"));
+
+ return glist;
}
-static bool compare_pixels(unsigned char *a, unsigned char *b, int fuzziness) {
- for (int i = 0; i < 4; i++) {
- if (a[i] != b[i]) {
- return false;
+static bool compare_pixels(unsigned char *check, unsigned char *orig, unsigned char *dtc, int threshold, PaintBucketChannels method) {
+ int diff = 0;
+ float hsl_check[3], hsl_orig[3];
+
+ if ((method == FLOOD_CHANNELS_H) ||
+ (method == FLOOD_CHANNELS_S) ||
+ (method == FLOOD_CHANNELS_L)) {
+ sp_color_rgb_to_hsl_floatv(hsl_check, check[0] / 255.0, check[1] / 255.0, check[2] / 255.0);
+ sp_color_rgb_to_hsl_floatv(hsl_orig, orig[0] / 255.0, orig[1] / 255.0, orig[2] / 255.0);
}
- }
- return true;
+
+ switch (method) {
+ case FLOOD_CHANNELS_ALPHA:
+ return ((int)abs(check[3] - orig[3]) <= threshold);
+ case FLOOD_CHANNELS_R:
+ return ((int)abs(check[0] - orig[0]) <= threshold);
+ case FLOOD_CHANNELS_G:
+ return ((int)abs(check[1] - orig[1]) <= threshold);
+ case FLOOD_CHANNELS_B:
+ return ((int)abs(check[2] - orig[2]) <= threshold);
+ case FLOOD_CHANNELS_RGB:
+ unsigned char merged_orig[4];
+ unsigned char merged_check[4];
+
+ merge_pixel_with_background(orig, dtc, merged_orig);
+ merge_pixel_with_background(check, dtc, merged_check);
+
+ for (int i = 0; i < 3; i++) {
+ diff += (int)abs(merged_check[i] - merged_orig[i]);
+ }
+ return ((diff / 3) <= ((threshold * 3) / 4));
+
+ case FLOOD_CHANNELS_H:
+ return ((int)(fabs(hsl_check[0] - hsl_orig[0]) * 100.0) <= threshold);
+ case FLOOD_CHANNELS_S:
+ return ((int)(fabs(hsl_check[1] - hsl_orig[1]) * 100.0) <= threshold);
+ case FLOOD_CHANNELS_L:
+ return ((int)(fabs(hsl_check[2] - hsl_orig[2]) * 100.0) <= threshold);
+ }
+
+ return false;
}
-static void try_add_to_queue(std::queue<NR::Point> *fill_queue, guchar *px, unsigned char *orig, int x, int y, int width) {
- unsigned char *t = get_pixel(px, x, y, width);
- if (compare_pixels(t, orig, 0)) {
- fill_queue->push(NR::Point(x, y));
- }
+static bool try_add_to_queue(std::queue<NR::Point> *fill_queue, guchar *px, guchar *trace_px, unsigned char *orig, unsigned char *dtc, int x, int y, int width, int threshold, PaintBucketChannels method, bool fill_switch) {
+ unsigned char *t = get_pixel(px, x, y, width);
+ if (compare_pixels(t, orig, dtc, threshold, method)) {
+ unsigned char *trace_t = get_pixel(trace_px, x, y, width);
+ if (trace_t[3] != 255 && trace_t[0] != 255) {
+ if (fill_switch) {
+ fill_queue->push(NR::Point(x, y));
+ trace_t[0] = 255;
+ }
+ }
+ return false;
+ }
+ return true;
}
-static void do_trace(GdkPixbuf *px, SPDesktop *desktop, NR::Matrix transform) {
+static void do_trace(GdkPixbuf *px, SPDesktop *desktop, NR::Matrix transform, bool union_with_selection) {
SPDocument *document = sp_desktop_document(desktop);
Inkscape::Trace::Potrace::PotraceTracingEngine pte;
long totalNodeCount = 0L;
+ double offset = prefs_get_double_attribute("tools.paintbucket", "offset", 0.0);
+
for (unsigned int i=0 ; i<results.size() ; i++) {
Inkscape::Trace::TracingEngineResult result = results[i];
totalNodeCount += result.getNodeCount();
@@ -304,49 +354,162 @@ static void do_trace(GdkPixbuf *px, SPDesktop *desktop, NR::Matrix transform) {
NArtBpath *bpath = sp_svg_read_path(result.getPathData().c_str());
Path *path = bpath_to_Path(bpath);
g_free(bpath);
+
+ if (offset != 0) {
- Shape *path_shape = new Shape();
+ Shape *path_shape = new Shape();
- path->ConvertWithBackData(0.03);
- path->Fill(path_shape, 0);
- delete path;
+ path->ConvertWithBackData(0.03);
+ path->Fill(path_shape, 0);
+ delete path;
- Shape *expanded_path_shape = new Shape();
+ Shape *expanded_path_shape = new Shape();
- expanded_path_shape->ConvertToShape(path_shape, fill_nonZero);
- path_shape->MakeOffset(expanded_path_shape, 1.5, join_round, 4);
- expanded_path_shape->ConvertToShape(path_shape, fill_positive);
+ expanded_path_shape->ConvertToShape(path_shape, fill_nonZero);
+ path_shape->MakeOffset(expanded_path_shape, offset * desktop->current_zoom(), join_round, 4);
+ expanded_path_shape->ConvertToShape(path_shape, fill_positive);
- Path *expanded_path = new Path();
-
- expanded_path->Reset();
- expanded_path_shape->ConvertToForme(expanded_path);
- expanded_path->ConvertEvenLines(1.0);
- expanded_path->Simplify(1.0);
+ Path *expanded_path = new Path();
- delete path_shape;
- delete expanded_path_shape;
+ expanded_path->Reset();
+ expanded_path_shape->ConvertToForme(expanded_path);
+ expanded_path->ConvertEvenLines(1.0);
+ expanded_path->Simplify(1.0);
- gchar *str = expanded_path->svg_dump_path();
- delete expanded_path;
- pathRepr->setAttribute("d", str);
- g_free(str);
+ delete path_shape;
+ delete expanded_path_shape;
+ gchar *str = expanded_path->svg_dump_path();
+ if (str && *str) {
+ pathRepr->setAttribute("d", str);
+ g_free(str);
+ } else {
+ desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("<b>Too much inset</b>, the result is empty."));
+ Inkscape::GC::release(pathRepr);
+ g_free(str);
+ return;
+ }
+
+ delete expanded_path;
+
+ } else {
+ gchar *str = path->svg_dump_path();
+ delete 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);
+
+ if (union_with_selection) {
+ desktop->messageStack()->flashF(Inkscape::WARNING_MESSAGE, _("Area filled, path with <b>%d</b> nodes created and unioned with selection."), sp_nodes_in_path(SP_PATH(reprobj)));
+ selection->add(reprobj);
+ sp_selected_path_union_skip_undo();
+ } else {
+ desktop->messageStack()->flashF(Inkscape::WARNING_MESSAGE, _("Area filled, path with <b>%d</b> nodes created."), sp_nodes_in_path(SP_PATH(reprobj)));
+ selection->set(reprobj);
+ }
+
}
-
+
Inkscape::GC::release(pathRepr);
+
}
}
-static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *event) {
+struct bitmap_coords_info {
+ bool is_left;
+ int x;
+ int y;
+ int y_limit;
+ int width;
+ int threshold;
+ PaintBucketChannels method;
+ unsigned char *dtc;
+ bool top_fill;
+ bool bottom_fill;
+ NR::Rect bbox;
+ NR::Rect screen;
+};
+
+enum ScanlineCheckResult {
+ SCANLINE_CHECK_OK,
+ SCANLINE_CHECK_ABORTED,
+ SCANLINE_CHECK_BOUNDARY
+};
+
+static ScanlineCheckResult perform_bitmap_scanline_check(std::queue<NR::Point> *fill_queue, guchar *px, guchar *trace_px, unsigned char *orig_color, bitmap_coords_info bci) {
+ bool aborted = false;
+ bool reached_screen_boundary = false;
+ bool ok;
+
+ bool keep_tracing;
+ unsigned char *t, *trace_t;
+
+ do {
+ ok = false;
+ if (bci.is_left) {
+ keep_tracing = (bci.x >= 0);
+ } else {
+ keep_tracing = (bci.x < bci.width);
+ }
+
+ if (keep_tracing) {
+ t = get_pixel(px, bci.x, bci.y, bci.width);
+ if (compare_pixels(t, orig_color, bci.dtc, bci.threshold, bci.method)) {
+ for (int i = 0; i < 4; i++) { t[i] = 255 - t[i]; }
+ trace_t = get_pixel(trace_px, bci.x, bci.y, bci.width);
+ trace_t[3] = 255;
+ if (bci.y > 0) {
+ bci.top_fill = try_add_to_queue(fill_queue, px, trace_px, orig_color, bci.dtc, bci.x, bci.y - 1, bci.width, bci.threshold, bci.method, bci.top_fill);
+ }
+ if (bci.y < bci.y_limit) {
+ bci.bottom_fill = try_add_to_queue(fill_queue, px, trace_px, orig_color, bci.dtc, bci.x, bci.y + 1, bci.width, bci.threshold, bci.method, bci.bottom_fill);
+ }
+ if (bci.is_left) {
+ bci.x--;
+ } else {
+ bci.x++;
+ }
+ ok = true;
+ }
+ } else {
+ if (bci.bbox.min()[NR::X] > bci.screen.min()[NR::X]) {
+ aborted = true; break;
+ } else {
+ reached_screen_boundary = true;
+ }
+ }
+ } while (ok);
+
+ if (aborted) { return SCANLINE_CHECK_ABORTED; }
+ if (reached_screen_boundary) { return SCANLINE_CHECK_BOUNDARY; }
+ return SCANLINE_CHECK_OK;
+}
+
+static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *event, bool union_with_selection) {
SPDesktop *desktop = event_context->desktop;
SPDocument *document = sp_desktop_document(desktop);
@@ -357,15 +520,15 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
sp_document_ensure_up_to_date (document);
SPItem *document_root = SP_ITEM(SP_DOCUMENT_ROOT(document));
- NR::Rect bbox = document_root->invokeBbox(NR::identity());
+ NR::Maybe<NR::Rect> bbox = document_root->getBounds(NR::identity());
- if (bbox.isEmpty()) {
- desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("<b>Area is not bounded</b>, cannot fill."));
- return;
+ if (!bbox) {
+ desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("<b>Area is not bounded</b>, cannot fill."));
+ return;
}
double zoom_scale = desktop->current_zoom();
- double padding = 1.4;
+ double padding = 1.6;
NR::Rect screen = desktop->get_display_area();
@@ -374,7 +537,7 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
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));
@@ -397,14 +560,32 @@ 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);
guchar *px = g_new(guchar, 4 * width * height);
- memset(px, 0x00, 4 * width * height);
-
+ //memset(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 );
+ SPNamedView *nv = sp_desktop_namedview(desktop);
+ unsigned long bgcolor = nv->pagecolor;
+
+ unsigned char dtc[4];
+ dtc[0] = NR_RGBA32_R(bgcolor);
+ dtc[1] = NR_RGBA32_G(bgcolor);
+ dtc[2] = NR_RGBA32_B(bgcolor);
+ dtc[3] = NR_RGBA32_A(bgcolor);
+
+ for (int fy = 0; fy < height; fy++) {
+ guchar *p = NR_PIXBLOCK_PX(&B) + fy * B.rs;
+ for (int fx = 0; fx < width; fx++) {
+ for (int i = 0; i < 4; i++) {
+ *p++ = dtc[i];
+ }
+ }
+ }
+
+ nr_arena_item_invoke_render(NULL, root, &final_bbox, &B, NR_ARENA_ITEM_RENDER_NO_CACHE );
nr_pixblock_release(&B);
// Hide items
@@ -413,7 +594,6 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
nr_arena_item_unref(root);
nr_object_unref((NRObject *) arena);
-
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]));
@@ -432,85 +612,121 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
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]; }
+ unsigned char merged_orig[4];
+
+ merge_pixel_with_background(orig_color, dtc, merged_orig);
+
+ PaintBucketChannels method = (PaintBucketChannels)prefs_get_int_attribute("tools.paintbucket", "channels", 0);
+ int threshold = prefs_get_int_attribute_limited("tools.paintbucket", "threshold", 1, 0, 100);
+
+ switch(method) {
+ case FLOOD_CHANNELS_ALPHA:
+ case FLOOD_CHANNELS_RGB:
+ case FLOOD_CHANNELS_R:
+ case FLOOD_CHANNELS_G:
+ case FLOOD_CHANNELS_B:
+ threshold = (255 * threshold) / 100;
+ break;
+ case FLOOD_CHANNELS_H:
+ case FLOOD_CHANNELS_S:
+ case FLOOD_CHANNELS_L:
+ break;
+ }
+
+ bool reached_screen_boundary = false;
+
+ bitmap_coords_info bci;
+
+ bci.y_limit = y_limit;
+ bci.width = width;
+ bci.threshold = threshold;
+ bci.method = method;
+ bci.bbox = *bbox;
+ bci.screen = screen;
+ bci.dtc = dtc;
+
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);
-
- // same color at this point
- if (compare_pixels(s, orig_color, 0)) {
- 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];
+ NR::Point cp = fill_queue.front();
+ fill_queue.pop();
+ unsigned char *s = get_pixel(px, (int)cp[NR::X], (int)cp[NR::Y], width);
- if (y > 0) {
- try_add_to_queue(&fill_queue, px, orig_color, x, y - 1, width);
- } else {
- aborted = true; break;
- }
- if (y < y_limit) {
- try_add_to_queue(&fill_queue, px, orig_color, x, y + 1, width);
- } else {
- aborted = true; break;
- }
-
- unsigned char *t, *trace_t;
- bool ok = false;
-
- do {
- ok = false;
- // go left
- if (left >= 0) {
- t = get_pixel(px, left, y, width);
- if (compare_pixels(t, orig_color, 0)) {
- for (int i = 0; i < 4; i++) { t[i] = 255 - t[i]; }
- trace_t = get_pixel(trace_px, left, y, width);
- trace_t[3] = 255;
- if (y > 0) { try_add_to_queue(&fill_queue, px, orig_color, left, y - 1, width); }
- if (y < y_limit) { try_add_to_queue(&fill_queue, px, orig_color, left, y + 1, width); }
- left--; ok = true;
+ // same color at this point
+ if (compare_pixels(s, orig_color, dtc, threshold, method)) {
+ int x = (int)cp[NR::X];
+ int y = (int)cp[NR::Y];
+
+ bool top_fill = true;
+ bool bottom_fill = true;
+
+ if (y > 0) {
+ top_fill = try_add_to_queue(&fill_queue, px, trace_px, orig_color, dtc, x, y - 1, width, threshold, method, top_fill);
+ } else {
+ if (bbox->min()[NR::Y] > screen.min()[NR::Y]) {
+ aborted = true; break;
+ } else {
+ reached_screen_boundary = true;
+ }
}
- } else {
- aborted = true; break;
- }
- } while (ok);
-
- do {
- ok = false;
- // go left
- if (right < width) {
- t = get_pixel(px, right, y, width);
- if (compare_pixels(t, orig_color, 0)) {
- for (int i = 0; i < 4; i++) { t[i] = 255 - t[i]; }
- trace_t = get_pixel(trace_px, right, y, width);
- trace_t[3] = 255;
- if (y > 0) { try_add_to_queue(&fill_queue, px, orig_color, right, y - 1, width); }
- if (y < y_limit) { try_add_to_queue(&fill_queue, px, orig_color, right, y + 1, width); }
- right++; ok = true;
+ if (y < y_limit) {
+ bottom_fill = try_add_to_queue(&fill_queue, px, trace_px, orig_color, dtc, x, y + 1, width, threshold, method, bottom_fill);
+ } else {
+ if (bbox->max()[NR::Y] < screen.max()[NR::Y]) {
+ aborted = true; break;
+ } else {
+ reached_screen_boundary = true;
+ }
}
- } else {
- aborted = true; break;
- }
- } while (ok);
- }
+
+ bci.is_left = true;
+ bci.x = x;
+ bci.y = y;
+ bci.top_fill = top_fill;
+ bci.bottom_fill = bottom_fill;
+
+ ScanlineCheckResult result = perform_bitmap_scanline_check(&fill_queue, px, trace_px, orig_color, bci);
+
+ switch (result) {
+ case SCANLINE_CHECK_ABORTED:
+ aborted = true;
+ break;
+ case SCANLINE_CHECK_BOUNDARY:
+ reached_screen_boundary = true;
+ break;
+ default:
+ break;
+ }
+
+ bci.is_left = false;
+ bci.x = x + 1;
+ bci.y = y;
+ bci.top_fill = top_fill;
+ bci.bottom_fill = bottom_fill;
+
+ result = perform_bitmap_scanline_check(&fill_queue, px, trace_px, orig_color, bci);
+
+ switch (result) {
+ case SCANLINE_CHECK_ABORTED:
+ aborted = true;
+ break;
+ case SCANLINE_CHECK_BOUNDARY:
+ reached_screen_boundary = true;
+ break;
+ default:
+ break;
+ }
+ }
}
- GdkPixbuf* pixbuft = gdk_pixbuf_new_from_data(px,
- GDK_COLORSPACE_RGB,
- TRUE,
- 8, width, height, width * 4,
- (GdkPixbufDestroyNotify)g_free,
- NULL);
-
- gdk_pixbuf_save(pixbuft, "sample.png", "png", NULL, NULL);
-
g_free(px);
if (aborted) {
- g_free(trace_px);
- desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("<b>Area is not bounded</b>, cannot fill."));
- return;
+ g_free(trace_px);
+ desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("<b>Area is not bounded</b>, cannot fill."));
+ return;
+ }
+
+ if (reached_screen_boundary) {
+ desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("<b>Only the visible part of the bounded area was filled.</b> If you want to fill all of the area, undo, zoom out, and fill again."));
}
GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(trace_px,
@@ -522,7 +738,7 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
NR::Matrix inverted_affine = NR::Matrix(affine).inverse();
- do_trace(pixbuf, desktop, inverted_affine);
+ do_trace(pixbuf, desktop, inverted_affine, union_with_selection);
g_free(trace_px);
@@ -533,10 +749,22 @@ static gint sp_flood_context_item_handler(SPEventContext *event_context, SPItem
{
gint ret = FALSE;
+ SPDesktop *desktop = event_context->desktop;
+
switch (event->type) {
case GDK_BUTTON_PRESS:
+ if (event->button.state & GDK_CONTROL_MASK) {
+ NR::Point const button_w(event->button.x,
+ event->button.y);
+
+ SPItem *item = sp_event_context_find_item (desktop, button_w, TRUE, TRUE);
+
+ Inkscape::XML::Node *pathRepr = SP_OBJECT_REPR(item);
+ /* Set style */
+ sp_desktop_apply_style_tool (desktop, pathRepr, "tools.paintbucket", false);
+ ret = TRUE;
+ }
break;
- // motion and release are always on root (why?)
default:
break;
}
@@ -550,15 +778,29 @@ static gint sp_flood_context_item_handler(SPEventContext *event_context, SPItem
static gint sp_flood_context_root_handler(SPEventContext *event_context, GdkEvent *event)
{
+ gint ret = FALSE;
SPDesktop *desktop = event_context->desktop;
- gint ret = FALSE;
switch (event->type) {
case GDK_BUTTON_PRESS:
if ( event->button.button == 1 ) {
- sp_flood_do_flood_fill(event_context, event);
-
- ret = TRUE;
+ if (!(event->button.state & GDK_CONTROL_MASK)) {
+ // set "busy" cursor
+ desktop->setWaitingCursor();
+
+ if (SP_IS_EVENT_CONTEXT(event_context)) {
+ // Since setWaitingCursor runs main loop iterations, we may have already left this tool!
+ // So check if the tool is valid before doing anything
+
+ sp_flood_do_flood_fill(event_context, event, event->button.state & GDK_SHIFT_MASK);
+
+ // restore cursor when done; note that it may already be different if e.g. user
+ // switched to another tool during interruptible tracing or drawing, in which case do nothing
+ desktop->clearWaitingCursor();
+
+ ret = TRUE;
+ }
+ }
}
break;
case GDK_KEY_PRESS:
@@ -571,8 +813,6 @@ static gint sp_flood_context_root_handler(SPEventContext *event_context, GdkEven
if (!MOD__CTRL_ONLY)
ret = TRUE;
break;
- case GDK_Escape:
- sp_desktop_selection(desktop)->clear();
default:
break;
}
sp_desktop_selection(desktop)->set(rc->item);
sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_PAINTBUCKET,
- _("Fill bounded area"));
+ _("Fill bounded area"));
rc->item = NULL;
}
}
+void flood_channels_changed(GtkComboBox *cbox, GtkWidget *tbl)
+{
+ prefs_set_int_attribute("tools.paintbucket", "channels", (gint)gtk_combo_box_get_active(cbox));
+}
+
/*
Local Variables:
mode:c++