Changeset 69bee6d in sasview for sansview/perspectives/fitting/fitpage.py

Timestamp:

Apr 14, 2009 7:57:49 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:

74ad4b1

Parents:

7b35808

Message:

checking value of textcrtl, hide add button for simul fit
hide error of fit param in None

File:

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

sansview/perspectives/fitting/fitpage.py

@@ -8 +8 @@
 
 from sans.guicomm.events import StatusEvent   
-from sans.guiframe.utils import format_number
+from sans.guiframe.utils import format_number,check_float
 
 ## event to post model to fit to fitting plugins
@@ -459 +459 @@
             when enter value on panel redraw model according to changed
         """
-        self._onparamEnter_helper()
-        self.compute_chisqr()
-        
+        tcrtl= event.GetEventObject()
+        if check_float(tcrtl):
+            self._onparamEnter_helper()
+            self.compute_chisqr()
+        else:
+            msg= "Cannot Plot :Must enter a number!!!  "
+            wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
+            return 
         
     def reset_page(self, state):
@@ -516 +521 @@
                 if self.text_disp_1 !=None:
                     self.text_disp_1.Show(True)
-                    
-                self.param_toFit[0][3].Show(True)
-                self.param_toFit[0][4].Clear()
-                self.param_toFit[0][4].SetValue(format_number(cov[0]))
-                self.param_toFit[0][4].Show(True)
+                if cov[0]==None:  
+                    self.param_toFit[0][3].Hide()
+                    self.param_toFit[0][4].Clear()
+                    self.param_toFit[0][4].Hide()
+                    self.param_toFit[0][4].Refresh()
+                else:
+                    self.param_toFit[0][3].Show(True)
+                    self.param_toFit[0][4].Clear()
+                    self.param_toFit[0][4].SetValue(format_number(cov[0]))
+                    self.param_toFit[0][4].Show(True)
+                    self.param_toFit[0][4].Refresh()
         else:
             i=0
@@ -542 +553 @@
                         if out[j]==self.model.getParam(item[1]):
                             break
-                    item[4].SetValue(format_number(cov[j]))
-                    item[4].Refresh()
-                    item[4].Show(True)   
+                    ## unable to compare cov[j]==numpy.nan so switch to None
+                    if cov[j]==None:
+                        item[3].Hide()
+                        item[4].Refresh()
+                        item[4].Clear()
+                        item[4].Hide()
+                    else:
+                        item[4].SetValue(format_number(cov[j]))
+                        item[4].Refresh()
+                        item[4].Show(True)   
                 i+=1