~centralelyon2010/inkscape/imagelinks2

« back to all changes in this revision

Viewing changes to src/pencil-context.cpp

Committer: Ted Gould
Date: 2008-11-21 05:24:08 UTC
Revision ID: ted@canonical.com-20081121052408-tilucis2pjrrpzxx

Merge from fe-moved

files added:
Doxyfile

share/extensions/Inkscape.pm

share/extensions/cut-marks.inx

share/extensions/cut-marks.pl

share/extensions/dxf_input.py

share/filters

share/filters/Makefile.am

share/filters/README

share/filters/filters.svg

src/filters

src/filters/Makefile_insert

src/filters/blend-fns.h

src/filters/blend.cpp

src/filters/blend.h

src/filters/colormatrix-fns.h

src/filters/colormatrix.cpp

src/filters/colormatrix.h

src/filters/componenttransfer-fns.h

src/filters/componenttransfer-funcnode.cpp

src/filters/componenttransfer-funcnode.h

src/filters/componenttransfer.cpp

src/filters/componenttransfer.h

src/filters/composite-fns.h

src/filters/composite.cpp

src/filters/composite.h

src/filters/convolvematrix-fns.h

src/filters/convolvematrix.cpp

src/filters/convolvematrix.h

src/filters/diffuselighting-fns.h

src/filters/diffuselighting.cpp

src/filters/diffuselighting.h

src/filters/displacementmap-fns.h

src/filters/displacementmap.cpp

src/filters/displacementmap.h

src/filters/distantlight.cpp

src/filters/distantlight.h

src/filters/flood-fns.h

src/filters/flood.cpp

src/filters/flood.h

src/filters/image-fns.h

src/filters/image.cpp

src/filters/image.h

src/filters/makefile.in

src/filters/merge-fns.h

src/filters/merge.cpp

src/filters/merge.h

src/filters/mergenode.cpp

src/filters/mergenode.h

src/filters/morphology-fns.h

src/filters/morphology.cpp

src/filters/morphology.h

src/filters/offset-fns.h

src/filters/offset.cpp

src/filters/offset.h

src/filters/pointlight.cpp

src/filters/pointlight.h

src/filters/specularlighting-fns.h

src/filters/specularlighting.cpp

src/filters/specularlighting.h

src/filters/spotlight.cpp

src/filters/spotlight.h

src/filters/tile-fns.h

src/filters/tile.cpp

src/filters/tile.h

src/filters/turbulence-fns.h

src/filters/turbulence.cpp

src/filters/turbulence.h

src/live_effects/effect-enum.h

src/live_effects/lpe-hatches.cpp

src/live_effects/lpe-hatches.h

src/live_effects/parameter/array.cpp

src/live_effects/parameter/array.h

src/ui/dialog/debug.cpp

src/ui/dialog/debug.h

src/ui/dialog/tile.cpp

src/ui/dialog/tile.h

files removed:
src/Doxyfile

src/dialogs/debugdialog.cpp

src/dialogs/debugdialog.h

src/dialogs/tiledialog.cpp

src/dialogs/tiledialog.h

src/extension/internal/cairo-pdf-out.cpp

src/extension/internal/cairo-pdf-out.h

src/extension/internal/eps-out.cpp

src/extension/internal/eps-out.h

src/extension/internal/pdf-cairo.cpp

src/extension/internal/pdf-cairo.h

src/extension/internal/ps-out.cpp

src/extension/internal/ps-out.h

src/extension/internal/ps.cpp

src/extension/internal/ps.h

src/live_effects/parameter/pointparam-knotholder.cpp

src/live_effects/parameter/pointparam-knotholder.h

src/sp-feblend-fns.h

src/sp-feblend.cpp

src/sp-feblend.h

src/sp-fecolormatrix-fns.h

src/sp-fecolormatrix.cpp

src/sp-fecolormatrix.h

src/sp-fecomponenttransfer-fns.h

src/sp-fecomponenttransfer-funcnode.cpp

