Changeset 85b3971 in sasview

Timestamp:

Dec 18, 2009 11:07:28 PM (15 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

e051c8d

Parents:

6e74ee4

Message:

sansview: got rid of bad util call

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (5 diffs)
• fitpage.py (modified) (4 diffs)

sansview/perspectives/fitting/basepage.py

@@ -7 +7 @@
 import math
 import string
-from sans.guiframe.utils import format_number,check_float,check_value 
+from sans.guiframe.utils import format_number,check_float
 from sans.guicomm.events import StatusEvent
 import pagestate
@@ -935 +935 @@
             # If qmin and qmax have been modified, update qmin and qmax and 
             # set the is_modified flag to True
-            if check_value( self.qmin, self.qmax):
+            if self._validate_qrange(self.qmin, self.qmax):
                 tempmin = float(self.qmin.GetValue())
                 if tempmin != self.qmin_x:
@@ -984 +984 @@
             # If qmin and qmax have been modified, update qmin and qmax and 
             # set the is_modified flag to True
-            if check_value( self.qmin, self.qmax):
+            if self._validate_qrange(self.qmin, self.qmax):
                 tempmin = float(self.qmin.GetValue())
                 if tempmin != self.qmin_x:
@@ -1530 +1530 @@
         self.Layout()     
         
-              
+    def _validate_qrange(self, qmin_ctrl, qmax_ctrl):
+        """
+            Verify that the Q range controls have valid values
+            and that Qmin < Qmax.
+            
+            @param qmin_ctrl: text control for Qmin
+            @param qmax_ctrl: text control for Qmax
+            @return: True is the Q range is value, False otherwise 
+        """
+        qmin_validity = check_float(qmin_ctrl)
+        qmax_validity = check_float(qmax_ctrl)
+        if not (qmin_validity and qmax_validity):
+            return False
+        else:
+            qmin = float(qmin_ctrl.GetValue())
+            qmax = float(qmax_ctrl.GetValue())
+            if qmin < qmax:
+                #Make sure to set both colours white.  
+                qmin_ctrl.SetBackgroundColour(wx.WHITE)
+                qmin_ctrl.Refresh()
+                qmax_ctrl.SetBackgroundColour(wx.WHITE)
+                qmax_ctrl.Refresh()
+            else:
+                qmin_ctrl.SetBackgroundColour("pink")
+                qmin_ctrl.Refresh()
+                qmax_ctrl.SetBackgroundColour("pink")
+                qmax_ctrl.Refresh()
+                msg= "Invalid Q range: Q min must be smaller than Q max"
+                wx.PostEvent(self.parent.parent, StatusEvent(status = msg))
+                return False
+        return True
+
     def _check_value_enter(self, list, modified):
         """
@@ -1590 +1621 @@
 
                 if param_min != None and param_max !=None:
-                    if not check_value(item[5], item[6]):
+                    if not self._validate_qrange(item[5], item[6]):
                         msg= "Wrong Fit range entered for parameter "
                         msg+= "name %s of model %s "%(name, self.model.name)

sansview/perspectives/fitting/fitpage.py

@@ -11 +11 @@
 
 from sans.guicomm.events import StatusEvent   
-from sans.guiframe.utils import format_number,check_float,check_value
+from sans.guiframe.utils import format_number,check_float
  
 ## event to post model to fit to fitting plugins
@@ -571 +571 @@
         #make sure all parameter values are updated.
        
-        flag = self._update_paramv_on_fit() #check_value( self.qmin, self.qmax) 
+        flag = self._update_paramv_on_fit() 
                 
         if not flag:
@@ -745 +745 @@
 
                 # If qmin and qmax have been modified, update qmin and qmax
-                if check_value( self.qmin, self.qmax):
+                if self._validate_qrange( self.qmin, self.qmax):
                     tempmin = float(self.qmin.GetValue())
                     if tempmin != self.qmin_x:
@@ -1138 +1138 @@
             to the tcChi txtcrl
         """
-        flag = check_value( self.qmin, self.qmax)
+        flag = self._validate_qrange( self.qmin, self.qmax)
         if flag== True:
             try: