![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index f58f70940e79d2e03f4aeb9566356bf5f3579c30..7c2f05d53bb9eac53c9c9741f0ba537c9a140ccf 100644 (file)
--- a/src/flood-context.cpp
+++ b/src/flood-context.cpp
#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"
rc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack());
}
+static void merge_pixel_with_background(unsigned char *orig, unsigned char *bg, unsigned char *base) {
+ 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;
}
-static bool compare_pixels(unsigned char *a, unsigned char *b, int tolerance) {
+enum PaintBucketChannels {
+ FLOOD_CHANNELS_RGB,
+ FLOOD_CHANNELS_R,
+ FLOOD_CHANNELS_G,
+ FLOOD_CHANNELS_B,
+ 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, _("Alpha"));
+
+ return glist;
+}
+
+static bool compare_pixels(unsigned char *check, unsigned char *orig, unsigned char *dtc, int tolerance, PaintBucketChannels method) {
int diff = 0;
- for (int i = 0; i < 4; i++) {
- diff += (int)abs(a[i] - b[i]);
+
+ switch (method) {
+ case FLOOD_CHANNELS_ALPHA:
+ return ((int)abs(check[3] - orig[3]) <= tolerance);
+ case FLOOD_CHANNELS_R:
+ return ((int)abs(check[0] - orig[0]) <= tolerance);
+ case FLOOD_CHANNELS_G:
+ return ((int)abs(check[1] - orig[1]) <= tolerance);
+ case FLOOD_CHANNELS_B:
+ return ((int)abs(check[2] - orig[2]) <= tolerance);
+ 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) <= ((tolerance * 3) / 4));
}
- return ((diff / 4) <= tolerance);
+
+ return false;
}
-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) {
+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 tolerance, PaintBucketChannels method, bool fill_switch) {
unsigned char *t = get_pixel(px, x, y, width);
- if (compare_pixels(t, orig, tolerance)) {
+ if (compare_pixels(t, orig, dtc, tolerance, method)) {
unsigned char *trace_t = get_pixel(trace_px, x, y, width);
if (trace_t[3] != 255) {
if (fill_switch) {
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();
@@ -277,33 +328,50 @@ 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();
+ Path *expanded_path = new Path();
- expanded_path->Reset();
- expanded_path_shape->ConvertToForme(expanded_path);
- expanded_path->ConvertEvenLines(1.0);
- expanded_path->Simplify(1.0);
+ expanded_path->Reset();
+ expanded_path_shape->ConvertToForme(expanded_path);
+ expanded_path->ConvertEvenLines(1.0);
+ expanded_path->Simplify(1.0);
- delete path_shape;
- delete expanded_path_shape;
+ delete path_shape;
+ delete expanded_path_shape;
- gchar *str = expanded_path->svg_dump_path();
- delete expanded_path;
- pathRepr->setAttribute("d", str);
- g_free(str);
+ 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);
@@ -328,12 +396,85 @@ static void do_trace(GdkPixbuf *px, SPDesktop *desktop, NR::Matrix transform) {
Inkscape::Selection *selection = sp_desktop_selection(desktop);
selection->set(reprobj);
pathRepr->setPosition(-1);
+
+ desktop->messageStack()->flashF(Inkscape::WARNING_MESSAGE, _("Area filled, path with <b>%d</b> nodes created."), sp_nodes_in_path(SP_PATH(reprobj)));
}
Inkscape::GC::release(pathRepr);
+
}
}
+struct bitmap_coords_info {
+ bool is_left;
+ int x;
+ int y;
+ int y_limit;
+ int width;
+ int tolerance;
+ 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.tolerance, 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.tolerance, 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.tolerance, 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) {
SPDesktop *desktop = event_context->desktop;
SPDocument *document = sp_desktop_document(desktop);
@@ -345,9 +486,9 @@ 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()) {
+ if (!bbox) {
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("<b>Area is not bounded</b>, cannot fill."));
return;
}
@@ -385,13 +526,31 @@ 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 );
+ 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);
@@ -419,19 +578,32 @@ 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);
+
int tolerance = (255 * prefs_get_int_attribute_limited("tools.paintbucket", "tolerance", 1, 0, 100)) / 100;
+ PaintBucketChannels method = (PaintBucketChannels)prefs_get_int_attribute("tools.paintbucket", "channels", 0);
bool reached_screen_boundary = false;
+ bitmap_coords_info bci;
+
+ bci.y_limit = y_limit;
+ bci.width = width;
+ bci.tolerance = tolerance;
+ 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, tolerance)) {
- int left = (int)cp[NR::X];
- int right = (int)cp[NR::X] + 1;
+ if (compare_pixels(s, orig_color, dtc, tolerance, method)) {
int x = (int)cp[NR::X];
int y = (int)cp[NR::Y];
@@ -439,76 +611,61 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
bool bottom_fill = true;
if (y > 0) {
- top_fill = try_add_to_queue(&fill_queue, px, trace_px, orig_color, x, y - 1, width, tolerance, top_fill);
+ top_fill = try_add_to_queue(&fill_queue, px, trace_px, orig_color, dtc, x, y - 1, width, tolerance, method, top_fill);
} else {
- if (bbox.min()[NR::Y] > screen.min()[NR::Y]) {
+ if (bbox->min()[NR::Y] > screen.min()[NR::Y]) {
aborted = true; break;
} else {
reached_screen_boundary = true;
}
}
if (y < y_limit) {
- bottom_fill = try_add_to_queue(&fill_queue, px, trace_px, orig_color, x, y + 1, width, tolerance, bottom_fill);
+ bottom_fill = try_add_to_queue(&fill_queue, px, trace_px, orig_color, dtc, x, y + 1, width, tolerance, method, bottom_fill);
} else {
- if (bbox.max()[NR::Y] < screen.max()[NR::Y]) {
+ if (bbox->max()[NR::Y] < screen.max()[NR::Y]) {
aborted = true; break;
} else {
reached_screen_boundary = true;
}
}
- bool default_top_fill = top_fill;
- bool default_bottom_fill = bottom_fill;
+ bci.is_left = true;
+ bci.x = x;
+ bci.y = y;
+ bci.top_fill = top_fill;
+ bci.bottom_fill = bottom_fill;
- unsigned char *t, *trace_t;
- bool ok = false;
+ ScanlineCheckResult result = perform_bitmap_scanline_check(&fill_queue, px, trace_px, orig_color, bci);
- do {
- ok = false;
- // go left
- if (left >= 0) {
- t = get_pixel(px, left, y, width);
- 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[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 {
- if (bbox.min()[NR::X] > screen.min()[NR::X]) {
- aborted = true; break;
- } else {
- reached_screen_boundary = true;
- }
- }
- } while (ok);
-
- top_fill = default_top_fill;
- bottom_fill = default_bottom_fill;
+ switch (result) {
+ case SCANLINE_CHECK_ABORTED:
+ aborted = true;
+ break;
+ case SCANLINE_CHECK_BOUNDARY:
+ reached_screen_boundary = true;
+ break;
+ default:
+ break;
+ }
- do {
- ok = false;
- // go right
- if (right < width) {
- t = get_pixel(px, right, y, width);
- 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[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 {
- if (bbox.max()[NR::X] < screen.max()[NR::X]) {
- aborted = true; break;
- } else {
- reached_screen_boundary = true;
- }
- }
- } while (ok);
+ 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;
+ }
}
}
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:
@@ -582,8 +737,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;
}
}
}
+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++