From c7ae29ec0c3a1d30078b04db6d9927137e8f74b3 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Sun, 15 Nov 2015 07:27:02 -0800 Subject: [PATCH] Better toString() for AffineTransform. If it's just a translation transform, only show the translation, and if it's an identity transform, just say 'ident'. --- src/main/java/pythagoras/d/AffineTransform.java | 5 ++++- src/main/java/pythagoras/f/AffineTransform.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/pythagoras/d/AffineTransform.java b/src/main/java/pythagoras/d/AffineTransform.java index 92c7055..98aa421 100644 --- a/src/main/java/pythagoras/d/AffineTransform.java +++ b/src/main/java/pythagoras/d/AffineTransform.java @@ -380,8 +380,11 @@ public class AffineTransform extends AbstractTransform @Override public String toString () { - return "affine [" + MathUtil.toString(m00) + " " + MathUtil.toString(m01) + " " + + if (m00 != 1 || m01 != 0 || m10 != 0 || m11 != 1) return "affine [" + + MathUtil.toString(m00) + " " + MathUtil.toString(m01) + " " + MathUtil.toString(m10) + " " + MathUtil.toString(m11) + " " + translation() + "]"; + else if (tx != 0 || ty != 0) return "trans " + translation(); + else return "ident"; } // we don't publicize this because it might encourage someone to do something stupid like diff --git a/src/main/java/pythagoras/f/AffineTransform.java b/src/main/java/pythagoras/f/AffineTransform.java index 49ed339..09b21d0 100644 --- a/src/main/java/pythagoras/f/AffineTransform.java +++ b/src/main/java/pythagoras/f/AffineTransform.java @@ -380,8 +380,11 @@ public class AffineTransform extends AbstractTransform @Override public String toString () { - return "affine [" + MathUtil.toString(m00) + " " + MathUtil.toString(m01) + " " + + if (m00 != 1 || m01 != 0 || m10 != 0 || m11 != 1) return "affine [" + + MathUtil.toString(m00) + " " + MathUtil.toString(m01) + " " + MathUtil.toString(m10) + " " + MathUtil.toString(m11) + " " + translation() + "]"; + else if (tx != 0 || ty != 0) return "trans " + translation(); + else return "ident"; } // we don't publicize this because it might encourage someone to do something stupid like