Changeset 31e3298 in sasview

Timestamp:

Feb 12, 2009 12:10:23 PM (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:

3b909b7

Parents:

acb37d9

Message:

Frequent mis-displaying of the main sector line is fixed.

File:

• guiframe/local_perspectives/plotting/SectorSlicer.py (modified) (7 diffs)

guiframe/local_perspectives/plotting/SectorSlicer.py

@@ -113 +113 @@
         if self.main_line.has_move:
             self.main_line.update()
-            self.right_line.update( delta = self.main_line.get_radius(),mline= self.main_line)
-            self.left_line.update( delta = self.main_line.get_radius() ,mline= self.main_line)
-            #print "Main line has moved ---> phi right",math.degrees(self.main_line.get_radius()+self.right_line.theta)
+            #print "main_theta--->",self.main_line.get_radius()*180/3.14
+            self.right_line.update( delta = -self.left_line.phi/2+math.pi,mline= self.main_line.theta)
+            #print "main_theta--->",self.main_line.get_radius()*180/3.14
+            self.left_line.update( delta = self.left_line.phi/2+math.pi ,mline= self.main_line.theta)
+            #print "main_theta--->",self.main_line.get_radius()*180/3.14
+            #print "Main line has moved ---> phi right",math.degrees(self.main_line.theta),math.degrees(self.main_line.get_radius()),math.degrees(self.main_line.get_radius()+self.right_line.theta)
             #print "Main line has moved ---> phi left",math.degrees(self.left_line.theta+self.main_line.get_radius())
         if self.left_line.has_move:
@@ -153 +156 @@
         from DataLoader.manipulations import SectorQ
         radius = self.qmax #radius=math.sqrt(math.pow(self.qmax,2)+math.pow(self.qmax,2))
-        phimin = self.right_line.theta+math.pi
-        phimax = self.left_line.theta+math.pi
+        phimin =  -self.left_line.phi+self.main_line.theta
+        phimax = self.left_line.phi+self.main_line.theta
         #phimin = min(self.right_line.theta+math.pi,self.left_line.theta+math.pi)
         #phimax = max(self.right_line.theta+math.pi,self.left_line.theta+math.pi)
-        #print "sector Q",phimin,phimax
-        sect = SectorQ(r_min=0.0, r_max= radius , phi_min=phimin, phi_max=phimax)
+        #print "sector Q angles=",phimin*180/math.pi,phimax*180/math.pi,self.main_line.theta*180/math.pi
+        #phi must be 0 to 2pi with cut-off line sts on the left.
+        sect = SectorQ(r_min=0.0, r_max= radius , phi_min=phimin+math.pi, phi_max=phimax+math.pi)
         #sect = SectorQ(r_min=-1*radius , r_max= radius , phi_min=phimin, phi_max=phimax)
         if nbins!=None:
@@ -267 +271 @@
         self.axes = axes
         
+            
         self.save_theta = theta2 + phi
-        self.theta=  theta2 + phi
+        self.theta= theta2 + phi
         self.theta2 = theta2
         self.radius = r
@@ -336 +341 @@
         #print "update left or right ", self.has_move
         self.left_moving=left
+        theta3=0
         if phi !=None:
             self.phi= phi
+        if delta==None:
+            delta = 0
+
         if  right:
             self.phi = -1*math.fabs(self.phi)
+            #delta=-delta
         else:
             self.phi =math.fabs(self.phi)
-        if delta==None:
-            delta = 0
         if side:
             self.theta=  mline.theta + self.phi
-        
-        
-            
-        if mline!=None:
-            self.theta2 = mline.theta
+                    
+        if mline!=None :
+            if delta!=0:
+                self.theta2 = mline+delta
+            else:
+                self.theta2 = mline.theta
+        if delta==0:
+            theta3=self.theta+delta
+        else:
+            theta3=self.theta2+delta
+        
             #self.phi= math.fabs(self.theta2 - (self.theta+delta))
         #print "U:for line side theta2, phi, theta",math.degrees(self.theta2),math.degrees(self.phi),math.degrees(self.theta) 
@@ -356 +370 @@
         #    print "between 0-pi",math.degrees(self.theta) 
         
-        x1= self.radius*math.cos(self.theta + delta)
-        y1= self.radius*math.sin(self.theta + delta)
-        x2= -1*self.radius*math.cos(self.theta + delta)
-        y2= -1*self.radius*math.sin(self.theta + delta)
+        x1= self.radius*math.cos(theta3)
+        y1= self.radius*math.sin(theta3)
+        x2= -1*self.radius*math.cos(theta3)
+        y2= -1*self.radius*math.sin(theta3)
        
         self.inner_marker.set(xdata=[x1/2.5],ydata=[y1/2.5])
@@ -393 +407 @@
         self.theta= math.atan2(y,x)
         self.has_move=True
-        
         #ToDo: Simplify below
         if not self.left_moving:
@@ -595 +608 @@
         x = params["radius"] 
         self.set_cursor(x, self._inner_mouse_y)
-        
-
-
-        
+
+
+