Changeset 1961
- Timestamp:
- Aug 25, 2015 4:41:05 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASII.py
r1960 r1961 3676 3676 self.main.Show() 3677 3677 self.SetTopWindow(self.main) 3678 # save the current package versions 3679 self.main.PackageVersions = {} 3680 self.main.PackageVersions['Python'] = sys.version.split()[0] 3681 for p in (wx,mpl,np,sp,ogl): 3682 self.main.PackageVersions[p.__name__] = p.__version__ 3683 try: 3684 self.main.PackageVersions[Image.__name__] = Image.VERSION 3685 except: 3686 try: 3687 from PIL import PILLOW_VERSION 3688 self.main.PackageVersions[Image.__name__] = PILLOW_VERSION 3689 except: 3690 pass 3691 self.main.PackageVersions[' Platform'] = sys.platform+' '+platform.architecture()[0]+' '+platform.machine() 3678 3692 # DEBUG: jump to sequential results 3679 3693 #Id = G2gd.GetPatternTreeItemId(self.main,self.main.root,'Sequential results') … … 3692 3706 # self.main.OnFileOpen(None,filename) 3693 3707 # removed because this gets triggered when a file is on the command line in canopy 1.4 -- not likely used anyway 3694 3708 3695 3709 def main(): 3696 3710 '''Start up the GSAS-II application''' -
trunk/GSASIIIO.py
r1960 r1961 1003 1003 if datum[0] == 'Controls' and 'LastSavedUsing' in datum[1]: 1004 1004 LastSavedUsing = datum[1]['LastSavedUsing'] 1005 if datum[0] == 'Controls' and 'PythonVersions' in datum[1] and GSASIIpath.GetConfigValue('debug'): 1006 print('Packages used to create .GPX file:') 1007 for p in sorted(datum[1]['PythonVersions'],key=lambda s: s.lower()): 1008 print("{:>14s}: {:s}".format(p,datum[1]['PythonVersions'][p])) 1005 1009 for datus in data[1:]: 1006 1010 sub = G2frame.PatternTree.AppendItem(Id,datus[0]) … … 1039 1043 file = open(G2frame.GSASprojectfile,'wb') 1040 1044 print 'save to file: ',G2frame.GSASprojectfile 1041 # stick the file name into the tree, if possible 1045 # stick the file name into the tree and version info into tree so they are saved. 1046 # (Controls should always be created at this point) 1042 1047 try: 1043 1048 Controls = G2frame.PatternTree.GetItemPyData( … … 1045 1050 Controls['LastSavedAs'] = os.path.abspath(G2frame.GSASprojectfile) 1046 1051 Controls['LastSavedUsing'] = str(GSASIIpath.GetVersionNumber()) 1052 Controls['PythonVersions'] = G2frame.PackageVersions 1047 1053 except: 1048 1054 pass
Note: See TracChangeset
for help on using the changeset viewer.