matplotlib

matplotlib-checkins Mailing List for matplotlib

Brought to you by: cjgohlke, dsdale, efiring, heeres, and 8 others

matplotlib-checkins — Commit notification. DO NOT POST to this list, just subscribe to it.

You can subscribe to this list here.

2007	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul (115)	_Aug (120)	_Sep (137)	_Oct (170)	_Nov (461)	_Dec (263)
2008	_Jan (120)	_Feb (74)	_Mar (35)	_Apr (74)	_May (245)	_Jun (356)	_Jul (240)	_Aug (115)	_Sep (78)	_Oct (225)	_Nov (98)	_Dec (271)
2009	_Jan (132)	_Feb (84)	_Mar (74)	_Apr (56)	_May (90)	_Jun (79)	_Jul (83)	_Aug (296)	_Sep (214)	_Oct (76)	_Nov (82)	_Dec (66)
2010	_Jan (46)	_Feb (58)	_Mar (51)	_Apr (77)	_May (58)	_Jun (126)	_Jul (128)	_Aug (64)	_Sep (50)	_Oct (44)	_Nov (48)	_Dec (54)
2011	_Jan (68)	_Feb (52)	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec (1)
2018	_Jan	_Feb	_Mar	_Apr	_May (1)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

S	M	T	W	T	F	S
			1 (3)	2 (3)	3	4 (2)
5 (9)	6 (4)	7 (9)	8 (7)	9 (2)	10 (3)	11 (2)
12	13 (2)	14 (10)	15 (24)	16 (17)	17 (21)	18 (3)
19 (23)	20 (6)	21 (4)	22 (14)	23 (11)	24 (15)	25 (6)
26 (1)	27 (4)	28 (3)	29 (9)	30 (6)	31 (2)

Flat | Threaded

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

From: <jd...@us...> - 2008年10月13日 19:17:09

Revision: 6182
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6182&view=rev
Author: jdh2358
Date: 2008年10月13日 19:16:58 +0000 (2008年10月13日)
Log Message:
-----------
more fixes to mlab/excel formatters
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/mlab.py
 trunk/matplotlib/lib/mpl_toolkits/exceltools.py
Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py	2008年10月13日 18:10:39 UTC (rev 6181)
+++ trunk/matplotlib/lib/matplotlib/mlab.py	2008年10月13日 19:16:58 UTC (rev 6182)
@@ -2181,7 +2181,7 @@
 
 def tostr(self, x):
 if x is None: return 'None'
- return (self.fmt%self.toval(x)).rstrip('.')
+ return self.fmt%self.toval(x)
 
 
 
Modified: trunk/matplotlib/lib/mpl_toolkits/exceltools.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/exceltools.py	2008年10月13日 18:10:39 UTC (rev 6181)
+++ trunk/matplotlib/lib/mpl_toolkits/exceltools.py	2008年10月13日 19:16:58 UTC (rev 6182)
@@ -41,8 +41,11 @@
 xlstyle.num_format_str = '0.%s%%;[RED]-0.%s%%'%(zeros, zeros)
 format.scale = 1.
 elif isinstance(format, mlab.FormatFloat):
- zeros = ''.join(['0']*format.precision)
- xlstyle.num_format_str = '#,##0.%s;[RED]-#,##0.%s'%(zeros, zeros)
+ if format.precision>0:
+ zeros = ''.join(['0']*format.precision)
+ xlstyle.num_format_str = '#,##0.%s;[RED]-#,##0.%s'%(zeros, zeros)
+ else:
+ xlstyle.num_format_str = '#,##;[RED]-#,##'
 elif isinstance(format, mlab.FormatInt):
 xlstyle.num_format_str = '#,##;[RED]-#,##'
 else:
@@ -99,11 +102,11 @@
 
 ind = np.arange(len(r.dtype.names))
 for row in r:
- #print 'row',
+
 for i in ind:
 val = row[i]
 format = formats[i]
-
+ val = format.toval(val)
 if mlab.safe_isnan(val):
 ws.write(rownum, colnum+i, nanstr)
 elif mlab.safe_isinf(val):
@@ -112,11 +115,8 @@
 else: s = '-%s'%infstr
 ws.write(rownum, colnum+i, s)
 elif format.xlstyle is None:
- val = format.toval(val)
 ws.write(rownum, colnum+i, val)
 else:
- val = format.toval(val)
- #print (i, r.dtype.names[i], val, format.toval(val)),
 ws.write(rownum, colnum+i, val, format.xlstyle)
 rownum += 1
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

From: <jd...@us...> - 2008年10月13日 18:10:49

Revision: 6181
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6181&view=rev
Author: jdh2358
Date: 2008年10月13日 18:10:39 +0000 (2008年10月13日)
Log Message:
-----------
updates to formatters
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/mlab.py
 trunk/matplotlib/lib/mpl_toolkits/exceltools.py
Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py	2008年10月11日 18:27:35 UTC (rev 6180)
+++ trunk/matplotlib/lib/matplotlib/mlab.py	2008年10月13日 18:10:39 UTC (rev 6181)
@@ -2173,15 +2173,19 @@
 # def tostr(self, x):
 # return '"%r"'%self.toval(x)
 
+
+
 class FormatFormatStr(FormatObj):
 def __init__(self, fmt):
 self.fmt = fmt
 
 def tostr(self, x):
 if x is None: return 'None'
- return self.fmt%self.toval(x)
+ return (self.fmt%self.toval(x)).rstrip('.')
 
 
+
+
 class FormatFloat(FormatFormatStr):
 def __init__(self, precision=4, scale=1.):
 FormatFormatStr.__init__(self, '%%1.%df'%precision)
@@ -2198,6 +2202,10 @@
 
 
 class FormatInt(FormatObj):
+
+ def tostr(self, x):
+ return '%d'%int(x)
+
 def toval(self, x):
 return int(x)
 
Modified: trunk/matplotlib/lib/mpl_toolkits/exceltools.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/exceltools.py	2008年10月11日 18:27:35 UTC (rev 6180)
+++ trunk/matplotlib/lib/mpl_toolkits/exceltools.py	2008年10月13日 18:10:39 UTC (rev 6181)
@@ -99,10 +99,11 @@
 
 ind = np.arange(len(r.dtype.names))
 for row in r:
+ #print 'row',
 for i in ind:
 val = row[i]
 format = formats[i]
- val = format.toval(val)
+
 if mlab.safe_isnan(val):
 ws.write(rownum, colnum+i, nanstr)
 elif mlab.safe_isinf(val):
@@ -111,15 +112,14 @@
 else: s = '-%s'%infstr
 ws.write(rownum, colnum+i, s)
 elif format.xlstyle is None:
+ val = format.toval(val)
 ws.write(rownum, colnum+i, val)
 else:
+ val = format.toval(val)
+ #print (i, r.dtype.names[i], val, format.toval(val)),
 ws.write(rownum, colnum+i, val, format.xlstyle)
 rownum += 1
 
 if autosave:
 wb.save(filename)
 return rownum
-
-
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

Thanks for helping keep SourceForge clean.