Changeset 3649

Timestamp:

Oct 5, 2018 10:51:51 AM (5 years ago)

Author:

toby

Message:

Change display of equivalences

Location:

trunk

Files:

• GSASIIconstrGUI.py (modified) (1 diff)
• GSASIImapvars.py (modified) (2 diffs)

trunk/GSASIIconstrGUI.py

@@ -945 +945 @@
                 elif item[-1] == 'e':
                     helptext = "The following variables are set to be equivalent, noting multipliers:"
-                    for term in item[:-3]:
+                    normval = item[:-3][1][0]
+                    for i,term in enumerate(item[:-3]):
                         var = str(term[1])
                         if term[0] == 0: term[0] = 1.0
                         if len(eqString[-1]) > maxlen:
                             eqString.append(' ')
-                        if eqString[-1] == '':
-                            eqString[-1] += var+' '
-                            first = term[0]
+                        if i == 0: # move independent variable to end
+                            indepterm = term
+                            continue
+                        elif eqString[-1] != '':
+                            eqString[-1] += ' = '
+                        if normval/term[0] == 1:
+                            eqString[-1] += '%s'% var
                         else:
-                            eqString[-1] += ' = %.3f*%s '%(first/term[0],var)
+                            eqString[-1] += '%.3f*%s'%(normval/term[0],var)
                         varMean = G2obj.fmtVarDescr(var)
                         helptext += "\n" + var + " ("+ varMean + ")"
+                    if normval/indepterm[0] == 1:
+                        eqString[-1] += ' = %s'% str(indepterm[1])
+                    else:
+                        eqString[-1] += ' = %.3f*%s'%(normval/indepterm[0],str(indepterm[1]))
                     typeString = 'EQUIV'
                 else:

trunk/GSASIImapvars.py

@@ -1024 +1024 @@
             if not symFlag: continue
             if multarr is None:
-                s1 = str(mv) + ' = '
+                #s1 = str(mv) + ' = '
+                s1 = ''
+                s2 = ' = ' + str(mv)
                 j = 0
                 for v,m in zip(varlist,invmultarr):
@@ -1034 +1036 @@
                     if m != 1:
                         s1 += " / " + str(m[0])
-                    symout.append(s1)
+                    symout.append(s1+s2)
                 continue
             else: