Changeset 3251


Ignore:
Timestamp:
Jan 30, 2018 10:00:52 AM (4 years ago)
Author:
toby
Message:

shorten seq. ref. header; misc cleanups

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIdataGUI.py

    r3248 r3251  
    58185818            head = ['name']
    58195819            for col in cols:
    5820                 item = G2frame.SeqTable.GetColLabelValue(col)
     5820                item = G2obj.StripUnicode(G2frame.SeqTable.GetColLabelValue(col))
    58215821                # get rid of labels that have Unicode characters
    5822                 if not all([ord(c) < 128 and ord(c) != 0 for c in item]): item = '?'
     5822                #if not all([ord(c) < 128 and ord(c) != 0 for c in item]): item = '?'
    58235823                if col in havesig:
    58245824                    head += [item,'esd-'+item]
     
    68746874    G2frame.dataDisplay.SetScrollRate(10,10)
    68756875    G2frame.dataWindow.GetSizer().Add(G2frame.dataDisplay,1,wx.ALL|wx.EXPAND)
     6876    if histNames[0].startswith('PWDR'):
     6877        #rowLabels = [str(i)+': '+l[5:30] for i,l in enumerate(histNames)]
     6878        rowLabels = [l[5:] for i,l in enumerate(histNames)]
     6879    else:
     6880        rowLabels = histNames
    68766881    G2frame.SeqTable = G2G.Table([list(cl) for cl in zip(*G2frame.colList)],     # convert from columns to rows
    6877         colLabels=displayLabels,rowLabels=histNames,types=Types)
     6882        colLabels=displayLabels,rowLabels=rowLabels,types=Types)
    68786883    G2frame.dataDisplay.SetTable(G2frame.SeqTable, True)
    68796884    # make all Use editable all others ReadOnly
  • trunk/GSASIIpath.py

    r3246 r3251  
    629629    This routine is only used when debug=True is set in config.py   
    630630    '''
    631     from IPython.core import ultratb
    632     # IPyBreak_base() # need fix below for Python3
    633     if 'win' in sys.platform:
    634         ultratb.FormattedTB(call_pdb=False,color_scheme='NoColor')(*args)
    635     else:
    636         ultratb.FormattedTB(call_pdb=False,color_scheme='LightBG')(*args)
     631    import IPython.core
     632    if sys.platform.startswith('win'):
     633        IPython.core.ultratb.FormattedTB(call_pdb=False,color_scheme='NoColor')(*args)
     634    else:
     635        IPython.core.ultratb.FormattedTB(call_pdb=False,color_scheme='LightBG')(*args)
     636
    637637    try:
    638638        from IPython.terminal.embed import InteractiveShellEmbed
Note: See TracChangeset for help on using the changeset viewer.