SF.net SVN: matplotlib:[7359] branches/v0_99_maint/lib/matplotlib/backends/ backend_gtk.py

[jdh2358]

Revision: 7359
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7359&view=rev
Author:   jdh2358
Date: 2009-08-05 11:06:13 + (Wed, 05 Aug 2009)

Log Message:
---
remove dup gui event in enter/leave events in gtk

Modified Paths:
--
branches/v0_99_maint/lib/matplotlib/backends/backend_gtk.py

Modified: branches/v0_99_maint/lib/matplotlib/backends/backend_gtk.py
===
--- branches/v0_99_maint/lib/matplotlib/backends/backend_gtk.py 2009-08-05 
02:29:12 UTC (rev 7358)
+++ branches/v0_99_maint/lib/matplotlib/backends/backend_gtk.py 2009-08-05 
11:06:13 UTC (rev 7359)
@@ -243,10 +243,10 @@
 return False  # finish event propagation?
 
 def leave_notify_event(self, widget, event):
-FigureCanvasBase.leave_notify_event(self, event, guiEvent=event)
+FigureCanvasBase.leave_notify_event(self, event)
 
 def enter_notify_event(self, widget, event):
-FigureCanvasBase.enter_notify_event(self, event, guiEvent=event)
+FigureCanvasBase.enter_notify_event(self, event)
 
 def _get_key(self, event):
 if event.keyval in self.keyvald:


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[7360] trunk/mpl_data/testdata.csv

[jdh2358]

Revision: 7360
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7360&view=rev
Author:   jdh2358
Date: 2009-08-05 11:34:43 + (Wed, 05 Aug 2009)

Log Message:
---
added testdata.csv

Added Paths:
---
trunk/mpl_data/testdata.csv

Added: trunk/mpl_data/testdata.csv
===
--- trunk/mpl_data/testdata.csv (rev 0)
+++ trunk/mpl_data/testdata.csv 2009-08-05 11:34:43 UTC (rev 7360)
@@ -0,0 +1,3 @@
+name,age
+john,41
+miriam,38
\ No newline at end of file


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[7361] trunk/mpl_data/testdata.csv

[jdh2358]

Revision: 7361
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7361&view=rev
Author:   jdh2358
Date: 2009-08-05 11:39:37 + (Wed, 05 Aug 2009)

Log Message:
---
updated test data

Modified Paths:
--
trunk/mpl_data/testdata.csv

Modified: trunk/mpl_data/testdata.csv
===
--- trunk/mpl_data/testdata.csv 2009-08-05 11:34:43 UTC (rev 7360)
+++ trunk/mpl_data/testdata.csv 2009-08-05 11:39:37 UTC (rev 7361)
@@ -1,3 +1,5 @@
 name,age
 john,41
-miriam,38
\ No newline at end of file
+miriam,38
+rahel,11
+


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

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

[jdh2358]

Revision: 7362
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7362&view=rev
Author:   jdh2358
Date: 2009-08-05 12:04:36 + (Wed, 05 Aug 2009)

Log Message:
---
added a new mpl data example script to test svn commits on the data

Modified Paths:
--
trunk/matplotlib/lib/matplotlib/__init__.py
trunk/matplotlib/lib/matplotlib/cbook.py

Added Paths:
---
trunk/matplotlib/examples/misc/mpl_data_test.py

Added: trunk/matplotlib/examples/misc/mpl_data_test.py
===
--- trunk/matplotlib/examples/misc/mpl_data_test.py 
(rev 0)
+++ trunk/matplotlib/examples/misc/mpl_data_test.py 2009-08-05 12:04:36 UTC 
(rev 7362)
@@ -0,0 +1,13 @@
+"""
+Demonstrate how get_mpl_data works with svn revisions in the data.
+
+svn co 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/mpl_data
+
+and edit testdata.csv to add a new row.  After committing the changes,
+when you rerun this script you will get the updated data (and the new
+svn version will be cached in ~/.matplotlib/mpl_data)
+"""
+
+import matplotlib.cbook as cbook
+fh = cbook.get_mpl_data("testdata.csv")
+print fh.read()

Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===
--- trunk/matplotlib/lib/matplotlib/__init__.py 2009-08-05 11:39:37 UTC (rev 
7361)
+++ trunk/matplotlib/lib/matplotlib/__init__.py 2009-08-05 12:04:36 UTC (rev 
7362)
@@ -89,7 +89,7 @@
 """
 from __future__ import generators
 
-__version__  = '0.99.0.rc1'
+__version__  = '1.0.svn'
 __revision__ = '$Revision$'
 __date__ = '$Date$'
 

Modified: trunk/matplotlib/lib/matplotlib/cbook.py
===
--- trunk/matplotlib/lib/matplotlib/cbook.py2009-08-05 11:39:37 UTC (rev 
7361)
+++ trunk/matplotlib/lib/matplotlib/cbook.py2009-08-05 12:04:36 UTC (rev 
7362)
@@ -356,7 +356,7 @@
 
 def in_cache_dir(self, fn):
 return os.path.join(self.cache_dir, fn)
-
+
 def read_cache(self):
 """
 Read the cache file from the cache directory.
@@ -386,7 +386,7 @@
 for path in os.listdir(self.cache_dir):
 if path not in listed and path != 'cache.pck':
 os.remove(os.path.join(self.cache_dir, path))
-
+
 def write_cache(self):
 """
 Write the cache data structure into the cache directory.
@@ -419,7 +419,7 @@
 # http_request for preprocessing requests
 # http_error_304 for handling 304 Not Modified responses
 # http_response for postprocessing requests
-
+
 def http_request(self, req):
 """
 Make the request conditional if we have a cached file.
@@ -441,7 +441,7 @@
 handle = urllib2.addinfourl(file, hdrs, url)
 handle.code = 304
 return handle
-
+
 def http_response(self, req, response):
 """
 Update the cache with the returned file.
@@ -473,7 +473,7 @@
 To add a datafile to this directory, you need to check out
 mpl_data from matplotlib svn::
 
-  svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/mpl_data
+  svn co 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/mpl_data
 
 and svn add the data file you want to support.  This is primarily
 intended for use in mpl examples that need custom data
@@ -497,7 +497,7 @@
 response.close()
 p = get_mpl_data.processor
 return p.in_cache_dir(p.cache[url][0])
-
+
 def flatten(seq, scalarp=is_scalar_or_string):
 """
 this generator flattens nested containers such as


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

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

[jdh2358]

Revision: 7363
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7363&view=rev
Author:   jdh2358
Date: 2009-08-05 14:35:06 + (Wed, 05 Aug 2009)

Log Message:
---
Merged revisions 7353,7358-7359 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint


  r7353 | jdh2358 | 2009-08-04 13:46:41 -0500 (Tue, 04 Aug 2009) | 1 line
  
  attach gtk events to mpl events -- fixes sf bug 2816580

  r7358 | jdh2358 | 2009-08-04 21:29:12 -0500 (Tue, 04 Aug 2009) | 1 line
  
  some fixes for osx builds on rc2

  r7359 | jdh2358 | 2009-08-05 06:06:13 -0500 (Wed, 05 Aug 2009) | 1 line
  
  remove dup gui event in enter/leave events in gtk


Modified Paths:
--
trunk/matplotlib/doc/_templates/indexsidebar.html
trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
trunk/matplotlib/release/osx/Makefile
trunk/matplotlib/release/osx/README.txt

Property Changed:

trunk/matplotlib/


Property changes on: trunk/matplotlib
___
Modified: svnmerge-integrated
   - /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 
/branches/v0_99_maint:1-7345
   + /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 
/branches/v0_99_maint:1-7362

Modified: trunk/matplotlib/doc/_templates/indexsidebar.html
===
--- trunk/matplotlib/doc/_templates/indexsidebar.html   2009-08-05 12:04:36 UTC 
(rev 7362)
+++ trunk/matplotlib/doc/_templates/indexsidebar.html   2009-08-05 14:35:06 UTC 
(rev 7363)
@@ -4,7 +4,7 @@
 Please http://sourceforge.net/project/project_donations.php?group_id=80706";>donate
 to support matplotlib development.
 
-A release candidate rc1 of matplotlib-0.99.0 is http://drop.io/xortel1#";>available for testing.  Please post any bugs 
to the http://sourceforge.net/tracker2/?group_id=80706";>tracker
+A release candidate rc2 of matplotlib-0.99.0 is http://drop.io/xortel1#";>available for testing.  Please post any bugs 
to the http://sourceforge.net/tracker2/?group_id=80706";>tracker
 
 
 Watch a http://videolectures.net/mloss08_hunter_mat";>video 
lecture about matplotlib presented at http://videolectures.net/mloss08_whistler";>NIPS 08 Workshop 
Machine Learning Open Source Software. 

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
===
--- trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py 2009-08-05 
12:04:36 UTC (rev 7362)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py 2009-08-05 
14:35:06 UTC (rev 7363)
@@ -197,7 +197,7 @@
 step = 1
 else:
 step = -1
-FigureCanvasBase.scroll_event(self, x, y, step)
+FigureCanvasBase.scroll_event(self, x, y, step, guiEvent=event)
 return False  # finish event propagation?
 
 def button_press_event(self, widget, event):
@@ -205,7 +205,7 @@
 x = event.x
 # flipy so y=0 is bottom of canvas
 y = self.allocation.height - event.y
-FigureCanvasBase.button_press_event(self, x, y, event.button)
+FigureCanvasBase.button_press_event(self, x, y, event.button, 
guiEvent=event)
 return False  # finish event propagation?
 
 def button_release_event(self, widget, event):
@@ -213,21 +213,21 @@
 x = event.x
 # flipy so y=0 is bottom of canvas
 y = self.allocation.height - event.y
-FigureCanvasBase.button_release_event(self, x, y, event.button)
+FigureCanvasBase.button_release_event(self, x, y, event.button, 
guiEvent=event)
 return False  # finish event propagation?
 
 def key_press_event(self, widget, event):
 if _debug: print 'FigureCanvasGTK.%s' % fn_name()
 key = self._get_key(event)
 if _debug: print "hit", key
