Changeset cafa75f in sasview for src/sans/guiframe/local_perspectives/plotting/Plotter2D.py

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

File:

• src/sans/guiframe/local_perspectives/plotting/Plotter2D.py (modified) (2 diffs)

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):