src/sp-fecomponenttransfer-funcnode.h

src/sp-fecomponenttransfer.cpp

src/sp-fecomponenttransfer.h

src/sp-fecomposite-fns.h

src/sp-fecomposite.cpp

src/sp-fecomposite.h

src/sp-feconvolvematrix-fns.h

src/sp-feconvolvematrix.cpp

src/sp-feconvolvematrix.h

src/sp-fediffuselighting-fns.h

src/sp-fediffuselighting.cpp

src/sp-fediffuselighting.h

src/sp-fedisplacementmap-fns.h

src/sp-fedisplacementmap.cpp

src/sp-fedisplacementmap.h

src/sp-fedistantlight.cpp

src/sp-fedistantlight.h

src/sp-feflood-fns.h

src/sp-feflood.cpp

src/sp-feflood.h

src/sp-feimage-fns.h

src/sp-feimage.cpp

src/sp-feimage.h

src/sp-femerge-fns.h

src/sp-femerge.cpp

src/sp-femerge.h

src/sp-femergenode.cpp

src/sp-femergenode.h

src/sp-femorphology-fns.h

src/sp-femorphology.cpp

src/sp-femorphology.h

src/sp-feoffset-fns.h

src/sp-feoffset.cpp

src/sp-feoffset.h

src/sp-fepointlight.cpp

src/sp-fepointlight.h

src/sp-fespecularlighting-fns.h

src/sp-fespecularlighting.cpp

src/sp-fespecularlighting.h

src/sp-fespotlight.cpp

src/sp-fespotlight.h

src/sp-fetile-fns.h

src/sp-fetile.cpp

src/sp-fetile.h

src/sp-feturbulence-fns.h

src/sp-feturbulence.cpp

src/sp-feturbulence.h

src/streams-gzip.cpp

src/streams-gzip.h

src/streams-handles.cpp

src/streams-handles.h

src/streams-jar.cpp

src/streams-jar.h

src/streams-zlib.cpp

src/streams-zlib.h

files modified:
AUTHORS

build-lx.xml

configure.ac

doc/keys.xml

mkinstalldirs

po/POTFILES.in

po/gl.po

po/he.po

po/nl.po

po/ru.po

share/Makefile.am

share/README

share/extensions/Makefile.am

share/extensions/dxf_input.inx

share/extensions/simpletransform.py

share/keys/default.xml

share/keys/inkscape.xml

share/templates/LaTeX_Beamer.svg

share/templates/default.ca.svg

share/templates/default.fi.svg

share/templates/default.svg

share/templates/fontforge_glyph.svg

src/2geom/bezier-curve.h

src/2geom/bezier.h

src/2geom/concepts.h

src/2geom/crossing.h

src/2geom/curve.h

src/2geom/d2-sbasis.cpp

src/2geom/d2-sbasis.h

src/2geom/d2.h

src/2geom/elliptical-arc.cpp

src/2geom/elliptical-arc.h

src/2geom/forward.h

src/2geom/geom.cpp

src/2geom/geom.h

src/2geom/hvlinesegment.h

src/2geom/interval.h

src/2geom/linear.h

src/2geom/nearest-point.cpp

src/2geom/path-intersection.cpp

src/2geom/path.cpp

src/2geom/path.h

src/2geom/pathvector.cpp

src/2geom/pathvector.h

src/2geom/piecewise.h

src/2geom/point.h

src/2geom/rect.h

src/2geom/region.h

src/2geom/sbasis-2d.cpp

src/2geom/sbasis-curve.h

src/2geom/sbasis-geometric.cpp

src/2geom/sbasis-math.cpp

src/2geom/sbasis-math.h

src/2geom/sbasis-roots.cpp

src/2geom/sbasis.cpp

src/2geom/sbasis.h

src/2geom/shape.cpp

src/2geom/svg-elliptical-arc.cpp

src/2geom/svg-elliptical-arc.h

src/2geom/svg-path-parser.cpp

src/2geom/sweep.cpp

src/CMakeLists.txt

