Changeset 05fa132 in sasview

Timestamp:

Jul 9, 2018 3:09:50 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:

515c23df

Parents:

a36517ad

git-author:

Piotr Rozyczko <rozyczko@…> (07/09/18 03:09:17)

git-committer:

Piotr Rozyczko <rozyczko@…> (07/09/18 03:09:50)

Message:

Minor fixes from pylint

Location:

src/sas/qtgui/Plotting

Files:

• MaskEditor.py (modified) (1 diff)
• Masks/SectorMask.py (modified) (1 diff)
• Slicers/Arc.py (modified) (8 diffs)

src/sas/qtgui/Plotting/MaskEditor.py

@@ -207 +207 @@
         Respond to changes in masking
         """
-        # the case of liitle numbers of True points
+        # the case of litle numbers of True points
         if len(mask[mask]) < 10 and self.data is not None:
-            self.data.mask = copy.deepcopy(self.mask)
+            self.data.mask = copy.deepcopy(self.default_mask)
         else:
-            self.mask = mask
+            self.default_mask = mask
         # make temperary data to plot
         temp_mask = np.zeros(len(mask))

src/sas/qtgui/Plotting/Masks/SectorMask.py

@@ -166 +166 @@
             msg += "different %f, %f" % (self.left_line.phi,
                                          self.right_line.phi)
-            raise (ValueError, msg)
+            raise ValueError(msg)
         params["Phi"] = self.main_line.theta
         params["Delta_Phi"] = np.fabs(self.left_line.phi)

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

@@ -31 +31 @@
     def set_layer(self, n):
         """
-            Allow adding plot to the same panel
-            :param n: the number of layer
+        Allow adding plot to the same panel
+        :param n: the number of layer
         """
         self.layernum = n
@@ -39 +39 @@
     def clear(self):
         """
-            Clear this slicer and its markers
+        Clear this slicer and its markers
         """
         self.clear_markers()
@@ -53 +53 @@
     def get_radius(self):
         """
-            Return arc radius
+        Return arc radius
         """
         radius = np.sqrt(np.power(self._mouse_x, 2) + \
@@ -61 +61 @@
     def update(self, theta1=None, theta2=None, nbins=None, r=None):
         """
-            Update the plotted arc
-            :param theta1: starting angle of the arc
-            :param theta2: ending angle of the arc
-            :param nbins: number of points along the arc
-            :param r: radius of the arc
+        Update the plotted arc
+        :param theta1: starting angle of the arc
+        :param theta2: ending angle of the arc
+        :param nbins: number of points along the arc
+        :param r: radius of the arc
         """
         # Plot inner circle
@@ -78 +78 @@
         while self.theta2 >= (self.theta1 + 2 * np.pi):
             self.theta2 -= (2 * np.pi)
-        npts = int((self.theta2 - self.theta1) / (np.pi / 120))
+        self.npts = int((self.theta2 - self.theta1) / (np.pi / 120))
 
         if r is None:
@@ -92 +92 @@
             x.append(xval)
             y.append(yval)
-        # self.marker.set(xdata=[self._mouse_x],ydata=[0])
         self.arc.set_data(x, y)
 
@@ -102 +101 @@
         self._save_x = self._mouse_x
         self._save_y = self._mouse_y
-        # self._save_x = ev.xdata
-        # self._save_y = ev.ydata
         self.base.freeze_axes()
 
     def moveend(self, ev):
         """
-            After a dragging motion reset the flag self.has_move to False
-            :param ev: event
+        After a dragging motion reset the flag self.has_move to False
+        :param ev: event
         """
         self.has_move = False
@@ -126 +123 @@
         Process move to a new position, making sure that the move is allowed.
         """
-        # print "ring move x, y", x,y
         self._mouse_x = x
         self._mouse_y = y