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

Timestamp:

Nov 9, 2017 8:41:54 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

cee5c78

Parents:

749b715

git-author:

Piotr Rozyczko <rozyczko@…> (10/26/17 03:13:05)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 08:41:54)

Message:

Initial changes to make SasView? run with python3

Location:

src/sas/qtgui/Plotting/Slicers

Files:

• AnnulusSlicer.py (modified) (1 diff)
• Arc.py (modified) (1 diff)
• AzimutSlicer.py (modified) (2 diffs)
• BoxSlicer.py (modified) (3 diffs)
• BoxSum.py (modified) (1 diff)
• SectorSlicer.py (modified) (2 diffs)

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

@@ -4 +4 @@
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
-from BaseInteractor import BaseInteractor
+from .BaseInteractor import BaseInteractor
 from sas.qtgui.Plotting.PlotterData import Data1D
 from sas.qtgui.Utilities.GuiUtils import formatNumber

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

@@ -4 +4 @@
 import math
 
-from BaseInteractor import BaseInteractor
+from .BaseInteractor import BaseInteractor
 
 class ArcInteractor(BaseInteractor):

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

@@ -5 +5 @@
 #
 import math
-from BaseInteractor import BaseInteractor
+from .BaseInteractor import BaseInteractor
 
 class SectorInteractor(BaseInteractor):
@@ -26 +26 @@
 
         # Inner circle
-        from Arc import ArcInteractor
+        from .Arc import ArcInteractor
         self.inner_circle = ArcInteractor(self, self.base.subplot,
                                           zorder=zorder,

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

@@ -3 +3 @@
 from PyQt4 import QtCore
 
-from BaseInteractor import BaseInteractor
+from .BaseInteractor import BaseInteractor
 from sas.qtgui.Plotting.PlotterData import Data1D
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
@@ -136 +136 @@
             if new_slab is None:
                 msg = "post data:cannot average , averager is empty"
-                raise ValueError, msg
+                raise ValueError(msg)
             self.averager = new_slab
         if self.direction == "X":
@@ -152 +152 @@
         else:
             msg = "post data:no Box Average direction was supplied"
-            raise ValueError, msg
+            raise ValueError(msg)
         # # Average data2D given Qx or Qy
         box = self.averager(x_min=x_min, x_max=x_max, y_min=y_min, y_max=y_max,

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

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

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

@@ -6 +6 @@
 from PyQt4 import QtCore
 
-from BaseInteractor import BaseInteractor
+from .BaseInteractor import BaseInteractor
 from sas.qtgui.Plotting.PlotterData import Data1D
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
@@ -230 +230 @@
             msg = "Phi left and phi right are different"
             msg += " %f, %f" % (self.left_line.phi, self.right_line.phi)
-            raise ValueError, msg
+            raise ValueError(msg)
         params["Phi [deg]"] = self.main_line.theta * 180 / numpy.pi
         params["Delta_Phi [deg]"] = numpy.fabs(self.left_line.phi * 180 / numpy.pi)