Changeset 75906a1 in sasview for src/sas/qtgui/Plotting

Timestamp:

Oct 26, 2018 4:39:39 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

9d23e4c, 722b7d6

Parents:

aed159f

Message:

More fixes from PK's CR

Location:

src/sas/qtgui/Plotting

Files:

• Binder.py (modified) (1 diff)
• ConvertUnits.py (modified) (1 diff)
• Slicers/AzimutSlicer.py (modified) (1 diff)

src/sas/qtgui/Plotting/Binder.py

@@ -233 +233 @@
         """
         # TODO: sort by zorder of axes then by zorder within axes
-        #self._artists.sort(cmp=lambda x, y: cmp(y.zorder, x.zorder))
-        #self._artists.sort(cmp=lambda x, y: y.zorder.__gt__(x.zorder))
         found = Selection()
+        self._artists.sort(key=lambda x: x.zorder, reverse=True)
         for artist in self._artists:
             # TODO: should contains() return false if invisible?

src/sas/qtgui/Plotting/ConvertUnits.py

@@ -10 +10 @@
     """
     if power != 0:
-        if unit.find("^") != -1:  # if the unit contains a powerer ^
-            toks = re.split("\^", unit)
+        if unit.find("^") != -1:  # if the unit contains a power ^
+            toks = re.split(r"\^", unit)
             if toks[0].find("/") != -1 or \
                 toks[0].find("-") != -1:

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

@@ -137 +137 @@
         sector = sect(self.base.data2D)
 
-        from sas.sasgui.guiframe.dataFitting import Data1D
+        from sas.qtgui.Plotting.PlotterData import Data1D
         if hasattr(sector, "dxl"):
             dxl = sector.dxl