Changeset b3e8629 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

Timestamp:

Nov 9, 2017 6:41:54 AM (6 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 01:13:05)

git-committer:

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

Message:

Initial changes to make SasView? run with python3

File:

• src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py (modified) (7 diffs)

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

@@ -12 +12 @@
 from sas.qtgui.Perspectives.Fitting.FittingOptions import FittingOptions
 from sas.qtgui.Perspectives.Fitting.GPUOptions import GPUOptions
-from sas.qtgui.Perspectives.Fitting import ModelUtilities
+#from sas.qtgui.Perspectives.Fitting import ModelUtilities
 
 class FittingWindow(QtGui.QTabWidget):
@@ -64 +64 @@
         # GPU Options
         self.gpu_options_widget = GPUOptions(self)
-
-        self.menu_manager = ModelUtilities.ModelManager()
-        # TODO: reuse these in FittingWidget properly
-        self.model_list_box = self.menu_manager.get_model_list()
-        self.model_dictionary = self.menu_manager.get_model_dictionary()
 
         #self.setWindowTitle('Fit panel - Active Fitting Optimizer: %s' % self.optimizer)
@@ -124 +119 @@
         Create a list if none exists and append if there's already a list
         """
-        if item_key in self.dataToFitTab.keys():
-            self.dataToFitTab[item_key].append(tab_name)
+        item_key_str = str(item_key)
+        if item_key_str in list(self.dataToFitTab.keys()):
+            self.dataToFitTab[item_key_str].append(tab_name)
         else:
-            self.dataToFitTab[item_key] = [tab_name]
+            self.dataToFitTab[item_key_str] = [tab_name]
 
         #print "CURRENT dict: ", self.dataToFitTab
@@ -173 +169 @@
         Given name of the fitting tab - close it
         """
-        for tab_index in xrange(len(self.tabs)):
+        for tab_index in range(len(self.tabs)):
             if self.tabText(tab_index) == tab_name:
                 self.tabCloses(tab_index)
@@ -185 +181 @@
             return
         for index_to_delete in index_list:
-            if index_to_delete in self.dataToFitTab.keys():
-                for tab_name in self.dataToFitTab[index_to_delete]:
+            index_to_delete_str = str(index_to_delete)
+            if index_to_delete_str in list(self.dataToFitTab.keys()):
+                for tab_name in self.dataToFitTab[index_to_delete_str]:
                     # delete tab #index after corresponding data got removed
                     self.closeTabByName(tab_name)
-                self.dataToFitTab.pop(index_to_delete)
+                self.dataToFitTab.pop(index_to_delete_str)
 
         #print "CURRENT dict: ", self.dataToFitTab
@@ -209 +206 @@
         if not isinstance(data_item, list):
             msg = "Incorrect type passed to the Fitting Perspective"
-            raise AttributeError, msg
+            raise AttributeError(msg)
 
         if not isinstance(data_item[0], QtGui.QStandardItem):
             msg = "Incorrect type passed to the Fitting Perspective"
-            raise AttributeError, msg
+            raise AttributeError(msg)
 
         items = [data_item] if is_batch else data_item
@@ -220 +217 @@
             # Find the first unassigned tab.
             # If none, open a new tab.
-            available_tabs = list(map(lambda tab: tab.acceptsData(), self.tabs))
+            available_tabs = list([tab.acceptsData() for tab in self.tabs])
 
             if numpy.any(available_tabs):