Changeset b0b09b9 in sasview for src/sas/qtgui/MainWindow/DataExplorer.py

Timestamp:

Oct 26, 2017 3:13:05 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:

895e7359

Parents:

def64a0

Message:

Initial changes to make SasView? run with python3

File:

• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (21 diffs, 1 prop)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -155 +155 @@
         Populate the Perspective combobox and define callbacks
         """
-        available_perspectives = sorted([p for p in Perspectives.PERSPECTIVES.keys()])
+        available_perspectives = sorted([p for p in list(Perspectives.PERSPECTIVES.keys())])
         if available_perspectives:
             self.cbFitting.clear()
@@ -240 +240 @@
 
         self.manager.assign(manager)
-        for id, item in self.manager.get_all_data().iteritems():
+        for id, item in self.manager.get_all_data().items():
             self.updateModel(item.data, item.path)
 
@@ -345 +345 @@
         # Figure out which rows are checked
         selected_items = [self.model.item(index)
-                          for index in xrange(self.model.rowCount())
+                          for index in range(self.model.rowCount())
                           if isItemReady(index)]
 
@@ -400 +400 @@
         else:
             freeze_msg = "Unexpected number of theories copied: %i" % theories_copied
-            raise AttributeError, freeze_msg
+            raise AttributeError(freeze_msg)
         self.communicator.statusBarUpdateSignal.emit(freeze_msg)
         # Actively switch tabs
@@ -411 +411 @@
         new_item = item.clone()
         # clone doesn't do deepcopy :(
-        for child_index in xrange(item.rowCount()):
+        for child_index in range(item.rowCount()):
             child_item = self.recursivelyCloneItem(item.child(child_index))
             new_item.setChild(child_index, child_item)
@@ -435 +435 @@
             return
         new_plots = [PlotHelper.plotById(plot) for plot in graph_list]
-        active_plots_copy = self.active_plots.keys()
+        active_plots_copy = list(self.active_plots.keys())
         for plot in active_plots_copy:
             if self.active_plots[plot] in new_plots:
@@ -478 +478 @@
         for plot in plots:
             plot_id = plot.id
-            if plot_id in self.active_plots.keys():
+            if plot_id in list(self.active_plots.keys()):
                 self.active_plots[plot_id].replacePlot(plot_id, plot)
             else:
@@ -530 +530 @@
             else:
                 msg = "Incorrect data type passed to Plotting"
-                raise AttributeError, msg
+                raise AttributeError(msg)
 
         if 'new_plot' in locals() and \
@@ -597 +597 @@
 
         id = data.id
-        if data.id in self.active_plots.keys():
+        if data.id in list(self.active_plots.keys()):
             self.active_plots[id].replacePlot(id, data)
 
@@ -610 +610 @@
         # But only with Qt built-in dialog (non-platform native)
         paths = QtGui.QFileDialog.getOpenFileNames(self, "Choose a file", "",
-                wlist, None, QtGui.QFileDialog.DontUseNativeDialog)
+                wlist, QtGui.QFileDialog.DontUseNativeDialog)
         if paths is None:
             return
 
-        if isinstance(paths, QtCore.QStringList):
-            paths = [str(f) for f in paths]
+        #if isinstance(paths, QtCore.QStringList):
+        #    paths = [str(f) for f in paths]
 
         if not isinstance(paths, list):
@@ -687 +687 @@
 
             except Exception as ex:
-                logging.error(sys.exc_value)
+                logging.error(sys.exc_info()[1])
 
                 any_error = True
@@ -747 +747 @@
         if not isinstance(index, int):
             msg = "Incorrect type passed to DataExplorer.selectData()"
-            raise AttributeError, msg
+            raise AttributeError(msg)
 
         # Respond appropriately
@@ -773 +773 @@
                 except AttributeError:
                     msg = "Bad structure of the data model."
-                    raise RuntimeError, msg
+                    raise RuntimeError(msg)
 
                 if is1D:
@@ -787 +787 @@
                 except AttributeError:
                     msg = "Bad structure of the data model."
-                    raise RuntimeError, msg
+                    raise RuntimeError(msg)
 
                 if item.isCheckable() and item.checkState() == QtCore.Qt.Checked and is1D:
@@ -801 +801 @@
                 except AttributeError:
                     msg = "Bad structure of the data model."
-                    raise RuntimeError, msg
+                    raise RuntimeError(msg)
 
                 if is2D:
@@ -815 +815 @@
                 except AttributeError:
                     msg = "Bad structure of the data model."
-                    raise RuntimeError, msg
+                    raise RuntimeError(msg)
 
                 if item.isCheckable() and item.checkState() == QtCore.Qt.Checked and is2D:
@@ -823 +823 @@
             msg = "Incorrect value in the Selection Option"
             # Change this to a proper logging action
-            raise Exception, msg
+            raise Exception(msg)
 
     def contextMenu(self):
@@ -1016 +1016 @@
         # Add the actual Data1D/Data2D object
         object_item = QtGui.QStandardItem()
-        object_item.setData(QtCore.QVariant(data))
+        object_item.setData(data)
 
         checkbox_item.setChild(0, object_item)
@@ -1040 +1040 @@
         if not isinstance(model_item, QtGui.QStandardItem):
             msg = "Wrong data type returned from calculations."
-            raise AttributeError, msg
+            raise AttributeError(msg)
 
         # TODO: Assert other properties
@@ -1057 +1057 @@
         if not isinstance(model_item, QtGui.QStandardItem):
             msg = "Wrong data type returned from calculations."
-            raise AttributeError, msg
+            raise AttributeError(msg)
 
         # Check if there are any other items for this tab
@@ -1064 +1064 @@
         # 
         current_tab_name = model_item.text()[:2]
-        for current_index in xrange(self.theory_model.rowCount()):
+        for current_index in range(self.theory_model.rowCount()):
             if current_tab_name in self.theory_model.item(current_index).text():
                 self.theory_model.removeRow(current_index)