Changeset 4782 for trunk

Timestamp:

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

Author:

toby

Message:

scripting fix; wx4.1 RB fixes

Location:

trunk

Files:

• GSASIIconstrGUI.py (modified) (5 diffs)
• GSASIIplot.py (modified) (1 diff)
• GSASIIscriptable.py (modified) (2 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)

trunk/GSASIIplot.py

@@ -518 +518 @@
             plotNum = self.plotList.index(label)
             Page = self.nb.GetPage(plotNum)
+            self.SetSelectionNoRefresh(plotNum) # raises plot tab
 
         Page.plotInvalid = False # plot has just been drawn

trunk/GSASIIscriptable.py

@@ -1121 +1121 @@
 Below are example commands to install GSAS-II for use for scripting only.
 
-Installing a minimal Python configuration: Note I have chosen below 
+**Installing a minimal Python configuration**: Note I have chosen below 
 to use the free 
 miniconda installer from Anaconda, Inc., but there are also plenty of 
 other ways to install Python, Numpy and Scipy on Linux, Windows and MacOS. 
 For Linux a reasonable alternative is to install these packages 
-(and perhaps others) as supplied by the Linux dist (``apt-get`` etc.).
+(and perhaps others as below) using the Linux dist (``apt-get`` etc.).
 
 .. code-block::  bash
@@ -4257 +4257 @@
         peaks['sigDict'] = G2pwd.DoPeakFit('LSQ',peaks['peaks'],background,limits,
                                            Parms,Parms2,self.data['data'][1],bxye,[],
-                                           False,controls,None)[0]
+                                           oneCycle=False,controls=controls,dlg=None)[0]
 
     @property