Changeset 4270 for trunk/GSASIIctrlGUI.py

Timestamp:

Jan 31, 2020 4:07:00 AM (3 years ago)

Author:

vondreele

Message:

set default directories to G2frame.LastGPXdir or result from GetImportPath? or GetExportPath? in most FileDialogs?
It is never None; ultimate default is '.' with a printed message - shouldn't happen
Set self.LastGPXdir to location of gpx file anytime GSAS-II reads it to start that project.
It should never be None or '.'.
Remove RMCProfile patches - shouldn't be needed now.
Make sure RMCProfile data files are local to the gpx file - required for running RMCProfile

File:

• trunk/GSASIIctrlGUI.py (modified) (3 diffs)

trunk/GSASIIctrlGUI.py

@@ -3162 +3162 @@
 def GetImportPath(G2frame):
     '''Determines the default location to use for importing files. Tries sequentially
-    G2frame.TutorialImportDir, config var Import_directory and G2frame.LastImportDir.
+    G2frame.TutorialImportDir, config var Import_directory, G2frame.LastImportDir
+    and G2frame.LastGPXdir
     
-    :returns: a string containing the path to be used when reading files or None
+    :returns: a string containing the path to be used when reading files or '.'
       if none of the above are specified.
     '''
@@ -3185 +3186 @@
         elif GSASIIpath.GetConfigValue('debug'):
             print('DBG_Warning: G2frame.LastImportDir not found = '+G2frame.LastImportDir)
-    return None
+    elif G2frame.LastGPXdir:
+        return G2frame.LastGPXdir
+    print('Import path not found - set to current directory')      #now shouldn't happen
+    return '.'
 
 def GetExportPath(G2frame):
@@ -3198 +3202 @@
     elif G2frame.LastGPXdir:
         return G2frame.LastGPXdir
-    else:
-        return '.'
+    print('Export path not found - set to current directory')      #now shouldn't happen
+    return '.'
+
 
 ################################################################################