src/Makefile.am

src/Makefile_insert

src/application/app-prototype.cpp

src/application/app-prototype.h

src/application/application.cpp

src/application/application.h

src/application/editor.cpp

src/application/editor.h

src/attributes-test.h

src/attributes.cpp

src/attributes.h

src/bind/dobinding.cpp

src/bind/javabind-private.h

src/bind/javabind.cpp

src/bind/javabind.h

src/box3d-side.cpp

src/conn-avoid-ref.cpp

src/connector-context.cpp

src/desktop-style.cpp

src/desktop.cpp

src/dialogs/CMakeLists.txt

src/dialogs/Makefile_insert

src/dialogs/clonetiler.cpp

src/dialogs/clonetiler.h

src/dialogs/dialog-events.cpp

src/dialogs/dialog-events.h

src/dialogs/eek-color-def.cpp

src/dialogs/eek-color-def.h

src/dialogs/eek-preview.cpp

src/dialogs/eek-preview.h

src/dialogs/export.cpp

src/dialogs/export.h

src/dialogs/extensions.cpp

src/dialogs/extensions.h

src/dialogs/fill-style.cpp

src/dialogs/fill-style.h

src/dialogs/find.cpp

src/dialogs/find.h

src/dialogs/guidelinedialog.cpp

src/dialogs/iconpreview.cpp

src/dialogs/iconpreview.h

src/dialogs/in-dt-coordsys.h

src/dialogs/input.cpp

src/dialogs/input.h

src/dialogs/item-properties.cpp

src/dialogs/item-properties.h

src/dialogs/layer-properties.cpp

src/dialogs/layer-properties.h

src/dialogs/layers-panel.h

src/dialogs/object-attributes.cpp

src/dialogs/object-attributes.h

src/dialogs/rdf.cpp

src/dialogs/rdf.h

src/dialogs/sp-attribute-widget.cpp

src/dialogs/sp-attribute-widget.h

src/dialogs/stroke-style.cpp

src/dialogs/stroke-style.h

src/dialogs/swatches.cpp

src/dialogs/swatches.h

src/dialogs/text-edit.cpp

src/dialogs/text-edit.h

src/dialogs/unclump.cpp

src/dialogs/unclump.h

src/dialogs/xml-tree.cpp

src/dialogs/xml-tree.h

src/display/canvas-bpath.cpp

src/display/inkscape-cairo.cpp

src/display/inkscape-cairo.h

src/display/nr-arena-group.cpp

src/display/nr-arena-image.cpp

src/display/nr-arena-item.cpp

src/display/nr-arena-item.h

src/display/nr-arena-shape.cpp

src/display/nr-filter-composite.cpp

src/display/nr-filter-composite.h

src/display/nr-filter-diffuselighting.h

src/display/nr-filter-displacement-map.h

src/display/nr-filter-image.cpp

src/display/nr-filter-merge.cpp

src/display/nr-filter-merge.h

src/display/nr-filter-specularlighting.h

src/display/nr-filter-units.h

src/display/nr-filter.cpp

src/display/nr-light.cpp

src/display/nr-svgfonts.cpp

src/display/snap-indicator.cpp

src/display/sodipodi-ctrl.cpp

src/display/sp-canvas.cpp

src/document.cpp

src/document.h

src/doxygen-main.cpp

src/eraser-context.cpp

src/event-context.cpp

src/extension/init.cpp

src/extension/internal/Makefile_insert

src/extension/internal/cairo-ps-out.cpp

src/extension/internal/cairo-renderer-pdf-out.cpp

src/extension/internal/cairo-renderer.cpp

src/extension/internal/filter/drop-shadow.h

src/extension/internal/filter/filter-all.cpp

src/extension/internal/filter/filter-file.cpp

src/extension/internal/filter/filter.cpp

src/extension/internal/filter/filter.h

src/extension/internal/filter/snow.h

src/extension/internal/grid.cpp

src/extension/internal/javafx-out.cpp

src/extension/internal/odf.cpp

