Changeset 1306
- Timestamp:
- Apr 28, 2014 3:10:41 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIgrid.py
r1303 r1306 4064 4064 for parm in atomList: 4065 4065 colList += [[data[name]['newAtomDict'][atomList[parm]][1] for name in histNames]] 4066 colSigs += [None] #why not the values? 4066 4067 # add Pseudovars 4067 for exp in Controls['SeqPseudoVars']:4068 obj = Controls['SeqPseudoVars'][exp ]4068 for expr in Controls['SeqPseudoVars']: 4069 obj = Controls['SeqPseudoVars'][expr] 4069 4070 calcobj = G2obj.ExpressionCalcObj(obj) 4070 4071 valList = [] … … 4073 4074 calcobj.SetupCalc(parmDict) 4074 4075 valList.append(calcobj.EvalExpression()) 4076 colSigs += [None] 4075 4077 colList += [valList] 4076 colSigs += [None] 4077 colLabels += [exp] 4078 colLabels += [expr] 4078 4079 Types += [wg.GRID_VALUE_FLOAT,] 4079 4080 4080 rowList = [c for c in zip(*colList)] # convert from columns to rows 4081 4081 G2frame.SeqTable = Table(rowList,colLabels=colLabels,rowLabels=histNames,types=Types) -
trunk/GSASIIplot.py
r1300 r1306 2347 2347 def Draw(): 2348 2348 Page.SetFocus() 2349 G2frame.G2plotNB.status.Set Fields(['press s to select X axis'])2349 G2frame.G2plotNB.status.SetStatusText('press s to select X axis',1) 2350 2350 Plot.clear() 2351 2351 if G2frame.seqXaxis is not None: … … 2409 2409 triggers the addition of a d-zero. 2410 2410 ''' 2411 G2frame.dataFrame.GetStatusBar().SetStatusText('Add strain ring active - LB pick d-zero value' )2411 G2frame.dataFrame.GetStatusBar().SetStatusText('Add strain ring active - LB pick d-zero value',1) 2412 2412 StrSta = G2frame.PatternTree.GetItemPyData( 2413 2413 G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Stress/Strain')) … … 2561 2561 Data['ring'].append([xpos,ypos]) 2562 2562 elif event.button == 3: 2563 G2frame.dataFrame.GetStatusBar().SetStatusText('Calibrating...' )2563 G2frame.dataFrame.GetStatusBar().SetStatusText('Calibrating...',1) 2564 2564 if G2img.ImageCalibrate(G2frame,Data): 2565 G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration successful - Show ring picks to check' )2565 G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration successful - Show ring picks to check',1) 2566 2566 print 'Calibration successful' 2567 2567 else: 2568 G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration failed - Show ring picks to diagnose' )2568 G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration failed - Show ring picks to diagnose',1) 2569 2569 print 'Calibration failed' 2570 2570 G2frame.ifGetRing = False … … 3386 3386 return G2frame.dataDisplay.GetSelection() 3387 3387 except AttributeError: 3388 G2frame.G2plotNB.status.SetStatusText('Select this from Phase data window!' )3388 G2frame.G2plotNB.status.SetStatusText('Select this from Phase data window!',1) 3389 3389 return 0 3390 3390
Note: See TracChangeset
for help on using the changeset viewer.