Changeset 473

Timestamp:

Feb 7, 2012 12:54:11 PM (12 years ago)

Author:

vondreele

Message:

Add FileDlgFixExt? to fix linux problem in FileDialog? where the extension is not taken from the wildcard choice.

Location:

trunk

Files:

• GSASII.py (modified) (6 diffs)
• GSASIIIO.py (modified) (1 diff)
• scanCCD.py (modified) (2 diffs)

trunk/GSASII.py

@@ -90 +90 @@
 ] = [wx.NewId() for _init_coll_Export_Items in range(7)]
 
+def FileDlgFixExt(dlg,file):            #this is needed to fix a problem in linux wx.FileDialog
+    ext = dlg.GetWildcard().split('|')[2*dlg.GetFilterIndex()+1].strip('*')
+    if ext not in file:
+        file += ext
+    return file
+    
 class GSASII(wx.Frame):
     
@@ -1040 +1046 @@
                         if dlg.ShowModal() == wx.ID_OK:
                             newimagefile = dlg.GetPath()
+                            newimagefile = FileDlgFixExt(dlg,newimagefile)
                             G2IO.PutG2Image(newimagefile,Comments,Data,Npix,newImage)
                             Imax = np.amax(newImage)
@@ -1252 +1259 @@
                 if dlg.ShowModal() == wx.ID_OK:
                     self.GSASprojectfile = dlg.GetPath()
+                    self.GSASprojectfile = FileDlgFixExt(dlg,self.GSASprojectfile)
                     self.dirname = dlg.GetDirectory()
                     G2IO.ProjFileOpen(self)
@@ -1308 +1316 @@
             if dlg.ShowModal() == wx.ID_OK:
                 self.GSASprojectfile = dlg.GetPath()
+                self.GSASprojectfile = FileDlgFixExt(dlg,self.GSASprojectfile)
                 self.PatternTree.SetItemText(self.root,'Loaded Data: '+self.GSASprojectfile)
                 G2IO.ProjFileSave(self)
@@ -1542 +1551 @@
                 if dlg.ShowModal() == wx.ID_OK:
                     powderfile = dlg.GetPath()
+                    powderfile = FileDlgFixExt(dlg,powderfile)
                     if 'fxye' in powderfile:
                         G2IO.powderFxyeSave(self,exports,powderfile)
@@ -1555 +1565 @@
             if dlg.ShowModal() == wx.ID_OK:
                 self.peaklistfile = dlg.GetPath()
+                self.peaklistfile = FileDlgFixExt(dlg,self.peaklistfile)
                 file = open(self.peaklistfile,'w')                
                 item, cookie = self.PatternTree.GetFirstChild(self.root)

trunk/GSASIIIO.py

@@ -1131 +1131 @@
     outfile.close()
     print 'GPX file save successful'
-    
-                    
+                        
 def GetPWDRdata(GPXfile,PWDRname):
     ''' Returns powder data from GSASII gpx file

trunk/scanCCD.py

@@ -27 +27 @@
 ] = [wx.NewId() for _init_coll_File_Items in range(4)]
 
+def FileDlgFixExt(dlg,file):            #this is needed to fix a problem in linux wx.FileDialog
+    ext = dlg.GetWildcard().split('|')[2*dlg.GetFilterIndex()+1].strip('*')
+    if ext not in file:
+        file += ext
+    return file
+    
 class scanCCD(wx.Frame):
 
@@ -265 +271 @@
         try:
             if dlg.ShowModal() == wx.ID_OK:
+                print dlg.GetFilename()
                 powderfile = dlg.GetPath()
                 if 'fxye' in powderfile: