X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdyna-draw-context.cpp;h=7d0c7ee91ff178c849007f6a34c43c83a5b9e2dc;hb=0dc33d4ce43e0bb49c63aa53b826ec4a1ff68e28;hp=3b5e94d2846245ec1182b3b2dbc44b42c0e4c306;hpb=ce15d9fa523c759beb14666a721e51ba8d39ebe5;p=inkscape.git diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp index 3b5e94d28..7d0c7ee91 100644 --- a/src/dyna-draw-context.cpp +++ b/src/dyna-draw-context.cpp @@ -1,5 +1,3 @@ -#define __SP_DYNA_DRAW_CONTEXT_C__ - /* * Handwriting-like drawing mode * @@ -8,6 +6,7 @@ * Lauris Kaplinski * bulia byak * MenTaLguY + * Abhishek Sharma * * The original dynadraw code: * Paul Haeberli @@ -28,13 +27,16 @@ #include #include #include - +#include +#include #include #include "svg/svg.h" #include "display/canvas-bpath.h" -#include "display/bezier-utils.h" - +#include <2geom/isnan.h> +#include <2geom/pathvector.h> +#include <2geom/bezier-utils.h> +#include "display/curve.h" #include #include "macros.h" #include "document.h" @@ -42,32 +44,29 @@ #include "desktop.h" #include "desktop-events.h" #include "desktop-handles.h" -#include "desktop-affine.h" #include "desktop-style.h" #include "message-context.h" +#include "preferences.h" #include "pixmaps/cursor-calligraphy.xpm" -#include "pixmaps/cursor-thin.xpm" -#include "pixmaps/cursor-thicken.xpm" -#include "libnr/n-art-bpath.h" -#include "libnr/nr-path.h" -#include "libnr/nr-matrix-ops.h" -#include "libnr/nr-scale-translate-ops.h" #include "xml/repr.h" #include "context-fns.h" #include "sp-item.h" #include "inkscape.h" #include "color.h" #include "splivarot.h" +#include "sp-item-group.h" #include "sp-shape.h" #include "sp-path.h" #include "sp-text.h" +#include "display/sp-canvas.h" #include "display/canvas-bpath.h" #include "display/canvas-arena.h" #include "livarot/Shape.h" -#include "isnan.h" #include "dyna-draw-context.h" +using Inkscape::DocumentUndo; + #define DDC_RED_RGBA 0xff0000ff #define TOLERANCE_CALLIGRAPHIC 0.1 @@ -78,62 +77,46 @@ #define DYNA_MIN_WIDTH 1.0e-6 -#define DRAG_MIN 0.0 -#define DRAG_DEFAULT 1.0 -#define DRAG_MAX 1.0 - -// FIXME: move it to some shared file to be reused by both calligraphy and dropper -#define C1 0.552 -static NArtBpath const hatch_area_circle[] = { - { NR_MOVETO, 0, 0, 0, 0, -1, 0 }, - { NR_CURVETO, -1, C1, -C1, 1, 0, 1 }, - { NR_CURVETO, C1, 1, 1, C1, 1, 0 }, - { NR_CURVETO, 1, -C1, C1, -1, 0, -1 }, - { NR_CURVETO, -C1, -1, -1, -C1, -1, 0 }, - { NR_END, 0, 0, 0, 0, 0, 0 } -}; -#undef C1 - - static void sp_dyna_draw_context_class_init(SPDynaDrawContextClass *klass); static void sp_dyna_draw_context_init(SPDynaDrawContext *ddc); static void sp_dyna_draw_context_dispose(GObject *object); static void sp_dyna_draw_context_setup(SPEventContext *ec); -static void sp_dyna_draw_context_set(SPEventContext *ec, gchar const *key, gchar const *val); +static void sp_dyna_draw_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *value); static gint sp_dyna_draw_context_root_handler(SPEventContext *ec, GdkEvent *event); static void clear_current(SPDynaDrawContext *dc); -static void set_to_accumulated(SPDynaDrawContext *dc, bool unionize); -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 accumulate_calligraphic(SPDynaDrawContext *dc); +static void set_to_accumulated(SPDynaDrawContext *dc, bool unionize, bool subtract); +static void add_cap(SPCurve *curve, Geom::Point const &from, Geom::Point const &to, double rounding); +static bool accumulate_calligraphic(SPDynaDrawContext *dc); static void fit_and_split(SPDynaDrawContext *ddc, gboolean release); -static void sp_dyna_draw_reset(SPDynaDrawContext *ddc, NR::Point p); -static NR::Point sp_dyna_draw_get_npoint(SPDynaDrawContext const *ddc, NR::Point v); -static NR::Point sp_dyna_draw_get_vpoint(SPDynaDrawContext const *ddc, NR::Point n); +static void sp_dyna_draw_reset(SPDynaDrawContext *ddc, Geom::Point p); +static Geom::Point sp_dyna_draw_get_npoint(SPDynaDrawContext const *ddc, Geom::Point v); +static Geom::Point sp_dyna_draw_get_vpoint(SPDynaDrawContext const *ddc, Geom::Point n); static void draw_temporary_box(SPDynaDrawContext *dc); -static SPEventContextClass *parent_class; +static SPEventContextClass *dd_parent_class = 0; -GtkType -sp_dyna_draw_context_get_type(void) +GType sp_dyna_draw_context_get_type(void) { static GType type = 0; if (!type) { GTypeInfo info = { sizeof(SPDynaDrawContextClass), - NULL, NULL, - (GClassInitFunc) sp_dyna_draw_context_class_init, - NULL, NULL, + 0, // base_init + 0, // base_finalize + (GClassInitFunc)sp_dyna_draw_context_class_init, + 0, // class_finalize + 0, // class_data sizeof(SPDynaDrawContext), - 4, - (GInstanceInitFunc) sp_dyna_draw_context_init, - NULL, /* value_table */ + 0, // n_preallocs + (GInstanceInitFunc)sp_dyna_draw_context_init, + 0 // value_table }; - type = g_type_register_static(SP_TYPE_EVENT_CONTEXT, "SPDynaDrawContext", &info, (GTypeFlags)0); + type = g_type_register_static(SP_TYPE_COMMON_CONTEXT, "SPDynaDrawContext", &info, static_cast(0)); } return type; } @@ -144,7 +127,7 @@ sp_dyna_draw_context_class_init(SPDynaDrawContextClass *klass) GObjectClass *object_class = (GObjectClass *) klass; SPEventContextClass *event_context_class = (SPEventContextClass *) klass; - parent_class = (SPEventContextClass*)g_type_class_peek_parent(klass); + dd_parent_class = (SPEventContextClass*)g_type_class_peek_parent(klass); object_class->dispose = sp_dyna_draw_context_dispose; @@ -156,38 +139,9 @@ sp_dyna_draw_context_class_init(SPDynaDrawContextClass *klass) static void sp_dyna_draw_context_init(SPDynaDrawContext *ddc) { - SPEventContext *event_context = SP_EVENT_CONTEXT(ddc); - - event_context->cursor_shape = cursor_calligraphy_xpm; - event_context->hot_x = 4; - event_context->hot_y = 4; - - ddc->accumulated = NULL; - ddc->segments = NULL; - ddc->currentcurve = NULL; - ddc->currentshape = NULL; - ddc->npoints = 0; - ddc->cal1 = NULL; - ddc->cal2 = NULL; - ddc->repr = NULL; - - /* DynaDraw values */ - ddc->cur = NR::Point(0,0); - ddc->last = NR::Point(0,0); - ddc->vel = NR::Point(0,0); - ddc->vel_max = 0; - ddc->acc = NR::Point(0,0); - ddc->ang = NR::Point(0,0); - ddc->del = NR::Point(0,0); - - /* attributes */ - ddc->dragging = FALSE; - - ddc->mass = 0.3; - ddc->drag = DRAG_DEFAULT; - ddc->angle = 30.0; - ddc->width = 0.2; - ddc->pressure = DDC_DEFAULT_PRESSURE; + ddc->cursor_shape = cursor_calligraphy_xpm; + ddc->hot_x = 4; + ddc->hot_y = 4; ddc->vel_thin = 0.1; ddc->flatness = 0.9; @@ -197,19 +151,20 @@ sp_dyna_draw_context_init(SPDynaDrawContext *ddc) ddc->keep_selected = true; ddc->hatch_spacing = 0; + ddc->hatch_spacing_step = 0; new (&ddc->hatch_pointer_past) std::list(); new (&ddc->hatch_nearest_past) std::list(); - ddc->hatch_last_nearest = NR::Point(0,0); - ddc->hatch_last_pointer = NR::Point(0,0); - ddc->hatch_vector_accumulated = NR::Point(0,0); + new (&ddc->inertia_vectors) std::list(); + new (&ddc->hatch_vectors) std::list(); + ddc->hatch_last_nearest = Geom::Point(0,0); + ddc->hatch_last_pointer = Geom::Point(0,0); ddc->hatch_escaped = false; ddc->hatch_area = NULL; ddc->hatch_item = NULL; ddc->hatch_livarot_path = NULL; ddc->trace_bg = false; - - ddc->is_dilating = false; + ddc->just_started_drawing = false; } static void @@ -222,37 +177,13 @@ sp_dyna_draw_context_dispose(GObject *object) ddc->hatch_area = NULL; } - if (ddc->dilate_area) { - gtk_object_destroy(GTK_OBJECT(ddc->dilate_area)); - ddc->dilate_area = NULL; - } - - if (ddc->accumulated) { - ddc->accumulated = sp_curve_unref(ddc->accumulated); - } - - while (ddc->segments) { - gtk_object_destroy(GTK_OBJECT(ddc->segments->data)); - ddc->segments = g_slist_remove(ddc->segments, ddc->segments->data); - } - - if (ddc->currentcurve) ddc->currentcurve = sp_curve_unref(ddc->currentcurve); - if (ddc->cal1) ddc->cal1 = sp_curve_unref(ddc->cal1); - if (ddc->cal2) ddc->cal2 = sp_curve_unref(ddc->cal2); - - if (ddc->currentshape) { - gtk_object_destroy(GTK_OBJECT(ddc->currentshape)); - ddc->currentshape = NULL; - } - - if (ddc->_message_context) { - delete ddc->_message_context; - } - G_OBJECT_CLASS(parent_class)->dispose(object); + G_OBJECT_CLASS(dd_parent_class)->dispose(object); ddc->hatch_pointer_past.~list(); ddc->hatch_nearest_past.~list(); + ddc->inertia_vectors.~list(); + ddc->hatch_vectors.~list(); } static void @@ -260,14 +191,14 @@ sp_dyna_draw_context_setup(SPEventContext *ec) { SPDynaDrawContext *ddc = SP_DYNA_DRAW_CONTEXT(ec); - if (((SPEventContextClass *) parent_class)->setup) - ((SPEventContextClass *) parent_class)->setup(ec); + if (((SPEventContextClass *) dd_parent_class)->setup) + ((SPEventContextClass *) dd_parent_class)->setup(ec); - ddc->accumulated = sp_curve_new_sized(32); - ddc->currentcurve = sp_curve_new_sized(4); + ddc->accumulated = new SPCurve(); + ddc->currentcurve = new SPCurve(); - ddc->cal1 = sp_curve_new_sized(32); - ddc->cal2 = sp_curve_new_sized(32); + ddc->cal1 = new SPCurve(); + ddc->cal2 = new SPCurve(); ddc->currentshape = sp_canvas_item_new(sp_desktop_sketch(ec->desktop), SP_TYPE_CANVAS_BPATH, NULL); sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(ddc->currentshape), DDC_RED_RGBA, SP_WIND_RULE_EVENODD); @@ -276,23 +207,22 @@ sp_dyna_draw_context_setup(SPEventContext *ec) g_signal_connect(G_OBJECT(ddc->currentshape), "event", G_CALLBACK(sp_desktop_root_handler), ec->desktop); { - SPCurve *c = sp_curve_new_from_foreign_bpath(hatch_area_circle); + /* TODO: this can be done either with an arcto, and should maybe also be put in a general file (other tools use this as well) */ + SPCurve *c = new SPCurve(); + const double C1 = 0.552; + c->moveto(-1,0); + c->curveto(-1, C1, -C1, 1, 0, 1 ); + c->curveto(C1, 1, 1, C1, 1, 0 ); + c->curveto(1, -C1, C1, -1, 0, -1 ); + c->curveto(-C1, -1, -1, -C1, -1, 0 ); + c->closepath(); ddc->hatch_area = sp_canvas_bpath_new(sp_desktop_controls(ec->desktop), c); - sp_curve_unref(c); + c->unref(); sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(ddc->hatch_area), 0x00000000,(SPWindRule)0); sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(ddc->hatch_area), 0x0000007f, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); sp_canvas_item_hide(ddc->hatch_area); } - { - SPCurve *c = sp_curve_new_from_foreign_bpath(hatch_area_circle); - ddc->dilate_area = sp_canvas_bpath_new(sp_desktop_controls(ec->desktop), c); - sp_curve_unref(c); - sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(ddc->dilate_area), 0x00000000,(SPWindRule)0); - sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(ddc->dilate_area), 0xff9900ff, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); - sp_canvas_item_hide(ddc->dilate_area); - } - sp_event_context_read(ec, "mass"); sp_event_context_read(ec, "wiggle"); sp_event_context_read(ec, "angle"); @@ -308,48 +238,29 @@ sp_dyna_draw_context_setup(SPEventContext *ec) sp_event_context_read(ec, "cap_rounding"); ddc->is_drawing = false; - ddc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack()); + + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + if (prefs->getBool("/tools/calligraphic/selcue")) { + ec->enableSelectionCue(); + } } static void -sp_dyna_draw_context_set(SPEventContext *ec, gchar const *key, gchar const *val) +sp_dyna_draw_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val) { SPDynaDrawContext *ddc = SP_DYNA_DRAW_CONTEXT(ec); + Glib::ustring path = val->getEntryName(); - if (!strcmp(key, "mass")) { - double const dval = ( val ? g_ascii_strtod (val, NULL) : 0.2 ); - ddc->mass = CLAMP(dval, -1000.0, 1000.0); - } else if (!strcmp(key, "wiggle")) { - double const dval = ( val ? g_ascii_strtod (val, NULL) : (1 - DRAG_DEFAULT)); - ddc->drag = CLAMP((1 - dval), DRAG_MIN, DRAG_MAX); // drag is inverse to wiggle - } else if (!strcmp(key, "angle")) { - double const dval = ( val ? g_ascii_strtod (val, NULL) : 0.0); - ddc->angle = CLAMP (dval, -90, 90); - } else if (!strcmp(key, "width")) { - double const dval = ( val ? g_ascii_strtod (val, NULL) : 0.1 ); - ddc->width = CLAMP(dval, -1000.0, 1000.0); - } else if (!strcmp(key, "thinning")) { - double const dval = ( val ? g_ascii_strtod (val, NULL) : 0.1 ); - ddc->vel_thin = CLAMP(dval, -1.0, 1.0); - } else if (!strcmp(key, "tremor")) { - double const dval = ( val ? g_ascii_strtod (val, NULL) : 0.0 ); - ddc->tremor = CLAMP(dval, 0.0, 1.0); - } else if (!strcmp(key, "flatness")) { - double const dval = ( val ? g_ascii_strtod (val, NULL) : 1.0 ); - ddc->flatness = CLAMP(dval, 0, 1.0); - } else if (!strcmp(key, "tracebackground")) { - ddc->trace_bg = (val && strcmp(val, "0")); - } else if (!strcmp(key, "usepressure")) { - ddc->usepressure = (val && strcmp(val, "0")); - } else if (!strcmp(key, "usetilt")) { - ddc->usetilt = (val && strcmp(val, "0")); - } else if (!strcmp(key, "abs_width")) { - ddc->abs_width = (val && strcmp(val, "0")); - } else if (!strcmp(key, "keep_selected")) { - ddc->keep_selected = (val && strcmp(val, "0")); - } else if (!strcmp(key, "cap_rounding")) { - ddc->cap_rounding = ( val ? g_ascii_strtod (val, NULL) : 0.0 ); + if (path == "tracebackground") { + ddc->trace_bg = val->getBool(); + } else if (path == "keep_selected") { + ddc->keep_selected = val->getBool(); + } else { + //pass on up to parent class to handle common attributes. + if ( dd_parent_class->set ) { + dd_parent_class->set(ec, val); + } } //g_print("DDC: %g %g %g %g\n", ddc->mass, ddc->drag, ddc->angle, ddc->width); @@ -362,32 +273,32 @@ flerp(double f0, double f1, double p) } /* Get normalized point */ -static NR::Point -sp_dyna_draw_get_npoint(SPDynaDrawContext const *dc, NR::Point v) +static Geom::Point +sp_dyna_draw_get_npoint(SPDynaDrawContext 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_dyna_draw_get_vpoint(SPDynaDrawContext const *dc, NR::Point n) +static Geom::Point +sp_dyna_draw_get_vpoint(SPDynaDrawContext 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_dyna_draw_reset(SPDynaDrawContext *dc, NR::Point p) +sp_dyna_draw_reset(SPDynaDrawContext *dc, Geom::Point p) { dc->last = dc->cur = sp_dyna_draw_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 @@ -411,25 +322,25 @@ sp_dyna_draw_extinput(SPDynaDrawContext *dc, GdkEvent *event) static gboolean -sp_dyna_draw_apply(SPDynaDrawContext *dc, NR::Point p) +sp_dyna_draw_apply(SPDynaDrawContext *dc, Geom::Point p) { - NR::Point n = sp_dyna_draw_get_npoint(dc, p); + Geom::Point n = sp_dyna_draw_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 DYNA_EPSILON, // or we haven't yet reached DYNA_VEL_START (i.e. at the beginning of stroke) // _and_ the force is below the (higher) DYNA_EPSILON_START threshold, - // discard this move. + // discard this move. // 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) < DYNA_EPSILON || (dc->vel_max < DYNA_VEL_START && NR::L2(force) < DYNA_EPSILON_START)) { + if ( Geom::L2(force) < DYNA_EPSILON || (dc->vel_max < DYNA_VEL_START && Geom::L2(force) < DYNA_EPSILON_START)) { return FALSE; } @@ -438,8 +349,8 @@ sp_dyna_draw_apply(SPDynaDrawContext *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 */ @@ -449,7 +360,7 @@ sp_dyna_draw_apply(SPDynaDrawContext *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 @@ -458,16 +369,16 @@ sp_dyna_draw_apply(SPDynaDrawContext *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 < DYNA_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 @@ -489,15 +400,15 @@ sp_dyna_draw_apply(SPDynaDrawContext *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; @@ -522,15 +433,15 @@ sp_dyna_draw_brush(SPDynaDrawContext *dc) // get the real brush point, not the same as pointer (affected by hatch tracking and/or mass // drag) - NR::Point brush = sp_dyna_draw_get_vpoint(dc, dc->cur); - NR::Point brush_w = SP_EVENT_CONTEXT(dc)->desktop->d2w(brush); + Geom::Point brush = sp_dyna_draw_get_vpoint(dc, dc->cur); + Geom::Point brush_w = SP_EVENT_CONTEXT(dc)->desktop->d2w(brush); double trace_thick = 1; if (dc->trace_bg) { // pick single pixel NRPixBlock pb; - int x = (int) floor(brush_w[NR::X]); - int y = (int) floor(brush_w[NR::Y]); + int x = (int) floor(brush_w[Geom::X]); + int y = (int) floor(brush_w[Geom::Y]); nr_pixblock_setup_fast(&pb, NR_PIXBLOCK_MODE_R8G8B8A8P, x, y, x+1, y+1, TRUE); sp_canvas_arena_render_pixblock(SP_CANVAS_ARENA(sp_desktop_drawing(SP_EVENT_CONTEXT(dc)->desktop)), &pb); const unsigned char *s = NR_PIXBLOCK_PX(&pb); @@ -545,7 +456,7 @@ sp_dyna_draw_brush(SPDynaDrawContext *dc) //g_print ("L %g thick %g\n", L, trace_thick); } - 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) { @@ -565,8 +476,8 @@ sp_dyna_draw_brush(SPDynaDrawContext *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 ) { @@ -578,8 +489,8 @@ sp_dyna_draw_brush(SPDynaDrawContext *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; @@ -589,152 +500,6 @@ sp_dyna_draw_brush(SPDynaDrawContext *dc) dc->npoints++; } -double -get_dilate_radius (SPDynaDrawContext *dc) -{ - // 10 times the pen width: - return 500 * dc->width/SP_EVENT_CONTEXT(dc)->desktop->current_zoom(); -} - -double -get_dilate_force (SPDynaDrawContext *dc) -{ - double force = 4 * dc->pressure/SP_EVENT_CONTEXT(dc)->desktop->current_zoom(); - if (force > 3) { - force += 8 * (force - 3); - } - return force; -} - -bool -sp_ddc_dilate (SPDynaDrawContext *dc, NR::Point p, bool expand) -{ - Inkscape::Selection *selection = sp_desktop_selection(SP_EVENT_CONTEXT(dc)->desktop); - - if (selection->isEmpty()) { - return false; - } - - bool did = false; - double radius = get_dilate_radius(dc); - double offset = get_dilate_force(dc); - if (radius == 0 || offset == 0) { - return false; - } - - for (GSList *items = g_slist_copy((GSList *) selection->itemList()); - items != NULL; - items = items->next) { - - SPItem *item = (SPItem *) items->data; - - // only paths - if (!SP_IS_PATH(item)) - continue; - - SPCurve *curve = NULL; - curve = sp_shape_get_curve(SP_SHAPE(item)); - if (curve == NULL) - continue; - - // skip those paths whose bboxes are entirely out of reach with our radius - NR::Maybe bbox = item->getBounds(sp_item_i2doc_affine(item)); - if (bbox) { - bbox->growBy(radius); - if (!bbox->contains(p)) { - continue; - } - } - - Path *orig = Path_for_item(item, false); - if (orig == NULL) { - sp_curve_unref(curve); - continue; - } - Path *res = new Path; - res->SetBackData(false); - - Shape *theShape = new Shape; - Shape *theRes = new Shape; - - orig->ConvertWithBackData(0.05); - orig->Fill(theShape, 0); - - SPCSSAttr *css = sp_repr_css_attr(SP_OBJECT_REPR(item), "style"); - gchar const *val = sp_repr_css_property(css, "fill-rule", NULL); - if (val && strcmp(val, "nonzero") == 0) - { - theRes->ConvertToShape(theShape, fill_nonZero); - } - else if (val && strcmp(val, "evenodd") == 0) - { - theRes->ConvertToShape(theShape, fill_oddEven); - } - else - { - theRes->ConvertToShape(theShape, fill_nonZero); - } - - bool did_this = false; - NR::Matrix i2doc(sp_item_i2doc_affine(item)); - if (theShape->MakeOffset(theRes, - expand? offset : -offset, - join_straight, butt_straight, - true, p[NR::X], p[NR::Y], radius, &i2doc) == 0) // 0 means the shape was actually changed - did_this = true; - - // the rest only makes sense if we actually changed the path - if (did_this) { - theRes->ConvertToShape(theShape, fill_positive); - - res->Reset(); - theRes->ConvertToForme(res); - - if (offset >= 0.5) - { - res->ConvertEvenLines(0.5); - res->Simplify(0.5); - } - else - { - res->ConvertEvenLines(0.5*offset); - res->Simplify(0.5 * offset); - } - - sp_curve_unref(curve); - if (res->descr_cmd.size() > 1) { - gchar *str = res->svg_dump_path(); - SP_OBJECT_REPR(item)->setAttribute("d", str); - g_free(str); - } else { - // TODO: if there's 0 or 1 node left, delete this path altogether - } - } - - delete theShape; - delete theRes; - delete orig; - delete res; - - if (did_this) - did = true; - } - - return did; -} - -void -sp_ddc_update_cursors (SPDynaDrawContext *dc) -{ - if (dc->is_dilating) { - double radius = get_dilate_radius(dc); - NR::Matrix const sm (NR::scale(radius, radius) * NR::translate(SP_EVENT_CONTEXT(dc)->desktop->point())); - sp_canvas_item_affine_absolute(dc->dilate_area, sm); - sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(dc->hatch_area), 0xff9900ff, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); - sp_canvas_item_show(dc->dilate_area); - } -} - void sp_ddc_update_toolbox (SPDesktop *desktop, const gchar *id, double value) { @@ -754,7 +519,7 @@ calligraphic_cancel(SPDynaDrawContext *dc) dc->segments = g_slist_remove(dc->segments, dc->segments->data); } /* reset accumulated curve */ - sp_curve_reset(dc->accumulated); + dc->accumulated->reset(); clear_current(dc); if (dc->repr) { dc->repr = NULL; @@ -773,7 +538,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, switch (event->type) { case GDK_BUTTON_PRESS: - if ( event->button.button == 1 ) { + if (event->button.button == 1 && !event_context->space_panning) { SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(dc); @@ -781,13 +546,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, return TRUE; } - NR::Point const button_w(event->button.x, - event->button.y); - NR::Point const button_dt(desktop->w2d(button_w)); - sp_dyna_draw_reset(dc, button_dt); - sp_dyna_draw_extinput(dc, event); - sp_dyna_draw_apply(dc, button_dt); - sp_curve_reset(dc->accumulated); + dc->accumulated->reset(); if (dc->repr) { dc->repr = NULL; } @@ -805,58 +564,26 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, ret = TRUE; + sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 3); dc->is_drawing = true; + dc->just_started_drawing = true; } 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_dyna_draw_extinput(dc, event); - // draw the dilating cursor - if (event->motion.state & GDK_MOD1_MASK) { - double radius = get_dilate_radius(dc); - NR::Matrix const sm (NR::scale(radius, radius) * NR::translate(desktop->w2d(motion_w))); - sp_canvas_item_affine_absolute(dc->dilate_area, sm); - sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(dc->hatch_area), 0xff9900ff, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); - sp_canvas_item_show(dc->dilate_area); - - guint num = 0; - if (!desktop->selection->isEmpty()) { - num = g_slist_length((GSList *) desktop->selection->itemList()); - } - if (num == 0) { - dc->_message_context->set(Inkscape::NORMAL_MESSAGE, _("Select paths to thin or thicken")); - } else { - dc->_message_context->setF(Inkscape::NORMAL_MESSAGE, - event->motion.state & GDK_SHIFT_MASK? - _("Thickening %d selected paths; without Shift to thin") : - _("Thinning %d selected paths; with Shift to thicken"), num); - } - - } else { - dc->_message_context->clear(); - sp_canvas_item_hide(dc->dilate_area); - } - - // dilating: - if (dc->is_drawing && ( event->motion.state & GDK_BUTTON1_MASK ) && event->motion.state & GDK_MOD1_MASK) { - sp_ddc_dilate (dc, desktop->dt2doc(motion_dt), event->motion.state & GDK_SHIFT_MASK? true : false); - dc->is_dilating = true; - // it's slow, so prevent clogging up with events - gobble_motion_events(GDK_BUTTON1_MASK); - return TRUE; - } - + dc->_message_context->clear(); // for hatching: double hatch_dist = 0; - NR::Point hatch_unit_vector(0,0); - NR::Point nearest(0,0); - NR::Point pointer(0,0); - NR::Matrix motion_to_curve(NR::identity()); + Geom::Point hatch_unit_vector(0,0); + Geom::Point nearest(0,0); + Geom::Point pointer(0,0); + Geom::Matrix motion_to_curve(Geom::identity()); if (event->motion.state & GDK_CONTROL_MASK) { // hatching - sense the item @@ -874,16 +601,16 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, } // calculate pointer point in the guide item's coords - motion_to_curve = sp_item_dt2i_affine(selected) * sp_item_i2doc_affine(selected); + motion_to_curve = selected->dt2i_affine() * selected->i2doc_affine(); pointer = motion_dt * motion_to_curve; // calculate the nearest point on the guide path - NR::Maybe position = get_nearest_position_on_Path(dc->hatch_livarot_path, pointer); + boost::optional position = get_nearest_position_on_Path(dc->hatch_livarot_path, pointer); nearest = get_point_on_Path(dc->hatch_livarot_path, position->piece, position->t); // distance from pointer to nearest - hatch_dist = NR::L2(pointer - nearest); + hatch_dist = Geom::L2(pointer - nearest); // unit-length vector hatch_unit_vector = (pointer - nearest)/hatch_dist; @@ -891,16 +618,19 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, } else { dc->_message_context->set(Inkscape::NORMAL_MESSAGE, _("Select a guide path to track with Ctrl")); } - } + } - if ( dc->is_drawing && ( event->motion.state & GDK_BUTTON1_MASK ) ) { + if ( dc->is_drawing && (event->motion.state & GDK_BUTTON1_MASK) && !event_context->space_panning) { dc->dragging = TRUE; if (event->motion.state & GDK_CONTROL_MASK && dc->hatch_item) { // hatching +#define HATCH_VECTOR_ELEMENTS 12 +#define INERTIA_ELEMENTS 24 #define SPEED_ELEMENTS 12 -#define SPEED_MIN 0.12 -#define SPEED_NORMAL 0.65 +#define SPEED_MIN 0.3 +#define SPEED_NORMAL 0.35 +#define INERTIA_FORCE 0.5 // speed is the movement of the nearest point along the guide path, divided by // the movement of the pointer at the same period; it is averaged for the last @@ -915,11 +645,11 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, // mass recommended; with zero mass, jerks are still quite noticeable). double speed = 1; - if (NR::L2(dc->hatch_last_nearest) != 0) { + if (Geom::L2(dc->hatch_last_nearest) != 0) { // the distance nearest moved since the last motion event - double nearest_moved = NR::L2(nearest - dc->hatch_last_nearest); + double nearest_moved = Geom::L2(nearest - dc->hatch_last_nearest); // the distance pointer moved since the last motion event - double pointer_moved = NR::L2(pointer - dc->hatch_last_pointer); + double pointer_moved = Geom::L2(pointer - dc->hatch_last_pointer); // store them in stacks limited to SPEED_ELEMENTS dc->hatch_nearest_past.push_front(nearest_moved); if (dc->hatch_nearest_past.size() > SPEED_ELEMENTS) @@ -945,19 +675,37 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, ) { // We are NOT attracted to the guide! - //g_print ("\nlast_nearest %g %g nearest %g %g pointer %g %g pos %d %g\n", dc->last_nearest[NR::X], dc->last_nearest[NR::Y], nearest[NR::X], nearest[NR::Y], pointer[NR::X], pointer[NR::Y], position->piece, position->t); + //g_print ("\nlast_nearest %g %g nearest %g %g pointer %g %g pos %d %g\n", dc->last_nearest[Geom::X], dc->last_nearest[Geom::Y], nearest[Geom::X], nearest[Geom::Y], pointer[Geom::X], pointer[Geom::Y], position->piece, position->t); // Remember hatch_escaped so we don't get // attracted again until the end of this stroke dc->hatch_escaped = true; + if (dc->inertia_vectors.size() >= INERTIA_ELEMENTS/2) { // move by inertia + Geom::Point moved_past_escape = motion_dt - dc->inertia_vectors.front(); + Geom::Point inertia = + dc->inertia_vectors.front() - dc->inertia_vectors.back(); + + double dot = Geom::dot (moved_past_escape, inertia); + dot /= Geom::L2(moved_past_escape) * Geom::L2(inertia); + + if (dot > 0) { // mouse is still moving in approx the same direction + Geom::Point should_have_moved = + (inertia) * (1/Geom::L2(inertia)) * Geom::L2(moved_past_escape); + motion_dt = dc->inertia_vectors.front() + + (INERTIA_FORCE * should_have_moved + (1 - INERTIA_FORCE) * moved_past_escape); + } + } + } else { // Calculate angle cosine of this vector-to-guide and all past vectors // summed, to detect if we accidentally flipped to the other side of the // guide - double dot = NR::dot (pointer - nearest, dc->hatch_vector_accumulated); - dot /= NR::L2(pointer - nearest) * NR::L2(dc->hatch_vector_accumulated); + Geom::Point hatch_vector_accumulated = std::accumulate + (dc->hatch_vectors.begin(), dc->hatch_vectors.end(), Geom::Point(0,0)); + double dot = Geom::dot (pointer - nearest, hatch_vector_accumulated); + dot /= Geom::L2(pointer - nearest) * Geom::L2(hatch_vector_accumulated); if (dc->hatch_spacing != 0) { // spacing was already set double target; @@ -967,14 +715,14 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, } else { // looks like we're starting to lose speed, // so _gradually_ let go attraction to prevent jerks - target = (dc->hatch_spacing * speed + hatch_dist * (SPEED_NORMAL - speed))/SPEED_NORMAL; + target = (dc->hatch_spacing * speed + hatch_dist * (SPEED_NORMAL - speed))/SPEED_NORMAL; } - if (!isNaN(dot) && dot < -0.5) {// flip + if (!IS_NAN(dot) && dot < -0.5) {// flip target = -target; } // This is the track pointer that we will use instead of the real one - NR::Point new_pointer = nearest + target * hatch_unit_vector; + Geom::Point new_pointer = nearest + target * hatch_unit_vector; // some limited feedback: allow persistent pulling to slightly change // the spacing @@ -983,15 +731,24 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, // return it to the desktop coords motion_dt = new_pointer * motion_to_curve.inverse(); + if (speed >= SPEED_NORMAL) { + dc->inertia_vectors.push_front(motion_dt); + if (dc->inertia_vectors.size() > INERTIA_ELEMENTS) + dc->inertia_vectors.pop_back(); + } + } else { - // this is the first motion event, set the dist + // this is the first motion event, set the dist dc->hatch_spacing = hatch_dist; } // remember last points dc->hatch_last_pointer = pointer; dc->hatch_last_nearest = nearest; - dc->hatch_vector_accumulated += (pointer - nearest); + + dc->hatch_vectors.push_front(pointer - nearest); + if (dc->hatch_vectors.size() > HATCH_VECTOR_ELEMENTS) + dc->hatch_vectors.pop_back(); } dc->_message_context->set(Inkscape::NORMAL_MESSAGE, dc->hatch_escaped? _("Tracking: connection to guide path lost!") : _("Tracking a guide path")); @@ -1000,6 +757,11 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, dc->_message_context->set(Inkscape::NORMAL_MESSAGE, _("Drawing a calligraphic stroke")); } + if (dc->just_started_drawing) { + dc->just_started_drawing = false; + sp_dyna_draw_reset(dc, motion_dt); + } + if (!sp_dyna_draw_apply(dc, motion_dt)) { ret = TRUE; break; @@ -1014,34 +776,34 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, } // Draw the hatching circle if necessary - if (event->motion.state & GDK_CONTROL_MASK) { - if (dc->hatch_spacing == 0 && hatch_dist != 0) { + if (event->motion.state & GDK_CONTROL_MASK) { + if (dc->hatch_spacing == 0 && hatch_dist != 0) { // Haven't set spacing yet: gray, center free, update radius live - NR::Point c = desktop->w2d(motion_w); - NR::Matrix const sm (NR::scale(hatch_dist, hatch_dist) * NR::translate(c)); + Geom::Point c = desktop->w2d(motion_w); + Geom::Matrix const sm (Geom::Scale(hatch_dist, hatch_dist) * Geom::Translate(c)); sp_canvas_item_affine_absolute(dc->hatch_area, sm); sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(dc->hatch_area), 0x7f7f7fff, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); sp_canvas_item_show(dc->hatch_area); } else if (dc->dragging && !dc->hatch_escaped) { // Tracking: green, center snapped, fixed radius - NR::Point c = motion_dt; - NR::Matrix const sm (NR::scale(dc->hatch_spacing, dc->hatch_spacing) * NR::translate(c)); + Geom::Point c = motion_dt; + Geom::Matrix const sm (Geom::Scale(dc->hatch_spacing, dc->hatch_spacing) * Geom::Translate(c)); sp_canvas_item_affine_absolute(dc->hatch_area, sm); sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(dc->hatch_area), 0x00FF00ff, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); sp_canvas_item_show(dc->hatch_area); } else if (dc->dragging && dc->hatch_escaped) { // Tracking escaped: red, center free, fixed radius - NR::Point c = desktop->w2d(motion_w); - NR::Matrix const sm (NR::scale(dc->hatch_spacing, dc->hatch_spacing) * NR::translate(c)); + Geom::Point c = motion_dt; + Geom::Matrix const sm (Geom::Scale(dc->hatch_spacing, dc->hatch_spacing) * Geom::Translate(c)); sp_canvas_item_affine_absolute(dc->hatch_area, sm); sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(dc->hatch_area), 0xFF0000ff, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); sp_canvas_item_show(dc->hatch_area); } else { // Not drawing but spacing set: gray, center snapped, fixed radius - NR::Point c = (nearest + dc->hatch_spacing * hatch_unit_vector) * motion_to_curve.inverse(); - if (!isNaN(c[NR::X]) && !isNaN(c[NR::Y])) { - NR::Matrix const sm (NR::scale(dc->hatch_spacing, dc->hatch_spacing) * NR::translate(c)); + Geom::Point c = (nearest + dc->hatch_spacing * hatch_unit_vector) * motion_to_curve.inverse(); + if (!IS_NAN(c[Geom::X]) && !IS_NAN(c[Geom::Y])) { + Geom::Matrix const sm (Geom::Scale(dc->hatch_spacing, dc->hatch_spacing) * Geom::Translate(c)); sp_canvas_item_affine_absolute(dc->hatch_area, sm); sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(dc->hatch_area), 0x7f7f7fff, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); sp_canvas_item_show(dc->hatch_area); @@ -1055,20 +817,17 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, case GDK_BUTTON_RELEASE: + { + 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); dc->is_drawing = false; - if ( dc->is_dilating && event->button.button == 1 ) { - dc->is_dilating = false; - sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(dc)->desktop), - SP_VERB_CONTEXT_CALLIGRAPHIC, - (event->button.state & GDK_SHIFT_MASK ? _("Thicken paths") : _("Thin paths"))); - ret = TRUE; - } else if ( dc->dragging && event->button.button == 1 ) { + if (dc->dragging && event->button.button == 1 && !event_context->space_panning) { dc->dragging = FALSE; - NR::Point const motion_w(event->button.x, event->button.y); - NR::Point const motion_dt(desktop->w2d(motion_w)); sp_dyna_draw_apply(dc, motion_dt); /* Remove all temporary line segments */ @@ -1079,11 +838,13 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, /* Create object */ fit_and_split(dc, TRUE); - accumulate_calligraphic(dc); - set_to_accumulated(dc, event->button.state & GDK_SHIFT_MASK); // performs document_done + if (accumulate_calligraphic(dc)) + set_to_accumulated(dc, event->button.state & GDK_SHIFT_MASK, event->button.state & GDK_MOD1_MASK); // performs document_done + else + g_warning ("Failed to create path: invalid data in dc->cal1 or dc->cal2"); /* reset accumulated curve */ - sp_curve_reset(dc->accumulated); + dc->accumulated->reset(); clear_current(dc); if (dc->repr) { @@ -1092,17 +853,28 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, if (!dc->hatch_pointer_past.empty()) dc->hatch_pointer_past.clear(); if (!dc->hatch_nearest_past.empty()) dc->hatch_nearest_past.clear(); - dc->hatch_last_nearest = NR::Point(0,0); - dc->hatch_last_pointer = NR::Point(0,0); - dc->hatch_vector_accumulated = NR::Point(0,0); + if (!dc->inertia_vectors.empty()) dc->inertia_vectors.clear(); + if (!dc->hatch_vectors.empty()) dc->hatch_vectors.clear(); + dc->hatch_last_nearest = Geom::Point(0,0); + dc->hatch_last_pointer = Geom::Point(0,0); dc->hatch_escaped = false; dc->hatch_item = NULL; dc->hatch_livarot_path = NULL; + dc->just_started_drawing = false; + + if (dc->hatch_spacing != 0 && !dc->keep_selected) { + // we do not select the newly drawn path, so increase spacing by step + if (dc->hatch_spacing_step == 0) { + dc->hatch_spacing_step = dc->hatch_spacing; + } + dc->hatch_spacing += dc->hatch_spacing_step; + } dc->_message_context->clear(); ret = TRUE; } break; + } case GDK_KEY_PRESS: switch (get_group0_keyval (&event->key)) { @@ -1133,7 +905,6 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, if (dc->width > 1.0) dc->width = 1.0; sp_ddc_update_toolbox (desktop, "altx-calligraphy", dc->width * 100); // the same spinbutton is for alt+x - sp_ddc_update_cursors(dc); ret = TRUE; } break; @@ -1144,7 +915,6 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, if (dc->width < 0.01) dc->width = 0.01; sp_ddc_update_toolbox (desktop, "altx-calligraphy", dc->width * 100); - sp_ddc_update_cursors(dc); ret = TRUE; } break; @@ -1152,14 +922,12 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, case GDK_KP_Home: dc->width = 0.01; sp_ddc_update_toolbox (desktop, "altx-calligraphy", dc->width * 100); - sp_ddc_update_cursors(dc); ret = TRUE; break; case GDK_End: case GDK_KP_End: dc->width = 1.0; sp_ddc_update_toolbox (desktop, "altx-calligraphy", dc->width * 100); - sp_ddc_update_cursors(dc); ret = TRUE; break; case GDK_x: @@ -1184,28 +952,6 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, ret = TRUE; } break; - case GDK_Meta_L: - case GDK_Meta_R: - event_context->cursor_shape = cursor_thicken_xpm; - sp_event_context_update_cursor(event_context); - break; - case GDK_Alt_L: - case GDK_Alt_R: - if (MOD__SHIFT) { - event_context->cursor_shape = cursor_thicken_xpm; - sp_event_context_update_cursor(event_context); - } else { - event_context->cursor_shape = cursor_thin_xpm; - sp_event_context_update_cursor(event_context); - } - break; - case GDK_Shift_L: - case GDK_Shift_R: - if (MOD__ALT) { - event_context->cursor_shape = cursor_thicken_xpm; - sp_event_context_update_cursor(event_context); - } - break; default: break; } @@ -1217,24 +963,8 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, case GDK_Control_R: dc->_message_context->clear(); dc->hatch_spacing = 0; + dc->hatch_spacing_step = 0; break; - case GDK_Alt_L: - case GDK_Alt_R: - event_context->cursor_shape = cursor_calligraphy_xpm; - sp_event_context_update_cursor(event_context); - break; - case GDK_Shift_L: - case GDK_Shift_R: - if (MOD__ALT) { - event_context->cursor_shape = cursor_thin_xpm; - sp_event_context_update_cursor(event_context); - } - break; - case GDK_Meta_L: - case GDK_Meta_R: - event_context->cursor_shape = cursor_calligraphy_xpm; - sp_event_context_update_cursor(event_context); - break; default: break; } @@ -1244,8 +974,8 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, } if (!ret) { - if (((SPEventContextClass *) parent_class)->root_handler) { - ret = ((SPEventContextClass *) parent_class)->root_handler(event_context, event); + if (((SPEventContextClass *) dd_parent_class)->root_handler) { + ret = ((SPEventContextClass *) dd_parent_class)->root_handler(event_context, event); } } @@ -1259,52 +989,49 @@ clear_current(SPDynaDrawContext *dc) /* reset bpath */ sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->currentshape), NULL); /* reset curve */ - sp_curve_reset(dc->currentcurve); - sp_curve_reset(dc->cal1); - sp_curve_reset(dc->cal2); + dc->currentcurve->reset(); + dc->cal1->reset(); + dc->cal2->reset(); /* reset points */ dc->npoints = 0; } static void -set_to_accumulated(SPDynaDrawContext *dc, bool unionize) +set_to_accumulated(SPDynaDrawContext *dc, bool unionize, bool subtract) { SPDesktop *desktop = SP_EVENT_CONTEXT(dc)->desktop; - if (!sp_curve_empty(dc->accumulated)) { - NArtBpath *abp; - gchar *str; - + if (!dc->accumulated->is_empty()) { if (!dc->repr) { /* Create object */ - 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"); /* Set style */ - sp_desktop_apply_style_tool (desktop, repr, "tools.calligraphic", false); + sp_desktop_apply_style_tool (desktop, repr, "/tools/calligraphic", 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(desktop->currentLayer())->i2doc_affine().inverse(); item->updateRepr(); } - abp = nr_artpath_affine(sp_curve_first_bpath(dc->accumulated), sp_desktop_dt2root_affine(desktop)); - str = sp_svg_write_path(abp); + Geom::PathVector pathv = dc->accumulated->get_pathvector() * desktop->dt2doc(); + gchar *str = sp_svg_write_path(pathv); g_assert( str != NULL ); - g_free(abp); dc->repr->setAttribute("d", str); g_free(str); if (unionize) { sp_desktop_selection(desktop)->add(dc->repr); - sp_selected_path_union_skip_undo(); + sp_selected_path_union_skip_undo(desktop); + } else if (subtract) { + sp_desktop_selection(desktop)->add(dc->repr); + sp_selected_path_diff_skip_undo(desktop); } else { if (dc->keep_selected) { sp_desktop_selection(desktop)->set(dc->repr); - } else { - sp_desktop_selection(desktop)->clear(); } } @@ -1315,71 +1042,85 @@ set_to_accumulated(SPDynaDrawContext *dc, bool unionize) dc->repr = NULL; } - sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_CALLIGRAPHIC, - _("Draw calligraphic stroke")); + DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_CONTEXT_CALLIGRAPHIC, + _("Draw calligraphic stroke")); } 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 &from, + Geom::Point const &to, double rounding) { - NR::Point vel = rounding * NR::rot90( to - from ) / sqrt(2.0); - double mag = NR::L2(vel); + if (Geom::L2( to - from ) > DYNA_EPSILON) { + 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); - if ( mag_in > DYNA_EPSILON ) { - v_in = mag * v_in / mag_in; - } else { - v_in = NR::Point(0, 0); - } - - NR::Point v_out = to - post; - double mag_out = NR::L2(v_out); - if ( mag_out > DYNA_EPSILON ) { - v_out = mag * v_out / mag_out; - } else { - v_out = NR::Point(0, 0); - } - - if ( NR::L2(v_in) > DYNA_EPSILON || NR::L2(v_out) > DYNA_EPSILON ) { - sp_curve_curveto(curve, from + v_in, to + v_out, to); + Geom::Point v = mag * Geom::rot90( to - from ) / Geom::L2( to - from ); + curve->curveto(from + v, to + v, to); } } -static void +static bool accumulate_calligraphic(SPDynaDrawContext *dc) { - if ( !sp_curve_empty(dc->cal1) && !sp_curve_empty(dc->cal2) ) { - sp_curve_reset(dc->accumulated); /* Is this required ?? */ - SPCurve *rev_cal2 = sp_curve_reverse(dc->cal2); + if ( + dc->cal1->is_empty() || + dc->cal2->is_empty() || + (dc->cal1->get_segment_count() <= 0) || + dc->cal1->first_path()->closed() + ) { + dc->cal1->reset(); + dc->cal2->reset(); + return false; // failure + } - g_assert(dc->cal1->end > 1); - g_assert(rev_cal2->end > 1); - g_assert(SP_CURVE_SEGMENT(dc->cal1, 0)->code == NR_MOVETO_OPEN); - g_assert(SP_CURVE_SEGMENT(rev_cal2, 0)->code == NR_MOVETO_OPEN); - g_assert(SP_CURVE_SEGMENT(dc->cal1, 1)->code == NR_CURVETO); - g_assert(SP_CURVE_SEGMENT(rev_cal2, 1)->code == NR_CURVETO); - g_assert(SP_CURVE_SEGMENT(dc->cal1, dc->cal1->end-1)->code == NR_CURVETO); - g_assert(SP_CURVE_SEGMENT(rev_cal2, rev_cal2->end-1)->code == NR_CURVETO); + SPCurve *rev_cal2 = dc->cal2->create_reverse(); + if ( + (rev_cal2->get_segment_count() <= 0) || + rev_cal2->first_path()->closed() + ) { + rev_cal2->unref(); + dc->cal1->reset(); + dc->cal2->reset(); + return false; // failure + } - sp_curve_append(dc->accumulated, dc->cal1, FALSE); + Geom::CubicBezier const * dc_cal1_firstseg = dynamic_cast( dc->cal1->first_segment() ); + Geom::CubicBezier const * rev_cal2_firstseg = dynamic_cast( rev_cal2->first_segment() ); + Geom::CubicBezier const * dc_cal1_lastseg = dynamic_cast( dc->cal1->last_segment() ); + Geom::CubicBezier const * rev_cal2_lastseg = dynamic_cast( rev_cal2->last_segment() ); + + if ( + !dc_cal1_firstseg || + !rev_cal2_firstseg || + !dc_cal1_lastseg || + !rev_cal2_lastseg + ) { + rev_cal2->unref(); + dc->cal1->reset(); + dc->cal2->reset(); + return false; // failure + } - add_cap(dc->accumulated, SP_CURVE_SEGMENT(dc->cal1, dc->cal1->end-1)->c(2), SP_CURVE_SEGMENT(dc->cal1, dc->cal1->end-1)->c(3), SP_CURVE_SEGMENT(rev_cal2, 0)->c(3), SP_CURVE_SEGMENT(rev_cal2, 1)->c(1), dc->cap_rounding); + dc->accumulated->reset(); /* Is this required ?? */ - sp_curve_append(dc->accumulated, rev_cal2, TRUE); + dc->accumulated->append(dc->cal1, false); - add_cap(dc->accumulated, SP_CURVE_SEGMENT(rev_cal2, rev_cal2->end-1)->c(2), SP_CURVE_SEGMENT(rev_cal2, rev_cal2->end-1)->c(3), SP_CURVE_SEGMENT(dc->cal1, 0)->c(3), SP_CURVE_SEGMENT(dc->cal1, 1)->c(1), dc->cap_rounding); + add_cap(dc->accumulated, (*dc_cal1_lastseg)[3], (*rev_cal2_firstseg)[0], dc->cap_rounding); - sp_curve_closepath(dc->accumulated); + dc->accumulated->append(rev_cal2, true); - sp_curve_unref(rev_cal2); + add_cap(dc->accumulated, (*rev_cal2_lastseg)[3], (*dc_cal1_firstseg)[0], dc->cap_rounding); - sp_curve_reset(dc->cal1); - sp_curve_reset(dc->cal2); - } + dc->accumulated->closepath(); + + rev_cal2->unref(); + + dc->cal1->reset(); + dc->cal2->reset(); + + return true; // success } static double square(double const x) @@ -1390,7 +1131,9 @@ static double square(double const x) static void fit_and_split(SPDynaDrawContext *dc, gboolean release) { - double const tolerance_sq = square( NR::expansion(SP_EVENT_CONTEXT(dc)->desktop->w2d()) * TOLERANCE_CALLIGRAPHIC ); + SPDesktop *desktop = SP_EVENT_CONTEXT(dc)->desktop; + + double const tolerance_sq = square( desktop->w2d().descrim() * TOLERANCE_CALLIGRAPHIC ); #ifdef DYNA_DRAW_VERBOSE g_print("[F&S:R=%c]", release?'T':'F'); @@ -1410,23 +1153,23 @@ fit_and_split(SPDynaDrawContext *dc, gboolean release) #endif /* Current calligraphic */ - if ( dc->cal1->end == 0 || dc->cal2->end == 0 ) { + if ( dc->cal1->is_empty() || dc->cal2->is_empty() ) { /* dc->npoints > 0 */ /* g_print("calligraphics(1|2) reset\n"); */ - sp_curve_reset(dc->cal1); - sp_curve_reset(dc->cal2); + dc->cal1->reset(); + dc->cal2->reset(); - sp_curve_moveto(dc->cal1, dc->point1[0]); - sp_curve_moveto(dc->cal2, dc->point2[0]); + dc->cal1->moveto(dc->point1[0]); + 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)) ); @@ -1437,31 +1180,29 @@ fit_and_split(SPDynaDrawContext *dc, gboolean release) #endif /* CanvasShape */ if (! release) { - sp_curve_reset(dc->currentcurve); - sp_curve_moveto(dc->currentcurve, b1[0]); - for (NR::Point *bp1 = b1; bp1 < b1 + BEZIER_SIZE * nb1; bp1 += BEZIER_SIZE) { - sp_curve_curveto(dc->currentcurve, bp1[1], - bp1[2], bp1[3]); + dc->currentcurve->reset(); + dc->currentcurve->moveto(b1[0]); + for (Geom::Point *bp1 = b1; bp1 < b1 + BEZIER_SIZE * nb1; bp1 += BEZIER_SIZE) { + dc->currentcurve->curveto(bp1[1], bp1[2], bp1[3]); } - sp_curve_lineto(dc->currentcurve, - b2[BEZIER_SIZE*(nb2-1) + 3]); - for (NR::Point *bp2 = b2 + BEZIER_SIZE * ( nb2 - 1 ); bp2 >= b2; bp2 -= BEZIER_SIZE) { - sp_curve_curveto(dc->currentcurve, bp2[2], bp2[1], bp2[0]); + dc->currentcurve->lineto(b2[BEZIER_SIZE*(nb2-1) + 3]); + 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?? if (!dc->segments) { // first segment - add_cap(dc->currentcurve, b2[1], b2[0], b1[0], b1[1], dc->cap_rounding); + add_cap(dc->currentcurve, b2[0], b1[0], dc->cap_rounding); } - sp_curve_closepath(dc->currentcurve); + dc->currentcurve->closepath(); sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->currentshape), dc->currentcurve); } /* Current calligraphic */ - for (NR::Point *bp1 = b1; bp1 < b1 + BEZIER_SIZE * nb1; bp1 += BEZIER_SIZE) { - sp_curve_curveto(dc->cal1, bp1[1], bp1[2], bp1[3]); + 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) { - sp_curve_curveto(dc->cal2, bp2[1], bp2[2], bp2[3]); + for (Geom::Point *bp2 = b2; bp2 < b2 + BEZIER_SIZE * nb2; bp2 += BEZIER_SIZE) { + dc->cal2->curveto(bp2[1], bp2[2], bp2[3]); } } else { /* fixme: ??? */ @@ -1471,10 +1212,10 @@ fit_and_split(SPDynaDrawContext *dc, gboolean release) draw_temporary_box(dc); for (gint i = 1; i < dc->npoints; i++) { - sp_curve_lineto(dc->cal1, dc->point1[i]); + dc->cal1->lineto(dc->point1[i]); } for (gint i = 1; i < dc->npoints; i++) { - sp_curve_lineto(dc->cal2, dc->point2[i]); + dc->cal2->lineto(dc->point2[i]); } } @@ -1483,26 +1224,26 @@ fit_and_split(SPDynaDrawContext *dc, gboolean release) g_print("[%d]Yup\n", dc->npoints); #endif if (!release) { - g_assert(!sp_curve_empty(dc->currentcurve)); + 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 = sp_curve_copy(dc->currentcurve); + SPCurve *curve = dc->currentcurve->copy(); sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH (cbp), curve); - sp_curve_unref(curve); + curve->unref(); - guint32 fillColor = sp_desktop_get_color_tool (SP_ACTIVE_DESKTOP, "tools.calligraphic", true); - //guint32 strokeColor = sp_desktop_get_color_tool (SP_ACTIVE_DESKTOP, "tools.calligraphic", false); - double opacity = sp_desktop_get_master_opacity_tool (SP_ACTIVE_DESKTOP, "tools.calligraphic"); - double fillOpacity = sp_desktop_get_opacity_tool (SP_ACTIVE_DESKTOP, "tools.calligraphic", true); - //double strokeOpacity = sp_desktop_get_opacity_tool (SP_ACTIVE_DESKTOP, "tools.calligraphic", false); + guint32 fillColor = sp_desktop_get_color_tool (desktop, "/tools/calligraphic", true); + //guint32 strokeColor = sp_desktop_get_color_tool (desktop, "/tools/calligraphic", false); + double opacity = sp_desktop_get_master_opacity_tool (desktop, "/tools/calligraphic"); + double fillOpacity = sp_desktop_get_opacity_tool (desktop, "/tools/calligraphic", true); + //double strokeOpacity = sp_desktop_get_opacity_tool (desktop, "/tools/calligraphic", 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); } @@ -1518,20 +1259,21 @@ fit_and_split(SPDynaDrawContext *dc, gboolean release) static void draw_temporary_box(SPDynaDrawContext *dc) { - sp_curve_reset(dc->currentcurve); + dc->currentcurve->reset(); - sp_curve_moveto(dc->currentcurve, dc->point1[dc->npoints-1]); + dc->currentcurve->moveto(dc->point2[dc->npoints-1]); for (gint i = dc->npoints-2; i >= 0; i--) { - sp_curve_lineto(dc->currentcurve, dc->point1[i]); + dc->currentcurve->lineto(dc->point2[i]); } for (gint i = 0; i < dc->npoints; i++) { - sp_curve_lineto(dc->currentcurve, dc->point2[i]); + dc->currentcurve->lineto(dc->point1[i]); } + if (dc->npoints >= 2) { - add_cap(dc->currentcurve, dc->point2[dc->npoints-2], dc->point2[dc->npoints-1], dc->point1[dc->npoints-1], dc->point1[dc->npoints-2], dc->cap_rounding); + add_cap(dc->currentcurve, dc->point1[dc->npoints-1], dc->point2[dc->npoints-1], dc->cap_rounding); } - sp_curve_closepath(dc->currentcurve); + dc->currentcurve->closepath(); sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(dc->currentshape), dc->currentcurve); } @@ -1544,4 +1286,4 @@ draw_temporary_box(SPDynaDrawContext *dc) 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 :