Changeset 707436d in sasview

Timestamp:

Apr 13, 2009 5:39:35 PM (16 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:

fb8daaaf

Parents:

7959f297

Message:

switching between fitting engine when create new page fix

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (3 diffs)
• fitting.py (modified) (7 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -40 +40 @@
         self.text_disp_1=None
         ## default fitengine type
-        self.engine_type = "scipy"
+        self.engine_type = None
         ## draw sizer
         self._fill_datainfo_sizer()
@@ -630 +630 @@
         self.sizer3.Clear(True)
         self.parameters = []
-        #self.page_info.parameters=[]
         self.param_toFit=[]
         self.fittable_param=[]
@@ -639 +638 @@
             self.SetScrollbars(20,20,200,100)
             return
+        ## the panel is drawn using the current value of the fit engine
+        if self.engine_type==None and self.manager !=None:
+            self.engine_type= self.manager._return_engine_type()
+            
         box_description= wx.StaticBox(self, -1,str("Model Parameters"))
         boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)

sansview/perspectives/fitting/fitting.py

@@ -96 +96 @@
         id3 = wx.NewId()
         scipy_help= "Scipy Engine: Perform Simple fit. More in Help window...."
-        #self.menu1.Append(id3, "Scipy",scipy_help) 
         self.menu1.AppendCheckItem(id3, "Simple Fit  [Scipy]",scipy_help) 
         wx.EVT_MENU(owner, id3,  self._onset_engine_scipy)
@@ -104 +103 @@
         self.menu1.AppendCheckItem(id3, "Complex Fit  [Park]",park_help) 
         wx.EVT_MENU(owner, id3,  self._onset_engine_park)
+        
+        self.menu1.FindItemByPosition(0).Check(True)
+        self.menu1.FindItemByPosition(1).Check(False)
+            
         self.menu1.AppendSeparator()
         
@@ -405 +408 @@
         ## if simultaneous fit change automatically the engine to park
         if fitproblem_count >1:
-            self.menu1.FindItemByPosition(1).Check(True)
-            self.menu1.FindItemByPosition(0).Check(False)
             self._on_change_engine(engine='park')
             
@@ -702 +703 @@
             set engine to park
         """
-        if event.IsChecked():
-            self.menu1.FindItemByPosition(0).Check(False)
         self._on_change_engine('park')
        
@@ -711 +710 @@
             set engine to scipy
         """
-        if event.IsChecked():
-            self.menu1.FindItemByPosition(1).Check(False)
         self._on_change_engine('scipy')
        
@@ -730 +727 @@
             new_panel
             self.mypanels.append(new_panel) 
-        return    
-   
+        return  
+    
+      
+    def _return_engine_type(self):
+        """
+            return the current type of engine
+        """
+        return self._fit_engine
+     
+     
     def _on_change_engine(self, engine='park'):
         """
@@ -739 +744 @@
         ## saving fit engine name
         self._fit_engine = engine
+        ## change menu item state
+        if engine=="park":
+            self.menu1.FindItemByPosition(0).Check(False)
+            self.menu1.FindItemByPosition(1).Check(True)
+        else:
+            self.menu1.FindItemByPosition(0).Check(True)
+            self.menu1.FindItemByPosition(1).Check(False)
+            
         ## post a message to status bar
         wx.PostEvent(self.parent, StatusEvent(status="Engine set to: %s" % self._fit_engine))