Changeset 3468

Timestamp:

Jul 12, 2018 10:30:56 AM (5 years ago)

Author:

vondreele

Message:

define new function FindAllCons? to replace bits of identical code that found all constrained variables

File:

• trunk/GSASIIconstrGUI.py (modified) (5 diffs)

trunk/GSASIIconstrGUI.py

@@ -510 +510 @@
             dlg.Destroy()
         return []
-
+    
+    def FindAllCons(data):
+        ''' Find all constraints
+        '''
+        allcons = []
+        for key in data:
+            if key.startswith('_'): continue
+            allcons += data[key]
+        return allcons
+        
     def CheckConstraints(constraintSet):
         '''Check for errors in a set of constraints. Constraints based on symmetry (etc.)
@@ -535 +544 @@
         :returns: True if constraint should be added
         '''
-        allcons1 = []
-        for key in data:
-            if key.startswith('_'): continue
-            allcons1 += data[key]
+        
+        allcons1 = FindAllCons(data)
         allcons = allcons1[:]
         allcons += newcons
@@ -566 +573 @@
         :returns: True if the edit should be retained
         '''
-        allcons = []
-        for key in data:
-            if key.startswith('_'): continue
-            allcons += data[key]
+        allcons = FindAllCons(data)
         if not len(allcons): return True
         errmsg,warnmsg = CheckConstraints(allcons)
@@ -1002 +1006 @@
         Id,name = Indx[Obj.GetId()]
         del data[name][Id]
-        allcons = []
-        for key in data:
-            if key.startswith('_'): continue
-            allcons += data[key]
+        allcons = FindAllCons(data)
         if not len(allcons): return
         errmsg,warnmsg = CheckConstraints(allcons)
@@ -1180 +1181 @@
     G2frame.constr.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED, OnPageChanged)
     # validate all the constrants -- should not see any errors here normally
-    allcons = []
-    for key in data:
-        if key.startswith('_'): continue
-        allcons += data[key]
+    allcons = FindAllCons(data)
     if not len(allcons): return
     errmsg,warnmsg = CheckConstraints(allcons)