diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2017-03-22 19:03:41 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2017-03-22 19:03:41 +0000 |
| commit | a184a53752fb8027c22e4a5d68819fd7b78a15d8 (patch) | |
| tree | aa4d7f84fc1b76dc8afde129eade5d660c9e0219 /src/display/canvas-grid.cpp | |
| parent | Add entry for canvas rotate step in Inkscape Preferences dialog. (diff) | |
| download | inkscape-a184a53752fb8027c22e4a5d68819fd7b78a15d8.tar.gz inkscape-a184a53752fb8027c22e4a5d68819fd7b78a15d8.zip | |
Add canvas flip. No GUI. Can be bound to keys via preferences.
(bzr r15606)
Diffstat (limited to 'src/display/canvas-grid.cpp')
| -rw-r--r-- | src/display/canvas-grid.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index c8951525f..4243d3365 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -853,7 +853,7 @@ CanvasXYGrid::Update (Geom::Affine const &affine, unsigned int /*flags*/) scaling_factor = 5; scaled[dim] = false; - while (sw[dim].length() < 8.0) { + while (fabs(sw[dim].length()) < 8.0) { scaled[dim] = true; sw[dim] *= scaling_factor; /* First pass, go up to the major line spacing, then @@ -927,8 +927,8 @@ CanvasXYGrid::Render (SPCanvasBuf *buf) Geom::Line axis = Geom::Line::from_origin_and_vector( ow, sw[dim] ); Geom::Line orth = Geom::Line::from_origin_and_vector( ow, sw[(dim+1)%2] ); - double spacing = fabs( sw[(dim+1)%2].length()); // Spacing between grid lines. - double dash = fabs( sw[dim].length()); // Total length of dash pattern. + double spacing = sw[(dim+1)%2].length(); // Spacing between grid lines. + double dash = sw[dim].length(); // Total length of dash pattern. // std::cout << " axis: " << axis.origin() << ", " << axis.vector() << std::endl; // std::cout << " spacing: " << spacing << std::endl; @@ -941,9 +941,12 @@ CanvasXYGrid::Render (SPCanvasBuf *buf) // We need signed distance... lib2geom offers only positive distance. double distance = signed_distance( buf->rect.corner(c), axis ); - if (dim == 1 ) { // YFLIP? + + // Correct it for coordinate flips (inverts handedness). + if (Geom::cross( axis.vector(), orth.vector() ) > 0 ) { distance = -distance; } + if (distance < min) min = distance; if (distance > max) @@ -996,7 +999,9 @@ CanvasXYGrid::Render (SPCanvasBuf *buf) // Dash pattern must use spacing from orthogonal direction. // Offset is to center dash on orthogonal lines. double offset = fmod( signed_distance( x[0], orth ), sw[dim].length()); - if (dim == 1) offset = -offset; + if (Geom::cross( axis.vector(), orth.vector() ) > 0 ) { + offset = -offset; + } double dashes[2]; if (!scaled[dim] && (j % empspacing) != 0) { |