Changeset 69bee6d in sasview

Timestamp:

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

74ad4b1

Parents:

7b35808

Message:

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

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (5 diffs)
• fitpage.py (modified) (4 diffs)
• fitting.py (modified) (1 diff)
• simfitpage.py (modified) (1 diff)

sansview/perspectives/fitting/basepage.py

@@ -5 +5 @@
 import time
 
-from sans.guiframe.utils import format_number
+from sans.guiframe.utils import format_number,check_float
 from sans.guicomm.events import StatusEvent   
 import pagestate
@@ -565 +565 @@
             # If qmin and qmax have been modified, update qmin and qmax and 
             # set the is_modified flag to True
-            from sans.guiframe.utils import check_value
+            from sans.guiframe.utils import check_value 
             if check_value( self.qmin, self.qmax):
                 if float(self.qmin.GetValue()) != self.qmin_x:
@@ -577 +577 @@
                 self.fitrange = False
             if self.npts != None:
-                if float(self.npts.GetValue()) !=  self.num_points:
-                    self.num_points = float(self.npts.GetValue())
-                    is_modified = True
-           
+                if check_float(self.npts):
+                    if float(self.npts.GetValue()) !=  self.num_points:
+                        self.num_points = float(self.npts.GetValue())
+                        is_modified = True
+                else:
+                    msg= "Cannot Plot :Must enter a number!!!  "
+                    wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
+                    
             
             ## if any value is modify draw model with new value
@@ -988 +992 @@
             when enter value on panel redraw model according to changed
         """
-        self._onparamEnter_helper()
+        tcrtl= event.GetEventObject()
+        if check_float(tcrtl):
+            self._onparamEnter_helper()
+        else:
+            msg= "Cannot Plot :Must enter a number!!!  "
+            wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
+            return 
         
         
@@ -1034 +1044 @@
                     item[4].Clear()
                     item[4].Hide()
+                    
+           
+                value= float(item[2].GetValue())
                 
-                value= float(item[2].GetValue())
                 # If the value of the parameter has changed,
                 # +update the model and set the is_modified flag
                 if value != self.model.getParam(name):
                     self.model.setParam(name,value)
-                    is_modified = True    
+                    is_modified = True   
+            
             except:
                 msg= "Model Drawing  Error:wrong value entered : %s"% sys.exc_value

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
         

sansview/perspectives/fitting/fitting.py

@@ -670 +670 @@
                                 small_out.append(p.value )
                                 model.setParam(param_name,p.value) 
+                                """
                                 if p.stderr==None:
                                     p.stderr=numpy.nan
                                     small_cov.append(p.stderr)
-                                   
                                 else:
                                     small_cov.append(p.stderr)
+                                """
+                                small_cov.append(p.stderr)
                             else:
                                 value= model.getParam(param_name)
                                 small_out.append(value )
-                                small_cov.append(numpy.nan)
+                                #small_cov.append(numpy.nan)
+                                small_cov.append(None)
                     # Display result on each page 
                     page.onsetValues(result.fitness, small_out,small_cov)

sansview/perspectives/fitting/simfitpage.py

@@ -362 +362 @@
         self.nb_constraint =0     
         self.constraint_dict={}
+        if hasattr(self,"btAdd"):
+            self.btAdd.Hide()
         self._store_model()