Changeset 1375 for trunk/GSASIIimgGUI.py

Timestamp:

Jun 6, 2014 1:52:50 PM (9 years ago)

Author:

vondreele

Message:

stress/strain copy, save, load fixes

File:

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

trunk/GSASIIimgGUI.py

@@ -290 +290 @@
                     S = File.readline()
                 data.update(save)
+                G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'),copy.deepcopy(Data))
                 UpdateImageControls(G2frame,data,masks)
                 G2plt.PlotExposedImage(G2frame,event=event)
@@ -1129 +1130 @@
                 data.update(save)
                 UpdateMasks(G2frame,data)
-                G2plt.PlotExposedImage(G2frame,event=event)
-                
+                G2plt.PlotExposedImage(G2frame,event=event)                
                 File.close()
         finally:
@@ -1405 +1405 @@
                         ifcopy,name,id = item
                         if ifcopy:
-                            G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,id, 'Stress/Strain'),copy.deepcopy(Data))
+                            G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,id, 'Stress/Strain'),copy.deepcopy(data))
             finally:
                 dlg.Destroy()
 
     def OnLoadStrSta(event):
-        print 'Load stress/strain data - does nothing yet'
-        event.Skip()
+        dlg = wx.FileDialog(G2frame, 'Choose stress/strain file', '.', '', 
+            'image control files (*.strsta)|*.strsta',wx.OPEN|wx.CHANGE_DIR)
+        try:
+            if dlg.ShowModal() == wx.ID_OK:
+                filename = dlg.GetPath()
+                File = open(filename,'r')
+                S = File.read()
+                data = eval(S)
+                Controls = G2frame.PatternTree.GetItemPyData(
+                    G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'))
+                G2img.FitStrSta(G2frame.ImageZ,data,Controls)
+                UpdateStressStrain(G2frame,data)
+                G2plt.PlotExposedImage(G2frame,event=event)
+                G2plt.PlotStrain(G2frame,data,newPlot=True)
+                File.close()
+        finally:
+            dlg.Destroy()
 
     def OnSaveStrSta(event):
@@ -1425 +1440 @@
                 File.write('{\n\t')
                 for key in keys:
-                    if key in 'strain':
-                        File.write("'"+key+"':["+str(data[key][0])+','+str(data[key][1])+','+str(data[key][2])+'],')
+                    if key in 'Type':
+                        File.write("'"+key+"':'"+data[key]+"',")
                     else:
                         File.write("'"+key+"':"+str(data[key])+',')
@@ -1433 +1448 @@
                     File.write('\t\t{')
                     for key in keys2:
-                        File.write("'"+key+"':"+':'+str(data2[key])+',')
-                    File.write("'ImxyObs':[[],[]],'ImtaObs':[[],[]],'Imtacalc':[[],[]]},\n")
+                        File.write("'"+key+"':"+str(data2[key])+',')
+                    File.write("'ImxyObs':[[],[]],'ImtaObs':[[],[]],'ImtaCalc':[[],[]]},\n")
                 File.write('\t]\n}')
                 File.close()