Changeset 1261 for trunk/exports/G2export_csv.py

Timestamp:

Mar 24, 2014 5:22:41 PM (10 years ago)

Author:

toby

Message:

reorg exports to implement directory selection

File:

• trunk/exports/G2export_csv.py (modified) (10 diffs)

trunk/exports/G2export_csv.py

@@ -61 +61 @@
         # create a dict with refined values and their uncertainties
         self.loadParmDict()
-        if self.ExportSelect( # set export parameters
-            AskFile=True     # prompt the user for a file name
-            ): return 
-        self.OpenFile(self.filename)
+        if self.ExportSelect(): return # set export parameters; get file name
+        self.OpenFile()
         # if more than one format is selected, put them into a single file
         for phasenam in self.phasenam:
@@ -108 +106 @@
                         line += ","
                 self.Write(line)
-            print('Phase '+str(phasenam)+' written to file '+str(self.filename))                        
+            print('Phase '+str(phasenam)+' written to file '+str(self.fullpath))
         self.CloseFile()
 
@@ -135 +133 @@
         self.loadTree()
         if self.ExportSelect( # set export parameters
-            AskFile=False # use the default file name, which is ignored
+            AskFile='single' # get a file name/directory to save in
             ): return
         filenamelist = []
         for hist in self.histnam:
-            fileroot = G2obj.MakeUniqueLabel(self.MakePWDRfilename(hist),filenamelist)
-            self.filename = fileroot + self.extension
+            if len(self.histnam) > 1:
+                # multiple files: create a unique name from the histogram
+                fileroot = G2obj.MakeUniqueLabel(self.MakePWDRfilename(hist),filenamelist)
+                # create an instrument parameter file
+                self.filename = os.path.join(self.dirname,fileroot + self.extension)
             self.OpenFile()
             histblk = self.Histograms[hist]
@@ -158 +159 @@
                 self.Write(line)
             self.CloseFile()
-            print('Histogram '+str(hist)+' written to file '+str(self.filename))
+            print('Histogram '+str(hist)+' written to file '+str(self.fullpath))
 
 class ExportPowderReflCSV(G2IO.ExportBaseclass):
@@ -181 +182 @@
         # load all of the tree into a set of dicts
         self.loadTree()
-        if self.ExportSelect( # set export parameters
-            AskFile=False # use the default file name
-            ): return 
+        if self.ExportSelect(): return  # set export parameters, get file name
         self.OpenFile()
         hist = self.histnam[0] # there should only be one histogram, in any case take the 1st
@@ -201 +200 @@
                 self.Write(fmt.format(h,k,l,pos,Fobs,Fcalc,phase,mult,i))
         self.CloseFile()
-        print(str(hist)+'reflections written to file '+str(self.filename))
+        print(str(hist)+'reflections written to file '+str(self.fullpath))
 
 class ExportSingleCSV(G2IO.ExportBaseclass):
@@ -225 +224 @@
         # load all of the tree into a set of dicts
         self.loadTree()
-        if self.ExportSelect( # set export parameters
-            AskFile=False # use the default file name
-            ): return 
+        if self.ExportSelect(): return  # set export parameters, get file name
         self.OpenFile()
         hist = self.histnam[0] # there should only be one histogram, in any case take the 1st
@@ -238 +235 @@
             self.Write(fmt.format(h,k,l,dsp,Fobs,sigFobs,Fcalc,phase,mult))
         self.CloseFile()
-        print(str(hist)+' written to file '+str(self.filename))                        
+        print(str(hist)+' written to file '+str(self.fullname))                        
 
 class ExportStrainCSV(G2IO.ExportBaseclass):
@@ -262 +259 @@
         # load all of the tree into a set of dicts
         self.loadTree()
-        if self.ExportSelect( # set export parameters
-            AskFile=True # use the default file name
-            ): return 
+        if self.ExportSelect(): return  # set export parameters, get file name
         self.OpenFile()
         hist = self.histnam[0] # there should only be one histogram, in any case take the 1st
@@ -283 +278 @@
                 self.Write(fmt2.format(dat[1],dat[0],dat[2]))            
         self.CloseFile()
-        print(str(hist)+' written to file '+str(self.filename))                        
-
+        print(str(hist)+' written to file '+str(self.fullpath))