diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index 47e3d3d2beaad4a96846a87a55d41e4cf0c0024b..7b622338480a85124c78052ed2f9f4c0c68029b3 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>
+ *
+ * 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"
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
@@ -181,21 +171,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();
}
}
@@ -437,6 +413,7 @@ static void do_trace(bitmap_coords_info bci, guchar *trace_px, SPDesktop *deskto
}
Inkscape::Trace::Potrace::PotraceTracingEngine pte;
+ pte.keepGoing = 1;
std::vector<Inkscape::Trace::TracingEngineResult> results = pte.traceGrayMap(gray_map);
gray_map->destroy(gray_map);
@@ -445,7 +422,8 @@ static void do_trace(bitmap_coords_info bci, guchar *trace_px, SPDesktop *deskto
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];
@@ -453,7 +431,7 @@ static void do_trace(bitmap_coords_info bci, guchar *trace_px, SPDesktop *deskto
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);
Geom::PathVector pathv = sp_svg_read_pathv(result.getPathData().c_str());
Path *path = new Path;
@@ -801,7 +779,7 @@ 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));
- boost::optional<Geom::Rect> bbox = document_root->getBounds(Geom::identity());
+ Geom::OptRect bbox = document_root->getBounds(Geom::identity());
if (!bbox) {
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("<b>Area is not bounded</b>, cannot fill."));
@@ -887,8 +865,9 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
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:
@@ -914,7 +893,7 @@ 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;
@@ -1159,7 +1138,7 @@ static gint sp_flood_context_item_handler(SPEventContext *event_context, SPItem
Inkscape::XML::Node *pathRepr = SP_OBJECT_REPR(item);
/* Set style */
- sp_desktop_apply_style_tool (desktop, pathRepr, "tools.paintbucket", false);
+ 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"));
ret = TRUE;
}
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);
}
/*