Changeset 2312 for trunk/GSASIIimgGUI.py

Timestamp:

Jun 8, 2016 10:09:41 AM (7 years ago)

Author:

vondreele

Message:

fix issues with save, load copy & selected copy of image controls

File:

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

trunk/GSASIIimgGUI.py

@@ -329 +329 @@
                     'tilt','rotation','azmthOff','fullIntegrate','LRazimuth',
                     'IOtth','outChannels','outAzimuths','invert_x','invert_y','DetDepth',
-                    'calibskip','pixLimit','cutoff','calibdmin','chisq','Flat Bkg',
+                    'calibskip','pixLimit','cutoff','calibdmin','Flat Bkg','varyList',
                     'binType','SampleShape','PolaVal','SampleAbs','dark image','background image']
         keyText = [i+'='+str(data[i]) for i in keyList]
@@ -361 +361 @@
         finally:
             dlg.Destroy()            
-                         
-            
-            
                 
     def OnSaveControls(event):
@@ -378 +375 @@
                     'tilt','rotation','azmthOff','fullIntegrate','LRazimuth',
                     'IOtth','outChannels','outAzimuths','invert_x','invert_y','DetDepth',
-                    'calibskip','pixLimit','cutoff','calibdmin','chisq','Flat Bkg',
+                    'calibskip','pixLimit','cutoff','calibdmin','Flat Bkg','varyList',
                     'binType','SampleShape','PolaVal','SampleAbs','dark image','background image']
                 for key in keys:
@@ -391 +388 @@
         cntlList = ['wavelength','distance','tilt','invert_x','invert_y','type',
             'fullIntegrate','outChannels','outAzimuths','LRazimuth','IOtth','azmthOff','DetDepth',
-            'calibskip','pixLimit','cutoff','calibdmin','chisq','Flat Bkg',
+            'calibskip','pixLimit','cutoff','calibdmin','Flat Bkg','varyList',
             'PolaVal','SampleAbs','dark image','background image']
         pth = G2G.GetImportPath(G2frame)
@@ -407 +404 @@
                         S = File.readline()
                         continue
-                    [key,val] = S[:-1].split(':')
+                    [key,val] = S[:-1].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)