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

Timestamp:

Jun 27, 2018 5: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 07:15:47)

git-committer:

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

Message:

Masking dialog for fitting

File:

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

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

@@ -4 +4 @@
 # TODO: NEED MAJOR REFACTOR
 #
-import math
-from .BaseInteractor import BaseInteractor
+import numpy as np
+from sas.qtgui.Plotting.Slicers.Arc import ArcInteractor
+from sas.qtgui.Plotting.Slicers.RadiusInteractor import RadiusInteractor
+from sas.qtgui.Plotting.Slicers.BaseInteractor import BaseInteractor
 
 class SectorInteractor(BaseInteractor):
@@ -22 +24 @@
         # # Number of points on the plot
         self.nbins = 20
-        theta1 = 2 * math.pi / 3
-        theta2 = -2 * math.pi / 3
+        theta1 = 2 * np.pi / 3
+        theta2 = -2 * np.pi / 3
 
         # Inner circle
-        from .Arc import ArcInteractor
         self.inner_circle = ArcInteractor(self, self.base.subplot,
                                           zorder=zorder,
@@ -40 +41 @@
         self.outer_circle.qmax = self.qmax * 1.2
         # self.outer_circle.set_cursor(self.base.qmax/1.8, 0)
-        from Edge import RadiusInteractor
         self.right_edge = RadiusInteractor(self, self.base.subplot,
                                            zorder=zorder + 1,
@@ -132 +132 @@
             phimin = self.left_edge.get_angle()
             phimax = self.right_edge.get_angle()
-        # print "phimin, phimax, rmin ,rmax",math.degrees(phimin),
-        # math.degrees(phimax), rmin ,rmax
-        # from sas.sascalc.dataloader.manipulations import SectorQ
 
         sect = new_sector(r_min=rmin, r_max=rmax,