-FigureCanvasBase.key_press_event(self, key)
+FigureCanvasBase.key_press_event(self, key, guiEvent=event)
 return False  # finish event propagation?
 
 def key_release_event(self, widget, event):
 if _debug: print 'FigureCanvasGTK.%s' % fn_name()
 key = self._get_key(event)
 if _debug: print "release", key
-FigureCanvasBase.key_release_event(self, key)
+FigureCanvasBase.key_release_event(self, key, guiEvent=event)
 return False  # finish event propagation?
 
 def motion_notify_event(self, widget, event):
@@ -239,7 +239,7 @@
 
 # flipy so y=0 is bottom of canvas
 y = self.allocation.height - y
-FigureCanvasBase.motion_notify_event(self, x, y)
+FigureCanvasBase.motion_notify_event(self, x, y, guiEvent=event)
 return False  # finish event propagation?
 
 def leave_notify_event(self, widget, event):

Modified: trunk/matplotlib/release/osx/Makefile
===
--- t

SF.net SVN: matplotlib:[7364] trunk

[jdh2358]

Revision: 7364
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7364&view=rev
Author:   jdh2358
Date: 2009-08-05 14:36:27 + (Wed, 05 Aug 2009)

Log Message:
---
rename mpl_data sample_data

Added Paths:
---
trunk/sample_data/

Removed Paths:
-
trunk/mpl_data/


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

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

[jdh2358]

Revision: 7365
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7365&view=rev
Author:   jdh2358
Date: 2009-08-05 14:38:44 + (Wed, 05 Aug 2009)

Log Message:
---
rename mpl_data to sample_data to avoid ambiguity with lib/matplotlib/mpl-data

Modified Paths:
--
trunk/matplotlib/examples/misc/mpl_data_demo.py
trunk/matplotlib/examples/misc/mpl_data_test.py
trunk/matplotlib/lib/matplotlib/cbook.py

Modified: trunk/matplotlib/examples/misc/mpl_data_demo.py
===
--- trunk/matplotlib/examples/misc/mpl_data_demo.py 2009-08-05 14:36:27 UTC 
(rev 7364)
+++ trunk/matplotlib/examples/misc/mpl_data_demo.py 2009-08-05 14:38:44 UTC 
(rev 7365)
@@ -1,10 +1,10 @@
 """
-Grab mpl data from the ~/.matplotlib/mpl_data cache if it exists, else
+Grab mpl data from the ~/.matplotlib/sample_data cache if it exists, else
 fetch it from svn and cache it
 """
 import matplotlib.cbook as cbook
 import matplotlib.pyplot as plt
-fname = cbook.get_mpl_data('lena.png', asfileobj=False)
+fname = cbook.get_sample_data('lena.png', asfileobj=False)
 
 print 'fname', fname
 im = plt.imread(fname)

Modified: trunk/matplotlib/examples/misc/mpl_data_test.py
===
--- trunk/matplotlib/examples/misc/mpl_data_test.py 2009-08-05 14:36:27 UTC 
(rev 7364)
+++ trunk/matplotlib/examples/misc/mpl_data_test.py 2009-08-05 14:38:44 UTC 
(rev 7365)
@@ -1,13 +1,13 @@
 """
-Demonstrate how get_mpl_data works with svn revisions in the data.
+Demonstrate how get_sample_data works with svn revisions in the data.
 
-svn co 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/mpl_data
+svn co 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/sample_data
 
 and edit testdata.csv to add a new row.  After committing the changes,
 when you rerun this script you will get the updated data (and the new
-svn version will be cached in ~/.matplotlib/mpl_data)
+svn version will be cached in ~/.matplotlib/sample_data)
 """
 
 import matplotlib.cbook as cbook
-fh = cbook.get_mpl_data("testdata.csv")
+fh = cbook.get_sample_data("testdata.csv")
 print fh.read()

Modified: trunk/matplotlib/lib/matplotlib/cbook.py
===
--- trunk/matplotlib/lib/matplotlib/cbook.py2009-08-05 14:36:27 UTC (rev 
7364)
+++ trunk/matplotlib/lib/matplotlib/cbook.py2009-08-05 14:38:44 UTC (rev 
7365)
@@ -458,12 +458,12 @@
 result.msg = response.msg
 return result
 
-def get_mpl_data(fname, asfileobj=True):
+def get_sample_data(fname, asfileobj=True):
 """
-Check the cachedirectory ~/.matplotlib/mpl_data for an mpl_data
+Check the cachedirectory ~/.matplotlib/sample_data for an sample_data
 file.  If it does not exist, fetch it with urllib from the mpl svn repo
 
-  http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/mpl_data/
+  
http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/sample_data/
 
 and store it in the cachedir.
 
@@ -471,31 +471,31 @@
 path to the file as a string will be returned
 
 To add a datafile to this directory, you need to check out
-mpl_data from matplotlib svn::
+sample_data from matplotlib svn::
 
-  svn co 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/mpl_data
+  svn co 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/sample_data
 
 and svn add the data file you want to support.  This is primarily
 intended for use in mpl examples that need custom data
 """
 
-if not hasattr(get_mpl_data, 'opener'):
+if not hasattr(get_sample_data, 'opener'):
 configdir = matplotlib.get_configdir()
-cachedir = os.path.join(configdir, 'mpl_data')
+cachedir = os.path.join(configdir, 'sample_data')
 if not os.path.exists(cachedir):
 os.mkdir(cachedir)
 # Store the cache processor and url opener as attributes of this 
function
-get_mpl_data.processor = _CacheProcessor(cachedir)
-get_mpl_data.opener = urllib2.build_opener(get_mpl_data.processor)
+get_sample_data.processor = _CacheProcessor(cachedir)
+get_sample_data.opener = 
urllib2.build_opener(get_sample_data.processor)
 
-url = 
'http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/mpl_data/' + \
+url = 
'http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/sample_data/' + \
 urllib2.quote(fname)
-response = get_mpl_data.opener.open(url)
+response = get_sample_data.opener.open(url)
 if asfileobj:
 return response
 else:
 response.close()
-p = get_mpl_data.processor
+p = get_sample_data.processor
 return p.in_cache_dir(p.cache[url][0])
 
 def flatten(seq, scalarp=is_scalar_or_string):


This was sent by the SourceForge.net collaborat

SF.net SVN: matplotlib:[7366] trunk/matplotlib/examples/misc

[jdh2358]

Revision: 7366
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7366&view=rev
Author:   jdh2358
Date: 2009-08-05 14:39:36 + (Wed, 05 Aug 2009)

Log Message:
---
rename mpl_data to sample_data to avoid ambiguity with lib/matplotlib/mpl-data

Added Paths:
---
trunk/matplotlib/examples/misc/sample_data_demo.py
trunk/matplotlib/examples/misc/sample_data_test.py

Removed Paths:
-
trunk/matplotlib/examples/misc/mpl_data_demo.py
trunk/matplotlib/examples/misc/mpl_data_test.py

Deleted: trunk/matplotlib/examples/misc/mpl_data_demo.py
===
--- trunk/matplotlib/examples/misc/mpl_data_demo.py 2009-08-05 14:38:44 UTC 
(rev 7365)
+++ trunk/matplotlib/examples/misc/mpl_data_demo.py 2009-08-05 14:39:36 UTC 
(rev 7366)
@@ -1,12 +0,0 @@
-"""
-Grab mpl data from the ~/.matplotlib/sample_data cache if it exists, else
-fetch it from svn and cache it
-"""
-import matplotlib.cbook as cbook
-import matplotlib.pyplot as plt
-fname = cbook.get_sample_data('lena.png', asfileobj=False)
-
-print 'fname', fname
-im = plt.imread(fname)
-plt.imshow(im)
-plt.show()

Deleted: trunk/matplotlib/examples/misc/mpl_data_test.py
===
--- trunk/matplotlib/examples/misc/mpl_data_test.py 2009-08-05 14:38:44 UTC 
(rev 7365)
+++ trunk/matplotlib/examples/misc/mpl_data_test.py 2009-08-05 14:39:36 UTC 
(rev 7366)
@@ -1,13 +0,0 @@
-"""
-Demonstrate how get_sample_data works with svn revisions in the data.
-
-svn co 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/sample_data
-
-and edit testdata.csv to add a new row.  After committing the changes,
-when you rerun this script you will get the updated data (and the new
-svn version will be cached in ~/.matplotlib/sample_data)
-"""
-
-import matplotlib.cbook as cbook
-fh = cbook.get_sample_data("testdata.csv")
-print fh.read()

Copied: trunk/matplotlib/examples/misc/sample_data_demo.py (from rev 7365, 
trunk/matplotlib/examples/misc/mpl_data_demo.py)
===
--- trunk/matplotlib/examples/misc/sample_data_demo.py  
(rev 0)
+++ trunk/matplotlib/examples/misc/sample_data_demo.py  2009-08-05 14:39:36 UTC 
(rev 7366)
@@ -0,0 +1,12 @@
+"""
+Grab mpl data from the ~/.matplotlib/sample_data cache if it exists, else
+fetch it from svn and cache it
+"""
+import matplotlib.cbook as cbook
+import matplotlib.pyplot as plt
+fname = cbook.get_sample_data('lena.png', asfileobj=False)
+
+print 'fname', fname
+im = plt.imread(fname)
+plt.imshow(im)
+plt.show()

Copied: trunk/matplotlib/examples/misc/sample_data_test.py (from rev 7365, 
trunk/matplotlib/examples/misc/mpl_data_test.py)
===
--- trunk/matplotlib/examples/misc/sample_data_test.py  
(rev 0)
+++ trunk/matplotlib/examples/misc/sample_data_test.py  2009-08-05 14:39:36 UTC 
(rev 7366)
@@ -0,0 +1,13 @@
+"""
+Demonstrate how get_sample_data works with svn revisions in the data.
+
+svn co 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/sample_data
+
+and edit testdata.csv to add a new row.  After committing the changes,
+when you rerun this script you will get the updated data (and the new
+svn version will be cached in ~/.matplotlib/sample_data)
+"""
+
+import matplotlib.cbook as cbook
+fh = cbook.get_sample_data("testdata.csv")
+print fh.read()


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[7367] trunk/matplotlib/lib/matplotlib/cbook.py

