Mercurial > octave-nkf
changeset 12445:98772e4e8a2a
calculation of tightinset property
| author | Konstantinos Poulios <logari81@googlemail.com> |
|---|---|
| date | Mon, 14 Feb 2011 20:16:08 +0100 |
| parents | 07e102029d2a |
| children | f899f451fe76 |
| files | src/ChangeLog src/graphics.cc |
| diffstat | 2 files changed, 20 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Feb 14 08:06:32 2011 -0500 +++ b/src/ChangeLog Mon Feb 14 20:16:08 2011 +0100 @@ -1,3 +1,8 @@ +2011-02-14 Konstantinos Poulios <logari81@googlemail.com> + + * graphics.cc (axes::properties::sync_positions): Calculation of + tightinset property. + 2011-02-13 Konstantinos Poulios <logari81@googlemail.com> Bugs #31800, #32211.
--- a/src/graphics.cc Mon Feb 14 08:06:32 2011 -0500 +++ b/src/graphics.cc Mon Feb 14 20:16:08 2011 +0100 @@ -3263,11 +3263,11 @@ axes::properties::sync_positions (void) { Matrix defpos = default_axes_position (); - + Matrix pos = position.get ().matrix_value (); + Matrix outpos = outerposition.get ().matrix_value (); if (activepositionproperty.is ("outerposition")) { - Matrix outpos = outerposition.get ().matrix_value (); - Matrix pos(outpos); + pos = outpos; pos(0) = outpos(0) + defpos(0) * outpos(2); pos(1) = outpos(1) + defpos(1) * outpos(3); pos(2) = outpos(2) * defpos(2); @@ -3341,14 +3341,21 @@ { update_transform (); - Matrix pos = position.get ().matrix_value (); - pos(0) -= pos(2)*defpos(0)/defpos(2); - pos(1) -= pos(3)*defpos(1)/defpos(3); - pos(2) /= defpos(2); - pos(3) /= defpos(3); + outpos(0) = pos(0)-pos(2)*defpos(0)/defpos(2); + outpos(1) = pos(1)-pos(3)*defpos(1)/defpos(3); + outpos(2) = pos(2)/defpos(2); + outpos(3) = pos(3)/defpos(3); outerposition = calc_tightbox (pos); } + + Matrix inset (1, 4, 1.0); + inset(0) = pos(0)-outpos(0); + inset(1) = pos(1)-outpos(1); + inset(2) = outpos(0)+outpos(2)-pos(0)-pos(2); + inset(3) = outpos(1)+outpos(3)-pos(1)-pos(3); + + tightinset = inset; } void