Changeset 4868 for trunk/GSASIIctrlGUI.py

Timestamp:

Mar 30, 2021 5:45:34 PM (2 years ago)

Author:

toby

Message:

fix back print issue + some CIF fixes

File:

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

trunk/GSASIIctrlGUI.py

@@ -183 +183 @@
     pass
 
+if 'phoenix' in wx.version():
+    wxValidator = wx.Validator
+else:
+    wxValidator = wx.pyValidator
+
 #### Fixed definitions for wx Ids ################################################################################
 def Define_wxId(*args):
@@ -542 +547 @@
         val = loc[key]
         if 'style' in kw: # add a "Process Enter" to style
-            kw['style'] += kw['style'] | wx.TE_PROCESS_ENTER
+            kw['style'] |= wx.TE_PROCESS_ENTER
         else:
             kw['style'] = wx.TE_PROCESS_ENTER
@@ -646 +651 @@
                 s = ''
                 for c in val:
-                    if ord(c) < 128: s += c
+                    if ord(c) < 128:
+                        s += c
+                    else:
+                        s += '!'
                 if val != s:
                     val = s
@@ -715 +723 @@
             self.OKcontrol(True)
         # always store the result
-        if self.CIFinput: # for CIF make results ASCII
+        if self.CIFinput and '2' in platform.python_version_tuple()[0]: # CIF/Py2 make results ASCII
             self.result[self.key] = val.encode('ascii','replace') 
         else:
@@ -730 +738 @@
         val = self.GetValue().strip()
         # always store the result
-        if self.CIFinput: # for CIF make results ASCII
+        if self.CIFinput and '2' in platform.python_version_tuple()[0]: # Py2/CIF make results ASCII
             self.result[self.key] = val.encode('ascii','replace') 
         else:
@@ -777 +785 @@
                 pass
 ################################################################################
-class NumberValidator(wx.PyValidator):
+class NumberValidator(wxValidator):
     '''A validator to be used with a TextCtrl to prevent
     entering characters other than digits, signs, and for float
@@ -816 +824 @@
         result=None, key=None, OKcontrol=None, CIFinput=False):
         'Create the validator'
-        if 'phoenix' in wx.version():
-            wx.Validator.__init__(self)
-        else:
-            wx.PyValidator.__init__(self)
+        wxValidator.__init__(self)
         # save passed parameters
         self.typ = typ
@@ -978 +983 @@
 
 ################################################################################
-class ASCIIValidator(wx.PyValidator):
+class ASCIIValidator(wxValidator):
     '''A validator to be used with a TextCtrl to prevent
     entering characters other than ASCII characters.
@@ -994 +999 @@
         'Create the validator'
         import string
-        wx.PyValidator.__init__(self)
+        wxValidator.__init__(self)
         # save passed parameters
         self.result = result
@@ -1020 +1025 @@
           is associated with.
         '''
-        self.result[self.key] = tc.GetValue().encode('ascii','replace')
+        if '2' in platform.python_version_tuple()[0]:
+            self.result[self.key] = tc.GetValue().encode('ascii','replace')
+        else:
+            self.result[self.key] = tc.GetValue()
         log.LogVarChange(self.result,self.key)