X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-item-group.cpp;h=186b766635f1115ee63e0817401f4fd83af249c5;hb=8b9a820756fdf348239872236be2257f854e094a;hp=cd11b3c41be974c2e4e3ae95da4a2855e9debbb5;hpb=4fdf6b76d694d20b7bc67a8cfb65e4dd77542d69;p=inkscape.git diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp index cd11b3c41..186b76663 100644 --- a/src/sp-item-group.cpp +++ b/src/sp-item-group.cpp @@ -6,8 +6,9 @@ * Authors: * Lauris Kaplinski * bulia byak + * Johan Engelen * - * Copyright (C) 1999-2005 authors + * Copyright (C) 1999-2006 authors * Copyright (C) 2000-2001 Ximian, Inc. * * Released under GNU GPL, read the file 'COPYING' for more information @@ -17,11 +18,12 @@ # include "config.h" #endif -#if defined(WIN32) || defined(__APPLE__) -# include -#endif +#include +#include +#include #include "display/nr-arena-group.h" +#include "display/curve.h" #include "libnr/nr-matrix-ops.h" #include "libnr/nr-matrix-fns.h" #include "xml/repr.h" @@ -29,10 +31,20 @@ #include "document.h" #include "style.h" #include "attributes.h" - +#include "sp-item-transform.h" #include "sp-root.h" #include "sp-use.h" #include "prefs-utils.h" +#include "sp-clippath.h" +#include "sp-mask.h" +#include "sp-path.h" +#include "box3d.h" +#include "persp3d.h" +#include "inkscape.h" +#include "desktop-handles.h" +#include "selection.h" +#include "live_effects/lpeobject.h" +#include "live_effects/lpeobject-reference.h" static void sp_group_class_init (SPGroupClass *klass); static void sp_group_init (SPGroup *group); @@ -45,17 +57,21 @@ static void sp_group_remove_child (SPObject * object, Inkscape::XML::Node * chil static void sp_group_order_changed (SPObject * object, Inkscape::XML::Node * child, Inkscape::XML::Node * old_ref, Inkscape::XML::Node * new_ref); static void sp_group_update (SPObject *object, SPCtx *ctx, guint flags); static void sp_group_modified (SPObject *object, guint flags); -static Inkscape::XML::Node *sp_group_write (SPObject *object, Inkscape::XML::Node *repr, guint flags); +static Inkscape::XML::Node *sp_group_write (SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags); static void sp_group_set(SPObject *object, unsigned key, char const *value); static void sp_group_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const flags); static void sp_group_print (SPItem * item, SPPrintContext *ctx); static gchar * sp_group_description (SPItem * item); +static NR::Matrix sp_group_set_transform(SPItem *item, NR::Matrix const &xform); static NRArenaItem *sp_group_show (SPItem *item, NRArena *arena, unsigned int key, unsigned int flags); static void sp_group_hide (SPItem * item, unsigned int key); static void sp_group_snappoints (SPItem const *item, SnapPointsIter p); -static SPItemClass * parent_class; +static void sp_group_update_patheffect(SPLPEItem *lpeitem, bool write); +static void sp_group_perform_patheffect(SPGroup *group, SPGroup *topgroup); + +static SPLPEItemClass * parent_class; GType sp_group_get_type (void) @@ -74,7 +90,7 @@ sp_group_get_type (void) (GInstanceInitFunc) sp_group_init, NULL, /* value_table */ }; - group_type = g_type_register_static (SP_TYPE_ITEM, "SPGroup", &group_info, (GTypeFlags)0); + group_type = g_type_register_static (SP_TYPE_LPE_ITEM, "SPGroup", &group_info, (GTypeFlags)0); } return group_type; } @@ -85,12 +101,14 @@ sp_group_class_init (SPGroupClass *klass) GObjectClass * object_class; SPObjectClass * sp_object_class; SPItemClass * item_class; + SPLPEItemClass * lpe_item_class; object_class = (GObjectClass *) klass; sp_object_class = (SPObjectClass *) klass; item_class = (SPItemClass *) klass; + lpe_item_class = (SPLPEItemClass *) klass; - parent_class = (SPItemClass *)g_type_class_ref (SP_TYPE_ITEM); + parent_class = (SPLPEItemClass *)g_type_class_ref (SP_TYPE_LPE_ITEM); object_class->dispose = sp_group_dispose; @@ -107,9 +125,12 @@ sp_group_class_init (SPGroupClass *klass) item_class->bbox = sp_group_bbox; item_class->print = sp_group_print; item_class->description = sp_group_description; + item_class->set_transform = sp_group_set_transform; item_class->show = sp_group_show; item_class->hide = sp_group_hide; item_class->snappoints = sp_group_snappoints; + + lpe_item_class->update_patheffect = sp_group_update_patheffect; } static void @@ -190,11 +211,14 @@ sp_group_update (SPObject *object, SPCtx *ctx, unsigned int flags) static void sp_group_modified (SPObject *object, guint flags) { + if (((SPObjectClass *) (parent_class))->modified) + ((SPObjectClass *) (parent_class))->modified (object, flags); + SP_GROUP(object)->group->onModified(flags); } static Inkscape::XML::Node * -sp_group_write (SPObject *object, Inkscape::XML::Node *repr, guint flags) +sp_group_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) { SPGroup *group; SPObject *child; @@ -204,10 +228,12 @@ sp_group_write (SPObject *object, Inkscape::XML::Node *repr, guint flags) if (flags & SP_OBJECT_WRITE_BUILD) { GSList *l; - if (!repr) repr = sp_repr_new ("svg:g"); + if (!repr) { + repr = xml_doc->createElement("svg:g"); + } l = NULL; for (child = sp_object_first_child(object); child != NULL; child = SP_OBJECT_NEXT(child) ) { - crepr = child->updateRepr(NULL, flags); + crepr = child->updateRepr(xml_doc, NULL, flags); if (crepr) l = g_slist_prepend (l, crepr); } while (l) { @@ -234,7 +260,7 @@ sp_group_write (SPObject *object, Inkscape::XML::Node *repr, guint flags) } if (((SPObjectClass *) (parent_class))->write) - ((SPObjectClass *) (parent_class))->write (object, repr, flags); + ((SPObjectClass *) (parent_class))->write (object, xml_doc, repr, flags); return repr; } @@ -256,17 +282,35 @@ static gchar * sp_group_description (SPItem * item) return SP_GROUP(item)->group->getDescription(); } +static NR::Matrix +sp_group_set_transform(SPItem *item, NR::Matrix const &xform) +{ + Inkscape::Selection *selection = sp_desktop_selection(inkscape_active_desktop()); + persp3d_split_perspectives_according_to_selection(selection); + + NR::Matrix last_trans; + sp_svg_transform_read(SP_OBJECT_REPR(item)->attribute("transform"), &last_trans); + NR::Matrix inc_trans = last_trans.inverse()*xform; + + std::list plist = selection->perspList(); + for (std::list::iterator i = plist.begin(); i != plist.end(); ++i) { + persp3d_apply_affine_transformation(*i, inc_trans); + } + + return xform; +} + static void sp_group_set(SPObject *object, unsigned key, char const *value) { - SPGroup *group=SP_GROUP(object); + SPGroup *group = SP_GROUP(object); switch (key) { - case SP_ATTR_INKSCAPE_GROUPMODE: { + case SP_ATTR_INKSCAPE_GROUPMODE: if ( value && !strcmp(value, "layer") ) { group->setLayerMode(SPGroup::LAYER); } else { group->setLayerMode(SPGroup::GROUP); } - } break; + break; default: { if (((SPObjectClass *) (parent_class))->set) { (* ((SPObjectClass *) (parent_class))->set)(object, key, value); @@ -294,7 +338,7 @@ static void sp_group_snappoints (SPItem const *item, SnapPointsIter p) o = SP_OBJECT_NEXT(o)) { if (SP_IS_ITEM(o)) { - sp_item_snappoints(SP_ITEM(o), p); + sp_item_snappoints(SP_ITEM(o), false, p); } } } @@ -321,6 +365,13 @@ sp_item_group_ungroup (SPGroup *group, GSList **children, bool do_done) SPItem *pitem = SP_ITEM (SP_OBJECT_PARENT (gitem)); Inkscape::XML::Node *prepr = SP_OBJECT_REPR (pitem); + if (SP_IS_BOX3D(gitem)) { + group = box3d_convert_to_group(SP_BOX3D(gitem)); + gitem = SP_ITEM(group); + } + + sp_lpe_item_remove_all_path_effects(SP_LPE_ITEM(group), false); + /* Step 1 - generate lists of children objects */ GSList *items = NULL; GSList *objects = NULL; @@ -360,7 +411,7 @@ sp_item_group_ungroup (SPGroup *group, GSList **children, bool do_done) child->updateRepr(); - Inkscape::XML::Node *nrepr = SP_OBJECT_REPR (child)->duplicate(); + Inkscape::XML::Node *nrepr = SP_OBJECT_REPR (child)->duplicate(prepr->document()); // Merging transform NR::Matrix ctrans; @@ -383,17 +434,14 @@ sp_item_group_ungroup (SPGroup *group, GSList **children, bool do_done) // This is just a way to temporarily remember the transform in repr. When repr is // reattached outside of the group, the transform will be written more properly // (i.e. optimized into the object if the corresponding preference is set) - gchar affinestr[80]; - if (sp_svg_transform_write(affinestr, 79, ctrans)) { - nrepr->setAttribute("transform", affinestr); - } else { - nrepr->setAttribute("transform", NULL); - } + gchar *affinestr=sp_svg_transform_write(ctrans); + nrepr->setAttribute("transform", affinestr); + g_free(affinestr); items = g_slist_prepend (items, nrepr); } else { - Inkscape::XML::Node *nrepr = SP_OBJECT_REPR (child)->duplicate(); + Inkscape::XML::Node *nrepr = SP_OBJECT_REPR (child)->duplicate(prepr->document()); objects = g_slist_prepend (objects, nrepr); } } @@ -409,43 +457,37 @@ sp_item_group_ungroup (SPGroup *group, GSList **children, bool do_done) if (objects) { Inkscape::XML::Node *last_def = SP_OBJECT_REPR(defs)->lastChild(); while (objects) { - SP_OBJECT_REPR(defs)->addChild((Inkscape::XML::Node *) objects->data, last_def); - Inkscape::GC::release((Inkscape::XML::Node *) objects->data); + Inkscape::XML::Node *repr = (Inkscape::XML::Node *) objects->data; + if (!sp_repr_is_meta_element(repr)) + SP_OBJECT_REPR(defs)->addChild(repr, last_def); + Inkscape::GC::release(repr); objects = g_slist_remove (objects, objects->data); } } /* Step 4 - add items */ - gint const preserve = prefs_get_int_attribute("options.preservetransform", "value", 0); while (items) { Inkscape::XML::Node *repr = (Inkscape::XML::Node *) items->data; // add item - prepr->appendChild(repr); + prepr->appendChild(repr); // restore position; since the items list was prepended (i.e. reverse), we now add // all children at the same pos, which inverts the order once again repr->setPosition(pos > 0 ? pos : 0); // fill in the children list if non-null - SPItem *nitem = (SPItem *) doc->getObjectByRepr(repr); - - /* Optimize the transform matrix if requested. */ - // No compensations are required because this is supposed to be a non-transformation visually. - if (!preserve) { - NR::Matrix (*set_transform)(SPItem *, NR::Matrix const &) = ((SPItemClass *) G_OBJECT_GET_CLASS(nitem))->set_transform; - if (set_transform) { - sp_item_set_item_transform(nitem, set_transform(nitem, nitem->transform)); - nitem->updateRepr(); - } - } + SPItem *item = (SPItem *) doc->getObjectByRepr(repr); + + sp_item_write_transform(item, repr, item->transform, NULL, false); Inkscape::GC::release(repr); - if (children && SP_IS_ITEM (nitem)) - *children = g_slist_prepend (*children, nitem); + if (children && SP_IS_ITEM (item)) + *children = g_slist_prepend (*children, item); items = g_slist_remove (items, items->data); } - if (do_done) sp_document_done (doc); + if (do_done) + sp_document_done (doc, SP_VERB_NONE, _("Ungroup")); } /* @@ -524,6 +566,19 @@ void SPGroup::_updateLayerMode(unsigned int display_key) { } } +void SPGroup::translateChildItems(NR::translate const &tr) +{ + if (this->hasChildren()) + { + SPObject *o = NULL; + for (o = sp_object_first_child(SP_OBJECT(this)) ; o != NULL ; o = SP_OBJECT_NEXT(o) ) { + if (SP_IS_ITEM (o)) { + sp_item_move_rel(static_cast(o), tr); + } + } + } +} + CGroup::CGroup(SPGroup *group) { _group = group; } @@ -578,19 +633,28 @@ void CGroup::onChildRemoved(Inkscape::XML::Node */*child*/) { _group->requestModified(SP_OBJECT_MODIFIED_FLAG); } -void CGroup::onUpdate(SPCtx *ctx, unsigned int flags) { - SPObject *child; +void CGroup::onUpdate(SPCtx *ctx, unsigned int flags) { SPItemCtx *ictx, cctx; ictx = (SPItemCtx *) ctx; cctx = *ictx; - if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG; + if (flags & SP_OBJECT_MODIFIED_FLAG) { + flags |= SP_OBJECT_PARENT_MODIFIED_FLAG; + } + flags &= SP_OBJECT_MODIFIED_CASCADE; - GSList *l = g_slist_reverse(_childList(true, ActionUpdate)); + if (flags & SP_OBJECT_STYLE_MODIFIED_FLAG) { + SPObject *object = SP_OBJECT(_group); + for (SPItemView *v = SP_ITEM(_group)->display; v != NULL; v = v->next) { + nr_arena_group_set_style(NR_ARENA_GROUP(v->arenaitem), SP_OBJECT_STYLE(object)); + } + } + + GSList *l = g_slist_reverse(_group->childList(true, SPObject::ActionUpdate)); while (l) { - child = SP_OBJECT (l->data); + SPObject *child = SP_OBJECT (l->data); l = g_slist_remove (l, child); if (flags || (child->uflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) { if (SP_IS_ITEM (child)) { @@ -606,24 +670,20 @@ void CGroup::onUpdate(SPCtx *ctx, unsigned int flags) { } } -GSList *CGroup::_childList(bool add_ref, Action) { - GSList *l = NULL; - for (SPObject *child = sp_object_first_child(_group) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) { - if (add_ref) - g_object_ref (G_OBJECT (child)); - - l = g_slist_prepend (l, child); - } - return l; -} - void CGroup::onModified(guint flags) { SPObject *child; if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG; flags &= SP_OBJECT_MODIFIED_CASCADE; - GSList *l = g_slist_reverse(_childList(true)); + if (flags & SP_OBJECT_STYLE_MODIFIED_FLAG) { + SPObject *object = SP_OBJECT(_group); + for (SPItemView *v = SP_ITEM(_group)->display; v != NULL; v = v->next) { + nr_arena_group_set_style(NR_ARENA_GROUP(v->arenaitem), SP_OBJECT_STYLE(object)); + } + } + + GSList *l = g_slist_reverse(_group->childList(true)); while (l) { child = SP_OBJECT (l->data); l = g_slist_remove (l, child); @@ -635,25 +695,30 @@ void CGroup::onModified(guint flags) { } void CGroup::calculateBBox(NRRect *bbox, NR::Matrix const &transform, unsigned const flags) { - GSList *l = _childList(false, ActionBBox); + + boost::optional dummy_bbox; + + GSList *l = _group->childList(false, SPObject::ActionBBox); while (l) { SPObject *o = SP_OBJECT (l->data); - if (SP_IS_ITEM(o)) { + if (SP_IS_ITEM(o) && !SP_ITEM(o)->isHidden()) { SPItem *child = SP_ITEM(o); NR::Matrix const ct(child->transform * transform); - sp_item_invoke_bbox_full(child, bbox, ct, flags, FALSE); - } + sp_item_invoke_bbox_full(child, &dummy_bbox, ct, flags, FALSE); + } l = g_slist_remove (l, o); } + + *bbox = NRRect(dummy_bbox); } void CGroup::onPrint(SPPrintContext *ctx) { - GSList *l = g_slist_reverse(_childList(false)); + GSList *l = g_slist_reverse(_group->childList(false)); while (l) { SPObject *o = SP_OBJECT (l->data); if (SP_IS_ITEM(o)) { sp_item_invoke_print (SP_ITEM (o), ctx); - } + } l = g_slist_remove (l, o); } } @@ -665,7 +730,7 @@ gint CGroup::getItemCount() { len++; } } - + return len; } @@ -679,11 +744,14 @@ gchar *CGroup::getDescription() { NRArenaItem *CGroup::show (NRArena *arena, unsigned int key, unsigned int flags) { NRArenaItem *ai; + SPObject *object = SP_OBJECT(_group); ai = NRArenaGroup::create(arena); + nr_arena_group_set_transparent(NR_ARENA_GROUP (ai), _group->effectiveLayerMode(key) == SPGroup::LAYER); + nr_arena_group_set_style(NR_ARENA_GROUP(ai), SP_OBJECT_STYLE(object)); _showChildren(arena, ai, key, flags); return ai; @@ -693,7 +761,7 @@ void CGroup::_showChildren (NRArena *arena, NRArenaItem *ai, unsigned int key, u NRArenaItem *ac = NULL; NRArenaItem *ar = NULL; SPItem * child = NULL; - GSList *l = g_slist_reverse(_childList(false, ActionShow)); + GSList *l = g_slist_reverse(_group->childList(false, SPObject::ActionShow)); while (l) { SPObject *o = SP_OBJECT (l->data); if (SP_IS_ITEM (o)) { @@ -712,7 +780,7 @@ void CGroup::_showChildren (NRArena *arena, NRArenaItem *ai, unsigned int key, u void CGroup::hide (unsigned int key) { SPItem * child; - GSList *l = g_slist_reverse(_childList(false, ActionShow)); + GSList *l = g_slist_reverse(_group->childList(false, SPObject::ActionShow)); while (l) { SPObject *o = SP_OBJECT (l->data); if (SP_IS_ITEM (o)) { @@ -740,3 +808,68 @@ void CGroup::onOrderChanged (Inkscape::XML::Node *child, Inkscape::XML::Node *, _group->requestModified(SP_OBJECT_MODIFIED_FLAG); } + +static void +sp_group_update_patheffect (SPLPEItem *lpeitem, bool write) +{ +#ifdef GROUP_VERBOSE + g_message("sp_group_update_patheffect: %p\n", lpeitem); +#endif + g_return_if_fail (lpeitem != NULL); + g_return_if_fail (SP_IS_GROUP (lpeitem)); + + GSList const *item_list = sp_item_group_item_list(SP_GROUP(lpeitem)); + for ( GSList const *iter = item_list; iter; iter = iter->next ) { + SPObject *subitem = static_cast(iter->data); + if (SP_IS_LPE_ITEM(subitem)) { + if (SP_LPE_ITEM_CLASS (G_OBJECT_GET_CLASS (subitem))->update_patheffect) { + SP_LPE_ITEM_CLASS (G_OBJECT_GET_CLASS (subitem))->update_patheffect (SP_LPE_ITEM(subitem), write); + } + } + } + + if (sp_lpe_item_has_path_effect(lpeitem) && sp_lpe_item_path_effects_enabled(lpeitem)) { + for (PathEffectList::iterator it = lpeitem->path_effect_list->begin(); it != lpeitem->path_effect_list->end(); it++) + { + LivePathEffectObject *lpeobj = (*it)->lpeobject; + lpeobj->lpe->doBeforeEffect(lpeitem); + } + + sp_group_perform_patheffect(SP_GROUP(lpeitem), SP_GROUP(lpeitem)); + } +} + +static void +sp_group_perform_patheffect(SPGroup *group, SPGroup *topgroup) +{ + GSList const *item_list = sp_item_group_item_list(SP_GROUP(group)); + for ( GSList const *iter = item_list; iter; iter = iter->next ) { + SPObject *subitem = static_cast(iter->data); + if (SP_IS_GROUP(subitem)) { + sp_group_perform_patheffect(SP_GROUP(subitem), topgroup); + } else if (SP_IS_SHAPE(subitem)) { + SPCurve * c = sp_shape_get_curve(SP_SHAPE(subitem)); + sp_lpe_item_perform_path_effect(SP_LPE_ITEM(topgroup), c); + sp_shape_set_curve(SP_SHAPE(subitem), c, TRUE); + + Inkscape::XML::Node *repr = SP_OBJECT_REPR(subitem); + + gchar *str = sp_svg_write_path(c->get_pathvector()); + repr->setAttribute("d", str); + g_free(str); + + c->unref(); + } + } +} + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :