Changeset e20870bc in sasview for src/sas/qtgui/Plotting/Slicers

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

Location:

src/sas/qtgui/Plotting/Slicers

Files:

• AnnulusSlicer.py (modified) (1 diff)
• Arc.py (modified) (4 diffs, 1 prop)
• AzimutSlicer.py (modified) (4 diffs, 1 prop)
• BoxSlicer.py (modified) (1 diff)
• BoxSum.py (modified) (1 diff)
• RadiusInteractor.py (added)
• SectorSlicer.py (modified) (5 diffs)

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

@@ -382 +382 @@
         self.set_cursor(x, self._inner_mouse_y)
 
-class CircularMask(BaseInteractor):
-    """
-     Draw a ring Given a radius
-    """
-    def __init__(self, base, axes, color='grey', zorder=3, side=None):
-        """
-        :param: the color of the line that defined the ring
-        :param r: the radius of the ring
-        :param sign: the direction of motion the the marker
-        """
-        BaseInteractor.__init__(self, base, axes, color=color)
-        self.markers = []
-        self.axes = axes
-        self.base = base
-        self.is_inside = side
-        self.qmax = min(numpy.fabs(self.base.data.xmax),
-                        numpy.fabs(self.base.data.xmin))  # must be positive
-        self.connect = self.base.connect
-
-        # Cursor position of Rings (Left(-1) or Right(1))
-        self.xmaxd = self.base.data.xmax
-        self.xmind = self.base.data.xmin
-
-        if (self.xmaxd + self.xmind) > 0:
-            self.sign = 1
-        else:
-            self.sign = -1
-        # Inner circle
-        self.outer_circle = RingInteractor(self, self.axes, 'blue',
-                                           zorder=zorder + 1, r=self.qmax / 1.8,
-                                           sign=self.sign)
-        self.outer_circle.qmax = self.qmax * 1.2
-        self.update()
-        self._post_data()
-
-    def set_layer(self, n):
-        """
-        Allow adding plot to the same panel
-        :param n: the number of layer
-        """
-        self.layernum = n
-        self.update()
-
-    def clear(self):
-        """
-        Clear the slicer and all connected events related to this slicer
-        """
-        self.clear_markers()
-        self.outer_circle.clear()
-        self.base.connect.clearall()
-
-    def update(self):
-        """
-        Respond to changes in the model by recalculating the profiles and
-        resetting the widgets.
-        """
-        # Update locations
-        self.outer_circle.update()
-        self._post_data()
-        out = self._post_data()
-        return out
-
-    def save(self, ev):
-        """
-        Remember the roughness for this layer and the next so that we
-        can restore on Esc.
-        """
-        self.outer_circle.save(ev)
-
-    def _post_data(self):
-        """
-        Uses annulus parameters to plot averaged data into 1D data.
-
-        :param nbins: the number of points to plot
-
-        """
-        # Data to average
-        data = self.base.data
-
-        # If we have no data, just return
-        if data is None:
-            return
-        mask = data.mask
-        from sas.sascalc.dataloader.manipulations import Ringcut
-
-        rmin = 0
-        rmax = numpy.fabs(self.outer_circle.get_radius())
-
-        # Create the data1D Q average of data2D
-        mask = Ringcut(r_min=rmin, r_max=rmax)
-
-        if self.is_inside:
-            out = (mask(data) == False)
-        else:
-            out = (mask(data))
-        return out
-
-
-    def moveend(self, ev):
-        """
-        Called when any dragging motion ends.
-        Post an event (type =SlicerParameterEvent)
-        to plotter 2D with a copy  slicer parameters
-        Call  _post_data method
-        """
-        self.base.thaw_axes()
-        # create a 1D data plot
-        self._post_data()
-
-    def restore(self):
-        """
-        Restore the roughness for this layer.
-        """
-        self.outer_circle.restore()
-
-    def move(self, x, y, ev):
-        """
-        Process move to a new position, making sure that the move is allowed.
-        """
-        pass
-
-    def set_cursor(self, x, y):
-        pass
-
-    def getParams(self):
-        """
-        Store a copy of values of parameters of the slicer into a dictionary.
-
-        :return params: the dictionary created
-
-        """
-        params = {}
-        params["outer_radius"] = numpy.fabs(self.outer_circle._inner_mouse_x)
-        return params
-
-    def setParams(self, params):
-        """
-        Receive a dictionary and reset the slicer with values contained
-        in the values of the dictionary.
-
-        :param params: a dictionary containing name of slicer parameters and
-            values the user assigned to the slicer.
-        """
-        outer = numpy.fabs(params["outer_radius"])
-        # Update the picture
-        self.outer_circle.set_cursor(outer, self.outer_circle._inner_mouse_y)
-        # Post the data given the nbins entered by the user
-        self._post_data()
-
-    def draw(self):
-        self.base.update()
-
+

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)

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,

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

@@ -1 +1 @@
 import numpy
 
-from .BaseInteractor import BaseInteractor
+from sas.qtgui.Plotting.Slicers.BaseInteractor import BaseInteractor
 from sas.qtgui.Plotting.PlotterData import Data1D
 import sas.qtgui.Utilities.GuiUtils as GuiUtils

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

@@ -8 +8 @@
 from sas.qtgui.Utilities.GuiUtils import formatNumber, toDouble
 
-from .BaseInteractor import BaseInteractor
+from sas.qtgui.Plotting.Slicers.BaseInteractor import BaseInteractor
 from sas.sascalc.dataloader.manipulations import Boxavg
 from sas.sascalc.dataloader.manipulations import Boxsum

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

@@ -5 +5 @@
 import logging
 
-from .BaseInteractor import BaseInteractor
+from sas.qtgui.Plotting.Slicers.BaseInteractor import BaseInteractor
 from sas.qtgui.Plotting.PlotterData import Data1D
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
@@ -283 +283 @@
         self.markers = []
         self.axes = axes
+        self.color = color
         # compute the value of the angle between the current line and
         # the x-axis
@@ -438 +439 @@
         if self.phi > numpy.pi:
             self.phi = 2 * numpy.pi - numpy.fabs(self.theta2 - self.theta)
-        self.base.base.update()
+        #self.base.base.update()
+        self.base.update()
 
     def set_cursor(self, x, y):
@@ -464 +466 @@
 
         self.markers = []
+        self.color = color
         self.axes = axes
         self.save_theta = theta
@@ -541 +544 @@
         self.theta = numpy.arctan2(y, x)
         self.has_move = True
-        self.base.base.update()
+        #self.base.base.update()
+        self.base.update()
 
     def set_cursor(self, x, y):