src/extension/output.h

src/extension/system.cpp

src/file.cpp

src/filter-chemistry.cpp

src/filter-enums.h

src/flood-context.cpp

src/gradient-chemistry.cpp

src/gradient-context.cpp

src/gradient-drag.cpp

src/gradient-drag.h

src/graphlayout/graphlayout.cpp

src/helper/Makefile_insert

src/helper/geom.cpp

src/helper/geom.h

src/helper/png-write.cpp

src/helper/png-write.h

src/helper/recthull.h

src/inkscape.cpp

src/interface.cpp

src/libnr/nr-convert2geom.h

src/libnr/nr-rect.cpp

src/libnr/nr-rect.h

src/libnrtype/FontInstance.cpp

src/libnrtype/Layout-TNG-Compute.cpp

src/libnrtype/Layout-TNG-Input.cpp

src/libnrtype/Layout-TNG-OutIter.cpp

src/libnrtype/Layout-TNG-Output.cpp

src/libnrtype/Layout-TNG.h

src/libnrtype/RasterFont.cpp

src/libnrtype/font-instance.h

src/line-snapper.cpp

src/line-snapper.h

src/live_effects/CMakeLists.txt

src/live_effects/Makefile_insert

src/live_effects/effect.cpp

src/live_effects/effect.h

src/live_effects/lpe-circle_with_radius.cpp

src/live_effects/lpe-circle_with_radius.h

src/live_effects/lpe-curvestitch.cpp

src/live_effects/lpe-interpolate.cpp

src/live_effects/lpe-knot.cpp

src/live_effects/lpe-knot.h

src/live_effects/lpe-patternalongpath.cpp

src/live_effects/lpe-patternalongpath.h

src/live_effects/lpe-perspective_path.cpp

src/live_effects/lpe-perspective_path.h

src/live_effects/lpe-skeleton.cpp

src/live_effects/lpe-skeleton.h

src/live_effects/lpe-sketch.cpp

src/live_effects/lpe-sketch.h

src/live_effects/lpegroupbbox.cpp

src/live_effects/parameter/CMakeLists.txt

src/live_effects/parameter/Makefile_insert

src/live_effects/parameter/parameter.h

src/live_effects/parameter/point.cpp

src/live_effects/parameter/point.h

src/live_effects/parameter/vector.cpp

src/live_effects/parameter/vector.h

src/lpe-tool-context.cpp

src/main.cpp

src/node-context.cpp

src/nodepath.cpp

src/nodepath.h

src/object-snapper.cpp

src/object-snapper.h

src/pencil-context.cpp

src/pencil-context.h

src/preferences-skeleton.h

src/removeoverlap/removeoverlap.cpp

src/rubberband.cpp

src/rubberband.h

src/selcue.cpp

src/select-context.cpp

src/selection-chemistry.cpp

src/selection.cpp

src/selection.h

src/seltrans.h

src/shape-editor.cpp

src/snap.cpp

src/snap.h

src/snapper.h

src/sp-conn-end-pair.cpp

src/sp-conn-end.cpp

src/sp-ellipse.cpp

src/sp-flowtext.cpp

src/sp-item-group.cpp

src/sp-item-transform.cpp

src/sp-item-transform.h

src/sp-item.cpp

src/sp-item.h

src/sp-lpe-item.cpp

src/sp-lpe-item.h

src/sp-namedview.cpp

src/sp-namedview.h

src/sp-object-repr.cpp

src/sp-offset.cpp

src/sp-path.cpp

src/sp-pattern.cpp

src/sp-shape.cpp

src/sp-spiral.cpp

src/sp-star.cpp

src/splivarot.cpp

src/svg/svg-affine.cpp

src/svg/svg.h

src/text-context.cpp

src/tweak-context.cpp

src/ui/clipboard.cpp

src/ui/dialog/CMakeLists.txt

src/ui/dialog/Makefile_insert

src/ui/dialog/align-and-distribute.cpp

src/ui/dialog/align-and-distribute.h

