Sync 2Geom to commit 5ee51c1c4f2066faa3e2c82021fc92671ad44ba4

static code analysis

Refactoring of the code that handles transformations and snapping in the selector tool and the node tool. Splitting large chunks of code into some small classes, and eliminating some wrapper methods which were all just too similar

Fixed comparison function used in sorts

more cast cleanup

corrected the casts (hopefully)

Put a few std::vector<SPitem*>

At first, I was thinking "I just have to go to the selection file, and change that GSList* with a std::list, then resolve the few problems" So, i tried that. And I will continue tomorrow, and the days after, on and on.

Remove sp_desktop_document and finish cleanup of desktop-handles.h

Purge sp_desktop_controls

Deprecate and remove sp_desktop_selection in favor of SPDesktop::getSelection

Units: make it absolutely clear that Document properties unit dropdown is for UI Display Units. Upon document load, calculate the units used for SVG values, if a viewbox is available. If not, default to "px" SVG units. Change all code to use either Display units OR svg units.

i18n. Fixing untranslated strings.

Fix skewing bug that could lead to infinite transforms

Limit the number of paths to be used as snap targets, to keep Inkscape responsive in very complex drawings

Fix regression introduced by rev 13446 / 13333

Fix regression that prevented snapping back to original location, caused by rev. 13333

Remove debugging output

Fix snapping issue in selector tool

Fix bounding box cache issues in general, and prevent the selector tool from updating anything in case of identity affines (which prevents the bounding box from being invalidated)

Further refactored SPKnot.

First step of refactoring SPKnot.

Embedded SVG's cannot be transformed.

refactor, fixing some diff diferences

modify transform behaviour for unscaled stroke width, Preserved Transforms (Bug 1262146)

modify transform behaviour for scaled stroke width, Preserved Transforms

Moved and renamed some tool-related files.

First step of moving tools into appropriate namespaces.

static code analysis: performance

Units: stop newing Unit objects. pass around pointers to "undeletable" Unit objects in the UnitTable. I think we should move to using indexed units, and pass around the index of the unit in the unittable, or smth like that... ?

Ported away from and removed "sp-metrics.*".

Make handle colour a configurable property.

Refactor resize, rotate, skew handle code

Fix for Bug #448872 (Changing the bounding box type in preferences does not update the preview) by Vinipsmaker.

Migrate ruler position tracking to new track_widget API

Selector tool: improve responsiveness for snapping a path's internal intersections (was unbearable already for paths having 20+ segments)

Drop GTK+ 2.20 support.

Stop deriving SPCanvasItem from GtkObject

Header cleaning for GTK+3 migration

Centralized line creation and enhanced visibility.

C++ification of SPCtrlLine in preparation of visibility improvements.

Eliminated duplication of GTK key defines.

Adopt obsolete GtkAnchorType enum as SPAnchorType

Replace deprecated GDK key symbols

Don' t use convex hull for snapping a large selection if "only snap closest node" has been enabled

Header cleaning

reverting change to seltrans.cpp in rev 10935, as requested

implement some switches between visual bbox and geometric bbox, depending on prefs (Bug 906952)

Janitorial tasks: get rid of deprecated repr wrapper functions

Refactor snap-preferences a bit more

Remove unused parameter

Minor code safety and warning cleanup.

1) Cycle to the next-closest-snap-source when pressing tab, if the snap-closest-point-only-option has been activated. Works for the selector tool, but also when scaling/stretching/skewing a selection of nodes in the node tool 2) Cleanup and simplification of the code that finds the closest snapsource

Another minor pass of Doxygen cleanup.

Node tool, transforming a set of nodes: Fix crashes, and finish implementation of snapping

1) Fix absolute scaling in transform dialog 2) Transform dialog now follows the user prefs for geometric vs. visual bounding box

Completely remove NRRect, NRRectL, in-svg-plane.h

Refactor SPItem bounding box methods: remove NRRect usage and make code using them more obvious. Fix filter region computation.

Fix "snap guides" toggle

Refactoring of the snapping preferences; mainly about storing all toggles in a single array, instead of each having its own member variable

