Merged revisions 3962-3983 via svnmerge from

mdboom · mdboom · commit f282ff8a7b37 · 2007-10-23T14:30:57.000Z
http://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib ........ r3963 | mdboom | 2007-10-18 13:40:30 -0400 (Thu, 18 Oct 2007) | 1 line Major speedup in PDF backend by using hasattr() rather than 'in dir()' ........ r3964 | mdboom | 2007-10-18 14:07:06 -0400 (Thu, 18 Oct 2007) | 1 line Faster version of fill() for PDF writing ........ r3966 | jdh2358 | 2007-10-19 10:23:48 -0400 (Fri, 19 Oct 2007) | 2 lines fixed a verbose report bug in patches ........ r3967 | dsdale | 2007-10-19 10:43:21 -0400 (Fri, 19 Oct 2007) | 2 lines removed a gsave/grestore pair surrounding _draw_ps ........ r3968 | dsdale | 2007-10-19 11:37:41 -0400 (Fri, 19 Oct 2007) | 3 lines changed dependency check for ghostscript, which was failing to identify svn versions ........ r3969 | dsdale | 2007-10-19 11:41:25 -0400 (Fri, 19 Oct 2007) | 2 lines whitespace cleanup ........ r3975 | jdh2358 | 2007-10-21 12:02:07 -0400 (Sun, 21 Oct 2007) | 1 line added a show method for gtk fig manager ........ svn path=/branches/transforms/; revision=3984
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+2007-10-19 Removed a gsave/grestore pair surrounding _draw_ps, which
+           was causing a loss graphics state info (see "EPS output
+           problem - scatter & edgecolors" on mpl-dev, 2007-10-29)
+           - DSD
+
 2007-10-15 Fixed a bug in patches.Ellipse that was broken for
            aspect='auto'.  Scale free ellipses now work properly for
            equal and auto on Agg and PS, and they fall back on a
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -149,13 +149,10 @@ class Verbose:
     # --verbose-silent or --verbose-helpful
     _commandLineVerbose = None
 
-
     for arg in sys.argv[1:]:
         if not arg.startswith('--verbose-'): continue
         _commandLineVerbose = arg[10:]
 
-
-
     def __init__(self):
         self.set_level('silent')
         self.fileo = sys.stdout
@@ -195,8 +192,6 @@ def report(self, s, level='helpful'):
             return True
         return False
 
-
-
     def wrap(self, fmt, func, level='helpful', always=True):
         """
         return a callable function that wraps func and reports it
@@ -225,6 +220,7 @@ def ge(self, level):
 
 verbose=Verbose()
 
+
 def checkdep_dvipng():
     try:
         stdin, stdout = os.popen4('dvipng -version')
@@ -243,7 +239,7 @@ def checkdep_ghostscript():
             command = 'gs -v'
         stdin, stdout = os.popen4(command)
         line = stdout.readlines()[0]
-        v = line.split()[2]
+        v = line.split()[-2]
         vtest = '.'.join(v.split('.')[:2]) # deal with version numbers like '7.07.1'
         float(vtest)
         return vtest
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -390,7 +390,7 @@ def __init__(self, canvas, num):
 
         self.window = gtk.Window()
         self.window.set_title("Figure %d" % num)
-
+        
         self.vbox = gtk.VBox()
         self.window.add(self.vbox)
         self.vbox.show()
@@ -439,7 +439,10 @@ def destroy(self, *args):
                gtk.main_level() >= 1:
             gtk.main_quit()
 
-
+    def show(self):
+        # show the figure window
+        self.window.show()
+        
     def full_screen_toggle (self):
         self._full_screen_flag = not self._full_screen_flag
         if self._full_screen_flag:
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -777,7 +777,6 @@ def _draw_ps(self, ps, gc, rgbFace, fill=True, stroke=True, command=None):
         """
         # local variable eliminates all repeated attribute lookups
         write = self._pswriter.write
-        # write('gsave\n')
         if debugPS and command:
             write("% "+command+"\n")
 
@@ -818,7 +817,6 @@ def _draw_ps(self, ps, gc, rgbFace, fill=True, stroke=True, command=None):
             write("grestore\n")
         if cliprect:
             write("grestore\n")
-        #write('grestore\n')
 
             
 class GraphicsContextPS(GraphicsContextBase):
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -288,7 +288,6 @@ def set_linestyles(self, ls):
                 raise ValueError()
         except ValueError:
             raise ValueError('Do not know how to convert %s to dashes'%ls)
-
         self._linestyles = dashes
     set_dashes = set_linestyle = set_linestyles
         
diff --git a/lib/matplotlib/config/checkdep.py b/lib/matplotlib/config/checkdep.py
@@ -1,4 +1,7 @@
-import os, re, sys
+import os
+import re
+import sys
+import warnings
 import distutils.version as version
 
 def dvipng():
@@ -19,7 +22,7 @@ def ghostscript():
             command = 'gs -v'
         stdin, stdout = os.popen4(command)
         line = stdout.readlines()[0]
-        v = line.split()[2]
+        v = line.split()[-2]
         vtest = '.'.join(v.split('.')[:2]) # deal with version numbers like '7.07.1'
         float(vtest)
         return vtest
@@ -130,4 +133,4 @@ def usetex(s):
                        'unless ghostscript-%s or later is '
                        'installed on your system') % gs_req)
 
-    return flag
+    return flag
diff --git a/setup.py b/setup.py
@@ -24,8 +24,8 @@
 # it.  It makes very nice antialiased output and also supports alpha
 # blending
 BUILD_AGG          = 1
-BUILD_GTKAGG       = 'auto'
-BUILD_GTK          = 'auto'
+BUILD_GTKAGG       = 1
+BUILD_GTK          = 1
 
 # build TK GUI with Agg renderer ; requires Tkinter Python extension
 # and Tk includes
@@ -271,7 +271,7 @@ def add_dateutil():
 # packagers: set rc['numerix'] and rc['backend'] here to override the auto
 # defaults, eg
 #rc['numerix'] = numpy
-#rc['backend'] = GTKAgg
+#rc['backend'] = 'GTKAgg'
 if sys.platform=='win32':
     rc = dict(backend='TkAgg', numerix='numpy')
 template = file('matplotlibrc.template').read()
diff --git a/setupext.py b/setupext.py
@@ -43,9 +43,10 @@
 
 import os
 
+
 basedir = {
     'win32'  : ['win32_static',],
-    'linux2' : ['/usr/local', '/usr',],
+    'linux2' : ['/usr/local', '/usr'],
     'linux'  : ['/usr/local', '/usr',],
     'cygwin' : ['/usr/local', '/usr',],
     'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
@@ -170,6 +171,7 @@ def has_pkgconfig():
     if sys.platform == 'win32':
         has_pkgconfig.cache = False
     else:
+        #print 'environ',  os.environ['PKG_CONFIG_PATH']
         status, output = commands.getstatusoutput("pkg-config --help")
         has_pkgconfig.cache = (status == 0)
     return has_pkgconfig.cache
@@ -192,6 +194,9 @@ def get_pkgconfig(module,
 
     status, output = commands.getstatusoutput(
         "%s %s %s" % (pkg_config_exec, flags, packages))
+    #if packages.startswith('pygtk'):
+    #    print 'status', status, output
+    #    raise SystemExit
     if status == 0:
         for token in output.split():
             attr = _flags.get(token[:2], None)
