reverted tkagg show, sigh

jdh2358 · jdh2358 · commit 629e83dbd0d5 · 2004-12-28T20:25:47.000Z
svn path=/trunk/matplotlib/; revision=820
diff --git a/TODO b/TODO
@@ -612,4 +612,6 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- DONE agg rotation bug for angles > 180
 
--- mathtext color is wrong in PS
+-- DONE mathtext color is wrong in PS
+
+-- reverse pie rotation
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -1125,7 +1125,7 @@ def draw(self, renderer):
 
         if len(self.images)==1:
             im = self.images[0]
-            im.draw(renderer)
+            if im.get_visible(): im.draw(renderer)
         elif len(self.images)>1:
             # make a composite image blending alpha
             # list of (_image.Image, ox, oy)
@@ -1134,7 +1134,7 @@ def draw(self, renderer):
                 raise ValueError('Composite images with different origins not supported')
             else:
                 origin = self.images[0].origin
-            ims = [(im.make_image(renderer),0,0) for im in self.images]
+            ims = [(im.make_image(renderer),0,0) for im in self.images if im.get_visible()]
 
                 
             im = _image.from_images(self.bbox.height(), self.bbox.width(), ims)
@@ -1146,8 +1146,8 @@ def draw(self, renderer):
             
 
         if self.axison:
-            self.xaxis.draw(renderer)
-            self.yaxis.draw(renderer)
+            if self.xaxis.get_visible(): self.xaxis.draw(renderer)
+            if self.yaxis.get_visible(): self.yaxis.draw(renderer)
 
 
         artists = []
@@ -1156,24 +1156,24 @@ def draw(self, renderer):
         artists.extend(self.lines)
         artists.extend(self.texts)
 
-        dsu = [ (a.zorder, a) for a in artists]
+        dsu = [ (a.zorder, a) for a in artists if a.get_visible()]
         dsu.sort()
         
         for zorder, a in dsu:
             a.draw(renderer)
 
-        self.title.draw(renderer)
+        if self.title.get_visible(): self.title.draw(renderer)
         if 0: bbox_artist(self.title, renderer)
         # optional artists
         for a in self.artists:
             a.draw(renderer)
 
 
         if self.legend_ is not None:
-            self.legend_.draw(renderer)
+           if self.legend_.get_visible(): self.legend_.draw(renderer)
 
         for table in self.tables:
-            table.draw(renderer)
+            if table.get_visible(): table.draw(renderer)
 
         self.transData.thaw()  # release the lazy objects
         self.transAxes.thaw()  # release the lazy objects
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -281,7 +281,48 @@ def resize(self, event):
         width, height = event.width, event.height
         self.toolbar.configure(width=width) # , height=height)
 
+
     def show(self):
+        """
+        this function doesn't segfault but causes the
+        PyEval_RestoreThread: NULL state bug on win32
+        """
+
+        def destroy(*args):
+            self.window = None
+            Gcf.destroy(self._num)
+        if not self._shown: self.window.bind("<Destroy>", destroy)
+
+        _focus = windowing.FocusManager()
+        if not self._shown:
+            self.window.deiconify()
+            # anim.py requires this
+            if sys.platform=='win32' : self.window.update()            
+        else: self.canvas.draw()
+        self._shown = True
+
+    def _show(self):
+        """
+        # this function segfaults on an interactive session in pylab
+
+1 >>> plot([1,2,3])
+Out[1]: [<matplotlib.lines.Line2D instance at 0x418ed62c>]
+ CLOSE WINDOW
+2 >>> plot([1,2,3])
+Segmentation fault
+
+I now realize that any call to self.window.bind("<Destroy>", destroy)
+causes the PyEval_RestoreThread: NULL state bug if the mainloop is not started.  Due to the placement of
+
+  if not self._shown: self.window.bind("<Destroy>", destroy)
+
+after the setting of
+
+  self._shown = True
+
+it is never called
+
+        """
         _focus = windowing.FocusManager()
         if not self._shown:
             self.window.deiconify()
