Changeset 3018 for trunk

Timestamp:

Aug 18, 2017 3:13:34 PM (8 years ago)

Author:

toby

Message:

put user-defined seq ref var labels into table

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (3 diffs)
• imports/G2img_1TIF.py (modified) (1 diff)

trunk/GSASIIdataGUI.py ¶

@@ -6669 +6669 @@
         var = colLabels[col]
         lbl = variableLabels.get(var,G2obj.fmtVarDescr(var))
+        head = u'Set a new name for variable {} (column {})'.format(var,col)
         dlg = G2G.SingleStringDialog(G2frame,'Set variable label',
-                                 'Set a new name for variable '+var,lbl,size=(400,-1))
+                                 head,lbl,size=(400,-1))
         if dlg.Show():
             variableLabels[var] = dlg.GetValue()
-        dlg.Destroy()
+            dlg.Destroy()
+            wx.CallAfter(UpdateSeqResults,G2frame,data) # redisplay variables
+        else:
+            dlg.Destroy()
 
     def DoSequentialExport(event):
@@ -7124 +7128 @@
             del G2frame.colSigs[l]
 
+    # make a copy of the column labels substituting alternate labels when defined
+    displayLabels = colLabels[:]
+    for i,l in enumerate(colLabels):
+        if l in variableLabels:
+            displayLabels[i] = variableLabels[l]
+            
     G2frame.dataWindow.ClearData()
     G2frame.dataWindow.currentGrids = []
@@ -7130 +7140 @@
     G2frame.dataWindow.GetSizer().Add(G2frame.dataDisplay,1,wx.ALL|wx.EXPAND)
     G2frame.SeqTable = G2G.Table([list(cl) for cl in zip(*G2frame.colList)],     # convert from columns to rows
-        colLabels=colLabels,rowLabels=histNames,types=Types)
+        colLabels=displayLabels,rowLabels=histNames,types=Types)
     G2frame.dataDisplay.SetTable(G2frame.SeqTable, True)
     G2frame.dataDisplay.EnableEditing(False)

trunk/imports/G2img_1TIF.py ¶

@@ -212 +212 @@
 #                image = np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
             elif IFD[258][2][0] == 32:
+                # includes CHESS & Pilatus files from Area Detector
                 tifType = 'CHESS'
                 pixy = [200.,200.]
                 File.seek(8)
-                print 'Read CHESS-detector tiff file: ',filename
+                print 'Read as 32-bit unsigned (CHESS) tiff file: ',filename
                 image = np.array(ar.array('I',File.read(4*Npix)),dtype=np.uint32)
     elif 270 in IFD: