diff --git a/src/rubberband.cpp b/src/rubberband.cpp
index bfe73a43db4b4ea286b2a72f288bfe09c53ca895..76743cf8b6017f578148c507fe3406ab9f4fa516 100644 (file)
--- a/src/rubberband.cpp
+++ b/src/rubberband.cpp
#include "rubberband.h"
#include "display/canvas-bpath.h"
#include "display/curve.h"
-#include "libnr/nr-point.h"
Inkscape::Rubberband *Inkscape::Rubberband::_instance = NULL;
}
-void Inkscape::Rubberband::start(SPDesktop *d, NR::Point const &p)
+void Inkscape::Rubberband::start(SPDesktop *d, Geom::Point const &p)
{
_points.clear();
_touchpath_curve->reset();
sp_canvas_end_forced_full_redraws(_desktop->canvas);
}
-void Inkscape::Rubberband::move(NR::Point const &p)
+void Inkscape::Rubberband::move(Geom::Point const &p)
{
if (!_started)
return;
_end = p;
- _desktop->scroll_to_point(&p);
+ _desktop->scroll_to_point(p);
_touchpath_curve->lineto(p);
- NR::Point next = _desktop->d2w(p);
+ Geom::Point next = _desktop->d2w(p);
// we want the points to be at most 0.5 screen pixels apart,
// so that we don't lose anything small;
// if they are farther apart, we interpolate more points
- if (_points.size() > 0 && NR::L2(next-_points.back()) > 0.5) {
- NR::Point prev = _points.back();
- int subdiv = 2 * (int) round(NR::L2(next-prev) + 0.5);
+ if (_points.size() > 0 && Geom::L2(next-_points.back()) > 0.5) {
+ Geom::Point prev = _points.back();
+ int subdiv = 2 * (int) round(Geom::L2(next-prev) + 0.5);
for (int i = 1; i <= subdiv; i ++) {
_points.push_back(prev + ((double)i/subdiv) * (next - prev));
}
if (_rect == NULL) {
_rect = static_cast<CtrlRect *>(sp_canvas_item_new(sp_desktop_controls(_desktop), SP_TYPE_CTRLRECT, NULL));
}
- _rect->setRectangle(NR::Rect(_start, _end));
+ _rect->setRectangle(Geom::Rect(_start, _end));
sp_canvas_item_show(_rect);
if (_touchpath)
_mode = mode;
}
-boost::optional<NR::Rect> Inkscape::Rubberband::getRectangle() const
+Geom::OptRect Inkscape::Rubberband::getRectangle() const
{
if (!_started) {
- return boost::optional<NR::Rect>();
+ return Geom::OptRect();
}
- return NR::Rect(_start, _end);
+ return Geom::Rect(_start, _end);
}
Inkscape::Rubberband *Inkscape::Rubberband::get(SPDesktop *desktop)