![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index ed7e341478ecf28af15eccecb4e46043ae75b98b..f1ce029f4f36b95c17bcb3c718e2bf9234dbd678 100644 (file)
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
#include "svg/svg.h"
#include "sp-path.h"
#include "sp-shape.h"
-#include "sp-marker.h"
+#include "marker.h"
#include "enums.h"
#include "sp-text.h"
#include "sp-item-group.h"
bool Ancetre(Inkscape::XML::Node *a, Inkscape::XML::Node *who);
-void sp_selected_path_boolop(bool_op bop);
+void sp_selected_path_boolop(bool_op bop, const unsigned int verb=SP_VERB_NONE, const Glib::ustring description="");
void sp_selected_path_do_offset(bool expand, double prefOffset);
void sp_selected_path_create_offset_object(int expand, bool updating);
void
sp_selected_path_union()
{
- sp_selected_path_boolop(bool_op_union);
+ sp_selected_path_boolop(bool_op_union, SP_VERB_SELECTION_UNION, _("Union"));
+}
+
+void
+sp_selected_path_union_skip_undo()
+{
+ sp_selected_path_boolop(bool_op_union, SP_VERB_NONE, _("Union"));
}
void
sp_selected_path_intersect()
{
- sp_selected_path_boolop(bool_op_inters);
+ sp_selected_path_boolop(bool_op_inters, SP_VERB_SELECTION_INTERSECT, _("Intersection"));
}
void
sp_selected_path_diff()
{
- sp_selected_path_boolop(bool_op_diff);
+ sp_selected_path_boolop(bool_op_diff, SP_VERB_SELECTION_DIFF, _("Difference"));
}
void
sp_selected_path_symdiff()
{
- sp_selected_path_boolop(bool_op_symdiff);
+ sp_selected_path_boolop(bool_op_symdiff, SP_VERB_SELECTION_SYMDIFF, _("Exclusion"));
}
void
sp_selected_path_cut()
{
- sp_selected_path_boolop(bool_op_cut);
+ sp_selected_path_boolop(bool_op_cut, SP_VERB_SELECTION_CUT, _("Division"));
}
void
sp_selected_path_slice()
{
- sp_selected_path_boolop(bool_op_slice);
+ sp_selected_path_boolop(bool_op_slice, SP_VERB_SELECTION_SLICE, _("Cut path"));
}
// boolean operations
// take the source paths from the file, do the operation, delete the originals and add the results
void
-sp_selected_path_boolop(bool_op bop)
+sp_selected_path_boolop(bool_op bop, const unsigned int verb, const Glib::ustring description)
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
Inkscape::Selection *selection = sp_desktop_selection(desktop);
-
+
GSList *il = (GSList *) selection->itemList();
-
- if (g_slist_length(il) < 2) {
+
+ // allow union on a single object for the purpose of removing self overlapse (svn log, revision 13334)
+ if ( (g_slist_length(il) < 2) && (bop != bool_op_union)) {
desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("Select <b>at least 2 paths</b> to perform a boolean operation."));
return;
}
+ else if ( g_slist_length(il) < 1 ) {
+ desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("Select <b>at least 1 path</b> to perform a boolean union."));
+ return;
+ }
if (g_slist_length(il) > 2) {
if (bop == bool_op_diff || bop == bool_op_symdiff || bop == bool_op_cut || bop == bool_op_slice ) {
{
SP_OBJECT(l->data)->deleteObject();
}
- sp_document_done(sp_desktop_document(desktop));
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE,
+ description);
selection->clear();
delete res;
return;
}
- // remember important aspects of the source path, to be restored
- Inkscape::XML::Node *repr_source;
+ // get the source path object
+ SPObject *source;
if ( bop == bool_op_diff || bop == bool_op_symdiff || bop == bool_op_cut || bop == bool_op_slice ) {
if (reverseOrderForOp) {
- repr_source = SP_OBJECT_REPR(il->data);
+ source = SP_OBJECT(il->data);
} else {
- repr_source = SP_OBJECT_REPR(il->next->data);
+ source = SP_OBJECT(il->next->data);
}
} else {
// find out the bottom object
GSList *sorted = g_slist_copy((GSList *) selection->reprList());
sorted = g_slist_sort(sorted, (GCompareFunc) sp_repr_compare_position);
- repr_source = ((Inkscape::XML::Node *) sorted->data);
+
+ source = sp_desktop_document(desktop)->
+ getObjectByRepr((Inkscape::XML::Node *)sorted->data);
+
g_slist_free(sorted);
}
+
+ // adjust style properties that depend on a possible transform in the source object in order
+ // to get a correct style attribute for the new path
+ SPItem* item_source = SP_ITEM(source);
+ NR::Matrix i2root = sp_item_i2root_affine(item_source);
+ sp_item_adjust_stroke(item_source, i2root.expansion());
+ sp_item_adjust_pattern(item_source, i2root);
+ sp_item_adjust_gradient(item_source, i2root);
+
+ Inkscape::XML::Node *repr_source = SP_OBJECT_REPR(source);
+
+ // remember important aspects of the source path, to be restored
gint pos = repr_source->position();
Inkscape::XML::Node *parent = sp_repr_parent(repr_source);
- char const *id = repr_source->attribute("id");
- char const *style = repr_source->attribute("style");
-
+ gchar const *id = repr_source->attribute("id");
+ gchar const *style = repr_source->attribute("style");
+ gchar const *mask = repr_source->attribute("mask");
+ gchar const *clip_path = repr_source->attribute("clip-path");
// remove source paths
selection->clear();
// premultiply by the inverse of parent's repr
SPItem *parent_item = SP_ITEM(sp_desktop_document(desktop)->getObjectByRepr(parent));
NR::Matrix local = sp_item_i2doc_affine(parent_item);
- gchar affinestr[80];
- gchar *transform = NULL;
- if (!local.test_identity() && sp_svg_transform_write(affinestr, 79, local.inverse())) {
- transform = affinestr;
- }
+ gchar *transform = sp_svg_transform_write(local);
// now that we have the result, add it on the canvas
if ( bop == bool_op_cut || bop == bool_op_slice ) {
for (int i=0;i<nbRP;i++) {
gchar *d = resPath[i]->svg_dump_path();
- Inkscape::XML::Node *repr = sp_repr_new("svg:path");
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+ Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
repr->setAttribute("style", style);
+ if (mask)
+ repr->setAttribute("mask", mask);
+ if (clip_path)
+ repr->setAttribute("clip-path", clip_path);
+
repr->setAttribute("d", d);
g_free(d);
} else {
gchar *d = res->svg_dump_path();
- Inkscape::XML::Node *repr = sp_repr_new("svg:path");
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+ Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
repr->setAttribute("style", style);
+ if ( mask )
+ repr->setAttribute("mask", mask);
+
+ if ( clip_path )
+ repr->setAttribute("clip-path", clip_path);
+
repr->setAttribute("d", d);
g_free(d);
Inkscape::GC::release(repr);
}
- sp_document_done(sp_desktop_document(desktop));
+ g_free(transform);
+
+ if (verb != SP_VERB_NONE) {
+ sp_document_done(sp_desktop_document(desktop), verb, description);
+ }
delete res;
}
Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
- // TRANSLATORS: "to outline" means "to convert stroke to path"
- desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>path(s)</b> to outline."));
+ desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>stroked path(s)</b> to convert stroke to path."));
return;
}
float const scale = transform.expansion();
gchar *style = g_strdup(SP_OBJECT_REPR(item)->attribute("style"));
SPStyle *i_style = SP_OBJECT(item)->style;
+ gchar const *mask = SP_OBJECT_REPR(item)->attribute("mask");
+ gchar const *clip_path = SP_OBJECT_REPR(item)->attribute("clip-path");
float o_width, o_miter;
JoinType o_join;
if (res->descr_cmd.size() > 1) { // if there's 0 or 1 node left, drop this path altogether
- Inkscape::XML::Node *repr = sp_repr_new("svg:path");
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+ Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
// restore old style
repr->setAttribute("style", style);
repr->setAttribute("d", str);
g_free(str);
+ if (mask)
+ repr->setAttribute("mask", mask);
+ if (clip_path)
+ repr->setAttribute("clip-path", clip_path);
if (SP_IS_SHAPE(item) && sp_shape_has_markers (SP_SHAPE(item))) {
- Inkscape::XML::Node *g_repr = sp_repr_new("svg:g");
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+ Inkscape::XML::Node *g_repr = xml_doc->createElement("svg:g");
// add the group to the parent
parent->appendChild(g_repr);
tr = marker_item->transform * marker->c2p * tr * transform;
if (SP_OBJECT_REPR(marker_item)) {
- Inkscape::XML::Node *m_repr = SP_OBJECT_REPR(marker_item)->duplicate();
+ Inkscape::XML::Node *m_repr = SP_OBJECT_REPR(marker_item)->duplicate(xml_doc);
g_repr->appendChild(m_repr);
SPItem *marker_item = (SPItem *) sp_desktop_document(desktop)->getObjectByRepr(m_repr);
sp_item_write_transform(marker_item, m_repr, tr);
}
if (did) {
- sp_document_done(sp_desktop_document(desktop));
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_OUTLINE,
+ _("Convert stroke to path"));
} else {
// TRANSLATORS: "to outline" means "to convert stroke to path"
- desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("<b>No stroked paths</b> to outline in the selection."));
+ desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("<b>No stroked paths</b> in the selection."));
return;
}
}
{
// pas vraiment de points sur le resultat
// donc il ne reste rien
- sp_document_done(sp_desktop_document(desktop));
+ sp_document_done(sp_desktop_document(desktop),
+ (updating ? SP_VERB_SELECTION_LINKED_OFFSET
+ : SP_VERB_SELECTION_DYNAMIC_OFFSET),
+ (updating ? _("Create linked offset")
+ : _("Create dynamic offset")));
selection->clear();
delete res;
tstr[79] = '\0';
- repr = sp_repr_new("svg:path");
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+ repr = xml_doc->createElement("svg:path");
repr->setAttribute("sodipodi:type", "inkscape:offset");
sp_repr_set_svg_double(repr, "inkscape:radius", ( expand > 0
? o_width
selection->set(nitem);
}
- sp_document_done(sp_desktop_document(desktop));
+ sp_document_done(sp_desktop_document(desktop),
+ (updating ? SP_VERB_SELECTION_LINKED_OFFSET
+ : SP_VERB_SELECTION_DYNAMIC_OFFSET),
+ (updating ? _("Create linked offset")
+ : _("Create dynamic offset")));
delete res;
delete orig;
tstr[79] = '\0';
- Inkscape::XML::Node *repr = sp_repr_new("svg:path");
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+ Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
repr->setAttribute("style", style);
}
if (did) {
- sp_document_done(sp_desktop_document(desktop));
+ sp_document_done(sp_desktop_document(desktop),
+ (expand ? SP_VERB_SELECTION_OFFSET : SP_VERB_SELECTION_INSET),
+ (expand ? _("Outset path") : _("Inset path")));
} else {
desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("<b>No paths</b> to inset/outset in the selection."));
return;
}
+static bool
+sp_selected_path_simplify_items(SPDesktop *desktop,
+ Inkscape::Selection *selection, GSList *items,
+ float threshold, bool justCoalesce,
+ float angleLimit, bool breakableAngles,
+ bool modifySelection);
+
//return true if we changed something, else false
bool
-sp_selected_path_simplify_item(SPDesktop *desktop, Inkscape::Selection *selection, SPItem *item,
+sp_selected_path_simplify_item(SPDesktop *desktop,
+ Inkscape::Selection *selection, SPItem *item,
float threshold, bool justCoalesce,
float angleLimit, bool breakableAngles,
gdouble size, bool modifySelection)
@@ -1361,18 +1430,12 @@ sp_selected_path_simplify_item(SPDesktop *desktop, Inkscape::Selection *selectio
//If this is a group, do the children instead
if (SP_IS_GROUP(item)) {
-
- bool didSomething = false;
-
- for ( GSList *children = sp_item_group_item_list(SP_GROUP(item));
- children ; children = children->next) {
-
- SPItem *child = (SPItem *) children->data;
- didSomething |= sp_selected_path_simplify_item(desktop, selection, child, threshold, justCoalesce,
- angleLimit, breakableAngles, size, false);
- }
-
- return didSomething;
+ GSList *items = sp_item_group_item_list(SP_GROUP(item));
+
+ return sp_selected_path_simplify_items(desktop, selection, items,
+ threshold, justCoalesce,
+ angleLimit, breakableAngles,
+ false);
}
@@ -1401,6 +1464,8 @@ sp_selected_path_simplify_item(SPDesktop *desktop, Inkscape::Selection *selectio
sp_item_write_transform(item, SP_OBJECT_REPR(item), NR::identity());
gchar *style = g_strdup(SP_OBJECT_REPR(item)->attribute("style"));
+ gchar *mask = g_strdup(SP_OBJECT_REPR(item)->attribute("mask"));
+ gchar *clip_path = g_strdup(SP_OBJECT_REPR(item)->attribute("clip-path"));
Path *orig = Path_for_item(item, false);
if (orig == NULL) {
@@ -1430,10 +1495,24 @@ sp_selected_path_simplify_item(SPDesktop *desktop, Inkscape::Selection *selectio
orig->Simplify(threshold * size);
}
- Inkscape::XML::Node *repr = sp_repr_new("svg:path");
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+ Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
+ // restore style, mask and clip-path
repr->setAttribute("style", style);
+ g_free(style);
+
+ if ( mask ) {
+ repr->setAttribute("mask", mask);
+ g_free(mask);
+ }
+
+ if ( clip_path ) {
+ repr->setAttribute("clip-path", clip_path);
+ g_free(clip_path);
+ }
+ // path
gchar *str = orig->svg_dump_path();
repr->setAttribute("d", str);
g_free(str);
@@ -1465,6 +1544,74 @@ sp_selected_path_simplify_item(SPDesktop *desktop, Inkscape::Selection *selectio
}
+bool
+sp_selected_path_simplify_items(SPDesktop *desktop,
+ Inkscape::Selection *selection, GSList *items,
+ float threshold, bool justCoalesce,
+ float angleLimit, bool breakableAngles,
+ bool modifySelection)
+{
+ bool simplifyIndividualPaths =
+ (bool) prefs_get_int_attribute("options.simplifyindividualpaths", "value", 0);
+
+ gchar *simplificationType;
+ if (simplifyIndividualPaths) {
+ simplificationType = _("Simplifying paths (separately):");
+ } else {
+ simplificationType = _("Simplifying paths:");
+ }
+
+ bool didSomething = false;
+
+ NR::Maybe<NR::Rect> selectionBbox = selection->bounds();
+ if (!selectionBbox) {
+ return false;
+ }
+ gdouble selectionSize = L2(selectionBbox->dimensions());
+
+ gdouble simplifySize = selectionSize;
+
+ int pathsSimplified = 0;
+ int totalPathCount = g_slist_length(items);
+
+ // set "busy" cursor
+ desktop->setWaitingCursor();
+
+ for (; items != NULL; items = items->next) {
+ SPItem *item = (SPItem *) items->data;
+
+ if (!(SP_IS_GROUP(item) || SP_IS_SHAPE(item) || SP_IS_TEXT(item)))
+ continue;
+
+ if (simplifyIndividualPaths) {
+ NR::Maybe<NR::Rect> itemBbox = item->getBounds(sp_item_i2d_affine(item));
+ if (itemBbox) {
+ simplifySize = L2(itemBbox->dimensions());
+ } else {
+ simplifySize = 0;
+ }
+ }
+
+ pathsSimplified++;
+
+ if (pathsSimplified % 20 == 0) {
+ gchar *message = g_strdup_printf(_("%s <b>%d</b> of <b>%d</b> paths simplified..."), simplificationType, pathsSimplified, totalPathCount);
+ desktop->messageStack()->flash(Inkscape::IMMEDIATE_MESSAGE, message);
+ }
+
+ didSomething |= sp_selected_path_simplify_item(desktop, selection, item,
+ threshold, justCoalesce, angleLimit, breakableAngles, simplifySize, modifySelection);
+ }
+
+ desktop->clearWaitingCursor();
+
+ if (pathsSimplified > 20) {
+ desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, g_strdup_printf(_("<b>%d</b> paths simplified."), pathsSimplified));
+ }
+
+ return didSomething;
+}
+
void
sp_selected_path_simplify_selection(float threshold, bool justCoalesce,
float angleLimit, bool breakableAngles)
return;
}
- // remember selection size
- NR::Rect bbox = selection->bounds();
- gdouble size = L2(bbox.dimensions());
-
- bool didSomething = false;
-
- //Loop through all of the items in the selection
- for (GSList *items = g_slist_copy((GSList *) selection->itemList());
- items != NULL; items = items->next) {
-
- SPItem *item = (SPItem *) items->data;
-
- if (!(SP_IS_GROUP(item) || SP_IS_SHAPE(item) || SP_IS_TEXT(item)))
- continue;
-
- didSomething |= sp_selected_path_simplify_item(desktop, selection, item,
- threshold, justCoalesce, angleLimit, breakableAngles, size, true);
- }
+ GSList *items = g_slist_copy((GSList *) selection->itemList());
+ bool didSomething = sp_selected_path_simplify_items(desktop, selection,
+ items, threshold,
+ justCoalesce,
+ angleLimit,
+ breakableAngles, true);
if (didSomething)
- sp_document_done(sp_desktop_document(desktop));
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_SIMPLIFY,
+ _("Simplify"));
else
desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("<b>No paths</b> to simplify in the selection."));
bpath=SP_CURVE_BPATH(curve);
}
+ Path *dest = bpath_to_Path(bpath);
+
+ if ( doTransformation ) {
+ if ( bpath ) g_free(bpath);
+ } else {
+ sp_curve_unref(curve);
+ }
+ return dest;
+}
+
+Path *bpath_to_Path(NArtBpath const *bpath) {
Path *dest = new Path;
dest->SetBackData(false);
{
if (closed)
dest->Close();
}
-
- if ( doTransformation ) {
- if ( bpath ) g_free(bpath);
- } else {
- sp_curve_unref(curve);
- }
return dest;
}