Changeset 1961

Timestamp:

Aug 25, 2015 4:41:05 PM (7 years ago)

Author:

toby

Message:

save package info in GPX; display only in Debug mode

Location:

trunk

Files:

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

trunk/GSASII.py

@@ -3676 +3676 @@
         self.main.Show()
         self.SetTopWindow(self.main)
+        # save the current package versions
+        self.main.PackageVersions = {}
+        self.main.PackageVersions['Python'] = sys.version.split()[0]
+        for p in (wx,mpl,np,sp,ogl):
+            self.main.PackageVersions[p.__name__] = p.__version__
+        try:
+            self.main.PackageVersions[Image.__name__] = Image.VERSION
+        except:
+            try:
+                from PIL import PILLOW_VERSION
+                self.main.PackageVersions[Image.__name__] = PILLOW_VERSION
+            except:
+                pass
+        self.main.PackageVersions[' Platform'] = sys.platform+' '+platform.architecture()[0]+' '+platform.machine()
         # DEBUG: jump to sequential results
         #Id = G2gd.GetPatternTreeItemId(self.main,self.main.root,'Sequential results')
@@ -3692 +3706 @@
     #     self.main.OnFileOpen(None,filename)
     # removed because this gets triggered when a file is on the command line in canopy 1.4 -- not likely used anyway
-    
+       
 def main():
     '''Start up the GSAS-II application'''

trunk/GSASIIIO.py

@@ -1003 +1003 @@
                 if datum[0] == 'Controls' and 'LastSavedUsing' in datum[1]:
                     LastSavedUsing = datum[1]['LastSavedUsing']
+                if datum[0] == 'Controls' and 'PythonVersions' in datum[1] and GSASIIpath.GetConfigValue('debug'):
+                    print('Packages used to create .GPX file:')
+                    for p in sorted(datum[1]['PythonVersions'],key=lambda s: s.lower()):
+                        print("{:>14s}: {:s}".format(p,datum[1]['PythonVersions'][p]))
             for datus in data[1:]:
                 sub = G2frame.PatternTree.AppendItem(Id,datus[0])
@@ -1039 +1043 @@
         file = open(G2frame.GSASprojectfile,'wb')
         print 'save to file: ',G2frame.GSASprojectfile
-        # stick the file name into the tree, if possible
+        # stick the file name into the tree and version info into tree so they are saved.
+        # (Controls should always be created at this point)
         try:
             Controls = G2frame.PatternTree.GetItemPyData(
@@ -1045 +1050 @@
             Controls['LastSavedAs'] = os.path.abspath(G2frame.GSASprojectfile)
             Controls['LastSavedUsing'] = str(GSASIIpath.GetVersionNumber())
+            Controls['PythonVersions'] = G2frame.PackageVersions
         except:
             pass