Changeset b3e8629 in sasview for src/sas/qtgui/Calculators

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/Calculators

Files:

• DataOperationUtilityPanel.py (modified) (6 diffs, 1 prop)
• DensityPanel.py (modified) (2 diffs, 1 prop)
• GenericScatteringCalculator.py (modified) (8 diffs, 1 prop)
• KiessigPanel.py (modified) (1 diff, 1 prop)
• ResolutionCalculatorPanel.py (modified) (6 diffs, 1 prop)
• SldPanel.py (modified) (6 diffs, 1 prop)
• SlitSizeCalculator.py (modified) (5 diffs, 1 prop)
• UnitTesting/SlitSizeCalculatorTest.py (modified) (1 diff, 1 prop)

src/sas/qtgui/Calculators/DataOperationUtilityPanel.py

@@ -13 +13 @@
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
-from UI.DataOperationUtilityUI import Ui_DataOperationUtility
+from .UI.DataOperationUtilityUI import Ui_DataOperationUtility
 
 BG_WHITE = "background-color: rgb(255, 255, 255);"
@@ -76 +76 @@
         self.filenames = filenames
 
-        if filenames.keys():
+        if list(filenames.keys()):
             # clear contents of comboboxes
             self.cbData1.clear()
@@ -85 +85 @@
             list_datafiles = []
 
-            for key_id in filenames.keys():
+            for key_id in list(filenames.keys()):
                 if filenames[key_id].get_data().title:
                     # filenames with titles
@@ -139 +139 @@
             data1 = self.data1
             data2 = self.data2
-            exec "output = data1 %s data2" % operator
+            exec("output = data1 %s data2" % operator)
         except:
             raise
@@ -300 +300 @@
                 self.cbData1.setStyleSheet(QtCore.QString(BG_RED))
                 self.cbData2.setStyleSheet(QtCore.QString(BG_RED))
-                print self.data1.__class__.__name__ != self.data2.__class__.__name__
+                print(self.data1.__class__.__name__ != self.data2.__class__.__name__)
                 logging.warning('Cannot compute data of different dimensions')
                 return False
@@ -354 +354 @@
     def _findId(self, name):
         """ find id of name in list of filenames """
-        isinstance(name, basestring)
-
-        for key_id in self.filenames.keys():
+        isinstance(name, str)
+
+        for key_id in list(self.filenames.keys()):
             # data with title
             if self.filenames[key_id].get_data().title:

src/sas/qtgui/Calculators/DensityPanel.py

@@ -14 +14 @@
 
 def enum(*sequential, **named):
-    enums = dict(zip(sequential, range(len(sequential))), **named)
+    enums = dict(list(zip(sequential, list(range(len(sequential))))), **named)
     return type('Enum', (), enums)
 
@@ -95 +95 @@
 
     def dataChanged(self, top, bottom):
-        for index in xrange(top.row(), bottom.row() + 1):
+        for index in range(top.row(), bottom.row() + 1):
             if index == MODEL.MOLECULAR_FORMULA:
                 molarMass = toMolarMass(self.model.item(MODEL.MOLECULAR_FORMULA).text())

src/sas/qtgui/Calculators/GenericScatteringCalculator.py

@@ -22 +22 @@
 
 # Local UI
-from UI.GenericScatteringCalculator import Ui_GenericScatteringCalculator
+from .UI.GenericScatteringCalculator import Ui_GenericScatteringCalculator
 
 _Q1D_MIN = 0.001
