Changeset b3e8629 in sasview for src/sas/qtgui/Calculators/SldPanel.py

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

File:

• src/sas/qtgui/Calculators/SldPanel.py (modified) (6 diffs, 1 prop)

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("")