Changeset 5523 for trunk

Timestamp:

Mar 25, 2023 11:11:14 AM (2 years ago)

Author:

vondreele

Message:

force RMCProfile files to always be written to directory containing gpx file.

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (4 diffs)
• GSASIIphsGUI.py (modified) (2 diffs)
• GSASIIpwd.py (modified) (1 diff)

trunk/GSASIIctrlGUI.py ¶

@@ -3867 +3867 @@
 ################################################################################
 def GetImportFile(G2frame, message, defaultDir="", defaultFile="",
-                      style=wx.FD_OPEN, parent=None,
-                      *args, **kwargs):
+    style=wx.FD_OPEN, parent=None,*args, **kwargs):
     '''Uses a customized dialog that gets files from the appropriate import directory. 
     Arguments are used the same as in :func:`wx.FileDialog`. Selection of
@@ -3887 +3886 @@
     #    print('debug: GetImportFile from '+defaultDir)
     #    print('debug: GetImportFile pth '+pth)
-    dlg = wx.FileDialog(parent, message, defaultDir, defaultFile, *args,
-                        style=style, **kwargs)
+    dlg = wx.FileDialog(parent, message, defaultDir, defaultFile, *args,style=style, **kwargs)
 #    dlg.CenterOnParent()
     if not defaultDir and pth: dlg.SetDirectory(pth)
@@ -3931 +3929 @@
             return pth
         elif GSASIIpath.GetConfigValue('debug'):
-            print('Ignoring Config Import_directory value: '+
-                      GSASIIpath.GetConfigValue('Import_directory'))
+            print('Ignoring Config Import_directory value: '+GSASIIpath.GetConfigValue('Import_directory'))
     if G2frame.LastImportDir:
         if os.path.exists(G2frame.LastImportDir):
@@ -5316 +5313 @@
     '''
     pth = GetExportPath(G2frame)
-    dlg = wx.DirDialog(
-            G2frame, 'Input directory where file(s) will be written', pth,
-            wx.DD_DEFAULT_STYLE)
+    dlg = wx.DirDialog(G2frame,'Input directory where file(s) will be written',pth,wx.DD_DEFAULT_STYLE)
     dlg.CenterOnParent()
     try:

trunk/GSASIIphsGUI.py ¶

@@ -6424 +6424 @@
         if not G2frame.GSASprojectfile:     #force a project save
             G2frame.OnFileSaveas(event)
+        dName = G2frame.LastGPXdir            
+        os.chdir(dName)
         if G2frame.RMCchoice == 'fullrmc':
             RMCPdict = data['RMC']['fullrmc']
@@ -6447 +6449 @@
                 G2frame.dataWindow.FRMCDataEdit.Enable(G2G.wxID_RUNRMC,False)
                 return
+            dName = G2frame.LastGPXdir            
             pName = generalData['Name']
             G2frame.dataWindow.FRMCDataEdit.Enable(G2G.wxID_RUNRMC,True)

trunk/GSASIIpwd.py ¶

@@ -2921 +2921 @@
     inst = PWDdata['Instrument Parameters'][0]
     try:
+        pName = Phase['General']['Name']
         refList = PWDdata['Reflection Lists'][Name]['RefList']
     except TypeError: