Changeset a2c38de in sasview

Timestamp:

Jan 19, 2009 10:20:14 AM (16 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:

ffd23b5

Parents:

3dc83be

Message:

Cursors for AnnulusSlicer? rings are now located at + or - x-axis where it has more space for the cursors to move around.

File:

• guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) (9 diffs)

guiframe/local_perspectives/plotting/AnnulusSlicer.py

@@ -6 +6 @@
 #
 
-
+ 
 # Debug printout
 from sans.guicomm.events import StatusEvent 
@@ -26 +26 @@
         self.markers = []
         self.axes = axes
-        self.qmax = self.base.data2D.xmax
+        self.base= base
+        self.qmax = min(math.fabs(self.base.data2D.xmax),math.fabs(self.base.data2D.xmin))  #must be positive
         self.connect = self.base.connect
         
+
         ## Number of points on the plot
         self.nbins = 20
-
+        
+        #Cursor position of Rings (Left(-1) or Right(1))
+        self.xmaxd=self.base.data2D.xmax
+        self.xmind=self.base.data2D.xmin
+
+        #self.sign=1
+        
+        if (self.xmaxd+self.xmind)>0:
+            self.sign=1
+        else:
+            self.sign=-1
+                 
         # Inner circle
-        self.inner_circle = RingInteractor(self, self.base.subplot, zorder=zorder, r=self.qmax/2.0)
+        self.inner_circle = RingInteractor(self, self.base.subplot, zorder=zorder, r=self.qmax/2.0,sign=self.sign)
         self.inner_circle.qmax = self.qmax
-        self.outer_circle = RingInteractor(self, self.base.subplot, zorder=zorder+1, r=self.qmax/1.8)
+        self.outer_circle = RingInteractor(self, self.base.subplot, zorder=zorder+1, r=self.qmax/1.8,sign=self.sign)
         self.outer_circle.qmax = self.qmax*1.2
         #self.outer_circle.set_cursor(self.base.qmax/1.8, 0)
@@ -45 +58 @@
         # Bind to slice parameter events
         self.base.parent.Bind(SlicerParameters.EVT_SLICER_PARS, self._onEVT_SLICER_PARS)
-
+        
 
     def _onEVT_SLICER_PARS(self, event):
@@ -107 +120 @@
         
         from DataLoader.manipulations import SectorPhi
-        radius = math.sqrt(math.pow(self.qmax,2)+math.pow(self.qmax,2))
-        rmin= self.inner_circle.get_radius()
-        rmax = self.outer_circle.get_radius()
+        radius = self.qmax#math.sqrt(math.pow(self.qmax,2)+math.pow(self.qmax,2))
+        rmin= math.fabs(self.inner_circle.get_radius())
+        rmax = math.fabs(self.outer_circle.get_radius())
         phi_min=-math.pi
         phi_max=math.pi
@@ -208 +221 @@
          Select an annulus through a 2D plot
     """
-    def __init__(self,base,axes,color='black', zorder=5, r=1.0):
+    def __init__(self,base,axes,color='black', zorder=5, r=1.0,sign=1):
         
         _BaseInteractor.__init__(self, base, axes, color=color)
@@ -218 +231 @@
         self._inner_save_y  = 0
         self.scale = 10.0
-        
+        self.base= base
+        self.sign=sign
+         
+        
+        print "sign",self.sign,self.sign*math.fabs(self._inner_mouse_x)
+                                                    
         try:
             # Inner circle marker
-            self.inner_marker = self.axes.plot([self._inner_mouse_x],[0], linestyle='',
+            self.inner_marker = self.axes.plot([self.sign*math.fabs(self._inner_mouse_x)],[0], linestyle='',
                                           marker='s', markersize=10,
                                           color=self.color, alpha=0.6,
@@ -228 +246 @@
                                           visible=True)[0]
         except:
-            self.inner_marker = self.axes.plot([self._inner_mouse_x],[0], linestyle='',
+            self.inner_marker = self.axes.plot([self.sign*math.fabs(self._inner_mouse_x)],[0], linestyle='',
                                           marker='s', markersize=10,
                                           color=self.color, alpha=0.6,
@@ -283 +301 @@
             x.append(xval)
             y.append(yval)
-        
-        self.inner_marker.set(xdata=[self._inner_mouse_x],ydata=[0])
+            
+        self.inner_marker.set(xdata=[self.sign*math.fabs(self._inner_mouse_x)],ydata=[0])
         self.inner_circle.set_data(x, y)        
 
@@ -321 +339 @@
     def get_params(self):
         params = {}
-        params["radius"] = self._inner_mouse_x
+        params["radius"] = math.fabs(self._inner_mouse_x)
         return params