Ignore:
Timestamp:
Sep 8, 2017 5:56:57 PM (4 years ago)
Author:
toby
Message:

more work on constraints: prevent use of perviously constrained variables in new equivalences; include sym. generated constraints in checks; do not allow error-generating constraints to be added

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIdataGUI.py

    r3046 r3057  
    46394639       
    46404640        # Constraints
    4641         G2G.Define_wxId('wxID_CONSTRAINTADD', 'wxID_EQUIVADD', 'wxID_HOLDADD', 'wxID_FUNCTADD', 'wxID_ADDRIDING',
    4642           'wxID_CONSPHASE', 'wxID_CONSHIST', 'wxID_CONSHAP', 'wxID_CONSGLOBAL', 'wxID_EQUIVALANCEATOMS',)
     4641        G2G.Define_wxId('wxID_CONSTRAINTADD', 'wxID_EQUIVADD', 'wxID_HOLDADD', 'wxID_FUNCTADD',
     4642                        'wxID_ADDRIDING', 'wxID_CONSPHASE', 'wxID_CONSHIST', 'wxID_CONSHAP',
     4643                        'wxID_CONSGLOBAL', 'wxID_CONSSYM', 'wxID_EQUIVALANCEATOMS',)
    46434644        self.ConstraintMenu = wx.MenuBar()
    46444645        self.PrefillDataMenu(self.ConstraintMenu)
     
    46464647        self.ConstraintMenu.Append(menu=self.ConstraintTab, title='Select tab')
    46474648        for id,txt in (
    4648             (G2G.wxID_CONSPHASE,'Phase'),
    4649             (G2G.wxID_CONSHAP,'Histogram/Phase'),
    4650             (G2G.wxID_CONSHIST,'Histogram'),
    4651             (G2G.wxID_CONSGLOBAL,'Global')):
     4649                (G2G.wxID_CONSPHASE,'Phase'),
     4650                (G2G.wxID_CONSHAP,'Histogram/Phase'),
     4651                (G2G.wxID_CONSHIST,'Histogram'),
     4652                (G2G.wxID_CONSGLOBAL,'Global'),
     4653                (G2G.wxID_CONSSYM,'Sym-Generated'),
     4654                ):
    46524655            self.ConstraintTab.Append(id=id, kind=wx.ITEM_NORMAL,text=txt,
    46534656                help='Select '+txt+' constraint editing tab')
     
    76517654        elif G2frame.GPXtree.GetItemText(item) == 'Constraints':
    76527655            data = G2frame.GPXtree.GetItemPyData(item)
     7656            #reload(G2cnstG)  # for testing changes to GSASIIconstrGUI
    76537657            G2cnstG.UpdateConstraints(G2frame,data)
    76547658        elif G2frame.GPXtree.GetItemText(item) == 'Rigid bodies':
Note: See TracChangeset for help on using the changeset viewer.