diff options
| author | Ted Gould <ted@gould.cx> | 2010-05-15 18:08:17 +0000 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-05-15 18:08:17 +0000 |
| commit | 2d8c2dfd832ce207aef3895e702bff4098ab7136 (patch) | |
| tree | 642a37c6e3ca05d5e991ffe868f03c9cc58e51bc /src/display/canvas-axonomgrid.cpp | |
| parent | Merge from trunk (diff) | |
| parent | Minor tweaks to text toolbar. (diff) | |
| download | inkscape-2d8c2dfd832ce207aef3895e702bff4098ab7136.tar.gz inkscape-2d8c2dfd832ce207aef3895e702bff4098ab7136.zip | |
Updating to trunk
(bzr r8254.1.54)
Diffstat (limited to 'src/display/canvas-axonomgrid.cpp')
| -rw-r--r-- | src/display/canvas-axonomgrid.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp index ee05cd01c..cf2883116 100644 --- a/src/display/canvas-axonomgrid.cpp +++ b/src/display/canvas-axonomgrid.cpp @@ -518,6 +518,9 @@ CanvasAxonomGrid::Update (Geom::Matrix const &affine, unsigned int /*flags*/) { ow = origin * affine; sw = Geom::Point(fabs(affine[0]),fabs(affine[3])); + sw *= lengthy; + + scaled = false; for(int dim = 0; dim < 2; dim++) { gint scaling_factor = empspacing; @@ -525,10 +528,9 @@ CanvasAxonomGrid::Update (Geom::Matrix const &affine, unsigned int /*flags*/) if (scaling_factor <= 1) scaling_factor = 5; - scaled = FALSE; int watchdog = 0; while ( (sw[dim] < 8.0) & (watchdog < 100) ) { - scaled = TRUE; + scaled = true; sw[dim] *= scaling_factor; // First pass, go up to the major line spacing, then // keep increasing by two. @@ -538,13 +540,13 @@ CanvasAxonomGrid::Update (Geom::Matrix const &affine, unsigned int /*flags*/) } - spacing_ylines = sw[Geom::X] * lengthy /(tan_angle[X] + tan_angle[Z]); - lyw = sw[Geom::Y] * lengthy; - lxw_x = (lengthy / tan_angle[X]) * sw[Geom::X]; - lxw_z = (lengthy / tan_angle[Z]) * sw[Geom::X]; + spacing_ylines = sw[Geom::X] /(tan_angle[X] + tan_angle[Z]); + lyw = sw[Geom::Y]; + lxw_x = sw[Geom::X] / tan_angle[X]; + lxw_z = sw[Geom::X] / tan_angle[Z]; if (empspacing == 0) { - scaled = TRUE; + scaled = true; } } |