fixed Jochen and Andrews bugs

jdh2358 · jdh2358 · commit 7fc9539458cd · 2004-10-13T22:00:59.000Z
svn path=/trunk/matplotlib/; revision=587
diff --git a/GOALS b/GOALS
diff --git a/INSTALL b/INSTALL
@@ -57,6 +57,11 @@ COMPILING
   location, you will need to set the MATPLOTLIBDATA environment
   variable to point to the install base dir.
  
+  Once you have everything above set to your liking, just do the usual
+  thing
+
+      python setup.py build
+      python setup.py install
     
 WINDOWS
 
diff --git a/LICENSE/LICENSE_TTFQUERY b/LICENSE/LICENSE_TTFQUERY
diff --git a/README b/README
@@ -22,7 +22,7 @@ INTRODUCTION:
   properties, axes properties, etc, via an object oriented interface
   or via a handle graphics interface familiar to matlab users. A
   summary of the goals of matplotlib and the progress so far can be
-  found here.
+  found at http://matplotlib.sf.net/goals.html.
 
 REQUIREMENTS:
 
diff --git a/TODO b/TODO
@@ -589,4 +589,6 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- why is tkagg loading init 2x
 
--- add ishold and spy
+-- add ishold and spy
+
+-- Humufr's shared ticker bug
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -398,7 +398,7 @@ def cla(self):
         self.tables = []
         self.artists = []
         self.images = []
-        self.legend = None
+        self.legend_ = None
         self.collections = []  # collection.Collection instances
 
         self.images = []
@@ -832,8 +832,8 @@ def draw(self, renderer, *args, **kwargs):
             a.draw(renderer)
 
 
-        if self.legend is not None:
-            self.legend.draw(renderer)
+        if self.legend_ is not None:
+            self.legend_.draw(renderer)
 
         for table in self.tables:
             table.draw(renderer)
@@ -965,8 +965,8 @@ def get_child_artists(self):
         artists.extend(self.lines)
         artists.extend(self.patches)
         artists.extend(self.texts)
-        if self.legend is not None:
-            artists.append(self.legend)
+        if self.legend_ is not None:
+            artists.append(self.legend_)
         return artists
     
     def get_frame(self):
@@ -975,7 +975,7 @@ def get_frame(self):
 
     def get_legend(self):
         'Return the Legend instance, or None if no legend is defined'
-        return self.legend
+        return self.legend_
 
 
     def get_lines(self):
@@ -1292,8 +1292,8 @@ def legend(self, *args, **kwargs):
             raise RuntimeError('Invalid arguments to legend')
 
         lines = flatten(lines)
-        self.legend = Legend(self, lines, labels, loc)
-        return self.legend
+        self.legend_ = Legend(self, lines, labels, loc)
+        return self.legend_
 
     def loglog(self, *args, **kwargs):
         """
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -586,12 +586,9 @@ def show(mainloop=True):
     for manager in Gcf.get_all_fig_managers():
         manager.window.show()
         
-    #if show._needmain and mainloop:
     if gtk.main_level() == 0 and mainloop:
         if gtk.pygtk_version >= (2,4,0):  gtk.main()
         else:                              gtk.mainloop()
-        #show._needmain = False
-#show._needmain = True
 
 def _quit_after_print_xvfb(*args):
 
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -64,7 +64,7 @@
     # common application, not really useful
     "/usr/lib/openoffice/share/fonts/truetype/",
     # documented as a good place to install new fonts...
-    "/usr/share/fonts",
+    "/usr/share/fonts/",
     # okay, now the OS X variants...
     "~/Library/Fonts/",
     "/Library/Fonts/",
@@ -132,12 +132,12 @@ def x11FontDirectory():
     else:
         fontpaths = []
         #def add(arg, directory, files):
-        def add(directory):
+        def add(arg,directory,files):
             fontpaths.append(directory)
         for fontdir in X11FontDirectories:
             try:
                 if os.path.isdir(fontdir):
-                    os.path.walk(fontdir, add, ())
+                    os.path.walk(fontdir, add, None)
             except (IOError, OSError, TypeError, ValueError):
                 pass
         return fontpaths
