![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-use.cpp b/src/sp-use.cpp
index 8b63217455f280c7f4d4452967cdc8302126d689..ecb7eb788b137c69537c43312d9950e96ce06518 100644 (file)
--- a/src/sp-use.cpp
+++ b/src/sp-use.cpp
#include <libnr/nr-matrix-ops.h>
#include <libnr/nr-matrix-fns.h>
-#include "libnr/nr-matrix-translate-ops.h"
+#include <2geom/transforms.h>
#include <glibmm/i18n.h>
#include "display/nr-arena-group.h"
#include "attributes.h"
#include "uri.h"
#include "print.h"
#include "xml/repr.h"
-#include "prefs-utils.h"
+#include "preferences.h"
#include "style.h"
#include "sp-symbol.h"
#include "sp-use.h"
static void sp_use_modified(SPObject *object, guint flags);
static void sp_use_bbox(SPItem const *item, NRRect *bbox, Geom::Matrix const &transform, unsigned const flags);
-static void sp_use_snappoints(SPItem const *item, SnapPointsIter p);
+static void sp_use_snappoints(SPItem const *item, std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs);
static void sp_use_print(SPItem *item, SPPrintContext *ctx);
static gchar *sp_use_description(SPItem *item);
static NRArenaItem *sp_use_show(SPItem *item, NRArena *arena, unsigned key, unsigned flags);
static SPItemClass *parent_class;
-//void m_print(gchar *say, NR::Matrix m)
+//void m_print(gchar *say, Geom::Matrix m)
//{ g_print("%s %g %g %g %g %g %g\n", say, m[0], m[1], m[2], m[3], m[4], m[5]); }
GType
@@ -288,7 +288,14 @@ sp_use_bbox(SPItem const *item, NRRect *bbox, Geom::Matrix const &transform, uns
* Geom::Translate(use->x.computed,
use->y.computed)
* transform );
- sp_item_invoke_bbox_full(child, bbox, ct, flags, FALSE);
+ Geom::OptRect optbbox;
+ sp_item_invoke_bbox_full(child, optbbox, ct, flags, FALSE);
+ if (optbbox) {
+ bbox->x0 = (*optbbox)[0][0];
+ bbox->y0 = (*optbbox)[1][0];
+ bbox->x1 = (*optbbox)[0][1];
+ bbox->y1 = (*optbbox)[1][1];
+ }
}
}
SPUse *use = SP_USE(item);
if ((use->x._set && use->x.computed != 0) || (use->y._set && use->y.computed != 0)) {
- NR::Matrix tp(NR::translate(use->x.computed, use->y.computed));
+ Geom::Matrix tp(Geom::Translate(use->x.computed, use->y.computed));
sp_print_bind(ctx, tp, 1.0);
translated = true;
}
if (ac) {
nr_arena_item_add_child(ai, ac, NULL);
}
- NR::translate t(use->x.computed,
+ Geom::Translate t(use->x.computed,
use->y.computed);
- nr_arena_group_set_child_transform(NR_ARENA_GROUP(ai), NR::Matrix(t));
+ nr_arena_group_set_child_transform(NR_ARENA_GROUP(ai), Geom::Matrix(t));
}
return ai;
sp_use_root(SPUse *use)
{
SPObject *orig = use->child;
- while (SP_IS_USE(orig)) {
+ while (orig && SP_IS_USE(orig)) {
orig = SP_USE(orig)->child;
}
- g_return_val_if_fail(SP_IS_ITEM(orig), NULL);
+ if (!orig || !SP_IS_ITEM(orig))
+ return NULL;
return SP_ITEM(orig);
}
* Returns the effective transform that goes from the ultimate original to given SPUse, both ends
* included.
*/
-NR::Matrix
+Geom::Matrix
sp_use_get_root_transform(SPUse *use)
{
//track the ultimate source of a chain of uses
//calculate the accummulated transform, starting from the original
- NR::Matrix t(NR::identity());
+ Geom::Matrix t(Geom::identity());
for (GSList *i = chain; i != NULL; i = i->next) {
SPItem *i_tem = SP_ITEM(i->data);
if (SP_IS_USE(i_tem)) {
SPUse *i_use = SP_USE(i_tem);
if ((i_use->x._set && i_use->x.computed != 0) || (i_use->y._set && i_use->y.computed != 0)) {
- t = t * NR::translate(i_use->x._set ? i_use->x.computed : 0, i_use->y._set ? i_use->y.computed : 0);
+ t = t * Geom::Translate(i_use->x._set ? i_use->x.computed : 0, i_use->y._set ? i_use->y.computed : 0);
}
}
* Returns the transform that leads to the use from its immediate original.
* Does not inlcude the original's transform if any.
*/
-NR::Matrix
+Geom::Matrix
sp_use_get_parent_transform(SPUse *use)
{
- NR::Matrix t(NR::identity());
+ Geom::Matrix t(Geom::identity());
if ((use->x._set && use->x.computed != 0) || (use->y._set && use->y.computed != 0)) {
- t *= NR::translate(use->x._set ? use->x.computed : 0,
+ t *= Geom::Translate(use->x._set ? use->x.computed : 0,
use->y._set ? use->y.computed : 0);
}
* clone's transform.
*/
static void
-sp_use_move_compensate(NR::Matrix const *mp, SPItem */*original*/, SPUse *self)
+sp_use_move_compensate(Geom::Matrix const *mp, SPItem */*original*/, SPUse *self)
{
// the clone is orphaned; or this is not a real use, but a clone of another use;
// we skip it, otherwise duplicate compensation will occur
@@ -471,31 +479,32 @@ sp_use_move_compensate(NR::Matrix const *mp, SPItem */*original*/, SPUse *self)
return;
}
- guint mode = prefs_get_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_PARALLEL);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ guint mode = prefs->getInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_PARALLEL);
// user wants no compensation
if (mode == SP_CLONE_COMPENSATION_NONE)
return;
- NR::Matrix m(*mp);
+ Geom::Matrix m(*mp);
// this is not a simple move, do not try to compensate
- if (!(m.is_translation()))
+ if (!(m.isTranslation()))
return;
// restore item->transform field from the repr, in case it was changed by seltrans
sp_object_read_attr (SP_OBJECT (self), "transform");
- NR::Matrix t = sp_use_get_parent_transform(self);
- NR::Matrix clone_move = t.inverse() * m * t;
+ Geom::Matrix t = sp_use_get_parent_transform(self);
+ Geom::Matrix clone_move = t.inverse() * m * t;
// calculate the compensation matrix and the advertized movement matrix
- NR::Matrix advertized_move;
+ Geom::Matrix advertized_move;
if (mode == SP_CLONE_COMPENSATION_PARALLEL) {
clone_move = clone_move.inverse() * m;
advertized_move = m;
} else if (mode == SP_CLONE_COMPENSATION_UNMOVED) {
clone_move = clone_move.inverse();
- advertized_move.set_identity();
+ advertized_move.setIdentity();
} else {
g_assert_not_reached();
}
return;
}
- guint const mode = prefs_get_int_attribute("options.cloneorphans", "value",
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ guint const mode = prefs->getInt("/options/cloneorphans/value",
SP_CLONE_ORPHANS_UNLINK);
if (mode == SP_CLONE_ORPHANS_UNLINK) {
cctx.vp.y0 = 0.0;
cctx.vp.x1 = use->width.computed;
cctx.vp.y1 = use->height.computed;
- cctx.i2vp = NR::identity();
+ cctx.i2vp = Geom::identity();
flags&=~SP_OBJECT_USER_MODIFIED_FLAG_B;
if (use->child) {
/* As last step set additional transform of arena group */
for (SPItemView *v = item->display; v != NULL; v = v->next) {
- NR::Matrix t(NR::translate(use->x.computed, use->y.computed));
+ Geom::Matrix t(Geom::Translate(use->x.computed, use->y.computed));
nr_arena_group_set_child_transform(NR_ARENA_GROUP(v->arenaitem), t);
}
}
// Track the ultimate source of a chain of uses.
SPItem *orig = sp_use_root(use);
- g_return_val_if_fail(orig, NULL);
+ if (!orig) return NULL ;
// Calculate the accumulated transform, starting from the original.
- NR::Matrix t = sp_use_get_root_transform(use);
+ Geom::Matrix t = sp_use_get_root_transform(use);
Inkscape::XML::Node *copy = NULL;
if (SP_IS_SYMBOL(orig)) { // make a group, copy children
SPItem *item = SP_ITEM(unlinked);
// Set the accummulated transform.
{
- NR::Matrix nomove(NR::identity());
+ Geom::Matrix nomove(Geom::identity());
// Advertise ourselves as not moving.
sp_item_write_transform(item, SP_OBJECT_REPR(item), t, &nomove);
}
}
static void
-sp_use_snappoints(SPItem const *item, SnapPointsIter p)
+sp_use_snappoints(SPItem const *item, std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs)
{
g_assert (item != NULL);
g_assert (SP_IS_ITEM(item));
g_assert (SP_IS_USE(item));
-
+
SPUse *use = SP_USE(item);
SPItem *root = sp_use_root(use);
- g_return_if_fail(root);
-
+ if (!root)
+ return;
+
SPItemClass const &item_class = *(SPItemClass const *) G_OBJECT_GET_CLASS(root);
if (item_class.snappoints) {
- item_class.snappoints(root, p);
+ item_class.snappoints(root, p, snapprefs);
}
}