Changeset b98db8c in sasview

Timestamp:

Dec 12, 2008 7:32:32 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

e5a9e32

Parents:

356aea78

Message:

comment added

Location:

guiframe/local_perspectives/plotting

Files:

• Arc.py (modified) (1 diff)
• Edge.py (modified) (3 diffs)
• SectorSlicer.py (modified) (2 diffs)

guiframe/local_perspectives/plotting/Arc.py

@@ -69 +69 @@
         if theta2 !=None:
             self.theta2= theta2
-        #print "ring update theta1 theta2", self.theta1, self.theta2
+        print "ring update theta1 theta2", math.degrees(self.theta1), math.degrees(self.theta2)
         while self.theta2 < self.theta1: self.theta2 += 2*math.pi
         npts = int((self.theta2 - self.theta1)/(math.pi/120))

guiframe/local_perspectives/plotting/Edge.py

@@ -71 +71 @@
         Draw the new roughness on the graph.
         """
+        if r1 !=None:
+            self.r1=r1
+        if r2!=None:
+            self.r2=r2
+        """
         self.theta_left=theta_left
         self.theta_right=theta_right
@@ -89 +94 @@
         if theta_left ==None and theta_right==None:
             self.move_stop=True
-        print "in the edge theta_right theta_left",theta_right,theta_left,self.theta
+        """
+        #print "in the edge theta_right theta_left",theta_right,theta_left,self.theta
         x1= self.r1*math.cos(self.theta)
         y1= self.r1*math.sin(self.theta)
@@ -122 +128 @@
         #print "on move theta left , theta right",self.theta_left,self.theta_right
         theta= math.atan2(y,x)
-        print "on move theta left , theta right",self.theta_left,self.theta_right,theta
-        if self.theta_left !=None:
-            if self.theta_left >= theta:
-                print "went hier"
-                self.move_stop= True
-        if self.theta_right !=None:
-            if self.theta_right <= theta:
-                self.move_stop= True
-
-        if self.move_stop:
-            self.theta= math.atan2(y,x)
-            self.has_move= True
+        """print "on move theta left , theta right",self.theta_left,self.theta_right,theta
+            if self.theta_left !=None:
+                if self.theta_left >= theta:
+                    print "went hier"
+                        self.move_stop= True
+                if self.theta_right !=None:
+                    if self.theta_right <= theta:
+                        self.move_stop= True
+           
+            self.move_stop= True
+            if self.move_stop:
+         """
+        self.theta= math.atan2(y,x)
+        self.has_move= True
             
         self.base.base.update()

guiframe/local_perspectives/plotting/SectorSlicer.py

@@ -33 +33 @@
         theta1=math.pi/8
         theta2=math.pi/2
+        theta1=2*math.pi/3
+        theta2=-2*math.pi/3
         r1=self.qmax/2.0
         r2=self.qmax/1.8
+       
         # Inner circle
         from Arc import ArcInteractor
@@ -48 +51 @@
                                              arc1=self.inner_circle,
                                              arc2=self.outer_circle,
-                                            theta=math.pi/8)
+                                            theta=theta1)
         self.outer_radius= RadiusInteractor(self, self.base.subplot, zorder=zorder+1,
                                              arc1=self.inner_circle,
                                              arc2=self.outer_circle,
-                                            theta=math.pi/2)
+                                            theta=theta2)
         self.update()
         self._post_data()