Changeset a208464 in sasview

Timestamp:

Dec 18, 2009 10:30:40 AM (15 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:

db27a2c

Parents:

0957dbdb

Message:

refactored check_value()

File:

• guiframe/utils.py (modified) (2 diffs)

guiframe/utils.py

@@ -23 +23 @@
 def check_float(item):
     """
-       @param item2: txtcrtl containing the maximum value
+       @param item: txtcrtl containing a value
     """
     flag= True
@@ -35 +35 @@
         item.Refresh()
     return flag
-def check_value( item1, item2):
+
+
+def check_value(item1, item2):
     """
-        Check 2 txtcrtl value 
-        @param item1: txtcrtl containing the minimum value
-        @param item2: txtcrtl containing the maximum value
+        Check 2 txtcrtl item values if they are in order
+        @param item1: txtcrtl containing value1
+        @param item2: txtcrtl containing value2
+        @return flag=True when value1<value2 
+        Note: item1 backgroundcolour="white" when value1<value2 otherwise "pink"
     """
-    flag= False
-    try:
-        mini = float(format_number(item1.GetValue()))
-        item1.SetBackgroundColour(wx.WHITE)
-        item1.Refresh()
-    except:
+    flag= True
+    flag_item1 = check_float(item1)
+    flag_item2 = check_float(item2)
+    if flag_item1 == False or flag_item2 == False:
         flag = False
-        item1.SetBackgroundColour("pink")
-        item1.Refresh()
-        return flag
-    try:    
-        maxi = float(format_number(item2.GetValue()))
-        item2.SetBackgroundColour(wx.WHITE)
-        item2.Refresh()
-    except:
-        flag = False
-        item2.SetBackgroundColour("pink")
-        item2.Refresh()
-        return flag
-    
-    if mini <  maxi: 
-      item1.SetBackgroundColour(wx.WHITE)
-      item1.Refresh()
-      item2.SetBackgroundColour(wx.WHITE)
-      item2.Refresh()
-      flag = True
     else:
-        flag = False
-        item1.SetBackgroundColour("pink")
-        item1.Refresh()
-      
+        value_item1 = float(item1.GetValue())
+        value_item2 = float(item2.GetValue())
+        if value_item1 <  value_item2: 
+          #Make sure to set both colours white.  
+          item1.SetBackgroundColour(wx.WHITE)
+          item1.Refresh()
+          item2.SetBackgroundColour(wx.WHITE)
+          item2.Refresh()
+        else:
+            flag = False
+            item1.SetBackgroundColour("pink")
+            item1.Refresh()      
     return flag
-   
-