Changeset 1518

Timestamp:

Oct 6, 2014 10:16:26 AM (8 years ago)

Author:

vondreele

Message:

Add metadata file processing for Image stress/strain data - reads sample load & sample phi from text file.
Correction to PWDR metadata file processing

Location:

trunk

Files:

• GSASIIgrid.py (modified) (3 diffs)
• GSASIIimgGUI.py (modified) (3 diffs)
• GSASIIpwdGUI.py (modified) (1 diff)

trunk/GSASIIgrid.py

@@ -105 +105 @@
 ] = [wx.NewId() for item in range(8)]
 
-[ wxID_STRSTACOPY, wxID_STRSTAFIT, wxID_STRSTASAVE, wxID_STRSTALOAD,wxID_APPENDDZERO,
-    wxID_STRSTAALLFIT,wxID_UPDATEDZERO,
-] = [wx.NewId() for item in range(7)]
+[ wxID_STRSTACOPY, wxID_STRSTAFIT, wxID_STRSTASAVE, wxID_STRSTALOAD,wxID_STRSTSAMPLE,
+    wxID_APPENDDZERO,wxID_STRSTAALLFIT,wxID_UPDATEDZERO,
+] = [wx.NewId() for item in range(8)]
 
 [ wxID_BACKCOPY,wxID_LIMITCOPY, wxID_SAMPLECOPY, wxID_SAMPLECOPYSOME, wxID_BACKFLAGCOPY, wxID_SAMPLEFLAGCOPY,
@@ -3272 +3272 @@
         self.SampleEdit.Append(id=wxID_SAMPLE1VAL, kind=wx.ITEM_NORMAL,text='Set one value',
             help='Set one sample parameter value across multiple histograms')
-        self.SampleEdit.Append(id=wxID_ALLSAMPLELOAD, kind=wx.ITEM_NORMAL,text='Load all samples',
+        self.SampleEdit.Append(id=wxID_ALLSAMPLELOAD, kind=wx.ITEM_NORMAL,text='Load all',
             help='Load sample parmameters over multiple histograms')
 
@@ -3455 +3455 @@
         self.StrStaEdit.Append(help='Load stress/strain data from file', 
             id=wxID_STRSTALOAD, kind=wx.ITEM_NORMAL,text='Load stress/strain')
+        self.StrStaEdit.Append(help='Load sample data from file', 
+            id=wxID_STRSTSAMPLE, kind=wx.ITEM_NORMAL,text='Load sample data')
         self.PostfillDataMenu()
             

trunk/GSASIIimgGUI.py

@@ -42 +42 @@
 ##### Image Data
 ################################################################################
+
 def UpdateImageData(G2frame,data):
     
@@ -1500 +1501 @@
         finally:
             dlg.Destroy()
-
+            
+    def OnStrStaSample(event):
+        filename = ''
+        dlg = wx.FileDialog(G2frame, 'Choose multihistogram metadata text file', '.', '', 
+            'metadata file (*.*)|*.*',wx.OPEN|wx.CHANGE_DIR)
+        try:
+            if dlg.ShowModal() == wx.ID_OK:
+                filename = dlg.GetPath()
+                File = open(filename,'r')
+                S = File.readline()
+                newItems = []
+                itemNames = []
+                Comments = []
+                while S:
+                    if S[0] == '#':
+                        Comments.append(S)
+                        S = File.readline()
+                        continue
+                    S = S.replace(',',' ').replace('\t',' ')
+                    Stuff = S[:-1].split()
+                    itemNames.append(Stuff[0])
+                    newItems.append(Stuff[1:])
+                    S = File.readline()                
+                File.close()
+        finally:
+            dlg.Destroy()
+        if not filename:
+            G2frame.ErrorDialog('Nothing to do','No file selected')
+            return
+        dataDict = dict(zip(itemNames,newItems))
+        ifany = False
+        Names = [' ','Sample phi','Sample z','Sample load']
+        dlg = G2gd.G2ColumnIDDialog( G2frame,' Choose multihistogram metadata columns:',
+            'Select columns',Comments,Names,np.array(newItems).T)
+        try:
+            if dlg.ShowModal() == wx.ID_OK:
+                colNames,newData = dlg.GetSelection()
+                dataDict = dict(zip(itemNames,newData.T))
+                for item in colNames:
+                    if item != ' ':
+                        ifany = True
+        finally:
+            dlg.Destroy()
+        if not ifany:
+            G2frame.ErrorDialog('Nothing to do','No columns identified')
+            return
+        histList = []
+        item, cookie = G2frame.PatternTree.GetFirstChild(G2frame.root)        
+        while item:
+            name = G2frame.PatternTree.GetItemText(item)
+            if name.startswith('IMG'):
+                histList.append(name)
+            item, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)
+        colIds = {}
+        for i,name in enumerate(colNames):
+            if name != ' ':
+                colIds[name] = i
+        for hist in histList:
+            name = hist.split()[1]  #this is file name
+            if name in dataDict:
+                newItems = {}
+                for item in colIds:
+                    newItems[item] = float(dataDict[name][colIds[item]])
+                Id = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,hist)
+                stsrData = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id,'Stress/Strain'))
+                stsrData.update(newItems)        
+        UpdateStressStrain(G2frame,data)        
+    
     def OnFitStrSta(event):
         Controls = G2frame.PatternTree.GetItemPyData(
@@ -1745 +1813 @@
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnCopyStrSta, id=G2gd.wxID_STRSTACOPY)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnLoadStrSta, id=G2gd.wxID_STRSTALOAD)
-    G2frame.dataFrame.Bind(wx.EVT_MENU, OnSaveStrSta, id=G2gd.wxID_STRSTASAVE)    
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnSaveStrSta, id=G2gd.wxID_STRSTASAVE)
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnStrStaSample, id=G2gd.wxID_STRSTSAMPLE)        
     if not G2frame.dataFrame.GetStatusBar():
         Status = G2frame.dataFrame.CreateStatusBar()

trunk/GSASIIpwdGUI.py

@@ -1606 +1606 @@
                         S = File.readline()
                         continue
-                    S.replace(',',' ')
-                    S.replace('\t',' ')
-                    Stuff = S[:-1].split(' ')
+                    S = S.replace(',',' ').replace('\t',' ')
+                    Stuff = S[:-1].split()
                     itemNames.append(Stuff[0])
                     newItems.append(Stuff[1:])