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

Timestamp:

Apr 1, 2014 7:23:29 AM (11 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

aba5876

Parents:

b099388

Message:

Re #216 Merging wx30 branch

Location:

src/sans/guiframe/local_perspectives/plotting

Files:

• Plotter1D.py (modified) (2 diffs)
• Plotter2D.py (modified) (1 diff)

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

@@ -485 +485 @@
                     "Plotting Error: %s"% msg, info="error")) 
             # Check if zoomed
-            toolbar_zoomed = self.toolbar.GetToolEnabled(self.toolbar._NTB2_BACK)
+            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:
                 # Recover the x,y limits
@@ -565 +567 @@
         self.subplot.figure.canvas.draw_idle()  
         # Check if zoomed
-        toolbar_zoomed = self.toolbar.GetToolEnabled(self.toolbar._NTB2_BACK)
+        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:
             # Recover the x,y limits

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

@@ -250 +250 @@
         self.default_zmax_ctl = self.zmax_2D
         # Check if zoomed
-        toolbar_zoomed = self.toolbar.GetToolEnabled(self.toolbar._NTB2_BACK)
+        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:
             return