Changeset 858fabed in sasview

Timestamp:

Mar 20, 2009 6:31:29 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:

200a6c5

Parents:

20d30e9

Message:

add small function in utils

Location:

guiframe

Files:

• calcthread.py (deleted)
• dataFitting.py (modified) (2 diffs)
• model_thread.py (deleted)
• utils.py (modified) (1 diff)

guiframe/dataFitting.py

@@ -12 +12 @@
         plotData1D.__init__(self, x, y, dx, dy)
         self.smearer=None
-        if dxl !=None:
-            self.dxl = dxl
-        if dxw !=None:
-            self.dxw = dxw
+       
+        self.dxl = dxl
+        self.dxw = dxw
  
 class Theory1D(plotTheory1D,DataInfo):
@@ -21 +20 @@
         plotTheory1D.__init__(self, x, y)
         self.smearer=None
-        if dxl !=None:
-            self.dxl = dxl
-        if dxw !=None:
-            self.dxw = dxw
+        
+        self.dxl = dxl
+        self.dxw = dxw
  

guiframe/utils.py

@@ -20 +20 @@
         output= "%-5.3g" % value
     return output.lstrip().rstrip()
+def check_value( item1, item2):
+    """
+        Check 2 txtcrtl value 
+        @param item1: txtcrtl containing the minimum value
+        @param item2: txtcrtl containing the maximum value
+    """
+    mini = float(format_number(item1.GetValue()))
+    maxi = float(format_number(item2.GetValue()))
+    flag= True
+    if mini <  maxi: 
+      item1.SetBackgroundColour(wx.WHITE)
+      item1.Refresh()
+    else:
+        flag = False
+        item1.SetBackgroundColour("pink")
+        item1.Refresh()
+      
+    return flag
+   
+    
+    
     
 class PanelMenu(wx.Menu):