Changeset 1943


Ignore:
Timestamp:
Jul 21, 2015 1:28:34 PM (7 years ago)
Author:
vondreele
Message:

remove H-atom riding constraint editing; unusable at present

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIconstrGUI.py

    r1925 r1943  
    826826            constr = []
    827827            if 'riding' in constType:
    828                 if 'AU11' in name or 'AUiso' in name:
    829                     parts = name.split('AU11').split('AUiso')
    830                     constr = [[1.0,G2obj.G2VarObj(parts[0]+'AUiso'+parts[1])]]
     828                if 'AUiso' in name:
     829                    constr = [[1.0,G2obj.G2VarObj(name)]]
     830                elif 'AU11' in name:
     831                    pass
    831832                elif 'AU' not in name:
    832833                    constr = [[1.0,G2obj.G2VarObj(name)]]
     
    837838                id = Atoms[AtNames[sel]][0].rsplit(':',1)[-1]
    838839                if 'riding' in constType:
    839                     if 'AU11' in pref or 'AUiso' in pref:
     840                    if 'AUiso' in pref:
     841                        parts = pref.split('AUiso')
    840842                        constr += [[1.2,G2obj.G2VarObj('%s:%s'%(parts[0]+'AUiso',id))]]
    841843                    elif 'AU' not in pref:
     
    10741076        text = G2frame.dataDisplay.GetPageText(page)
    10751077        G2frame.dataFrame.ConstraintEdit.Enable(G2gd.wxID_EQUIVALANCEATOMS,False)
    1076         G2frame.dataFrame.ConstraintEdit.Enable(G2gd.wxID_ADDRIDING,False)
     1078#        G2frame.dataFrame.ConstraintEdit.Enable(G2gd.wxID_ADDRIDING,False)
    10771079        if text == 'Histogram/Phase constraints':
    10781080            G2frame.Page = [page,'hap']
     
    10841086            G2frame.Page = [page,'phs']
    10851087            G2frame.dataFrame.ConstraintEdit.Enable(G2gd.wxID_EQUIVALANCEATOMS,True)
    1086             G2frame.dataFrame.ConstraintEdit.Enable(G2gd.wxID_ADDRIDING,True)
     1088#            G2frame.dataFrame.ConstraintEdit.Enable(G2gd.wxID_ADDRIDING,True)
    10871089            UpdateConstraintPanel(PhaseConstr,'Phase')
    10881090        elif text == 'Global constraints':
     
    11191121    G2frame.dataFrame.Bind(wx.EVT_MENU, OnAddHold, id=G2gd.wxID_HOLDADD)
    11201122    G2frame.dataFrame.Bind(wx.EVT_MENU, OnAddAtomEquiv, id=G2gd.wxID_EQUIVALANCEATOMS)
    1121     G2frame.dataFrame.Bind(wx.EVT_MENU, OnAddRiding, id=G2gd.wxID_ADDRIDING)
     1123#    G2frame.dataFrame.Bind(wx.EVT_MENU, OnAddRiding, id=G2gd.wxID_ADDRIDING)
    11221124    # tab commands
    11231125    for id in (G2gd.wxID_CONSPHASE,
  • trunk/GSASIIgrid.py

    r1930 r1943  
    735735            help='Add equivalences between atom parameter values')
    736736        self.ConstraintEdit.Enable(wxID_EQUIVALANCEATOMS,False)
    737         self.ConstraintEdit.Append(id=wxID_ADDRIDING, kind=wx.ITEM_NORMAL,text='Add H riding constraints',
    738             help='Add H atom riding constraints between atom parameter values')
    739         self.ConstraintEdit.Enable(wxID_ADDRIDING,False)
    740         wxID_ADDRIDING
     737#        self.ConstraintEdit.Append(id=wxID_ADDRIDING, kind=wx.ITEM_NORMAL,text='Add H riding constraints',
     738#            help='Add H atom riding constraints between atom parameter values')
     739#        self.ConstraintEdit.Enable(wxID_ADDRIDING,False)
    741740        self.PostfillDataMenu()
    742741
Note: See TracChangeset for help on using the changeset viewer.