Changeset 3195 for trunk/GSASIIdataGUI.py

Timestamp:

Dec 18, 2017 3:18:15 PM (5 years ago)

Author:

toby

Message:

generalize 1ID metadata import to column-oriented; add routine to test .lbls file; recognize Dexala in either orientation

File:

• trunk/GSASIIdataGUI.py (modified) (3 diffs)

trunk/GSASIIdataGUI.py

@@ -783 +783 @@
                             if rd.sumfile:
                                 rd.readfilename = rd.sumfile
-                            if GSASIIpath.GetConfigValue('Image_1IDmetadata'):
-                                G2IO.Get1IDMetadata(rd)
+                            # Load generic metadata, as configured
+                            G2IO.GetColumnMetadata(rd)
                             G2IO.LoadImage2Tree(rd.readfilename,self,rd.Comments,rd.Data,rd.Npix,rd.Image)
                             rd_list.append(True) # save a stub the result before it is written over
@@ -2530 +2530 @@
         self._Add_ImportMenu_reflectometry(Import)
         self._Add_ImportMenu_PDF(Import)
+        
+        item = Import.Append(wx.ID_ANY,'Column metadata test','Test Column (.par) metadata import')
+        self.Bind(wx.EVT_MENU, self.OnColMetaTest, id=item.GetId())
 
         #======================================================================
@@ -2932 +2935 @@
         'implement unfortunate synonym. with luck no longer used'
         self.SetTitle(text,location=0)
-        
+
+    def OnColMetaTest(self,event):
+        'Test the .par/.*lbls pair for contents'
+        G2IO.testColumnMetadata(self)
                 
     def OnReadPowderPeaks(self,event):