Changeset 3223 for trunk/exports/G2export_csv.py

Timestamp:

Jan 14, 2018 11:28:10 AM (5 years ago)

Author:

toby

Message:

fix histogram export file naming

File:

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

trunk/exports/G2export_csv.py

@@ -206 +206 @@
         filenamelist = []
         for hist in self.histnam:
-            # multiple files: create a unique name from the histogram
-            fileroot = G2obj.MakeUniqueLabel(self.MakePWDRfilename(hist),filenamelist)
-            # create an instrument parameter file
+            if len(self.histnam) == 1:
+                name = self.filename
+            else:    # multiple files: create a unique name from the histogram
+                name = self.MakePWDRfilename(hist)
+            fileroot = os.path.splitext(G2obj.MakeUniqueLabel(name,filenamelist))[0]
+            # create the file
             self.filename = os.path.join(self.dirname,fileroot + self.extension)
             self.Writer(hist)
@@ -230 +233 @@
 
     def Exporter(self,event=None):
-        '''Export a set of powder data as a csv file
+        '''Export a set of powder data as a single csv file
         '''
         # the export process starts here
@@ -237 +240 @@
         self.loadTree()
         if self.ExportSelect( # set export parameters
-            AskFile='single' # get a file name/directory to save in
+            AskFile='ask' # only one file is ever written
             ): return
-        filenamelist = []
         csvData = []
         headList = ["x",]
         digitList = []
-        fileroot = G2obj.MakeUniqueLabel(self.MakePWDRfilename(self.histnam[0]),filenamelist)
-        # create a file
-        self.filename = os.path.join(self.dirname,fileroot + self.extension)
+        self.filename = os.path.join(self.dirname,os.path.splitext(self.filename)[0]
+                                     + self.extension)
         for ihst,hist in enumerate(self.histnam):
             histblk = self.Histograms[hist]
@@ -254 +255 @@
             digitList += [(13,3),]
             csvData.append(histblk['Data'][1])
-            print('Histogram '+hist+' written to file '+self.fullpath)
+            print('Histogram '+hist+' added to file...')
         self.OpenFile()
         WriteList(self,headList)
@@ -264 +265 @@
             self.Write(line)
         self.CloseFile()
+        print('...file '+self.fullpath+' written')
 
 class ExportPowderReflCSV(G2IO.ExportBaseclass):