Changeset 9466f2d6 in sasview for sansview/perspectives/fitting/fitpage.py

Timestamp:

Mar 29, 2011 11:08:55 AM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

29ef718

Parents:

852354c8

Message:

make sure plugin model are recompile online when the plugin dir has changed

File:

• sansview/perspectives/fitting/fitpage.py (modified) (4 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -50 +50 @@
         self._set_bookmark_flag(False)
         self._set_save_flag(False)
-
+    
+  
+        
     def _on_fit_complete(self):
         """
@@ -532 +534 @@
         self.initialize_combox()
         wx.EVT_COMBOBOX(self.formfactorbox, -1, self._on_select_model)
+
         wx.EVT_COMBOBOX(self.structurebox, -1, self._on_select_model)
         wx.EVT_COMBOBOX(self.multifactorbox, -1, self._on_select_model)
@@ -997 +1000 @@
         call back for model selection
         """  
-        if self.plugin_rbutton.GetValue():
-            self._show_combox_helper()
-            print "went here"
+        
             
         self._on_select_model_helper() 
@@ -1059 +1060 @@
             event = PageInfoEvent(page = self)
             wx.PostEvent(self.parent, event) 
+            #update list of plugins if new plugin is available
+            if self.plugin_rbutton.GetValue():
+                temp = self.parent.update_model_list()
+                if temp:
+                    self.model_list_box = temp
+                    current_val = self.formfactorbox.GetValue()
+                    pos = self.formfactorbox.GetSelection()
+                    self._show_combox_helper()
+                    self.formfactorbox.SetSelection(pos)
+                    self.formfactorbox.SetValue(current_val)
         self.SetupScrolling()
+    
       
     def _onparamEnter(self,event):