src/ui/dialog/dialog-manager.cpp

src/ui/dialog/document-properties.cpp

src/ui/dialog/document-properties.h

src/ui/dialog/filedialogimpl-win32.cpp

src/ui/dialog/filter-effects-dialog.cpp

src/ui/dialog/inkscape-preferences.cpp

src/ui/dialog/inkscape-preferences.h

src/ui/dialog/livepatheffect-editor.cpp

src/ui/dialog/livepatheffect-editor.h

src/ui/dialog/messages.cpp

src/ui/dialog/transformation.cpp

src/ui/view/edit-widget.cpp

src/ui/widget/object-composite-settings.cpp

src/ui/widget/preferences-widget.cpp

src/ui/widget/preferences-widget.h

src/ui/widget/style-subject.cpp

src/ui/widget/style-subject.h

src/verbs.cpp

src/verbs.h

src/widgets/Makefile_insert

src/widgets/calligraphic-profile-rename.cpp *

src/widgets/calligraphic-profile-rename.h *

src/widgets/desktop-widget.cpp

src/widgets/font-selector.cpp

src/widgets/icon.cpp

src/widgets/select-toolbar.cpp

src/widgets/toolbox.cpp

src/zoom-context.cpp

Show diffs side-by-side

added added

removed removed

src/pencil-context.cpp

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 SPDrawContextClass *pencil_parent_class;

static Geom::Point pencil_drag_origin_w(0, 0);

263

Inkscape::SnappedPoint const s = m.freeSnap(Inkscape::SnapPreferences::SNAPPOINT_NODE, p);

264

if (s.getSnapped()) {

265

s.getPoint(p);

266

pc->pencil_has_snapped_before = true;

266

pc->prev_snap_was_succesful = true;

267

} else {

268

pc->pencil_has_snapped_before = false;

268

pc->prev_snap_was_succesful = false;

269

}

270

} else if (selection->singleItem() && SP_IS_PATH(selection->singleItem())) {

271

desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Appending to selected path"));

362

Inkscape::SnappedPoint const s = m.freeSnap(Inkscape::SnapPreferences::SNAPPOINT_NODE, p);

363

if (s.getSnapped()) {

364

s.getPoint(p);

365

pc->pencil_has_snapped_before = true;

365

pc->prev_snap_was_succesful = true;

366

} else {

367

pc->prev_snap_was_succesful = false;

366

368

}

367

369

}

368

370

