Changeset 1960

Timestamp:

Aug 25, 2015 12:53:42 PM (8 years ago)

Author:

toby

Message:

add current version number to Controls dict on save; display on read

Location:

trunk

Files:

• GSASII.py (modified) (3 diffs)
• GSASIIIO.py (modified) (4 diffs)

trunk/GSASII.py

@@ -2439 +2439 @@
     def CheckNotebook(self):
         '''Make sure the data tree has the minimally expected controls.
-        (BHT) correct?
         '''
         if not G2gd.GetPatternTreeItemId(self,self.root,'Notebook'):
@@ -3057 +3056 @@
         if self.GSASprojectfile: 
             self.PatternTree.SetItemText(self.root,'Loaded Data: '+self.GSASprojectfile)
+            self.CheckNotebook()
             G2IO.ProjFileSave(self)
         else:
@@ -3073 +3073 @@
                 self.PatternTree.SetItemText(self.root,'Saving project as'+self.GSASprojectfile)
                 self.SetTitle("GSAS-II data tree: "+os.path.split(self.GSASprojectfile)[1])
+                self.CheckNotebook()
                 G2IO.ProjFileSave(self)
                 os.chdir(dlg.GetDirectory())           # to get Mac/Linux to change directory!

trunk/GSASIIIO.py

@@ -976 +976 @@
                str(G2frame.GSASprojectfile))
         return
+    LastSavedUsing = None
     file = open(G2frame.GSASprojectfile,'rb')
     print 'load from file: ',G2frame.GSASprojectfile
@@ -999 +1000 @@
                 G2frame.PatternTree.SetItemPyData(Id,datum[1])
             else:
-                G2frame.PatternTree.SetItemPyData(Id,datum[1])
+                G2frame.PatternTree.SetItemPyData(Id,datum[1])             
+                if datum[0] == 'Controls' and 'LastSavedUsing' in datum[1]:
+                    LastSavedUsing = datum[1]['LastSavedUsing']
             for datus in data[1:]:
                 sub = G2frame.PatternTree.AppendItem(Id,datus[0])
@@ -1017 +1020 @@
                     G2frame.imageDefault = Data                
         file.close()
-        print('project load successful')
+        if LastSavedUsing:
+            print('GPX load successful. Last saved with GSAS-II version '+LastSavedUsing)
+        else:
+            print('project load successful')
         G2frame.NewPlot = True
     except:
@@ -1038 +1044 @@
                 G2gd.GetPatternTreeItemId(G2frame,G2frame.root, 'Controls'))
             Controls['LastSavedAs'] = os.path.abspath(G2frame.GSASprojectfile)
+            Controls['LastSavedUsing'] = str(GSASIIpath.GetVersionNumber())
         except:
             pass