Changeset 3887

Timestamp:

Apr 10, 2019 5:52:53 PM (4 years ago)

Author:

toby

Message:

Fix restore of seq results after crash

Location:

trunk

Files:

• GSASIIIO.py (modified) (6 diffs)
• GSASIIstrIO.py (modified) (2 diffs)

trunk/GSASIIIO.py

@@ -617 +617 @@
     GPXphase = os.path.splitext(G2frame.GSASprojectfile)[0]+'.seqPhase'
     GPXhist = os.path.splitext(G2frame.GSASprojectfile)[0]+'.seqHist'
+    deleteSeq = False
     hist = None
     tmpHistIndex = {}
@@ -626 +627 @@
         try:
             result = dlg.ShowModal()
-            if result == wx.ID_OK:
+            deleteSeq = result != wx.ID_CANCEL
+            if result == wx.ID_YES:
                 updateFromSeq = True
                 fp = open(GPXphase,'rb')
@@ -648 +650 @@
                 except EOFError:
                     pass
-            elif result != wx.ID_CANCEL:
-                #print('deleting .seqXXXX files')
-                try:
-                    os.remove(GPXphase)
-                except:
-                    print('Warning: unable to delete {}'.format(GPXphase))
-                try:
-                    os.remove(GPXhist)
-                except:
-                    print('Warning: unable to delete {}'.format(GPXhist))
         finally:
             dlg.Destroy()
@@ -688 +680 @@
                 hist.seek(tmpHistIndex[datum[0]])
                 hdata = cPickleLoad(hist)
+                if data[0][0] != hdata[0][0]:
+                    print('Error! Updating {} with {}'.format(data[0][0],hdata[0][0]))
+                datum = hdata[0]
                 xferItems = ['Background','Instrument Parameters','Sample Parameters','Reflection Lists']
                 hItems = {name:j+1 for j,(name,val) in enumerate(hdata[1:]) if name in xferItems}
@@ -735 +730 @@
                 sub = G2frame.GPXtree.AppendItem(Id,'PDF Peaks')
                 G2frame.GPXtree.SetItemPyData(sub,{'Limits':[1.,5.],'Background':[2,[0.,-0.2*np.pi],False],'Peaks':[]})
-            if datum[0].startswith('IMG'):                   #retrieve image default flag & data if set
+            if datum [0].startswith('IMG'):                   #retrieve image default flag & data if set
                 Data = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,Id,'Image Controls'))
                 if Data['setDefault']:
@@ -757 +752 @@
         wx.EndBusyCursor()
         G2frame.Status.SetStatusText('Mouse RB drag/drop to reorder',0)
-    if hist:
-        hist.close()
-        #print('deleting .seqXXXX files')
+    if deleteSeq:
+        if hist: hist.close()
         try:
             os.remove(GPXphase)

trunk/GSASIIstrIO.py

@@ -783 +783 @@
             hist.seek(histIndex[datum[0]])
             hdata = cPickleLoad(hist)
-            if GSASIIpath.GetConfigValue('debug'): 
-                print('Updating {} with {}'.format(data[0][0],hdata[0][0]))
+            if data[0][0] != hdata[0][0]:
+                print('Error! Updating {} with {}'.format(data[0][0],hdata[0][0]))
+            data[0] = hdata[0]
             xferItems = ['Background','Instrument Parameters','Sample Parameters','Reflection Lists']
             hItems = {name:j+1 for j,(name,val) in enumerate(hdata[1:]) if name in xferItems}
@@ -790 +791 @@
                 if name not in xferItems: continue
                 data[j+1][1] = hdata[hItems[name]][1]
-            data[0] = hdata[0]
-            # old code update from Histograms array
-            #histogram = Histograms[datum[0]]
-            #data[0][1][1] = list(histogram['Data'])
-            #for datus in data[1:]:
-            #    if datus[0] in 
-            #        datus[1] = histogram[datus[0]]
         cPickle.dump(data,outfile,1)
     hist.close()