Changeset cafa75f in sasview for src/sans/guiframe/local_perspectives/plotting

Timestamp:

Apr 2, 2014 4:04:01 PM (11 years ago)

Author:

pkienzle

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

1829835

Parents:

6771d94

Message:

support old and new versions of matplotlib

Location:

src/sans/guiframe/local_perspectives/plotting

Files:

• Plotter1D.py (modified) (4 diffs)
• Plotter2D.py (modified) (2 diffs)

src/sans/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -173 +173 @@
         self.graph.reset()
         self.plots      = {}
-        if self.is_zoomed:
-            self.is_zoomed = False
+        self.is_zoomed = False
         
     def _OnReSize(self, event):   
@@ -480 +479 @@
             try:
                 self._onEVT_FUNC_PROPERTY()
-            except:
+            except Exception, exc:
                 msg=" Encountered singular points..."
                 wx.PostEvent(self.parent, StatusEvent(status=\
-                    "Plotting Error: %s"% msg, info="error")) 
-            # Check if zoomed
-            try: tb = self.toolbar.wx_ids['Back']
-            except AttributeError: tb = self.toolbar._NTB2_BACK # Cruft
-            toolbar_zoomed = self.toolbar.GetToolEnabled(tb)
-            if self.is_zoomed or toolbar_zoomed:
+                    "Plotting Error: %s"% str(exc), info="error"))
+            if self.is_zoomed:
                 # Recover the x,y limits
                 self.subplot.set_xlim((xlo, xhi))     
@@ -502 +497 @@
                     # MAC: forcing to plot 2D avg
                     self.canvas._onDrawIdle()
-            except:
+            except Exception,exc:
                 msg=" Encountered singular points..."
                 wx.PostEvent(self.parent, StatusEvent(status=\
-                    "Plotting Error: %s"% msg, info="error")) 
+                    "Plotting Error: %s"% str(exc), info="error"))
             self.toolbar.update()
-            if self.is_zoomed:
-                self.is_zoomed = False
+            self.is_zoomed = False
             # Update Graph menu and help string        
             #pos = self.parent._window_menu.FindItem(self.window_caption)
@@ -566 +560 @@
         self.graph.render(self)
         self.subplot.figure.canvas.draw_idle()  
-        # Check if zoomed
-        try: tb = self.toolbar.wx_ids['Back']
-        except AttributeError: tb = self.toolbar._NTB2_BACK # Cruft
-        toolbar_zoomed = self.toolbar.GetToolEnabled(tb)
-        if self.is_zoomed or toolbar_zoomed:
+        if self.is_zoomed:
             # Recover the x,y limits
             self.subplot.set_xlim((xlo, xhi))     

src/sans/guiframe/local_perspectives/plotting/Plotter2D.py

@@ -249 +249 @@
         self.default_zmin_ctl = self.zmin_2D
         self.default_zmax_ctl = self.zmax_2D
-        # Check if zoomed
-        try: tb = self.toolbar.wx_ids['Back']
-        except AttributeError: tb = self.toolbar._NTB2_BACK # Cruft
-        toolbar_zoomed = self.toolbar.GetToolEnabled(tb)
-        if not self.is_zoomed and not toolbar_zoomed:
+        if not self.is_zoomed:
             return
         # Recover the x,y limits
@@ -263 +259 @@
             else: 
                 self.toolbar.update()
-                self._is_zoomed = False
+                self.is_zoomed = False
 
     def _set_axis_labels(self):