Changeset b3e8629 in sasview for src/sas/qtgui/Plotting/PlotProperties.py

Timestamp:

Nov 9, 2017 8: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 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/Plotting/PlotProperties.py (modified) (3 diffs, 1 prop)

src/sas/qtgui/Plotting/PlotProperties.py

@@ -26 +26 @@
 
         # Fill out the color combobox
-        self.cbColor.addItems(COLORS.keys()[:-1])
+        self.cbColor.addItems(list(COLORS.keys())[:-1])
         # data1d.custom_color can now be a simple integer,
         # specifying COLORS dict index or a string containing
@@ -34 +34 @@
         else:
             # Need the Custom entry here. "Custom" is always last.
-            self.cbColor.addItems([COLORS.keys()[-1]])
-            self.cbColor.setCurrentIndex(COLORS.keys().index("Custom"))
+            self.cbColor.addItems([list(COLORS.keys())[-1]])
+            self.cbColor.setCurrentIndex(list(COLORS.keys()).index("Custom"))
 
         # Fill out the marker combobox
-        self.cbShape.addItems(SHAPES.keys())
+        self.cbShape.addItems(list(SHAPES.keys()))
         try:
             self.cbShape.setCurrentIndex(self._marker)
@@ -83 +83 @@
             # Add Custom to the color combo box
             self.cbColor.addItems(["Custom"])
-            self.cbColor.setCurrentIndex(COLORS.keys().index("Custom"))
+            self.cbColor.setCurrentIndex(list(COLORS.keys()).index("Custom"))
             # unblock currentIndexChanged
             self.cbColor.blockSignals(False)