Changeset 4823 for trunk

Timestamp:

Feb 20, 2021 1:25:23 PM (4 years ago)

Author:

toby

Message:

fix naming of new variable constraints; label them & improve constraint help text

Location:

trunk

Files:

• GSASIIconstrGUI.py (modified) (5 diffs)
• GSASIIobj.py (modified) (1 diff)
• GSASIIstrIO.py (modified) (2 diffs)

trunk/GSASIIconstrGUI.py ¶

@@ -1092 +1092 @@
                             eqString[-1] += '{:g}*{:} '.format(m,var)
                         varMean = G2obj.fmtVarDescr(var)
-                        helptext += "\n" + var + " ("+ varMean + ")"
+                        helptext += '\n{:3g} * {:} '.format(m,var) + " ("+ varMean + ")"
                     # Add ISODISTORT help items
                     if '_Explain' in data:
@@ -1105 +1105 @@
                             helptext += '\n\n'
                             helptext += hlptxt
-                    # typeString = 'NEWVAR'
-                    # if item[-3]:
-                    #     eqString[-1] += ' = '+item[-3]
-                    # else:
-                    #     eqString[-1] += ' = New Variable'
                     if item[-3]:
-                        typeString = str(item[-3]) + ' = '
+                        typeString = '(NEWVAR) ' + str(item[-3]) + ' = '
                     else:
                         typeString = 'New Variable = '
@@ -1134 +1129 @@
                             eqString[-1] += '{:g}*{:} '.format(m,var)
                         varMean = G2obj.fmtVarDescr(var)
-                        helptext += "\n" + var + " ("+ varMean + ")"
+                        helptext += '\n{:3g} * {:} '.format(m,var) + " ("+ varMean + ")"
                     typeString = 'CONST'
                     eqString[-1] += ' = '+str(item[-3])
                 elif item[-1] == 'e':
-                    helptext = "The following variables are set to be equivalent, noting multipliers:"
-                    normval = item[:-3][1][0]
+                    helptext = "The following variable:"
+                    normval = item[:-3][0][0]
+                    indepterm = item[:-3][0][1]
                     for i,term in enumerate(item[:-3]):
                         var = str(term[1])
@@ -1145 +1141 @@
                         if len(eqString[-1]) > maxlen:
                             eqString.append(' ')
-                        if i == 0: # move independent variable to end
-                            indepterm = term
+                        varMean = G2obj.fmtVarDescr(var)
+                        if i == 0: # move independent variable to end, as requested by Bob
+                            helptext += '\n{:} '.format(var) + " ("+ varMean + ")"
+                            helptext += "\n\nis equivalent to the following, noting multipliers:"
                             continue
                         elif eqString[-1] != '':
                             eqString[-1] += ' = '
-                        if normval/term[0] == 1:
+                        m = normval/term[0]
+                        if m == 1:
                             eqString[-1] += '{:}'.format(var)
                         else:
-                            eqString[-1] += '{:g}*{:} '.format(normval/term[0],var)
-                        varMean = G2obj.fmtVarDescr(var)
-                        helptext += "\n" + var + " ("+ varMean + ")"
-                    if normval/indepterm[0] == 1:
-                        eqString[-1] += ' = {:} '.format(indepterm[1])
-                    else:
-                        eqString[-1] += ' = {:g}*{:} '.format(normval/indepterm[0],str(indepterm[1]))
+                            eqString[-1] += '{:g}*{:} '.format(m,var)
+                        helptext += '\n{:3g} * {:} '.format(m,var) + " ("+ varMean + ")"
+                    eqString[-1] += ' = {:} '.format(indepterm)
                     typeString = 'EQUIV'
                 else:
@@ -1247 +1242 @@
                 elif data[name][Id][-1] == 'f':
                     data[name][Id][-2] = dlg.newvar[1]
-                    if type(data[name][Id][-3]) is str:
+                    if dlg.newvar[0]:
                         # process the variable name to put in global form (::var)
                         varname = str(dlg.newvar[0]).strip().replace(' ','_')

trunk/GSASIIobj.py ¶

@@ -1932 +1932 @@
         'RBRU' : 'Residue rigid body group Uiso param.',
         'constr([0-9]*)' : 'Parameter from constraint',
+        'nv-([^_]+)_*' : 'New variable constraint parameter named \\1',
         # supersymmetry parameters  p::<var>:a:o 'Flen','Fcent'?
         'mV([0-2])$' : 'Modulation vector component \\1',

trunk/GSASIIstrIO.py ¶

@@ -191 +191 @@
     fixedList = []
     ignored = 0
+    namedVarList = []
     for item in constList:
         if item[-1] == 'h':
@@ -214 +215 @@
                 if varname is not None:
                     varname = str(varname) # in case this is a G2VarObj
-                    if ':' in varname:
+                    if varname.startswith(':'):
                         D['_name'] = varname
                     else:
-                        D['_name'] = '::' + varname
+                        D['_name'] = '::nv-' + varname
+                    D['_name'] = G2obj.MakeUniqueLabel(D['_name'],namedVarList)
                 D['_vary'] = varyFlag == True # force to bool
                 constDict.append(D)