From b1597d6f47f64eef7d17b7b614056edd64692130 Mon Sep 17 00:00:00 2001 From: Diederik van Lierop Date: Mon, 11 Aug 2008 04:53:15 +0000 Subject: Move all of the snapper code to 2geom (bzr r6606) --- src/display/canvas-grid.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/display/canvas-grid.cpp') diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index 81e017f12..84e8bfbf9 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -953,7 +953,7 @@ CanvasXYGridSnapper::CanvasXYGridSnapper(CanvasXYGrid *grid, SPNamedView const * } LineSnapper::LineList -CanvasXYGridSnapper::_getSnapLines(NR::Point const &p) const +CanvasXYGridSnapper::_getSnapLines(Geom::Point const &p) const { LineList s; @@ -972,22 +972,22 @@ CanvasXYGridSnapper::_getSnapLines(NR::Point const &p) const scaled_spacing /= SP_ACTIVE_DESKTOP->current_zoom(); } - NR::Coord rounded; - NR::Point point_on_line; + Geom::Coord rounded; + Geom::Point point_on_line; rounded = Inkscape::Util::round_to_upper_multiple_plus(p[i], scaled_spacing, grid->origin[i]); - point_on_line = i ? NR::Point(0, rounded) : NR::Point(rounded, 0); + point_on_line = i ? Geom::Point(0, rounded) : Geom::Point(rounded, 0); s.push_back(std::make_pair(component_vectors[i], point_on_line)); rounded = Inkscape::Util::round_to_lower_multiple_plus(p[i], scaled_spacing, grid->origin[i]); - point_on_line = i ? NR::Point(0, rounded) : NR::Point(rounded, 0); + point_on_line = i ? Geom::Point(0, rounded) : Geom::Point(rounded, 0); s.push_back(std::make_pair(component_vectors[i], point_on_line)); } return s; } -void CanvasXYGridSnapper::_addSnappedLine(SnappedConstraints &sc, NR::Point const snapped_point, NR::Coord const snapped_distance, NR::Point const normal_to_line, NR::Point const point_on_line) const +void CanvasXYGridSnapper::_addSnappedLine(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, Geom::Point const normal_to_line, Geom::Point const point_on_line) const { SnappedLine dummy = SnappedLine(snapped_point, snapped_distance, getSnapperTolerance(), getSnapperAlwaysSnap(), normal_to_line, point_on_line); sc.grid_lines.push_back(dummy); -- cgit v1.2.3