Changeset 1160 for trunk/GSASIIconstrGUI.py

Timestamp:

Nov 28, 2013 9:16:02 PM (8 years ago)

Author:

toby

Message:

finish ISODISPLACE fixes; improve show var window; improve help window; add refine checkbox for newvars in constraints display

File:

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

trunk/GSASIIconstrGUI.py

@@ -511 +511 @@
         '''
         allcons = []
-        for key in ['Hist','HAP','Phase','Global']:
+        for key in data:
+            if key.startswith('_'): continue
             allcons += data[key]
         allcons += newcons
@@ -538 +539 @@
         '''
         allcons = []
-        for key in 'Hist','HAP','Phase':
+        for key in data:
+            if key.startswith('_'): continue
             allcons += data[key]
         if not len(allcons): return True
@@ -675 +677 @@
         :returns: wx.Sizer created by method
         '''
-        constSizer = wx.FlexGridSizer(1,5,0,0)
+        constSizer = wx.FlexGridSizer(1,6,0,0)
         maxlen = 70 # characters before wrapping a constraint
         for Id,item in enumerate(data[name]):
+            refineflag = False
             helptext = ""
             eqString = ['',]
@@ -693 +696 @@
                 Indx[constEdit.GetId()] = [Id,name]
                 if item[-1] == 'f':
-                    helptext = "A new variable is created from a linear combination of the following variables:"
+                    helptext = "A new variable"
+                    if item[-3]:
+                        helptext += " named "+str(item[-3])
+                    helptext += " is created from a linear combination of the following variables:\n"
                     for term in item[:-3]:
                         var = str(term[1])
@@ -712 +718 @@
                             helptext += '\n\n'
                             helptext += data['_Explain'][item[-3]]
-                    typeString = 'NEWVAR'
+                    # typeString = 'NEWVAR'
+                    # if item[-3]:
+                    #     eqString[-1] += ' = '+item[-3]
+                    # else:
+                    #     eqString[-1] += ' = New Variable'
                     if item[-3]:
-                        eqString[-1] += ' = '+item[-3]
+                        typeString = item[-3] + ' = '
                     else:
-                        eqString[-1] += ' = New Variable'
+                        typeString = 'New Variable = '
+                    #print 'refine',item[-2]
+                    refineflag = True
                 elif item[-1] == 'c':
                     helptext = "The following variables constrained to equal a constant:"
@@ -732 +744 @@
                         helptext += "\n" + var + " ("+ varMean + ")"
                     typeString = 'CONST'
-                    eqString[-1] += ' = %.3f'%(item[-3])+'  '
+                    eqString[-1] += ' = '+str(item[-3])
                 elif item[-1] == 'e':
                     helptext = "The following variables are set to be equivalent, noting multipliers:"
@@ -763 +775 @@
                 constSizer.Add(ch,0,wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_CENTER,1)
             else:
+                constSizer.Add((-1,-1))
+            if refineflag:
+                ch = G2gd.G2CheckBox(pageDisplay,'',item,-2)
+                constSizer.Add(ch,0,wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_CENTER,1)
+            else:
                 constSizer.Add((-1,-1))                
-            constSizer.Add(wx.StaticText(pageDisplay,-1,typeString),0,wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_CENTER|wx.RIGHT|wx.LEFT,3)
+            constSizer.Add(wx.StaticText(pageDisplay,-1,typeString),
+                           0,wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_CENTER|wx.RIGHT|wx.LEFT,3)
             if len(eqString) > 1:
                 Eq = wx.BoxSizer(wx.VERTICAL)
@@ -815 +833 @@
                 result = dlg.GetData()
                 for i in range(len(data[name][Id][:-3])):
+                    if type(data[name][Id][i]) is tuple: # fix non-mutable construct
+                        data[name][Id][i] = list(data[name][Id][i])
                     data[name][Id][i][0] = result[i][0]
                 if data[name][Id][-1] == 'c':
@@ -825 +845 @@
                     varname = varname.replace(':',';')
                     if varname:
-                        data[name][Id][-3] = '::' + varname
+                        data[name][Id][-3] = varname
                     else:
                         data[name][Id][-3] = ''
@@ -925 +945 @@
     # validate all the constrants -- should not see any errors here normally
     allcons = []
-    for key in 'Hist','HAP','Phase':
+    for key in data:
+        if key.startswith('_'): continue
         allcons += data[key]
     if not len(allcons): return