X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Feraser-context.cpp;h=8854dbcec9e65241b6852b6fa79cf1b5b9bc2d50;hb=abac96a58638236025e60f4dca3848bb294c6672;hp=49f86b03cdba897982f31e09e33496e142121faf;hpb=24c87cf413fa94ea530a0d599df724a8198b0b5f;p=inkscape.git diff --git a/src/eraser-context.cpp b/src/eraser-context.cpp index 49f86b03c..8854dbcec 100644 --- a/src/eraser-context.cpp +++ b/src/eraser-context.cpp @@ -34,7 +34,7 @@ #include "svg/svg.h" #include "display/canvas-bpath.h" -#include "display/bezier-utils.h" +#include <2geom/bezier-utils.h> #include #include "macros.h" @@ -46,12 +46,11 @@ #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" #include "sp-item.h" -#include "inkscape.h" #include "color.h" #include "rubberband.h" #include "splivarot.h" @@ -85,19 +84,19 @@ static void sp_eraser_context_init(SPEraserContext *erc); 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); static void set_to_accumulated(SPEraserContext *dc); -static void add_cap(SPCurve *curve, NR::Point const &pre, NR::Point const &from, NR::Point const &to, NR::Point const &post, double rounding); +static void add_cap(SPCurve *curve, Geom::Point const &pre, Geom::Point const &from, Geom::Point const &to, Geom::Point const &post, double rounding); static void accumulate_eraser(SPEraserContext *dc); static void fit_and_split(SPEraserContext *erc, gboolean release); -static void sp_eraser_reset(SPEraserContext *erc, NR::Point p); -static NR::Point sp_eraser_get_npoint(SPEraserContext const *erc, NR::Point v); -static NR::Point sp_eraser_get_vpoint(SPEraserContext const *erc, NR::Point n); +static void sp_eraser_reset(SPEraserContext *erc, Geom::Point p); +static Geom::Point sp_eraser_get_npoint(SPEraserContext const *erc, Geom::Point v); +static Geom::Point sp_eraser_get_vpoint(SPEraserContext const *erc, Geom::Point n); static void draw_temporary_box(SPEraserContext *dc); @@ -159,21 +158,22 @@ static void sp_eraser_context_setup(SPEventContext *ec) { SPEraserContext *erc = SP_ERASER_CONTEXT(ec); + SPDesktop *desktop = ec->desktop; if (((SPEventContextClass *) eraser_parent_class)->setup) ((SPEventContextClass *) eraser_parent_class)->setup(ec); - erc->accumulated = new SPCurve(32); - erc->currentcurve = new SPCurve(4); + erc->accumulated = new SPCurve(); + erc->currentcurve = new SPCurve(); - erc->cal1 = new SPCurve(32); - erc->cal2 = new SPCurve(32); + erc->cal1 = new SPCurve(); + erc->cal2 = new SPCurve(); - erc->currentshape = sp_canvas_item_new(sp_desktop_sketch(ec->desktop), SP_TYPE_CANVAS_BPATH, NULL); + erc->currentshape = sp_canvas_item_new(sp_desktop_sketch(desktop), SP_TYPE_CANVAS_BPATH, NULL); sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(erc->currentshape), ERC_RED_RGBA, SP_WIND_RULE_EVENODD); sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(erc->currentshape), 0x00000000, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); /* fixme: Cannot we cascade it to root more clearly? */ - g_signal_connect(G_OBJECT(erc->currentshape), "event", G_CALLBACK(sp_desktop_root_handler), ec->desktop); + g_signal_connect(G_OBJECT(erc->currentshape), "event", G_CALLBACK(sp_desktop_root_handler), desktop); /* static ProfileFloatElement f_profile[PROFILE_FLOAT_SIZE] = { @@ -202,9 +202,10 @@ static ProfileFloatElement f_profile[PROFILE_FLOAT_SIZE] = { erc->is_drawing = false; - erc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack()); + 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: @@ -213,11 +214,11 @@ static ProfileFloatElement f_profile[PROFILE_FLOAT_SIZE] = { } 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); } } @@ -228,32 +229,32 @@ flerp(double f0, double f1, double p) } /* Get normalized point */ -static NR::Point -sp_eraser_get_npoint(SPEraserContext const *dc, NR::Point v) +static Geom::Point +sp_eraser_get_npoint(SPEraserContext const *dc, Geom::Point v) { - NR::Rect drect = SP_EVENT_CONTEXT(dc)->desktop->get_display_area(); - double const max = MAX ( drect.dimensions()[NR::X], drect.dimensions()[NR::Y] ); - return NR::Point(( v[NR::X] - drect.min()[NR::X] ) / max, ( v[NR::Y] - drect.min()[NR::Y] ) / max); + Geom::Rect drect = SP_EVENT_CONTEXT(dc)->desktop->get_display_area(); + double const max = MAX ( drect.dimensions()[Geom::X], drect.dimensions()[Geom::Y] ); + return Geom::Point(( v[Geom::X] - drect.min()[Geom::X] ) / max, ( v[Geom::Y] - drect.min()[Geom::Y] ) / max); } /* Get view point */ -static NR::Point -sp_eraser_get_vpoint(SPEraserContext const *dc, NR::Point n) +static Geom::Point +sp_eraser_get_vpoint(SPEraserContext const *dc, Geom::Point n) { - NR::Rect drect = SP_EVENT_CONTEXT(dc)->desktop->get_display_area(); - double const max = MAX ( drect.dimensions()[NR::X], drect.dimensions()[NR::Y] ); - return NR::Point(n[NR::X] * max + drect.min()[NR::X], n[NR::Y] * max + drect.min()[NR::Y]); + Geom::Rect drect = SP_EVENT_CONTEXT(dc)->desktop->get_display_area(); + double const max = MAX ( drect.dimensions()[Geom::X], drect.dimensions()[Geom::Y] ); + return Geom::Point(n[Geom::X] * max + drect.min()[Geom::X], n[Geom::Y] * max + drect.min()[Geom::Y]); } static void -sp_eraser_reset(SPEraserContext *dc, NR::Point p) +sp_eraser_reset(SPEraserContext *dc, Geom::Point p) { dc->last = dc->cur = sp_eraser_get_npoint(dc, p); - dc->vel = NR::Point(0,0); + dc->vel = Geom::Point(0,0); dc->vel_max = 0; - dc->acc = NR::Point(0,0); - dc->ang = NR::Point(0,0); - dc->del = NR::Point(0,0); + dc->acc = Geom::Point(0,0); + dc->ang = Geom::Point(0,0); + dc->del = Geom::Point(0,0); } static void @@ -277,16 +278,16 @@ sp_eraser_extinput(SPEraserContext *dc, GdkEvent *event) static gboolean -sp_eraser_apply(SPEraserContext *dc, NR::Point p) +sp_eraser_apply(SPEraserContext *dc, Geom::Point p) { - NR::Point n = sp_eraser_get_npoint(dc, p); + Geom::Point n = sp_eraser_get_npoint(dc, p); /* Calculate mass and drag */ double const mass = flerp(1.0, 160.0, dc->mass); double const drag = flerp(0.0, 0.5, dc->drag * dc->drag); /* Calculate force and acceleration */ - NR::Point force = n - dc->cur; + Geom::Point force = n - dc->cur; // If force is below the absolute threshold ERASER_EPSILON, // or we haven't yet reached ERASER_VEL_START (i.e. at the beginning of stroke) @@ -295,7 +296,7 @@ sp_eraser_apply(SPEraserContext *dc, NR::Point p) // 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; } @@ -304,8 +305,8 @@ sp_eraser_apply(SPEraserContext *dc, NR::Point p) /* 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 */ @@ -315,7 +316,7 @@ sp_eraser_apply(SPEraserContext *dc, NR::Point p) gdouble length = std::sqrt(dc->xtilt*dc->xtilt + dc->ytilt*dc->ytilt);; if (length > 0) { - NR::Point ang1 = NR::Point(dc->ytilt/length, dc->xtilt/length); + Geom::Point ang1 = Geom::Point(dc->ytilt/length, dc->xtilt/length); a1 = atan2(ang1); } else @@ -324,16 +325,16 @@ sp_eraser_apply(SPEraserContext *dc, NR::Point p) else { // 1b. fixed dc->angle (absolutely flat nib): double const radians = ( (dc->angle - 90) / 180.0 ) * M_PI; - NR::Point ang1 = NR::Point(-sin(radians), cos(radians)); + Geom::Point ang1 = Geom::Point(-sin(radians), cos(radians)); a1 = atan2(ang1); } // 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; } - NR::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 @@ -355,15 +356,15 @@ sp_eraser_apply(SPEraserContext *dc, NR::Point p) // 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(NR::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 = NR::Point (cos (new_ang), sin (new_ang)); + 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; @@ -388,12 +389,12 @@ sp_eraser_brush(SPEraserContext *dc) // get the real brush point, not the same as pointer (affected by hatch tracking and/or mass // drag) - NR::Point brush = sp_eraser_get_vpoint(dc, dc->cur); - NR::Point brush_w = SP_EVENT_CONTEXT(dc)->desktop->d2w(brush); + Geom::Point brush = sp_eraser_get_vpoint(dc, dc->cur); + Geom::Point brush_w = SP_EVENT_CONTEXT(dc)->desktop->d2w(brush); 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) { @@ -413,8 +414,8 @@ sp_eraser_brush(SPEraserContext *dc) // (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 ) { @@ -426,8 +427,8 @@ sp_eraser_brush(SPEraserContext *dc) dezoomify_factor /= SP_EVENT_CONTEXT(dc)->desktop->current_zoom(); } - NR::Point del_left = dezoomify_factor * (width + tremble_left) * dc->ang; - NR::Point del_right = dezoomify_factor * (width + tremble_right) * dc->ang; + Geom::Point del_left = dezoomify_factor * (width + tremble_left) * dc->ang; + Geom::Point del_right = dezoomify_factor * (width + tremble_right) * dc->ang; dc->point1[dc->npoints] = brush + del_left; dc->point2[dc->npoints] = brush - del_right; @@ -477,15 +478,13 @@ sp_eraser_context_root_handler(SPEventContext *event_context, case GDK_BUTTON_PRESS: if (event->button.button == 1 && !event_context->space_panning) { - SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(dc); - if (Inkscape::have_viable_layer(desktop, dc->_message_context) == false) { return TRUE; } - NR::Point const button_w(event->button.x, + Geom::Point const button_w(event->button.x, event->button.y); - NR::Point const button_dt(desktop->w2d(button_w)); + Geom::Point const button_dt(desktop->w2d(button_w)); sp_eraser_reset(dc, button_dt); sp_eraser_extinput(dc, event); sp_eraser_apply(dc, button_dt); @@ -494,8 +493,8 @@ sp_eraser_context_root_handler(SPEventContext *event_context, dc->repr = NULL; } - Inkscape::Rubberband::get()->start(desktop, button_dt); - Inkscape::Rubberband::get()->setMode(RUBBERBAND_MODE_TOUCHPATH); + Inkscape::Rubberband::get(desktop)->start(desktop, button_dt); + Inkscape::Rubberband::get(desktop)->setMode(RUBBERBAND_MODE_TOUCHPATH); /* initialize first point */ dc->npoints = 0; @@ -516,9 +515,9 @@ sp_eraser_context_root_handler(SPEventContext *event_context, break; case GDK_MOTION_NOTIFY: { - NR::Point const motion_w(event->motion.x, + Geom::Point const motion_w(event->motion.x, event->motion.y); - NR::Point motion_dt(desktop->w2d(motion_w)); + Geom::Point motion_dt(desktop->w2d(motion_w)); sp_eraser_extinput(dc, event); dc->_message_context->clear(); @@ -540,15 +539,15 @@ sp_eraser_context_root_handler(SPEventContext *event_context, } ret = TRUE; } - Inkscape::Rubberband::get()->move(motion_dt); + Inkscape::Rubberband::get(desktop)->move(motion_dt); } break; case GDK_BUTTON_RELEASE: { - NR::Point const motion_w(event->button.x, event->button.y); - NR::Point const motion_dt(desktop->w2d(motion_w)); + Geom::Point const motion_w(event->button.x, event->button.y); + Geom::Point const motion_dt(desktop->w2d(motion_w)); sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time); sp_canvas_end_forced_full_redraws(desktop->canvas); @@ -557,8 +556,6 @@ sp_eraser_context_root_handler(SPEventContext *event_context, if (dc->dragging && event->button.button == 1 && !event_context->space_panning) { dc->dragging = FALSE; - NR::Maybe const b = Inkscape::Rubberband::get()->getRectangle(); - sp_eraser_apply(dc, motion_dt); /* Remove all temporary line segments */ @@ -580,7 +577,7 @@ sp_eraser_context_root_handler(SPEventContext *event_context, dc->repr = NULL; } - Inkscape::Rubberband::get()->stop(); + Inkscape::Rubberband::get(desktop)->stop(); dc->_message_context->clear(); ret = TRUE; } @@ -649,7 +646,7 @@ sp_eraser_context_root_handler(SPEventContext *event_context, } break; case GDK_Escape: - Inkscape::Rubberband::get()->stop(); + Inkscape::Rubberband::get(desktop)->stop(); if (dc->is_drawing) { // if drawing, cancel, otherwise pass it up for deselecting eraser_cancel (dc); @@ -721,16 +718,16 @@ set_to_accumulated(SPEraserContext *dc) 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() * to_2geom(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); @@ -739,19 +736,21 @@ set_to_accumulated(SPEraserContext *dc) 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)); - NR::Maybe eraserBbox = acid->getBounds(NR::identity()); - NR::Rect bounds = (*eraserBbox) * desktop->doc2dt(); + Geom::OptRect eraserBbox = acid->getBounds(Geom::identity()); + Geom::Rect bounds = (*eraserBbox) * desktop->doc2dt(); std::vector remainingItems; GSList* toWorkOn = 0; if (selection->isEmpty()) { if ( eraserMode ) { toWorkOn = sp_document_partial_items_in_box(sp_desktop_document(desktop), desktop->dkey, bounds); } else { - Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(); + Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop); toWorkOn = sp_document_items_at_points(sp_desktop_document(desktop), desktop->dkey, r->getPoints()); } toWorkOn = g_slist_remove( toWorkOn, acid ); @@ -765,7 +764,7 @@ set_to_accumulated(SPEraserContext *dc) for (GSList *i = toWorkOn ; i ; i = i->next ) { SPItem *item = SP_ITEM(i->data); if ( eraserMode ) { - NR::Maybe bbox = item->getBounds(NR::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); @@ -773,7 +772,7 @@ set_to_accumulated(SPEraserContext *dc) selection->set(item); selection->add(dup); - sp_selected_path_diff_skip_undo(); + sp_selected_path_diff_skip_undo(desktop); workDone = true; // TODO set this only if something was cut. if ( !selection->isEmpty() ) { // If the item was not completely erased, track the new remainder. @@ -803,7 +802,7 @@ set_to_accumulated(SPEraserContext *dc) g_slist_free(toWorkOn); if ( !eraserMode ) { - //sp_selection_delete(); + //sp_selection_delete(desktop); remainingItems.clear(); } @@ -837,30 +836,30 @@ set_to_accumulated(SPEraserContext *dc) static void add_cap(SPCurve *curve, - NR::Point const &pre, NR::Point const &from, - NR::Point const &to, NR::Point const &post, + Geom::Point const &pre, Geom::Point const &from, + Geom::Point const &to, Geom::Point const &post, double rounding) { - NR::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); - NR::Point v_in = from - pre; - double mag_in = NR::L2(v_in); + Geom::Point v_in = from - pre; + double mag_in = Geom::L2(v_in); if ( mag_in > ERASER_EPSILON ) { v_in = mag * v_in / mag_in; } else { - v_in = NR::Point(0, 0); + v_in = Geom::Point(0, 0); } - NR::Point v_out = to - post; - double mag_out = NR::L2(v_out); + Geom::Point v_out = to - post; + double mag_out = Geom::L2(v_out); if ( mag_out > ERASER_EPSILON ) { v_out = mag * v_out / mag_out; } else { - v_out = NR::Point(0, 0); + 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); } } @@ -911,7 +910,9 @@ static double square(double const x) static void fit_and_split(SPEraserContext *dc, gboolean release) { - double const tolerance_sq = square( NR::expansion(SP_EVENT_CONTEXT(dc)->desktop->w2d()) * TOLERANCE_ERASER ); + SPDesktop *desktop = SP_EVENT_CONTEXT(dc)->desktop; + + double const tolerance_sq = square( desktop->w2d().descrim() * TOLERANCE_ERASER ); #ifdef ERASER_VERBOSE g_print("[F&S:R=%c]", release?'T':'F'); @@ -941,13 +942,13 @@ fit_and_split(SPEraserContext *dc, gboolean release) dc->cal2->moveto(dc->point2[0]); } - NR::Point b1[BEZIER_MAX_LENGTH]; - gint const nb1 = sp_bezier_fit_cubic_r(b1, dc->point1, dc->npoints, + Geom::Point b1[BEZIER_MAX_LENGTH]; + 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)) ); - NR::Point b2[BEZIER_MAX_LENGTH]; - gint const nb2 = sp_bezier_fit_cubic_r(b2, dc->point2, dc->npoints, + Geom::Point b2[BEZIER_MAX_LENGTH]; + 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)) ); @@ -960,12 +961,12 @@ fit_and_split(SPEraserContext *dc, gboolean release) if (! release) { dc->currentcurve->reset(); dc->currentcurve->moveto(b1[0]); - for (NR::Point *bp1 = b1; bp1 < b1 + BEZIER_SIZE * nb1; bp1 += BEZIER_SIZE) { + for (Geom::Point *bp1 = b1; bp1 < b1 + BEZIER_SIZE * nb1; bp1 += BEZIER_SIZE) { dc->currentcurve->curveto(bp1[1], bp1[2], bp1[3]); } dc->currentcurve->lineto(b2[BEZIER_SIZE*(nb2-1) + 3]); - for (NR::Point *bp2 = b2 + BEZIER_SIZE * ( nb2 - 1 ); bp2 >= b2; bp2 -= BEZIER_SIZE) { + for (Geom::Point *bp2 = b2 + BEZIER_SIZE * ( nb2 - 1 ); bp2 >= b2; bp2 -= BEZIER_SIZE) { dc->currentcurve->curveto(bp2[2], bp2[1], bp2[0]); } // FIXME: dc->segments is always NULL at this point?? @@ -977,10 +978,10 @@ fit_and_split(SPEraserContext *dc, gboolean release) } /* Current eraser */ - for (NR::Point *bp1 = b1; bp1 < b1 + BEZIER_SIZE * nb1; bp1 += BEZIER_SIZE) { + for (Geom::Point *bp1 = b1; bp1 < b1 + BEZIER_SIZE * nb1; bp1 += BEZIER_SIZE) { dc->cal1->curveto(bp1[1], bp1[2], bp1[3]); } - for (NR::Point *bp2 = b2; bp2 < b2 + BEZIER_SIZE * nb2; bp2 += BEZIER_SIZE) { + for (Geom::Point *bp2 = b2; bp2 < b2 + BEZIER_SIZE * nb2; bp2 += BEZIER_SIZE) { dc->cal2->curveto(bp2[1], bp2[2], bp2[3]); } } else { @@ -1003,27 +1004,28 @@ fit_and_split(SPEraserContext *dc, gboolean release) 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(SP_EVENT_CONTEXT(dc)->desktop), + SPCanvasItem *cbp = sp_canvas_item_new(sp_desktop_sketch(desktop), SP_TYPE_CANVAS_BPATH, NULL); SPCurve *curve = dc->currentcurve->copy(); sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH (cbp), curve); curve->unref(); - guint32 fillColor = sp_desktop_get_color_tool (SP_ACTIVE_DESKTOP, "tools.eraser", true); - //guint32 strokeColor = sp_desktop_get_color_tool (SP_ACTIVE_DESKTOP, "tools.eraser", false); - double opacity = sp_desktop_get_master_opacity_tool (SP_ACTIVE_DESKTOP, "tools.eraser"); - double fillOpacity = sp_desktop_get_opacity_tool (SP_ACTIVE_DESKTOP, "tools.eraser", true); - //double strokeOpacity = sp_desktop_get_opacity_tool (SP_ACTIVE_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); sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(cbp), 0x00000000, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); /* fixme: Cannot we cascade it to root more clearly? */ - g_signal_connect(G_OBJECT(cbp), "event", G_CALLBACK(sp_desktop_root_handler), SP_EVENT_CONTEXT(dc)->desktop); + g_signal_connect(G_OBJECT(cbp), "event", G_CALLBACK(sp_desktop_root_handler), desktop); dc->segments = g_slist_prepend(dc->segments, cbp);