![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/draw-context.cpp b/src/draw-context.cpp
index a3c3601cc8ccd98f35740bd8a8ae89fdfbd05a8e..62ae67336cad48236adbbcb3c29132257aa716b6 100644 (file)
--- a/src/draw-context.cpp
+++ b/src/draw-context.cpp
-#define __SP_DRAW_CONTEXT_C__
-
/*
* Generic drawing context
*
* Author:
* Lauris Kaplinski <lauris@kaplinski.com>
+ * Abhishek Sharma
*
* Copyright (C) 2000 Lauris Kaplinski
* Copyright (C) 2000-2001 Ximian, Inc.
#include "live_effects/lpe-patternalongpath.h"
#include "style.h"
+using Inkscape::DocumentUndo;
+
static void sp_draw_context_class_init(SPDrawContextClass *klass);
static void sp_draw_context_init(SPDrawContext *dc);
static void sp_draw_context_dispose(GObject *object);
* \param dc draw context
* \param p cursor point (to be changed by snapping)
* \param o origin point
- * \param state keyboard state to check if ctrl was pressed
+ * \param state keyboard state to check if ctrl or shift was pressed
*/
void spdc_endpoint_snap_rotation(SPEventContext const *const ec, Geom::Point &p, Geom::Point const &o,
@@ -476,44 +477,26 @@ void spdc_endpoint_snap_rotation(SPEventContext const *const ec, Geom::Point &p,
{
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
unsigned const snaps = abs(prefs->getInt("/options/rotationsnapsperpi/value", 12));
- /* 0 means no snapping. */
-
- /* mirrored by fabs, so this corresponds to 15 degrees */
- Geom::Point best; /* best solution */
- double bn = NR_HUGE; /* best normal */
- double bdot = 0;
- Geom::Point v = Geom::Point(0, 1);
- double const r00 = cos(M_PI / snaps), r01 = sin(M_PI / snaps);
- double const r10 = -r01, r11 = r00;
-
- Geom::Point delta = p - o;
-
- for (unsigned i = 0; i < snaps; i++) {
- double const ndot = fabs(dot(v,Geom::rot90(delta)));
- Geom::Point t(r00*v[Geom::X] + r01*v[Geom::Y],
- r10*v[Geom::X] + r11*v[Geom::Y]);
- if (ndot < bn) {
- /* I think it is better numerically to use the normal, rather than the dot product
- * to assess solutions, but I haven't proven it. */
- bn = ndot;
- best = v;
- bdot = dot(v, delta);
- }
- v = t;
+ SnapManager &m = SP_EVENT_CONTEXT_DESKTOP(ec)->namedview->snap_manager;
+ m.setup(SP_EVENT_CONTEXT_DESKTOP(ec));
+
+ bool snap_enabled = m.snapprefs.getSnapEnabledGlobally();
+ if (state & GDK_SHIFT_MASK) {
+ // SHIFT disables all snapping, except the angular snapping. After all, the user explicitly asked for angular
+ // snapping by pressing CTRL, otherwise we wouldn't have arrived here. But although we temporarily disable
+ // the snapping here, we must still call for a constrained snap in order to apply the constraints (i.e. round
+ // to the nearest angle increment)
+ m.snapprefs.setSnapEnabledGlobally(false);
}
- if (fabs(bdot) > 0) {
- p = o + bdot * best;
+ Inkscape::SnappedPoint dummy = m.constrainedAngularSnap(Inkscape::SnapCandidatePoint(p, Inkscape::SNAPSOURCE_NODE_HANDLE), boost::optional<Geom::Point>(), o, snaps);
+ p = dummy.getPoint();
- if (!(state & GDK_SHIFT_MASK)) { //SHIFT disables all snapping, except the angular snapping above
- //After all, the user explicitly asked for angular snapping by
- //pressing CTRL
- /* Snap it along best vector */
- SnapManager &m = SP_EVENT_CONTEXT_DESKTOP(ec)->namedview->snap_manager;
- m.setup(SP_EVENT_CONTEXT_DESKTOP(ec));
- m.constrainedSnapReturnByRef(p, Inkscape::SNAPSOURCE_NODE_HANDLE, Inkscape::Snapper::ConstraintLine(best));
- }
+ if (state & GDK_SHIFT_MASK) {
+ m.snapprefs.setSnapEnabledGlobally(snap_enabled); // restore the original setting
}
+
+ m.unSetup();
}
@@ -528,6 +511,7 @@ void spdc_endpoint_snap_free(SPEventContext const * const ec, Geom::Point& p, gu
m.setup(dt, true, selection->singleItem());
m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_NODE_HANDLE);
+ m.unSetup();
}
static SPCurve *
SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(dc);
SPDocument *doc = sp_desktop_document(desktop);
- Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
+ Inkscape::XML::Document *xml_doc = doc->getReprDoc();
if ( c && !c->is_empty() ) {
/* We actually have something to write */
item->updateRepr();
}
- SPDocumentUndo::done(doc, SP_IS_PEN_CONTEXT(dc)? SP_VERB_CONTEXT_PEN : SP_VERB_CONTEXT_PENCIL,
+ DocumentUndo::done(doc, SP_IS_PEN_CONTEXT(dc)? SP_VERB_CONTEXT_PEN : SP_VERB_CONTEXT_PENCIL,
_("Draw path"));
// When quickly drawing several subpaths with Shift, the next subpath may be finished and
c->unref();
/* Flush pending updates */
- doc->ensure_up_to_date();
+ doc->ensureUpToDate();
}
/**
@@ -806,7 +790,7 @@ void spdc_create_single_dot(SPEventContext *ec, Geom::Point const &pt, char cons
Glib::ustring tool_path = tool;
SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(ec);
- Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+ Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
repr->setAttribute("sodipodi:type", "arc");
SPItem *item = SP_ITEM(desktop->currentLayer()->appendChildRepr(repr));
@@ -861,7 +845,7 @@ void spdc_create_single_dot(SPEventContext *ec, Geom::Point const &pt, char cons
sp_desktop_selection(desktop)->set(item);
desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Creating single dot"));
- SPDocumentUndo::done(sp_desktop_document(desktop), SP_VERB_NONE, _("Create single dot"));
+ DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_NONE, _("Create single dot"));
}
/*
@@ -873,4 +857,4 @@ void spdc_create_single_dot(SPEventContext *ec, Geom::Point const &pt, char cons
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :