~centralelyon2010/inkscape/imagelinks2

« back to all changes in this revision

Viewing changes to src/seltrans.cpp

Committer: cilix42
Date: 2008-09-18 17:48:42 UTC
Revision ID: cilix42@users.sourceforge.net-20080918174842-1ad33a7d7gqhv2hq

Next roud of NR ==> Geom conversion

files modified:
src/box3d.cpp

src/desktop-style.cpp

src/desktop.cpp

src/desktop.h

src/display/canvas-arena.cpp

src/display/canvas-axonomgrid.cpp

src/display/canvas-axonomgrid.h

src/display/canvas-bpath.cpp

src/display/canvas-bpath.h

src/display/canvas-grid.cpp

src/display/canvas-grid.h

src/display/gnome-canvas-acetate.cpp

src/display/guideline.cpp

src/display/nr-arena-shape.cpp

src/display/sodipodi-ctrl.cpp

src/display/sodipodi-ctrl.h

src/display/sodipodi-ctrlrect.cpp

src/display/sodipodi-ctrlrect.h

src/display/sp-canvas-util.cpp

src/display/sp-canvas-util.h

src/display/sp-canvas.cpp

src/display/sp-canvas.h

src/display/sp-ctrlline.cpp

src/display/sp-ctrlline.h

src/display/sp-ctrlquadr.cpp

src/display/sp-ctrlquadr.h

src/document.cpp

src/document.h

src/dropper-context.cpp

src/dropper-context.h

src/dyna-draw-context.cpp

src/eraser-context.cpp

src/event-context.cpp

src/flood-context.cpp

src/gradient-context.cpp

src/gradient-context.h

src/gradient-drag.cpp

src/gradient-drag.h

src/interface.cpp

src/libnr/nr-convert2geom.h

src/line-geometry.cpp

src/line-geometry.h

src/livarot/Shape.h

src/livarot/ShapeMisc.cpp

src/marker.cpp

src/marker.h

src/node-context.cpp

src/nodepath.cpp

src/nodepath.h

src/pencil-context.cpp

src/rubberband.cpp

src/rubberband.h

src/selcue.cpp

src/select-context.cpp

src/selection-chemistry.cpp

src/seltrans.cpp

src/shape-editor.cpp

src/shape-editor.h

src/sp-flowtext.cpp

src/sp-image.cpp

src/sp-item-group.cpp

src/sp-item-group.h

src/sp-item.cpp

src/sp-item.h

src/sp-namedview.cpp

src/sp-namedview.h

src/sp-root.cpp

src/sp-root.h

src/sp-shape.cpp

src/sp-symbol.cpp

src/sp-text.cpp

src/sp-tref.cpp

src/sp-tspan.cpp

src/sp-use.cpp

src/splivarot.cpp

src/text-context.cpp

src/text-editing.cpp

src/tweak-context.cpp

src/ui/view/edit-widget.cpp

src/ui/widget/zoom-status.cpp

src/verbs.cpp

src/widgets/desktop-widget.cpp

src/widgets/font-selector.cpp

src/widgets/toolbox.cpp

src/zoom-context.cpp

Show diffs side-by-side

added added

removed removed

src/seltrans.cpp

525

526

SPItem *copy_item = (SPItem *) sp_desktop_document(_desktop)->getObjectByRepr(copy_repr);

527

528

NR::Matrix const *new_affine;

528

Geom::Matrix const *new_affine;

529

if (_show == SHOW_OUTLINE) {

530

NR::Matrix const i2d(sp_item_i2d_affine(original_item));

531

NR::Matrix const i2dnew( i2d * _current_relative_affine );

902

NR::Point pt_geom = _getGeomHandlePos(pt);

903

NR::scale geom_scale = calcScaleFactors(_point_geom, pt_geom, _origin_for_specpoints);

904

905

_absolute_affine = NR::identity(); //Initialize the scaler

905

_absolute_affine = Geom::identity(); //Initialize the scaler

906

907

if (state & GDK_MOD1_MASK) { // scale by an integer multiplier/divider

908

// We're scaling either the visual or the geometric bbox here (see the comment above)

1017

NR::scale geom_scale = calcScaleFactors(_point_geom, pt_geom, _origin_for_specpoints);

1018

geom_scale[perp] = 1;

1019

1020

_absolute_affine = NR::identity(); //Initialize the scaler

1020

_absolute_affine = Geom::identity(); //Initialize the scaler

1021

1022

if (state & GDK_MOD1_MASK) { // stretch by an integer multiplier/divider

1023

if (fabs(default_scale[axis]) > 1) {

1184

pt[dim_a] = initial_delta[dim_a] * scale[dim_a] + _origin[dim_a];

1185

1186

// Calculate the relative affine

1187

_relative_affine = NR::identity();

1187

_relative_affine = Geom::identity();

1188

_relative_affine[2*dim_a + dim_a] = (pt[dim_a] - _origin[dim_a]) / initial_delta[dim_a];

1189

_relative_affine[2*dim_a + (dim_b)] = (pt[dim_b] - _point[dim_b]) / initial_delta[dim_a];

1190

_relative_affine[2*(dim_b) + (dim_a)] = 0;

Older »