Changeset 4868 for trunk

Timestamp:

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

Author:

toby

Message:

fix back print issue + some CIF fixes

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (10 diffs)
• GSASIIstrIO.py (modified) (1 diff)
• exports/G2export_CIF.py (modified) (6 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)
 

trunk/GSASIIstrIO.py

@@ -3551 +3551 @@
                         ptstr += 12*' '
                 pFile.write(ptstr+'\n')
-        if 'background PWDR' in DebyePeaks and DebyePeaks['background PWDR'][2]:
+        if ('background PWDR' in DebyePeaks and
+                len(DebyePeaks['background PWDR']) >= 3 and
+                DebyePeaks['background PWDR'][2]):
             pFile.write(' Fixed background scale: %.3f(%d)\n'%(DebyePeaks['background PWDR'][1],int(1000*backSig[-1])))
         sumBk = np.array(Histogram['sumBk'])

trunk/exports/G2export_CIF.py

@@ -2678 +2678 @@
         self.msg=msg
         self.parent = parent
-        #self.helpwin = self.parent.helpwin
         self.helpwin = helpwin
         self.helptxt = helptxt
@@ -2684 +2683 @@
         'Respond to a button press by displaying the requested text'
         try:
-            #helptxt = self.helptxt
+            ww,wh = self.helpwin.GetSize()
             ow,oh = self.helptxt.GetSize()
             self.helptxt.SetLabel(self.msg)
+            self.helptxt.Wrap(ww-10)
             w,h = self.helptxt.GetSize()
-            if h > oh:
+            if h > oh: # resize the help area if needed, but avoid changing width
+                self.helptxt.SetMinSize((ww,h))
                 self.helpwin.GetSizer().Fit(self.helpwin)
         except: # error posting help, ignore
@@ -2801 +2802 @@
         savebtn.Bind(wx.EVT_BUTTON,self._onSave)
         OKbtn = wx.Button(self, wx.ID_OK, "Use")
+        OKbtn.Bind(wx.EVT_BUTTON, lambda x: self.EndModal(wx.ID_OK))
         OKbtn.SetDefault()
         OKbuttons.append(OKbtn)
@@ -2833 +2835 @@
             defaultFile=self.defaultname,
             wildcard="CIF (*.cif)|*.cif",
-            style=wx.SAVE)
+            style=wx.FD_SAVE)
         val = (dlg.ShowModal() == wx.ID_OK)
         fil = dlg.GetPath()
@@ -2919 +2921 @@
                 txt = wx.StaticText(self,wx.ID_ANY,item+"  ")
                 fbox.Add(txt,(0,i+1))
-                # if self.cifdic.get(item):
-                #     df = self.cifdic[item].get('_definition')
-                #     if df:
-                #         txt.SetToolTipString(G2IO.trim(df))
-                #         but = CIFdefHelp(self,
-                #                          "Definition for "+item+":\n\n"+G2IO.trim(df),
-                #                          self.parent,
-                #                          self.parent.helptxt)
-                #         fbox.Add(but,(1,i+1),flag=wx.ALIGN_CENTER)
                 for j,val in enumerate(self.cifblk[item]):
                     ent = self.CIFEntryWidget(self.cifblk[item],j,item)
@@ -2947 +2940 @@
             for i in range(rows):
                 txt = wx.StaticText(self,wx.ID_ANY,str(i+1))
-                fbox.Add(txt,(i+2,0))
+                fbox.Add(txt,(i+1,0))
             line = wx.StaticLine(self,wx.ID_ANY, size=(-1,3), style=wx.LI_HORIZONTAL)
             vbox.Add(line, 0, wx.EXPAND|wx.ALL, 10)