Changeset 3251

Timestamp:

Jan 30, 2018 10:00:52 AM (6 years ago)

Author:

toby

Message:

shorten seq. ref. header; misc cleanups

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (2 diffs)
• GSASIIpath.py (modified) (1 diff)

trunk/GSASIIdataGUI.py

@@ -5818 +5818 @@
             head = ['name']
             for col in cols:
-                item = G2frame.SeqTable.GetColLabelValue(col)
+                item = G2obj.StripUnicode(G2frame.SeqTable.GetColLabelValue(col))
                 # get rid of labels that have Unicode characters
-                if not all([ord(c) < 128 and ord(c) != 0 for c in item]): item = '?'
+                #if not all([ord(c) < 128 and ord(c) != 0 for c in item]): item = '?'
                 if col in havesig:
                     head += [item,'esd-'+item]
@@ -6874 +6874 @@
     G2frame.dataDisplay.SetScrollRate(10,10)
     G2frame.dataWindow.GetSizer().Add(G2frame.dataDisplay,1,wx.ALL|wx.EXPAND)
+    if histNames[0].startswith('PWDR'):
+        #rowLabels = [str(i)+': '+l[5:30] for i,l in enumerate(histNames)]
+        rowLabels = [l[5:] for i,l in enumerate(histNames)]
+    else:
+        rowLabels = histNames
     G2frame.SeqTable = G2G.Table([list(cl) for cl in zip(*G2frame.colList)],     # convert from columns to rows
-        colLabels=displayLabels,rowLabels=histNames,types=Types)
+        colLabels=displayLabels,rowLabels=rowLabels,types=Types)
     G2frame.dataDisplay.SetTable(G2frame.SeqTable, True)
     # make all Use editable all others ReadOnly

trunk/GSASIIpath.py

@@ -629 +629 @@
     This routine is only used when debug=True is set in config.py    
     '''
-    from IPython.core import ultratb
-    # IPyBreak_base() # need fix below for Python3
-    if 'win' in sys.platform:
-        ultratb.FormattedTB(call_pdb=False,color_scheme='NoColor')(*args)
-    else:
-        ultratb.FormattedTB(call_pdb=False,color_scheme='LightBG')(*args)
+    import IPython.core
+    if sys.platform.startswith('win'):
+        IPython.core.ultratb.FormattedTB(call_pdb=False,color_scheme='NoColor')(*args)
+    else:
+        IPython.core.ultratb.FormattedTB(call_pdb=False,color_scheme='LightBG')(*args)
+
     try: 
         from IPython.terminal.embed import InteractiveShellEmbed