Changeset 3057 for trunk/GSASIIdataGUI.py

Timestamp:

Sep 8, 2017 5:56:57 PM (5 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:

• trunk/GSASIIdataGUI.py (modified) (3 diffs)

trunk/GSASIIdataGUI.py

@@ -4639 +4639 @@
         
         # Constraints
-        G2G.Define_wxId('wxID_CONSTRAINTADD', 'wxID_EQUIVADD', 'wxID_HOLDADD', 'wxID_FUNCTADD', 'wxID_ADDRIDING',
-          'wxID_CONSPHASE', 'wxID_CONSHIST', 'wxID_CONSHAP', 'wxID_CONSGLOBAL', 'wxID_EQUIVALANCEATOMS',)
+        G2G.Define_wxId('wxID_CONSTRAINTADD', 'wxID_EQUIVADD', 'wxID_HOLDADD', 'wxID_FUNCTADD',
+                        'wxID_ADDRIDING', 'wxID_CONSPHASE', 'wxID_CONSHIST', 'wxID_CONSHAP',
+                        'wxID_CONSGLOBAL', 'wxID_CONSSYM', 'wxID_EQUIVALANCEATOMS',)
         self.ConstraintMenu = wx.MenuBar()
         self.PrefillDataMenu(self.ConstraintMenu)
@@ -4646 +4647 @@
         self.ConstraintMenu.Append(menu=self.ConstraintTab, title='Select tab')
         for id,txt in (
-            (G2G.wxID_CONSPHASE,'Phase'),
-            (G2G.wxID_CONSHAP,'Histogram/Phase'),
-            (G2G.wxID_CONSHIST,'Histogram'),
-            (G2G.wxID_CONSGLOBAL,'Global')):
+                (G2G.wxID_CONSPHASE,'Phase'),
+                (G2G.wxID_CONSHAP,'Histogram/Phase'),
+                (G2G.wxID_CONSHIST,'Histogram'),
+                (G2G.wxID_CONSGLOBAL,'Global'),
+                (G2G.wxID_CONSSYM,'Sym-Generated'),
+                ):
             self.ConstraintTab.Append(id=id, kind=wx.ITEM_NORMAL,text=txt,
                 help='Select '+txt+' constraint editing tab')
@@ -7651 +7654 @@
         elif G2frame.GPXtree.GetItemText(item) == 'Constraints':
             data = G2frame.GPXtree.GetItemPyData(item)
+            #reload(G2cnstG)  # for testing changes to GSASIIconstrGUI
             G2cnstG.UpdateConstraints(G2frame,data)
         elif G2frame.GPXtree.GetItemText(item) == 'Rigid bodies':