Changeset 5216 for trunk

Timestamp:

Mar 13, 2022 11:38:03 AM (3 years ago)

Author:

toby

Message:

improve display of processed constraints

Location:

trunk

Files:

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

trunk/GSASIIconstrGUI.py ¶

@@ -1396 +1396 @@
             btn = wx.Button(panel, wx.ID_ANY, 'Show generated constraints')
             butSizer.Add(btn,0,wx.ALIGN_CENTER_VERTICAL)
+            txt = G2mv.VarRemapShow(linelen=999).replace('&','&&')
             btn.Bind(wx.EVT_BUTTON,lambda event:
                          G2G.ShowScrolledColText(panel,
-                        '*** Constraints after processing ***'+G2mv.VarRemapShow(linelen=999),
+                        '*** Constraints after processing ***'+txt,
                          header='Generated constraints',col1len=80))
             panel.delBtn = wx.Button(panel, wx.ID_ANY, 'Delete selected')

trunk/GSASIIctrlGUI.py ¶

@@ -2565 +2565 @@
     for i,line in enumerate(txt.split('\n')):
         if line.strip().endswith(':'):
-            st = wx.StaticText(spanel,wx.ID_ANY,line,style=wx.ALIGN_CENTER)
+            st = wx.StaticText(spanel,wx.ID_ANY,line)
             txtSizer.Add(st,pos=(i,0),span=(0,cols),flag=wx.EXPAND)
             continue
         elif line.strip().startswith('**') and line.strip().endswith('**'):
-            st = wx.StaticText(spanel,wx.ID_ANY,line)
+            st = wx.StaticText(spanel,wx.ID_ANY,line,style=wx.ALIGN_CENTER)
             st.SetBackgroundColour(DULL_YELLOW)
             txtSizer.Add(st,pos=(i,0),span=(0,cols),flag=wx.EXPAND)
@@ -2584 +2584 @@
             while col == 0 and len(t) > col1len:
                 b = -1
-                for sym in (') ',' * ',' + ',' - '):
-                    if sym in t[:col1len]:
-                        b = max(b,t.rfind(sym,0,col1len)+len(sym))
-                s += t[:b] + '\n\t'
-                t = t[b:]
+                for sym in (') ',' * ',' + ',' - ',' && '):
+                    b = max(b, t.rfind(sym,0,col1len))
+                if b > 20:
+                    s += t[:b+1] 
+                    t = '\n\t' + t[b+1:]
+                    continue
+                break
             s += t
             st = wx.StaticText(spanel,wx.ID_ANY,s)
-            if col == 0: st.Wrap(600)
+            if col == 0: st.Wrap(650)  # last resort...
             st.SetBackgroundColour(wx.WHITE)
             txtSizer.Add(st,pos=(i,col),flag=wx.EXPAND)
-        txtSizer.AddGrowableRow(i)
+        #txtSizer.AddGrowableRow(i)
     txtSizer.AddGrowableCol(0)  #to fill screen
     spanel.SetSizer(txtSizer)

trunk/GSASIImapvars.py ¶

@@ -2226 +2226 @@
                 for v,m in zip(varlist,invmultarr):
                     if debug: print ('v,m[0]: ',v,m[0])
-                    if len(s1.split('\n')[-1]) > 75: s1 += '\n        '
                     if j > 0: s1 += ' & '
                     j += 1
                     s1 += str(v)
                     if m != 1:
-                        s1 += " / " + str(m[0])
+                        s1 += " / " + '{:.4f}'.format(m[0])
+                    #if len(s1.split('\n')[-1]) > 70: 
+                    #    s1 = ' \n          &'.join(s1.rsplit('&',1))
                 if symFlag:
                     symOut += s1 + '\n'
@@ -2318 +2319 @@
     return s
 
+def getInvConstraintEq(var,varyList):
+    '''For a dependent variable, find the constraint that 
+    defines the dependent variable in terms of varied independent variables.
+    This works for constraint equations (via new var or generated parameters)
+    or equivalences. For equivalences the result will lists of length 1
+    
+    :param str var: named of refined variable (e.g. 0:0:Scale)
+    :param list varyList: list of refined variables
+    :returns: vList,mList where vList is a list of variables and 
+      mList is a list of multipliers for that variable (floats)
+    '''
+    for varlist,mapvars,invmultarr in zip(dependentParmList,indParmList,invarrayList):
+        if var not in varlist: continue
+        i = varlist.index(var)
+        print(var,i)
+        vList = []
+        mList = []
+        for m,v in zip(invmultarr[i,:],mapvars):
+            if v not in varyList: continue
+            if m == 0: continue
+            if v == 0: continue
+            vList.append(v)
+            mList.append(m)
+        return vList,mList
+    if GSASIIpath.GetConfigValue('debug'): print('getInvConstraintEq: not found: ',var)
+    return [],[]   # unexpected -- not an independent parameter
+    
 def GetSymEquiv(seqmode,seqhistnum):
     '''Return the automatically generated (equivalence) relationships.