![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index b9aaf902e39fd5fd075bb95a2f934484f02b3945..dd26782a37897239b14882be3fad5febee95c517 100644 (file)
--- a/src/flood-context.cpp
+++ b/src/flood-context.cpp
-#define __SP_FLOOD_CONTEXT_C__
-
/** @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.
* 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
#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);
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;
}
@@ -417,9 +419,8 @@ static void do_trace(bitmap_coords_info bci, guchar *trace_px, SPDesktop *deskto
std::vector<Inkscape::Trace::TracingEngineResult> results = pte.traceGrayMap(gray_map);
gray_map->destroy(gray_map);
- //XML Tree being used here directly while it shouldn't be...."
- //Inkscape::XML::Node *layer_repr = SP_GROUP(desktop->currentLayer())->getRepr();
- 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;
@@ -482,8 +483,7 @@ static void do_trace(bitmap_coords_info bci, guchar *trace_px, SPDesktop *deskto
g_free(str);
}
- //layer_repr->addChild(pathRepr, NULL);
- desktop->currentLayer()->addChild(pathRepr,NULL);
+ desktop->currentLayer()->addChild(pathRepr,NULL);
SPObject *reprobj = document->getObjectByRepr(pathRepr);
if (reprobj) {
@@ -778,9 +778,9 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
NRArena *arena = NRArena::create();
unsigned dkey = SPItem::display_key_new(1);
- document->ensure_up_to_date ();
+ document->ensureUpToDate();
- SPItem *document_root = SP_ITEM(SP_DOCUMENT_ROOT(document));
+ SPItem *document_root = SP_ITEM(document->getRoot());
Geom::OptRect bbox = document_root->getBounds(Geom::identity());
if (!bbox) {
@@ -809,7 +809,7 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
Geom::Matrix affine = scale * Geom::Translate(-origin * scale);
/* Create ArenaItems and set transform */
- NRArenaItem *root = SP_ITEM(sp_document_root(document))->invoke_show( 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);
@@ -852,7 +852,7 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
nr_pixblock_release(&B);
// Hide items
- SP_ITEM(sp_document_root(document))->invoke_hide(dkey);
+ SP_ITEM(document->getRoot())->invoke_hide(dkey);
nr_object_unref((NRObject *) arena);
@@ -1121,7 +1121,7 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
g_free(trace_px);
- SPDocumentUndo::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)
@@ -1138,11 +1138,9 @@ static gint sp_flood_context_item_handler(SPEventContext *event_context, SPItem
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);
- desktop->applyCurrentOrToolStyle(item, "/tools/paintbucket", false);
- SPDocumentUndo::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;
sp_canvas_end_forced_full_redraws(desktop->canvas);
sp_desktop_selection(desktop)->set(rc->item);
- SPDocumentUndo::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;
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 :