X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-path.cpp;h=962be5cb50bb91a9d70287ec3545399c926dcf3b;hb=80d34fe4a953d704430b44c6201a4fcbf455dfc6;hp=7dbe51c265c954703bfadc54ccb9fac64df29d9b;hpb=3955580a5a68a873b098921626f5b9d841b964ec;p=inkscape.git diff --git a/src/sp-path.cpp b/src/sp-path.cpp index 7dbe51c26..962be5cb5 100644 --- a/src/sp-path.cpp +++ b/src/sp-path.cpp @@ -24,6 +24,7 @@ #include #include #include +#include <2geom/pathvector.h> #include "svg/svg.h" #include "xml/repr.h" @@ -53,13 +54,13 @@ static void sp_path_release(SPObject *object); static void sp_path_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr); static void sp_path_set(SPObject *object, unsigned key, gchar const *value); -static Inkscape::XML::Node *sp_path_write(SPObject *object, Inkscape::XML::Node *repr, guint flags); +static Inkscape::XML::Node *sp_path_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags); static NR::Matrix sp_path_set_transform(SPItem *item, NR::Matrix const &xform); static gchar * sp_path_description(SPItem *item); static void sp_path_convert_to_guides(SPItem *item); static void sp_path_update(SPObject *object, SPCtx *ctx, guint flags); -static void sp_path_update_patheffect(SPShape *shape, bool write); +static void sp_path_update_patheffect(SPLPEItem *lpeitem, bool write); static SPShapeClass *parent_class; @@ -98,7 +99,7 @@ sp_path_class_init(SPPathClass * klass) GObjectClass *gobject_class = (GObjectClass *) klass; SPObjectClass *sp_object_class = (SPObjectClass *) klass; SPItemClass *item_class = (SPItemClass *) klass; - SPShapeClass *shape_class = (SPShapeClass *) klass; + SPLPEItemClass *lpe_item_class = (SPLPEItemClass *) klass; parent_class = (SPShapeClass *)g_type_class_peek_parent(klass); @@ -114,7 +115,7 @@ sp_path_class_init(SPPathClass * klass) item_class->set_transform = sp_path_set_transform; item_class->convert_to_guides = sp_path_convert_to_guides; - shape_class->update_patheffect = sp_path_update_patheffect; + lpe_item_class->update_patheffect = sp_path_update_patheffect; } @@ -122,21 +123,16 @@ gint sp_nodes_in_path(SPPath *path) { SPCurve *curve = SP_SHAPE(path)->curve; - if (!curve) return 0; - gint r = curve->end; - gint i = curve->length - 1; - if (i > r) i = r; // sometimes after switching from node editor length is wrong, e.g. f6 - draw - f2 - tab - f1, this fixes it - for (; i >= 0; i --) - if (SP_CURVE_BPATH(curve)[i].code == NR_MOVETO) - r --; - return r; + if (!curve) + return 0; + return curve->nodes_in_path(); } static gchar * sp_path_description(SPItem * item) { int count = sp_nodes_in_path(SP_PATH(item)); - if (SP_SHAPE(item)->path_effect_href) { + if (sp_lpe_item_has_path_effect(SP_LPE_ITEM(item))) { return g_strdup_printf(ngettext("Path (%i node, path effect)", "Path (%i nodes, path effect)",count), count); } else { @@ -153,11 +149,11 @@ sp_path_convert_to_guides(SPItem *item) SPDocument *doc = SP_OBJECT_DOCUMENT(path); std::list > pts; - NR::Matrix const i2d (sp_item_i2d_affine(SP_ITEM(path))); + NR::Matrix const i2d (from_2geom(sp_item_i2d_affine(SP_ITEM(path)))); SPCurve *curve = SP_SHAPE(path)->curve; if (!curve) return; - NArtBpath *bpath = SP_CURVE_BPATH(curve); + NArtBpath const *bpath = SP_CURVE_BPATH(curve); NR::Point last_pt; NR::Point pt; @@ -232,7 +228,7 @@ sp_path_release(SPObject *object) path->connEndPair.release(); if (path->original_curve) { - path->original_curve = sp_curve_unref (path->original_curve); + path->original_curve = path->original_curve->unref(); } if (((SPObjectClass *) parent_class)->release) { @@ -252,11 +248,11 @@ sp_path_set(SPObject *object, unsigned int key, gchar const *value) switch (key) { case SP_ATTR_INKSCAPE_ORIGINAL_D: if (value) { - NArtBpath *bpath = sp_svg_read_path(value); - SPCurve *curve = sp_curve_new_from_bpath(bpath); + Geom::PathVector pv = sp_svg_read_pathv(value); + SPCurve *curve = new SPCurve(pv); if (curve) { sp_path_set_original_curve(path, curve, TRUE, true); - sp_curve_unref(curve); + curve->unref(); } } else { sp_path_set_original_curve(path, NULL, TRUE, true); @@ -264,13 +260,13 @@ sp_path_set(SPObject *object, unsigned int key, gchar const *value) object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); break; case SP_ATTR_D: - if (!((SPShape *) path)->path_effect_href) { + if (!sp_lpe_item_has_path_effect_recursive(SP_LPE_ITEM(path))) { if (value) { - NArtBpath *bpath = sp_svg_read_path(value); - SPCurve *curve = sp_curve_new_from_bpath(bpath); + Geom::PathVector pv = sp_svg_read_pathv(value); + SPCurve *curve = new SPCurve(pv); if (curve) { sp_shape_set_curve((SPShape *) path, curve, TRUE); - sp_curve_unref(curve); + curve->unref(); } } else { sp_shape_set_curve((SPShape *) path, NULL, TRUE); @@ -303,38 +299,27 @@ sp_path_set(SPObject *object, unsigned int key, gchar const *value) * Writes the path object into a Inkscape::XML::Node */ static Inkscape::XML::Node * -sp_path_write(SPObject *object, Inkscape::XML::Node *repr, guint flags) +sp_path_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) { SPShape *shape = (SPShape *) object; if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) { - Inkscape::XML::Document *xml_doc = sp_document_repr_doc(SP_OBJECT_DOCUMENT(object)); repr = xml_doc->createElement("svg:path"); } if ( shape->curve != NULL ) { - NArtBpath *abp = sp_curve_first_bpath(shape->curve); - if (abp) { - gchar *str = sp_svg_write_path(abp); - repr->setAttribute("d", str); - g_free(str); - } else { - repr->setAttribute("d", ""); - } + gchar *str = sp_svg_write_path(shape->curve->get_pathvector()); + repr->setAttribute("d", str); + g_free(str); } else { repr->setAttribute("d", NULL); } SPPath *path = (SPPath *) object; if ( path->original_curve != NULL ) { - NArtBpath *abp = sp_curve_first_bpath(path->original_curve); - if (abp) { - gchar *str = sp_svg_write_path(abp); - repr->setAttribute("inkscape:original-d", str); - g_free(str); - } else { - repr->setAttribute("inkscape:original-d", ""); - } + gchar *str = sp_svg_write_path(path->original_curve->get_pathvector()); + repr->setAttribute("inkscape:original-d", str); + g_free(str); } else { repr->setAttribute("inkscape:original-d", NULL); } @@ -342,7 +327,7 @@ sp_path_write(SPObject *object, Inkscape::XML::Node *repr, guint flags) SP_PATH(shape)->connEndPair.writeRepr(repr); if (((SPObjectClass *)(parent_class))->write) { - ((SPObjectClass *)(parent_class))->write(object, repr, flags); + ((SPObjectClass *)(parent_class))->write(object, xml_doc, repr, flags); } return repr; @@ -378,17 +363,11 @@ sp_path_set_transform(SPItem *item, NR::Matrix const &xform) } // Transform the original-d path or the (ordinary) path - bool original_path = (bool)path->original_curve; - SPCurve *srccurve = original_path ? path->original_curve : shape->curve; - SPCurve *dstcurve = sp_curve_copy(srccurve); - if (dstcurve) { - sp_curve_transform(dstcurve, xform); - if (original_path) { - sp_path_set_original_curve(path, dstcurve, TRUE, true); - } else { - sp_shape_set_curve(shape, dstcurve, TRUE); - } - sp_curve_unref(dstcurve); + if (path->original_curve) { + path->original_curve->transform(xform); + sp_lpe_item_update_patheffect(path, true, true); + } else { + shape->curve->transform(xform); } // Adjust stroke @@ -410,27 +389,24 @@ sp_path_set_transform(SPItem *item, NR::Matrix const &xform) } static void -sp_path_update_patheffect(SPShape *shape, bool write) +sp_path_update_patheffect(SPLPEItem *lpeitem, bool write) { - SPPath *path = (SPPath *) shape; + SPShape *shape = (SPShape *) lpeitem; + SPPath *path = (SPPath *) lpeitem; if (path->original_curve) { - SPCurve *curve = sp_curve_copy (path->original_curve); - sp_shape_perform_path_effect(curve, shape); - sp_shape_set_curve(shape, curve, TRUE); - sp_curve_unref(curve); + SPCurve *curve = path->original_curve->copy(); + sp_shape_set_curve_insync(shape, curve, TRUE); + sp_lpe_item_perform_path_effect(SP_LPE_ITEM(shape), curve); + SP_OBJECT(shape)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + curve->unref(); if (write) { // could also do SP_OBJECT(shape)->updateRepr(); but only the d attribute needs updating. Inkscape::XML::Node *repr = SP_OBJECT_REPR(shape); if ( shape->curve != NULL ) { - NArtBpath *abp = sp_curve_first_bpath(shape->curve); - if (abp) { - gchar *str = sp_svg_write_path(abp); - repr->setAttribute("d", str); - g_free(str); - } else { - repr->setAttribute("d", ""); - } + gchar *str = sp_svg_write_path(shape->curve->get_pathvector()); + repr->setAttribute("d", str); + g_free(str); } else { repr->setAttribute("d", NULL); } @@ -445,24 +421,24 @@ sp_path_update_patheffect(SPShape *shape, bool write) * Adds a original_curve to the path. If owner is specified, a reference * will be made, otherwise the curve will be copied into the path. * Any existing curve in the path will be unreferenced first. - * This routine triggers reapplication of the an effect is present - * an also triggers a request to update the display. Does not write -* result to XML when write=false. + * This routine triggers reapplication of an effect if present + * and also triggers a request to update the display. Does not write + * result to XML when write=false. */ void sp_path_set_original_curve (SPPath *path, SPCurve *curve, unsigned int owner, bool write) { if (path->original_curve) { - path->original_curve = sp_curve_unref (path->original_curve); + path->original_curve = path->original_curve->unref(); } if (curve) { if (owner) { - path->original_curve = sp_curve_ref (curve); + path->original_curve = curve->ref(); } else { - path->original_curve = sp_curve_copy (curve); + path->original_curve = curve->copy(); } } - sp_path_update_patheffect(path, write); + sp_lpe_item_update_patheffect(path, true, write); SP_OBJECT(path)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); } @@ -473,7 +449,7 @@ SPCurve * sp_path_get_original_curve (SPPath *path) { if (path->original_curve) { - return sp_curve_copy (path->original_curve); + return path->original_curve->copy(); } return NULL; } @@ -539,7 +515,7 @@ void freehand_create_single_dot(SPEventContext *ec, NR::Point const &pt, char co /* put the circle where the mouse click occurred and set the diameter to the current stroke width, multiplied by the amount specified in the preferences */ - NR::Matrix const i2d (sp_item_i2d_affine (item)); + NR::Matrix const i2d (from_2geom(sp_item_i2d_affine (item))); NR::Point pp = pt * i2d; double rad = 0.5 * prefs_get_double_attribute(tool, "dot-size", 3.0); if (event_state & GDK_MOD1_MASK) {