Changeset 3319

Timestamp:

Mar 22, 2018 1:09:57 PM (6 years ago)

Author:

toby

Message:

set a default name when the gpx file name is blank

File:

• trunk/GSASIIIO.py (modified) (1 diff)

trunk/GSASIIIO.py

@@ -1712 +1712 @@
         :returns: a file name (str) or None if Cancel is pressed
 
-        TODO: Can this be replaced with G2G.askSaveFile?
         '''
-        
         pth = G2G.GetExportPath(self.G2frame)
-        defnam = os.path.splitext(
-            os.path.split(self.G2frame.GSASprojectfile)[1]
-            )[0]+self.extension
-        dlg = wx.FileDialog(
-            self.G2frame, 'Input name for file to write', pth, defnam,
-            self.longFormatName+' (*'+self.extension+')|*'+self.extension,
-            wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
-        dlg.CenterOnParent()
-        try:
-            if dlg.ShowModal() == wx.ID_OK:
-                filename = dlg.GetPath()
-                self.G2frame.LastExportDir = os.path.split(filename)[0]
-                filename = os.path.splitext(filename)[0]+self.extension # make sure extension is correct
-            else:
-                filename = None
-        finally:
-            dlg.Destroy()
-        return filename
+        if self.G2frame.GSASprojectfile:
+            defnam = os.path.splitext(
+                os.path.split(self.G2frame.GSASprojectfile)[1]
+                )[0]+self.extension
+        else:
+            defnam = 'default' + self.extension
+        return G2G.askSaveFile(self.G2frame,defnam,self.extension,self.longFormatName)
 
     def askSaveDirectory(self):