Changeset 77e23a2 in sasview for sansview/perspectives/fitting/fitpage.py

Timestamp:

Apr 2, 2009 12:28:34 PM (15 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:

7fff5cd

Parents:

05f14dd

Message:

add fit with parameter range when selecting park only

File:

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

sansview/perspectives/fitting/fitpage.py

@@ -9 +9 @@
 from sans.guicomm.events import StatusEvent   
 from sans.guiframe.utils import format_number
+
 (ModelEventbox, EVT_MODEL_BOX) = wx.lib.newevent.NewEvent()
+(FitterTypeEvent, EVT_FITTER_TYPE)   = wx.lib.newevent.NewEvent()
 _BOX_WIDTH = 80
 
@@ -43 +45 @@
         self.page_info.model= self.model
         self._on_select_model(event=None)
-            
-        
+        self.Bind(EVT_FITTER_TYPE,self._on_engine_change)
+    
+    
+    def _on_engine_change(self, event):
+        """
+            get an event containing the current name of the fit engine type
+            @param event: FitterTypeEvent containing  the name of the current engine
+        """
+        if len(self.parameters)==0:
+            return
+        for item in self.parameters:
+            if event.type =="scipy":
+                item[5].SetValue(format_number(""))
+                item[5].Hide()
+                item[6].SetValue(format_number(""))
+                item[6].Hide()
+                self.text2_min.Hide()
+                self.text2_max.Hide()
+            else:
+                item[5].Show(True)
+                item[6].Show(True)
+                self.text2_min.Show(True)
+                self.text2_max.Show(True)
+                
+        self.sizer3.Layout()
+        self.SetScrollbars(20,20,200,100)
+            
+            
     def _on_display_description(self, event):
         """
@@ -261 +289 @@
                     ctl1.SetValue(str (format_number(value)))
                     ctl1.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
+                    ctl1.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
                     ctl1.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
                     self.sizer4_4.Add(ctl1, (iy,ix),(1,1),wx.EXPAND)
@@ -286 +315 @@
                         Tctl.SetValue(str (format_number(value)))
                         Tctl.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
+                        Tctl.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
                         Tctl.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
                         self.sizer4_4.Add(Tctl, (iy,ix),(1,1),
@@ -300 +330 @@
                         Tctl.SetValue(str (format_number(value)))
                         Tctl.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
+                        Tctl.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
                         Tctl.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
                         self.sizer4_4.Add(Tctl, (iy,ix),(1,1),
@@ -344 +375 @@
         self.manager.set_fit_range(page= self,qmin= self.qmin_x, qmax= self.qmax_x)
         #single fit 
-        #self.manager.on_single_fit(qmin=self.qmin_x,qmax=self.qmax_x)
         self.manager.onFit()
             
@@ -373 +403 @@
             when enter value on panel redraw model according to changed
         """
-        
         self._onparamEnter_helper()
         self.compute_chisqr()
@@ -660 +689 @@
         
         
-    def set_model_param_sizer(self, model, engine_type="park"):
+    def set_model_param_sizer(self, model):
         """
             Build the panel from the model content
@@ -719 +748 @@
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
         self.text2_4.Hide()
-        if  engine_type == "park":
-            self.text2_max.Show(True)
-            self.text2_min.Show(True)
+        
 
         for item in keys:
@@ -739 +766 @@
                                     style=wx.TE_PROCESS_ENTER)
                 
-                ctl1.SetValue(str (format_number(value)))
+                ctl1.SetValue(format_number(value))
+                ctl1.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
                 ctl1.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
                 ctl1.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
@@ -755 +783 @@
                 ctl2.Hide()
                 
+                param_min, param_max= self.model.details[item][1:]
                 ix += 1
                 ctl3 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH/2,20), style=wx.TE_PROCESS_ENTER)
+                ctl3.SetValue(format_number(param_min))
+                ctl3.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
                 ctl3.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
                 ctl3.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
                 sizer.Add(ctl3, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
                 ctl3.Hide()
-                
+        
                 ix += 1
                 ctl4 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH/2,20), style=wx.TE_PROCESS_ENTER)
+                ctl4.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
                 ctl4.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
                 ctl4.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
                 sizer.Add(ctl4, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                ctl4.SetValue(format_number(param_max))
                 ctl4.Hide()
-                if  engine_type == "park":
-                    ctl3.Show(True)
-                    ctl4.Show(True)
-                    
+              
                 ix +=1
                 # Units