Changeset 1eafef1 in sasview

Timestamp:

Oct 26, 2017 8:26:01 AM (7 years ago)

Author:

Adam Washington <adam.washington@…>

Parents:

ff2b961

Message:

Unify enum function into GuiUtils?

Location:

src/sas/qtgui

Files:

• Calculators/DensityPanel.py (modified) (1 diff)
• Calculators/SldPanel.py (modified) (1 diff)
• Perspectives/Corfunc/CorfuncUtils.py (modified) (1 diff)
• Perspectives/Invariant/InvariantUtils.py (modified) (1 diff)
• Utilities/GuiUtils.py (modified) (1 diff)

src/sas/qtgui/Calculators/DensityPanel.py

@@ -8 +8 @@
 from sas.qtgui.Utilities.GuiUtils import FormulaValidator
 from sas.qtgui.UI import main_resources_rc
-from sas.qtgui.Utilities.GuiUtils import HELP_DIRECTORY_LOCATION
+from sas.qtgui.Utilities.GuiUtils import HELP_DIRECTORY_LOCATION, enum
 
 # Local UI
 from sas.qtgui.Calculators.UI.DensityPanel import Ui_DensityPanel
-
-def enum(*sequential, **named):
-    enums = dict(zip(sequential, range(len(sequential))), **named)
-    return type('Enum', (), enums)
 
 MODEL = enum(

src/sas/qtgui/Calculators/SldPanel.py

@@ -14 +14 @@
 from sas.qtgui.Calculators.UI.SldPanel import Ui_SldPanel
 
-def enum(*sequential, **named):
-    enums = dict(zip(sequential, range(len(sequential))), **named)
-    return type('Enum', (), enums)
-
-MODEL = enum(
+MODEL = GuiUtils.enum(
     'MOLECULAR_FORMULA',
     'MASS_DENSITY',

src/sas/qtgui/Perspectives/Corfunc/CorfuncUtils.py

@@ -1 @@
-def enum(*sequential, **named):
-    enums = dict(zip(sequential, range(len(sequential))), **named)
-    return type('Enum', (), enums)
+from sas.qtgui.Utilities.GuiUtils import enum
 
 WIDGETS = enum( 'W_QMIN',

src/sas/qtgui/Perspectives/Invariant/InvariantUtils.py

@@ -1 @@
-def enum(*sequential, **named):
-    enums = dict(zip(sequential, range(len(sequential))), **named)
-    return type('Enum', (), enums)
+from sas.qtgui.Utilities.GuiUtils import enum
 
 WIDGETS = enum( 'W_FILENAME',           #0

src/sas/qtgui/Utilities/GuiUtils.py

@@ -806 +806 @@
     else:
         return name
+
+def enum(*sequential, **named):
+    """Create an enumeration object from a list of strings"""
+    enums = dict(zip(sequential, range(len(sequential))), **named)
+    return type('Enum', (), enums)