Changeset 3674

Timestamp:

Oct 15, 2018 11:45:38 AM (5 years ago)

Author:

toby

Message:

misc cosmetic & build changes

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIobj.py (modified) (5 diffs)
• fsource/SConstruct (modified) (1 diff)

trunk/GSASII.py

@@ -18 +18 @@
 '''
 
+import platform
 import GSASIIpath
 
@@ -28 +29 @@
         print('Unable to run with current setup, do you want to update to the')
         try:
-            ans = raw_input("latest GSAS-II version? Update ([Yes]/no): ")
+            if '2' in platform.python_version_tuple()[0]:            
+                ans = raw_input("latest GSAS-II version? Update ([Yes]/no): ")
+            else:
+                ans = input("latest GSAS-II version? Update ([Yes]/no): ")                
         except:
             ans = 'no'

trunk/GSASIIdataGUI.py

@@ -685 +685 @@
         else:
             mode = wx.FD_OPEN
-        filelist = G2G.GetImportFile(self,message="Choose "+label+" input file",
+        if len(readerlist) > 1: 
+            typ = ' (type to be guessed)'
+        else:
+            typ = '( type '+readerlist[0].formatName+')'
+        filelist = G2G.GetImportFile(self,
+                    message="Choose "+label+" input file"+typ,
                     defaultFile="",wildcard=choices,style=mode)
         rd_list = []

trunk/GSASIIobj.py

@@ -2777 +2777 @@
         {'Limits':[1.,5.],'Background':[2,[0.,-0.2*np.pi],False],'Peaks':[]})
     return Id
-
+#%%
 class ShowTiming(object):
     '''An object to use for timing repeated sections of code.
@@ -2798 +2798 @@
        
     '''
-    import time
     def __init__(self):
         self.timeSum =  []
@@ -2805 +2804 @@
         self.prev = None
     def start(self,label):
+        import time
         if label in self.label:
             i = self.label.index(label)
@@ -2817 +2817 @@
         self.prev = i
     def end(self):
+        import time
         if self.prev is not None:
             self.timeSum[self.prev] += time.time() - self.timeStart[self.prev]
@@ -2825 +2826 @@
         for i,(lbl,val) in enumerate(zip(self.label,self.timeSum)):
             print('{} {:20} {:8.2f} ms {:5.2f}%'.format(i,lbl,1000.*val,100*val/sumT))
-
+#%%
 
 if __name__ == "__main__":

trunk/fsource/SConstruct

@@ -283 +283 @@
 #==========================================================================================
 # Setup build Environment
-env = Environment()
+if sys.platform == "win32":
+   env = Environment(ENV = os.environ)
+else:
+   env = Environment()
 # Define a builder to run f2py 
 def generate_f2py(source, target, env, for_signature):