Changeset eacf1d66 in sasview

Timestamp:

Nov 8, 2009 11:11:41 AM (15 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:

e2f7b92

Parents:

b421b1a

Message:

cleaned up param min max from set-model-param-sizer

File:

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

sansview/perspectives/fitting/fitpage.py

@@ -368 +368 @@
                         ix = 3
                         ctl2 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,20), style=wx.TE_PROCESS_ENTER)
-                        #ctl2.SetValue(str(format_number(fit_errs)))
+                  
                         self.sizer4_4.Add(ctl2, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                        #if fit_errs==None or not numpy.isfinite(fit_errs):
+                     
                         ctl2.Hide()
-                        #else:
-                        #    if not text2.IsShown():
-                        #        text2.Show(True)
-                        #    ctl2.Show(True)
-                        #Prepare add min and max in model.details.
-                        param_min, param_max= self.model.details[name1][1:]
+
                         ix = 4
                         ctl3 = BasicPage.ModelTextCtrl(self, -1, size=(_BOX_WIDTH/2,20), style=wx.TE_PROCESS_ENTER,
                                                        kill_focus_callback = self._on_paramRangeEnter,
                                                        set_focus_callback  = self._on_paramRangeEnter)
-                        if param_min ==None or not numpy.isfinite(param_min):
-                            ctl3.SetValue("")
-                        else:
-                            ctl3.SetValue(str(param_min))
+
                         self.sizer4_4.Add(ctl3, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
                         ctl3.Hide()
@@ -394 +386 @@
                                                        set_focus_callback  = self._on_paramRangeEnter)
                         self.sizer4_4.Add(ctl4, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                        if param_max==None or not numpy.isfinite(param_max):
-                            ctl4.SetValue("")
-                        else:
-                            ctl4.SetValue(str(param_max))
+
                         ctl4.Hide()
                         
@@ -482 +471 @@
                         ctl2.Hide()
                             
-                        param_min, param_max= self.model.details[name1][1:]
                         ix = 4
                         ctl3 = BasicPage.ModelTextCtrl(self, -1, size=(_BOX_WIDTH/2,20), style=wx.TE_PROCESS_ENTER,
                                                        kill_focus_callback = self._onparamRangeEnter,
                                                        set_focus_callback  = self._onparamRangeEnter)
-                        if param_min ==None or not numpy.isfinite(param_min):
-                            ctl3.SetValue("")
-                        else:
-                            ctl3.SetValue(str(param_min))
+
                         self.sizer4_4.Add(ctl3, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
 
@@ -874 +859 @@
                     self.param_toFit[0][4].Refresh()
         else:
-            #i=0
+           
             if self.text2_3.IsShown():
                 self.text2_3.Hide()
-            #print "fittable",self.print "fittable",self.fittable_param[p_name]    
+            
             #Set the panel when fit result are list
-
             for item in self.param_toFit:               
                 ## reset error value to initial state
@@ -910 +894 @@
                             item[3].Hide()
                         if item[4].IsShown:
-                            item[4].Hide()           
-                        #k += 1   
+                            item[4].Hide()             
 
                     else:                        
@@ -921 +904 @@
                         has_error = True
                     
- 
-               # i+=1  
         #Show error title when any errors displayed
         if has_error: 
@@ -1137 +1118 @@
         for item in self.fittable_param:
             if item[0].GetValue():
-                #print item[0].GetValue()
                 if not (item in self.param_toFit):
                     self.param_toFit.append(item)  
@@ -1263 +1243 @@
                 ctl2.Hide()
                 
-                param_min, param_max= self.model.details[item][1:]
                 ix += 1
                 ctl3 = BasicPage.ModelTextCtrl(self, -1, size=(_BOX_WIDTH/2,20), style=wx.TE_PROCESS_ENTER,
                                                kill_focus_callback = self._on_paramRangeEnter,
                                                set_focus_callback  = self._on_paramRangeEnter)
-                if param_min ==None or not numpy.isfinite(param_min):
-                    ctl3.SetValue("")
-                else:
-                    ctl3.SetValue(str(param_min))
+     
                 sizer.Add(ctl3, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
                 ctl3.Hide()
@@ -1280 +1256 @@
                                                set_focus_callback  = self._on_paramRangeEnter)
                 sizer.Add(ctl4, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                if param_max==None or not numpy.isfinite(param_max):
-                    ctl4.SetValue("")
-                else:
-                    ctl4.SetValue(str(param_max))
+      
                 ctl4.Hide()
                 
@@ -1372 +1345 @@
                         ctl2.Show(True)
                     
-                    param_min, param_max= self.model.details[item][1:]
+                    #param_min, param_max= self.model.details[item][1:]
                     ix += 1
                     ctl3 = BasicPage.ModelTextCtrl(self, -1, size=(_BOX_WIDTH/2,20), style=wx.TE_PROCESS_ENTER,
                                                    kill_focus_callback = self._onparamRangeEnter,
                                                    set_focus_callback  = self._onparamRangeEnter)
-                    if param_min ==None or not numpy.isfinite(param_min):
-                        ctl3.SetValue("")
-                    else:
-                        ctl3.SetValue(str(param_min))
+               
                     sizer.Add(ctl3, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
                     ctl3.Hide()
@@ -1394 +1364 @@
                                                    set_focus_callback  = self._onparamRangeEnter)
                     sizer.Add(ctl4, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                    if param_max ==None or not numpy.isfinite(param_max):
-                        ctl4.SetValue("")
-                    else:
-                        ctl4.SetValue(str(param_max))
+                   
                     ctl4.Hide()
                     if self.data.__class__.__name__ =="Data2D":
@@ -1504 +1471 @@
         self.page = FitPage(self, myinfo) 
         
-        
-        
         self.Centre()
         self.Show(True)
-
-
-   
+ 
 if __name__=="__main__":
     app = wx.App()