[jdh2358]

Revision: 7367
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7367&view=rev
Author:   jdh2358
Date: 2009-08-05 14:44:18 + (Wed, 05 Aug 2009)

Log Message:
---
make urllib quote python2.4 compliant

Modified Paths:
--
trunk/matplotlib/lib/matplotlib/cbook.py

Modified: trunk/matplotlib/lib/matplotlib/cbook.py
===
--- trunk/matplotlib/lib/matplotlib/cbook.py2009-08-05 14:39:36 UTC (rev 
7366)
+++ trunk/matplotlib/lib/matplotlib/cbook.py2009-08-05 14:44:18 UTC (rev 
7367)
@@ -488,8 +488,16 @@
 get_sample_data.processor = _CacheProcessor(cachedir)
 get_sample_data.opener = 
urllib2.build_opener(get_sample_data.processor)
 
+
+# quote is not in python2.4, so check for it and get it from
+# urllib if it is not available
+quote = getattr(urllib2, 'quote', None)
+if quote is None:
+import urllib
+quote = urllib.quote
+
 url = 
'http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/sample_data/' + \
-urllib2.quote(fname)
+quote(fname)
 response = get_sample_data.opener.open(url)
 if asfileobj:
 return response


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[7368] trunk/sample_data

[jdh2358]

Revision: 7368
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7368&view=rev
Author:   jdh2358
Date: 2009-08-05 14:54:01 + (Wed, 05 Aug 2009)

Log Message:
---
make a nested subdir for testing

Added Paths:
---
trunk/sample_data/testdir/
trunk/sample_data/testdir/subdir/
trunk/sample_data/testdir/subdir/testsub.csv

Added: trunk/sample_data/testdir/subdir/testsub.csv
===
--- trunk/sample_data/testdir/subdir/testsub.csv
(rev 0)
+++ trunk/sample_data/testdir/subdir/testsub.csv2009-08-05 14:54:01 UTC 
(rev 7368)
@@ -0,0 +1,5 @@
+name,age
+john,41
+miriam,38
+rahel,11
+


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

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

[jdh2358]

Revision: 7369
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7369&view=rev
Author:   jdh2358
Date: 2009-08-05 15:02:12 + (Wed, 05 Aug 2009)

Log Message:
---
add support for nested dirs in sample_data

Modified Paths:
--
trunk/matplotlib/examples/misc/sample_data_test.py
trunk/matplotlib/lib/matplotlib/cbook.py

Modified: trunk/matplotlib/examples/misc/sample_data_test.py
===
--- trunk/matplotlib/examples/misc/sample_data_test.py  2009-08-05 14:54:01 UTC 
(rev 7368)
+++ trunk/matplotlib/examples/misc/sample_data_test.py  2009-08-05 15:02:12 UTC 
(rev 7369)
@@ -9,5 +9,5 @@
 """
 
 import matplotlib.cbook as cbook
-fh = cbook.get_sample_data("testdata.csv")
+fh = cbook.get_sample_data('testdir/subdir/testsub.csv')
 print fh.read()

Modified: trunk/matplotlib/lib/matplotlib/cbook.py
===
--- trunk/matplotlib/lib/matplotlib/cbook.py2009-08-05 14:54:01 UTC (rev 
7368)
+++ trunk/matplotlib/lib/matplotlib/cbook.py2009-08-05 15:02:12 UTC (rev 
7369)
@@ -349,8 +349,9 @@
 Urllib2 handler that takes care of caching files.
 The file cache.pck holds the directory of files to be cached.
 """
-def __init__(self, cache_dir):
+def __init__(self, cache_dir, baseurl):
 self.cache_dir = cache_dir
+self.baseurl = baseurl
 self.read_cache()
 self.remove_stale_files()
 


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[7370] trunk/matplotlib/lib/matplotlib/cbook.py

[jdh2358]

Revision: 7370
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7370&view=rev
Author:   jdh2358
Date: 2009-08-05 15:07:41 + (Wed, 05 Aug 2009)

Log Message:
---
add support for nested dirs in sample_data

Modified Paths:
--
trunk/matplotlib/lib/matplotlib/cbook.py

Modified: trunk/matplotlib/lib/matplotlib/cbook.py
===
--- trunk/matplotlib/lib/matplotlib/cbook.py2009-08-05 15:02:12 UTC (rev 
7369)
+++ trunk/matplotlib/lib/matplotlib/cbook.py2009-08-05 15:07:41 UTC (rev 
7370)
@@ -356,8 +356,14 @@
 self.remove_stale_files()
 
 def in_cache_dir(self, fn):
-return os.path.join(self.cache_dir, fn)
+# make sure the datadir exists
+reldir, filename = os.path.split(fn)
+datadir = os.path.join(self.cache_dir, reldir)
+if not os.path.exists(datadir):
+os.makedirs(datadir)
 
+return os.path.join(datadir, filename)
+
 def read_cache(self):
 """
 Read the cache file from the cache directory.
@@ -386,7 +392,11 @@
 listed = set([fn for (_, (fn, _, _)) in self.cache.items()])
 for path in os.listdir(self.cache_dir):
 if path not in listed and path != 'cache.pck':
-os.remove(os.path.join(self.cache_dir, path))
+thisfile = os.path.join(self.cache_dir, path)
+if not os.path.isdir(thisfile):
+
matplotlib.verbose.report('_CacheProcessor:remove_stale_files: removing 
%s'%thisfile,
+  level='debug')
+os.remove(thisfile)
 
 def write_cache(self):
 """
@@ -402,12 +412,14 @@
 Store a received file in the cache directory.
 """
 # Pick a filename
-rightmost = url.rstrip('/').split('/')[-1]
-fn = rightmost
-while os.path.exists(self.in_cache_dir(fn)):
-fn = rightmost + '.' + str(random.randint(0,999))
+fn = url[len(self.baseurl):]
+fullpath = self.in_cache_dir(fn)
 
-# Write out the data
+#while os.path.exists(self.in_cache_dir(fn)):
+#fn = rightmost + '.' + str(random.randint(0,999))
+
+
+
 f = open(self.in_cache_dir(fn), 'wb')
 f.write(data)
 f.close()
@@ -438,7 +450,9 @@
 """
 url = req.get_full_url()
 fn, _, _ = self.cache[url]
