Changeset 238

Timestamp:

Jan 11, 2011 12:17:17 PM (13 years ago)

Author:

vondreele

Message:

add new image data types SXAS & REFL
make image controls save file a user editable text file

File:

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

trunk/GSASIIimgGUI.py

@@ -29 +29 @@
 def UpdateImageControls(self,data,masks):
     import ImageCalibrants as calFile
+    
+    def OnDataType(event):
+        data['type'] = typeSel.GetValue()[:4]
     
     def OnNewColorBar(event):
@@ -283 +286 @@
             if dlg.ShowModal() == wx.ID_OK:
                 filename = dlg.GetPath()
-                File = open(filename,'wb')
+                File = open(filename,'w')
                 save = {}
-                keys = ['wavelength','calibrant','distance','center','tilt','rotation']
+                keys = ['type','wavelength','calibrant','distance','center','tilt','rotation']
                 for key in keys:
-                    save[key] = data[key]
-                cPickle.dump(save,File,1)
+                    File.write(key+':'+str(data[key])+'\n')
                 File.close()
         finally:
@@ -301 +303 @@
             if dlg.ShowModal() == wx.ID_OK:
                 filename = dlg.GetPath()
-                File = open(filename,'rb')
-                save = cPickle.load(File)
+                File = open(filename,'r')
+                save = {}
+                S = File.readline()
+                while S:
+                    if S[0] == '#':
+                        S = File.readline()
+                        continue
+                    [key,val] = S[:-1].split(':')
+                    if key in ['type','calibrant']:
+                        save[key] = val
+                    elif key in ['wavelength','distance','tilt','rotation']:
+                        save[key] = float(val)
+                    elif key in ['center',]:
+                        vals = val.strip('[] ').split()
+                        save[key] = [float(vals[0]),float(vals[1])]                    
+                    S = File.readline()
                 data.update(save)
                 calSel.SetValue(data['calibrant']) 
@@ -317 +333 @@
     colorList = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]
     calList = [m for m in calFile.Calibrants.keys()]
+    typeList = ['PWDR - powder diffraction data','SXAS - small angle scattering data',
+        'REFL - reflectometry data']
+    if not data.get('type'):                        #patch for old project files
+        data['type'] = 'PWDR'
+    typeDict = {'PWDR':typeList[0],'SXAS':typeList[1],'REFL':typeList[2]}
     if self.dataDisplay:
         self.dataDisplay.Destroy()
@@ -337 +358 @@
     mainSizer.Add((5,10),0)
     
+    typeSizer = wx.BoxSizer(wx.HORIZONTAL)
+    typeSizer.Add(wx.StaticText(parent=self.dataDisplay,label='Type of image data: '),0,
+        wx.ALIGN_CENTER_VERTICAL)
+    typeSel = wx.ComboBox(parent=self.dataDisplay,value=typeDict[data['type']],choices=typeList,
+        style=wx.CB_READONLY|wx.CB_DROPDOWN)
+    typeSel.SetValue(data['type'])
+    typeSel.Bind(wx.EVT_COMBOBOX, OnDataType)
+    typeSizer.Add(typeSel,0,wx.ALIGN_CENTER_VERTICAL)
+    mainSizer.Add(typeSizer,0,wx.ALIGN_CENTER_HORIZONTAL)
+            
     maxSizer = wx.FlexGridSizer(2,2,0,5)
     maxSizer.AddGrowableCol(1,1)