Changeset 169

Timestamp:

Nov 2, 2010 9:38:57 AM (12 years ago)

Author:

vondreele

Message:

remove undo from GSASII.py
make numpy arrays of xyz powder data
fixup the undo stuff for peak fitting

Location:

trunk

Files:

• GSASII.py (modified) (3 diffs)
• GSASIIplot.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (2 diffs)

trunk/GSASII.py

@@ -130 +130 @@
         self.Refine.Enable(False)
         self.Bind(wx.EVT_MENU, self.OnRefine, id=wxID_REFINE)
-        self.UnDo = parent.Append(help='', id=wxID_UNDO, kind=wx.ITEM_NORMAL,
-            text='UnDo')
-        self.UnDo.Enable(False)
-        self.Bind(wx.EVT_MENU, self.OnUnDo, id=wxID_UNDO)
+#        self.UnDo = parent.Append(help='', id=wxID_UNDO, kind=wx.ITEM_NORMAL,
+#            text='UnDo')
+#        self.UnDo.Enable(False)
+#        self.Bind(wx.EVT_MENU, self.OnUnDo, id=wxID_UNDO)
         
     def _init_coll_Import_Items(self,parent):
@@ -1129 +1129 @@
         event.Skip()
         
-    def OnUnDo(self,event):
-        self.DoUnDo()
-        self.UnDo.Enable(False)
-        
+#    def OnUnDo(self,event):
+#        self.DoUnDo()
+#        self.UnDo.Enable(False)
+#        
     def OnRefine(self,event):
         #works - but it'd be better if it could restore plots
@@ -1147 +1147 @@
             dlg.Destroy()
         
-    def DoUnDo(self):
-        print 'Undo last refinement'
-        file = open(self.undofile,'rb')
-        PatternId = self.PatternId
-        for item in ['Background','Instrument Parameters','Peak List']:
-            self.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId, item),cPickle.load(file))
-            if self.dataDisplay.GetName() == item:
-                if item == 'Background':
-                    G2pdG.UpdateBackgroundGrid(self,self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId, item)))
-                elif item == 'Instrument Parameters':
-                    G2pdG.UpdateInstrumentGrid(self,self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId, item)))
-                elif item == 'Peak List':
-                    G2pdG.UpdatePeakGrid(self,self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId, item)))
-            print item,' recovered'
-        file.close()
-        
-    def SaveState(self):
-        self.undofile = self.dirname+'\\GSASII.save'
-        file = open(self.undofile,'wb')
-        PatternId = self.PatternId
-        for item in ['Background','Instrument Parameters','Peak List']:
-            cPickle.dump(self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId,item)),file,1)
-        file.close()
-        self.UnDo.Enable(True)
-                
+#    def DoUnDo(self):
+#        print 'Undo last refinement'
+#        file = open(self.undofile,'rb')
+#        PatternId = self.PatternId
+#        for item in ['Background','Instrument Parameters','Peak List']:
+#            self.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId, item),cPickle.load(file))
+#            if self.dataDisplay.GetName() == item:
+#                if item == 'Background':
+#                    G2pdG.UpdateBackgroundGrid(self,self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId, item)))
+#                elif item == 'Instrument Parameters':
+#                    G2pdG.UpdateInstrumentGrid(self,self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId, item)))
+#                elif item == 'Peak List':
+#                    G2pdG.UpdatePeakGrid(self,self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId, item)))
+#            print item,' recovered'
+#        file.close()
+#        
+#    def SaveState(self):
+#        self.undofile = self.dirname+'\\GSASII.save'
+#        file = open(self.undofile,'wb')
+#        PatternId = self.PatternId
+#        for item in ['Background','Instrument Parameters','Peak List']:
+#            cPickle.dump(self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId,item)),file,1)
+#        file.close()
+#        self.UnDo.Enable(True)
+#                
     def ErrorDialog(self,title,message):
         dlg = wx.MessageDialog(self, message, title,  wx.OK)

trunk/GSASIIplot.py

@@ -428 +428 @@
         ifpicked = False
         LimitId = 0
-        xye = Pattern[1]
+        xye = np.array(Pattern[1])
         if PickId:
             ifpicked = Pattern[2] == self.PatternTree.GetItemText(PatternId)

trunk/GSASIIpwdGUI.py

@@ -31 +31 @@
     def DoUnDo():
         print 'Undo last refinement'
-        file = open('GSASII.save','rb')
+        file = open(self.undofile,'rb')
         PatternId = self.PatternId
         for item in ['Background','Instrument Parameters','Peak List']:
@@ -45 +45 @@
         file.close()
         
+    def SaveState(self):
+        self.undofile = self.dirname+'\\GSASII.save'
+        file = open(self.undofile,'wb')
+        PatternId = self.PatternId
+        for item in ['Background','Instrument Parameters','Peak List']:
+            cPickle.dump(self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId,item)),file,1)
+        file.close()
+        self.dataFrame.UnDo.Enable(True)
+                
     def OnPeakFit(event):
         self.SaveState()