Changeset 1dd00f4 in sasview for sansview

Timestamp:

Jun 13, 2011 9:13:09 AM (14 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:

cdb042d

Parents:

d7e9792

Message:

try to fix onsetvalue for mac

File:

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

sansview/perspectives/fitting/fitpage.py

@@ -1303 +1303 @@
                     continue
                 ## hide statictext +/-    
+                if len(item) < 4 :
+                    continue
                 if item[3]!=None and item[3].IsShown():
                     item[3].Hide()
@@ -1317 +1319 @@
                         continue
                 if item in self.param_toFit:
+                    continue
+                if len(item) < 4 :
                     continue
                 ## hide statictext +/-    
@@ -1797 +1801 @@
         
         #Hide error title
-        if self.text2_3.IsShown():
-            self.text2_3.Hide()
+        #if self.text2_3.IsShown():
+        #    self.text2_3.Hide()
       
         try:
             if self.enable_disp.GetValue():
                 if hasattr(self,"text_disp_1" ):
-                    if self.text_disp_1 != None:
+                    if self.text_disp_1 != None and self.text_disp_1.IsShown():
                         self.text_disp_1.Hide()
         except:
@@ -1847 +1851 @@
                             break        
                     if len(out)<=len(self.param_toFit) and out[ind] !=None:   
-                        val_out = format_number(out[ind], True)                  
-                        item[2].SetValue(val_out)
+                        val_out = format_number(out[ind], True) 
+                        if numpy.isfinite(val_out):                 
+                            item[2].SetValue(val_out)
+
 
                     if(cov !=None):
@@ -1866 +1872 @@
                                 val_err = format_number(cov[ind], True)
                                 item[3].Show(True)
+                                item[4].SetValue(val_err)
                                 item[4].Show(True)
-                                item[4].SetValue(val_err)
 
                                 has_error = True