- rename SPItem::i2d_affine to i2dt_affine, to clarify that it is item-to-desktop, not item-to-document. This should make it easier to spot bugs. - tag some instances where the document-to-desktop transform has been hardcoded

Selector's toolbar: changing the dimensions of the visual bounding box of selection of multiple objects having different stroke widths has been fixed (bug #212768, #190557, ...)

- Add a third group of snap sources/targets, called ¨others¨ (before we had only ¨bounding box¨ and nodes (see bug #788178) - Fix the display of the snap source - Fix snapping of guides to other guides & grids

Allow the center handle to be selectable for items having a width or height close to zero (i.e. lines, dots) Before I fixed this the center handle used to be burried underneath the other handles

Finished cleanup of outated SP_OBJECT_DOCUMENT C macro.

Properly fix seltrans brokenness in 2Geom and pull updated files into Inkscape

temporary work around 2geom matrix bug to make inkscape more usable

update to latest 2geom !

Node tool: snap while scaling a selection of nodes. Consider this as experimental; needs cleanup!

Shift should disable snapping when dragging the rotation center of an object

Super duper mega (fun!) commit: replaced encoding=utf-8 with fileencoding=utf-8 in all 1074 Vim modelines. The reason for this is that (a) setting the encoding isn't nice, and (b) Vim 7.3 (with modeline enabled) disallows it and pops up an error whenever you open any file with it ("invalid modeline"). Also corrected five deviant modestrings: * src/ui/widget/dock.cpp and src/ui/widget/dock.h: missing colon at the end * src/ui/dialog/tile.cpp: removed gratuitous second colon at the end * src/helper/units-test.h: removed gratuitous space before a colon * share/extensions/export_gimp_palette.py: missing textwidth=99 That's my geekiest commit yet.

Fix display of snap source indicator for constrained snapping in the selector tool

Leave constrained angular snapping to the snap manager, instead of handling it locally

Fix self-snapping when dragging the transformation center of a selection containing multiple items (as reported by LucaDC in LP #607107, comment #30)

Clear pointers in the snapmanager if they're no longer needed.

Wholesale cruft removal part 4; fix crash when rendering guides

Avoid self-snapping when dragging a rotation center, and draw the rotation center at the snapped position

- Remove some old code which snapped the rotation center to the bbox, and which discarded all of the snapping settings - Improve the logic behind the snapping buttons, i.e. what snaps to what for each of the buttons

- Snap while rotating an object using the selector tool - Rename the ConstraintLine class to SnapConstraint - Move some duplicated code to 2geom

New Class SPDocumentUndo created which takes care of c++fying some non SPDocument based methods

This is the first c++ification commit from me. It handles sp-line, sp-polyline, sp-item and marks the onset of document c++ification as well. Users can check performace increase with [/usr/bin/time -v inkscape_binary_with_commandline_options].

- "Snap nodes or handles" button now also includes smooth nodes - Improved snap tooltips

Fix bbox snapping as reported in LP bug #562205

1) Fix moving by an integer multiple of the grid spacing (<alt>-dragging in the selector tool) 2) Allow constrained translation for 1) (with <ctrl>) 3) Fix snapping to the grid when pasting 4) Show snap indicators for all of the above 5) Implement snap delay mechanism for 1) and 2)

Remove redundancy from snapping API (type of snapsource no longer has to be specified explicitly)

Refactoring the snapping API (making it easier to maintain and understand for the devs)

Patch by Diederik to mitigate crash on 318726.

Diederik's patch for crash bug 441255

fix for 415168

When translating too many items, then don't use the bbox of the selection as a whole but instead use the closest corner of one of the individual bboxes instead.

