X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fseltrans.cpp;h=8ff00d60ae902f654b23e21055e657220d66f1ed;hb=e711b02fbbe0b7d07102ebdd63b05027d6f8af47;hp=a3e0c9f0b4cec86f897f6c5439acd7542c4389b5;hpb=f5b6a31c52761f10431371b96c6a8db0970edc47;p=inkscape.git diff --git a/src/seltrans.cpp b/src/seltrans.cpp index a3e0c9f0b..8ff00d60a 100644 --- a/src/seltrans.cpp +++ b/src/seltrans.cpp @@ -1,9 +1,7 @@ -#define __SELTRANS_C__ - -/* - * Helper object for transforming selected items - * - * Authors: +/** @file + * @brief Helper object for transforming selected items + */ +/* Authors: * Lauris Kaplinski * bulia byak * Carl Hetherington @@ -21,12 +19,7 @@ #include #include -#include -#include -#include -#include -#include -#include +#include <2geom/transforms.h> #include #include "document.h" #include "sp-namedview.h" @@ -46,10 +39,10 @@ #include "verbs.h" #include #include "display/sp-ctrlline.h" -#include "prefs-utils.h" +#include "preferences.h" #include "xml/repr.h" #include "mod360.h" -#include "2geom/angle.h" +#include <2geom/angle.h> #include "display/snap-indicator.h" @@ -58,8 +51,8 @@ static void sp_remove_handles(SPKnot *knot[], gint num); static void sp_sel_trans_handle_grab(SPKnot *knot, guint state, gpointer data); static void sp_sel_trans_handle_ungrab(SPKnot *knot, guint state, gpointer data); static void sp_sel_trans_handle_click(SPKnot *knot, guint state, gpointer data); -static void sp_sel_trans_handle_new_event(SPKnot *knot, NR::Point *position, guint32 state, gpointer data); -static gboolean sp_sel_trans_handle_request(SPKnot *knot, NR::Point *p, guint state, gboolean *data); +static void sp_sel_trans_handle_new_event(SPKnot *knot, Geom::Point *position, guint32 state, gpointer data); +static gboolean sp_sel_trans_handle_request(SPKnot *knot, Geom::Point *p, guint state, gboolean *data); extern GdkPixbuf *handles[]; @@ -94,20 +87,21 @@ Inkscape::SelTrans::SelTrans(SPDesktop *desktop) : _show(SHOW_CONTENT), _grabbed(false), _show_handles(true), - _bbox(NR::Nothing()), - _approximate_bbox(NR::Nothing()), - _absolute_affine(NR::scale(1,1)), - _opposite(NR::Point(0,0)), - _opposite_for_specpoints(NR::Point(0,0)), - _opposite_for_bboxpoints(NR::Point(0,0)), - _origin_for_specpoints(NR::Point(0,0)), - _origin_for_bboxpoints(NR::Point(0,0)), + _bbox(), + _approximate_bbox(), + _absolute_affine(Geom::Scale(1,1)), + _opposite(Geom::Point(0,0)), + _opposite_for_specpoints(Geom::Point(0,0)), + _opposite_for_bboxpoints(Geom::Point(0,0)), + _origin_for_specpoints(Geom::Point(0,0)), + _origin_for_bboxpoints(Geom::Point(0,0)), _chandle(NULL), _stamp_cache(NULL), _message_context(desktop->messageStack()) { - int prefs_bbox = prefs_get_int_attribute("tools", "bounding_box", 0); - _snap_bbox_type = (prefs_bbox ==0)? + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + int prefs_bbox = prefs->getBool("/tools/bounding_box"); + _snap_bbox_type = !prefs_bbox ? SPItem::APPROXIMATE_BBOX : SPItem::GEOMETRIC_BBOX; g_return_if_fail(desktop != NULL); @@ -118,7 +112,7 @@ Inkscape::SelTrans::SelTrans(SPDesktop *desktop) : } _updateVolatileState(); - _current_relative_affine.set_identity(); + _current_relative_affine.setIdentity(); _center_is_set = false; // reread _center from items, or set to bbox midpoint @@ -232,7 +226,7 @@ void Inkscape::SelTrans::increaseState() _updateHandles(); } -void Inkscape::SelTrans::setCenter(NR::Point const &p) +void Inkscape::SelTrans::setCenter(Geom::Point const &p) { _center = p; _center_is_set = true; @@ -247,16 +241,19 @@ void Inkscape::SelTrans::setCenter(NR::Point const &p) _updateHandles(); } -void Inkscape::SelTrans::grab(NR::Point const &p, gdouble x, gdouble y, bool show_handles) +void Inkscape::SelTrans::grab(Geom::Point const &p, gdouble x, gdouble y, bool show_handles, bool translating) { + // While dragging a handle, we will either scale, skew, or rotate and the "translating" parameter will be false + // When dragging the selected item itself however, we will translate the selection and that parameter will be true Inkscape::Selection *selection = sp_desktop_selection(_desktop); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); g_return_if_fail(!_grabbed); _grabbed = true; _show_handles = show_handles; _updateVolatileState(); - _current_relative_affine.set_identity(); + _current_relative_affine.setIdentity(); _changed = false; @@ -268,7 +265,7 @@ void Inkscape::SelTrans::grab(NR::Point const &p, gdouble x, gdouble y, bool sho SPItem *it = (SPItem *)sp_object_ref(SP_OBJECT(l->data), NULL); _items.push_back(it); _items_const.push_back(it); - _items_affines.push_back(from_2geom(sp_item_i2d_affine(it))); + _items_affines.push_back(sp_item_i2d_affine(it)); _items_centers.push_back(it->getCenter()); // for content-dragging, we need to remember original centers } @@ -278,73 +275,152 @@ void Inkscape::SelTrans::grab(NR::Point const &p, gdouble x, gdouble y, bool sho // The selector tool should snap the bbox, special snappoints, and path nodes // (The special points are the handles, center, rotation axis, font baseline, ends of spiral, etc.) - // First, determine the bounding box for snapping ... + // First, determine the bounding box _bbox = selection->bounds(_snap_bbox_type); _approximate_bbox = selection->bounds(SPItem::APPROXIMATE_BBOX); // Used for correctly scaling the strokewidth _geometric_bbox = selection->bounds(SPItem::GEOMETRIC_BBOX); + _point = p; if (_geometric_bbox) { - _point_geom = _geometric_bbox->min() + _geometric_bbox->dimensions() * NR::scale(x, y); + _point_geom = _geometric_bbox->min() + _geometric_bbox->dimensions() * Geom::Scale(x, y); } else { _point_geom = p; } // Next, get all points to consider for snapping SnapManager const &m = _desktop->namedview->snap_manager; - _snap_points = selection->getSnapPoints(m.getIncludeItemCenter()); - std::vector snap_points_hull = selection->getSnapPointsConvexHull(); - if (_snap_points.size() > 100) { + Inkscape::SnapPreferences local_snapprefs = m.snapprefs; + local_snapprefs.setSnapToItemNode(true); // We should get at least the cusp nodes here. This might + // have been turned off because (for example) the user only want paths as a snap target, not nodes + // but as a snap source we still need some nodes though! + _snap_points.clear(); + _snap_points = selection->getSnapPoints(&local_snapprefs); + std::vector > snap_points_hull = selection->getSnapPointsConvexHull(&local_snapprefs); + if (_snap_points.size() > 200) { /* Snapping a huge number of nodes will take way too long, so limit the number of snappable nodes An average user would rarely ever try to snap such a large number of nodes anyway, because (s)he could hardly discern which node would be snapping */ - _snap_points = snap_points_hull; + if (prefs->getBool("/options/snapclosestonly/value", false)) { + _keepClosestPointOnly(_snap_points, p); + } else { + _snap_points = snap_points_hull; + } // Unfortunately, by now we will have lost the font-baseline snappoints :-( } // Find bbox hulling all special points, which excludes stroke width. Here we need to include the // path nodes, for example because a rectangle which has been converted to a path doesn't have // any other special points - NR::Rect snap_points_bbox; + Geom::Rect snap_points_bbox; if ( snap_points_hull.empty() == false ) { - std::vector::iterator i = snap_points_hull.begin(); - snap_points_bbox = NR::Rect(*i, *i); + std::vector >::iterator i = snap_points_hull.begin(); + snap_points_bbox = Geom::Rect((*i).first, (*i).first); i++; while (i != snap_points_hull.end()) { - snap_points_bbox.expandTo(*i); + snap_points_bbox.expandTo((*i).first); i++; } } _bbox_points.clear(); - if (_bbox) { - // ... and add the bbox corners to _bbox_points - for ( unsigned i = 0 ; i < 4 ; i++ ) { - _bbox_points.push_back(_bbox->corner(i)); + _bbox_points_for_translating.clear(); + // Collect the bounding box's corners and midpoints for each selected item + if (m.snapprefs.getSnapModeBBox()) { + bool mp = m.snapprefs.getSnapBBoxMidpoints(); + bool emp = m.snapprefs.getSnapBBoxEdgeMidpoints(); + // Preferably we'd use the bbox of each selected item, instead of the bbox of the selection as a whole; for translations + // this is easy to do, but when snapping the visual bbox while scaling we will have to compensate for the scaling of the + // stroke width. (see get_scale_transform_with_stroke()). This however is currently only implemented for a single bbox. + // That's why we have both _bbox_points_for_translating and _bbox_points. + getBBoxPoints(selection->bounds(_snap_bbox_type), &_bbox_points, false, true, emp, mp); + if (((_items.size() > 0) && (_items.size() < 50)) || prefs->getBool("/options/snapclosestonly/value", false)) { + // More than 50 items will produce at least 200 bbox points, which might make Inkscape crawl + // (see the comment a few lines above). In that case we will use the bbox of the selection as a whole + for (unsigned i = 0; i < _items.size(); i++) { + getBBoxPoints(sp_item_bbox_desktop(_items[i], _snap_bbox_type), &_bbox_points_for_translating, false, true, emp, mp); + } + } else { + _bbox_points_for_translating = _bbox_points; // use the bbox points of the selection as a whole } + } + + if (_bbox) { // There are two separate "opposites" (i.e. opposite w.r.t. the handle being dragged): // - one for snapping the boundingbox, which can be either visual or geometric // - one for snapping the special points // The "opposite" in case of a geometric boundingbox always coincides with the "opposite" for the special points // These distinct "opposites" are needed in the snapmanager to avoid bugs such as #sf1540195 (in which // a box is caught between two guides) - _opposite_for_bboxpoints = _bbox->min() + _bbox->dimensions() * NR::scale(1-x, 1-y); - _opposite_for_specpoints = snap_points_bbox.min() + snap_points_bbox.dimensions() * NR::scale(1-x, 1-y); + _opposite_for_bboxpoints = _bbox->min() + _bbox->dimensions() * Geom::Scale(1-x, 1-y); + _opposite_for_specpoints = snap_points_bbox.min() + snap_points_bbox.dimensions() * Geom::Scale(1-x, 1-y); _opposite = _opposite_for_bboxpoints; } - // The lines below are usefull for debugging any snapping issues, as they'll spit out all points that are considered for snapping + // When snapping the node closest to the mouse pointer is absolutely preferred over the closest snap + // (i.e. when weight == 1), then we will not even try to snap to other points and discard those other + // points immediately. - /*std::cout << "Number of snap points: " << _snap_points.size() << std::endl; - for (std::vector::const_iterator i = _snap_points.begin(); i != _snap_points.end(); i++) - { - std::cout << " " << *i << std::endl; - } + if (prefs->getBool("/options/snapclosestonly/value", false)) { + if (m.snapprefs.getSnapModeNode()) { + _keepClosestPointOnly(_snap_points, p); + } else { + _snap_points.clear(); // don't keep any point + } - std::cout << "Number of bbox points: " << _bbox_points.size() << std::endl; - for (std::vector::const_iterator i = _bbox_points.begin(); i != _bbox_points.end(); i++) - { - std::cout << " " << *i << std::endl; - }*/ + if (m.snapprefs.getSnapModeBBox()) { + _keepClosestPointOnly(_bbox_points, p); + _keepClosestPointOnly(_bbox_points_for_translating, p); + } else { + _bbox_points.clear(); // don't keep any point + _bbox_points_for_translating.clear(); + } + + // Each of the three vectors of snappoints now contains either one snappoint or none at all. + if (_snap_points.size() > 1 || _bbox_points.size() > 1 || _bbox_points_for_translating.size() > 1) { + g_warning("Incorrect assumption encountered while finding the snap source; nothing serious, but please report to Diederik"); + } + + // Now let's reduce this to a single closest snappoint + Geom::Coord dsp = _snap_points.size() == 1 ? Geom::L2((_snap_points.at(0)).first - p) : NR_HUGE; + Geom::Coord dbbp = _bbox_points.size() == 1 ? Geom::L2((_bbox_points.at(0)).first - p) : NR_HUGE; + Geom::Coord dbbpft = _bbox_points_for_translating.size() == 1 ? Geom::L2((_bbox_points_for_translating.at(0)).first - p) : NR_HUGE; + + if (translating) { + _bbox_points.clear(); + if (dsp > dbbpft) { + _snap_points.clear(); + } else { + _bbox_points_for_translating.clear(); + } + } else { + _bbox_points_for_translating.clear(); + if (dsp > dbbp) { + _snap_points.clear(); + } else { + _bbox_points.clear(); + } + } + + if ((_snap_points.size() + _bbox_points.size() + _bbox_points_for_translating.size()) > 1) { + g_warning("Checking number of snap sources failed; nothing serious, but please report to Diederik"); + } + + // Optionally, show the snap source + if (!(_state == STATE_ROTATE && x != 0.5 && y != 0.5)) { // but not when we're dragging a rotation handle, because that won't snap + // Now either _bbox_points or _snap_points has a single element, the other one has zero..... or both have zero elements + if ((_snap_points.size() + _bbox_points.size() + _bbox_points_for_translating.size()) > 1) { + g_warning("too many snap sources to display, please fix this"); + } else if (m.snapprefs.getSnapEnabledGlobally()) { + if (_bbox_points.size() == 1) { + _desktop->snapindicator->set_new_snapsource(_bbox_points.at(0)); + } else if (_bbox_points_for_translating.size() == 1) { + _desktop->snapindicator->set_new_snapsource(_bbox_points_for_translating.at(0)); + } else if (_snap_points.size() == 1){ + _desktop->snapindicator->set_new_snapsource(_snap_points.at(0)); + } + } + } + } if ((x != -1) && (y != -1)) { sp_canvas_item_show(_norm); @@ -360,23 +436,23 @@ void Inkscape::SelTrans::grab(NR::Point const &p, gdouble x, gdouble y, bool sho g_return_if_fail(_stamp_cache == NULL); } -void Inkscape::SelTrans::transform(NR::Matrix const &rel_affine, NR::Point const &norm) +void Inkscape::SelTrans::transform(Geom::Matrix const &rel_affine, Geom::Point const &norm) { g_return_if_fail(_grabbed); g_return_if_fail(!_empty); - NR::Matrix const affine( NR::translate(-norm) * rel_affine * NR::translate(norm) ); + Geom::Matrix const affine( Geom::Translate(-norm) * rel_affine * Geom::Translate(norm) ); if (_show == SHOW_CONTENT) { // update the content for (unsigned i = 0; i < _items.size(); i++) { SPItem &item = *_items[i]; - NR::Matrix const &prev_transform = _items_affines[i]; - sp_item_set_i2d_affine(&item, to_2geom(prev_transform * affine)); + Geom::Matrix const &prev_transform = _items_affines[i]; + sp_item_set_i2d_affine(&item, prev_transform * affine); } } else { if (_bbox) { - NR::Point p[4]; + Geom::Point p[4]; /* update the outline */ for (unsigned i = 0 ; i < 4 ; i++) { p[i] = _bbox->corner(i) * affine; @@ -398,6 +474,8 @@ void Inkscape::SelTrans::ungrab() _grabbed = false; _show_handles = true; + _desktop->snapindicator->remove_snapsource(); + Inkscape::Selection *selection = sp_desktop_selection(_desktop); _updateVolatileState(); @@ -430,7 +508,7 @@ void Inkscape::SelTrans::ungrab() // If dragging showed content live, sp_selection_apply_affine cannot change the centers // appropriately - it does not know the original positions of the centers (all objects already have // the new bboxes). So we need to reset the centers from our saved array. - if (_show != SHOW_OUTLINE && !_current_relative_affine.is_translation()) { + if (_show != SHOW_OUTLINE && !_current_relative_affine.isTranslation()) { for (unsigned i = 0; i < _items_centers.size(); i++) { SPItem *currentItem = _items[i]; if (currentItem->isCenterSet()) { // only if it's already set @@ -445,13 +523,13 @@ void Inkscape::SelTrans::ungrab() _items_affines.clear(); _items_centers.clear(); - if (_current_relative_affine.is_translation()) { + if (_current_relative_affine.isTranslation()) { sp_document_done(sp_desktop_document(_desktop), SP_VERB_CONTEXT_SELECT, _("Move")); - } else if (_current_relative_affine.is_scale()) { + } else if (_current_relative_affine.without_translation().isScale()) { sp_document_done(sp_desktop_document(_desktop), SP_VERB_CONTEXT_SELECT, _("Scale")); - } else if (_current_relative_affine.is_rotation()) { + } else if (_current_relative_affine.without_translation().isRotation()) { sp_document_done(sp_desktop_document(_desktop), SP_VERB_CONTEXT_SELECT, _("Rotate")); } else { @@ -523,11 +601,11 @@ void Inkscape::SelTrans::stamp() SPItem *copy_item = (SPItem *) sp_desktop_document(_desktop)->getObjectByRepr(copy_repr); - NR::Matrix const *new_affine; + Geom::Matrix const *new_affine; if (_show == SHOW_OUTLINE) { - NR::Matrix const i2d(from_2geom(sp_item_i2d_affine(original_item))); - NR::Matrix const i2dnew( i2d * _current_relative_affine ); - sp_item_set_i2d_affine(copy_item, to_2geom(i2dnew)); + Geom::Matrix const i2d(sp_item_i2d_affine(original_item)); + Geom::Matrix const i2dnew( i2d * _current_relative_affine ); + sp_item_set_i2d_affine(copy_item, i2dnew); new_affine = ©_item->transform; } else { new_affine = &original_item->transform; @@ -610,7 +688,7 @@ void Inkscape::SelTrans::_updateHandles() sp_knot_hide(_chandle); } else { sp_knot_show(_chandle); - sp_knot_moveto(_chandle, &*_center); + sp_knot_moveto(_chandle, *_center); } } @@ -674,14 +752,14 @@ void Inkscape::SelTrans::_showHandles(SPKnot *knot[], SPSelTransHandle const han } sp_knot_show(knot[i]); - NR::Point const handle_pt(handle[i].x, handle[i].y); + Geom::Point const handle_pt(handle[i].x, handle[i].y); // shouldn't have nullary bbox, but knots g_assert(_bbox); - NR::Point p( _bbox->min() + Geom::Point p( _bbox->min() + ( _bbox->dimensions() - * NR::scale(handle_pt) ) ); + * Geom::Scale(handle_pt) ) ); - sp_knot_moveto(knot[i], &p); + sp_knot_moveto(knot[i], p); } } @@ -697,14 +775,14 @@ static void sp_sel_trans_handle_ungrab(SPKnot *knot, guint /*state*/, gpointer / SP_SELECT_CONTEXT(knot->desktop->event_context)->_seltrans->ungrab(); } -static void sp_sel_trans_handle_new_event(SPKnot *knot, NR::Point *position, guint state, gpointer data) +static void sp_sel_trans_handle_new_event(SPKnot *knot, Geom::Point *position, guint state, gpointer data) { SP_SELECT_CONTEXT(knot->desktop->event_context)->_seltrans->handleNewEvent( knot, position, state, *(SPSelTransHandle const *) data ); } -static gboolean sp_sel_trans_handle_request(SPKnot *knot, NR::Point *position, guint state, gboolean *data) +static gboolean sp_sel_trans_handle_request(SPKnot *knot, Geom::Point *position, guint state, gboolean *data) { return SP_SELECT_CONTEXT(knot->desktop->event_context)->_seltrans->handleRequest( knot, position, state, *(SPSelTransHandle const *) data @@ -761,11 +839,11 @@ void Inkscape::SelTrans::handleGrab(SPKnot *knot, guint /*state*/, SPSelTransHan break; } - grab(sp_knot_position(knot), handle.x, handle.y, FALSE); + grab(sp_knot_position(knot), handle.x, handle.y, FALSE, FALSE); } -void Inkscape::SelTrans::handleNewEvent(SPKnot *knot, NR::Point *position, guint state, SPSelTransHandle const &handle) +void Inkscape::SelTrans::handleNewEvent(SPKnot *knot, Geom::Point *position, guint state, SPSelTransHandle const &handle) { if (!SP_KNOT_IS_GRABBED(knot)) { return; @@ -783,7 +861,7 @@ void Inkscape::SelTrans::handleNewEvent(SPKnot *knot, NR::Point *position, guint } -gboolean Inkscape::SelTrans::handleRequest(SPKnot *knot, NR::Point *position, guint state, SPSelTransHandle const &handle) +gboolean Inkscape::SelTrans::handleRequest(SPKnot *knot, Geom::Point *position, guint state, SPSelTransHandle const &handle) { if (!SP_KNOT_IS_GRABBED(knot)) { return TRUE; @@ -807,7 +885,7 @@ gboolean Inkscape::SelTrans::handleRequest(SPKnot *knot, NR::Point *position, gu return TRUE; } if (handle.request(this, handle, *position, state)) { - sp_knot_set_position(knot, position, state); + sp_knot_set_position(knot, *position, state); SP_CTRL(_grip)->moveto(*position); SP_CTRL(_norm)->moveto(_origin); } @@ -819,14 +897,15 @@ gboolean Inkscape::SelTrans::handleRequest(SPKnot *knot, NR::Point *position, gu void Inkscape::SelTrans::_selChanged(Inkscape::Selection */*selection*/) { if (!_grabbed) { + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); // reread in case it changed on the fly: - int prefs_bbox = prefs_get_int_attribute("tools", "bounding_box", 0); - _snap_bbox_type = (prefs_bbox ==0)? + int prefs_bbox = prefs->getBool("/tools/bounding_box"); + _snap_bbox_type = !prefs_bbox ? SPItem::APPROXIMATE_BBOX : SPItem::GEOMETRIC_BBOX; //SPItem::APPROXIMATE_BBOX will be replaced by SPItem::VISUAL_BBOX, as soon as the latter is implemented properly _updateVolatileState(); - _current_relative_affine.set_identity(); + _current_relative_affine.setIdentity(); _center_is_set = false; // center(s) may have changed _updateHandles(); } @@ -836,7 +915,7 @@ void Inkscape::SelTrans::_selModified(Inkscape::Selection */*selection*/, guint { if (!_grabbed) { _updateVolatileState(); - _current_relative_affine.set_identity(); + _current_relative_affine.setIdentity(); // reset internal flag _changed = false; @@ -860,47 +939,47 @@ static double sign(double const x) } gboolean sp_sel_trans_scale_request(Inkscape::SelTrans *seltrans, - SPSelTransHandle const &, NR::Point &pt, guint state) + SPSelTransHandle const &, Geom::Point &pt, guint state) { return seltrans->scaleRequest(pt, state); } gboolean sp_sel_trans_stretch_request(Inkscape::SelTrans *seltrans, - SPSelTransHandle const &handle, NR::Point &pt, guint state) + SPSelTransHandle const &handle, Geom::Point &pt, guint state) { return seltrans->stretchRequest(handle, pt, state); } gboolean sp_sel_trans_skew_request(Inkscape::SelTrans *seltrans, - SPSelTransHandle const &handle, NR::Point &pt, guint state) + SPSelTransHandle const &handle, Geom::Point &pt, guint state) { return seltrans->skewRequest(handle, pt, state); } gboolean sp_sel_trans_rotate_request(Inkscape::SelTrans *seltrans, - SPSelTransHandle const &, NR::Point &pt, guint state) + SPSelTransHandle const &, Geom::Point &pt, guint state) { return seltrans->rotateRequest(pt, state); } gboolean sp_sel_trans_center_request(Inkscape::SelTrans *seltrans, - SPSelTransHandle const &, NR::Point &pt, guint state) + SPSelTransHandle const &, Geom::Point &pt, guint state) { return seltrans->centerRequest(pt, state); } -gboolean Inkscape::SelTrans::scaleRequest(NR::Point &pt, guint state) +gboolean Inkscape::SelTrans::scaleRequest(Geom::Point &pt, guint state) { // Calculate the scale factors, which can be either visual or geometric // depending on which type of bbox is currently being used (see preferences -> selector tool) - NR::scale default_scale = calcScaleFactors(_point, pt, _origin); + Geom::Scale default_scale = calcScaleFactors(_point, pt, _origin); // Find the scale factors for the geometric bbox - NR::Point pt_geom = _getGeomHandlePos(pt); - NR::scale geom_scale = calcScaleFactors(_point_geom, pt_geom, _origin_for_specpoints); + Geom::Point pt_geom = _getGeomHandlePos(pt); + Geom::Scale geom_scale = calcScaleFactors(_point_geom, pt_geom, _origin_for_specpoints); - _absolute_affine = NR::identity(); //Initialize the scaler + _absolute_affine = Geom::identity(); //Initialize the scaler if (state & GDK_MOD1_MASK) { // scale by an integer multiplier/divider // We're scaling either the visual or the geometric bbox here (see the comment above) @@ -917,59 +996,59 @@ gboolean Inkscape::SelTrans::scaleRequest(NR::Point &pt, guint state) } else { // In all other cases we should try to snap now SnapManager &m = _desktop->namedview->snap_manager; - m.setup(NULL, _items_const); + m.setup(_desktop, false, _items_const); Inkscape::SnappedPoint bb, sn; - NR::Coord bd(NR_HUGE); - NR::Coord sd(NR_HUGE); + Geom::Coord bd(NR_HUGE); + Geom::Coord sd(NR_HUGE); if ((state & GDK_CONTROL_MASK) || _desktop->isToolboxButtonActive ("lock")) { // Scale is locked to a 1:1 aspect ratio, so that s[X] must be made to equal s[Y]. // // The aspect-ratio must be locked before snapping - if (fabs(default_scale[NR::X]) > fabs(default_scale[NR::Y])) { - default_scale[NR::X] = fabs(default_scale[NR::Y]) * sign(default_scale[NR::X]); - geom_scale[NR::X] = fabs(geom_scale[NR::Y]) * sign(geom_scale[NR::X]); + if (fabs(default_scale[Geom::X]) > fabs(default_scale[Geom::Y])) { + default_scale[Geom::X] = fabs(default_scale[Geom::Y]) * sign(default_scale[Geom::X]); + geom_scale[Geom::X] = fabs(geom_scale[Geom::Y]) * sign(geom_scale[Geom::X]); } else { - default_scale[NR::Y] = fabs(default_scale[NR::X]) * sign(default_scale[NR::Y]); - geom_scale[NR::Y] = fabs(geom_scale[NR::X]) * sign(geom_scale[NR::Y]); + default_scale[Geom::Y] = fabs(default_scale[Geom::X]) * sign(default_scale[Geom::Y]); + geom_scale[Geom::Y] = fabs(geom_scale[Geom::X]) * sign(geom_scale[Geom::Y]); } // Snap along a suitable constraint vector from the origin. - bb = m.constrainedSnapScale(Snapper::SNAPPOINT_BBOX, _bbox_points, default_scale, _origin_for_bboxpoints); - sn = m.constrainedSnapScale(Snapper::SNAPPOINT_NODE, _snap_points, geom_scale, _origin_for_specpoints); + bb = m.constrainedSnapScale(SnapPreferences::SNAPPOINT_BBOX, _bbox_points, _point, default_scale, _origin_for_bboxpoints); + sn = m.constrainedSnapScale(SnapPreferences::SNAPPOINT_NODE, _snap_points, _point, geom_scale, _origin_for_specpoints); /* Choose the smaller difference in scale. Since s[X] == s[Y] we can ** just compare difference in s[X]. */ - bd = bb.getSnapped() ? fabs(bb.getTransformation()[NR::X] - default_scale[NR::X]) : NR_HUGE; - sd = sn.getSnapped() ? fabs(sn.getTransformation()[NR::X] - geom_scale[NR::X]) : NR_HUGE; + bd = bb.getSnapped() ? fabs(bb.getTransformation()[Geom::X] - default_scale[Geom::X]) : NR_HUGE; + sd = sn.getSnapped() ? fabs(sn.getTransformation()[Geom::X] - geom_scale[Geom::X]) : NR_HUGE; } else { /* Scale aspect ratio is unlocked */ - bb = m.freeSnapScale(Snapper::SNAPPOINT_BBOX, _bbox_points, default_scale, _origin_for_bboxpoints); - sn = m.freeSnapScale(Snapper::SNAPPOINT_NODE, _snap_points, geom_scale, _origin_for_specpoints); + bb = m.freeSnapScale(SnapPreferences::SNAPPOINT_BBOX, _bbox_points, _point, default_scale, _origin_for_bboxpoints); + sn = m.freeSnapScale(SnapPreferences::SNAPPOINT_NODE, _snap_points, _point, geom_scale, _origin_for_specpoints); /* Pick the snap that puts us closest to the original scale */ - bd = bb.getSnapped() ? fabs(NR::L2(bb.getTransformation()) - NR::L2(default_scale.point())) : NR_HUGE; - sd = sn.getSnapped() ? fabs(NR::L2(sn.getTransformation()) - NR::L2(geom_scale.point())) : NR_HUGE; + bd = bb.getSnapped() ? fabs(Geom::L2(bb.getTransformation()) - Geom::L2(Geom::Point(default_scale[Geom::X], default_scale[Geom::Y]))) : NR_HUGE; + sd = sn.getSnapped() ? fabs(Geom::L2(sn.getTransformation()) - Geom::L2(Geom::Point(geom_scale[Geom::X], geom_scale[Geom::Y]))) : NR_HUGE; } if (!(bb.getSnapped() || sn.getSnapped())) { // We didn't snap at all! Don't update the handle position, just calculate the new transformation _calcAbsAffineDefault(default_scale); - _desktop->snapindicator->remove_snappoint(); + _desktop->snapindicator->remove_snaptarget(); } else if (bd < sd) { // We snapped the bbox (which is either visual or geometric) - _desktop->snapindicator->set_new_snappoint(bb); - default_scale = NR::scale(bb.getTransformation()); + _desktop->snapindicator->set_new_snaptarget(bb); + default_scale = Geom::Scale(bb.getTransformation()); // Calculate the new transformation and update the handle position pt = _calcAbsAffineDefault(default_scale); } else { - _desktop->snapindicator->set_new_snappoint(sn); + _desktop->snapindicator->set_new_snaptarget(sn); // We snapped the special points (e.g. nodes), which are not at the visual bbox // The handle location however (pt) might however be at the visual bbox, so we // will have to calculate pt taking the stroke width into account - geom_scale = NR::scale(sn.getTransformation()); + geom_scale = Geom::Scale(sn.getTransformation()); pt = _calcAbsAffineGeom(geom_scale); } } @@ -982,19 +1061,19 @@ gboolean Inkscape::SelTrans::scaleRequest(NR::Point &pt, guint state) return TRUE; } -gboolean Inkscape::SelTrans::stretchRequest(SPSelTransHandle const &handle, NR::Point &pt, guint state) +gboolean Inkscape::SelTrans::stretchRequest(SPSelTransHandle const &handle, Geom::Point &pt, guint state) { - NR::Dim2 axis, perp; + Geom::Dim2 axis, perp; switch (handle.cursor) { case GDK_TOP_SIDE: case GDK_BOTTOM_SIDE: - axis = NR::Y; - perp = NR::X; + axis = Geom::Y; + perp = Geom::X; break; case GDK_LEFT_SIDE: case GDK_RIGHT_SIDE: - axis = NR::X; - perp = NR::Y; + axis = Geom::X; + perp = Geom::Y; break; default: g_assert_not_reached(); @@ -1003,15 +1082,15 @@ gboolean Inkscape::SelTrans::stretchRequest(SPSelTransHandle const &handle, NR:: // Calculate the scale factors, which can be either visual or geometric // depending on which type of bbox is currently being used (see preferences -> selector tool) - NR::scale default_scale = calcScaleFactors(_point, pt, _origin); + Geom::Scale default_scale = calcScaleFactors(_point, pt, _origin); default_scale[perp] = 1; // Find the scale factors for the geometric bbox - NR::Point pt_geom = _getGeomHandlePos(pt); - NR::scale geom_scale = calcScaleFactors(_point_geom, pt_geom, _origin_for_specpoints); + Geom::Point pt_geom = _getGeomHandlePos(pt); + Geom::Scale geom_scale = calcScaleFactors(_point_geom, pt_geom, _origin_for_specpoints); geom_scale[perp] = 1; - _absolute_affine = NR::identity(); //Initialize the scaler + _absolute_affine = Geom::identity(); //Initialize the scaler if (state & GDK_MOD1_MASK) { // stretch by an integer multiplier/divider if (fabs(default_scale[axis]) > 1) { @@ -1026,17 +1105,17 @@ gboolean Inkscape::SelTrans::stretchRequest(SPSelTransHandle const &handle, NR:: // In all other cases we should try to snap now SnapManager &m = _desktop->namedview->snap_manager; - m.setup(NULL, _items_const); + m.setup(_desktop, false, _items_const); Inkscape::SnappedPoint bb, sn; g_assert(bb.getSnapped() == false); // Check initialization to catch any regression - NR::Coord bd(NR_HUGE); - NR::Coord sd(NR_HUGE); + Geom::Coord bd(NR_HUGE); + Geom::Coord sd(NR_HUGE); bool symmetrical = state & GDK_CONTROL_MASK; - bb = m.constrainedSnapStretch(Snapper::SNAPPOINT_BBOX, _bbox_points, default_scale[axis], _origin_for_bboxpoints, axis, symmetrical); - sn = m.constrainedSnapStretch(Snapper::SNAPPOINT_NODE, _snap_points, geom_scale[axis], _origin_for_specpoints, axis, symmetrical); + bb = m.constrainedSnapStretch(SnapPreferences::SNAPPOINT_BBOX, _bbox_points, _point, Geom::Coord(default_scale[axis]), _origin_for_bboxpoints, Geom::Dim2(axis), symmetrical); + sn = m.constrainedSnapStretch(SnapPreferences::SNAPPOINT_NODE, _snap_points, _point, Geom::Coord(geom_scale[axis]), _origin_for_specpoints, Geom::Dim2(axis), symmetrical); if (bb.getSnapped()) { // We snapped the bbox (which is either visual or geometric) @@ -1059,13 +1138,13 @@ gboolean Inkscape::SelTrans::stretchRequest(SPSelTransHandle const &handle, NR:: if (!(bb.getSnapped() || sn.getSnapped())) { // We didn't snap at all! Don't update the handle position, just calculate the new transformation _calcAbsAffineDefault(default_scale); - _desktop->snapindicator->remove_snappoint(); + _desktop->snapindicator->remove_snaptarget(); } else if (bd < sd) { - _desktop->snapindicator->set_new_snappoint(bb); + _desktop->snapindicator->set_new_snaptarget(bb); // Calculate the new transformation and update the handle position pt = _calcAbsAffineDefault(default_scale); } else { - _desktop->snapindicator->set_new_snappoint(sn); + _desktop->snapindicator->set_new_snaptarget(sn); // We snapped the special points (e.g. nodes), which are not at the visual bbox // The handle location however (pt) might however be at the visual bbox, so we // will have to calculate pt taking the stroke width into account @@ -1081,7 +1160,7 @@ gboolean Inkscape::SelTrans::stretchRequest(SPSelTransHandle const &handle, NR:: return TRUE; } -gboolean Inkscape::SelTrans::skewRequest(SPSelTransHandle const &handle, NR::Point &pt, guint state) +gboolean Inkscape::SelTrans::skewRequest(SPSelTransHandle const &handle, Geom::Point &pt, guint state) { /* When skewing (or rotating): * 1) the stroke width will not change. This makes life much easier because we don't have to @@ -1091,17 +1170,17 @@ gboolean Inkscape::SelTrans::skewRequest(SPSelTransHandle const &handle, NR::Poi * the handle; otherwise it will be relative to the center as set for the selection */ - NR::Dim2 dim_a; - NR::Dim2 dim_b; + Geom::Dim2 dim_a; + Geom::Dim2 dim_b; switch (handle.cursor) { case GDK_SB_H_DOUBLE_ARROW: - dim_a = NR::Y; - dim_b = NR::X; + dim_a = Geom::Y; + dim_b = Geom::X; break; case GDK_SB_V_DOUBLE_ARROW: - dim_a = NR::X; - dim_b = NR::Y; + dim_a = Geom::X; + dim_b = Geom::Y; break; default: g_assert_not_reached(); @@ -1109,7 +1188,7 @@ gboolean Inkscape::SelTrans::skewRequest(SPSelTransHandle const &handle, NR::Poi break; } - NR::Point const initial_delta = _point - _origin; + Geom::Point const initial_delta = _point - _origin; if (fabs(initial_delta[dim_a]) < 1e-15) { return false; @@ -1117,8 +1196,8 @@ gboolean Inkscape::SelTrans::skewRequest(SPSelTransHandle const &handle, NR::Poi // Calculate the scale factors, which can be either visual or geometric // depending on which type of bbox is currently being used (see preferences -> selector tool) - NR::scale scale = calcScaleFactors(_point, pt, _origin, false); - NR::scale skew = calcScaleFactors(_point, pt, _origin, true); + Geom::Scale scale = calcScaleFactors(_point, pt, _origin, false); + Geom::Scale skew = calcScaleFactors(_point, pt, _origin, true); scale[dim_b] = 1; skew[dim_b] = 1; @@ -1133,8 +1212,9 @@ gboolean Inkscape::SelTrans::skewRequest(SPSelTransHandle const &handle, NR::Poi double radians = atan(skew[dim_a] / scale[dim_a]); if (state & GDK_CONTROL_MASK) { + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); // Snap to defined angle increments - int snaps = prefs_get_int_attribute("options.rotationsnapsperpi", "value", 12); + int snaps = prefs->getInt("/options/rotationsnapsperpi/value", 12); if (snaps) { double sections = floor(radians * snaps / M_PI + .5); if (fabs(sections) >= snaps / 2) { @@ -1147,26 +1227,20 @@ gboolean Inkscape::SelTrans::skewRequest(SPSelTransHandle const &handle, NR::Poi // Snap to objects, grids, guides SnapManager &m = _desktop->namedview->snap_manager; - m.setup(NULL, _items_const); + m.setup(_desktop, false, _items_const); Inkscape::Snapper::ConstraintLine const constraint(component_vectors[dim_b]); - NR::Point const s(skew[dim_a], scale[dim_a]); - Inkscape::SnappedPoint bb = m.constrainedSnapSkew(Inkscape::Snapper::SNAPPOINT_BBOX, _bbox_points, constraint, s, _origin, dim_b); - Inkscape::SnappedPoint sn = m.constrainedSnapSkew(Inkscape::Snapper::SNAPPOINT_NODE, _snap_points, constraint, s, _origin, dim_b); + // When skewing, we cannot snap the corners of the bounding box, see the comment in "constrainedSnapSkew" for details + Geom::Point const s(skew[dim_a], scale[dim_a]); + Inkscape::SnappedPoint sn = m.constrainedSnapSkew(Inkscape::SnapPreferences::SNAPPOINT_NODE, _snap_points, _point, constraint, s, _origin, Geom::Dim2(dim_b)); - if (bb.getSnapped() || sn.getSnapped()) { + if (sn.getSnapped()) { // We snapped something, so change the skew to reflect it - NR::Coord const bd = bb.getSnapped() ? bb.getTransformation()[0] : NR_HUGE; - NR::Coord const sd = sn.getSnapped() ? sn.getTransformation()[0] : NR_HUGE; - if (bd < sd) { - _desktop->snapindicator->set_new_snappoint(bb); - skew[dim_a] = bd; - } else { - _desktop->snapindicator->set_new_snappoint(sn); - skew[dim_a] = sd; - } + Geom::Coord const sd = sn.getSnapped() ? sn.getTransformation()[0] : NR_HUGE; + _desktop->snapindicator->set_new_snaptarget(sn); + skew[dim_a] = sd; } else { - _desktop->snapindicator->remove_snappoint(); + _desktop->snapindicator->remove_snaptarget(); } } @@ -1175,7 +1249,7 @@ gboolean Inkscape::SelTrans::skewRequest(SPSelTransHandle const &handle, NR::Poi pt[dim_a] = initial_delta[dim_a] * scale[dim_a] + _origin[dim_a]; // Calculate the relative affine - _relative_affine = NR::identity(); + _relative_affine = Geom::identity(); _relative_affine[2*dim_a + dim_a] = (pt[dim_a] - _origin[dim_a]) / initial_delta[dim_a]; _relative_affine[2*dim_a + (dim_b)] = (pt[dim_b] - _point[dim_b]) / initial_delta[dim_a]; _relative_affine[2*(dim_b) + (dim_a)] = 0; @@ -1198,7 +1272,7 @@ gboolean Inkscape::SelTrans::skewRequest(SPSelTransHandle const &handle, NR::Poi return TRUE; } -gboolean Inkscape::SelTrans::rotateRequest(NR::Point &pt, guint state) +gboolean Inkscape::SelTrans::rotateRequest(Geom::Point &pt, guint state) { /* When rotating (or skewing): * 1) the stroke width will not change. This makes life much easier because we don't have to @@ -1208,43 +1282,44 @@ gboolean Inkscape::SelTrans::rotateRequest(NR::Point &pt, guint state) * the handle; otherwise it will be relative to the center as set for the selection */ - int snaps = prefs_get_int_attribute("options.rotationsnapsperpi", "value", 12); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + int snaps = prefs->getInt("/options/rotationsnapsperpi/value", 12); // rotate affine in rotate - NR::Point const d1 = _point - _origin; - NR::Point const d2 = pt - _origin; + Geom::Point const d1 = _point - _origin; + Geom::Point const d2 = pt - _origin; - NR::Coord const h1 = NR::L2(d1); // initial radius + Geom::Coord const h1 = Geom::L2(d1); // initial radius if (h1 < 1e-15) return FALSE; - NR::Point q1 = d1 / h1; // normalized initial vector to handle - NR::Coord const h2 = NR::L2(d2); // new radius + Geom::Point q1 = d1 / h1; // normalized initial vector to handle + Geom::Coord const h2 = Geom::L2(d2); // new radius if (fabs(h2) < 1e-15) return FALSE; - NR::Point q2 = d2 / h2; // normalized new vector to handle + Geom::Point q2 = d2 / h2; // normalized new vector to handle double radians; if (state & GDK_CONTROL_MASK) { // Snap to defined angle increments - double cos_t = NR::dot(q1, q2); - double sin_t = NR::dot(NR::rot90(q1), q2); + double cos_t = Geom::dot(q1, q2); + double sin_t = Geom::dot(Geom::rot90(q1), q2); radians = atan2(sin_t, cos_t); if (snaps) { radians = ( M_PI / snaps ) * floor( radians * snaps / M_PI + .5 ); } - q1 = NR::Point(1, 0); - q2 = NR::Point(cos(radians), sin(radians)); + q1 = Geom::Point(1, 0); + q2 = Geom::Point(cos(radians), sin(radians)); } else { - radians = atan2(NR::dot(NR::rot90(d1), d2), - NR::dot(d1, d2)); + radians = atan2(Geom::dot(Geom::rot90(d1), d2), + Geom::dot(d1, d2)); } - NR::rotate const r1(q1); - NR::rotate const r2(q2); + Geom::Rotate const r1(q1); + Geom::Rotate const r2(q2); // Calculate the relative affine - _relative_affine = NR::Matrix(r2/r1); + _relative_affine = r2 * r1.inverse(); // Update the handle position - pt = _point * NR::translate(-_origin) * _relative_affine * NR::translate(_origin); + pt = _point * Geom::Translate(-_origin) * _relative_affine * Geom::Translate(_origin); // Update the status text double degrees = mod360symm(Geom::rad_to_deg(radians)); @@ -1256,17 +1331,18 @@ gboolean Inkscape::SelTrans::rotateRequest(NR::Point &pt, guint state) return TRUE; } -gboolean Inkscape::SelTrans::centerRequest(NR::Point &pt, guint state) +// Move the item's transformation center +gboolean Inkscape::SelTrans::centerRequest(Geom::Point &pt, guint state) { SnapManager &m = _desktop->namedview->snap_manager; m.setup(_desktop); - m.freeSnapReturnByRef(Snapper::SNAPPOINT_NODE, pt); + m.freeSnapReturnByRef(SnapPreferences::SNAPPOINT_NODE, pt, Inkscape::SNAPSOURCE_HANDLE); if (state & GDK_CONTROL_MASK) { - if ( fabs(_point[NR::X] - pt[NR::X]) > fabs(_point[NR::Y] - pt[NR::Y]) ) { - pt[NR::Y] = _point[NR::Y]; + if ( fabs(_point[Geom::X] - pt[Geom::X]) > fabs(_point[Geom::Y] - pt[Geom::Y]) ) { + pt[Geom::Y] = _point[Geom::Y]; } else { - pt[NR::X] = _point[NR::X]; + pt[Geom::X] = _point[Geom::X]; } } @@ -1290,8 +1366,8 @@ gboolean Inkscape::SelTrans::centerRequest(NR::Point &pt, guint state) } // status text - GString *xs = SP_PX_TO_METRIC_STRING(pt[NR::X], _desktop->namedview->getDefaultMetric()); - GString *ys = SP_PX_TO_METRIC_STRING(pt[NR::Y], _desktop->namedview->getDefaultMetric()); + GString *xs = SP_PX_TO_METRIC_STRING(pt[Geom::X], _desktop->namedview->getDefaultMetric()); + GString *ys = SP_PX_TO_METRIC_STRING(pt[Geom::Y], _desktop->namedview->getDefaultMetric()); _message_context.setF(Inkscape::NORMAL_MESSAGE, _("Move center to %s, %s"), xs->str, ys->str); g_string_free(xs, FALSE); g_string_free(ys, FALSE); @@ -1304,59 +1380,58 @@ gboolean Inkscape::SelTrans::centerRequest(NR::Point &pt, guint state) * */ -void sp_sel_trans_stretch(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, NR::Point &pt, guint state) +void sp_sel_trans_stretch(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, Geom::Point &pt, guint state) { seltrans->stretch(handle, pt, state); } -void sp_sel_trans_scale(Inkscape::SelTrans *seltrans, SPSelTransHandle const &, NR::Point &pt, guint state) +void sp_sel_trans_scale(Inkscape::SelTrans *seltrans, SPSelTransHandle const &, Geom::Point &pt, guint state) { seltrans->scale(pt, state); } -void sp_sel_trans_skew(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, NR::Point &pt, guint state) +void sp_sel_trans_skew(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, Geom::Point &pt, guint state) { seltrans->skew(handle, pt, state); } -void sp_sel_trans_rotate(Inkscape::SelTrans *seltrans, SPSelTransHandle const &, NR::Point &pt, guint state) +void sp_sel_trans_rotate(Inkscape::SelTrans *seltrans, SPSelTransHandle const &, Geom::Point &pt, guint state) { seltrans->rotate(pt, state); } -void Inkscape::SelTrans::stretch(SPSelTransHandle const &/*handle*/, NR::Point &/*pt*/, guint /*state*/) +void Inkscape::SelTrans::stretch(SPSelTransHandle const &/*handle*/, Geom::Point &/*pt*/, guint /*state*/) { - transform(_absolute_affine, NR::Point(0, 0)); // we have already accounted for origin, so pass 0,0 + transform(_absolute_affine, Geom::Point(0, 0)); // we have already accounted for origin, so pass 0,0 } -void Inkscape::SelTrans::scale(NR::Point &/*pt*/, guint /*state*/) +void Inkscape::SelTrans::scale(Geom::Point &/*pt*/, guint /*state*/) { - transform(_absolute_affine, NR::Point(0, 0)); // we have already accounted for origin, so pass 0,0 + transform(_absolute_affine, Geom::Point(0, 0)); // we have already accounted for origin, so pass 0,0 } -void Inkscape::SelTrans::skew(SPSelTransHandle const &/*handle*/, NR::Point &/*pt*/, guint /*state*/) +void Inkscape::SelTrans::skew(SPSelTransHandle const &/*handle*/, Geom::Point &/*pt*/, guint /*state*/) { transform(_relative_affine, _origin); } -void Inkscape::SelTrans::rotate(NR::Point &/*pt*/, guint /*state*/) +void Inkscape::SelTrans::rotate(Geom::Point &/*pt*/, guint /*state*/) { transform(_relative_affine, _origin); } -void sp_sel_trans_center(Inkscape::SelTrans *seltrans, SPSelTransHandle const &, NR::Point &pt, guint /*state*/) +void sp_sel_trans_center(Inkscape::SelTrans *seltrans, SPSelTransHandle const &, Geom::Point &pt, guint /*state*/) { seltrans->setCenter(pt); } -void Inkscape::SelTrans::moveTo(NR::Point const &xy, guint state) +void Inkscape::SelTrans::moveTo(Geom::Point const &xy, guint state) { SnapManager &m = _desktop->namedview->snap_manager; - m.setup(_desktop, _items_const); /* The amount that we've moved by during this drag */ - NR::Point dxy = xy - _point; + Geom::Point dxy = xy - _point; bool const alt = (state & GDK_MOD1_MASK); bool const control = (state & GDK_CONTROL_MASK); @@ -1368,91 +1443,101 @@ void Inkscape::SelTrans::moveTo(NR::Point const &xy, guint state) ** FIXME: this will snap to more than just the grid, nowadays. */ - m.freeSnapReturnByRef(Snapper::SNAPPOINT_NODE, dxy); + m.setup(_desktop, true, _items_const); + m.freeSnapReturnByRef(SnapPreferences::SNAPPOINT_NODE, dxy, Inkscape::SNAPSOURCE_UNDEFINED); - } else if (!shift) { + } else if (shift) { + if (control) { // shift & control: constrained movement without snapping + if (fabs(dxy[Geom::X]) > fabs(dxy[Geom::Y])) { + dxy[Geom::Y] = 0; + } else { + dxy[Geom::X] = 0; + } + } + } else { //!shift: with snapping /* We're snapping to things, possibly with a constraint to horizontal or ** vertical movement. Obtain a list of possible translations and then ** pick the smallest. */ + m.setup(_desktop, false, _items_const); + /* This will be our list of possible translations */ std::list s; - if (control) { + if (control) { // constrained movement with snapping /* Snap to things, and also constrain to horizontal or vertical movement */ - for (unsigned int dim = 0; dim < 2; dim++) { - // When doing a constrained translation, all points will move in the same direction, i.e. - // either horizontally or vertically. Therefore we only have to specify the direction of - // the constraint-line once. The constraint lines are parallel, but might not be colinear. - // Therefore we will have to set the point through which the constraint-line runs - // individually for each point to be snapped; this will be handled however by _snapTransformed() - s.push_back(m.constrainedSnapTranslation(Inkscape::Snapper::SNAPPOINT_BBOX, - _bbox_points, - Inkscape::Snapper::ConstraintLine(component_vectors[dim]), - dxy)); - - s.push_back(m.constrainedSnapTranslation(Inkscape::Snapper::SNAPPOINT_NODE, - _snap_points, - Inkscape::Snapper::ConstraintLine(component_vectors[dim]), - dxy)); - } - - } else { + unsigned int dim = fabs(dxy[Geom::X]) > fabs(dxy[Geom::Y]) ? Geom::X : Geom::Y; + // When doing a constrained translation, all points will move in the same direction, i.e. + // either horizontally or vertically. Therefore we only have to specify the direction of + // the constraint-line once. The constraint lines are parallel, but might not be colinear. + // Therefore we will have to set the point through which the constraint-line runs + // individually for each point to be snapped; this will be handled however by _snapTransformed() + s.push_back(m.constrainedSnapTranslation(Inkscape::SnapPreferences::SNAPPOINT_BBOX, + _bbox_points_for_translating, + _point, + Inkscape::Snapper::ConstraintLine(component_vectors[dim]), + dxy)); + + s.push_back(m.constrainedSnapTranslation(Inkscape::SnapPreferences::SNAPPOINT_NODE, + _snap_points, + _point, + Inkscape::Snapper::ConstraintLine(component_vectors[dim]), + dxy)); + } else { // !control // Let's leave this timer code here for a while. I'll probably need it in the near future (Diederik van Lierop) /* GTimeVal starttime; GTimeVal endtime; - g_get_current_time(&starttime); */ + g_get_current_time(&starttime); */ /* Snap to things with no constraint */ - s.push_back(m.freeSnapTranslation(Inkscape::Snapper::SNAPPOINT_BBOX, _bbox_points, dxy)); - s.push_back(m.freeSnapTranslation(Inkscape::Snapper::SNAPPOINT_NODE, _snap_points, dxy)); + s.push_back(m.freeSnapTranslation(Inkscape::SnapPreferences::SNAPPOINT_BBOX, _bbox_points_for_translating, _point, dxy)); + s.push_back(m.freeSnapTranslation(Inkscape::SnapPreferences::SNAPPOINT_NODE, _snap_points, _point, dxy)); - /*g_get_current_time(&endtime); - double elapsed = ((((double)endtime.tv_sec - starttime.tv_sec) * G_USEC_PER_SEC + (endtime.tv_usec - starttime.tv_usec))) / 1000.0; - std::cout << "Time spent snapping: " << elapsed << std::endl; */ + /*g_get_current_time(&endtime); + double elapsed = ((((double)endtime.tv_sec - starttime.tv_sec) * G_USEC_PER_SEC + (endtime.tv_usec - starttime.tv_usec))) / 1000.0; + std::cout << "Time spent snapping: " << elapsed << std::endl; */ } /* Pick one */ Inkscape::SnappedPoint best_snapped_point; - g_assert(best_snapped_point.getDistance() == NR_HUGE); for (std::list::const_iterator i = s.begin(); i != s.end(); i++) { if (i->getSnapped()) { - if (i->getDistance() < best_snapped_point.getDistance()) { + if (best_snapped_point.isOtherSnapBetter(*i, true)) { best_snapped_point = *i; dxy = i->getTransformation(); } } } if (best_snapped_point.getSnapped()) { - _desktop->snapindicator->set_new_snappoint(best_snapped_point); + _desktop->snapindicator->set_new_snaptarget(best_snapped_point); } else { - // We didn't snap, so remove any previous snap indicator - _desktop->snapindicator->remove_snappoint(); + // We didn't snap, so remove any previous snap indicator + _desktop->snapindicator->remove_snaptarget(); if (control) { // If we didn't snap, then we should still constrain horizontally or vertically // (When we did snap, then this constraint has already been enforced by // calling constrainedSnapTranslation() above) - if (fabs(dxy[NR::X]) > fabs(dxy[NR::Y])) { - dxy[NR::Y] = 0; + if (fabs(dxy[Geom::X]) > fabs(dxy[Geom::Y])) { + dxy[Geom::Y] = 0; } else { - dxy[NR::X] = 0; + dxy[Geom::X] = 0; } } } } - - NR::Matrix const move((NR::translate(dxy))); - NR::Point const norm(0, 0); + + Geom::Matrix const move((Geom::Translate(dxy))); + Geom::Point const norm(0, 0); transform(move, norm); // status text - GString *xs = SP_PX_TO_METRIC_STRING(dxy[NR::X], _desktop->namedview->getDefaultMetric()); - GString *ys = SP_PX_TO_METRIC_STRING(dxy[NR::Y], _desktop->namedview->getDefaultMetric()); + GString *xs = SP_PX_TO_METRIC_STRING(dxy[Geom::X], _desktop->namedview->getDefaultMetric()); + GString *ys = SP_PX_TO_METRIC_STRING(dxy[Geom::Y], _desktop->namedview->getDefaultMetric()); _message_context.setF(Inkscape::NORMAL_MESSAGE, _("Move by %s, %s; with Ctrl to restrict to horizontal/vertical; with Shift to disable snapping"), xs->str, ys->str); g_string_free(xs, TRUE); g_string_free(ys, TRUE); @@ -1460,7 +1545,7 @@ void Inkscape::SelTrans::moveTo(NR::Point const &xy, guint state) // Given a location of a handle at the visual bounding box, find the corresponding location at the // geometrical bounding box -NR::Point Inkscape::SelTrans::_getGeomHandlePos(NR::Point const &visual_handle_pos) +Geom::Point Inkscape::SelTrans::_getGeomHandlePos(Geom::Point const &visual_handle_pos) { if ( _snap_bbox_type == SPItem::GEOMETRIC_BBOX) { // When the selector tool is using geometric bboxes, then the handle is already @@ -1473,32 +1558,33 @@ NR::Point Inkscape::SelTrans::_getGeomHandlePos(NR::Point const &visual_handle_p return visual_handle_pos; } - // Using the NR::Rect constructor below ensures that "min() < max()", which is important + // Using the Geom::Rect constructor below ensures that "min() < max()", which is important // because this will also hold for _bbox, and which is required for get_scale_transform_with_stroke() - NR::Rect new_bbox = NR::Rect(_origin_for_bboxpoints, visual_handle_pos); // new visual bounding box + Geom::Rect new_bbox = Geom::Rect(_origin_for_bboxpoints, visual_handle_pos); // new visual bounding box // Please note that the new_bbox might in fact be just a single line, for example when stretching (in // which case the handle and origin will be aligned vertically or horizontally) - NR::Point normalized_handle_pos = (visual_handle_pos - new_bbox.min()) * NR::scale(new_bbox.dimensions()).inverse(); + Geom::Point normalized_handle_pos = (visual_handle_pos - new_bbox.min()) * Geom::Scale(new_bbox.dimensions()).inverse(); // Calculate the absolute affine while taking into account the scaling of the stroke width - int transform_stroke = prefs_get_int_attribute ("options.transform", "stroke", 1); - NR::Matrix abs_affine = get_scale_transform_with_stroke (*_bbox, _strokewidth, transform_stroke, - new_bbox.min()[NR::X], new_bbox.min()[NR::Y], new_bbox.max()[NR::X], new_bbox.max()[NR::Y]); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + bool transform_stroke = prefs->getBool("/options/transform/stroke", true); + Geom::Matrix abs_affine = get_scale_transform_with_stroke (*_bbox, _strokewidth, transform_stroke, + new_bbox.min()[Geom::X], new_bbox.min()[Geom::Y], new_bbox.max()[Geom::X], new_bbox.max()[Geom::Y]); // Calculate the scaled geometrical bbox - NR::Rect new_geom_bbox = NR::Rect(_geometric_bbox->min() * abs_affine, _geometric_bbox->max() * abs_affine); + Geom::Rect new_geom_bbox = Geom::Rect(_geometric_bbox->min() * abs_affine, _geometric_bbox->max() * abs_affine); // Find the location of the handle on this new geometrical bbox - return normalized_handle_pos * NR::scale(new_geom_bbox.dimensions()) + new_geom_bbox.min(); //new position of the geometric handle + return normalized_handle_pos * Geom::Scale(new_geom_bbox.dimensions()) + new_geom_bbox.min(); //new position of the geometric handle } -NR::scale Inkscape::calcScaleFactors(NR::Point const &initial_point, NR::Point const &new_point, NR::Point const &origin, bool const skew) +Geom::Scale Inkscape::calcScaleFactors(Geom::Point const &initial_point, Geom::Point const &new_point, Geom::Point const &origin, bool const skew) { // Work out the new scale factors for the bbox - NR::Point const initial_delta = initial_point - origin; - NR::Point const new_delta = new_point - origin; - NR::Point const offset = new_point - initial_point; - NR::scale scale(1, 1); + Geom::Point const initial_delta = initial_point - origin; + Geom::Point const new_delta = new_point - origin; + Geom::Point const offset = new_point - initial_point; + Geom::Scale scale(1, 1); for ( unsigned int i = 0 ; i < 2 ; i++ ) { if ( fabs(initial_delta[i]) > 1e-6 ) { @@ -1514,40 +1600,67 @@ NR::scale Inkscape::calcScaleFactors(NR::Point const &initial_point, NR::Point c } // Only for scaling/stretching -NR::Point Inkscape::SelTrans::_calcAbsAffineDefault(NR::scale const default_scale) +Geom::Point Inkscape::SelTrans::_calcAbsAffineDefault(Geom::Scale const default_scale) { - NR::Matrix abs_affine = NR::translate(-_origin) * NR::Matrix(default_scale) * NR::translate(_origin); - NR::Point new_bbox_min = _approximate_bbox->min() * abs_affine; - NR::Point new_bbox_max = _approximate_bbox->max() * abs_affine; + Geom::Matrix abs_affine = Geom::Translate(-_origin) * Geom::Matrix(default_scale) * Geom::Translate(_origin); + Geom::Point new_bbox_min = _approximate_bbox->min() * abs_affine; + Geom::Point new_bbox_max = _approximate_bbox->max() * abs_affine; - int transform_stroke = false; + bool transform_stroke = false; gdouble strokewidth = 0; if ( _snap_bbox_type != SPItem::GEOMETRIC_BBOX) { - transform_stroke = prefs_get_int_attribute ("options.transform", "stroke", 1); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + transform_stroke = prefs->getBool("/options/transform/stroke", true); strokewidth = _strokewidth; } _absolute_affine = get_scale_transform_with_stroke (*_approximate_bbox, strokewidth, transform_stroke, - new_bbox_min[NR::X], new_bbox_min[NR::Y], new_bbox_max[NR::X], new_bbox_max[NR::Y]); + new_bbox_min[Geom::X], new_bbox_min[Geom::Y], new_bbox_max[Geom::X], new_bbox_max[Geom::Y]); // return the new handle position return ( _point - _origin ) * default_scale + _origin; } // Only for scaling/stretching -NR::Point Inkscape::SelTrans::_calcAbsAffineGeom(NR::scale const geom_scale) +Geom::Point Inkscape::SelTrans::_calcAbsAffineGeom(Geom::Scale const geom_scale) { - _relative_affine = NR::Matrix(geom_scale); - _absolute_affine = NR::translate(-_origin_for_specpoints) * _relative_affine * NR::translate(_origin_for_specpoints); + _relative_affine = Geom::Matrix(geom_scale); + _absolute_affine = Geom::Translate(-_origin_for_specpoints) * _relative_affine * Geom::Translate(_origin_for_specpoints); - bool const transform_stroke = prefs_get_int_attribute ("options.transform", "stroke", 1); - NR::Rect visual_bbox = get_visual_bbox(_geometric_bbox, _absolute_affine, _strokewidth, transform_stroke); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + bool const transform_stroke = prefs->getBool("/options/transform/stroke", true); + if (_geometric_bbox) { + Geom::Rect visual_bbox = get_visual_bbox(_geometric_bbox, _absolute_affine, _strokewidth, transform_stroke); + // return the new handle position + return visual_bbox.min() + visual_bbox.dimensions() * Geom::Scale(_handle_x, _handle_y); + } - // return the new handle position - return visual_bbox.min() + visual_bbox.dimensions() * NR::scale(_handle_x, _handle_y); + // Fall back scenario, in case we don't have a geometric bounding box at hand; + // (Due to some bugs related to bounding boxes having at least one zero dimension; For more details + // see https://bugs.launchpad.net/inkscape/+bug/318726) + g_warning("No geometric bounding box has been calculated; this is a bug that needs fixing!"); + return _calcAbsAffineDefault(geom_scale); // this is bogus, but we must return _something_ } +void Inkscape::SelTrans::_keepClosestPointOnly(std::vector > &points, const Geom::Point &reference) +{ + if (points.size() < 2) return; + + std::pair closest_point = std::make_pair(Geom::Point(NR_HUGE, NR_HUGE), SNAPSOURCE_UNDEFINED); + Geom::Coord closest_dist = NR_HUGE; + + for(std::vector >::const_iterator i = points.begin(); i != points.end(); i++) { + Geom::Coord dist = Geom::L2((*i).first - reference); + if (i == points.begin() || dist < closest_dist) { + closest_point = *i; + closest_dist = dist; + } + } + + points.clear(); + points.push_back(closest_point); +} /* Local Variables: @@ -1558,4 +1671,4 @@ NR::Point Inkscape::SelTrans::_calcAbsAffineGeom(NR::scale const geom_scale) fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :