Changeset 3333 for trunk/GSASIIimgGUI.py

Timestamp:

Apr 2, 2018 11:17:03 AM (5 years ago)

Author:

vondreele

Message:

add new Parm menu item Load Multi Contols for load image controls for a suite of images based on 2-theta setting for detector position.

File:

• trunk/GSASIIimgGUI.py (modified) (5 diffs)

trunk/GSASIIimgGUI.py

@@ -411 +411 @@
             'calibskip','pixLimit','cutoff','calibdmin','Flat Bkg','varyList',
             'binType','SampleShape','PolaVal','SampleAbs','dark image','background image',
-            ]
+            'twoth']
         for key in keys:
             if key not in data:     #uncalibrated!
@@ -465 +465 @@
             WriteControls(filename,data)
             
-    def OnLoadControls(event):
+    def LoadControls(Slines,data):
         cntlList = ['wavelength','distance','tilt','invert_x','invert_y','type','Oblique',
             'fullIntegrate','outChannels','outAzimuths','LRazimuth','IOtth','azmthOff','DetDepth',
             'calibskip','pixLimit','cutoff','calibdmin','Flat Bkg','varyList','setdist',
-            'PolaVal','SampleAbs','dark image','background image']
+            'PolaVal','SampleAbs','dark image','background image','twoth']
+        save = {}
+        for S in Slines:
+            if S[0] == '#':
+                continue
+            [key,val] = S.strip().split(':',1)
+            if key in ['type','calibrant','binType','SampleShape',]:    #strings
+                save[key] = val
+            elif key in ['varyList',]:
+                save[key] = eval(val)   #dictionary
+            elif key in ['rotation']:
+                save[key] = float(val)
+            elif key in ['center',]:
+                if ',' in val:
+                    save[key] = eval(val)
+                else:
+                    vals = val.strip('[] ').split()
+                    save[key] = [float(vals[0]),float(vals[1])] 
+            elif key in cntlList:
+                save[key] = eval(val)
+        data.update(save)
+        # next line removed. Previous updates tree contents. The next
+        # makes a copy of data, puts it into tree and "disconnects" data
+        # from tree contents (later changes to data are lost!)
+        #G2frame.GPXtree.SetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.Image, 'Image Controls'),copy.deepcopy(data))
+        
+            
+    def OnLoadControls(event):
         pth = G2G.GetImportPath(G2frame)
         if not pth: pth = '.'
@@ -478 +505 @@
                 filename = dlg.GetPath()
                 File = open(filename,'r')
-                save = {}
-                S = File.readline()
-                while S:
-                    if S[0] == '#':
-                        S = File.readline()
-                        continue
-                    [key,val] = S.strip().split(':',1)
-                    if key in ['type','calibrant','binType','SampleShape',]:    #strings
-                        save[key] = val
-                    elif key in ['varyList',]:
-                        save[key] = eval(val)   #dictionary
-                    elif key in ['rotation']:
-                        save[key] = float(val)
-                    elif key in ['center',]:
-                        if ',' in val:
-                            save[key] = eval(val)
-                        else:
-                            vals = val.strip('[] ').split()
-                            save[key] = [float(vals[0]),float(vals[1])] 
-                    elif key in cntlList:
-                        save[key] = eval(val)
-                    S = File.readline()
-                data.update(save)
-                # next line removed. Previous updates tree contents. The next
-                # makes a copy of data, puts it into tree and "disconnects" data
-                # from tree contents (later changes to data are lost!)
-                #G2frame.GPXtree.SetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.Image, 'Image Controls'),copy.deepcopy(data))
+                Slines = File.readlines()
                 File.close()
+                LoadControls(Slines,data)
         finally:
             dlg.Destroy()
@@ -512 +514 @@
         G2plt.PlotExposedImage(G2frame,event=event)
         wx.CallLater(100,UpdateImageControls,G2frame,data,masks)
+        
+    def OnLoadMultiControls(event):         #TODO: how read in multiple image controls & match them by 'twoth' tag?
+        pth = G2G.GetImportPath(G2frame)
+        if not pth: pth = '.'
+        controlsDict = {}
+        dlg = wx.FileDialog(G2frame, 'Choose image control files', pth, '', 
+            'image control files (*.imctrl)|*.imctrl',wx.FD_OPEN|wx.FD_MULTIPLE)
+        try:
+            if dlg.ShowModal() == wx.ID_OK:
+                filelist = dlg.GetPaths()
+                if len(filelist) == 0: return
+                for filename in filelist:
+                    File = open(filename,'r')
+                    Slines = File.readlines()
+                    for S in Slines:
+                        if S.find('twoth') == 0:
+                            indx = S.split(':')[1][:-1]     #remove '\n'!
+                    controlsDict[indx] = Slines
+                    File.close()
+        finally:
+            dlg.Destroy()
+        if not len(controlsDict):
+            return
+        Names = G2gd.GetGPXtreeDataNames(G2frame,['IMG ',])
+        dlg = G2G.G2MultiChoiceDialog(G2frame,'Select images','Select images for updating controls:',
+            Names)
+        try:
+            if dlg.ShowModal() == wx.ID_OK:
+                images = dlg.GetSelections()
+                if not len(images):
+                    return
+                for image in images:
+                    Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,Names[image])
+                    imctrls = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,Id,'Image Controls'))
+                    Slines = controlsDict[imctrls['twoth']]
+                    LoadControls(Slines,imctrls)
+        finally:
+            dlg.Destroy()
         
     def OnTransferAngles(event):
@@ -1237 +1277 @@
     G2frame.Bind(wx.EVT_MENU, OnSaveMultiControls, id=G2G.wxID_SAVESELECTEDCONTROLS)
     G2frame.Bind(wx.EVT_MENU, OnLoadControls, id=G2G.wxID_IMLOADCONTROLS)
+    G2frame.Bind(wx.EVT_MENU, OnLoadMultiControls, id=G2G.wxID_LOADELECTEDCONTROLS)
     G2frame.Bind(wx.EVT_MENU, OnTransferAngles, id=G2G.wxID_IMXFERCONTROLS)
     G2frame.Bind(wx.EVT_MENU, OnResetDist, id=G2G.wxID_IMRESETDIST)