![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index 06ae89ba035ef7cee7bfe182e0d101033f90b16b..085dfeda0a52595bd027f5c06b3b8a94c423ed10 100644 (file)
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
#include "text-editing.h"
#include "sp-item-group.h"
#include "style.h"
-#include "inkscape.h"
#include "document.h"
#include "message-stack.h"
#include "selection.h"
#include "display/canvas-bpath.h"
#include "display/curve.h"
#include <glibmm/i18n.h>
-#include "prefs-utils.h"
+#include "preferences.h"
-#include "libnr/n-art-bpath.h"
-#include "libnr/nr-path.h"
#include "xml/repr.h"
#include "xml/repr-sorting.h"
#include <2geom/pathvector.h>
-#include <libnr/nr-matrix-fns.h>
-#include <libnr/nr-matrix-ops.h>
-#include <libnr/nr-matrix-translate-ops.h>
#include <libnr/nr-scale-matrix-ops.h>
-#include <libnr/n-art-bpath-2geom.h>
#include "helper/geom.h"
#include "livarot/Path.h"
bool Ancetre(Inkscape::XML::Node *a, Inkscape::XML::Node *who);
-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_boolop(SPDesktop *desktop, bool_op bop, const unsigned int verb=SP_VERB_NONE, const Glib::ustring description="");
+void sp_selected_path_do_offset(SPDesktop *desktop, bool expand, double prefOffset);
+void sp_selected_path_create_offset_object(SPDesktop *desktop, int expand, bool updating);
void
-sp_selected_path_union()
+sp_selected_path_union(SPDesktop *desktop)
{
- sp_selected_path_boolop(bool_op_union, SP_VERB_SELECTION_UNION, _("Union"));
+ sp_selected_path_boolop(desktop, bool_op_union, SP_VERB_SELECTION_UNION, _("Union"));
}
void
-sp_selected_path_union_skip_undo()
+sp_selected_path_union_skip_undo(SPDesktop *desktop)
{
- sp_selected_path_boolop(bool_op_union, SP_VERB_NONE, _("Union"));
+ sp_selected_path_boolop(desktop, bool_op_union, SP_VERB_NONE, _("Union"));
}
void
-sp_selected_path_intersect()
+sp_selected_path_intersect(SPDesktop *desktop)
{
- sp_selected_path_boolop(bool_op_inters, SP_VERB_SELECTION_INTERSECT, _("Intersection"));
+ sp_selected_path_boolop(desktop, bool_op_inters, SP_VERB_SELECTION_INTERSECT, _("Intersection"));
}
void
-sp_selected_path_diff()
+sp_selected_path_diff(SPDesktop *desktop)
{
- sp_selected_path_boolop(bool_op_diff, SP_VERB_SELECTION_DIFF, _("Difference"));
+ sp_selected_path_boolop(desktop, bool_op_diff, SP_VERB_SELECTION_DIFF, _("Difference"));
}
void
-sp_selected_path_diff_skip_undo()
+sp_selected_path_diff_skip_undo(SPDesktop *desktop)
{
- sp_selected_path_boolop(bool_op_diff, SP_VERB_NONE, _("Difference"));
+ sp_selected_path_boolop(desktop, bool_op_diff, SP_VERB_NONE, _("Difference"));
}
void
-sp_selected_path_symdiff()
+sp_selected_path_symdiff(SPDesktop *desktop)
{
- sp_selected_path_boolop(bool_op_symdiff, SP_VERB_SELECTION_SYMDIFF, _("Exclusion"));
+ sp_selected_path_boolop(desktop, bool_op_symdiff, SP_VERB_SELECTION_SYMDIFF, _("Exclusion"));
}
void
-sp_selected_path_cut()
+sp_selected_path_cut(SPDesktop *desktop)
{
- sp_selected_path_boolop(bool_op_cut, SP_VERB_SELECTION_CUT, _("Division"));
+ sp_selected_path_boolop(desktop, bool_op_cut, SP_VERB_SELECTION_CUT, _("Division"));
}
void
-sp_selected_path_slice()
+sp_selected_path_slice(SPDesktop *desktop)
{
- sp_selected_path_boolop(bool_op_slice, SP_VERB_SELECTION_SLICE, _("Cut path"));
+ sp_selected_path_boolop(desktop, 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, const unsigned int verb, const Glib::ustring description)
+sp_selected_path_boolop(SPDesktop *desktop, 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();
@@ -136,8 +127,8 @@ sp_selected_path_boolop(bool_op bop, const unsigned int verb, const Glib::ustrin
}
if (g_slist_length(il) > 2) {
- if (bop == bool_op_diff || bop == bool_op_symdiff || bop == bool_op_cut || bop == bool_op_slice ) {
- desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("Select <b>exactly 2 paths</b> to perform difference, XOR, division, or path cut."));
+ if (bop == bool_op_diff || bop == bool_op_cut || bop == bool_op_slice ) {
+ desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("Select <b>exactly 2 paths</b> to perform difference, division, or path cut."));
return;
}
}
@@ -147,8 +138,7 @@ sp_selected_path_boolop(bool_op bop, const unsigned int verb, const Glib::ustrin
// topmost object (differences, cuts)
bool reverseOrderForOp = false;
- // mettre les elements de la liste dans l'ordre pour ces operations
- if (bop == bool_op_diff || bop == bool_op_symdiff || bop == bool_op_cut || bop == bool_op_slice) {
+ if (bop == bool_op_diff || bop == bool_op_cut || bop == bool_op_slice) {
// check in the tree to find which element of the selection list is topmost (for 2-operand commands only)
Inkscape::XML::Node *a = SP_OBJECT_REPR(il->data);
Inkscape::XML::Node *b = SP_OBJECT_REPR(il->next->data);
@@ -440,7 +430,7 @@ sp_selected_path_boolop(bool_op bop, const unsigned int verb, const Glib::ustrin
// 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 ( bop == bool_op_diff || bop == bool_op_cut || bop == bool_op_slice ) {
if (reverseOrderForOp) {
source = SP_OBJECT(il->data);
} else {
@@ -461,11 +451,11 @@ sp_selected_path_boolop(bool_op bop, const unsigned int verb, const Glib::ustrin
// 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 = from_2geom(sp_item_i2root_affine(item_source));
- sp_item_adjust_stroke(item_source, NR::expansion(i2root));
- sp_item_adjust_pattern(item_source, i2root);
- sp_item_adjust_gradient(item_source, i2root);
- sp_item_adjust_livepatheffect(item_source, i2root);
+ Geom::Matrix i2doc(sp_item_i2doc_affine(item_source));
+ sp_item_adjust_stroke(item_source, i2doc.descrim());
+ sp_item_adjust_pattern(item_source, i2doc);
+ sp_item_adjust_gradient(item_source, i2doc);
+ sp_item_adjust_livepatheffect(item_source, i2doc);
Inkscape::XML::Node *repr_source = SP_OBJECT_REPR(source);
@@ -476,7 +466,8 @@ sp_selected_path_boolop(bool_op bop, const unsigned int verb, const Glib::ustrin
gchar const *style = repr_source->attribute("style");
gchar const *mask = repr_source->attribute("mask");
gchar const *clip_path = repr_source->attribute("clip-path");
-
+ gchar *title = source->title();
+ gchar *desc = source->desc();
// remove source paths
selection->clear();
for (GSList *l = il; l != NULL; l = l->next) {
@@ -493,7 +484,7 @@ sp_selected_path_boolop(bool_op bop, const unsigned int verb, const Glib::ustrin
// premultiply by the inverse of parent's repr
SPItem *parent_item = SP_ITEM(sp_desktop_document(desktop)->getObjectByRepr(parent));
- NR::Matrix local = from_2geom(sp_item_i2doc_affine(parent_item));
+ Geom::Matrix local (sp_item_i2doc_affine(parent_item));
gchar *transform = sp_svg_transform_write(local.inverse());
// now that we have the result, add it on the canvas
@@ -585,13 +576,21 @@ sp_selected_path_boolop(bool_op bop, const unsigned int verb, const Glib::ustrin
repr->setAttribute("id", id);
parent->appendChild(repr);
- repr->setPosition(pos > 0 ? pos : 0);
+ if (title) {
+ sp_desktop_document(desktop)->getObjectByRepr(repr)->setTitle(title);
+ }
+ if (desc) {
+ sp_desktop_document(desktop)->getObjectByRepr(repr)->setDesc(desc);
+ }
+ repr->setPosition(pos > 0 ? pos : 0);
selection->add(repr);
Inkscape::GC::release(repr);
}
g_free(transform);
+ if (title) g_free(title);
+ if (desc) g_free(desc);
if (verb != SP_VERB_NONE) {
sp_document_done(sp_desktop_document(desktop), verb, description);
@@ -601,13 +600,14 @@ sp_selected_path_boolop(bool_op bop, const unsigned int verb, const Glib::ustrin
}
static
-void sp_selected_path_outline_add_marker( SPObject *marker_object, Geom::Matrix marker_transform, NR::scale stroke_scale, NR::Matrix transform,
- Inkscape::XML::Node *g_repr, Inkscape::XML::Document *xml_doc, SPDocument * doc )
+void sp_selected_path_outline_add_marker( SPObject *marker_object, Geom::Matrix marker_transform,
+ Geom::Scale stroke_scale, Geom::Matrix transform,
+ Inkscape::XML::Node *g_repr, Inkscape::XML::Document *xml_doc, SPDocument * doc )
{
SPMarker* marker = SP_MARKER (marker_object);
SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (marker_object));
- NR::Matrix tr(from_2geom(marker_transform));
+ Geom::Matrix tr(marker_transform);
if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
tr = stroke_scale * tr;
@@ -625,10 +625,8 @@ void sp_selected_path_outline_add_marker( SPObject *marker_object, Geom::Matrix
}
void
-sp_selected_path_outline()
+sp_selected_path_outline(SPDesktop *desktop)
{
- SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-
Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
sp_repr_css_unset_property(ncss, "marker-end");
}
- NR::Matrix const transform(item->transform);
- float const scale = NR::expansion(transform);
+ Geom::Matrix const transform(item->transform);
+ float const scale = transform.descrim();
gchar const *mask = SP_OBJECT_REPR(item)->attribute("mask");
gchar const *clip_path = SP_OBJECT_REPR(item)->attribute("clip-path");
Inkscape::XML::Node *parent = SP_OBJECT_REPR(item)->parent();
// remember id
char const *id = SP_OBJECT_REPR(item)->attribute("id");
-
+ // remember title
+ gchar *title = item->title();
+ // remember description
+ gchar *desc = item->desc();
+
if (res->descr_cmd.size() > 1) { // if there's 0 or 1 node left, drop this path altogether
SPDocument * doc = sp_desktop_document(desktop);
g_repr->setPosition(pos > 0 ? pos : 0);
g_repr->appendChild(repr);
+ // restore title, description, id, transform
repr->setAttribute("id", id);
SPItem *newitem = (SPItem *) doc->getObjectByRepr(repr);
sp_item_write_transform(newitem, repr, transform);
-
+ if (title) {
+ newitem->setTitle(title);
+ }
+ if (desc) {
+ newitem->setDesc(desc);
+ }
+
SPShape *shape = SP_SHAPE(item);
Geom::PathVector const & pathv = curve->get_pathvector();
- for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
- if ( SPObject *marker_obj = shape->marker[SP_MARKER_LOC_START] ) {
- Geom::Matrix const m (sp_shape_marker_get_transform_at_start(path_it->front()));
+
+ // START marker
+ for (int i = 0; i < 2; i++) { // SP_MARKER_LOC and SP_MARKER_LOC_START
+ if ( SPObject *marker_obj = shape->marker[i] ) {
+ Geom::Matrix const m (sp_shape_marker_get_transform_at_start(pathv.front().front()));
sp_selected_path_outline_add_marker( marker_obj, m,
- NR::scale(i_style->stroke_width.computed), transform,
+ Geom::Scale(i_style->stroke_width.computed), transform,
g_repr, xml_doc, doc );
}
-
- if ( SPObject *marker_obj = shape->marker[SP_MARKER_LOC_MID] ) {
- Geom::Path::const_iterator curve_it1 = path_it->begin(); // incoming curve
- Geom::Path::const_iterator curve_it2 = ++(path_it->begin()); // outgoing curve
- while (curve_it2 != path_it->end_default())
+ }
+ // MID marker
+ for (int i = 0; i < 3; i += 2) { // SP_MARKER_LOC and SP_MARKER_LOC_MID
+ SPObject *midmarker_obj = shape->marker[i];
+ if (!midmarker_obj) continue;
+ for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
+ // START position
+ if ( path_it != pathv.begin()
+ && ! ((path_it == (pathv.end()-1)) && (path_it->size_default() == 0)) ) // if this is the last path and it is a moveto-only, there is no mid marker there
{
- /* Put marker between curve_it1 and curve_it2.
- * Loop to end_default (so including closing segment), because when a path is closed,
- * there should be a midpoint marker between last segment and closing straight line segment
- */
- Geom::Matrix const m (sp_shape_marker_get_transform(*curve_it1, *curve_it2));
- sp_selected_path_outline_add_marker( marker_obj, m,
- NR::scale(i_style->stroke_width.computed), transform,
+ Geom::Matrix const m (sp_shape_marker_get_transform_at_start(path_it->front()));
+ sp_selected_path_outline_add_marker( midmarker_obj, m,
+ Geom::Scale(i_style->stroke_width.computed), transform,
+ g_repr, xml_doc, doc );
+ }
+ // MID position
+ if (path_it->size_default() > 1) {
+ Geom::Path::const_iterator curve_it1 = path_it->begin(); // incoming curve
+ Geom::Path::const_iterator curve_it2 = ++(path_it->begin()); // outgoing curve
+ while (curve_it2 != path_it->end_default())
+ {
+ /* Put marker between curve_it1 and curve_it2.
+ * Loop to end_default (so including closing segment), because when a path is closed,
+ * there should be a midpoint marker between last segment and closing straight line segment
+ */
+ Geom::Matrix const m (sp_shape_marker_get_transform(*curve_it1, *curve_it2));
+ sp_selected_path_outline_add_marker(midmarker_obj, m,
+ Geom::Scale(i_style->stroke_width.computed), transform,
+ g_repr, xml_doc, doc);
+
+ ++curve_it1;
+ ++curve_it2;
+ }
+ }
+ // END position
+ if ( path_it != (pathv.end()-1) && !path_it->empty()) {
+ Geom::Curve const &lastcurve = path_it->back_default();
+ Geom::Matrix const m = sp_shape_marker_get_transform_at_end(lastcurve);
+ sp_selected_path_outline_add_marker( midmarker_obj, m,
+ Geom::Scale(i_style->stroke_width.computed), transform,
g_repr, xml_doc, doc );
-
- ++curve_it1;
- ++curve_it2;
}
}
+ }
+ // END marker
+ for (int i = 0; i < 4; i += 3) { // SP_MARKER_LOC and SP_MARKER_LOC_END
+ if ( SPObject *marker_obj = shape->marker[i] ) {
+ /* Get reference to last curve in the path.
+ * For moveto-only path, this returns the "closing line segment". */
+ Geom::Path const &path_last = pathv.back();
+ unsigned int index = path_last.size_default();
+ if (index > 0) {
+ index--;
+ }
+ Geom::Curve const &lastcurve = path_last[index];
- if ( SPObject *marker_obj = shape->marker[SP_MARKER_LOC_END] ) {
- Geom::Matrix const m (sp_shape_marker_get_transform_at_end(path_it->back_default()));
+ Geom::Matrix const m = sp_shape_marker_get_transform_at_end(lastcurve);
sp_selected_path_outline_add_marker( marker_obj, m,
- NR::scale(i_style->stroke_width.computed), transform,
+ Geom::Scale(i_style->stroke_width.computed), transform,
g_repr, xml_doc, doc );
}
}
// move to the saved position
repr->setPosition(pos > 0 ? pos : 0);
+ // restore title, description, id, transform
repr->setAttribute("id", id);
SPItem *newitem = (SPItem *) sp_desktop_document(desktop)->getObjectByRepr(repr);
sp_item_write_transform(newitem, repr, transform);
-
+ if (title) {
+ newitem->setTitle(title);
+ }
+ if (desc) {
+ newitem->setDesc(desc);
+ }
+
selection->add(repr);
}
SP_OBJECT(item)->deleteObject(false);
}
+ if (title) g_free(title);
+ if (desc) g_free(desc);
delete res;
delete orig;
void
-sp_selected_path_offset()
+sp_selected_path_offset(SPDesktop *desktop)
{
- double prefOffset = prefs_get_double_attribute("options.defaultoffsetwidth", "value", 1.0);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ double prefOffset = prefs->getDouble("/options/defaultoffsetwidth/value", 1.0);
- sp_selected_path_do_offset(true, prefOffset);
+ sp_selected_path_do_offset(desktop, true, prefOffset);
}
void
-sp_selected_path_inset()
+sp_selected_path_inset(SPDesktop *desktop)
{
- double prefOffset = prefs_get_double_attribute("options.defaultoffsetwidth", "value", 1.0);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ double prefOffset = prefs->getDouble("/options/defaultoffsetwidth/value", 1.0);
- sp_selected_path_do_offset(false, prefOffset);
+ sp_selected_path_do_offset(desktop, false, prefOffset);
}
void
-sp_selected_path_offset_screen(double pixels)
+sp_selected_path_offset_screen(SPDesktop *desktop, double pixels)
{
- sp_selected_path_do_offset(true, pixels / SP_ACTIVE_DESKTOP->current_zoom());
+ sp_selected_path_do_offset(desktop, true, pixels / desktop->current_zoom());
}
void
-sp_selected_path_inset_screen(double pixels)
+sp_selected_path_inset_screen(SPDesktop *desktop, double pixels)
{
- sp_selected_path_do_offset(false, pixels / SP_ACTIVE_DESKTOP->current_zoom());
+ sp_selected_path_do_offset(desktop, false, pixels / desktop->current_zoom());
}
-void sp_selected_path_create_offset_object_zero()
+void sp_selected_path_create_offset_object_zero(SPDesktop *desktop)
{
- sp_selected_path_create_offset_object(0, false);
+ sp_selected_path_create_offset_object(desktop, 0, false);
}
-void sp_selected_path_create_offset()
+void sp_selected_path_create_offset(SPDesktop *desktop)
{
- sp_selected_path_create_offset_object(1, false);
+ sp_selected_path_create_offset_object(desktop, 1, false);
}
-void sp_selected_path_create_inset()
+void sp_selected_path_create_inset(SPDesktop *desktop)
{
- sp_selected_path_create_offset_object(-1, false);
+ sp_selected_path_create_offset_object(desktop, -1, false);
}
-void sp_selected_path_create_updating_offset_object_zero()
+void sp_selected_path_create_updating_offset_object_zero(SPDesktop *desktop)
{
- sp_selected_path_create_offset_object(0, true);
+ sp_selected_path_create_offset_object(desktop, 0, true);
}
-void sp_selected_path_create_updating_offset()
+void sp_selected_path_create_updating_offset(SPDesktop *desktop)
{
- sp_selected_path_create_offset_object(1, true);
+ sp_selected_path_create_offset_object(desktop, 1, true);
}
-void sp_selected_path_create_updating_inset()
+void sp_selected_path_create_updating_inset(SPDesktop *desktop)
{
- sp_selected_path_create_offset_object(-1, true);
+ sp_selected_path_create_offset_object(desktop, -1, true);
}
void
-sp_selected_path_create_offset_object(int expand, bool updating)
+sp_selected_path_create_offset_object(SPDesktop *desktop, int expand, bool updating)
{
Inkscape::Selection *selection;
Inkscape::XML::Node *repr;
SPItem *item;
SPCurve *curve;
gchar *style, *str;
- SPDesktop *desktop;
float o_width, o_miter;
JoinType o_join;
ButtType o_butt;
curve = NULL;
- desktop = SP_ACTIVE_DESKTOP;
-
selection = sp_desktop_selection(desktop);
item = selection->singleItem();
return;
}
- NR::Matrix const transform(item->transform);
+ Geom::Matrix const transform(item->transform);
- sp_item_write_transform(item, SP_OBJECT_REPR(item), NR::identity());
+ sp_item_write_transform(item, SP_OBJECT_REPR(item), Geom::identity());
style = g_strdup(SP_OBJECT(item)->repr->attribute("style"));
}
{
- double prefOffset = 1.0;
- prefOffset = prefs_get_double_attribute("options.defaultoffsetwidth", "value", prefOffset);
- o_width = prefOffset;
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ o_width = prefs->getDouble("/options/defaultoffsetwidth/value", 1.0);
}
if (o_width < 0.01)
void
-sp_selected_path_do_offset(bool expand, double prefOffset)
+sp_selected_path_do_offset(SPDesktop *desktop, bool expand, double prefOffset)
{
- SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-
Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
continue;
}
- NR::Matrix const transform(item->transform);
+ Geom::Matrix const transform(item->transform);
- sp_item_write_transform(item, SP_OBJECT_REPR(item), NR::identity());
+ sp_item_write_transform(item, SP_OBJECT_REPR(item), Geom::identity());
gchar *style = g_strdup(SP_OBJECT_REPR(item)->attribute("style"));
return false;
}
+ // correct virtual size by full transform (bug #166937)
+ size /= sp_item_i2doc_affine(item).descrim();
+
// save the transform, to re-apply it after simplification
- NR::Matrix const transform(item->transform);
+ Geom::Matrix const transform(item->transform);
/*
reset the transform, effectively transforming the item by transform.inverse();
this is necessary so that the item is transformed twice back and forth,
allowing all compensations to cancel out regardless of the preferences
*/
- sp_item_write_transform(item, SP_OBJECT_REPR(item), NR::identity());
+ sp_item_write_transform(item, SP_OBJECT_REPR(item), Geom::identity());
gchar *style = g_strdup(SP_OBJECT_REPR(item)->attribute("style"));
gchar *mask = g_strdup(SP_OBJECT_REPR(item)->attribute("mask"));
char const *id = SP_OBJECT_REPR(item)->attribute("id");
// remember path effect
char const *patheffect = SP_OBJECT_REPR(item)->attribute("inkscape:path-effect");
-
+ // remember title
+ gchar *title = item->title();
+ // remember description
+ gchar *desc = item->desc();
+
//If a group was selected, to not change the selection list
if (modifySelection)
selection->remove(item);
g_free(clip_path);
}
+ // restore path effect
+ repr->setAttribute("inkscape:path-effect", patheffect);
+
// path
gchar *str = orig->svg_dump_path();
if (patheffect)
// reapply the transform
sp_item_write_transform(newitem, repr, transform);
- // restore path effect
- repr->setAttribute("inkscape:path-effect", patheffect);
-
+ // restore title & description
+ if (title) {
+ newitem->setTitle(title);
+ g_free(title);
+ }
+ if (desc) {
+ newitem->setDesc(desc);
+ g_free(desc);
+ }
+
//If we are not in a selected group
if (modifySelection)
selection->add(repr);
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;
-
- boost::optional<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)))
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ bool simplifyIndividualPaths = prefs->getBool("/options/simplifyindividualpaths/value");
+
+ gchar *simplificationType;
+ if (simplifyIndividualPaths) {
+ simplificationType = _("Simplifying paths (separately):");
+ } else {
+ simplificationType = _("Simplifying paths:");
+ }
+
+ bool didSomething = false;
+
+ Geom::OptRect 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) {
- boost::optional<NR::Rect> itemBbox = item->getBounds(from_2geom(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;
+ if (simplifyIndividualPaths) {
+ Geom::OptRect 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)
+sp_selected_path_simplify_selection(SPDesktop *desktop, float threshold, bool justCoalesce,
+ float angleLimit, bool breakableAngles)
{
- SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-
Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
static gdouble simplifyMultiply = 1.0;
void
-sp_selected_path_simplify(void)
+sp_selected_path_simplify(SPDesktop *desktop)
{
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
gdouble simplifyThreshold =
- prefs_get_double_attribute("options.simplifythreshold", "value", 0.003);
- bool simplifyJustCoalesce =
- (bool) prefs_get_int_attribute("options.simplifyjustcoalesce", "value", 0);
+ prefs->getDouble("/options/simplifythreshold/value", 0.003);
+ bool simplifyJustCoalesce = prefs->getBool("/options/simplifyjustcoalesce/value", 0);
//Get the current time
GTimeVal currentTimeVal;
//g_print("%g\n", simplify_threshold);
//Make the actual call
- sp_selected_path_simplify_selection(simplifyThreshold,
- simplifyJustCoalesce, 0.0, false);
+ sp_selected_path_simplify_selection(desktop, simplifyThreshold,
+ simplifyJustCoalesce, 0.0, false);
}
@@ -1779,7 +1846,7 @@ pathvector_for_curve(SPItem *item, SPCurve *curve, bool doTransformation, bool t
if (transformFull) {
*dest *= extraPreAffine * sp_item_i2doc_affine(item) * extraPostAffine;
} else {
- *dest *= extraPreAffine * to_2geom(item->transform) * extraPostAffine;
+ *dest *= extraPreAffine * (Geom::Matrix)item->transform * extraPostAffine;
}
} else {
*dest *= extraPreAffine * extraPostAffine;
return curve; // do not forget to unref the curve at some point!
}
-Path *bpath_to_Path(NArtBpath const *bpath)
-{
- Path *dest = new Path;
- dest->SetBackData(false);
- {
- int i;
- bool closed = false;
- float lastX = 0.0;
- float lastY = 0.0;
-
- for (i = 0; bpath[i].code != NR_END; i++) {
- switch (bpath[i].code) {
- case NR_LINETO:
- lastX = bpath[i].x3;
- lastY = bpath[i].y3;
- {
- NR::Point tmp(lastX, lastY);
- dest->LineTo(tmp);
- }
- break;
-
- case NR_CURVETO:
- {
- NR::Point tmp, tms, tme;
- tmp[0]=bpath[i].x3;
- tmp[1]=bpath[i].y3;
- tms[0]=3 * (bpath[i].x1 - lastX);
- tms[1]=3 * (bpath[i].y1 - lastY);
- tme[0]=3 * (bpath[i].x3 - bpath[i].x2);
- tme[1]=3 * (bpath[i].y3 - bpath[i].y2);
- dest->CubicTo(tmp,tms,tme);
- }
- lastX = bpath[i].x3;
- lastY = bpath[i].y3;
- break;
-
- case NR_MOVETO_OPEN:
- case NR_MOVETO:
- if (closed)
- dest->Close();
- closed = (bpath[i].code == NR_MOVETO);
- lastX = bpath[i].x3;
- lastY = bpath[i].y3;
- {
- NR::Point tmp(lastX, lastY);
- dest->MoveTo(tmp);
- }
- break;
- default:
- break;
- }
- }
- if (closed)
- dest->Close();
- }
- return dest;
-}
-
-boost::optional<Path::cut_position> get_nearest_position_on_Path(Path *path, NR::Point p, unsigned seg)
+boost::optional<Path::cut_position> get_nearest_position_on_Path(Path *path, Geom::Point p, unsigned seg)
{
//get nearest position on path
Path::cut_position pos = path->PointToCurvilignPosition(p, seg);
return pos;
}
-NR::Point get_point_on_Path(Path *path, int piece, double t)
+Geom::Point get_point_on_Path(Path *path, int piece, double t)
{
- NR::Point p;
+ Geom::Point p;
path->PointAt(piece, t, p);
return p;
}