When snapping while translating, use the bounding box corners of each selected item instead of the selection as a whole (fixes bug #404941)

Make the snap delay mechanism easier to implement for the devs, and get rid of the related warning messages

When translating too many nodes, a convex hull is used for snapping. This is not needed when "only snap node closest to mouse pointer" has been enabled in the preferences (fixes bug #396070)

Fix constrained motion in the selector tool when snapping is being overridden (i.e. when ctrl+shift keys are pressed simultaneously)

Fix snapping during constrained translation, when only snapping the node closest to the mouse pointer

- Don't display the snap-source-indicator when we're about to rotate using the selector tool (because it won't snap when rotating!) - Use a smaller snap-source-indicator, which is visually more appealing

- Move snap delay mechanism to the event context (used to be in SPCanvas) - Rename lots of variables and methods to make them easier to understand - Add snapping to the connector tool

The snap indicator's tooltip now displays "A to B", whereas before it only displayed "B".

After snapping, show a tooltip together with the snap indicator

Remove the source snap-indicator when ungrabbing

Display the snap source indicator only when snapping is enabled

- The snap-delay mechanism should now be more robust. From now on, it must be turned on and off explicitely within each context. This prevents delayed snapping events from being fired after the context or context's state has changed. - Creating single dots now snaps

- Snap to the midpoint of shapes and bboxes - Snap to the midpoint of paths and bbox edges - Refactor the snapping toggle, i.e. what snaps to what when toggling a specific option in the snapping toolbar PS: icons.svg has been modified, so use "make install" if needed

Optionally snap from/to midpoints of the edges of a bounding box

When snapping only the closest node, draw an indicator at that node

Add an option to the preferences to _only_ snap the node closest to the mouse pointer

1) Improve the way the distance to the pointer is taken into account when finding the best snap 2) Use this distance also when snapping nodes in the path editor 3) Add a slider in the preferences dialog to control the weighing of this distance

Merge from trunk

From trunk

Merging from trunk

Next roud of NR ==> Geom conversion

Modify the parameters required for setting up the SnapManager

Fix some regressions in the snapping of the selector tool

Move all of the snapper code to 2geom

remove many unnecessary to_2geom and from_2geom calls

NR::Maybe => boost::optional

change knot.h to Geom::Point only instead of NR::Point.

* src/2geom/isnan.h, src/libcola/cola.cpp, src/style.cpp, src/seltrans.cpp, src/libcola/gradient_projection.cpp, src/libvpsc/generate-constraints.cpp, src/libnr/nr-types.cpp, src/libnr/nr-point-fns-test.cpp, src/isnan.h, src/libnr/nr-point-fns.cpp, src/libnr/in-svg-plane-test.cpp, src/doxygen-main.cpp, src/display/nr-filter-composite.cpp, src/display/nr-filter-merge.cpp, src/display/nr-filter-gaussian.cpp, src/display/bezier-utils.cpp, src/Makefile_insert, src/eraser-context.cpp, src/dyna-draw-context.cpp, src/tweak-context.cpp, src/sp-namedview.cpp, src/libnr/in-svg-plane-test.h, src/libnr/nr-point-fns-test.h, src/mod360-test.h, src/CMakeLists.txt, src/2geom/linear.h: Properly fix the conflicting isnan.h problem: 1) Update src/2geom/isnan.h to match newest Inkscape src/isnana.h (Also commited this change to lib2geom project repository) 2) Remove Inkscape's src/isnan.h 3) Update all files to include src/2geom/isnan.h instead of src/isnan.h

change NR::Matrix to Geom:: for many sp_item_xxx_affine functions

Fix snapping for constrained translation in the selector tool

Fix regression in constrained translation

Fix a regression in the snapper, caused by me. Sorry!

Add a centralized check (i.e. in the snapper mechanism) whether we've snapped or not, instead of leaving it up to the various tools. This should prevent these tools from moving to (0,0) if they bluntly use the value returned by the snapping mechanism without checking whether snapping has really occured.

make more messages immediate

Replace freeSnapSkew() by constrainedSnapSkew(). There is no such thing as freely snapping while skewing; snapping will always be constrained

Warning and whitespace cleanup

- Major refactoring of snapping related code... - Enabling snap indicator for all remaining tools

replace text strings by ints for tools/bounding_box

Refactor snapping mechanisms: in seltrans.cpp, a GSList was converted to a std::list in four different places. Now this is handled in only one place

Refactor snapper and snapindicator (in order to enable the snapindicator in the selector tool)

The deprecated version of sp_item_invoke_bbox_full (which still uses NRRects) returns empty rectangles when calculating geometric bboxes of vertical or horizontal lines. A group of those lines will therefore also have an empty geometric bbox, which is wrong. We must use the new version of sp_item_invoke_bbox_full, which uses NR::Maybe<NR::Rects> instead.

