WindowingTransformation.st
changeset 2 b35336ab0de3
parent 0 48194c26a46c
child 5 e5942fea6925
--- a/WindowingTransformation.st	Wed Oct 13 01:30:35 1993 +0100
+++ b/WindowingTransformation.st	Wed Oct 13 01:32:53 1993 +0100
@@ -84,9 +84,9 @@
 
     |transformedObject|
 
-    transformedObject := anObject translateBy:(self inverseTranslation).
+    transformedObject := anObject translatedBy:(self inverseTranslation).
     scale == nil ifFalse:[
-        transformedObject := transformedObject scaleBy:(self inverseScale)
+        transformedObject scaleBy:(self inverseScale)
     ].
     ^ transformedObject
 !
@@ -97,11 +97,10 @@
     |transformedObject|
 
     scale == nil ifTrue:[
-        transformedObject := anObject
-    ] ifFalse:[
-        transformedObject := anObject scaleBy:scale
+        ^ anObject translateBy:translation.
     ].
-    transformedObject := transformedObject translateBy:translation.
+    transformedObject := anObject scaledBy:scale
+    transformedObject translateBy:translation.
     ^ transformedObject
 !
 
@@ -138,7 +137,7 @@
 
 !WindowingTransformation methodsFor: 'transforming'!
 
-scaleBy:aScale 
+scaledBy:aScale 
     "return a new WindowingTransformation with the scale and translation of 
      the receiver both scaled by aScale."
 
@@ -160,7 +159,7 @@
                         translation:newTranslation
 !
 
-translateBy:aPoint 
+translatedBy:aPoint 
     "return a new WindowingTransformation with the same scale and 
      rotations as the receiver and with a translation of the current 
      translation plus aPoint."
@@ -223,16 +222,14 @@
     "returns a windowing transformation with no scaling (nil) 
      and no translation (0@0)."
 
-    ^ self new setScale:nil
-            translation:(Point x:0.0 y:0.0)
+    ^ self new setScale:nil translation:(Point x:0.0 y:0.0)
 !
 
 scale:aScale translation:aTranslation 
     "returns a windowing transformation with a scale factor of  
      aScale and a translation offset of aTranslation."
 
-    ^ self new setScale:aScale
-            translation:aTranslation
+    ^ self new setScale:aScale translation:aTranslation
 !
 
 window:sourceRectangle viewport:destinationRectangle 
@@ -251,6 +248,5 @@
     ] ifFalse:[
         newScale := Point x:sX y:sY
     ].
-    ^ self new setScale:newScale
-            translation:(Point x:tX y:tY)
+    ^ self new setScale:newScale translation:(Point x:tX y:tY)
 ! !