if ( pc->npoints != 0) { // buttonpress may have happened before we entered draw context!

369

if (!(pc->pencil_has_snapped_before && m.snapprefs.getSnapPostponedGlobally())) {

371

if (!(pc->prev_snap_was_succesful && m.snapprefs.getSnapPostponedGlobally())) {

370

372

// When snapping is enabled but temporarily on hold because the mouse is moving

371

373

// fast, then we don't want to add nodes off-grid

372

374

spdc_add_freehand_point(pc, from_2geom(p), mevent.state);

450

452

451

453

dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Finishing freehand"));

452

454

455

interpolate(pc);

453

456

spdc_concat_colors_and_flush(pc, FALSE);

454

457

pc->sa = NULL;

455

458

pc->ea = NULL;

624

627

}

625

628

}

626

629

630

627

631

static void

628

632

spdc_add_freehand_point(SPPencilContext *pc, Geom::Point p, guint /*state*/)

629

633

{

633

637

if ( ( p != pc->p[ pc->npoints - 1 ] )

634

638

&& in_svg_plane(p) )

635

639

{

640

pc->ps.push_back(p);

636

641

pc->p[pc->npoints++] = p;

637

642

fit_and_split(pc);

638

643

}

645

650

}

646

651

647

652

static void

653

interpolate(SPPencilContext *pc)

654

{

655

656

g_assert( pc->ps.size() > 1 );

657

658

Inkscape::Preferences *prefs = Inkscape::Preferences::get();

659

double const tol = prefs->getDoubleLimited("/tools/freehand/pencil/tolerance", 10.0, 1.0, 100.0) * 0.4;

660

double const tolerance_sq = 0.02 * square( pc->desktop->w2d().descrim() *

661

tol) * exp(0.2*tol - 2);

662

663

g_assert(is_zero(pc->req_tangent)

664

|| is_unit_vector(pc->req_tangent));

665

Geom::Point const tHatEnd(0, 0);

666

667

guint n_points = pc->ps.size();

668

pc->green_curve->reset();

669

pc->red_curve->reset();

670

671

Geom::Point * b = g_new(Geom::Point, 4*n_points);

672

Geom::Point * points = g_new(Geom::Point, 4*n_points);

673

for (int i = 0; i < pc->ps.size(); i++) {

674

points[i] = pc->ps[i];

675

}

676

677

// worst case gives us a segment per point

678

int max_segs = 4*n_points;

679

680

int const n_segs = sp_bezier_fit_cubic_r(b, points, n_points,

681

tolerance_sq, max_segs);

682

683

if ( n_segs > 0)

684

{

685

/* Fit and draw and reset state */

686

pc->red_curve->reset();

687

pc->red_curve->moveto(b[0]);

688

for (int c = 0; c < n_segs; c++) {

689

pc->red_curve->curveto(b[4*c+1], b[4*c+2], b[4*c+3]);

690

}

691

sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), pc->red_curve);

692

pc->red_curve_is_valid = true;

693

694

/* Fit and draw and copy last point */

695

g_assert(!pc->red_curve->is_empty());

696

697

/* Set up direction of next curve. */

698

{

699

Geom::CubicBezier const * last_seg = dynamic_cast<Geom::CubicBezier const *>(pc->red_curve->last_segment());

700

g_assert( last_seg ); // Relevance: validity of (*last_seg)[2]

701

pc->p[0] = last_seg->finalPoint();

702

pc->npoints = 1;

703

Geom::Point const req_vec( pc->p[0] - (*last_seg)[2] );

704

pc->req_tangent = ( ( Geom::is_zero(req_vec) || !in_svg_plane(req_vec) )

705

? Geom::Point(0, 0)

706

: Geom::unit_vector(req_vec) );

707

}

708

709

pc->green_curve->append_continuous(pc->red_curve, 0.0625);

710

SPCurve *curve = pc->red_curve->copy();

711

712

/// \todo fixme:

713

SPCanvasItem *cshape = sp_canvas_bpath_new(sp_desktop_sketch(pc->desktop), curve);

714

curve->unref();

715

sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(cshape), pc->green_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);

716

717

pc->green_bpaths = g_slist_prepend(pc->green_bpaths, cshape);

718

719

pc->red_curve_is_valid = false;

720

}

721

g_free(b);

722

g_free(points);

723

pc->ps.clear();

724

}

725

726

727

static void

648

728

fit_and_split(SPPencilContext *pc)

649

729

{

650

730

g_assert( pc->npoints > 1 );

651

731

652

Inkscape::Preferences *prefs = Inkscape::Preferences::get();

653

double const tol = prefs->getDoubleLimited("/tools/freehand/pencil/tolerance", 10.0, 1.0, 100.0);

654

double const tolerance_sq = 0.02 * square( pc->desktop->w2d().descrim() * tol)

655

* exp(0.2*tol - 2);

732

double const tolerance_sq = 0;

656

733

657

734

Geom::Point b[4];

658

735

g_assert(is_zero(pc->req_tangent)

659

736

|| is_unit_vector(pc->req_tangent));

660

737

Geom::Point const tHatEnd(0, 0);

661

738

int const n_segs = sp_bezier_fit_cubic_full(b, NULL, pc->p, pc->npoints,

662

pc->req_tangent, tHatEnd, tolerance_sq, 1);

739

pc->req_tangent, tHatEnd,

740

tolerance_sq, 1);

663

741

if ( n_segs > 0

664

742

&& unsigned(pc->npoints) < G_N_ELEMENTS(pc->p) )

665

743

{

Older »