Changeset 2083

Timestamp:

Dec 5, 2015 1:49:31 PM (7 years ago)

Author:

toby

Message:

Export multiple masks/controls

Location:

trunk

Files:

• GSASII.py (modified) (3 diffs)
• GSASIIIO.py (modified) (2 diffs)
• GSASIIimgGUI.py (modified) (2 diffs)
• autoint.py (deleted)

trunk/GSASII.py

@@ -73 +73 @@
 import GSASIIpwdGUI as G2pdG
 import GSASIIphsGUI as G2phsG
+import GSASIIimgGUI as G2imG
 import GSASIIspc as G2spc
 import GSASIIstrMain as G2stMn
@@ -2027 +2028 @@
                 self.Bind(wx.EVT_MENU, obj.Exporter, id=item.GetId())
                 self.ExportLookup[item.GetId()] = typ # lookup table for submenu item
-                
-        #code to debug an Exporter. hard-coded the routine below, to allow a reload before use
+        item = imagemenu.Append(wx.ID_ANY,
+                        help='Export image controls and masks for multiple images',
+                        kind=wx.ITEM_NORMAL,
+                        text='Multiple image controls and masks')
+        self.Bind(wx.EVT_MENU, self.OnSaveMultipleImg, id=item.GetId())
+        #code to debug an Exporter. hard-code the routine below, to allow a reload before use
         # def DebugExport(event):
         #      print 'start reload'
@@ -3678 +3683 @@
             dlg.Destroy()
         return result
-
+    
+    def OnSaveMultipleImg(self,event):
+        '''Select and save multiple image parameter and mask files
+        '''
+        G2IO.SaveMultipleImg(self)
+        
 class GSASIImain(wx.App):
     '''Defines a wxApp for GSAS-II

trunk/GSASIIIO.py

@@ -36 +36 @@
 import GSASIIlattice as G2lat
 import GSASIIpwdGUI as G2pdG
+import GSASIIimgGUI as G2imG
 import GSASIIimage as G2img
 import GSASIIElem as G2el
@@ -506 +507 @@
         return []
         #raise Exception('No image read')    
+
+def SaveMultipleImg(G2frame):
+    if not G2frame.PatternTree.GetCount():
+        print 'no images!'
+        return
+    choices = G2gd.GetPatternTreeDataNames(G2frame,['IMG ',])
+    if len(choices) == 1:
+        names = choices
+    else:
+        dlg = G2G.G2MultiChoiceDialog(G2frame,'Stress/Strain fitting','Select images to fit:',choices)
+        dlg.SetSelections([])
+        names = []
+        if dlg.ShowModal() == wx.ID_OK:
+            names = [choices[sel] for sel in dlg.GetSelections()]
+        dlg.Destroy()
+    if not names: return
+    for name in names:
+        Id = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, name)
+        Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(Id)
+        imroot = os.path.splitext(imagefile)[0]
+        if imagetag:
+            imroot += '_' + str(imagetag)
+        Data = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Image Controls'))
+        print('Writing '+imroot+'.imctrl')
+        File = open(imroot+'.imctrl','w')
+        keys = ['type','wavelength','calibrant','distance','center',
+                    'tilt','rotation','azmthOff','fullIntegrate','LRazimuth',
+                    'IOtth','outChannels','outAzimuths','invert_x','invert_y','DetDepth',
+                    'calibskip','pixLimit','cutoff','calibdmin','chisq','Flat Bkg',
+                    'binType','SampleShape','PolaVal','SampleAbs','dark image','background image']
+        for key in keys:
+            if key not in Data: continue    #uncalibrated!
+            File.write(key+':'+str(Data[key])+'\n')
+        File.close()
+        mask = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Masks'))
+        G2imG.CleanupMasks(mask)
+        print('Writing '+imroot+'.immask')
+        File = open(imroot+'.immask','w')
+        for key in ['Points','Rings','Arcs','Polygons','Frames','Thresholds']:
+            File.write(key+':'+str(mask[key])+'\n')
+        File.close()
         
 def PutG2Image(filename,Comments,Data,Npix,image):

trunk/GSASIIimgGUI.py

@@ -304 +304 @@
                 filename = os.path.splitext(filename)[0]+'.imctrl'
                 File = open(filename,'w')
-                save = {}
                 keys = ['type','wavelength','calibrant','distance','center',
                     'tilt','rotation','azmthOff','fullIntegrate','LRazimuth',
@@ -1190 +1189 @@
                 filename = os.path.splitext(filename)[0]+'.immask'
                 File = open(filename,'w')
-                save = {}
                 keys = ['Points','Rings','Arcs','Polygons','Frames','Thresholds']
                 for key in keys: