Changeset 641 for trunk/GSASII.py

Timestamp:

May 29, 2012 10:23:48 PM (10 years ago)

Author:

toby

Message:

add support for zipped data and zip up largest exercise files

File:

• trunk/GSASII.py (modified) (6 diffs)

trunk/GSASII.py

@@ -243 +243 @@
         '''
         self.lastimport = ''
+        self.zipfile = None
         if reader is None:
             multiple = False
             #print "use all formats"
             choices = "any file (*.*)|*.*"
+            choices += "|zip archive (.zip)|*.zip"
             extdict = {}
             # compile a list of allowed extensions
@@ -269 +271 @@
                 w += "*" + extn
             choices += w + ")|" + w
+            choices += "|zip archive (.zip)|*.zip"
             if not reader.strictExtension:
                 choices += "|any file (*.*)|*.*"
@@ -296 +299 @@
         rd_list = []
         for filename in filelist:
-        # set what formats are compatible with this file
+            # is this a zip file?
+            if os.path.splitext(filename)[1].lower() == '.zip':
+                extractedfile = G2IO.ExtractFileFromZip(filename,parent=self)
+                if extractedfile is None: continue # error or Cancel 
+                if extractedfile != filename:
+                    filename,self.zipfile = extractedfile,filename # now use the file that was created
+            # set what formats are compatible with this file
             primaryReaders = []
             secondaryReaders = []
@@ -596 +605 @@
                 print 'debug: open/read failed',instfile
                 pass # fail silently
-        
+
+        # did we read the data file from a zip? If so, look there for a
+        # instrument parameter file
+        if self.zipfile:
+            for ext in '.inst','.prm':
+                instfile = G2IO.ExtractFileFromZip(
+                    self.zipfile,
+                    selection=os.path.split(basename + ext)[1],
+                    parent=self)
+                if instfile is not None and instfile != self.zipfile:
+                    print 'debug:',instfile,'created from ',self.zipfile
+                    Iparm = self.ReadPowderIparm(instfile,bank,numbanks,rd)
+                    if Iparm:
+                        rd.instfile = instfile
+                        rd.instmsg = instfile + ' bank ' + str(rd.instbank)
+                        return Iparm
+                    else:
+                        print 'debug: open/read for',instfile,'from',self.zipfile,'failed'
+                        pass # fail silently
+
         while True: # loop until we get a file that works or we get a cancel
             instfile = ''
@@ -1024 +1052 @@
     def OnImageRead(self,event):
         self.CheckNotebook()
-        dlg = wx.FileDialog(self, 'Choose image files', '.', '',\
-        'Any image file (*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img;*.G2img)\
-        |*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img;*.G2img|\
-        Any detector tif (*.tif;*.tiff)|*.tif;*.tiff|\
-        MAR file (*.mar*)|*.mar*|\
-        GE Image (*.avg;*.sum)|*.avg;*.sum|\
-        ADSC Image (*.img)|*.img|\
-        GSAS-II Image (*.G2img)|*.G2img|\
-        All files (*.*)|*.*',
-        wx.OPEN | wx.MULTIPLE|wx.CHANGE_DIR)
+        dlg = wx.FileDialog(
+            self, 'Choose image files', '.', '',
+            'Any image file (*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img;*.G2img)|'
+            '*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img;*.G2img;*.zip|'
+            'Any detector tif (*.tif;*.tiff)|*.tif;*.tiff|'
+            'MAR file (*.mar*)|*.mar*|'
+            'GE Image (*.avg;*.sum)|*.avg;*.sum|'
+            'ADSC Image (*.img)|*.img|'
+            'GSAS-II Image (*.G2img)|*.G2img|'
+            'Zip archive (*.zip)|*.zip|'
+            'All files (*.*)|*.*',
+            wx.OPEN | wx.MULTIPLE|wx.CHANGE_DIR)
         try:
             if dlg.ShowModal() == wx.ID_OK:
@@ -1039 +1069 @@
                 imagefiles.sort()
                 for imagefile in imagefiles:
+                    # if a zip file, open and extract
+                    if os.path.splitext(imagefile)[1].lower() == '.zip':
+                        extractedfile = G2IO.ExtractFileFromZip(imagefile,parent=self)
+                        if extractedfile is not None and extractedfile != imagefile:
+                            imagefile = extractedfile
                     Comments,Data,Npix,Image = G2IO.GetImageData(self,imagefile)
                     if Comments: