Changeset 1306

Timestamp:

Apr 28, 2014 3:10:41 PM (8 years ago)

Author:

vondreele

Message:

fix status bar issues in seq plots
fix missing colSigs for atom xyz columns

Location:

trunk

Files:

• GSASIIgrid.py (modified) (2 diffs)
• GSASIIplot.py (modified) (4 diffs)

trunk/GSASIIgrid.py

@@ -4064 +4064 @@
     for parm in atomList:
         colList += [[data[name]['newAtomDict'][atomList[parm]][1] for name in histNames]]
+        colSigs += [None]   #why not the values?
     # add Pseudovars
-    for exp in Controls['SeqPseudoVars']:
-        obj = Controls['SeqPseudoVars'][exp]
+    for expr in Controls['SeqPseudoVars']:
+        obj = Controls['SeqPseudoVars'][expr]
         calcobj = G2obj.ExpressionCalcObj(obj)
         valList = []
@@ -4073 +4074 @@
             calcobj.SetupCalc(parmDict)
             valList.append(calcobj.EvalExpression())
+        colSigs += [None]
         colList += [valList]
-        colSigs += [None]
-        colLabels += [exp]
+        colLabels += [expr]
         Types += [wg.GRID_VALUE_FLOAT,]
-
     rowList = [c for c in zip(*colList)]     # convert from columns to rows
     G2frame.SeqTable = Table(rowList,colLabels=colLabels,rowLabels=histNames,types=Types)

trunk/GSASIIplot.py

@@ -2347 +2347 @@
     def Draw():
         Page.SetFocus()
-        G2frame.G2plotNB.status.SetFields(['press s to select X axis'])
+        G2frame.G2plotNB.status.SetStatusText('press s to select X axis',1)
         Plot.clear()
         if G2frame.seqXaxis is not None:    
@@ -2409 +2409 @@
       triggers the addition of a d-zero.    
     '''
-    G2frame.dataFrame.GetStatusBar().SetStatusText('Add strain ring active - LB pick d-zero value')
+    G2frame.dataFrame.GetStatusBar().SetStatusText('Add strain ring active - LB pick d-zero value',1)
     StrSta = G2frame.PatternTree.GetItemPyData(
         G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Stress/Strain'))
@@ -2561 +2561 @@
                         Data['ring'].append([xpos,ypos])
                 elif event.button == 3:
-                    G2frame.dataFrame.GetStatusBar().SetStatusText('Calibrating...')
+                    G2frame.dataFrame.GetStatusBar().SetStatusText('Calibrating...',1)
                     if G2img.ImageCalibrate(G2frame,Data):
-                        G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration successful - Show ring picks to check')
+                        G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration successful - Show ring picks to check',1)
                         print 'Calibration successful'
                     else:
-                        G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration failed - Show ring picks to diagnose')
+                        G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration failed - Show ring picks to diagnose',1)
                         print 'Calibration failed'
                     G2frame.ifGetRing = False
@@ -3386 +3386 @@
             return G2frame.dataDisplay.GetSelection()
         except AttributeError:
-            G2frame.G2plotNB.status.SetStatusText('Select this from Phase data window!')
+            G2frame.G2plotNB.status.SetStatusText('Select this from Phase data window!',1)
             return 0