Changeset 69bee6d in sasview for sansview/perspectives/fitting/basepage.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/basepage.py (modified) (5 diffs)

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