Changeset 6d2b50b in sasview

Timestamp:

Feb 7, 2017 9:05:25 AM (7 years ago)

Author:

krzywon

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

5e6df0e

Parents:

eb2dc13

Message:

Change the elif block to a dictionary search to minimize the number of checks.

File:

• src/sas/sasgui/perspectives/fitting/pagestate.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/pagestate.py

@@ -367 +367 @@
         """
         if self.formfactorcombobox == '':
-            if self.categorycombobox == '' and len(self.parameters) == 3:
-                self.categorycombobox = "Shape-Independent"
-                self.formfactorcombobox = 'PowerLawAbsModel'
-            elif self.categorycombobox == '' and len(self.parameters) == 9:
-                self.categorycombobox = 'Cylinder'
-                self.formfactorcombobox = 'barbell'
-            elif self.categorycombobox == 'Shapes':
-                self.formfactorcombobox = 'BCCrystalModel'
-            elif self.categorycombobox == 'Uncategorized':
-                self.formfactorcombobox = 'LineModel'
-            elif self.categorycombobox == 'StructureFactor':
-                self.structurecombobox = 'HardsphereStructure'
-            elif self.categorycombobox == 'Customized Models':
-                self.formfactorcombobox = 'MySumFunction'
-            elif self.categorycombobox == 'Ellipsoid':
-                self.formfactorcombobox = 'core_shell_ellipsoid'
-            elif self.categorycombobox == 'Lamellae':
-                self.formfactorcombobox = 'lamellar'
-            elif self.categorycombobox == 'Paracrystal':
-                self.formfactorcombobox = 'bcc_paracrystal'
-            elif self.categorycombobox == 'Parallelepiped':
-                self.formfactorcombobox = 'core_shell_parallelepiped'
-            elif self.categorycombobox == 'Shape Independent':
-                self.formfactorcombobox = 'be_polyelectrolyte'
-            elif self.categorycombobox == 'Sphere':
-                self.formfactorcombobox = 'adsorbed_layer'
-            elif self.categorycombobox == 'Structure Factor':
-                self.formfactorcombobox = 'hardsphere'
+            FIRST_FORM = {
+                'Shapes' : 'BCCrystalModel',
+                'Uncategorized' : 'LineModel',
+                'StructureFactor' : 'HardsphereStructure',
+                'Ellipsoid' : 'core_shell_ellipsoid',
+                'Lamellae' : 'lamellar',
+                'Paracrystal' : 'bcc_paracrystal',
+                'Parallelepiped' : 'core_shell_parallelepiped',
+                'Shape Independent' : 'be_polyelectrolyte',
+                'Sphere' : 'adsorbed_layer',
+                'Structure Factor' : 'hardsphere',
+                'Customized Models' : ''
+            }
+            if self.categorycombobox == '':
+                if len(self.parameters) == 3:
+                    self.categorycombobox = "Shape-Independent"
+                    self.formfactorcombobox = 'PowerLawAbsModel'
+                elif len(self.parameters) == 9:
+                    self.categorycombobox = 'Cylinder'
+                    self.formfactorcombobox = 'barbell'
+                else:
+                    msg = "Save state does not have enough information to load"
+                    msg += " the all of the data."
+                    logging.warning(msg=msg)
+            else:
+                self.formfactorcombobox = FIRST_FORM[self.categorycombobox]
 
     @staticmethod