diff --git a/src/eraser-context.cpp b/src/eraser-context.cpp
index 382a50edc5d25478d18c4004c6960361a6e90f15..8854dbcec9e65241b6852b6fa79cf1b5b9bc2d50 100644 (file)
--- a/src/eraser-context.cpp
+++ b/src/eraser-context.cpp
#include "svg/svg.h"
#include "display/canvas-bpath.h"
-#include "display/bezier-utils.h"
+#include <2geom/bezier-utils.h>
#include <glib/gmem.h>
#include "macros.h"
#include "desktop-affine.h"
#include "desktop-style.h"
#include "message-context.h"
-#include "prefs-utils.h"
+#include "preferences.h"
#include "pixmaps/cursor-eraser.xpm"
#include "xml/repr.h"
#include "context-fns.h"
static void sp_eraser_context_dispose(GObject *object);
static void sp_eraser_context_setup(SPEventContext *ec);
-static void sp_eraser_context_set(SPEventContext *ec, gchar const *key, gchar const *val);
+static void sp_eraser_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val);
static gint sp_eraser_context_root_handler(SPEventContext *ec, GdkEvent *event);
static void clear_current(SPEraserContext *dc);
erc->_message_context = new Inkscape::MessageContext(desktop->messageStack());
- if (prefs_get_int_attribute("tools.eraser", "selcue", 0) != 0) {
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ if (prefs->getBool("/tools/eraser/selcue", 0) != 0) {
ec->enableSelectionCue();
}
// TODO temp force:
}
static void
-sp_eraser_context_set(SPEventContext *ec, gchar const *key, gchar const *val)
+sp_eraser_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val)
{
//pass on up to parent class to handle common attributes.
if ( eraser_parent_class->set ) {
- eraser_parent_class->set(ec, key, val);
+ eraser_parent_class->set(ec, val);
}
}
// This prevents flips, blobs, and jerks caused by microscopic tremor of the tablet pen,
// especially bothersome at the start of the stroke where we don't yet have the inertia to
// smooth them out.
- if ( NR::L2(force) < ERASER_EPSILON || (dc->vel_max < ERASER_VEL_START && NR::L2(force) < ERASER_EPSILON_START)) {
+ if ( Geom::L2(force) < ERASER_EPSILON || (dc->vel_max < ERASER_VEL_START && Geom::L2(force) < ERASER_EPSILON_START)) {
return FALSE;
}
/* Calculate new velocity */
dc->vel += dc->acc;
- if (NR::L2(dc->vel) > dc->vel_max)
- dc->vel_max = NR::L2(dc->vel);
+ if (Geom::L2(dc->vel) > dc->vel_max)
+ dc->vel_max = Geom::L2(dc->vel);
/* Calculate angle of drawing tool */
}
// 2. perpendicular to dc->vel (absolutely non-flat nib):
- gdouble const mag_vel = NR::L2(dc->vel);
+ gdouble const mag_vel = Geom::L2(dc->vel);
if ( mag_vel < ERASER_EPSILON ) {
return FALSE;
}
- Geom::Point ang2 = NR::rot90(dc->vel) / mag_vel;
+ Geom::Point ang2 = Geom::rot90(dc->vel) / mag_vel;
// 3. Average them using flatness parameter:
// calculate angles
// Try to detect a sudden flip when the new angle differs too much from the previous for the
// current velocity; in that case discard this move
- double angle_delta = NR::L2(Geom::Point (cos (new_ang), sin (new_ang)) - dc->ang);
- if ( angle_delta / NR::L2(dc->vel) > 4000 ) {
+ double angle_delta = Geom::L2(Geom::Point (cos (new_ang), sin (new_ang)) - dc->ang);
+ if ( angle_delta / Geom::L2(dc->vel) > 4000 ) {
return FALSE;
}
// convert to point
dc->ang = Geom::Point (cos (new_ang), sin (new_ang));
-// g_print ("force %g acc %g vel_max %g vel %g a1 %g a2 %g new_ang %g\n", NR::L2(force), NR::L2(dc->acc), dc->vel_max, NR::L2(dc->vel), a1, a2, new_ang);
+// g_print ("force %g acc %g vel_max %g vel %g a1 %g a2 %g new_ang %g\n", Geom::L2(force), Geom::L2(dc->acc), dc->vel_max, Geom::L2(dc->vel), a1, a2, new_ang);
/* Apply drag */
dc->vel *= 1.0 - drag;
double trace_thick = 1;
- double width = (pressure_thick * trace_thick - vel_thin * NR::L2(dc->vel)) * dc->width;
+ double width = (pressure_thick * trace_thick - vel_thin * Geom::L2(dc->vel)) * dc->width;
double tremble_left = 0, tremble_right = 0;
if (dc->tremor > 0) {
// (2) deflection depends on width, but is upped for small widths for better visual uniformity across widths;
// (3) deflection somewhat depends on speed, to prevent fast strokes looking
// comparatively smooth and slow ones excessively jittery
- tremble_left = (y1)*dc->tremor * (0.15 + 0.8*width) * (0.35 + 14*NR::L2(dc->vel));
- tremble_right = (y2)*dc->tremor * (0.15 + 0.8*width) * (0.35 + 14*NR::L2(dc->vel));
+ tremble_left = (y1)*dc->tremor * (0.15 + 0.8*width) * (0.35 + 14*Geom::L2(dc->vel));
+ tremble_right = (y2)*dc->tremor * (0.15 + 0.8*width) * (0.35 + 14*Geom::L2(dc->vel));
}
if ( width < 0.02 * dc->width ) {
Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
/* Set style */
- sp_desktop_apply_style_tool (desktop, repr, "tools.eraser", false);
+ sp_desktop_apply_style_tool (desktop, repr, "/tools/eraser", false);
dc->repr = repr;
SPItem *item=SP_ITEM(desktop->currentLayer()->appendChildRepr(dc->repr));
Inkscape::GC::release(dc->repr);
- item->transform = SP_ITEM(desktop->currentRoot())->getRelativeTransform(desktop->currentLayer());
+ item->transform = sp_item_i2doc_affine(SP_ITEM(desktop->currentLayer())).inverse();
item->updateRepr();
}
- Geom::PathVector pathv = dc->accumulated->get_pathvector() * sp_desktop_dt2root_affine(desktop);
+ Geom::PathVector pathv = dc->accumulated->get_pathvector() * sp_desktop_dt2doc_affine(desktop);
gchar *str = sp_svg_write_path(pathv);
g_assert( str != NULL );
dc->repr->setAttribute("d", str);
if ( dc->repr ) {
bool wasSelection = false;
Inkscape::Selection *selection = sp_desktop_selection(desktop);
- gint eraserMode = (prefs_get_int_attribute("tools.eraser", "mode", 0) != 0) ? 1 : 0;
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+
+ gint eraserMode = prefs->getBool("/tools/eraser/mode") ? 1 : 0;
Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
SPItem* acid = SP_ITEM(desktop->doc()->getObjectByRepr(dc->repr));
- boost::optional<Geom::Rect> eraserBbox = to_2geom(acid->getBounds(Geom::identity()));
+ Geom::OptRect eraserBbox = acid->getBounds(Geom::identity());
Geom::Rect bounds = (*eraserBbox) * desktop->doc2dt();
std::vector<SPItem*> remainingItems;
GSList* toWorkOn = 0;
for (GSList *i = toWorkOn ; i ; i = i->next ) {
SPItem *item = SP_ITEM(i->data);
if ( eraserMode ) {
- boost::optional<Geom::Rect> bbox = to_2geom(item->getBounds(Geom::identity()));
+ Geom::OptRect bbox = item->getBounds(Geom::identity());
if (bbox && bbox->intersects(*eraserBbox)) {
Inkscape::XML::Node* dup = dc->repr->duplicate(xml_doc);
dc->repr->parent()->appendChild(dup);
Geom::Point const &to, Geom::Point const &post,
double rounding)
{
- Geom::Point vel = rounding * NR::rot90( to - from ) / sqrt(2.0);
- double mag = NR::L2(vel);
+ Geom::Point vel = rounding * Geom::rot90( to - from ) / sqrt(2.0);
+ double mag = Geom::L2(vel);
Geom::Point v_in = from - pre;
- double mag_in = NR::L2(v_in);
+ double mag_in = Geom::L2(v_in);
if ( mag_in > ERASER_EPSILON ) {
v_in = mag * v_in / mag_in;
} else {
}
Geom::Point v_out = to - post;
- double mag_out = NR::L2(v_out);
+ double mag_out = Geom::L2(v_out);
if ( mag_out > ERASER_EPSILON ) {
v_out = mag * v_out / mag_out;
} else {
v_out = Geom::Point(0, 0);
}
- if ( NR::L2(v_in) > ERASER_EPSILON || NR::L2(v_out) > ERASER_EPSILON ) {
+ if ( Geom::L2(v_in) > ERASER_EPSILON || Geom::L2(v_out) > ERASER_EPSILON ) {
curve->curveto(from + v_in, to + v_out, to);
}
}
}
Geom::Point b1[BEZIER_MAX_LENGTH];
- gint const nb1 = sp_bezier_fit_cubic_r(b1, dc->point1, dc->npoints,
+ gint const nb1 = Geom::bezier_fit_cubic_r(b1, dc->point1, dc->npoints,
tolerance_sq, BEZIER_MAX_BEZIERS);
g_assert( nb1 * BEZIER_SIZE <= gint(G_N_ELEMENTS(b1)) );
Geom::Point b2[BEZIER_MAX_LENGTH];
- gint const nb2 = sp_bezier_fit_cubic_r(b2, dc->point2, dc->npoints,
+ gint const nb2 = Geom::bezier_fit_cubic_r(b2, dc->point2, dc->npoints,
tolerance_sq, BEZIER_MAX_BEZIERS);
g_assert( nb2 * BEZIER_SIZE <= gint(G_N_ELEMENTS(b2)) );
g_print("[%d]Yup\n", dc->npoints);
#endif
if (!release) {
- gint eraserMode = (prefs_get_int_attribute("tools.eraser", "mode", 0) != 0) ? 1 : 0;
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ gint eraserMode = prefs->getBool("/tools/eraser/mode") ? 1 : 0;
g_assert(!dc->currentcurve->is_empty());
SPCanvasItem *cbp = sp_canvas_item_new(sp_desktop_sketch(desktop),
sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH (cbp), curve);
curve->unref();
- guint32 fillColor = sp_desktop_get_color_tool (desktop, "tools.eraser", true);
- //guint32 strokeColor = sp_desktop_get_color_tool (desktop, "tools.eraser", false);
- double opacity = sp_desktop_get_master_opacity_tool (desktop, "tools.eraser");
- double fillOpacity = sp_desktop_get_opacity_tool (desktop, "tools.eraser", true);
- //double strokeOpacity = sp_desktop_get_opacity_tool (desktop, "tools.eraser", false);
+ guint32 fillColor = sp_desktop_get_color_tool (desktop, "/tools/eraser", true);
+ //guint32 strokeColor = sp_desktop_get_color_tool (desktop, "/tools/eraser", false);
+ double opacity = sp_desktop_get_master_opacity_tool (desktop, "/tools/eraser");
+ double fillOpacity = sp_desktop_get_opacity_tool (desktop, "/tools/eraser", true);
+ //double strokeOpacity = sp_desktop_get_opacity_tool (desktop, "/tools/eraser", false);
sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(cbp), ((fillColor & 0xffffff00) | SP_COLOR_F_TO_U(opacity*fillOpacity)), SP_WIND_RULE_EVENODD);
//on second thougtht don't do stroke yet because we don't have stoke-width yet and because stoke appears between segments while drawing
//sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(cbp), ((strokeColor & 0xffffff00) | SP_COLOR_F_TO_U(opacity*strokeOpacity)), 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);