diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2007-11-03 18:11:46 +0000 |
|---|---|---|
| committer | dvlierop2 <dvlierop2@users.sourceforge.net> | 2007-11-03 18:11:46 +0000 |
| commit | 8ed66ab7cb377ed90e3213fc3bba8e5bb0c63a11 (patch) | |
| tree | 4d0150783a2f04376bb1b616a249a618581717c4 /src/object-snapper.cpp | |
| parent | add destructor to LayerManager that disconnects it signals. see bug: [ 172087... (diff) | |
| download | inkscape-8ed66ab7cb377ed90e3213fc3bba8e5bb0c63a11.tar.gz inkscape-8ed66ab7cb377ed90e3213fc3bba8e5bb0c63a11.zip | |
Oops, don't use tabs! (replace tabs by 4 spaces)
(bzr r4020)
Diffstat (limited to 'src/object-snapper.cpp')
| -rw-r--r-- | src/object-snapper.cpp | 398 |
1 files changed, 199 insertions, 199 deletions
diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp index 10f75e5c4..7739238b4 100644 --- a/src/object-snapper.cpp +++ b/src/object-snapper.cpp @@ -31,29 +31,29 @@ Inkscape::ObjectSnapper::ObjectSnapper(SPNamedView const *nv, NR::Coord const d) _snap_to_bboxnode(true), _snap_to_bboxpath(true), _strict_snapping(true), _include_item_center(false) { - _candidates = new std::vector<SPItem*>; - _points_to_snap_to = new std::vector<NR::Point>; - _paths_to_snap_to = new std::vector<Path*>; + _candidates = new std::vector<SPItem*>; + _points_to_snap_to = new std::vector<NR::Point>; + _paths_to_snap_to = new std::vector<Path*>; } Inkscape::ObjectSnapper::~ObjectSnapper() { - _candidates->clear(); //Don't delete the candidates themselves, as these are not ours! - delete _candidates; - - _points_to_snap_to->clear(); - delete _points_to_snap_to; - - for (std::vector<Path*>::const_iterator k = _paths_to_snap_to->begin(); k != _paths_to_snap_to->end(); k++) { - delete *k; + _candidates->clear(); //Don't delete the candidates themselves, as these are not ours! + delete _candidates; + + _points_to_snap_to->clear(); + delete _points_to_snap_to; + + for (std::vector<Path*>::const_iterator k = _paths_to_snap_to->begin(); k != _paths_to_snap_to->end(); k++) { + delete *k; } _paths_to_snap_to->clear(); - delete _paths_to_snap_to; + delete _paths_to_snap_to; } /** - * Find all items within snapping range. - * \param r Pointer to the current document + * Find all items within snapping range. + * \param r Pointer to the current document * \param it List of items to ignore * \param first_point If true then this point is the first one from a whole bunch of points * \param points_to_snap The whole bunch of points, all from the same selection and having the same transformation @@ -70,8 +70,8 @@ void Inkscape::ObjectSnapper::_findCandidates(SPObject* r, SPDesktop const *desktop = SP_ACTIVE_DESKTOP; if (first_point) { - _candidates->clear(); - } + _candidates->clear(); + } for (SPObject* o = sp_object_first_child(r); o != NULL; o = SP_OBJECT_NEXT(o)) { if (SP_IS_ITEM(o) && !SP_ITEM(o)->isLocked() && !desktop->itemIsHidden(SP_ITEM(o))) { @@ -82,7 +82,7 @@ void Inkscape::ObjectSnapper::_findCandidates(SPObject* r, i++; } - if (i == it.end()) { + if (i == it.end()) { /* See if the item is within range */ if (SP_IS_GROUP(o)) { _findCandidates(o, it, false, points_to_snap, snap_dim); @@ -91,19 +91,19 @@ void Inkscape::ObjectSnapper::_findCandidates(SPObject* r, // snapping range of this object NR::Maybe<NR::Rect> b = sp_item_bbox_desktop(SP_ITEM(o)); if (b) { - for (std::vector<NR::Point>::const_iterator i = points_to_snap.begin(); i != points_to_snap.end(); i++) { - NR::Point b_min = b->min(); - NR::Point b_max = b->max(); - double d = getDistance(); - bool withinX = ((*i)[NR::X] >= b_min[NR::X] - d) && ((*i)[NR::X] <= b_max[NR::X] + d); - bool withinY = ((*i)[NR::Y] >= b_min[NR::Y] - d) && ((*i)[NR::Y] <= b_max[NR::Y] + d); - if (snap_dim == SNAP_X && withinX || snap_dim == SNAP_Y && withinY || snap_dim == SNAP_XY && withinX && withinY) { - //We've found a point that is within snapping range - //of this object, so record it as a candidate - _candidates->push_back(SP_ITEM(o)); - break; - } - } + for (std::vector<NR::Point>::const_iterator i = points_to_snap.begin(); i != points_to_snap.end(); i++) { + NR::Point b_min = b->min(); + NR::Point b_max = b->max(); + double d = getDistance(); + bool withinX = ((*i)[NR::X] >= b_min[NR::X] - d) && ((*i)[NR::X] <= b_max[NR::X] + d); + bool withinY = ((*i)[NR::Y] >= b_min[NR::Y] - d) && ((*i)[NR::Y] <= b_max[NR::Y] + d); + if (snap_dim == SNAP_X && withinX || snap_dim == SNAP_Y && withinY || snap_dim == SNAP_XY && withinX && withinY) { + //We've found a point that is within snapping range + //of this object, so record it as a candidate + _candidates->push_back(SP_ITEM(o)); + break; + } + } } } } @@ -114,7 +114,7 @@ void Inkscape::ObjectSnapper::_findCandidates(SPObject* r, bool Inkscape::ObjectSnapper::_snapNodes(Inkscape::Snapper::PointType const &t, - Inkscape::SnappedPoint &s, + Inkscape::SnappedPoint &s, NR::Point const &p, bool const &first_point, DimensionToSnap const snap_dim) const @@ -123,70 +123,70 @@ bool Inkscape::ObjectSnapper::_snapNodes(Inkscape::Snapper::PointType const &t, // Determine the type of bounding box we should snap to SPItem::BBoxType bbox_type = SPItem::GEOMETRIC_BBOX; - if (_snap_to_bboxnode) { - gchar const *prefs_bbox = prefs_get_string_attribute("tools.select", "bounding_box"); - bbox_type = (prefs_bbox != NULL && strcmp(prefs_bbox, "geometric")==0)? SPItem::GEOMETRIC_BBOX : SPItem::APPROXIMATE_BBOX; - } - - bool p_is_a_node = t & Inkscape::Snapper::SNAPPOINT_NODE; - bool p_is_a_bbox = t & Inkscape::Snapper::SNAPPOINT_BBOX; - bool p_is_a_guide = t & Inkscape::Snapper::SNAPPOINT_GUIDE; - - // A point considered for snapping should be either a node, a bbox corner or a guide. Pick only ONE! - g_assert(!(p_is_a_node && p_is_a_bbox || p_is_a_bbox && p_is_a_guide || p_is_a_node && p_is_a_guide)); + if (_snap_to_bboxnode) { + gchar const *prefs_bbox = prefs_get_string_attribute("tools.select", "bounding_box"); + bbox_type = (prefs_bbox != NULL && strcmp(prefs_bbox, "geometric")==0)? SPItem::GEOMETRIC_BBOX : SPItem::APPROXIMATE_BBOX; + } + + bool p_is_a_node = t & Inkscape::Snapper::SNAPPOINT_NODE; + bool p_is_a_bbox = t & Inkscape::Snapper::SNAPPOINT_BBOX; + bool p_is_a_guide = t & Inkscape::Snapper::SNAPPOINT_GUIDE; + + // A point considered for snapping should be either a node, a bbox corner or a guide. Pick only ONE! + g_assert(!(p_is_a_node && p_is_a_bbox || p_is_a_bbox && p_is_a_guide || p_is_a_node && p_is_a_guide)); // Now, let's first collect all points to snap to. If we have a whole bunch of points to snap, // e.g. when translating an item using the selector tool, then we will only do this for the // first point and store the collection for later use. This dramatically improves the performance - if (first_point) { - _points_to_snap_to->clear(); - for (std::vector<SPItem*>::const_iterator i = _candidates->begin(); i != _candidates->end(); i++) { - - //NR::Matrix i2doc(NR::identity()); - SPItem *root_item = *i; - if (SP_IS_USE(*i)) { - root_item = sp_use_root(SP_USE(*i)); - } - - //Collect all nodes so we can snap to them - if (_snap_to_itemnode) { - if (!(_strict_snapping && !p_is_a_node) || p_is_a_guide) { - sp_item_snappoints(root_item, _include_item_center, SnapPointsIter(*_points_to_snap_to)); - } - } - - //Collect the bounding box's corners so we can snap to them - if (_snap_to_bboxnode) { - if (!(_strict_snapping && !p_is_a_bbox) || p_is_a_guide) { - NR::Maybe<NR::Rect> b = sp_item_bbox_desktop(root_item, bbox_type); - if (b) { - for ( unsigned k = 0 ; k < 4 ; k++ ) { - _points_to_snap_to->push_back(b->corner(k)); - } - } - } - } - } - } + if (first_point) { + _points_to_snap_to->clear(); + for (std::vector<SPItem*>::const_iterator i = _candidates->begin(); i != _candidates->end(); i++) { + + //NR::Matrix i2doc(NR::identity()); + SPItem *root_item = *i; + if (SP_IS_USE(*i)) { + root_item = sp_use_root(SP_USE(*i)); + } + + //Collect all nodes so we can snap to them + if (_snap_to_itemnode) { + if (!(_strict_snapping && !p_is_a_node) || p_is_a_guide) { + sp_item_snappoints(root_item, _include_item_center, SnapPointsIter(*_points_to_snap_to)); + } + } + + //Collect the bounding box's corners so we can snap to them + if (_snap_to_bboxnode) { + if (!(_strict_snapping && !p_is_a_bbox) || p_is_a_guide) { + NR::Maybe<NR::Rect> b = sp_item_bbox_desktop(root_item, bbox_type); + if (b) { + for ( unsigned k = 0 ; k < 4 ; k++ ) { + _points_to_snap_to->push_back(b->corner(k)); + } + } + } + } + } + } //Do the snapping, using all the nodes and corners collected above for (std::vector<NR::Point>::const_iterator k = _points_to_snap_to->begin(); k != _points_to_snap_to->end(); k++) { - /* Try to snap to this node of the path */ + /* Try to snap to this node of the path */ NR::Coord dist = NR_HUGE; NR::Point snapped_point; switch (snap_dim) { - case SNAP_X: - dist = fabs((*k)[NR::X] - p[NR::X]); - snapped_point = NR::Point((*k)[NR::X], p[NR::Y]); - break; - case SNAP_Y: - dist = fabs((*k)[NR::Y] - p[NR::Y]); - snapped_point = NR::Point(p[NR::X], (*k)[NR::Y]); - break; - case SNAP_XY: - dist = NR::L2(*k - p); - snapped_point = *k; - break; + case SNAP_X: + dist = fabs((*k)[NR::X] - p[NR::X]); + snapped_point = NR::Point((*k)[NR::X], p[NR::Y]); + break; + case SNAP_Y: + dist = fabs((*k)[NR::Y] - p[NR::Y]); + snapped_point = NR::Point(p[NR::X], (*k)[NR::Y]); + break; + case SNAP_XY: + dist = NR::L2(*k - p); + snapped_point = *k; + break; } if (dist < getDistance() && dist < s.getDistance()) { @@ -200,7 +200,7 @@ bool Inkscape::ObjectSnapper::_snapNodes(Inkscape::Snapper::PointType const &t, bool Inkscape::ObjectSnapper::_snapPaths(Inkscape::Snapper::PointType const &t, - Inkscape::SnappedPoint &s, + Inkscape::SnappedPoint &s, NR::Point const &p, bool const &first_point) const { @@ -214,110 +214,110 @@ bool Inkscape::ObjectSnapper::_snapPaths(Inkscape::Snapper::PointType const &t, // Determine the type of bounding box we should snap to SPItem::BBoxType bbox_type = SPItem::GEOMETRIC_BBOX; - if (_snap_to_bboxpath) { - gchar const *prefs_bbox = prefs_get_string_attribute("tools.select", "bounding_box"); - bbox_type = (prefs_bbox != NULL && strcmp(prefs_bbox, "geometric")==0)? SPItem::GEOMETRIC_BBOX : SPItem::APPROXIMATE_BBOX; - } - - bool p_is_a_node = t & Inkscape::Snapper::SNAPPOINT_NODE; - + if (_snap_to_bboxpath) { + gchar const *prefs_bbox = prefs_get_string_attribute("tools.select", "bounding_box"); + bbox_type = (prefs_bbox != NULL && strcmp(prefs_bbox, "geometric")==0)? SPItem::GEOMETRIC_BBOX : SPItem::APPROXIMATE_BBOX; + } + + bool p_is_a_node = t & Inkscape::Snapper::SNAPPOINT_NODE; + // Now, let's first collect all paths to snap to. If we have a whole bunch of points to snap, // e.g. when translating an item using the selector tool, then we will only do this for the // first point and store the collection for later use. This dramatically improves the performance - if (first_point) { - for (std::vector<Path*>::const_iterator k = _paths_to_snap_to->begin(); k != _paths_to_snap_to->end(); k++) { - delete *k; - } - _paths_to_snap_to->clear(); - for (std::vector<SPItem*>::const_iterator i = _candidates->begin(); i != _candidates->end(); i++) { - - /* Transform the requested snap point to this item's coordinates */ - NR::Matrix i2doc(NR::identity()); - SPItem *root_item = NULL; - /* We might have a clone at hand, so make sure we get the root item */ - if (SP_IS_USE(*i)) { - i2doc = sp_use_get_root_transform(SP_USE(*i)); - root_item = sp_use_root(SP_USE(*i)); - } else { - i2doc = sp_item_i2doc_affine(*i); - root_item = *i; - } - - //Build a list of all paths considered for snapping to - - //Add the item's path to snap to - if (_snap_to_itempath) { - if (!(_strict_snapping && !p_is_a_node)) { - // Snapping to the path of characters is very cool, but for a large - // chunk of text this will take ages! So limit snapping to text paths - // containing max. 240 characters. Snapping the bbox will not be affected - bool very_lenghty_prose = false; - if (SP_IS_TEXT(root_item) || SP_IS_FLOWTEXT(root_item)) { - very_lenghty_prose = sp_text_get_length(SP_TEXT(root_item)) > 240; - } - // On my AMD 3000+, the snapping lag becomes annoying at approx. 240 chars - // which corresponds to a lag of 500 msec. This is for snapping a rect - // to a single line of text. - - // Snapping for example to a traced bitmap is also very stressing for - // the CPU, so we'll only snap to paths having no more than 500 nodes - // This also leads to a lag of approx. 500 msec (in my lousy test set-up). - bool very_complex_path = false; - if (SP_IS_PATH(root_item)) { - very_complex_path = sp_nodes_in_path(SP_PATH(root_item)) > 500; - } - - if (!very_lenghty_prose && !very_complex_path) { - _paths_to_snap_to->push_back(Path_for_item(root_item, true, true)); - } - } - } - - //Add the item's bounding box to snap to - if (_snap_to_bboxpath) { - if (!(_strict_snapping && p_is_a_node)) { - //This will get ugly... rect -> curve -> bpath - NRRect rect; - sp_item_invoke_bbox(root_item, &rect, i2doc, TRUE, bbox_type); - NR::Maybe<NR::Rect> bbox = rect.upgrade(); - SPCurve *curve = sp_curve_new_from_rect(bbox); - if (curve) { - NArtBpath *bpath = SP_CURVE_BPATH(curve); - if (bpath) { - Path *path = bpath_to_Path(bpath); - if (path) { - _paths_to_snap_to->push_back(path); - } - delete bpath; - } - delete curve; - } - } - } - } + if (first_point) { + for (std::vector<Path*>::const_iterator k = _paths_to_snap_to->begin(); k != _paths_to_snap_to->end(); k++) { + delete *k; + } + _paths_to_snap_to->clear(); + for (std::vector<SPItem*>::const_iterator i = _candidates->begin(); i != _candidates->end(); i++) { + + /* Transform the requested snap point to this item's coordinates */ + NR::Matrix i2doc(NR::identity()); + SPItem *root_item = NULL; + /* We might have a clone at hand, so make sure we get the root item */ + if (SP_IS_USE(*i)) { + i2doc = sp_use_get_root_transform(SP_USE(*i)); + root_item = sp_use_root(SP_USE(*i)); + } else { + i2doc = sp_item_i2doc_affine(*i); + root_item = *i; + } + + //Build a list of all paths considered for snapping to + + //Add the item's path to snap to + if (_snap_to_itempath) { + if (!(_strict_snapping && !p_is_a_node)) { + // Snapping to the path of characters is very cool, but for a large + // chunk of text this will take ages! So limit snapping to text paths + // containing max. 240 characters. Snapping the bbox will not be affected + bool very_lenghty_prose = false; + if (SP_IS_TEXT(root_item) || SP_IS_FLOWTEXT(root_item)) { + very_lenghty_prose = sp_text_get_length(SP_TEXT(root_item)) > 240; + } + // On my AMD 3000+, the snapping lag becomes annoying at approx. 240 chars + // which corresponds to a lag of 500 msec. This is for snapping a rect + // to a single line of text. + + // Snapping for example to a traced bitmap is also very stressing for + // the CPU, so we'll only snap to paths having no more than 500 nodes + // This also leads to a lag of approx. 500 msec (in my lousy test set-up). + bool very_complex_path = false; + if (SP_IS_PATH(root_item)) { + very_complex_path = sp_nodes_in_path(SP_PATH(root_item)) > 500; + } + + if (!very_lenghty_prose && !very_complex_path) { + _paths_to_snap_to->push_back(Path_for_item(root_item, true, true)); + } + } + } + + //Add the item's bounding box to snap to + if (_snap_to_bboxpath) { + if (!(_strict_snapping && p_is_a_node)) { + //This will get ugly... rect -> curve -> bpath + NRRect rect; + sp_item_invoke_bbox(root_item, &rect, i2doc, TRUE, bbox_type); + NR::Maybe<NR::Rect> bbox = rect.upgrade(); + SPCurve *curve = sp_curve_new_from_rect(bbox); + if (curve) { + NArtBpath *bpath = SP_CURVE_BPATH(curve); + if (bpath) { + Path *path = bpath_to_Path(bpath); + if (path) { + _paths_to_snap_to->push_back(path); + } + delete bpath; + } + delete curve; + } + } + } + } } //Now we can finally do the real snapping, using the paths collected above for (std::vector<Path*>::const_iterator k = _paths_to_snap_to->begin(); k != _paths_to_snap_to->end(); k++) { if (*k) { if (first_point) { - (*k)->ConvertWithBackData(0.01); //This is extremely time consuming! + (*k)->ConvertWithBackData(0.01); //This is extremely time consuming! + } + + /* Look for the nearest position on this SPItem to our snap point */ + NR::Maybe<Path::cut_position> const o = get_nearest_position_on_Path(*k, p_doc); + if (o && o->t >= 0 && o->t <= 1) { + + /* Convert the nearest point back to desktop coordinates */ + NR::Point const o_it = get_point_on_Path(*k, o->piece, o->t); + NR::Point const o_dt = desktop->doc2dt(o_it); + + NR::Coord const dist = NR::L2(o_dt - p); + if (dist < getDistance() && dist < s.getDistance()) { + s = SnappedPoint(o_dt, dist); + success = true; + } } - - /* Look for the nearest position on this SPItem to our snap point */ - NR::Maybe<Path::cut_position> const o = get_nearest_position_on_Path(*k, p_doc); - if (o && o->t >= 0 && o->t <= 1) { - - /* Convert the nearest point back to desktop coordinates */ - NR::Point const o_it = get_point_on_Path(*k, o->piece, o->t); - NR::Point const o_dt = desktop->doc2dt(o_it); - - NR::Coord const dist = NR::L2(o_dt - p); - if (dist < getDistance() && dist < s.getDistance()) { - s = SnappedPoint(o_dt, dist); - success = true; - } - } } } @@ -326,24 +326,24 @@ bool Inkscape::ObjectSnapper::_snapPaths(Inkscape::Snapper::PointType const &t, void Inkscape::ObjectSnapper::_doFreeSnap(SnappedConstraints &sc, - Inkscape::Snapper::PointType const &t, - NR::Point const &p, - bool const &first_point, - std::vector<NR::Point> &points_to_snap, - std::list<SPItem const *> const &it) const + Inkscape::Snapper::PointType const &t, + NR::Point const &p, + bool const &first_point, + std::vector<NR::Point> &points_to_snap, + std::list<SPItem const *> const &it) const { if ( NULL == _named_view ) { return; } /* Get a list of all the SPItems that we will try to snap to */ - if (first_point) { - _findCandidates(sp_document_root(_named_view->document), it, first_point, points_to_snap, SNAP_XY); - } + if (first_point) { + _findCandidates(sp_document_root(_named_view->document), it, first_point, points_to_snap, SNAP_XY); + } - SnappedPoint s(p, NR_HUGE); - bool snapped_to_node = false; - bool snapped_to_path = false; + SnappedPoint s(p, NR_HUGE); + bool snapped_to_node = false; + bool snapped_to_path = false; if (_snap_to_itemnode || _snap_to_bboxnode) { snapped_to_node = _snapNodes(t, s, p, first_point, SNAP_XY); @@ -353,19 +353,19 @@ void Inkscape::ObjectSnapper::_doFreeSnap(SnappedConstraints &sc, } if (snapped_to_node || snapped_to_path) { - sc.points.push_back(s); + sc.points.push_back(s); } } void Inkscape::ObjectSnapper::_doConstrainedSnap(SnappedConstraints &sc, - Inkscape::Snapper::PointType const &t, - NR::Point const &p, - bool const &first_point, - std::vector<NR::Point> &points_to_snap, - ConstraintLine const &c, - std::list<SPItem const *> const &it) const + Inkscape::Snapper::PointType const &t, + NR::Point const &p, + bool const &first_point, + std::vector<NR::Point> &points_to_snap, + ConstraintLine const &c, + std::list<SPItem const *> const &it) const { /* FIXME: this needs implementing properly; I think we have to do the ** intersection of c with the objects. @@ -376,7 +376,7 @@ void Inkscape::ObjectSnapper::_doConstrainedSnap(SnappedConstraints &sc, Inkscape::SnappedPoint Inkscape::ObjectSnapper::guideSnap(NR::Point const &p, - DimensionToSnap const snap_dim) const + DimensionToSnap const snap_dim) const { if ( NULL == _named_view ) { return SnappedPoint(p, NR_HUGE); |
