![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index d263d2ffb273fb17fa615e9a4e225e9805227cef..dd26782a37897239b14882be3fad5febee95c517 100644 (file)
--- a/src/flood-context.cpp
+++ b/src/flood-context.cpp
-#define __SP_FLOOD_CONTEXT_C__
-
-/** \file
-* Bucket fill drawing context, works by bitmap filling an area on a rendered version of the current display and then tracing the result using potrace.
-*
-* 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
-*/
+/** @file
+ * @brief Bucket fill drawing context, works by bitmap filling an area on a rendered version
+ * of the current display and then tracing the result using potrace.
+ */
+/* Author:
+ * Lauris Kaplinski <lauris@kaplinski.com>
+ * bulia byak <buliabyak@users.sf.net>
+ * John Bintz <jcoswell@coswellproductions.org>
+ * Jon A. Cruz <jon@joncruz.org>
+ * Abhishek Sharma
+ *
+ * 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
+ */
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#include <gdk/gdkkeysyms.h>
#include <queue>
#include "object-edit.h"
#include "xml/repr.h"
#include "xml/node-event-vector.h"
-#include "prefs-utils.h"
+#include "preferences.h"
#include "context-fns.h"
#include "rubberband.h"
+#include "shape-editor.h"
#include "display/nr-arena-item.h"
#include "display/nr-arena.h"
#include "libnr/nr-translate-matrix-ops.h"
#include "libnr/nr-translate-scale-ops.h"
#include "libnr/nr-matrix-ops.h"
+#include <2geom/pathvector.h>
#include "sp-item.h"
#include "sp-root.h"
#include "sp-defs.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/imagemap.h"
#include "trace/potrace/inkscape-potrace.h"
+using Inkscape::DocumentUndo;
+
static void sp_flood_context_class_init(SPFloodContextClass *klass);
static void sp_flood_context_init(SPFloodContext *flood_context);
static void sp_flood_context_dispose(GObject *object);
event_context->within_tolerance = false;
event_context->item_to_select = NULL;
- event_context->shape_repr = NULL;
- event_context->shape_knot_holder = NULL;
-
flood_context->item = NULL;
new (&flood_context->sel_changed_connection) sigc::connection();
rc->sel_changed_connection.disconnect();
rc->sel_changed_connection.~connection();
+ delete ec->shape_editor;
+ ec->shape_editor = NULL;
+
/* fixme: This is necessary because we do not grab */
if (rc->item) {
sp_flood_finish(rc);
}
- if (ec->shape_repr) { // remove old listener
- sp_repr_remove_listener_by_data(ec->shape_repr, ec);
- Inkscape::GC::release(ec->shape_repr);
- ec->shape_repr = 0;
- }
-
if (rc->_message_context) {
delete rc->_message_context;
}
G_OBJECT_CLASS(parent_class)->dispose(object);
}
-static Inkscape::XML::NodeEventVector ec_shape_repr_events = {
- NULL, /* child_added */
- NULL, /* child_removed */
- ec_shape_event_attr_changed,
- NULL, /* content_changed */
- NULL /* order_changed */
-};
-
/**
\brief Callback that processes the "changed" signal on the selection;
destroys old and creates new knotholder
@@ -180,21 +173,9 @@ void sp_flood_context_selection_changed(Inkscape::Selection *selection, gpointer
SPFloodContext *rc = SP_FLOOD_CONTEXT(data);
SPEventContext *ec = SP_EVENT_CONTEXT(rc);
- if (ec->shape_repr) { // remove old listener
- sp_repr_remove_listener_by_data(ec->shape_repr, ec);
- Inkscape::GC::release(ec->shape_repr);
- ec->shape_repr = 0;
- }
-
- SPItem *item = selection->singleItem();
- if (item) {
- Inkscape::XML::Node *shape_repr = SP_OBJECT_REPR(item);
- if (shape_repr) {
- ec->shape_repr = shape_repr;
- Inkscape::GC::anchor(shape_repr);
- sp_repr_add_listener(shape_repr, &ec_shape_repr_events, ec);
- }
- }
+ ec->shape_editor->unset_item(SH_KNOTHOLDER);
+ SPItem *item = selection->singleItem();
+ ec->shape_editor->set_item(item, SH_KNOTHOLDER);
}
static void sp_flood_context_setup(SPEventContext *ec)
((SPEventContextClass *) parent_class)->setup(ec);
}
+ ec->shape_editor = new ShapeEditor(ec->desktop);
+
SPItem *item = sp_desktop_selection(ec->desktop)->singleItem();
if (item) {
- Inkscape::XML::Node *shape_repr = SP_OBJECT_REPR(item);
- if (shape_repr) {
- ec->shape_repr = shape_repr;
- Inkscape::GC::anchor(shape_repr);
- sp_repr_add_listener(shape_repr, &ec_shape_repr_events, ec);
- }
+ ec->shape_editor->set_item(item, SH_KNOTHOLDER);
}
rc->sel_changed_connection.disconnect();
rc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack());
- if (prefs_get_int_attribute("tools.paintbucket", "selcue", 0) != 0) {
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ if (prefs->getBool("/tools/paintbucket/selcue")) {
rc->enableSelectionCue();
}
}
return px + (x + y * width) * 4;
}
+inline unsigned char * get_trace_pixel(guchar *trace_px, int x, int y, int width) {
+ return trace_px + (x + y * width);
+}
+
/**
* \brief Generate the list of trace channel selection entries.
*/
GList * flood_autogap_dropdown_items_list() {
GList *glist = NULL;
- glist = g_list_append (glist, _("None"));
- glist = g_list_append (glist, _("Small"));
- glist = g_list_append (glist, _("Medium"));
- glist = g_list_append (glist, _("Large"));
+ glist = g_list_append (glist, (void*) C_("Flood autogap", "None"));
+ glist = g_list_append (glist, (void*) C_("Flood autogap", "Small"));
+ glist = g_list_append (glist, (void*) C_("Flood autogap", "Medium"));
+ glist = g_list_append (glist, (void*) C_("Flood autogap", "Large"));
return glist;
}
@@ -338,20 +321,30 @@ static bool compare_pixels(unsigned char *check, unsigned char *orig, unsigned c
return false;
}
-static inline bool is_pixel_checked(unsigned char *t) { return t[0] == 1; }
-static inline bool is_pixel_queued(unsigned char *t) { return t[1] == 1; }
-static inline bool is_pixel_paintability_checked(unsigned char *t) { return t[2] != 0; }
-static inline bool is_pixel_paintable(unsigned char *t) { return t[2] == 1; }
-static inline bool is_pixel_colored(unsigned char *t) { return t[3] == 255; }
+enum {
+ PIXEL_CHECKED = 1,
+ PIXEL_QUEUED = 2,
+ PIXEL_PAINTABLE = 4,
+ PIXEL_NOT_PAINTABLE = 8,
+ PIXEL_COLORED = 16
+};
+
+static inline bool is_pixel_checked(unsigned char *t) { return (*t & PIXEL_CHECKED) == PIXEL_CHECKED; }
+static inline bool is_pixel_queued(unsigned char *t) { return (*t & PIXEL_QUEUED) == PIXEL_QUEUED; }
+static inline bool is_pixel_paintability_checked(unsigned char *t) {
+ return !((*t & PIXEL_PAINTABLE) == 0) && ((*t & PIXEL_NOT_PAINTABLE) == 0);
+}
+static inline bool is_pixel_paintable(unsigned char *t) { return (*t & PIXEL_PAINTABLE) == PIXEL_PAINTABLE; }
+static inline bool is_pixel_colored(unsigned char *t) { return (*t & PIXEL_COLORED) == PIXEL_COLORED; }
-static inline void mark_pixel_checked(unsigned char *t) { t[0] = 1; }
-static inline void mark_pixel_unchecked(unsigned char *t) { t[0] = 0; }
-static inline void mark_pixel_queued(unsigned char *t) { t[1] = 1; }
-static inline void mark_pixel_paintable(unsigned char *t) { t[2] = 1; }
-static inline void mark_pixel_not_paintable(unsigned char *t) { t[2] = 2; }
-static inline void mark_pixel_colored(unsigned char *t) { t[3] = 255; }
+static inline void mark_pixel_checked(unsigned char *t) { *t |= PIXEL_CHECKED; }
+static inline void mark_pixel_unchecked(unsigned char *t) { *t ^= PIXEL_CHECKED; }
+static inline void mark_pixel_queued(unsigned char *t) { *t |= PIXEL_QUEUED; }
+static inline void mark_pixel_paintable(unsigned char *t) { *t |= PIXEL_PAINTABLE; *t ^= PIXEL_NOT_PAINTABLE; }
+static inline void mark_pixel_not_paintable(unsigned char *t) { *t |= PIXEL_NOT_PAINTABLE; *t ^= PIXEL_PAINTABLE; }
+static inline void mark_pixel_colored(unsigned char *t) { *t |= PIXEL_COLORED; }
-static inline void clear_pixel_paintability(unsigned char *t) { t[2] = 0; }
+static inline void clear_pixel_paintability(unsigned char *t) { *t ^= PIXEL_PAINTABLE; *t ^= PIXEL_NOT_PAINTABLE; }
struct bitmap_coords_info {
bool is_left;
PaintBucketChannels method;
unsigned char *dtc;
unsigned char *merged_orig_pixel;
- NR::Rect bbox;
- NR::Rect screen;
+ Geom::Rect bbox;
+ Geom::Rect screen;
unsigned int max_queue_size;
unsigned int current_step;
};
@@ -402,24 +395,37 @@ inline static bool check_if_pixel_is_paintable(guchar *px, unsigned char *trace_
* \param transform The transform to apply to the final SVG path.
* \param union_with_selection If true, merge the final SVG path with the current selection.
*/
-static void do_trace(GdkPixbuf *px, SPDesktop *desktop, NR::Matrix transform, bool union_with_selection) {
+static void do_trace(bitmap_coords_info bci, guchar *trace_px, SPDesktop *desktop, Geom::Matrix transform, unsigned int min_x, unsigned int max_x, unsigned int min_y, unsigned int max_y, bool union_with_selection) {
SPDocument *document = sp_desktop_document(desktop);
-
+
+ unsigned char *trace_t;
+
+ GrayMap *gray_map = GrayMapCreate((max_x - min_x + 1), (max_y - min_y + 1));
+ unsigned int gray_map_y = 0;
+ for (unsigned int y = min_y; y <= max_y; y++) {
+ unsigned long *gray_map_t = gray_map->rows[gray_map_y];
+
+ trace_t = get_trace_pixel(trace_px, min_x, y, bci.width);
+ for (unsigned int x = min_x; x <= max_x; x++) {
+ *gray_map_t = is_pixel_colored(trace_t) ? GRAYMAP_BLACK : GRAYMAP_WHITE;
+ gray_map_t++;
+ trace_t++;
+ }
+ gray_map_y++;
+ }
+
Inkscape::Trace::Potrace::PotraceTracingEngine pte;
-
- pte.setTraceType(Inkscape::Trace::Potrace::TRACE_BRIGHTNESS);
- pte.setInvert(false);
+ pte.keepGoing = 1;
+ std::vector<Inkscape::Trace::TracingEngineResult> results = pte.traceGrayMap(gray_map);
+ gray_map->destroy(gray_map);
- Glib::RefPtr<Gdk::Pixbuf> pixbuf = Glib::wrap(px, true);
-
- std::vector<Inkscape::Trace::TracingEngineResult> results = pte.trace(pixbuf);
-
- Inkscape::XML::Node *layer_repr = SP_GROUP(desktop->currentLayer())->repr;
- Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+ //XML Tree being used here directly while it shouldn't be...."
+ Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
long totalNodeCount = 0L;
- double offset = prefs_get_double_attribute("tools.paintbucket", "offset", 0.0);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ double offset = prefs->getDouble("/tools/paintbucket/offset", 0.0);
for (unsigned int i=0 ; i<results.size() ; i++) {
Inkscape::Trace::TracingEngineResult result = results[i];
@@ -427,11 +433,11 @@ static void do_trace(GdkPixbuf *px, SPDesktop *desktop, NR::Matrix transform, bo
Inkscape::XML::Node *pathRepr = xml_doc->createElement("svg:path");
/* Set style */
- sp_desktop_apply_style_tool (desktop, pathRepr, "tools.paintbucket", 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);
- g_free(bpath);
+ Geom::PathVector pathv = sp_svg_read_pathv(result.getPathData().c_str());
+ Path *path = new Path;
+ path->LoadPathVector(pathv);
if (offset != 0) {
@@ -477,17 +483,17 @@ static void do_trace(GdkPixbuf *px, SPDesktop *desktop, NR::Matrix transform, bo
g_free(str);
}
- layer_repr->addChild(pathRepr, NULL);
+ desktop->currentLayer()->addChild(pathRepr,NULL);
SPObject *reprobj = document->getObjectByRepr(pathRepr);
if (reprobj) {
- sp_item_write_transform(SP_ITEM(reprobj), pathRepr, transform, NULL);
+ SP_ITEM(reprobj)->doWriteTransform(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()) {
+ Geom::Matrix local (SP_GROUP(desktop->currentLayer())->i2doc_affine());
+ if (!local.isIdentity()) {
gchar const *t_str = pathRepr->attribute("transform");
- NR::Matrix item_t (NR::identity());
+ Geom::Matrix item_t (Geom::identity());
if (t_str)
sp_svg_transform_read(t_str, &item_t);
item_t *= local.inverse();
@@ -504,7 +510,7 @@ static void do_trace(GdkPixbuf *px, SPDesktop *desktop, NR::Matrix transform, bo
if (union_with_selection) {
desktop->messageStack()->flashF(Inkscape::WARNING_MESSAGE, ngettext("Area filled, path with <b>%d</b> node created and unioned with selection.","Area filled, path with <b>%d</b> nodes created and unioned with selection.",sp_nodes_in_path(SP_PATH(reprobj))), sp_nodes_in_path(SP_PATH(reprobj)));
selection->add(reprobj);
- sp_selected_path_union_skip_undo();
+ sp_selected_path_union_skip_undo(desktop);
} else {
desktop->messageStack()->flashF(Inkscape::WARNING_MESSAGE, ngettext("Area filled, path with <b>%d</b> node created.","Area filled, path with <b>%d</b> nodes created.",sp_nodes_in_path(SP_PATH(reprobj))), sp_nodes_in_path(SP_PATH(reprobj)));
selection->set(reprobj);
@@ -566,7 +572,7 @@ inline static unsigned int paint_pixel(guchar *px, guchar *trace_px, unsigned ch
for (unsigned int ty = bci.y - bci.radius; ty <= bci.y + bci.radius; ty++) {
for (unsigned int tx = bci.x - bci.radius; tx <= bci.x + bci.radius; tx++) {
if (coords_in_range(tx, ty, bci)) {
- trace_t = get_pixel(trace_px, tx, ty, bci.width);
+ trace_t = get_trace_pixel(trace_px, tx, ty, bci.width);
if (!is_pixel_colored(trace_t)) {
if (check_if_pixel_is_paintable(px, trace_t, tx, ty, orig_color, bci)) {
mark_pixel_colored(trace_t);
@@ -599,10 +605,10 @@ inline static unsigned int paint_pixel(guchar *px, guchar *trace_px, unsigned ch
* \param x The X coordinate.
* \param y The Y coordinate.
*/
-static void push_point_onto_queue(std::deque<NR::Point> *fill_queue, unsigned int max_queue_size, unsigned char *trace_t, unsigned int x, unsigned int y) {
+static void push_point_onto_queue(std::deque<Geom::Point> *fill_queue, unsigned int max_queue_size, unsigned char *trace_t, unsigned int x, unsigned int y) {
if (!is_pixel_queued(trace_t)) {
if ((fill_queue->size() < max_queue_size)) {
- fill_queue->push_back(NR::Point(x, y));
+ fill_queue->push_back(Geom::Point(x, y));
mark_pixel_queued(trace_t);
}
}
@@ -616,10 +622,10 @@ static void push_point_onto_queue(std::deque<NR::Point> *fill_queue, unsigned in
* \param x The X coordinate.
* \param y The Y coordinate.
*/
-static void shift_point_onto_queue(std::deque<NR::Point> *fill_queue, unsigned int max_queue_size, unsigned char *trace_t, unsigned int x, unsigned int y) {
+static void shift_point_onto_queue(std::deque<Geom::Point> *fill_queue, unsigned int max_queue_size, unsigned char *trace_t, unsigned int x, unsigned int y) {
if (!is_pixel_queued(trace_t)) {
if ((fill_queue->size() < max_queue_size)) {
- fill_queue->push_front(NR::Point(x, y));
+ fill_queue->push_front(Geom::Point(x, y));
mark_pixel_queued(trace_t);
}
}
@@ -633,7 +639,7 @@ static void shift_point_onto_queue(std::deque<NR::Point> *fill_queue, unsigned i
* \param orig_color The original selected pixel to use as the fill target color.
* \param bci The bitmap_coords_info structure.
*/
-static ScanlineCheckResult perform_bitmap_scanline_check(std::deque<NR::Point> *fill_queue, guchar *px, guchar *trace_px, unsigned char *orig_color, bitmap_coords_info bci) {
+static ScanlineCheckResult perform_bitmap_scanline_check(std::deque<Geom::Point> *fill_queue, guchar *px, guchar *trace_px, unsigned char *orig_color, bitmap_coords_info bci, unsigned int *min_x, unsigned int *max_x) {
bool aborted = false;
bool reached_screen_boundary = false;
bool ok;
@@ -641,21 +647,19 @@ static ScanlineCheckResult perform_bitmap_scanline_check(std::deque<NR::Point> *
bool keep_tracing;
bool initial_paint = true;
- unsigned char *current_trace_t = get_pixel(trace_px, bci.x, bci.y, bci.width);
+ unsigned char *current_trace_t = get_trace_pixel(trace_px, bci.x, bci.y, bci.width);
unsigned int paint_directions;
bool currently_painting_top = false;
bool currently_painting_bottom = false;
- unsigned int pix_width = bci.width * 4;
-
unsigned int top_ty = bci.y - 1;
unsigned int bottom_ty = bci.y + 1;
bool can_paint_top = (top_ty > 0);
bool can_paint_bottom = (bottom_ty < bci.height);
- NR::Point t = fill_queue->front();
+ Geom::Point t = fill_queue->front();
do {
ok = false;
@@ -665,19 +669,22 @@ static ScanlineCheckResult perform_bitmap_scanline_check(std::deque<NR::Point> *
keep_tracing = (bci.x < bci.width);
}
+ *min_x = MIN(*min_x, bci.x);
+ *max_x = MAX(*max_x, bci.x);
+
if (keep_tracing) {
if (check_if_pixel_is_paintable(px, current_trace_t, bci.x, bci.y, orig_color, bci)) {
paint_directions = paint_pixel(px, trace_px, orig_color, bci, current_trace_t);
if (bci.radius == 0) {
mark_pixel_checked(current_trace_t);
- if ((t[NR::X] == bci.x) && (t[NR::Y] == bci.y)) {
+ if ((t[Geom::X] == bci.x) && (t[Geom::Y] == bci.y)) {
fill_queue->pop_front(); t = fill_queue->front();
}
}
if (can_paint_top) {
if (paint_directions & PAINT_DIRECTION_UP) {
- unsigned char *trace_t = current_trace_t - pix_width;
+ unsigned char *trace_t = current_trace_t - bci.width;
if (!is_pixel_queued(trace_t)) {
bool ok_to_paint = check_if_pixel_is_paintable(px, trace_t, bci.x, top_ty, orig_color, bci);
@@ -696,7 +703,7 @@ static ScanlineCheckResult perform_bitmap_scanline_check(std::deque<NR::Point> *
if (can_paint_bottom) {
if (paint_directions & PAINT_DIRECTION_DOWN) {
- unsigned char *trace_t = current_trace_t + pix_width;
+ unsigned char *trace_t = current_trace_t + bci.width;
if (!is_pixel_queued(trace_t)) {
bool ok_to_paint = check_if_pixel_is_paintable(px, trace_t, bci.x, bottom_ty, orig_color, bci);
@@ -715,12 +722,12 @@ static ScanlineCheckResult perform_bitmap_scanline_check(std::deque<NR::Point> *
if (bci.is_left) {
if (paint_directions & PAINT_DIRECTION_LEFT) {
- bci.x -= 1; current_trace_t -= 4;
+ bci.x--; current_trace_t--;
ok = true;
}
} else {
if (paint_directions & PAINT_DIRECTION_RIGHT) {
- bci.x += 1; current_trace_t += 4;
+ bci.x++; current_trace_t++;
ok = true;
}
}
@@ -728,7 +735,7 @@ static ScanlineCheckResult perform_bitmap_scanline_check(std::deque<NR::Point> *
initial_paint = false;
}
} else {
- if (bci.bbox.min()[NR::X] > bci.screen.min()[NR::X]) {
+ if (bci.bbox.min()[Geom::X] > bci.screen.min()[Geom::X]) {
aborted = true; break;
} else {
reached_screen_boundary = true;
@@ -744,15 +751,15 @@ static ScanlineCheckResult perform_bitmap_scanline_check(std::deque<NR::Point> *
/**
* \brief Sort the rendered pixel buffer check queue vertically.
*/
-static bool sort_fill_queue_vertical(NR::Point a, NR::Point b) {
- return a[NR::Y] > b[NR::Y];
+static bool sort_fill_queue_vertical(Geom::Point a, Geom::Point b) {
+ return a[Geom::Y] > b[Geom::Y];
}
/**
* \brief Sort the rendered pixel buffer check queue horizontally.
*/
-static bool sort_fill_queue_horizontal(NR::Point a, NR::Point b) {
- return a[NR::X] > b[NR::X];
+static bool sort_fill_queue_horizontal(Geom::Point a, Geom::Point b) {
+ return a[Geom::X] > b[Geom::X];
}
/**
@@ -769,12 +776,12 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
/* Create new arena */
NRArena *arena = NRArena::create();
- unsigned dkey = sp_item_display_key_new(1);
+ unsigned dkey = SPItem::display_key_new(1);
- sp_document_ensure_up_to_date (document);
+ document->ensureUpToDate();
- SPItem *document_root = SP_ITEM(SP_DOCUMENT_ROOT(document));
- NR::Maybe<NR::Rect> bbox = document_root->getBounds(NR::identity());
+ SPItem *document_root = SP_ITEM(document->getRoot());
+ Geom::OptRect bbox = document_root->getBounds(Geom::identity());
if (!bbox) {
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("<b>Area is not bounded</b>, cannot fill."));
@@ -787,26 +794,26 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
// fill areas off the screen can be included in the fill.
double padding = 1.6;
- NR::Rect screen = desktop->get_display_area();
+ Geom::Rect screen = desktop->get_display_area();
- unsigned int width = (int)ceil(screen.extent(NR::X) * zoom_scale * padding);
- unsigned int height = (int)ceil(screen.extent(NR::Y) * zoom_scale * padding);
+ unsigned int width = (int)ceil(screen.width() * zoom_scale * padding);
+ unsigned int height = (int)ceil(screen.height() * zoom_scale * padding);
- NR::Point origin(screen.min()[NR::X],
- sp_document_height(document) - screen.extent(NR::Y) - screen.min()[NR::Y]);
+ Geom::Point origin(screen.min()[Geom::X],
+ document->getHeight() - screen.height() - screen.min()[Geom::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));
+ origin[Geom::X] = origin[Geom::X] + (screen.width() * ((1 - padding) / 2));
+ origin[Geom::Y] = origin[Geom::Y] + (screen.height() * ((1 - padding) / 2));
- NR::scale scale(zoom_scale, zoom_scale);
- NR::Matrix affine = scale * NR::translate(-origin * scale);
+ Geom::Scale scale(zoom_scale, zoom_scale);
+ Geom::Matrix affine = scale * Geom::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);
+ NRArenaItem *root = SP_ITEM(document->getRoot())->invoke_show( arena, dkey, SP_ITEM_SHOW_DISPLAY);
nr_arena_item_set_transform(NR_ARENA_ITEM(root), affine);
NRGC gc(NULL);
- nr_matrix_set_identity(&gc.transform);
+ gc.transform.setIdentity();
NRRectL final_bbox;
final_bbox.x0 = 0;
@@ -845,24 +852,24 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
nr_pixblock_release(&B);
// Hide items
- sp_item_invoke_hide(SP_ITEM(sp_document_root(document)), dkey);
+ SP_ITEM(document->getRoot())->invoke_hide(dkey);
- nr_arena_item_unref(root);
nr_object_unref((NRObject *) arena);
- guchar *trace_px = g_new(guchar, 4 * width * height);
- memset(trace_px, 0x00, 4 * width * height);
+ guchar *trace_px = g_new(guchar, width * height);
+ memset(trace_px, 0x00, width * height);
- std::deque<NR::Point> fill_queue;
- std::queue<NR::Point> color_queue;
+ std::deque<Geom::Point> fill_queue;
+ std::queue<Geom::Point> color_queue;
- std::vector<NR::Point> fill_points;
+ std::vector<Geom::Point> fill_points;
bool aborted = false;
int y_limit = height - 1;
- PaintBucketChannels method = (PaintBucketChannels)prefs_get_int_attribute("tools.paintbucket", "channels", 0);
- int threshold = prefs_get_int_attribute_limited("tools.paintbucket", "threshold", 1, 0, 100);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ PaintBucketChannels method = (PaintBucketChannels) prefs->getInt("/tools/paintbucket/channels", 0);
+ int threshold = prefs->getIntLimited("/tools/paintbucket/threshold", 1, 0, 100);
switch(method) {
case FLOOD_CHANNELS_ALPHA:
@@ -888,29 +895,29 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
bci.bbox = *bbox;
bci.screen = screen;
bci.dtc = dtc;
- bci.radius = prefs_get_int_attribute_limited("tools.paintbucket", "autogap", 0, 0, 3);
+ bci.radius = prefs->getIntLimited("/tools/paintbucket/autogap", 0, 0, 3);
bci.max_queue_size = (width * height) / 4;
bci.current_step = 0;
if (is_point_fill) {
- fill_points.push_back(NR::Point(event->button.x, event->button.y));
+ fill_points.push_back(Geom::Point(event->button.x, event->button.y));
} else {
- Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get();
+ Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
fill_points = r->getPoints();
}
for (unsigned int i = 0; i < fill_points.size(); i++) {
- NR::Point pw = NR::Point(fill_points[i][NR::X] / zoom_scale, sp_document_height(document) + (fill_points[i][NR::Y] / zoom_scale)) * affine;
+ Geom::Point pw = Geom::Point(fill_points[i][Geom::X] / zoom_scale, document->getHeight() + (fill_points[i][Geom::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]));
+ pw[Geom::X] = (int)MIN(width - 1, MAX(0, pw[Geom::X]));
+ pw[Geom::Y] = (int)MIN(height - 1, MAX(0, pw[Geom::Y]));
if (is_touch_fill) {
if (i == 0) {
color_queue.push(pw);
} else {
- unsigned char *trace_t = get_pixel(trace_px, (int)pw[NR::X], (int)pw[NR::Y], width);
- push_point_onto_queue(&fill_queue, bci.max_queue_size, trace_t, (int)pw[NR::X], (int)pw[NR::Y]);
+ unsigned char *trace_t = get_trace_pixel(trace_px, (int)pw[Geom::X], (int)pw[Geom::Y], width);
+ push_point_onto_queue(&fill_queue, bci.max_queue_size, trace_t, (int)pw[Geom::X], (int)pw[Geom::Y]);
}
} else {
color_queue.push(pw);
@@ -923,12 +930,17 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
unsigned long sort_size_threshold = 5;
+ unsigned int min_y = height;
+ unsigned int max_y = 0;
+ unsigned int min_x = width;
+ unsigned int max_x = 0;
+
while (!color_queue.empty() && !aborted) {
- NR::Point color_point = color_queue.front();
+ Geom::Point color_point = color_queue.front();
color_queue.pop();
- int cx = (int)color_point[NR::X];
- int cy = (int)color_point[NR::Y];
+ int cx = (int)color_point[Geom::X];
+ int cy = (int)color_point[Geom::Y];
unsigned char *orig_px = get_pixel(px, cx, cy, width);
unsigned char orig_color[4];
@@ -940,17 +952,17 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
bci.merged_orig_pixel = merged_orig;
- unsigned char *trace_t = get_pixel(trace_px, cx, cy, width);
+ unsigned char *trace_t = get_trace_pixel(trace_px, cx, cy, width);
if (!is_pixel_checked(trace_t) && !is_pixel_colored(trace_t)) {
if (check_if_pixel_is_paintable(px, trace_px, cx, cy, orig_color, bci)) {
shift_point_onto_queue(&fill_queue, bci.max_queue_size, trace_t, cx, cy);
if (!first_run) {
for (unsigned int y = 0; y < height; y++) {
- trace_t = get_pixel(trace_px, 0, y, width);
+ trace_t = get_trace_pixel(trace_px, 0, y, width);
for (unsigned int x = 0; x < width; x++) {
clear_pixel_paintability(trace_t);
- trace_t += 4;
+ trace_t++;
}
}
}
@@ -961,7 +973,7 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
unsigned long old_fill_queue_size = fill_queue.size();
while (!fill_queue.empty() && !aborted) {
- NR::Point cp = fill_queue.front();
+ Geom::Point cp = fill_queue.front();
if (bci.radius == 0) {
unsigned long new_fill_queue_size = fill_queue.size();
@@ -978,14 +990,14 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
if (new_fill_queue_size > old_fill_queue_size) {
std::sort(fill_queue.begin(), fill_queue.end(), sort_fill_queue_vertical);
- std::deque<NR::Point>::iterator start_sort = fill_queue.begin();
- std::deque<NR::Point>::iterator end_sort = fill_queue.begin();
- unsigned int sort_y = (unsigned int)cp[NR::Y];
+ std::deque<Geom::Point>::iterator start_sort = fill_queue.begin();
+ std::deque<Geom::Point>::iterator end_sort = fill_queue.begin();
+ unsigned int sort_y = (unsigned int)cp[Geom::Y];
unsigned int current_y = sort_y;
- for (std::deque<NR::Point>::iterator i = fill_queue.begin(); i != fill_queue.end(); i++) {
- NR::Point current = *i;
- current_y = (unsigned int)current[NR::Y];
+ for (std::deque<Geom::Point>::iterator i = fill_queue.begin(); i != fill_queue.end(); i++) {
+ Geom::Point current = *i;
+ current_y = (unsigned int)current[Geom::Y];
if (current_y != sort_y) {
if (start_sort != end_sort) {
std::sort(start_sort, end_sort, sort_fill_queue_horizontal);
@@ -1008,15 +1020,18 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
fill_queue.pop_front();
- int x = (int)cp[NR::X];
- int y = (int)cp[NR::Y];
+ int x = (int)cp[Geom::X];
+ int y = (int)cp[Geom::Y];
+
+ min_y = MIN((unsigned int)y, min_y);
+ max_y = MAX((unsigned int)y, max_y);
- unsigned char *trace_t = get_pixel(trace_px, x, y, width);
+ unsigned char *trace_t = get_trace_pixel(trace_px, x, y, width);
if (!is_pixel_checked(trace_t)) {
mark_pixel_checked(trace_t);
if (y == 0) {
- if (bbox->min()[NR::Y] > screen.min()[NR::Y]) {
+ if (bbox->min()[Geom::Y] > screen.min()[Geom::Y]) {
aborted = true; break;
} else {
reached_screen_boundary = true;
@@ -1024,7 +1039,7 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
}
if (y == y_limit) {
- if (bbox->max()[NR::Y] < screen.max()[NR::Y]) {
+ if (bbox->max()[Geom::Y] < screen.max()[Geom::Y]) {
aborted = true; break;
} else {
reached_screen_boundary = true;
@@ -1035,7 +1050,7 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
bci.x = x;
bci.y = y;
- ScanlineCheckResult result = perform_bitmap_scanline_check(&fill_queue, px, trace_px, orig_color, bci);
+ ScanlineCheckResult result = perform_bitmap_scanline_check(&fill_queue, px, trace_px, orig_color, bci, &min_x, &max_x);
switch (result) {
case SCANLINE_CHECK_ABORTED:
@@ -1049,13 +1064,13 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
}
if (bci.x < width) {
- trace_t += 4;
+ trace_t++;
if (!is_pixel_checked(trace_t) && !is_pixel_queued(trace_t)) {
mark_pixel_checked(trace_t);
bci.is_left = false;
bci.x = x + 1;
- result = perform_bitmap_scanline_check(&fill_queue, px, trace_px, orig_color, bci);
+ result = perform_bitmap_scanline_check(&fill_queue, px, trace_px, orig_color, bci, &min_x, &max_x);
switch (result) {
case SCANLINE_CHECK_ABORTED:
@@ -1090,21 +1105,23 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
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."));
}
+
+ unsigned int trace_padding = bci.radius + 1;
+ if (min_y > trace_padding) { min_y -= trace_padding; }
+ if (max_y < (y_limit - trace_padding)) { max_y += trace_padding; }
+ if (min_x > trace_padding) { min_x -= trace_padding; }
+ if (max_x < (width - 1 - trace_padding)) { max_x += trace_padding; }
+
+ Geom::Point min_start = Geom::Point(min_x, min_y);
- GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(trace_px,
- GDK_COLORSPACE_RGB,
- TRUE,
- 8, width, height, width * 4,
- (GdkPixbufDestroyNotify)g_free,
- NULL);
-
- NR::Matrix inverted_affine = NR::Matrix(affine).inverse();
+ affine = scale * Geom::Translate(-origin * scale - min_start);
+ Geom::Matrix inverted_affine = Geom::Matrix(affine).inverse();
- do_trace(pixbuf, desktop, inverted_affine, union_with_selection);
+ do_trace(bci, trace_px, desktop, inverted_affine, min_x, max_x, min_y, max_y, union_with_selection);
g_free(trace_px);
- sp_document_done(document, SP_VERB_CONTEXT_PAINTBUCKET, _("Fill bounded area"));
+ DocumentUndo::done(document, SP_VERB_CONTEXT_PAINTBUCKET, _("Fill bounded area"));
}
static gint sp_flood_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event)
@@ -1116,15 +1133,14 @@ static gint sp_flood_context_item_handler(SPEventContext *event_context, SPItem
switch (event->type) {
case GDK_BUTTON_PRESS:
if ((event->button.state & GDK_CONTROL_MASK) && event->button.button == 1 && !event_context->space_panning) {
- NR::Point const button_w(event->button.x,
- event->button.y);
+ Geom::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);
- sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_PAINTBUCKET, _("Set style on object"));
+ // Set style
+ desktop->applyCurrentOrToolStyle(item, "/tools/paintbucket", false);
+ DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_CONTEXT_PAINTBUCKET, _("Set style on object"));
ret = TRUE;
}
break;
@@ -1150,20 +1166,20 @@ static gint sp_flood_context_root_handler(SPEventContext *event_context, GdkEven
case GDK_BUTTON_PRESS:
if (event->button.button == 1 && !event_context->space_panning) {
if (!(event->button.state & GDK_CONTROL_MASK)) {
- NR::Point const button_w(event->button.x,
- event->button.y);
+ Geom::Point const button_w(event->button.x,
+ event->button.y);
if (Inkscape::have_viable_layer(desktop, event_context->defaultMessageContext())) {
// save drag origin
- event_context->xp = (gint) button_w[NR::X];
- event_context->yp = (gint) button_w[NR::Y];
+ event_context->xp = (gint) button_w[Geom::X];
+ event_context->yp = (gint) button_w[Geom::Y];
event_context->within_tolerance = true;
dragging = true;
- NR::Point const p(desktop->w2d(button_w));
- Inkscape::Rubberband::get()->setMode(RUBBERBAND_MODE_TOUCHPATH);
- Inkscape::Rubberband::get()->start(desktop, p);
+ Geom::Point const p(desktop->w2d(button_w));
+ Inkscape::Rubberband::get(desktop)->setMode(RUBBERBAND_MODE_TOUCHPATH);
+ Inkscape::Rubberband::get(desktop)->start(desktop, p);
}
}
}
@@ -1179,10 +1195,10 @@ static gint sp_flood_context_root_handler(SPEventContext *event_context, GdkEven
event_context->within_tolerance = false;
- NR::Point const motion_pt(event->motion.x, event->motion.y);
- NR::Point const p(desktop->w2d(motion_pt));
- if (Inkscape::Rubberband::get()->is_started()) {
- Inkscape::Rubberband::get()->move(p);
+ Geom::Point const motion_pt(event->motion.x, event->motion.y);
+ Geom::Point const p(desktop->w2d(motion_pt));
+ if (Inkscape::Rubberband::get(desktop)->is_started()) {
+ Inkscape::Rubberband::get(desktop)->move(p);
event_context->defaultMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Draw over</b> areas to add to fill, hold <b>Alt</b> for touch fill"));
gobble_motion_events(GDK_BUTTON1_MASK);
}
@@ -1191,7 +1207,7 @@ static gint sp_flood_context_root_handler(SPEventContext *event_context, GdkEven
case GDK_BUTTON_RELEASE:
if (event->button.button == 1 && !event_context->space_panning) {
- Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get();
+ Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
if (r->is_started()) {
// set "busy" cursor
desktop->setWaitingCursor();
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_PAINTBUCKET,
+ DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_CONTEXT_PAINTBUCKET,
_("Fill bounded area"));
rc->item = NULL;
void flood_channels_set_channels( gint channels )
{
- prefs_set_int_attribute("tools.paintbucket", "channels", channels);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ prefs->setInt("/tools/paintbucket/channels", channels);
}
/*
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :