Changeset 1989

Timestamp:

Oct 6, 2015 5:48:53 PM (7 years ago)

Author:

toby

Message:

fix ValidatedTxtCtrl? bug; add option to G2CheckBox

File:

• trunk/GSASIIctrls.py (modified) (4 diffs)

trunk/GSASIIctrls.py

@@ -308 +308 @@
         self.OnLeaveArgs = OnLeaveArgs
         self.CIFinput = CIFinput
+        self.notBlank = notBlank
         self.type = str
         # initialization
@@ -464 +465 @@
         '''
         val = self.GetValue().strip()
-        self.invalid = not val
+        if self.notBlank:
+            self.invalid = not val
+        else:
+            self.invalid = False
         self._IndicateValidity()
         if self.invalid:
@@ -962 +966 @@
       The CheckBox will be initialized from this value.
       If the value is anything other that True (or 1), it will be taken as
-      False. 
+      False.
+    :param function OnChange: specifies a function or method that will be
+      called when the CheckBox is changed (Default is None). 
+      The called function is supplied with one argument, the calling event.
     '''
-    def __init__(self,parent,label,loc,key):
+    def __init__(self,parent,label,loc,key,OnChange=None):
         wx.CheckBox.__init__(self,parent,id=wx.ID_ANY,label=label)
         self.loc = loc
         self.key = key
+        self.OnChange = OnChange
         self.SetValue(self.loc[self.key]==True)
         self.Bind(wx.EVT_CHECKBOX, self._OnCheckBox)
@@ -973 +981 @@
         self.loc[self.key] = self.GetValue()
         log.LogVarChange(self.loc,self.key)
-            
+        if self.OnChange: self.OnChange(event)
+                    
 ################################################################################
 #### Commonly used dialogs