Changeset e20870bc in sasview for src/sas/qtgui/Plotting/Slicers/Arc.py

Timestamp:

Jun 27, 2018 3:33:52 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, 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

Children:

b1a7a81

Parents:

c5e0d84

git-author:

Piotr Rozyczko <rozyczko@…> (05/31/18 05:15:47)

git-committer:

Piotr Rozyczko <rozyczko@…> (06/27/18 03:33:52)

Message:

Masking dialog for fitting

File:

• src/sas/qtgui/Plotting/Slicers/Arc.py (modified) (4 diffs, 1 prop)

src/sas/qtgui/Plotting/Slicers/Arc.py

@@ -2 +2 @@
     Arc slicer for 2D data
 """
-import math
+import numpy as np
 
-from .BaseInteractor import BaseInteractor
+from sas.qtgui.Plotting.Slicers.BaseInteractor import BaseInteractor
 
 class ArcInteractor(BaseInteractor):
@@ -11 +11 @@
     """
     def __init__(self, base, axes, color='black', zorder=5, r=1.0,
-                 theta1=math.pi / 8, theta2=math.pi / 4):
+                 theta1=np.pi / 8, theta2=np.pi / 4):
         BaseInteractor.__init__(self, base, axes, color=color)
         self.markers = []
@@ -55 +55 @@
             Return arc radius
         """
-        radius = math.sqrt(math.pow(self._mouse_x, 2) + \
-                           math.pow(self._mouse_y, 2))
+        radius = np.sqrt(np.power(self._mouse_x, 2) + \
+                           np.power(self._mouse_y, 2))
         return radius
 
@@ -75 +75 @@
             self.theta2 = theta2
         while self.theta2 < self.theta1:
-            self.theta2 += (2 * math.pi)
-        while self.theta2 >= (self.theta1 + 2 * math.pi):
-            self.theta2 -= (2 * math.pi)
-        npts = int((self.theta2 - self.theta1) / (math.pi / 120))
+            self.theta2 += (2 * np.pi)
+        while self.theta2 >= (self.theta1 + 2 * np.pi):
+            self.theta2 -= (2 * np.pi)
+        npts = int((self.theta2 - self.theta1) / (np.pi / 120))
 
         if r is None:
-            self.radius = math.sqrt(math.pow(self._mouse_x, 2) + \
-                                     math.pow(self._mouse_y, 2))
+            self.radius = np.sqrt(np.power(self._mouse_x, 2) + \
+                                     np.power(self._mouse_y, 2))
         else:
             self.radius = r
         for i in range(self.npts):
             phi = (self.theta2 - self.theta1) / (self.npts - 1) * i + self.theta1
-            xval = 1.0 * self.radius * math.cos(phi)
-            yval = 1.0 * self.radius * math.sin(phi)
+            xval = 1.0 * self.radius * np.cos(phi)
+            yval = 1.0 * self.radius * np.sin(phi)
 
             x.append(xval)