Changeset f22b43c in sasview

Timestamp:

Oct 10, 2016 5:29:45 PM (8 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:

f2261c2

Parents:

8662a58

Message:

If structurefactor, formfactor, and categorycombobox are loaded in as strings instead of unicode, now able to find the category, form factor and structure factor.

File:

• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (3 diffs)

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

@@ -1099 +1099 @@
         self.Refresh()
 
+    def get_cat_combo_box_pos(self, state):
+        """
+        Iterate through the categories to find the structurefactor
+        :return: combo_box_position
+        """
+        for key, value in self.master_category_dict.iteritems():
+            for list_item in value:
+                if state.formfactorcombobox in list_item:
+                    return self.categorybox.Items.index(key)
+
     def reset_page_helper(self, state):
         """
@@ -1145 +1155 @@
             category_pos = int(state.categorycombobox)
         except:
+            state.formfactorcombobox = unicode(state.formfactorcombobox.lower())
+            state.categorycombobox = unicode(state.categorycombobox)
             category_pos = 0
-            for ind_cat in range(self.categorybox.GetCount()):
-                if self.categorybox.GetString(ind_cat) == \
-                                        state.categorycombobox:
-                    category_pos = int(ind_cat)
-                    break
+            if state.categorycombobox in self.categorybox.Items:
+                category_pos = self.categorybox.Items.index(
+                    state.categorycombobox)
+            else:
+                # Look in master list for model name (model.lower)
+                category_pos = self.get_cat_combo_box_pos(state)
 
         self.categorybox.Select(category_pos)
@@ -1171 +1184 @@
             structfactor_pos = int(state.structurecombobox)
         except:
-            structfactor_pos = 0
-            for ind_struct in range(self.structurebox.GetCount()):
-                if self.structurebox.GetString(ind_struct) == \
-                                                    (state.structurecombobox):
-                    structfactor_pos = int(ind_struct)
-                    break
+            if state.structurecombobox is not None:
+                structfactor_pos = 0
+                state.structurecombobox = unicode(state.structurecombobox)
+                for ind_struct in range(self.structurebox.GetCount()):
+                    if self.structurebox.GetString(ind_struct) == \
+                                                        (state.structurecombobox):
+                        structfactor_pos = int(ind_struct)
+                        break
 
         self.structurebox.SetSelection(structfactor_pos)