Changeset 7022fdc in sasview

Timestamp:

Sep 1, 2011 3:01:38 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

49ad00b

Parents:

857d00f

Message:

Not plot remember zoomed range until a new data is set

Location:

sansguiframe/src/sans/guiframe/local_perspectives/plotting

Files:

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

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

@@ -159 +159 @@
         self.graph.reset()
         self.plots      = {}
+        if self.is_zoomed:
+                self.is_zoomed = False
         
     def _OnReSize(self, event):   
@@ -239 +241 @@
             ## Set the view scale for all plots
             self._onEVT_FUNC_PROPERTY()
-            # Recover the x,y limits
-            self.subplot.set_xlim((xlo, xhi))     
-            self.subplot.set_ylim((ylo, yhi))  
+            # Check if zoomed
+            toolbar_zoomed = self.toolbar.GetToolEnabled(self.toolbar._NTB2_BACK)
+            if self.is_zoomed or toolbar_zoomed:
+                # Recover the x,y limits
+                self.subplot.set_xlim((xlo, xhi))     
+                self.subplot.set_ylim((ylo, yhi))  
         else:
             self.plots[data.id] = data
@@ -248 +253 @@
             self._onEVT_FUNC_PROPERTY()
             self.toolbar.update()
+            if self.is_zoomed:
+                self.is_zoomed = False
         
           

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

@@ -229 +229 @@
         self.default_zmin_ctl = self.zmin_2D
         self.default_zmax_ctl = self.zmax_2D
+        # Check if zoomed
+        toolbar_zoomed = self.toolbar.GetToolEnabled(self.toolbar._NTB2_BACK)
+        if not self.is_zoomed and not toolbar_zoomed:
+            return
+        
         # Recover the x,y limits
         if (xlo and xhi and ylo and yhi) != None:
@@ -237 +242 @@
             else: 
                 self.toolbar.update()
+                self._is_zoomed = False
+
     def _set_axis_labels(self):
         """