Changeset 75906a1 in sasview for src

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

Files:

• Perspectives/Fitting/FittingWidget.py (modified) (1 diff)
• Perspectives/Fitting/ReportPageLogic.py (modified) (4 diffs)
• Plotting/Binder.py (modified) (1 diff)
• Plotting/ConvertUnits.py (modified) (1 diff)
• Plotting/Slicers/AzimutSlicer.py (modified) (1 diff)
• Utilities/CategoryInstaller.py (modified) (1 diff)
• Utilities/GridPanel.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -3364 +3364 @@
         else:
             index = self.theory_item
+        params = FittingUtilities.getStandardParam(self._model_model)
         report_logic = ReportPageLogic(self,
                                        kernel_module=self.kernel_module,
                                        data=self.data,
                                        index=index,
-                                       model=self._model_model)
+                                       params=params)
 
         return report_logic.reportList()

src/sas/qtgui/Perspectives/Fitting/ReportPageLogic.py

@@ -13 +13 @@
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
-from sas.qtgui.Perspectives.Fitting import FittingUtilities
 
 class ReportPageLogic(object):
@@ -19 +18 @@
     Logic for the Report Page functionality. Refactored from FittingWidget.
     """
-    def __init__(self, parent=None, kernel_module=None, data=None, index=None, model=None):
+    def __init__(self, parent=None, kernel_module=None, data=None, index=None, params=None):
 
         self.parent = parent
@@ -25 +24 @@
         self.data = data
         self._index = index
-        self.model = model
+        self.params = params
 
     @staticmethod
@@ -119 +118 @@
         Look at widget state and extract parameters
         """
-        pars = FittingUtilities.getStandardParam(self.model)
-        if pars is None:
+        if self.params is None:
             return ""
 
         report = ""
         plus_minus = " ± "
-        for value in pars:
+        for value in self.params:
             try:
                 par_name = value[1]

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

src/sas/qtgui/Utilities/CategoryInstaller.py

@@ -26 +26 @@
     def __init__(self):
         """ initialization """
-
-    @staticmethod
-    def _get_installed_model_dir():
-        """
-        returns the dir where installed_models.txt should be
-        """
-        import sas.sascalc.dataloader.readers
-        return sas.sascalc.dataloader.readers.get_data_path()
-
-    @staticmethod
-    def _get_models_py_dir():
-        """
-        returns the dir where models.py should be
-        """
-        import sas.sasgui.perspectives.fitting.models
-        return sas.sasgui.perspectives.fitting.models.get_model_python_path()
-
-    @staticmethod
-    def _get_default_cat_file_dir():
-        """
-        returns the dir where default_cat.j should be
-        """
-        # The default categories file is usually found with the code, except
-        # when deploying using py2app (it will be in Contents/Resources), or
-        # py2exe (it will be in the exec dir).
-        import sas.sasview
-        cat_file = "default_categories.json"
-
-        possible_cat_file_paths = [
-            os.path.join(os.path.split(sas.sasview.__file__)[0], cat_file),           # Source
-            os.path.join(os.path.dirname(sys.executable), '..', 'Resources', cat_file), # Mac
-            os.path.join(os.path.dirname(sys.executable), cat_file)                     # Windows
-        ]
-
-        for path in possible_cat_file_paths:
-            if os.path.isfile(path):
-                return os.path.dirname(path)
-
-        raise RuntimeError('CategoryInstaller: Could not find folder containing default categories')
 
     @staticmethod

src/sas/qtgui/Utilities/GridPanel.py

@@ -491 +491 @@
         """
         location = GuiUtils.HELP_DIRECTORY_LOCATION
-        url = "/user/sasgui/perspectives/pr/pr_help.html#batch-pr-mode"
+        url = "/user/qtgui/Perspectives/Fitting/fitting_help.html#batch-fit-mode"
         try:
             webbrowser.open('file://' + os.path.realpath(location + url))