@@ -119 +119 @@
         TODO Temporary solution to display information about option 'Ellipsoid'
         """
-        print "The option Ellipsoid has not been implemented yet."
+        print("The option Ellipsoid has not been implemented yet.")
         self.communicator.statusBarUpdateSignal.emit(
             "The option Ellipsoid has not been implemented yet.")
@@ -165 +165 @@
                 self.reader.queue()
         except (RuntimeError, IOError):
-            log_msg = "Generic SAS Calculator: %s" % sys.exc_value
+            log_msg = "Generic SAS Calculator: %s" % sys.exc_info()[1]
             logging.info(log_msg)
             raise
@@ -556 +556 @@
             d.addCallback(self.plot_1_2d)
         except:
-            log_msg = "{}. stop".format(sys.exc_value)
+            log_msg = "{}. stop".format(sys.exc_info()[1])
             logging.info(log_msg)
         return
@@ -644 +644 @@
             self.graph_num += 1
             # TODO
-            print 'TRANSFER OF DATA TO MAIN PANEL TO BE IMPLEMENTED'
+            print('TRANSFER OF DATA TO MAIN PANEL TO BE IMPLEMENTED')
             return plot1D
         else:
@@ -662 +662 @@
             self.graph_num += 1
             # TODO
-            print 'TRANSFER OF DATA TO MAIN PANEL TO BE IMPLEMENTED'
+            print('TRANSFER OF DATA TO MAIN PANEL TO BE IMPLEMENTED')
             return plot2D
 
@@ -744 +744 @@
         # II. Plot selective points in color
         other_color = numpy.ones(len(pix_symbol), dtype='bool')
-        for key in color_dic.keys():
+        for key in list(color_dic.keys()):
             chosen_color = pix_symbol == key
             if numpy.any(chosen_color):
@@ -758 +758 @@
                 # Get atom names not in the list
                 a_names = [symb for symb in pix_symbol \
-                           if symb not in color_dic.keys()]
+                           if symb not in list(color_dic.keys())]
                 a_name = a_names[0]
                 for name in a_names:

src/sas/qtgui/Calculators/KiessigPanel.py

@@ -3 +3 @@
 
 from sas.qtgui.UI import main_resources_rc
-from UI.KiessigPanel import Ui_KiessigPanel
+from .UI.KiessigPanel import Ui_KiessigPanel
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
 

src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py

@@ -20 +20 @@
 import re
 
-from UI.ResolutionCalculatorPanelUI import Ui_ResolutionCalculatorPanel
+from .UI.ResolutionCalculatorPanelUI import Ui_ResolutionCalculatorPanel
 
 _SOURCE_MASS = {'Alpha': 6.64465620E-24,
@@ -318 +318 @@
                 self, "Choose a spectral distribution file", "",
                 "All files (*.*)",
-                None, QtGui.QFileDialog.DontUseNativeDialog)
+                QtGui.QFileDialog.DontUseNativeDialog)
 
             if datafile is None or str(datafile) == '':
@@ -328 +328 @@
             try:
                 basename = os.path.basename(datafile)
-                if basename not in self.spectrum_dic.keys():
+                if basename not in list(self.spectrum_dic.keys()):
                     self.cbCustomSpectrum.addItem(basename)
 
@@ -604 +604 @@
                 msg = "The numbers must be one or two (separated by ',')"
                 logging.info(msg)
-                raise RuntimeError, msg
+                raise RuntimeError(msg)
 
         return new_numbers_list
@@ -618 +618 @@
             new_list = [float(t) for t in string_split]
         except:
-            logging.error(sys.exc_value)
+            logging.error(sys.exc_info()[1])
         return new_list
 
@@ -658 +658 @@
                         return out
                 except:
-                    logging.error(sys.exc_value)
+                    logging.error(sys.exc_info()[1])
 
     def _validate_q_input(self, qx, qy):

src/sas/qtgui/Calculators/SldPanel.py

@@ -15 +15 @@
 
 def enum(*sequential, **named):
-    enums = dict(zip(sequential, range(len(sequential))), **named)
+    enums = dict(list(zip(sequential, list(range(len(sequential))))), **named)
     return type('Enum', (), enums)
 
@@ -60 +60 @@
         if len(formula.atoms) != 1:
             raise NotImplementedError()
-        energy = xray_energy(formula.atoms.keys()[0].K_alpha)
+        energy = xray_energy(list(formula.atoms.keys())[0].K_alpha)
         return xray_sld_from_atoms(
             sld_formula.atoms,
@@ -142 +142 @@
         self.model.setItem(MODEL.WAVELENGTH       , QtGui.QStandardItem())
 
-        for key in self._getOutputs().keys():
+        for key in list(self._getOutputs().keys()):
             self.model.setItem(key, QtGui.QStandardItem())
 
@@ -161 +161 @@
         self.mapper.addMapping(self.ui.editWavelength      , MODEL.WAVELENGTH)
 
-        for key, edit in self._getOutputs().iteritems():
+        for key, edit in self._getOutputs().items():
             self.mapper.addMapping(edit, key)
 
@@ -168 +168 @@
     def dataChanged(self, top, bottom):
         update = False
-        for index in xrange(top.row(), bottom.row() + 1):
+        for index in range(top.row(), bottom.row() + 1):
             if (index == MODEL.MOLECULAR_FORMULA) or (index == MODEL.MASS_DENSITY) or (index == MODEL.WAVELENGTH):
                 update = True
@@ -202 +202 @@
                     pass
 
-            for key in self._getOutputs().keys():
+            for key in list(self._getOutputs().keys()):
                 self.model.item(key).setText("")
 

src/sas/qtgui/Calculators/SlitSizeCalculator.py

@@ -11 +11 @@
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
-from UI.SlitSizeCalculator import Ui_SlitSizeCalculator
+from .UI.SlitSizeCalculator import Ui_SlitSizeCalculator
 from sas.sascalc.dataloader.loader import Loader
 from sas.sascalc.calculator.slit_length_calculator import SlitlengthCalculator
@@ -76 +76 @@
         # But only with Qt built-in dialog (non-platform native)
         path = QtGui.QFileDialog.getOpenFileName(self, "Choose a file", "",
-                                                 "SAXSess 1D data (*.txt *.TXT *.dat *.DAT)", None,
+                                                 "SAXSess 1D data (*.txt *.TXT *.dat *.DAT)",
                                                  QtGui.QFileDialog.DontUseNativeDialog)
 
@@ -107 +107 @@
             self.clearResults()
             msg = "ERROR: Data hasn't been loaded correctly"
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         if data.__class__.__name__ == 'Data2D':
             self.clearResults()
             msg = "Slit Length cannot be computed for 2D Data"
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         #compute the slit size
@@ -120 +120 @@
             if xdata == [] or xdata is None or ydata == [] or ydata is None:
                 msg = "The current data is empty please check x and y"
-                raise ValueError, msg
+                raise ValueError(msg)
             slit_length_calculator = SlitlengthCalculator()
             slit_length_calculator.set_data(x=xdata, y=ydata)
@@ -126 +126 @@
         except:
             self.clearResults()
-            msg = "Slit Size Calculator: %s" % (sys.exc_value)
-            raise RuntimeError, msg
+            msg = "Slit Size Calculator: %s" % (sys.exc_info()[1])
+            raise RuntimeError(msg)
 
         slit_length_str = "{:.5f}".format(slit_length)

src/sas/qtgui/Calculators/UnitTesting/SlitSizeCalculatorTest.py

@@ -84 +84 @@
         loader = Loader()
         data = loader.load(filename)[0]
-        self.assertRaisesRegexp(RuntimeError,
+        self.assertRaisesRegex(RuntimeError,
                                 "Slit Length cannot be computed for 2D Data",
                                 self.widget.calculateSlitSize, data)
 
         data = None
-        self.assertRaisesRegexp(RuntimeError,
+        self.assertRaisesRegex(RuntimeError,
                                 "ERROR: Data hasn't been loaded correctly",
                                 self.widget.calculateSlitSize, data)