Changeset 1306


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r1303 r1306  
    40644064    for parm in atomList:
    40654065        colList += [[data[name]['newAtomDict'][atomList[parm]][1] for name in histNames]]
     4066        colSigs += [None]   #why not the values?
    40664067    # add Pseudovars
    4067     for exp in Controls['SeqPseudoVars']:
    4068         obj = Controls['SeqPseudoVars'][exp]
     4068    for expr in Controls['SeqPseudoVars']:
     4069        obj = Controls['SeqPseudoVars'][expr]
    40694070        calcobj = G2obj.ExpressionCalcObj(obj)
    40704071        valList = []
     
    40734074            calcobj.SetupCalc(parmDict)
    40744075            valList.append(calcobj.EvalExpression())
     4076        colSigs += [None]
    40754077        colList += [valList]
    4076         colSigs += [None]
    4077         colLabels += [exp]
     4078        colLabels += [expr]
    40784079        Types += [wg.GRID_VALUE_FLOAT,]
    4079 
    40804080    rowList = [c for c in zip(*colList)]     # convert from columns to rows
    40814081    G2frame.SeqTable = Table(rowList,colLabels=colLabels,rowLabels=histNames,types=Types)
  • trunk/GSASIIplot.py

    r1300 r1306  
    23472347    def Draw():
    23482348        Page.SetFocus()
    2349         G2frame.G2plotNB.status.SetFields(['press s to select X axis'])
     2349        G2frame.G2plotNB.status.SetStatusText('press s to select X axis',1)
    23502350        Plot.clear()
    23512351        if G2frame.seqXaxis is not None:   
     
    24092409      triggers the addition of a d-zero.   
    24102410    '''
    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)
    24122412    StrSta = G2frame.PatternTree.GetItemPyData(
    24132413        G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Stress/Strain'))
     
    25612561                        Data['ring'].append([xpos,ypos])
    25622562                elif event.button == 3:
    2563                     G2frame.dataFrame.GetStatusBar().SetStatusText('Calibrating...')
     2563                    G2frame.dataFrame.GetStatusBar().SetStatusText('Calibrating...',1)
    25642564                    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)
    25662566                        print 'Calibration successful'
    25672567                    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)
    25692569                        print 'Calibration failed'
    25702570                    G2frame.ifGetRing = False
     
    33863386            return G2frame.dataDisplay.GetSelection()
    33873387        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)
    33893389            return 0
    33903390           
Note: See TracChangeset for help on using the changeset viewer.