SF.net SVN: matplotlib: [4844] trunk/matplotlib

[<md...@us...>]

Revision: 4844
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4844&view=rev
Author:   mdboom
Date:     2008-01-10 05:33:03 -0800 (Thu, 10 Jan 2008)

Log Message:
-----------
Merged revisions 4826-4843 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_91_maint

........
  r4826 | mdboom | 2008-01-08 17:13:08 -0500 (Tue, 08 Jan 2008) | 1 line
  
  Undoing last commit.  Testing was successful.
........
  r4841 | mdboom | 2008-01-10 08:28:01 -0500 (Thu, 10 Jan 2008) | 1 line
  
  Fix offset labels (so the times symbol is displayed correctly)
........

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/lib/matplotlib/ticker.py

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/v0_91_maint:1-4816
   + /branches/v0_91_maint:1-4843

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2008-01-10 13:29:16 UTC (rev 4843)
+++ trunk/matplotlib/CHANGELOG	2008-01-10 13:33:03 UTC (rev 4844)
@@ -1,7 +1,7 @@
 2008-01-10 Moved toolkits to mpl_toolkits, made mpl_toolkits
            a namespace package - JSWHIT
 
-2008-01-10 Use setup.cfg to set the default parameters (tkagg, 
+2008-01-10 Use setup.cfg to set the default parameters (tkagg,
            numpy) when building windows installers - DSD
 
 ===============================================================

Modified: trunk/matplotlib/lib/matplotlib/ticker.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/ticker.py	2008-01-10 13:29:16 UTC (rev 4843)
+++ trunk/matplotlib/lib/matplotlib/ticker.py	2008-01-10 13:33:03 UTC (rev 4844)
@@ -327,12 +327,16 @@
                 if self.offset > 0: offsetStr = '+' + offsetStr
             if self.orderOfMagnitude:
                 if self._usetex or self._useMathText:
-                    sciNotStr = r'\times'+self.format_data(10**self.orderOfMagnitude)
+                    sciNotStr = self.format_data(10**self.orderOfMagnitude)
                 else:
-                    sciNotStr = u'\xd7'+'1e%d'% self.orderOfMagnitude
+                    sciNotStr = '1e%d'% self.orderOfMagnitude
             if self._useMathText:
-                return ''.join(('$\mathdefault{',sciNotStr,offsetStr,'}$'))
+                if sciNotStr != '':
+                    sciNotStr = r'\times\mathdefault{%s}' % sciNotStr
+                return ''.join(('$',sciNotStr,r'\mathdefault{',offsetStr,'}$'))
             elif self._usetex:
+                if sciNotStr != '':
+                    sciNotStr = u'\xd7%s' % sciNotStr
                 return ''.join(('$',sciNotStr,offsetStr,'$'))
             else:
                 return ''.join((sciNotStr,offsetStr))


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