![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp
index ba181476f8add21aa3660c6c1ceb04888de58410..9dfa760ea2c0280138bcf3e89aeea1f9f402fc15 100644 (file)
--- a/src/path-chemistry.cpp
+++ b/src/path-chemistry.cpp
* Authors:
* Lauris Kaplinski <lauris@kaplinski.com>
* bulia byak <buliabyak@users.sf.net>
+ * Jasper van de Gronde <th.v.d.gronde@hccnet.nl>
*
- * Copyright (C) 1999-2004 Authors
+ * Copyright (C) 1999-2008 Authors
* Copyright (C) 2001-2002 Ximian, Inc.
*
* Released under GNU GPL, read the file 'COPYING' for more information
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
+#include <cstring>
+#include <string>
#include "xml/repr.h"
#include "svg/svg.h"
#include "display/curve.h"
#include "text-editing.h"
#include "style.h"
#include "inkscape.h"
+#include "desktop.h"
#include "document.h"
#include "message-stack.h"
#include "selection.h"
#include "desktop-handles.h"
+#include "box3d.h"
+#include <2geom/pathvector.h>
+#include "path-chemistry.h"
/* Helper functions for sp_selected_path_to_curves */
static void sp_selected_path_to_curves0(gboolean do_document_done, guint32 text_grouping_policy);
-static Inkscape::XML::Node *sp_selected_item_to_curved_repr(SPItem *item, guint32 text_grouping_policy);
+static bool sp_item_list_to_curves(const GSList *items, GSList **selected, GSList **to_select);
+
enum {
/* Not used yet. This is the placeholder of Lauris's idea. */
SP_TOCURVE_INTERACTIVE = 1 << 0,
sp_selected_path_combine(void)
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-
Inkscape::Selection *selection = sp_desktop_selection(desktop);
- GSList *items = (GSList *) selection->itemList();
-
- if (g_slist_length(items) < 2) {
+ SPDocument *doc = sp_desktop_document(desktop);
+
+ if (g_slist_length((GSList *) selection->itemList()) < 2) {
sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>at least two objects</b> to combine."));
return;
}
- for (GSList *i = items; i != NULL; i = i->next) {
- SPItem *item = (SPItem *) i->data;
- if (!SP_IS_SHAPE(item) && !SP_IS_TEXT(item)) {
- sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("At least one of the objects is <b>not a path</b>, cannot combine."));
- return;
- }
- }
+ desktop->messageStack()->flash(Inkscape::IMMEDIATE_MESSAGE, _("Combining paths..."));
+ // set "busy" cursor
+ desktop->setWaitingCursor();
- Inkscape::XML::Node *parent = SP_OBJECT_REPR((SPItem *) items->data)->parent();
+ GSList *items = g_slist_copy((GSList *) selection->itemList());
+ GSList *to_paths = NULL;
for (GSList *i = items; i != NULL; i = i->next) {
- if ( SP_OBJECT_REPR((SPItem *) i->data)->parent() != parent ) {
- sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("You cannot combine objects from <b>different groups</b> or <b>layers</b>."));
- return;
- }
+ SPItem *item = (SPItem *) i->data;
+ if (!SP_IS_PATH(item))
+ to_paths = g_slist_prepend(to_paths, item);
}
-
- sp_selected_path_to_curves0(FALSE, 0);
-
- items = (GSList *) selection->itemList();
-
- items = g_slist_copy(items);
+ GSList *converted = NULL;
+ bool did = sp_item_list_to_curves(to_paths, &items, &converted);
+ g_slist_free(to_paths);
+ for (GSList *i = converted; i != NULL; i = i->next)
+ items = g_slist_prepend(items, doc->getObjectByRepr((Inkscape::XML::Node*)(i->data)));
items = g_slist_sort(items, (GCompareFunc) sp_item_repr_compare_position);
+ items = g_slist_reverse(items);
- // remember the position of the topmost object
- gint topmost = (SP_OBJECT_REPR((SPItem *) g_slist_last(items)->data))->position();
-
- // remember the id of the bottomost object
- char const *id = SP_OBJECT_REPR((SPItem *) items->data)->attribute("id");
-
- // FIXME: merge styles of combined objects instead of using the first one's style
- gchar *style = g_strdup(SP_OBJECT_REPR((SPItem *) items->data)->attribute("style"));
+ // remember the position, id, transform and style of the topmost path, they will be assigned to the combined one
+ gint position = 0;
+ char const *id = NULL;
+ char const *transform = NULL;
+ gchar *style = NULL;
+ gchar *path_effect = NULL;
- GString *dstring = g_string_new("");
- for (GSList *i = items; i != NULL; i = i->next) {
-
- SPPath *path = (SPPath *) i->data;
- SPCurve *c = sp_shape_get_curve(SP_SHAPE(path));
+ SPCurve* curve = 0;
+ SPItem *first = NULL;
+ Inkscape::XML::Node *parent = NULL;
- NArtBpath *abp = nr_artpath_affine(SP_CURVE_BPATH(c), SP_ITEM(path)->transform);
- sp_curve_unref(c);
- gchar *str = sp_svg_write_path(abp);
- g_free(abp);
+ for (GSList *i = items; i != NULL; i = i->next) { // going from top to bottom
- dstring = g_string_append(dstring, str);
- g_free(str);
+ SPItem *item = (SPItem *) i->data;
+ if (!SP_IS_PATH(item))
+ continue;
+ did = true;
- // if this is the bottommost object,
- if (!strcmp(SP_OBJECT_REPR(path)->attribute("id"), id)) {
- // delete it so that its clones don't get alerted; this object will be restored shortly, with the same id
- SP_OBJECT(path)->deleteObject(false);
+ SPCurve *c = sp_path_get_curve_for_edit(SP_PATH(item));
+ if (first == NULL) { // this is the topmost path
+ first = item;
+ parent = SP_OBJECT_REPR(first)->parent();
+ position = SP_OBJECT_REPR(first)->position();
+ id = SP_OBJECT_REPR(first)->attribute("id");
+ transform = SP_OBJECT_REPR(first)->attribute("transform");
+ // FIXME: merge styles of combined objects instead of using the first one's style
+ style = g_strdup(SP_OBJECT_REPR(first)->attribute("style"));
+ path_effect = g_strdup(SP_OBJECT_REPR(first)->attribute("inkscape:path-effect"));
+ //c->transform(item->transform);
+ curve = c;
} else {
- // delete the object for real, so that its clones can take appropriate action
- SP_OBJECT(path)->deleteObject();
+ c->transform(to_2geom(item->getRelativeTransform(SP_OBJECT(first))));
+ curve->append(c, false);
+ c->unref();
}
- topmost--;
+ // unless this is the topmost object,
+ if (item != first) {
+ // reduce position only if the same parent
+ if (SP_OBJECT_REPR(item)->parent() == parent)
+ position--;
+ // delete the object for real, so that its clones can take appropriate action
+ SP_OBJECT(item)->deleteObject();
+ }
}
g_slist_free(items);
- Inkscape::XML::Node *repr = sp_repr_new("svg:path");
+ if (did) {
+ selection->clear();
+
+ // delete the topmost one so that its clones don't get alerted; this object will be
+ // restored shortly, with the same id
+ SP_OBJECT(first)->deleteObject(false);
- // restore id
- repr->setAttribute("id", id);
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+ Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
- repr->setAttribute("style", style);
- g_free(style);
+ // restore id, transform, path effect, and style
+ repr->setAttribute("id", id);
+ if (transform) repr->setAttribute("transform", transform);
+ repr->setAttribute("style", style);
+ g_free(style);
+
+ // set path data corresponding to new curve
+ gchar *dstring = sp_svg_write_path(curve->get_pathvector());
+ curve->unref();
+ repr->setAttribute("d", dstring);
+ if (path_effect)
+ repr->setAttribute("inkscape:original-d", dstring);
+ g_free(dstring);
- repr->setAttribute("d", dstring->str);
- g_string_free(dstring, TRUE);
+ repr->setAttribute("inkscape:path-effect", path_effect);
+ g_free(path_effect);
- // add the new group to the group members' common parent
- parent->appendChild(repr);
+ // add the new group to the parent of the topmost
+ parent->appendChild(repr);
+
+ // move to the position of the topmost, reduced by the number of deleted items
+ repr->setPosition(position > 0 ? position : 0);
- // move to the position of the topmost, reduced by the number of deleted items
- repr->setPosition(topmost > 0 ? topmost + 1 : 0);
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_COMBINE,
+ _("Combine"));
- sp_document_done(sp_desktop_document(desktop));
+ selection->set(repr);
- selection->set(repr);
+ Inkscape::GC::release(repr);
- Inkscape::GC::release(repr);
+ } else {
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("<b>No path(s)</b> to combine in the selection."));
+ }
+
+ desktop->clearWaitingCursor();
}
void
return;
}
+ desktop->messageStack()->flash(Inkscape::IMMEDIATE_MESSAGE, _("Breaking apart paths..."));
+ // set "busy" cursor
+ desktop->setWaitingCursor();
+
bool did = false;
for (GSList *items = g_slist_copy((GSList *) selection->itemList());
SPPath *path = SP_PATH(item);
- SPCurve *curve = sp_shape_get_curve(SP_SHAPE(path));
+ SPCurve *curve = sp_path_get_curve_for_edit(SP_PATH(path));
if (curve == NULL)
continue;
char const *id = SP_OBJECT_REPR(item)->attribute("id");
gchar *style = g_strdup(SP_OBJECT(item)->repr->attribute("style"));
+ gchar *path_effect = g_strdup(SP_OBJECT(item)->repr->attribute("inkscape:path-effect"));
- NArtBpath *abp = nr_artpath_affine(SP_CURVE_BPATH(curve), (SP_ITEM(path))->transform);
+ Geom::PathVector apv = curve->get_pathvector() * to_2geom(SP_ITEM(path)->transform);
- sp_curve_unref(curve);
+ curve->unref();
// it's going to resurrect as one of the pieces, so we delete without advertisement
SP_OBJECT(item)->deleteObject(false);
- curve = sp_curve_new_from_bpath(abp);
+ curve = new SPCurve(apv);
g_assert(curve != NULL);
- GSList *list = sp_curve_split(curve);
+ GSList *list = curve->split();
- sp_curve_unref(curve);
+ curve->unref();
GSList *reprs = NULL;
for (GSList *l = list; l != NULL; l = l->next) {
curve = (SPCurve *) l->data;
- Inkscape::XML::Node *repr = sp_repr_new("svg:path");
+ Inkscape::XML::Node *repr = parent->document()->createElement("svg:path");
repr->setAttribute("style", style);
- gchar *str = sp_svg_write_path(SP_CURVE_BPATH(curve));
+ gchar *str = sp_svg_write_path(curve->get_pathvector());
repr->setAttribute("d", str);
+ if (path_effect)
+ repr->setAttribute("inkscape:original-d", str);
g_free(str);
+ repr->setAttribute("inkscape:path-effect", path_effect);
+
// add the new repr to the parent
parent->appendChild(repr);
}
+ desktop->clearWaitingCursor();
+
if (did) {
- sp_document_done(sp_desktop_document(desktop));
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_BREAK_APART,
+ _("Break apart"));
} else {
sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("<b>No path(s)</b> to break apart in the selection."));
- return;
}
}
/* This function is an entry point from GUI */
void
-sp_selected_path_to_curves(void)
+sp_selected_path_to_curves(bool interactive)
{
- sp_selected_path_to_curves0(TRUE, SP_TOCURVE_INTERACTIVE);
+ if (interactive) {
+ sp_selected_path_to_curves0(TRUE, SP_TOCURVE_INTERACTIVE);
+ } else {
+ sp_selected_path_to_curves0(false, 0);
+ }
}
static void
-sp_selected_path_to_curves0(gboolean interactive, guint32 text_grouping_policy)
+sp_selected_path_to_curves0(gboolean interactive, guint32 /*text_grouping_policy*/)
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
@@ -256,18 +308,88 @@ sp_selected_path_to_curves0(gboolean interactive, guint32 text_grouping_policy)
}
bool did = false;
+ if (interactive) {
+ desktop->messageStack()->flash(Inkscape::IMMEDIATE_MESSAGE, _("Converting objects to paths..."));
+ // set "busy" cursor
+ desktop->setWaitingCursor();
+ }
- for (GSList *items = g_slist_copy((GSList *) selection->itemList());
+ GSList *selected = g_slist_copy((GSList *) selection->itemList());
+ GSList *to_select = NULL;
+ selection->clear();
+ GSList *items = g_slist_copy(selected);
+
+ did = sp_item_list_to_curves(items, &selected, &to_select);
+
+ g_slist_free (items);
+ selection->setReprList(to_select);
+ selection->addList(selected);
+ g_slist_free (to_select);
+ g_slist_free (selected);
+
+ if (interactive) {
+ desktop->clearWaitingCursor();
+ if (did) {
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_OBJECT_TO_CURVE,
+ _("Object to path"));
+ } else {
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("<b>No objects</b> to convert to path in the selection."));
+ return;
+ }
+ }
+}
+
+static bool
+sp_item_list_to_curves(const GSList *items, GSList **selected, GSList **to_select)
+{
+ bool did = false;
+
+ for (;
items != NULL;
items = items->next) {
SPItem *item = SP_ITEM(items->data);
+ if (SP_IS_PATH(item) && !SP_PATH(item)->original_curve) {
+ continue; // already a path, and no path effect
+ }
+
+ if (SP_IS_BOX3D(item)) {
+ // convert 3D box to ordinary group of paths; replace the old element in 'selected' with the new group
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(box3d_convert_to_group(SP_BOX3D(item)));
+
+ if (repr) {
+ *to_select = g_slist_prepend (*to_select, repr);
+ did = true;
+ *selected = g_slist_remove (*selected, item);
+ }
+
+ continue;
+ }
+
+ if (SP_IS_GROUP(item)) {
+ sp_lpe_item_remove_all_path_effects(SP_LPE_ITEM(item), true);
+ GSList *item_list = sp_item_group_item_list(SP_GROUP(item));
+
+ GSList *item_to_select = NULL;
+ GSList *item_selected = NULL;
+
+ if (sp_item_list_to_curves(item_list, &item_selected, &item_to_select))
+ did = true;
+
+ g_slist_free(item_list);
+ g_slist_free(item_to_select);
+ g_slist_free(item_selected);
+
+ continue;
+ }
+
Inkscape::XML::Node *repr = sp_selected_item_to_curved_repr(item, 0);
if (!repr)
continue;
did = true;
+ *selected = g_slist_remove (*selected, item);
// remember the position of the item
gint pos = SP_OBJECT_REPR(item)->position();
// remember id
char const *id = SP_OBJECT_REPR(item)->attribute("id");
- selection->remove(item);
-
- // it's going to resurrect, so we delete without advertisement
+ // It's going to resurrect, so we delete without notifying listeners.
SP_OBJECT(item)->deleteObject(false);
// restore id
@@ -288,22 +408,17 @@ sp_selected_path_to_curves0(gboolean interactive, guint32 text_grouping_policy)
// move to the saved position
repr->setPosition(pos > 0 ? pos : 0);
- selection->add(repr);
+ /* Buglet: We don't re-add the (new version of the) object to the selection of any other
+ * desktops where it was previously selected. */
+ *to_select = g_slist_prepend (*to_select, repr);
Inkscape::GC::release(repr);
}
-
- if (interactive) {
- if (did) {
- sp_document_done(sp_desktop_document(desktop));
- } else {
- sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("<b>No objects</b> to convert to path in the selection."));
- return;
- }
- }
+
+ return did;
}
-static Inkscape::XML::Node *
-sp_selected_item_to_curved_repr(SPItem *item, guint32 text_grouping_policy)
+Inkscape::XML::Node *
+sp_selected_item_to_curved_repr(SPItem *item, guint32 /*text_grouping_policy*/)
{
if (!item)
return NULL;
if (!curve)
return NULL;
- Inkscape::XML::Node *repr = sp_repr_new("svg:path");
+ // Prevent empty paths from being added to the document
+ // otherwise we end up with zomby markup in the SVG file
+ if(curve->is_empty())
+ {
+ curve->unref();
+ return NULL;
+ }
+
+ Inkscape::XML::Document *xml_doc = SP_OBJECT_REPR(item)->document();
+ Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
/* Transformation */
repr->setAttribute("transform", SP_OBJECT_REPR(item)->attribute("transform"));
/* Style */
SP_OBJECT_STYLE(SP_OBJECT_PARENT(item)));
repr->setAttribute("style", style_str);
g_free(style_str);
+
+ /* Mask */
+ gchar *mask_str = (gchar *) SP_OBJECT_REPR(item)->attribute("mask");
+ if ( mask_str )
+ repr->setAttribute("mask", mask_str);
+
+ /* Clip path */
+ gchar *clip_path_str = (gchar *) SP_OBJECT_REPR(item)->attribute("clip-path");
+ if ( clip_path_str )
+ repr->setAttribute("clip-path", clip_path_str);
+
/* Rotation center */
- sp_repr_set_attr(repr, "inkscape:transform-center-x", SP_OBJECT_REPR(item)->attribute("inkscape:transform-center-x"));
- sp_repr_set_attr(repr, "inkscape:transform-center-y", SP_OBJECT_REPR(item)->attribute("inkscape:transform-center-y"));
+ repr->setAttribute("inkscape:transform-center-x", SP_OBJECT_REPR(item)->attribute("inkscape:transform-center-x"), false);
+ repr->setAttribute("inkscape:transform-center-y", SP_OBJECT_REPR(item)->attribute("inkscape:transform-center-y"), false);
/* Definition */
- gchar *def_str = sp_svg_write_path(SP_CURVE_BPATH(curve));
+ gchar *def_str = sp_svg_write_path(curve->get_pathvector());
repr->setAttribute("d", def_str);
g_free(def_str);
- sp_curve_unref(curve);
+ curve->unref();
return repr;
}
+
+// FIXME: THIS DOES NOT REVERSE THE NODETYPES ORDER!
void
sp_selected_path_reverse()
{
}
+ // set "busy" cursor
+ desktop->setWaitingCursor();
+
bool did = false;
+ desktop->messageStack()->flash(Inkscape::IMMEDIATE_MESSAGE, _("Reversing paths..."));
+
for (GSList *i = items; i != NULL; i = i->next) {
- if (!SP_IS_SHAPE(i->data))
+ if (!SP_IS_PATH(i->data))
continue;
did = true;
- SPShape *shape = SP_SHAPE(i->data);
+ SPPath *path = SP_PATH(i->data);
- SPCurve *rcurve = sp_curve_reverse(shape->curve);
+ SPCurve *rcurve = sp_path_get_curve_reference(path)->create_reverse();
- gchar *str = sp_svg_write_path(SP_CURVE_BPATH(rcurve));
- SP_OBJECT_REPR(shape)->setAttribute("d", str);
+ gchar *str = sp_svg_write_path(rcurve->get_pathvector());
+ if ( sp_lpe_item_has_path_effect_recursive(SP_LPE_ITEM(path)) ) {
+ SP_OBJECT_REPR(path)->setAttribute("inkscape:original-d", str);
+ } else {
+ SP_OBJECT_REPR(path)->setAttribute("d", str);
+ }
g_free(str);
- sp_curve_unref(rcurve);
+ rcurve->unref();
}
+ desktop->clearWaitingCursor();
+
if (did) {
- sp_document_done(sp_desktop_document(desktop));
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_REVERSE,
+ _("Reverse path"));
} else {
sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("<b>No paths</b> to reverse in the selection."));
}