Changeset 4782 for trunk/GSASIIconstrGUI.py

Timestamp:

Jan 20, 2021 2:35:12 PM (2 years ago)

Author:

toby

Message:

scripting fix; wx4.1 RB fixes

File:

• trunk/GSASIIconstrGUI.py (modified) (5 diffs)

trunk/GSASIIconstrGUI.py

@@ -206 +206 @@
             return self.labels[row]
         elif col == 1:
-            return int(self.select[row])
+            if self.select[row]:
+                return '1'
+            else:
+                return ''
         elif col == 2:
             return self.types[row]
@@ -217 +220 @@
                 self.labels[row] = value
             elif col == 1:
-                self.select[row] = int(value)
+                self.select[row] = bool(value)
             elif col == 2:
                 self.types[row] = value
@@ -230 +233 @@
         return self.colLabels[col]
     def GetRowLabelValue(self,row):
-        return str(row+1)
+        return str(row)
 
     # Implement "row movement" by updating the pointer array
@@ -2991 +2994 @@
             nameSizer = wx.BoxSizer(wx.HORIZONTAL)
             nameSizer.Add(wx.StaticText(VectorRBDisplay,-1,'Rigid body name: '),0,WACV)
-            RBname = wx.TextCtrl(VectorRBDisplay,-1,rbData['RBname'])
+            RBname = wx.TextCtrl(VectorRBDisplay,-1,rbData['RBname'],
+                                     style=wx.TE_PROCESS_ENTER)
             RBname.Bind(wx.EVT_LEAVE_WINDOW, OnRBName)
             RBname.Bind(wx.EVT_TEXT_ENTER,OnRBName)
@@ -3284 +3288 @@
             nameSizer = wx.BoxSizer(wx.HORIZONTAL)
             nameSizer.Add(wx.StaticText(ResidueRBDisplay,-1,'Residue name: '),0,WACV)
-            RBname = wx.TextCtrl(ResidueRBDisplay,-1,rbData['RBname'])
+            RBname = wx.TextCtrl(ResidueRBDisplay,-1,rbData['RBname'],
+                                     style=wx.TE_PROCESS_ENTER)
             RBname.Bind(wx.EVT_LEAVE_WINDOW, OnRBName)
             RBname.Bind(wx.EVT_TEXT_ENTER,OnRBName)