X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fpencil-context.cpp;h=a873eb6fcb9a84e383c68e006e1ee2040b13a7e9;hb=c7cf14ac71346f76ae219ce67fb88c1bd34832e2;hp=69d9a5e234475d3cb2cac3fff5341f85c6bc779e;hpb=6c3e745a94ef6b25a4ef9f018d350a7535aa45af;p=inkscape.git diff --git a/src/pencil-context.cpp b/src/pencil-context.cpp index 69d9a5e23..a873eb6fc 100644 --- a/src/pencil-context.cpp +++ b/src/pencil-context.cpp @@ -30,7 +30,8 @@ #include "preferences.h" #include "snap.h" #include "pixmaps/cursor-pencil.xpm" -#include "display/bezier-utils.h" +#include <2geom/sbasis-to-bezier.h> +#include <2geom/bezier-utils.h> #include "display/canvas-bpath.h" #include #include "libnr/in-svg-plane.h" @@ -40,7 +41,9 @@ #include "document.h" #include "desktop-style.h" #include "macros.h" +#include "display/sp-canvas.h" #include "display/curve.h" +#include "livarot/Path.h" static void sp_pencil_context_class_init(SPPencilContextClass *klass); static void sp_pencil_context_init(SPPencilContext *pc); @@ -52,6 +55,7 @@ static gint pencil_handle_button_press(SPPencilContext *const pc, GdkEventButton static gint pencil_handle_motion_notify(SPPencilContext *const pc, GdkEventMotion const &mevent); static gint pencil_handle_button_release(SPPencilContext *const pc, GdkEventButton const &revent); static gint pencil_handle_key_press(SPPencilContext *const pc, guint const keyval, guint const state); +static gint pencil_handle_key_release(SPPencilContext *const pc, guint const keyval, guint const state); static void spdc_set_startpoint(SPPencilContext *pc, Geom::Point const p); static void spdc_set_endpoint(SPPencilContext *pc, Geom::Point const p); @@ -59,6 +63,7 @@ static void spdc_finish_endpoint(SPPencilContext *pc); static void spdc_add_freehand_point(SPPencilContext *pc, Geom::Point p, guint state); static void fit_and_split(SPPencilContext *pc); static void interpolate(SPPencilContext *pc); +static void sketch_interpolate(SPPencilContext *pc); static SPDrawContextClass *pencil_parent_class; static Geom::Point pencil_drag_origin_w(0, 0); @@ -122,6 +127,10 @@ sp_pencil_context_init(SPPencilContext *pc) pc->npoints = 0; pc->state = SP_PENCIL_CONTEXT_IDLE; pc->req_tangent = Geom::Point(0, 0); + + // since SPPencilContext is not properly constructed... + pc->sketch_interpolation = Geom::Piecewise >(); + pc->sketch_n = 0; } /** @@ -193,6 +202,10 @@ sp_pencil_context_root_handler(SPEventContext *const ec, GdkEvent *event) ret = pencil_handle_key_press(pc, get_group0_keyval (&event->key), event->key.state); break; + case GDK_KEY_RELEASE: + ret = pencil_handle_key_release(pc, get_group0_keyval (&event->key), event->key.state); + break; + default: break; } @@ -223,6 +236,15 @@ pencil_handle_button_press(SPPencilContext *const pc, GdkEventButton const &beve return TRUE; } + if (!pc->grab) { + /* Grab mouse, so release will not pass unnoticed */ + pc->grab = SP_CANVAS_ITEM(desktop->acetate); + sp_canvas_item_grab(pc->grab, ( GDK_KEY_PRESS_MASK | GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_POINTER_MOTION_MASK ), + NULL, bevent.time); + } + Geom::Point const button_w(bevent.x, bevent.y); /* Find desktop coordinates */ @@ -241,38 +263,38 @@ pencil_handle_button_press(SPPencilContext *const pc, GdkEventButton const &beve break; default: /* Set first point of sequence */ + SnapManager &m = desktop->namedview->snap_manager; + if (bevent.state & GDK_CONTROL_MASK) { - spdc_create_single_dot(event_context, from_2geom(p), "/tools/freehand/pencil", bevent.state); + m.setup(desktop); + if (!(bevent.state & GDK_SHIFT_MASK)) { + m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_NODE_HANDLE); + } + spdc_create_single_dot(event_context, p, "/tools/freehand/pencil", bevent.state); + m.unSetup(); ret = true; break; } if (anchor) { - p = to_2geom(anchor->dp); + p = anchor->dp; desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Continuing selected path")); } else { - + m.setup(desktop); if (!(bevent.state & GDK_SHIFT_MASK)) { - // This is the first click of a new curve; deselect item so that // this curve is not combined with it (unless it is drawn from its // anchor, which is handled by the sibling branch above) selection->clear(); desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Creating new path")); - SnapManager &m = desktop->namedview->snap_manager; - m.setup(desktop); - Inkscape::SnappedPoint const s = m.freeSnap(Inkscape::SnapPreferences::SNAPPOINT_NODE, p); - if (s.getSnapped()) { - s.getPoint(p); - pc->prev_snap_was_succesful = true; - } else { - pc->prev_snap_was_succesful = false; - } + m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_NODE_HANDLE); } else if (selection->singleItem() && SP_IS_PATH(selection->singleItem())) { desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Appending to selected path")); + m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_NODE_HANDLE); } + m.unSetup(); } pc->sa = anchor; - spdc_set_startpoint(pc, from_2geom(p)); + spdc_set_startpoint(pc, p); ret = TRUE; break; } @@ -285,6 +307,8 @@ pencil_handle_button_press(SPPencilContext *const pc, GdkEventButton const &beve static gint pencil_handle_motion_notify(SPPencilContext *const pc, GdkEventMotion const &mevent) { + SPDesktop *const dt = pc->desktop; + if ((mevent.state & GDK_CONTROL_MASK) && (mevent.state & GDK_BUTTON1_MASK)) { // mouse was accidentally moved during Ctrl+click; // ignore the motion and create a single point @@ -292,7 +316,6 @@ pencil_handle_motion_notify(SPPencilContext *const pc, GdkEventMotion const &mev return TRUE; } gint ret = FALSE; - SPDesktop *const dt = pc->desktop; SPEventContext *event_context = SP_EVENT_CONTEXT(pc); if (event_context->space_panning || mevent.state & GDK_BUTTON2_MASK || mevent.state & GDK_BUTTON3_MASK) { @@ -310,7 +333,7 @@ pencil_handle_motion_notify(SPPencilContext *const pc, GdkEventMotion const &mev } /* Find desktop coordinates */ - Geom::Point p = to_2geom(dt->w2d(Geom::Point(mevent.x, mevent.y))); + Geom::Point p = dt->w2d(Geom::Point(mevent.x, mevent.y)); /* Test whether we hit any anchor. */ SPDrawAnchor *anchor = spdc_test_inside(pc, Geom::Point(mevent.x, mevent.y)); @@ -318,7 +341,7 @@ pencil_handle_motion_notify(SPPencilContext *const pc, GdkEventMotion const &mev if (pencil_within_tolerance) { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); gint const tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); - if ( NR::LInfty( Geom::Point(mevent.x,mevent.y) - pencil_drag_origin_w ) < tolerance ) { + if ( Geom::LInfty( Geom::Point(mevent.x,mevent.y) - pencil_drag_origin_w ) < tolerance ) { return FALSE; // Do not drag if we're within tolerance from origin. } } @@ -332,48 +355,41 @@ pencil_handle_motion_notify(SPPencilContext *const pc, GdkEventMotion const &mev case SP_PENCIL_CONTEXT_ADDLINE: /* Set red endpoint */ if (anchor) { - p = to_2geom(anchor->dp); + p = anchor->dp; } else { - Geom::Point ptnr = from_2geom(p); + Geom::Point ptnr(p); spdc_endpoint_snap(pc, ptnr, mevent.state); - p = to_2geom(ptnr); + p = ptnr; } - spdc_set_endpoint(pc, from_2geom(p)); + spdc_set_endpoint(pc, p); ret = TRUE; break; default: /* We may be idle or already freehand */ if ( mevent.state & GDK_BUTTON1_MASK && pc->is_drawing ) { + if (pc->state == SP_PENCIL_CONTEXT_IDLE) { + sp_event_context_discard_delayed_snap_event(event_context); + } pc->state = SP_PENCIL_CONTEXT_FREEHAND; + if ( !pc->sa && !pc->green_anchor ) { /* Create green anchor */ pc->green_anchor = sp_draw_anchor_new(pc, pc->green_curve, TRUE, pc->p[0]); } - /** \todo - * fixme: I am not sure whether we want to snap to anchors - * in middle of freehand (Lauris) - */ - SnapManager &m = dt->namedview->snap_manager; - if (anchor) { - p = to_2geom(anchor->dp); - } else if ((mevent.state & GDK_SHIFT_MASK) == 0) { - m.setup(dt); - Inkscape::SnappedPoint const s = m.freeSnap(Inkscape::SnapPreferences::SNAPPOINT_NODE, p); - if (s.getSnapped()) { - s.getPoint(p); - pc->prev_snap_was_succesful = true; - } else { - pc->prev_snap_was_succesful = false; - } + p = anchor->dp; } + if ( pc->npoints != 0) { // buttonpress may have happened before we entered draw context! - if (!(pc->prev_snap_was_succesful && m.snapprefs.getSnapPostponedGlobally())) { - // When snapping is enabled but temporarily on hold because the mouse is moving - // fast, then we don't want to add nodes off-grid - spdc_add_freehand_point(pc, from_2geom(p), mevent.state); - ret = TRUE; - } + if (pc->ps.size() == 0) { + // Only in freehand mode we have to add the first point also to pc->ps (apparently) + // - We cannot add this point in spdc_set_startpoint, because we only need it for freehand + // - We cannot do this in the button press handler because at that point we don't know yet + // wheter we're going into freehand mode or not + pc->ps.push_back(pc->p[0]); + } + spdc_add_freehand_point(pc, p, mevent.state); + ret = TRUE; } if (anchor && !pc->anchor_statusbar) { @@ -395,6 +411,16 @@ pencil_handle_motion_notify(SPPencilContext *const pc, GdkEventMotion const &mev pc->anchor_statusbar = false; } } + + // Show the pre-snap indicator to communicate to the user where we would snap to if he/she were to + // a) press the mousebutton to start a freehand drawing, or + // b) release the mousebutton to finish a freehand drawing + if (!sp_event_context_knot_mouseover(pc)) { + SnapManager &m = dt->namedview->snap_manager; + m.setup(dt); + m.preSnap(Inkscape::SnapCandidatePoint(p, Inkscape::SNAPSOURCE_NODE_HANDLE)); + m.unSetup(); + } break; } return ret; @@ -439,29 +465,53 @@ pencil_handle_button_release(SPPencilContext *const pc, GdkEventButton const &re spdc_set_endpoint(pc, p); spdc_finish_endpoint(pc); pc->state = SP_PENCIL_CONTEXT_IDLE; + sp_event_context_discard_delayed_snap_event(event_context); ret = TRUE; break; case SP_PENCIL_CONTEXT_FREEHAND: - /* Finish segment now */ - /// \todo fixme: Clean up what follows (Lauris) - if (anchor) { - p = anchor->dp; - } - pc->ea = anchor; - /* Write curves to object */ + if (revent.state & GDK_MOD1_MASK) { + /* sketch mode: interpolate the sketched path and improve the current output path with the new interpolation. don't finish sketch */ - dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Finishing freehand")); + sketch_interpolate(pc); - interpolate(pc); - spdc_concat_colors_and_flush(pc, FALSE); - pc->sa = NULL; - pc->ea = NULL; - if (pc->green_anchor) { - pc->green_anchor = sp_draw_anchor_destroy(pc->green_anchor); + if (pc->green_anchor) { + pc->green_anchor = sp_draw_anchor_destroy(pc->green_anchor); + } + + pc->state = SP_PENCIL_CONTEXT_SKETCH; + } else { + /* Finish segment now */ + /// \todo fixme: Clean up what follows (Lauris) + if (anchor) { + p = anchor->dp; + } else { + Geom::Point p_end = p; + spdc_endpoint_snap(pc, p_end, revent.state); + if (p_end != p) { + // then we must have snapped! + spdc_add_freehand_point(pc, p_end, revent.state); + } + } + + pc->ea = anchor; + /* Write curves to object */ + + dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Finishing freehand")); + + interpolate(pc); + spdc_concat_colors_and_flush(pc, FALSE); + pc->sa = NULL; + pc->ea = NULL; + if (pc->green_anchor) { + pc->green_anchor = sp_draw_anchor_destroy(pc->green_anchor); + } + pc->state = SP_PENCIL_CONTEXT_IDLE; + // reset sketch mode too + pc->sketch_n = 0; } - pc->state = SP_PENCIL_CONTEXT_IDLE; ret = TRUE; break; + case SP_PENCIL_CONTEXT_SKETCH: default: break; } @@ -478,7 +528,7 @@ pencil_handle_button_release(SPPencilContext *const pc, GdkEventButton const &re } static void -pencil_cancel (SPPencilContext *const pc) +pencil_cancel (SPPencilContext *const pc) { if (pc->grab) { /* Release grab now */ @@ -487,8 +537,8 @@ pencil_cancel (SPPencilContext *const pc) } pc->is_drawing = false; - pc->state = SP_PENCIL_CONTEXT_IDLE; + sp_event_context_discard_delayed_snap_event(SP_EVENT_CONTEXT(pc)); pc->red_curve->reset(); sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), NULL); @@ -547,6 +597,43 @@ pencil_handle_key_press(SPPencilContext *const pc, guint const keyval, guint con ret = true; } break; + case GDK_Alt_L: + case GDK_Alt_R: + case GDK_Meta_L: + case GDK_Meta_R: + if (pc->state == SP_PENCIL_CONTEXT_IDLE) { + pc->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Sketch mode: holding Alt interpolates between sketched paths. Release Alt to finalize.")); + } + break; + default: + break; + } + return ret; +} + +static gint +pencil_handle_key_release(SPPencilContext *const pc, guint const keyval, guint const /*state*/) +{ + gint ret = FALSE; + switch (keyval) { + case GDK_Alt_L: + case GDK_Alt_R: + case GDK_Meta_L: + case GDK_Meta_R: + if (pc->state == SP_PENCIL_CONTEXT_SKETCH) { + spdc_concat_colors_and_flush(pc, FALSE); + pc->sketch_n = 0; + pc->sa = NULL; + pc->ea = NULL; + if (pc->green_anchor) { + pc->green_anchor = sp_draw_anchor_destroy(pc->green_anchor); + } + pc->state = SP_PENCIL_CONTEXT_IDLE; + sp_event_context_discard_delayed_snap_event(SP_EVENT_CONTEXT(pc)); + pc->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Finishing freehand sketch")); + ret = TRUE; + } + break; default: break; } @@ -652,12 +739,13 @@ square(double const x) static void interpolate(SPPencilContext *pc) { - - g_assert( pc->ps.size() > 1 ); + if ( pc->ps.size() <= 1 ) { + return; + } Inkscape::Preferences *prefs = Inkscape::Preferences::get(); double const tol = prefs->getDoubleLimited("/tools/freehand/pencil/tolerance", 10.0, 1.0, 100.0) * 0.4; - double const tolerance_sq = 0.02 * square( pc->desktop->w2d().descrim() * + double const tolerance_sq = 0.02 * square( pc->desktop->w2d().descrim() * tol) * exp(0.2*tol - 2); g_assert(is_zero(pc->req_tangent) @@ -667,36 +755,35 @@ interpolate(SPPencilContext *pc) guint n_points = pc->ps.size(); pc->green_curve->reset(); pc->red_curve->reset(); + pc->red_curve_is_valid = false; Geom::Point * b = g_new(Geom::Point, 4*n_points); Geom::Point * points = g_new(Geom::Point, 4*n_points); - for (int i = 0; i < pc->ps.size(); i++) { + for (unsigned int i = 0; i < pc->ps.size(); i++) { points[i] = pc->ps[i]; } // worst case gives us a segment per point int max_segs = 4*n_points; - int const n_segs = sp_bezier_fit_cubic_r(b, points, n_points, + int const n_segs = Geom::bezier_fit_cubic_r(b, points, n_points, tolerance_sq, max_segs); if ( n_segs > 0) { /* Fit and draw and reset state */ - pc->red_curve->reset(); - pc->red_curve->moveto(b[0]); - for (int c = 0; c < n_segs; c++) { - pc->red_curve->curveto(b[4*c+1], b[4*c+2], b[4*c+3]); + pc->green_curve->moveto(b[0]); + for (int c = 0; c < n_segs; c++) { + pc->green_curve->curveto(b[4*c+1], b[4*c+2], b[4*c+3]); } - sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), pc->red_curve); - pc->red_curve_is_valid = true; + sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), pc->green_curve); /* Fit and draw and copy last point */ - g_assert(!pc->red_curve->is_empty()); + g_assert(!pc->green_curve->is_empty()); /* Set up direction of next curve. */ { - Geom::CubicBezier const * last_seg = dynamic_cast(pc->red_curve->last_segment()); + Geom::CubicBezier const * last_seg = dynamic_cast(pc->green_curve->last_segment()); g_assert( last_seg ); // Relevance: validity of (*last_seg)[2] pc->p[0] = last_seg->finalPoint(); pc->npoints = 1; @@ -705,25 +792,104 @@ interpolate(SPPencilContext *pc) ? Geom::Point(0, 0) : Geom::unit_vector(req_vec) ); } + } + g_free(b); + g_free(points); + pc->ps.clear(); +} - pc->green_curve->append_continuous(pc->red_curve, 0.0625); - SPCurve *curve = pc->red_curve->copy(); - /// \todo fixme: - SPCanvasItem *cshape = sp_canvas_bpath_new(sp_desktop_sketch(pc->desktop), curve); - curve->unref(); - sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(cshape), pc->green_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); +/* interpolates the sketched curve and tweaks the current sketch interpolation*/ +static void +sketch_interpolate(SPPencilContext *pc) +{ + if ( pc->ps.size() <= 1 ) { + return; + } - pc->green_bpaths = g_slist_prepend(pc->green_bpaths, cshape); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + double const tol = prefs->getDoubleLimited("/tools/freehand/pencil/tolerance", 10.0, 1.0, 100.0) * 0.4; + double const tolerance_sq = 0.02 * square( pc->desktop->w2d().descrim() * + tol) * exp(0.2*tol - 2); - pc->red_curve_is_valid = false; + bool average_all_sketches = prefs->getBool("/tools/freehand/pencil/average_all_sketches", true); + + g_assert(is_zero(pc->req_tangent) + || is_unit_vector(pc->req_tangent)); + Geom::Point const tHatEnd(0, 0); + + guint n_points = pc->ps.size(); + pc->red_curve->reset(); + pc->red_curve_is_valid = false; + + Geom::Point * b = g_new(Geom::Point, 4*n_points); + Geom::Point * points = g_new(Geom::Point, 4*n_points); + for (unsigned i = 0; i < pc->ps.size(); i++) { + points[i] = pc->ps[i]; + } + + // worst case gives us a segment per point + int max_segs = 4*n_points; + + int const n_segs = Geom::bezier_fit_cubic_r(b, points, n_points, + tolerance_sq, max_segs); + + if ( n_segs > 0) + { + Geom::Path fit(b[0]); + for (int c = 0; c < n_segs; c++) { + fit.appendNew(b[4*c+1], b[4*c+2], b[4*c+3]); + } + Geom::Piecewise > fit_pwd2 = fit.toPwSb(); + + double t =0.; + if ( pc->sketch_n > 0 ) { + if (average_all_sketches) { + // Average = (sum of all) / n + // = (sum of all + new one) / n+1 + // = ((old average)*n + new one) / n+1 + t = pc->sketch_n / (pc->sketch_n + 1.); + } else { + t = 0.5; + } + pc->sketch_interpolation = Geom::lerp(t, fit_pwd2, pc->sketch_interpolation); + // simplify path, to eliminate small segments + Path *path = new Path; + path->LoadPathVector(Geom::path_from_piecewise(pc->sketch_interpolation, 0.01)); + path->Simplify(0.5); + Geom::PathVector *pathv = path->MakePathVector(); + pc->sketch_interpolation = (*pathv)[0].toPwSb(); + delete path; + delete pathv; + } else { + pc->sketch_interpolation = fit_pwd2; + } + pc->sketch_n++; + + pc->green_curve->reset(); + pc->green_curve->set_pathvector(Geom::path_from_piecewise(pc->sketch_interpolation, 0.01)); + sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), pc->green_curve); + + /* Fit and draw and copy last point */ + g_assert(!pc->green_curve->is_empty()); + + /* Set up direction of next curve. */ + { + Geom::CubicBezier const * last_seg = dynamic_cast(pc->green_curve->last_segment()); + g_assert( last_seg ); // Relevance: validity of (*last_seg)[2] + pc->p[0] = last_seg->finalPoint(); + pc->npoints = 1; + Geom::Point const req_vec( pc->p[0] - (*last_seg)[2] ); + pc->req_tangent = ( ( Geom::is_zero(req_vec) || !in_svg_plane(req_vec) ) + ? Geom::Point(0, 0) + : Geom::unit_vector(req_vec) ); + } } g_free(b); g_free(points); pc->ps.clear(); } - static void fit_and_split(SPPencilContext *pc) { @@ -735,8 +901,8 @@ fit_and_split(SPPencilContext *pc) g_assert(is_zero(pc->req_tangent) || is_unit_vector(pc->req_tangent)); Geom::Point const tHatEnd(0, 0); - int const n_segs = sp_bezier_fit_cubic_full(b, NULL, pc->p, pc->npoints, - pc->req_tangent, tHatEnd, + int const n_segs = Geom::bezier_fit_cubic_full(b, NULL, pc->p, pc->npoints, + pc->req_tangent, tHatEnd, tolerance_sq, 1); if ( n_segs > 0 && unsigned(pc->npoints) < G_N_ELEMENTS(pc->p) ) @@ -788,4 +954,4 @@ fit_and_split(SPPencilContext *pc) 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 :