Changeset 4782


Ignore:
Timestamp:
Jan 20, 2021 2:35:12 PM (11 months ago)
Author:
toby
Message:

scripting fix; wx4.1 RB fixes

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIconstrGUI.py

    r4672 r4782  
    206206            return self.labels[row]
    207207        elif col == 1:
    208             return int(self.select[row])
     208            if self.select[row]:
     209                return '1'
     210            else:
     211                return ''
    209212        elif col == 2:
    210213            return self.types[row]
     
    217220                self.labels[row] = value
    218221            elif col == 1:
    219                 self.select[row] = int(value)
     222                self.select[row] = bool(value)
    220223            elif col == 2:
    221224                self.types[row] = value
     
    230233        return self.colLabels[col]
    231234    def GetRowLabelValue(self,row):
    232         return str(row+1)
     235        return str(row)
    233236
    234237    # Implement "row movement" by updating the pointer array
     
    29912994            nameSizer = wx.BoxSizer(wx.HORIZONTAL)
    29922995            nameSizer.Add(wx.StaticText(VectorRBDisplay,-1,'Rigid body name: '),0,WACV)
    2993             RBname = wx.TextCtrl(VectorRBDisplay,-1,rbData['RBname'])
     2996            RBname = wx.TextCtrl(VectorRBDisplay,-1,rbData['RBname'],
     2997                                     style=wx.TE_PROCESS_ENTER)
    29942998            RBname.Bind(wx.EVT_LEAVE_WINDOW, OnRBName)
    29952999            RBname.Bind(wx.EVT_TEXT_ENTER,OnRBName)
     
    32843288            nameSizer = wx.BoxSizer(wx.HORIZONTAL)
    32853289            nameSizer.Add(wx.StaticText(ResidueRBDisplay,-1,'Residue name: '),0,WACV)
    3286             RBname = wx.TextCtrl(ResidueRBDisplay,-1,rbData['RBname'])
     3290            RBname = wx.TextCtrl(ResidueRBDisplay,-1,rbData['RBname'],
     3291                                     style=wx.TE_PROCESS_ENTER)
    32873292            RBname.Bind(wx.EVT_LEAVE_WINDOW, OnRBName)
    32883293            RBname.Bind(wx.EVT_TEXT_ENTER,OnRBName)
  • trunk/GSASIIplot.py

    r4781 r4782  
    518518            plotNum = self.plotList.index(label)
    519519            Page = self.nb.GetPage(plotNum)
     520            self.SetSelectionNoRefresh(plotNum) # raises plot tab
    520521
    521522        Page.plotInvalid = False # plot has just been drawn
  • trunk/GSASIIscriptable.py

    r4765 r4782  
    11211121Below are example commands to install GSAS-II for use for scripting only.
    11221122
    1123 Installing a minimal Python configuration: Note I have chosen below
     1123**Installing a minimal Python configuration**: Note I have chosen below
    11241124to use the free
    11251125miniconda installer from Anaconda, Inc., but there are also plenty of
    11261126other ways to install Python, Numpy and Scipy on Linux, Windows and MacOS.
    11271127For Linux a reasonable alternative is to install these packages
    1128 (and perhaps others) as supplied by the Linux dist (``apt-get`` etc.).
     1128(and perhaps others as below) using the Linux dist (``apt-get`` etc.).
    11291129
    11301130.. code-block::  bash
     
    42574257        peaks['sigDict'] = G2pwd.DoPeakFit('LSQ',peaks['peaks'],background,limits,
    42584258                                           Parms,Parms2,self.data['data'][1],bxye,[],
    4259                                            False,controls,None)[0]
     4259                                           oneCycle=False,controls=controls,dlg=None)[0]
    42604260
    42614261    @property
Note: See TracChangeset for help on using the changeset viewer.