Changeset 5371 for trunk/GSASIIctrlGUI.py

Timestamp:

Nov 14, 2022 9:28:04 AM (7 months ago)

Author:

toby

Message:

more ValidatedTxtCtrl? fixes: add timer update for expressions & fix widget deletion problems

File:

• trunk/GSASIIctrlGUI.py (modified) (9 diffs)

trunk/GSASIIctrlGUI.py

@@ -554 +554 @@
         self.notBlank = notBlank
         self.ASCIIonly = ASCIIonly
-        self.type = str
+        
         # patch: remove this when min & max are no longer used to call this
         if min is not None:
@@ -566 +566 @@
                 print('Call to ValidatedTxtCtrl using max (change to xmax) here:')
                 G2obj.HowDidIgetHere(True)
+        # end patch
+        
         # initialization
         self.invalid = False   # indicates if the control has invalid contents
         self.evaluated = False # set to True when the validator recognizes an expression
+        self.timer = None      # tracks pending updates for expressions in float textctrls
+        self.delay = 5000      # delay for timer update (5 sec)
+        self.type = str
+        
         val = loc[key]
         if 'style' in kw: # add a "Process Enter" to style
@@ -672 +678 @@
             if self.nDig and show and not self.invalid:
                 wx.TextCtrl.SetValue(self,str(G2py3.FormatValue(val,self.nDig)))
+                self.evaluated = False # expression has been recast as value, reset flag
             elif show and not self.invalid:
                 wx.TextCtrl.SetValue(self,str(G2py3.FormatSigFigs(val)).rstrip('0'))
+                self.evaluated = False # expression has been recast as value, reset flag
         else:
             if self.ASCIIonly:
@@ -705 +713 @@
             self._onLoseFocus(None)
         if event: event.Skip()
+        if self.timer:
+            self.timer.Restart(self.delay)
                     
     def _onStringKey(self,event):
@@ -783 +793 @@
     def _onLeaveWindow(self,event):
         '''If the mouse leaves the text box, save the result, if valid,
-        but (unlike _onLoseFocus) don't update the textbox contents.
+        but (unlike _onLoseFocus) there is a two second delay before 
+        the textbox contents are updated with the value from the formula.
         '''
+        def delayedUpdate():
+            self.timer = None
+            try:
+                self._setValue(self.result[self.key])
+            except:
+                pass
         if self.type is not str:
             if not self.IsModified(): return  #ignore mouse crusing
@@ -790 +807 @@
            return
         if self.evaluated and not self.invalid: # deal with computed expressions
-            self.evaluated = False # expression has been recast as value, reset flag
+            if self.timer:
+                self.timer.Restart(self.delay)
+            else:
+                self.timer = wx.CallLater(self.delay,delayedUpdate)    # this includes a try in case the widget is deleted
         if self.invalid: # don't update an invalid expression
             if event: event.Skip()
@@ -813 +833 @@
             if self.invalid: # don't substitute for an invalid expression
                 return 
-            self.evaluated = False # expression has been recast as value, reset flag
             self._setValue(self.result[self.key])
         elif self.result is not None: # show formatted result, as Bob wants
@@ -819 +838 @@
             if not self.invalid: # don't update an invalid expression
                 self._setValue(self.result[self.key])
+                
         if self.OnLeave:
             self.event = event
@@ -1450 +1470 @@
     def _OnEvent(event):
         if event.GetEventObject() not in buttons:
-            print('Strange: unknown button')
+            if GSASIIpath.GetConfigValue('debug'): print('Strange: unknown button')
             return
         loc[key] = values[buttons.index(event.GetEventObject())]