unset affine transform for size and angle before applying the new parameters

mgoacolou · mgoacolou · commit 3fd05644bde6 · 2014-02-26T13:52:55.000+01:00
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -712,10 +712,24 @@ class _CollectionWithSizes(Collection):
     def get_sizes(self):
         return self._sizes
 
+    def __unset_sizes(self):
+        if len(self._sizes) == 0:
+            return
+        scale = np.sqrt(self._sizes) * self.__dpi / 72.0
+        s = np.zeros((len(self._sizes),3,3))
+        s[:, 0, 0] = scale
+        s[:, 1, 1] = scale
+        s[:, 2, 2] = 1.0
+        for i in xrange(self._transforms.shape[0]):
+            isc = np.linalg.inv(s[i%len(self._sizes),:,:])
+            self._transforms[i,:,:] = np.dot(isc, self._transforms[i,:,:])
+        
     def set_sizes(self, sizes, dpi=72.0):
+        # unset the size on transforms
+        self.__unset_sizes()
+        self.__dpi = dpi
         if sizes is None:
             self._sizes = np.array([])
-            self._transforms = np.empty((0, 3, 3))
         else:
             self._sizes = np.asarray(sizes)
             scale = np.sqrt(self._sizes) * dpi / 72.0
@@ -744,10 +758,26 @@ class _CollectionWithAngles(Collection):
     def get_angles(self):
         return self._angles
 
+    def __unset_angles(self):
+        if len(self._angles) == 0:
+            return
+        rot = np.deg2rad(-self._angles)
+        rot_c = np.cos(rot)
+        rot_s = np.sin(rot)
+        r = np.zeros((len(self._angles), 3, 3))
+        r[:, 0, 0] = rot_c
+        r[:, 0, 1] = -rot_s
+        r[:, 1, 1] = rot_c
+        r[:, 1, 0] = rot_s
+        r[:, 2, 2] = 1.0
+        for i in xrange(self._transforms.shape[0]):
+            irt = np.linalg.inv(r[i%len(self._angles),:,:])
+            self._transforms[i,:,:] = np.dot(irt, self._transforms[i,:,:])
+        
     def set_angles(self, angles):
+        self.__unset_angles()
         if angles is None:
             self._angles = np.array([])
-            self._transforms = np.empty((0, 3, 3))
         else:
             self._angles = np.asarray(angles)
             rot = np.deg2rad(-self._angles)
