Changeset 8df5faa in sasview for fittingview/src/sans/perspectives/fitting

Timestamp:

Apr 30, 2012 3:54:12 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6246e00

Parents:

ef26c83

Message:

fixed bookmarks with model_list sorted

File:

• fittingview/src/sans/perspectives/fitting/basepage.py (modified) (3 diffs)

fittingview/src/sans/perspectives/fitting/basepage.py

@@ -1219 +1219 @@
             formfactor_pos = 0
             for ind_form in range(self.formfactorbox.GetCount()):
-                if self.formfactorbox.GetString(ind_form).count(state.formfactorcombobox) > 0:
+                if self.formfactorbox.GetString(ind_form) == (state.formfactorcombobox):
                     formfactor_pos = int(ind_form)
                     break
@@ -1231 +1231 @@
             structfactor_pos = 0
             for ind_struct in range(self.structurebox.GetCount()):
-                if self.structurebox.GetString(ind_struct).count(state.structurecombobox) > 0:
+                if self.structurebox.GetString(ind_struct) == (state.structurecombobox) > 0:
                     structfactor_pos = int(ind_struct)
                     break
@@ -2009 +2009 @@
                 
         # Sort the models
-        mlist_sorted = mlist
+        mlist_sorted = sorted(mlist)
         for item in mlist_sorted:
             combobox.Append(item[0], item[1])