-file = open(self.in_cache_dir(fn), 'rb')
+cachefile = self.in_cache_dir(fn)
+matplotlib.verbose.report('_CacheProcessor: reading data file from 
cache file "%s"'%cachefile)
+file = open(cachefile, 'rb')
 handle = urllib2.addinfourl(file, hdrs, url)
 handle.code = 304
 return handle
@@ -480,13 +494,14 @@
 intended for use in mpl examples that need custom data
 """
 
+baseurl 
='http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/sample_data/'
 if not hasattr(get_sample_data, 'opener'):
 configdir = matplotlib.get_configdir()
 cachedir = os.path.join(configdir, 'sample_data')
 if not os.path.exists(cachedir):
 os.mkdir(cachedir)
 # Store the cache processor and url opener as attributes of this 
function
-get_sample_data.processor = _CacheProcessor(cachedir)
+get_sample_data.processor = _CacheProcessor(cachedir, baseurl)
 get_sample_data.opener = 
urllib2.build_opener(get_sample_data.processor)
 
 
@@ -497,8 +512,7 @@
 import urllib
 quote = urllib.quote
 
-url = 
'http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/sample_data/' + \
-quote(fname)
+url = baseurl + quote(fname)
 response = get_sample_data.opener.open(url)
 if asfileobj:
 return response


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

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

[jdh2358]

Revision: 7371
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7371&view=rev
Author:   jdh2358
Date: 2009-08-05 15:14:35 + (Wed, 05 Aug 2009)

Log Message:
---
use proper file handle to the sample data

Modified Paths:
--
trunk/matplotlib/examples/misc/sample_data_test.py
trunk/matplotlib/lib/matplotlib/cbook.py

Modified: trunk/matplotlib/examples/misc/sample_data_test.py
===
--- trunk/matplotlib/examples/misc/sample_data_test.py  2009-08-05 15:07:41 UTC 
(rev 7370)
+++ trunk/matplotlib/examples/misc/sample_data_test.py  2009-08-05 15:14:35 UTC 
(rev 7371)
@@ -8,6 +8,19 @@
 svn version will be cached in ~/.matplotlib/sample_data)
 """
 
+import matplotlib.mlab as mlab
 import matplotlib.cbook as cbook
-fh = cbook.get_sample_data('testdir/subdir/testsub.csv')
+
+# get the file handle to the cached data and print the contents
+datafile = 'testdir/subdir/testsub.csv'
+fh = cbook.get_sample_data(datafile)
 print fh.read()
+
+# make sure we can read it using csv2rec
+fh.seek(0)
+r = mlab.csv2rec(fh)
+
+print mlab.rec2txt(r)
+
+fh.close()
+

Modified: trunk/matplotlib/lib/matplotlib/cbook.py
===
--- trunk/matplotlib/lib/matplotlib/cbook.py2009-08-05 15:07:41 UTC (rev 
7370)
+++ trunk/matplotlib/lib/matplotlib/cbook.py2009-08-05 15:14:35 UTC (rev 
7371)
@@ -418,8 +418,8 @@
 #while os.path.exists(self.in_cache_dir(fn)):
 #fn = rightmost + '.' + str(random.randint(0,999))
 
-
-
+
+
 f = open(self.in_cache_dir(fn), 'wb')
 f.write(data)
 f.close()
@@ -514,12 +514,15 @@
 
 url = baseurl + quote(fname)
 response = get_sample_data.opener.open(url)
+
+p = get_sample_data.processor
+relpath = p.cache[url][0]
+fname = p.in_cache_dir(relpath)
+
 if asfileobj:
-return response
+return file(fname)
 else:
-response.close()
-p = get_sample_data.processor
-return p.in_cache_dir(p.cache[url][0])
+return fname
 
 def flatten(seq, scalarp=is_scalar_or_string):
 """


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[7372] branches/mathtex/lib/matplotlib/backends

[evilguru]

Revision: 7372
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7372&view=rev
Author:   evilguru
Date: 2009-08-05 15:26:30 + (Wed, 05 Aug 2009)

Log Message:
---
Enable caching for mathtex expressions. This delivers a big performance boost 
when panning/zooming.

Modified Paths:
--
branches/mathtex/lib/matplotlib/backends/backend_agg.py
branches/mathtex/lib/matplotlib/backends/backend_cairo.py
branches/mathtex/lib/matplotlib/backends/backend_gdk.py
branches/mathtex/lib/matplotlib/backends/backend_macosx.py
branches/mathtex/lib/matplotlib/backends/backend_pdf.py
branches/mathtex/lib/matplotlib/backends/backend_ps.py

Modified: branches/mathtex/lib/matplotlib/backends/backend_agg.py
===
--- branches/mathtex/lib/matplotlib/backends/backend_agg.py 2009-08-05 
15:14:35 UTC (rev 7371)
+++ branches/mathtex/lib/matplotlib/backends/backend_agg.py 2009-08-05 
15:26:30 UTC (rev 7372)
@@ -111,7 +111,7 @@
  'debug-annoying')
 if HAVE_MATHTEX:
 m = Mathtex(s, rcParams['mathtext.fontset'], 
prop.get_size_in_points(),
-self.dpi, rcParams['mathtext.default'])
+self.dpi, rcParams['mathtext.default'], cache=True)
 b = MathtexBackendImage()
 
 m.render_to_backend(b)
@@ -166,7 +166,7 @@
 return 0.0, 0.0, 0.0
 else:
 m = Mathtex(s, rcParams['mathtext.fontset'], 
prop.get_size_in_points(),
-self.dpi, rcParams['mathtext.default'])
+self.dpi, rcParams['mathtext.default'], cache=True)
 return m.width, m.height, m.depth
 font = self._get_agg_font(prop)
 font.set_text(s, 0.0, flags=LOAD_FORCE_AUTOHINT)  # the width and 
height of unrotated string

Modified: branches/mathtex/lib/matplotlib/backends/backend_cairo.py
===
--- branches/mathtex/lib/matplotlib/backends/backend_cairo.py   2009-08-05 
15:14:35 UTC (rev 7371)
+++ branches/mathtex/lib/matplotlib/backends/backend_cairo.py   2009-08-05 
15:26:30 UTC (rev 7372)
@@ -211,7 +211,7 @@
 ctx = gc.ctx
 
 m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(),
-self.dpi, rcParams['mathtext.default'])
+self.dpi, rcParams['mathtext.default'], cache=True)
 b = MathtexBackendCairo()
 m.render_to_backend(b)
 
@@ -242,7 +242,7 @@
 if ismath:
 if HAVE_MATHTEX:
 m = Mathtex(s, rcParams['mathtext.fontset'], 
prop.get_size_in_points(),
-self.dpi, rcParams['mathtext.default'])
+self.dpi, rcParams['mathtext.default'], cache=True)
 return m.width, m.height, m.depth
 else:
 warnings.warn('matplotlib was compiled without mathtex 
support. ' +

Modified: branches/mathtex/lib/matplotlib/backends/backend_gdk.py
===
--- branches/mathtex/lib/matplotlib/backends/backend_gdk.py 2009-08-05 
15:14:35 UTC (rev 7371)
+++ branches/mathtex/lib/matplotlib/backends/backend_gdk.py 2009-08-05 
15:26:30 UTC (rev 7372)
@@ -167,7 +167,8 @@
 return
 
 m = Mathtex(s, matplotlib.rcParams['mathtext.fontset'],
-prop.get_size_in_points(), self.dpi, 
rcParams['mathtext.default'])
+prop.get_size_in_points(), self.dpi, 
rcParams['mathtext.default'],
+cache=True)
 b = MathtexBackendImage()
 m.render_to_backend(b)
 
@@ -318,7 +319,8 @@
 return 0.0, 0.0, 0.0
 else:
 m = Mathtex(s, matplotlib.rcParams['mathtext.fontset'],
-prop.get_size_in_points(), self.dpi, 
rcParams['mathtext.default'])
+prop.get_size_in_points(), self.dpi, 
rcParams['mathtext.default'],
+cache=True)
 return m.width, m.height, m.depth
 
 layout, inkRect, logicalRect = self._get_pango_layout(s, prop)

Modified: branches/mathtex/lib/matplotlib/backends/backend_macosx.py
===
--- branches/mathtex/lib/matplotlib/backends/backend_macosx.py  2009-08-05 
15:14:35 UTC (rev 7371)
+++ branches/mathtex/lib/matplotlib/backends/backend_macosx.py  2009-08-05 
15:26:30 UTC (rev 7372)
@@ -98,7 +98,7 @@
 return
 
 m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(),
-self.dpi, rcParams['mathtext.default'])
+self.dpi, rcParams['mathtext.default'], cache=True)
 b = MathtexBackendImage()
 m.render_to_backend(b)
 
@@ -126,7 +126,8 @@
 i

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

[jdh2358]

Revision: 7373
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7373&view=rev
Author:   jdh2358
Date: 2009-08-05 15:37:08 + (Wed, 05 Aug 2009)

Log Message:
---
make all-in-one sample data server class cbook.ViewVCCachedServer so it can be 
reused by other projects

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

Modified: trunk/matplotlib/CHANGELOG
===
--- trunk/matplotlib/CHANGELOG  2009-08-05 15:26:30 UTC (rev 7372)
+++ trunk/matplotlib/CHANGELOG  2009-08-05 15:37:08 UTC (rev 7373)
@@ -1,4 +1,5 @@
-2009-08-04 Made cbook.get_mpl_data make use of the ETag and Last-Modified
+
+2009-08-04 Made cbook.get_sample_data make use of the ETag and Last-Modified
headers of mod_dav_svn. - JKS
 
 2009-08-03 Add PathCollection; modify contourf to use complex
@@ -6,9 +7,9 @@
 
 2009-08-03 Fixed boilerplate.py so it doesn't break the ReST docs. - JKS
 
-2009-07-31 Added cbook.get_mpl_data for urllib enabled fetching and
+2009-07-31 Added cbook.get_sample_data for urllib enabled fetching and
cacheing of data needed for examples.  See
-   examples/misc/mpl_data_demo.py - JDH
+   examples/misc/sample_data_demo.py - JDH
 
 ==
 

Modified: trunk/matplotlib/lib/matplotlib/cbook.py
===
--- trunk/matplotlib/lib/matplotlib/cbook.py2009-08-05 15:26:30 UTC (rev 
7372)
+++ trunk/matplotlib/lib/matplotlib/cbook.py2009-08-05 15:37:08 UTC (rev 
7373)
@@ -344,7 +344,7 @@
 def is_scalar_or_string(val):
 return is_string_like(val) or not iterable(val)
 
-class _CacheProcessor(urllib2.BaseHandler):
+class ViewVCCachedServer(urllib2.BaseHandler):
 """
 Urllib2 handler that takes care of caching files.
 The file cache.pck holds the directory of files to be cached.
@@ -354,6 +354,7 @@
 self.baseurl = baseurl
 self.read_cache()
 self.remove_stale_files()
+self.opener = urllib2.build_opener(self)
 
 def in_cache_dir(self, fn):
 # make sure the datadir exists
@@ -394,7 +395,7 @@
 if path not in listed and path != 'cache.pck':
 thisfile = os.path.join(self.cache_dir, path)
 if not os.path.isdir(thisfile):
-
matplotlib.verbose.report('_CacheProcessor:remove_stale_files: removing 
%s'%thisfile,
+
matplotlib.verbose.report('ViewVCCachedServer:remove_stale_files: removing 
%s'%thisfile,
   level='debug')
 os.remove(thisfile)
 
@@ -451,7 +452,7 @@
 url = req.get_full_url()
 fn, _, _ = self.cache[url]
 cachefile = self.in_cache_dir(fn)
-matplotlib.verbose.report('_CacheProcessor: reading data file from 
cache file "%s"'%cachefile)
+matplotlib.verbose.report('ViewVCCachedServer: reading data file from 
cache file "%s"'%cachefile)
 file = open(cachefile, 'rb')
 handle = urllib2.addinfourl(file, hdrs, url)
 handle.code = 304
@@ -473,9 +474,41 @@
 result.msg = response.msg
 return result
 
+def get_sample_data(self, fname, asfileobj=True):
+"""
+Check the cachedirectory for a sample_data file.  If it does
+not exist, fetch it with urllib from the svn repo and
+store it in the cachedir.
+
+If asfileobj is True, a file object will be returned.  Else the
+path to the file as a string will be returned
+
+"""
+
+
+# quote is not in python2.4, so check for it and get it from
+# urllib if it is not available
+quote = getattr(urllib2, 'quote', None)
+if quote is None:
+import urllib
+quote = urllib.quote
+
+url = self.baseurl + quote(fname)
+response = self.opener.open(url)
+
+
+relpath = self.cache[url][0]
+fname = self.in_cache_dir(relpath)
+
+if asfileobj:
+return file(fname)
+else:
+return fname
+
+
 def get_sample_data(fname, asfileobj=True):
 """
-Check the cachedirectory ~/.matplotlib/sample_data for an sample_data
+Check the cachedirectory ~/.matplotlib/sample_data for a sample_data
 file.  If it does not exist, fetch it with urllib from the mpl svn repo
 
   
http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/sample_data/
@@ -488,42 +521,22 @@
 To add a datafile to this directory, you need to check out
 sample_data from matplotlib svn::
 
-  svn co 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/sample_data
+  svn co 
http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/sample_data
 
 and svn add the data file you want to support.  This is primarily
 intended for use in mp

SF.net SVN: matplotlib:[7374] branches/mathtex/setup.py

[mdboom]

Revision: 7374
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7374&view=rev
Author:   mdboom
Date: 2009-08-05 15:40:22 + (Wed, 05 Aug 2009)

Log Message:
---
Fix mathtex-inside-of-matplotlib install (need to explicitly include 
mathtex.backends package)

Modified Paths:
--
branches/mathtex/setup.py

Modified: branches/mathtex/setup.py
===
--- branches/mathtex/setup.py   2009-08-05 15:37:08 UTC (rev 7373)
+++ branches/mathtex/setup.py   2009-08-05 15:40:22 UTC (rev 7374)
@@ -219,7 +219,7 @@
 # Add installation of mathtex
 if not check_for_mathtex():
 package_dir['mathtex'] = 'lib/mathtex/mathtex'
-packages.append('mathtex')
+packages.extend(['mathtex', 'mathtex.backends'])
 
 print_raw("")
 print_raw("OPTIONAL USETEX DEPENDENCIES")


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

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

[jdh2358]

Revision: 7375
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7375&view=rev
Author:   jdh2358
Date: 2009-08-05 15:43:54 + (Wed, 05 Aug 2009)

Log Message:
---
move demo image into axes_grid package so examples will run from anywhere

Modified Paths:
--
trunk/matplotlib/examples/axes_grid/demo_axes_divider.py
trunk/matplotlib/examples/axes_grid/demo_axes_grid.py
trunk/matplotlib/examples/axes_grid/inset_locator_demo2.py
trunk/matplotlib/examples/axes_grid/simple_axesgrid2.py
trunk/matplotlib/examples/axes_grid/simple_rgb.py

Added Paths:
---
trunk/matplotlib/lib/mpl_toolkits/axes_grid/demo_image.py

Removed Paths:
-
trunk/matplotlib/examples/axes_grid/demo_image.py

Modified: trunk/matplotlib/examples/axes_grid/demo_axes_divider.py
===
--- trunk/matplotlib/examples/axes_grid/demo_axes_divider.py2009-08-05 
15:40:22 UTC (rev 7374)
+++ trunk/matplotlib/examples/axes_grid/demo_axes_divider.py2009-08-05 
15:43:54 UTC (rev 7375)
@@ -1,5 +1,5 @@
 import matplotlib.pyplot as plt
-from demo_image import get_demo_image
+from mpl_toolkits.axes_grid.demo_image import get_demo_image
 #import mpl_toolkits.imaging.axes_grid as imaging
 
 def demo_simple_image(ax):

Modified: trunk/matplotlib/examples/axes_grid/demo_axes_grid.py
===
--- trunk/matplotlib/examples/axes_grid/demo_axes_grid.py   2009-08-05 
15:40:22 UTC (rev 7374)
+++ trunk/matplotlib/examples/axes_grid/demo_axes_grid.py   2009-08-05 
15:43:54 UTC (rev 7375)
@@ -1,5 +1,5 @@
 import matplotlib.pyplot as plt
-from demo_image import get_demo_image
+from mpl_toolkits.axes_grid.demo_image import get_demo_image
 from mpl_toolkits.axes_grid import AxesGrid
 
 

Deleted: trunk/matplotlib/examples/axes_grid/demo_image.py
===
--- trunk/matplotlib/examples/axes_grid/demo_image.py   2009-08-05 15:40:22 UTC 
(rev 7374)
+++ trunk/matplotlib/examples/axes_grid/demo_image.py   2009-08-05 15:43:54 UTC 
(rev 7375)
@@ -1,17 +0,0 @@
-import numpy as np
-
-def get_demo_image():
-# prepare image
-delta = 0.5
-
-extent = (-3,4,-4,3)
-x = np.arange(-3.0, 4.001, delta)
-y = np.arange(-4.0, 3.001, delta)
-X, Y = np.meshgrid(x, y)
-import matplotlib.mlab as mlab
-Z1 = mlab.bivariate_normal(X, Y, 1.0, 1.0, 0.0, 0.0)
-Z2 = mlab.bivariate_normal(X, Y, 1.5, 0.5, 1, 1)
-Z = (Z1 - Z2) * 10
-
-return Z, extent
-

Modified: trunk/matplotlib/examples/axes_grid/inset_locator_demo2.py
===
--- trunk/matplotlib/examples/axes_grid/inset_locator_demo2.py  2009-08-05 
15:40:22 UTC (rev 7374)
+++ trunk/matplotlib/examples/axes_grid/inset_locator_demo2.py  2009-08-05 
15:43:54 UTC (rev 7375)
@@ -5,7 +5,7 @@
 
 import numpy as np
 
-from demo_image import get_demo_image
+from mpl_toolkits.axes_grid.demo_image import get_demo_image
 
 
 fig = plt.figure(1, [5,4])

Modified: trunk/matplotlib/examples/axes_grid/simple_axesgrid2.py
===
--- trunk/matplotlib/examples/axes_grid/simple_axesgrid2.py 2009-08-05 
15:40:22 UTC (rev 7374)
+++ trunk/matplotlib/examples/axes_grid/simple_axesgrid2.py 2009-08-05 
15:43:54 UTC (rev 7375)
@@ -1,6 +1,6 @@
 import matplotlib.pyplot as plt
 from mpl_toolkits.axes_grid import AxesGrid
-from demo_image import get_demo_image
+from mpl_toolkits.axes_grid.demo_image import get_demo_image
 
 F = plt.figure(1, (5.5, 3.5))
 grid = AxesGrid(F, 111, # similar to subplot(111)

Modified: trunk/matplotlib/examples/axes_grid/simple_rgb.py
===
--- trunk/matplotlib/examples/axes_grid/simple_rgb.py   2009-08-05 15:40:22 UTC 
(rev 7374)
+++ trunk/matplotlib/examples/axes_grid/simple_rgb.py   2009-08-05 15:43:54 UTC 
(rev 7375)
@@ -1,6 +1,6 @@
 import matplotlib.pyplot as plt
 
-from demo_image import get_demo_image
+from mpl_toolkits.axes_grid.demo_image import get_demo_image
 from mpl_toolkits.axes_grid.axes_rgb import RGBAxes
 
 def get_rgb():

Added: trunk/matplotlib/lib/mpl_toolkits/axes_grid/demo_image.py
===
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid/demo_image.py   
(rev 0)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid/demo_image.py   2009-08-05 
15:43:54 UTC (rev 7375)
@@ -0,0 +1,17 @@
+import numpy as np
+
+def get_demo_image():
+# prepare image
+delta = 0.5
+
+extent = (-3,4,-4,3)
+x = np.arange(-3.0, 4.001, delta)
+y = np.arange(-4.0, 3.001, delta)
+X, Y = np.meshgrid(x, y)
+import matplotlib.mlab as mlab
+Z1 = mlab.bivariate_normal(X, Y, 1.0, 1.0, 0.0, 0.0)
+Z2 = mlab.bivariate_normal(X, Y, 1.5, 0.5, 1, 1)
+Z = (Z1

SF.net SVN: matplotlib:[7377] trunk

[jdh2358]

Revision: 7377
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7377&view=rev
Author:   jdh2358
Date: 2009-08-05 15:52:29 + (Wed, 05 Aug 2009)

Log Message:
---
moved the mpl example data to sample data and ported over the examples

Modified Paths:
--
trunk/matplotlib/examples/api/date_demo.py
trunk/matplotlib/examples/pylab_examples/centered_ticklabels.py
trunk/matplotlib/examples/pylab_examples/scatter_demo2.py
trunk/matplotlib/lib/matplotlib/__init__.py

Added Paths:
---
trunk/sample_data/aapl.npy
trunk/sample_data/goog.npy
trunk/sample_data/msft_nasdaq.npy

Removed Paths:
-
trunk/matplotlib/lib/matplotlib/mpl-data/example/aapl.npy
trunk/matplotlib/lib/matplotlib/mpl-data/example/goog.npy
trunk/matplotlib/lib/matplotlib/mpl-data/example/msft_nasdaq.npy

Modified: trunk/matplotlib/examples/api/date_demo.py
===
--- trunk/matplotlib/examples/api/date_demo.py  2009-08-05 15:47:20 UTC (rev 
7376)
+++ trunk/matplotlib/examples/api/date_demo.py  2009-08-05 15:52:29 UTC (rev 
7377)
@@ -17,6 +17,7 @@
 import matplotlib.pyplot as plt
 import matplotlib.dates as mdates
 import matplotlib.mlab as mlab
+import matplotlib.cbook as cbook
 
 years= mdates.YearLocator()   # every year
 months   = mdates.MonthLocator()  # every month
@@ -26,7 +27,7 @@
 # open, close, volume, adj_close from the mpl-data/example directory.
 # The record array stores python datetime.date as an object array in
 # the date column
-datafile = matplotlib.get_example_data('goog.npy')
+datafile = cbook.get_sample_data('goog.npy')
 r = np.load(datafile).view(np.recarray)
 
 fig = plt.figure()

Modified: trunk/matplotlib/examples/pylab_examples/centered_ticklabels.py
===
--- trunk/matplotlib/examples/pylab_examples/centered_ticklabels.py 
2009-08-05 15:47:20 UTC (rev 7376)
+++ trunk/matplotlib/examples/pylab_examples/centered_ticklabels.py 
2009-08-05 15:52:29 UTC (rev 7377)
@@ -15,12 +15,13 @@
 import datetime
 import numpy as np
 import matplotlib
+import matplotlib.cbook as cbook
 import matplotlib.dates as dates
 import matplotlib.ticker as ticker
 import matplotlib.pyplot as plt
 
 # load some financial data; apple's stock price
-fh = matplotlib.get_example_data('aapl.npy')
+fh = cbook.get_sample_data('aapl.npy')
 r = np.load(fh); fh.close()
 r = r[-250:]  # get the last 250 days
 

Modified: trunk/matplotlib/examples/pylab_examples/scatter_demo2.py
===
--- trunk/matplotlib/examples/pylab_examples/scatter_demo2.py   2009-08-05 
15:47:20 UTC (rev 7376)
+++ trunk/matplotlib/examples/pylab_examples/scatter_demo2.py   2009-08-05 
15:52:29 UTC (rev 7377)
@@ -5,12 +5,13 @@
 import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib.mlab as mlab
+import matplotlib.cbook as cbook
 
 # load a numpy record array from yahoo csv data with fields date,
 # open, close, volume, adj_close from the mpl-data/example directory.
 # The record array stores python datetime.date as an object array in
 # the date column
-datafile = matplotlib.get_example_data('goog.npy')
+datafile = cbook.get_sample_data('goog.npy')
 r = np.load(datafile).view(np.recarray)
 r = r[-250:] # get the most recent 250 trading days
 

Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===
--- trunk/matplotlib/lib/matplotlib/__init__.py 2009-08-05 15:47:20 UTC (rev 
7376)
+++ trunk/matplotlib/lib/matplotlib/__init__.py 2009-08-05 15:52:29 UTC (rev 
7377)
@@ -490,17 +490,9 @@
 
 def get_example_data(fname):
 """
-return a filehandle to one of the example files in mpl-data/example
-
-*fname*
-the name of one of the files in mpl-data/example
+get_example_data is deprecated -- use matplotlib.cbook.get_sample_data 
instead
 """
-datadir = os.path.join(get_data_path(), 'example')
-fullpath = os.path.join(datadir, fname)
-if not os.path.exists(fullpath):
-raise IOError('could not find matplotlib example file "%s" in data 
directory "%s"'%(
-fname, datadir))
-return file(fullpath, 'rb')
+raise NotImplementedError('get_example_data is deprecated -- use 
matplotlib.cbook.get_sample_data instead')
 
 
 def get_py2exe_datafiles():

Deleted: trunk/matplotlib/lib/matplotlib/mpl-data/example/aapl.npy
===
(Binary files differ)

Deleted: trunk/matplotlib/lib/matplotlib/mpl-data/example/goog.npy
===
(Binary files differ)

Deleted: trunk/matplotlib/lib/matplotlib/mpl-data/example/msft_nasdaq.npy
===
(Binary files differ)

Copied: trunk/sample_data/aapl.npy (from rev 7363, 
tru

SF.net SVN: matplotlib:[7378] trunk/matplotlib/lib/matplotlib/mpl-data/ example/

[jdh2358]

Revision: 7378
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7378&view=rev
Author:   jdh2358
Date: 2009-08-05 15:53:11 + (Wed, 05 Aug 2009)

Log Message:
---
moved the mpl example data to sample data and ported over the examples

Removed Paths:
-
trunk/matplotlib/lib/matplotlib/mpl-data/example/


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[7380] trunk/matplotlib/examples

[jdh2358]

Revision: 7380
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7380&view=rev
Author:   jdh2358
Date: 2009-08-05 15:59:24 + (Wed, 05 Aug 2009)

Log Message:
---
port more examples over to sample data

Modified Paths:
--
trunk/matplotlib/examples/api/date_index_formatter.py
trunk/matplotlib/examples/misc/rec_groupby_demo.py
trunk/matplotlib/examples/misc/rec_join_demo.py

Modified: trunk/matplotlib/examples/api/date_index_formatter.py
===
--- trunk/matplotlib/examples/api/date_index_formatter.py   2009-08-05 
15:57:31 UTC (rev 7379)
+++ trunk/matplotlib/examples/api/date_index_formatter.py   2009-08-05 
15:59:24 UTC (rev 7380)
@@ -9,7 +9,7 @@
 import matplotlib.cbook as cbook
 import matplotlib.ticker as ticker
 
-datafile = cbook.get_sample_data('aapl.csv', asobj=False)
+datafile = cbook.get_sample_data('aapl.csv', asfileobj=False)
 print 'loading', datafile
 r = mlab.csv2rec(datafile)
 

Modified: trunk/matplotlib/examples/misc/rec_groupby_demo.py
===
--- trunk/matplotlib/examples/misc/rec_groupby_demo.py  2009-08-05 15:57:31 UTC 
(rev 7379)
+++ trunk/matplotlib/examples/misc/rec_groupby_demo.py  2009-08-05 15:59:24 UTC 
(rev 7380)
@@ -2,11 +2,9 @@
 import matplotlib.mlab as mlab
 import matplotlib.cbook as cbook
 
-datafile = cbook.get_sample_data('aapl.csv', asobj=False)
+datafile = cbook.get_sample_data('aapl.csv', asfileobj=False)
 print 'loading', datafile
 r = mlab.csv2rec(datafile)
-
-r = mlab.csv2rec('../data/aapl.csv')
 r.sort()
 
 def daily_return(prices):

Modified: trunk/matplotlib/examples/misc/rec_join_demo.py
===
--- trunk/matplotlib/examples/misc/rec_join_demo.py 2009-08-05 15:57:31 UTC 
(rev 7379)
+++ trunk/matplotlib/examples/misc/rec_join_demo.py 2009-08-05 15:59:24 UTC 
(rev 7380)
@@ -2,7 +2,7 @@
 import matplotlib.mlab as mlab
 import matplotlib.cbook as cbook
 
-datafile = cbook.get_sample_data('aapl.csv', asobj=False)
+datafile = cbook.get_sample_data('aapl.csv', asfileobj=False)
 print 'loading', datafile
 r = mlab.csv2rec(datafile)
 


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[7381] branches/mathtex/src/ft2font.cpp

[evilguru]

Revision: 7381
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7381&view=rev
Author:   evilguru
Date: 2009-08-05 16:05:38 + (Wed, 05 Aug 2009)

Log Message:
---
Fix an off-by-one error in FT2Font. This is based off of r14 in mathtex.

Modified Paths:
--
branches/mathtex/src/ft2font.cpp

Modified: branches/mathtex/src/ft2font.cpp
===
--- branches/mathtex/src/ft2font.cpp2009-08-05 15:59:24 UTC (rev 7380)
+++ branches/mathtex/src/ft2font.cpp2009-08-05 16:05:38 UTC (rev 7381)
@@ -206,7 +206,7 @@
   y1 = std::min(y1, _height);
 
   for (size_t j=y0; jhttp://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[7383] trunk/matplotlib/examples/pylab_examples

[jdh2358]

Revision: 7383
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7383&view=rev
Author:   jdh2358
Date: 2009-08-05 16:23:06 + (Wed, 05 Aug 2009)

Log Message:
---
removed examples/data; ported all examples to use sample_data

Modified Paths:
--
trunk/matplotlib/examples/pylab_examples/date_index_formatter.py
trunk/matplotlib/examples/pylab_examples/image_demo2.py
trunk/matplotlib/examples/pylab_examples/load_converter.py
trunk/matplotlib/examples/pylab_examples/loadrec.py
trunk/matplotlib/examples/pylab_examples/logo.py
trunk/matplotlib/examples/pylab_examples/plotfile_demo.py

Modified: trunk/matplotlib/examples/pylab_examples/date_index_formatter.py
===
--- trunk/matplotlib/examples/pylab_examples/date_index_formatter.py
2009-08-05 16:21:23 UTC (rev 7382)
+++ trunk/matplotlib/examples/pylab_examples/date_index_formatter.py
2009-08-05 16:23:06 UTC (rev 7383)
@@ -14,7 +14,7 @@
 import matplotlib.cbook as cbook
 from matplotlib.ticker import Formatter
 
-datafile = cbook.get_sample_data('msft.csv', asobj=False)
+datafile = cbook.get_sample_data('msft.csv', asfileobj=False)
 print 'loading', datafile
 r = csv2rec(datafile)[-40:]
 

Modified: trunk/matplotlib/examples/pylab_examples/image_demo2.py
===
--- trunk/matplotlib/examples/pylab_examples/image_demo2.py 2009-08-05 
16:21:23 UTC (rev 7382)
+++ trunk/matplotlib/examples/pylab_examples/image_demo2.py 2009-08-05 
16:23:06 UTC (rev 7383)
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
 from pylab import *
+import matplotlib.cbook as cbook
 
 w, h = 512, 512
 
-datafile = cbook.get_sample_data('ct.raw', asobj=False)
+datafile = cbook.get_sample_data('ct.raw', asfileobj=False)
 print 'loading', datafile
 s = file(datafile, 'rb').read()
 A = fromstring(s, uint16).astype(float)

Modified: trunk/matplotlib/examples/pylab_examples/load_converter.py
===
--- trunk/matplotlib/examples/pylab_examples/load_converter.py  2009-08-05 
16:21:23 UTC (rev 7382)
+++ trunk/matplotlib/examples/pylab_examples/load_converter.py  2009-08-05 
16:23:06 UTC (rev 7383)
@@ -4,7 +4,7 @@
 from pylab import figure, show
 import matplotlib.cbook as cbook
 
-datafile = cbook.get_sample_data('msft.csv', asobj=False)
+datafile = cbook.get_sample_data('msft.csv', asfileobj=False)
 print 'loading', datafile
 
 dates, closes = np.loadtxt(

Modified: trunk/matplotlib/examples/pylab_examples/loadrec.py
===
--- trunk/matplotlib/examples/pylab_examples/loadrec.py 2009-08-05 16:21:23 UTC 
(rev 7382)
+++ trunk/matplotlib/examples/pylab_examples/loadrec.py 2009-08-05 16:23:06 UTC 
(rev 7383)
@@ -2,7 +2,7 @@
 from pylab import figure, show
 import matplotlib.cbook as cbook
 
-datafile = cbook.get_sample_data('msft.csv', asobj=False)
+datafile = cbook.get_sample_data('msft.csv', asfileobj=False)
 print 'loading', datafile
 a = mlab.csv2rec(datafile)
 a.sort()

Modified: trunk/matplotlib/examples/pylab_examples/logo.py
===
--- trunk/matplotlib/examples/pylab_examples/logo.py2009-08-05 16:21:23 UTC 
(rev 7382)
+++ trunk/matplotlib/examples/pylab_examples/logo.py2009-08-05 16:23:06 UTC 
(rev 7383)
@@ -4,7 +4,7 @@
 
 
 # convert data to mV
-datafile = cbook.get_sample_data('membrane.dat', asobj=False)
+datafile = cbook.get_sample_data('membrane.dat', asfileobj=False)
 print 'loading', datafile
 
 x = 1000*0.1*fromstring(file(datafile, 'rb').read(), float32)

Modified: trunk/matplotlib/examples/pylab_examples/plotfile_demo.py
===
--- trunk/matplotlib/examples/pylab_examples/plotfile_demo.py   2009-08-05 
16:21:23 UTC (rev 7382)
+++ trunk/matplotlib/examples/pylab_examples/plotfile_demo.py   2009-08-05 
16:23:06 UTC (rev 7383)
@@ -1,8 +1,8 @@
 from pylab import plotfile, show, gca
 import matplotlib.cbook as cbook
 
-fname = cbook.get_sample_data('msft.csv', asobj=False)
-fname2 = cbook.get_sample_data('data_x_x2_x3.csv', asobj=False)
+fname = cbook.get_sample_data('msft.csv', asfileobj=False)
+fname2 = cbook.get_sample_data('data_x_x2_x3.csv', asfileobj=False)
 
 # test 1; use ints
 plotfile(fname, (0,5,6))


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mail

SF.net SVN: matplotlib:[7384] trunk/matplotlib/examples

[jdh2358]

Revision: 7384
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7384&view=rev
Author:   jdh2358
Date: 2009-08-05 16:24:03 + (Wed, 05 Aug 2009)

Log Message:
---
fixed typo in sample data examples

Modified Paths:
--
trunk/matplotlib/examples/api/watermark_image.py
trunk/matplotlib/examples/user_interfaces/embedding_in_wx3.py
trunk/matplotlib/examples/user_interfaces/rec_edit_gtk_custom.py
trunk/matplotlib/examples/user_interfaces/rec_edit_gtk_simple.py

Modified: trunk/matplotlib/examples/api/watermark_image.py
===
--- trunk/matplotlib/examples/api/watermark_image.py2009-08-05 16:23:06 UTC 
(rev 7383)
+++ trunk/matplotlib/examples/api/watermark_image.py2009-08-05 16:24:03 UTC 
(rev 7384)
@@ -8,7 +8,7 @@
 import matplotlib.image as image
 import matplotlib.pyplot as plt
 
-datafile = cbook.get_sample_data('logo2.png', asobj=False)
+datafile = cbook.get_sample_data('logo2.png', asfileobj=False)
 print 'loading', datafile
 im = image.imread(datafile)
 im[:,:,-1] = 0.5  # set the alpha channel

Modified: trunk/matplotlib/examples/user_interfaces/embedding_in_wx3.py
===
--- trunk/matplotlib/examples/user_interfaces/embedding_in_wx3.py   
2009-08-05 16:23:06 UTC (rev 7383)
+++ trunk/matplotlib/examples/user_interfaces/embedding_in_wx3.py   
2009-08-05 16:24:03 UTC (rev 7384)
@@ -102,7 +102,7 @@
 
 class MyApp(wx.App):
 def OnInit(self):
-xrcfile = cbook.get_sample_data('embedding_in_wx3.xrc', asobj=False)
+xrcfile = cbook.get_sample_data('embedding_in_wx3.xrc', 
asfileobj=False)
 print 'loading', xrcfile
 
 self.res = xrc.XmlResource(xrcfile)

Modified: trunk/matplotlib/examples/user_interfaces/rec_edit_gtk_custom.py
===
--- trunk/matplotlib/examples/user_interfaces/rec_edit_gtk_custom.py
2009-08-05 16:23:06 UTC (rev 7383)
+++ trunk/matplotlib/examples/user_interfaces/rec_edit_gtk_custom.py
2009-08-05 16:24:03 UTC (rev 7384)
@@ -10,7 +10,7 @@
 import mpl_toolkits.gtktools as gtktools
 
 
-datafile = cbook.get_sample_data('demodata.csv', asobj=False)
+datafile = cbook.get_sample_data('demodata.csv', asfileobj=False)
 r = mlab.csv2rec(datafile, converterd={'weekdays':str})
 
 

Modified: trunk/matplotlib/examples/user_interfaces/rec_edit_gtk_simple.py
===
--- trunk/matplotlib/examples/user_interfaces/rec_edit_gtk_simple.py
2009-08-05 16:23:06 UTC (rev 7383)
+++ trunk/matplotlib/examples/user_interfaces/rec_edit_gtk_simple.py
2009-08-05 16:24:03 UTC (rev 7384)
@@ -8,7 +8,7 @@
 import matplotlib.cbook as cbook
 import mpl_toolkits.gtktools as gtktools
 
-datafile = cbook.get_sample_data('demodata.csv', asobj=False)
+datafile = cbook.get_sample_data('demodata.csv', asfileobj=False)
 r = mlab.csv2rec(datafile, converterd={'weekdays':str})
 
 liststore, treeview, win = gtktools.edit_recarray(r)


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[7385] trunk/matplotlib/examples/pylab_examples

[jdh2358]

Revision: 7385
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7385&view=rev
Author:   jdh2358
Date: 2009-08-05 16:30:55 + (Wed, 05 Aug 2009)

Log Message:
---
fixed a couple of missing cbook imports in sample_data examples

Modified Paths:
--
trunk/matplotlib/examples/pylab_examples/image_demo3.py
trunk/matplotlib/examples/pylab_examples/logo.py

Modified: trunk/matplotlib/examples/pylab_examples/image_demo3.py
===
--- trunk/matplotlib/examples/pylab_examples/image_demo3.py 2009-08-05 
16:24:03 UTC (rev 7384)
+++ trunk/matplotlib/examples/pylab_examples/image_demo3.py 2009-08-05 
16:30:55 UTC (rev 7385)
@@ -5,8 +5,10 @@
 except ImportError, exc:
 raise SystemExit("PIL must be installed to run this example")
 
+import matplotlib.cbook as cbook
+
 datafile = cbook.get_sample_data('lena.jpg')
-lena = cbook.Image.open(datafile)
+lena = Image.open(datafile)
 dpi = rcParams['figure.dpi']
 figsize = lena.size[0]/dpi, lena.size[1]/dpi
 

Modified: trunk/matplotlib/examples/pylab_examples/logo.py
===
--- trunk/matplotlib/examples/pylab_examples/logo.py2009-08-05 16:24:03 UTC 
(rev 7384)
+++ trunk/matplotlib/examples/pylab_examples/logo.py2009-08-05 16:30:55 UTC 
(rev 7385)
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 # This file generates the matplotlib web page logo
 from pylab import *
+import matplotlib.cbook as cbook
 
-
 # convert data to mV
 datafile = cbook.get_sample_data('membrane.dat', asfileobj=False)
 print 'loading', datafile


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[7386] trunk/toolkits/basemap/lib/mpl_toolkits/ basemap/__init__.py

[jswhit]

Revision: 7386
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7386&view=rev
Author:   jswhit
Date: 2009-08-05 16:55:48 + (Wed, 05 Aug 2009)

Log Message:
---
fix bug preventing drawing of parallels in some projections.

Modified Paths:
--
trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py

Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2009-08-05 
16:30:55 UTC (rev 7385)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2009-08-05 
16:55:48 UTC (rev 7386)
@@ -1789,8 +1789,7 @@
 yd = (y[1:]-y[0:-1])**2
 dist = np.sqrt(xd+yd)
 split = dist > 50.
-if np.sum(split) and self.projection not in \
-   ['cyl', 'merc', 'mill', 'gall', 'moll', 'robin', 'sinu', 
'mbtfpq']:
+if np.sum(split) and self.projection not in _cylproj:
 ind = 
(np.compress(split,np.squeeze(split*np.indices(xd.shape)))+1).tolist()
 xl = []
 yl = []
@@ -2028,7 +2027,7 @@
 yd = (y[1:]-y[0:-1])**2
 dist = np.sqrt(xd+yd)
 split = dist > 50.
-if np.sum(split) and self.projection not in _cylproj + 
_pseudocyl:
+if np.sum(split) and self.projection not in _cylproj:
 ind = 
(np.compress(split,np.squeeze(split*np.indices(xd.shape)))+1).tolist()
 xl = []
 yl = []


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[7387] trunk/sample_data/INTC.dat

[jdh2358]

Revision: 7387
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7387&view=rev
Author:   jdh2358
Date: 2009-08-05 17:16:00 + (Wed, 05 Aug 2009)

Log Message:
---
added INTC sample data

Added Paths:
---
trunk/sample_data/INTC.dat

Added: trunk/sample_data/INTC.dat
===
(Binary files differ)


Property changes on: trunk/sample_data/INTC.dat
___
Added: svn:mime-type
   + application/octet-stream


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[7388] trunk/sample_data/AAPL.dat

[jdh2358]

Revision: 7388
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7388&view=rev
Author:   jdh2358
Date: 2009-08-05 17:16:50 + (Wed, 05 Aug 2009)

Log Message:
---
added AAPL sample data

Added Paths:
---
trunk/sample_data/AAPL.dat

Added: trunk/sample_data/AAPL.dat
===
(Binary files differ)


Property changes on: trunk/sample_data/AAPL.dat
___
Added: svn:mime-type
   + application/octet-stream


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[7389] trunk/matplotlib/examples/pylab_examples/ data_helper.py

[jdh2358]

Revision: 7389
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7389&view=rev
Author:   jdh2358
Date: 2009-08-05 17:20:12 + (Wed, 05 Aug 2009)

Log Message:
---
fixed another example to use sample data

Modified Paths:
--
trunk/matplotlib/examples/pylab_examples/data_helper.py

Modified: trunk/matplotlib/examples/pylab_examples/data_helper.py
===
--- trunk/matplotlib/examples/pylab_examples/data_helper.py 2009-08-05 
17:16:50 UTC (rev 7388)
+++ trunk/matplotlib/examples/pylab_examples/data_helper.py 2009-08-05 
17:20:12 UTC (rev 7389)
@@ -2,7 +2,7 @@
 # Some functions to load a return data for the plot demos
 
 from numpy import fromstring, argsort, take, array, resize
-
+import matplotlib.cbook as cbook
 def get_two_stock_data():
 """
 load stock time and price data for two stocks The return values
@@ -10,11 +10,14 @@
 and 2 (intc and aapl)
 """
 ticker1, ticker2 = 'INTC', 'AAPL'
-M1 = fromstring( file('../data/%s.dat' % ticker1, 'rb').read(), 'http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[7390] trunk/matplotlib/examples/pylab_examples/ mri_demo.py

[jdh2358]

Revision: 7390
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7390&view=rev
Author:   jdh2358
Date: 2009-08-05 17:21:09 + (Wed, 05 Aug 2009)

Log Message:
---
fixed another example to use sample data

Modified Paths:
--
trunk/matplotlib/examples/pylab_examples/mri_demo.py

Modified: trunk/matplotlib/examples/pylab_examples/mri_demo.py
===
--- trunk/matplotlib/examples/pylab_examples/mri_demo.py2009-08-05 
17:20:12 UTC (rev 7389)
+++ trunk/matplotlib/examples/pylab_examples/mri_demo.py2009-08-05 
17:21:09 UTC (rev 7390)
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
 from pylab import *
-
+import matplotlib.cbook as cbook
 # data are 256x256 16 bit integers
-dfile = '../data/s1045.ima'
-im = fromstring(file(dfile, 'rb').read(), uint16).astype(float)
+dfile = cbook.get_sample_data('s1045.ima', asfileobj=False)
+print 'loading image', dfile
+im = np.fromstring(file(dfile, 'rb').read(), np.uint16).astype(float)
 im.shape = 256, 256
 
 #imshow(im, ColormapJet(256))


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[7391] trunk/matplotlib/doc/devel/coding_guide.rst

[jdh2358]

Revision: 7391
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7391&view=rev
Author:   jdh2358
Date: 2009-08-05 17:36:27 + (Wed, 05 Aug 2009)

Log Message:
---
updated devel doc with sample_data instructions

Modified Paths:
--
trunk/matplotlib/doc/devel/coding_guide.rst

Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===
--- trunk/matplotlib/doc/devel/coding_guide.rst 2009-08-05 17:21:09 UTC (rev 
7390)
+++ trunk/matplotlib/doc/devel/coding_guide.rst 2009-08-05 17:36:27 UTC (rev 
7391)
@@ -563,6 +563,45 @@
 
 .. _license-discussion:
 
+
+Writing examples
+
+
+We have hundreds of examples in subdirectories of
+file:`matplotlib/examples` in the trunk, and these are automatically
+generated when the website it built to show up both in the `examples
+`_ and `gallery
+`_ sections of the
+website.  Many people find these examples from the website, and do not
+have ready access to the file:`examples` directory in which they
+reside.  Thus any example data that is required for the example should
+be provided through the sample_data svn directory, which can then be
+accessed using :func:`matplotlib.cbook.get_sample_data`.  First get a
+copy of the repository and svn add your data::
+
+svn co 
http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/sample_data
+cp ~/path/to/mydata.dat sample_data/
+cd sample_data
+svn add mydata.dat
+svn commit -m 'added my data'
+
+and then in your example code you can load it into a file handle with::
+
+import matplotlib.cbook as cbook
+fh = cbook.get_sample_data('mydata.dat')
+
+The file will be fetched from the svn repo using urllib and updated
+when the revision number changes.
+
+
+If you prefer just to get the full path to the file instead of an file
+object::
+
+import matplotlib.cbook as cbook
+datafile = cbook.get_sample_data('mydata.dat', asfileobj=False)
+print 'datafile', datafile
+
+
 Licenses
 
 
@@ -630,3 +669,4 @@
 extensions for scientific computing: ipython, numpy, scipy, the
 enthought tool suite and python itself are all distributed under BSD
 compatible licenses.
+>
\ No newline at end of file


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

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

[jdh2358]

Revision: 7392
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7392&view=rev
Author:   jdh2358
Date: 2009-08-05 17:59:12 + (Wed, 05 Aug 2009)

Log Message:
---
fixed some svn doc bugs;

Modified Paths:
--
trunk/matplotlib/doc/devel/coding_guide.rst
trunk/matplotlib/lib/matplotlib/cbook.py

Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===
--- trunk/matplotlib/doc/devel/coding_guide.rst 2009-08-05 17:36:27 UTC (rev 
7391)
+++ trunk/matplotlib/doc/devel/coding_guide.rst 2009-08-05 17:59:12 UTC (rev 
7392)
@@ -579,7 +579,7 @@
 accessed using :func:`matplotlib.cbook.get_sample_data`.  First get a
 copy of the repository and svn add your data::
 
-svn co 
http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/sample_data
+svn co 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/sample_data
 cp ~/path/to/mydata.dat sample_data/
 cd sample_data
 svn add mydata.dat

Modified: trunk/matplotlib/lib/matplotlib/cbook.py
===
--- trunk/matplotlib/lib/matplotlib/cbook.py2009-08-05 17:36:27 UTC (rev 
7391)
+++ trunk/matplotlib/lib/matplotlib/cbook.py2009-08-05 17:59:12 UTC (rev 
7392)
@@ -521,7 +521,7 @@
 To add a datafile to this directory, you need to check out
 sample_data from matplotlib svn::
 
-  svn co 
http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/sample_data
+  svn co 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/sample_data
 
 and svn add the data file you want to support.  This is primarily
 intended for use in mpl examples that need custom data


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[7393] branches/v0_99_maint/lib/mpl_toolkits/ axes_grid

[leejjoon]

Revision: 7393
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7393&view=rev
Author:   leejjoon
Date: 2009-08-05 19:12:38 + (Wed, 05 Aug 2009)

Log Message:
---
fix typo in axes_divider.py. use nanmin, nanmax in angle_helper.py (patch by 
Christoph Gohlke)

Modified Paths:
--
branches/v0_99_maint/lib/mpl_toolkits/axes_grid/angle_helper.py
branches/v0_99_maint/lib/mpl_toolkits/axes_grid/axes_divider.py

Modified: branches/v0_99_maint/lib/mpl_toolkits/axes_grid/angle_helper.py
===
--- branches/v0_99_maint/lib/mpl_toolkits/axes_grid/angle_helper.py 
2009-08-05 17:59:12 UTC (rev 7392)
+++ branches/v0_99_maint/lib/mpl_toolkits/axes_grid/angle_helper.py 
2009-08-05 19:12:38 UTC (rev 7393)
@@ -293,14 +293,14 @@
 # iron out jumps, but algorithm should be improved.
 # Tis is just naive way of doing and my fail for some cases.
 if self.lon_cycle is not None:
-lon0 = lon.min()
+lon0 = np.nanmin(lon)
 lon -= 360. * ((lon - lon0) > 180.)
 if self.lat_cycle is not None:
-lat0 = lat.min()
+lat0 = np.nanmin(lat)
 lat -= 360. * ((lat - lat0) > 180.)
 
-lon_min, lon_max = lon.min(), lon.max()
-lat_min, lat_max = lat.min(), lat.max()
+lon_min, lon_max = np.nanmin(lon), np.nanmax(lon)
+lat_min, lat_max = np.nanmin(lat), np.nanmax(lat)
 
 lon_min, lon_max, lat_min, lat_max = \
  self._adjust_extremes(lon_min, lon_max, lat_min, lat_max)

Modified: branches/v0_99_maint/lib/mpl_toolkits/axes_grid/axes_divider.py
===
--- branches/v0_99_maint/lib/mpl_toolkits/axes_grid/axes_divider.py 
2009-08-05 17:59:12 UTC (rev 7392)
+++ branches/v0_99_maint/lib/mpl_toolkits/axes_grid/axes_divider.py 
2009-08-05 19:12:38 UTC (rev 7393)
@@ -544,7 +544,7 @@
 def apply_aspect(self, position=None):
 
 if self.get_axes_locator() is None:
-self._axes_class.apply_apsect(self, position)
+self._axes_class.apply_aspect(self, position)
 else:
 pos = self.get_axes_locator()(self, self._locator_renderer)
 self._axes_class.apply_aspect(self, position=pos)


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

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

[leejjoon]

Revision: 7394
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7394&view=rev
Author:   leejjoon
Date: 2009-08-05 19:18:26 + (Wed, 05 Aug 2009)

Log Message:
---
Merged revisions 7393 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint


  r7393 | leejjoon | 2009-08-05 15:12:38 -0400 (Wed, 05 Aug 2009) | 1 line
  
  fix typo in axes_divider.py. use nanmin, nanmax in angle_helper.py (patch by 
Christoph Gohlke)


Modified Paths:
--
trunk/matplotlib/lib/mpl_toolkits/axes_grid/angle_helper.py
trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_divider.py

Property Changed:

trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
trunk/matplotlib/doc/sphinxext/gen_rst.py
trunk/matplotlib/examples/misc/multiprocess.py
trunk/matplotlib/examples/mplot3d/contour3d_demo.py
trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
trunk/matplotlib/examples/mplot3d/polys3d_demo.py
trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
trunk/matplotlib/examples/mplot3d/surface3d_demo.py
trunk/matplotlib/examples/mplot3d/wire3d_demo.py
trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py


Property changes on: trunk/matplotlib
___
Modified: svnmerge-integrated
   - /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 
/branches/v0_99_maint:1-7362
   + /branches/mathtex:1-7263 /branches/v0_99_maint:1-7393 
/branches/v0_98_5_maint:1-7253
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393


Property changes on: trunk/matplotlib/doc/pyplots/README
___
Modified: svn:mergeinfo
   - 
/branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338
   + 
/branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393


Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338
   + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,

SF.net SVN: matplotlib:[7395] branches/v0_99_maint/lib/matplotlib/colors.py

[jdh2358]

Revision: 7395
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7395&view=rev
Author:   jdh2358
Date: 2009-08-05 19:49:43 + (Wed, 05 Aug 2009)

Log Message:
---
fixed an alpha colormapping bug posted on sf 2832575

Modified Paths:
--
branches/v0_99_maint/lib/matplotlib/colors.py

Modified: branches/v0_99_maint/lib/matplotlib/colors.py
===
--- branches/v0_99_maint/lib/matplotlib/colors.py   2009-08-05 19:18:26 UTC 
(rev 7394)
+++ branches/v0_99_maint/lib/matplotlib/colors.py   2009-08-05 19:49:43 UTC 
(rev 7395)
@@ -488,7 +488,7 @@
 if not self._isinit: self._init()
 alpha = min(alpha, 1.0) # alpha must be between 0 and 1
 alpha = max(alpha, 0.0)
-self._lut[:-3, -1] = alpha
+self._lut[:,-1] = alpha
 mask_bad = None
 if not cbook.iterable(X):
 vtype = 'scalar'


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

--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
___
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins