SF.net SVN: matplotlib:[6506] trunk/matplotlib/lib/matplotlib

[<jo...@us...>]

Revision: 6506
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6506&view=rev
Author:   jouni
Date:     2008-12-08 12:31:06 +0000 (Mon, 08 Dec 2008)

Log Message:
-----------
Other part of symlog bugfix (and deactivating an experimental type1font that slipped in by accident)

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/scale.py
    trunk/matplotlib/lib/matplotlib/type1font.py

Modified: trunk/matplotlib/lib/matplotlib/scale.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/scale.py	2008-12-08 12:26:53 UTC (rev 6505)
+++ trunk/matplotlib/lib/matplotlib/scale.py	2008-12-08 12:31:06 UTC (rev 6506)
@@ -329,6 +329,7 @@
             self._linadjust = linthresh / (np.log(linthresh) / self._log_base)
 
         def transform(self, a):
+            a = np.asarray(a)
             return np.where(a <= self._log_linthresh,
                              np.where(a >= -self._log_linthresh,
                                        a * self._linadjust,

Modified: trunk/matplotlib/lib/matplotlib/type1font.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/type1font.py	2008-12-08 12:26:53 UTC (rev 6505)
+++ trunk/matplotlib/lib/matplotlib/type1font.py	2008-12-08 12:31:06 UTC (rev 6506)
@@ -29,7 +29,7 @@
         finally:
             file.close()
         self.parts = self._split(data)
-        self._parse()
+        #self._parse()
 
     def _read(self, file):
         rawdata = file.read()
@@ -180,5 +180,5 @@
     font = Type1Font(sys.argv[1])
     parts = font.parts
     print len(parts[0]), len(parts[1]), len(parts[2])
-    print parts[0][font.enc_starts:font.enc_ends]
+    #print parts[0][font.enc_starts:font.enc_ends]
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.