Changeset 491d0fc in sasview

Timestamp:

Dec 21, 2011 9:22:17 AM (12 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:

490b281

Parents:

ed8fa6a3

Message:

moved the set_custom_combo to fitting

File:

• calculatorview/src/sans/perspectives/calculator/pyconsole.py (modified) (2 diffs)

calculatorview/src/sans/perspectives/calculator/pyconsole.py

@@ -180 +180 @@
             cancel = True
         return cancel
-    
-    
-    def update_custom_combo(self):
-        """
-        Update custom model combo box in fit_panel
-        """
-        try:
-            page = self.panel.get_current_page()
-            temp = self.panel.reset_pmodel_list()
-            if temp:
-                page.model_list_box = temp
-                current_val = page.formfactorbox.GetValue()
-                pos = page.formfactorbox.GetSelection()
-                page._show_combox_helper()
-                page.formfactorbox.SetSelection(pos)
-                page.formfactorbox.SetValue(current_val)
-        except:
-            pass
         
     def OnRun(self, event):
@@ -230 +212 @@
             if self._manager != None and self.panel != None:
                 self._manager.set_edit_menu_helper(self.parent)
-                wx.CallAfter(self.update_custom_combo)
+                # Update custom model list in fitpage combobox
+                wx.CallAfter(self._manager.update_custom_combo)
     
     def _check_changed(self):