Changeset 1261 for trunk/exports/G2export_map.py

Timestamp:

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

Author:

toby

Message:

reorg exports to implement directory selection

File:

• trunk/exports/G2export_map.py (modified) (6 diffs)

trunk/exports/G2export_map.py ¶

@@ -53 +53 @@
         # load all of the tree into a set of dicts
         self.loadTree()
-        if self.ExportSelect( # set export parameters
-            AskFile=True          # prompt the user for a file name
-            ): return 
+        if self.ExportSelect(): return  # set export parameters, get file name
+        filename = self.filename
         for phasenam in self.phasenam:
             phasedict = self.Phases[phasenam] # pointer to current phase info            
             rho = phasedict['General']['Map'].get('rho',[])
             if not len(rho):
-                return
-            print self.filename
-            self.OpenFile(self.filename)
+                print "There is no map for phase "+str(phasenam)
+                continue
+            if len(self.phasenam) > 1: # if more than one filename is written, add a phase # -- not in use yet
+                i = self.Phases[phasenam]['pId']
+                self.filename = os.path.splitext(filename)[1] + "_" + mapData['MapType'] + str(i) + self.extension
+            self.OpenFile()
             self.Write("Map of Phase "+str(phasenam)+" from "+str(self.G2frame.GSASprojectfile))
             # get cell parameters & print them
@@ -74 +76 @@
                     for k in range(nz):
                         self.Write(str(rho[i,j,k]))
-            print('map from Phase '+str(phasenam)+' written to file '+str(self.filename))
             self.CloseFile()
-            return
+            print('map from Phase '+str(phasenam)+' written to file '+str(self.fullpath))
 
 class ExportMapCCP4(G2IO.ExportBaseclass):
@@ -94 +95 @@
 
     # Tools for file writing. 
-    def OpenFile(self,fil=None):
-        '''Open the output file as binary
-
-        :param str fil: The name of the file to open. If None (default)
-          the name defaults to self.filename.
-        :returns: the file object opened by the routine which is also
-          saved as self.fp
-        '''
-        if not fil:
-            fil = self.filename
-        self.fp = open(fil,'wb')
-        return self.fp
-        
     def Write(self,data,dtype):
         import struct
@@ -122 +110 @@
         # load all of the tree into a set of dicts
         self.loadTree()
-        if self.ExportSelect( # set export parameters
-            AskFile=False     # I'll make the file name
-            ): return 
+        if self.ExportSelect(): return  # set export parameters, get file name
+        filename = self.filename
         for phasenam in self.phasenam:
             phasedict = self.Phases[phasenam] # pointer to current phase info 
@@ -131 +118 @@
             
             if not len(rho):
-                return
+                print "There is no map for phase "+str(phasenam)
+                continue
+            if len(self.phasenam) > 1: # if more than one filename is written, add a phase # -- not in use yet
+                i = self.Phases[phasenam]['pId']
+                self.filename = os.path.splitext(filename)[1] + "_" + mapData['MapType'] + str(i) + self.extension
             cell = phasedict['General']['Cell'][1:7]
             nx,ny,nz = rho.shape
-            filename,ext = os.path.splitext(self.filename)
-            self.filename = filename+'_'+phasenam+'_'+mapData['MapType']+ext
-            self.OpenFile(self.filename)
+            self.OpenFile(mode='wb')
             for n in rho.shape: self.Write(n,'i')  #nX,nY,nZ
             self.Write(2,'i')           #mode=2 float map
@@ -156 +145 @@
             for x in rho.flatten('F'):
                 self.Write(x,'f')
-            print('map from Phase '+str(phasenam)+' written to file '+str(self.filename))
             self.CloseFile()
-            return
+            print('map from Phase '+str(phasenam)+' written to file '+str(self.fullpath))