Major overhaul of the selector tool's internals to improve handling of transformations, origins and snapping, for both visual and geometric bounding boxes (see for example bug #174046 in Launchpad)

Applying fixes for gcc 4.3 build issues (closes LP: #169115)

Move 'bounding box' option up one level (from Selector to Tools page in Preferences) since it applies more globally than just in the Selector tool (see discussion on the mailing list)

Fix #181795

1) Fix bug #178312 2) Fix constrained snapping to objects

Also consider path nodes for snapping

1) Improving snapping logic 2) When skewing, don't snap to selection itself

Improve the user interaction for snapping of bounding boxes, and add an new tab in document properties for detailed snapping options

Warning cleanup

Inkscape becomes unusable when trying to snap to the path of a traced bitmap or a text paragraph. Make it usable again by not snapping to text longer than 240 chars or paths containing more than 500 nodes. Snapping to more than one of such objects will still be very slow.

Improving the performance of the object snapper

Make snapping to the item's transformation center optional, but not yet available in the snapping preferences dialog

1) Changes to snapping preferences dialog 2) Strict snapping implemented, i.e. bbox only to bbox and nodes only to paths/nodes 3) Renaming of some constants to improve readability

integer scale with Alt, instead of slow movement

Only snap the real corners of a rectangle, not the start and end points of each rounded corener

Fix bug #1077600 -> correct mirroring and no drifting of origin

Improve readability and remove some unused code

change the logic so that the value is correctly read at launch of seltrans, and approximate is the default for continuity

Some cleaning and reordering

Add global preference for selector tool, chosing between GEOMETRIC_BBOX or VISUAL_BBOX

Eliminate drift of origin if mirroring occurs during scaling/stretching

Changes to the selector tool, e.g. option to choose either APPROXIMATE_BBOX or GEOMETRIC_BBOX

bug #1524444 (partially solved): while uniformly scaling (with ctrl-key), the correct scaling must be applied BEFORE trying to snap

Fix for bug #1589436 - font baseline now correctly snaps in selector tool

plumb XML::Document parameter into duplication, courtesy of bryce

Fix for bug 1540195; solution: use correct origin for snapping

fix snapping while uniformly scaling, fix snapping while skewing

Switch selection bounds and center to use NR::Maybe, addressing most of the recent bbox regressions.

no need to update coords here, it's now done in any knot automatically

when dragging center, defer repr updating and committing until ungrab; this makes dragging faster. also remove superfluous reffing of objects while dragging

fix shift-dragging (no snap) of rotation center

fix by dvlierop2 for snapping bugs 1579556 and 1579587

yet another crash/freeze in ungrab. IMPORTANT: the document_done calls and others triggering screen redraw must come absolutely the last in any function, otherwise, because of the events that happened during the redraw, you risk seeing a vastly different landscape when you return for the remainder of your function (e.g. the tool context may have changed), and it will likely misbehave.

fix bug in my previous commit: updating rotation centers was broken

again rearrange code in ungrab handler so that screen update is as close to the end as possible, to prevent crash when switching tools during redraw after transform

peeled back the gboolean code as it hit on some complexity theory principles... need to rethink and incrementally change gbooleans to bools

Ok, committed msgloan's patch to convert gbooleans to bools thus completing one major janitorial task we identified....

prevent the race between ungrab and selModify to fix the disappearing handles problem with interruptible display

undo annotations

patch from Gustav Broberg: undo annotations and history dialog

Applied patch #1503864

Clear selection cache when not dragging. Fixes bug #1501156

More snapping cleanups.

Fix ctrl-scaling when there is no snap.

fix 1478932

More snapping cleanups.

Remove some old snap code.

Various snapping cleanups and bug fixes.

Give SPNamedView a SnapManager instance and use it for all management of snapping settings.

reset center on stamping

Get rid of the SP_DT_* macros which do nothing more than provide additional, confusing, names for other functions. If shorter names are desired, the actual functions should be renamed -- or better, made into member functions.

use SPKnot setter methods instead of g_object_set_property

use rotation center in keyboard rotation and transform dialog