Changeset 641 for trunk

Timestamp:

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

Author:

toby

Message:

add support for zipped data and zip up largest exercise files

Location:

trunk

Files:

• Exercises/LaB6/11bmb_3844.fxye.zip (added)
• Exercises/images/La_hex_+45deg-00015.tif.zip (added)
• Exercises/kryptonite/11bmb_6231.fxye.zip (added)
• Exercises/sucrose/11bmb_0842.fxye.zip (added)
• Exercises/sucrose/LaB6_d500Rb-00001.tif.zip (added)
• Exercises/sucrose/Sucrose_d500_8x22-00000.tif.zip (added)
• Exercises/two phase/11bmb_7652.fxye.zip (added)
• Exercises/two phase/11bmb_8341.fxye.zip (added)
• Exercises/two phase/11bmb_8342.fxye.zip (added)
• GSASII.py (modified) (6 diffs)
• GSASIIIO.py (modified) (2 diffs)
• imports/G2pwd_xye.py (modified) (1 diff)

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:

trunk/GSASIIIO.py ¶

@@ -1330 +1330 @@
         self.EndModal(wx.ID_CANCEL)              
             
+def ExtractFileFromZip(filename, selection=None, confirmread=True,
+                       confirmoverwrite=True, parent=None):
+    '''If the filename is a zip file, extract a file from that archive.
+      selection is used to predefine the name of the file to be extracted
+         filename case and zip directory name are ignored in selection;
+         the first matching file is used
+      confirmread if True asks the user to confirm before expanding
+         the only file in a zip
+      confirmoverwrite if True asks the user to confirm before
+        overwriting if the extracted file already exists
+    If only one file is present, do not ask which one, otherwise offer a
+       list of choices (unless selection is used)
+    Return the name of the file that has been created
+      If the file is not a zipfile, return the name of the input file.
+      If the zipfile is empty or no file has been selected, return None
+    '''
+    import zipfile # do this now, since we can save startup time by doing this only on need
+    import shutil
+    zloc = os.path.split(filename)[0]
+    if not zipfile.is_zipfile(filename):
+        #print("not zip")
+        return filename
+
+    z = zipfile.ZipFile(filename,'r')
+    zinfo = z.infolist()
+
+    if len(zinfo) == 0:
+        #print('Zip has no files!')
+        zindex = -1
+    if selection:
+        choices = [os.path.split(i.filename)[1].lower() for i in zinfo]
+        if selection.lower() in choices:
+            zindex = choices.index(selection.lower())
+        else:
+            print('debug: file '+str(selection)+' was not found in '+str(filename))
+            zindex = -1
+    elif len(zinfo) == 1 and confirmread:
+        result = wx.ID_NO
+        dlg = wx.MessageDialog(
+            parent,
+            'Is file '+str(zinfo[0].filename)+
+            ' what you want to extract from '+
+            str(os.path.split(filename)[1])+'?',
+            'Confirm file', 
+            wx.YES_NO | wx.ICON_QUESTION)
+        try:
+            result = dlg.ShowModal()
+        finally:
+            dlg.Destroy()
+        if result == wx.ID_NO:
+            zindex = -1
+        else:
+            zindex = 0
+    elif len(zinfo) == 1:
+        zindex = 0
+    else:
+        # select from list
+        choices = [i.filename for i in zinfo]
+        dlg = wx.SingleChoiceDialog(
+            parent,
+            'Select file to extract from zip file'+str(filename),
+            'Choose file',
+            choices,
+            )
+        if dlg.ShowModal() == wx.ID_OK:
+            zindex = dlg.GetSelection()
+            dlg.Destroy()
+        else:
+            dlg.Destroy()
+            zindex = -1
+        
+    if zindex >= 0:
+        efil = os.path.join(zloc, os.path.split(zinfo[zindex].filename)[1])
+        if os.path.exists(efil) and confirmoverwrite:
+            result = wx.ID_NO
+            dlg = wx.MessageDialog(
+                parent,
+                'File '+str(efil)+' already exists. OK to overwrite it?',
+                'Confirm overwrite', 
+                wx.YES_NO | wx.ICON_QUESTION)
+            try:
+                result = dlg.ShowModal()
+            finally:
+                dlg.Destroy()
+            if result == wx.ID_NO:
+                zindex = -1
+    if zindex >= 0:
+        # extract the file to the current directory, regardless of it's original path
+        eloc,efil = os.path.split(zinfo[zindex].filename)
+        outfile = os.path.join(zloc, efil)
+        fpin = z.open(zinfo[zindex])
+        fpout = file(outfile, "wb")
+        shutil.copyfileobj(fpin, fpout)
+        fpin.close()
+        fpout.close()
+        #z.extract(zinfo[zindex],zloc)
+        z.close()
+        return outfile
+    z.close()
+    return None
+
 ######################################################################
 # base classes for reading various types of data files
@@ -1624 +1725 @@
     app = wx.PySimpleApp()
     frm = wx.Frame(None) # create a frame
-    choicelist=[ ('a','b','c'),
-                 ('test1','test2'),('no choice',)]
-    titles = [ 'a, b or c', 'tests', 'No option here']
-    dlg = MultipleChoicesDialog(
-        choicelist,titles,
-        parent=frm)
-    if dlg.ShowModal() == wx.ID_OK:
-        print 'Got OK'
+    frm.Show(True)
+    filename = '/tmp/notzip.zip'
+    filename = '/tmp/all.zip'
+    #filename = '/tmp/11bmb_7652.zip'
+    
+    #selection=None, confirmoverwrite=True, parent=None
+    #print ExtractFileFromZip(filename, selection='11bmb_7652.fxye',parent=frm)
+    print ExtractFileFromZip(filename)
+                             #confirmread=False, confirmoverwrite=False)
+
+    # choicelist=[ ('a','b','c'),
+    #              ('test1','test2'),('no choice',)]
+    # titles = [ 'a, b or c', 'tests', 'No option here']
+    # dlg = MultipleChoicesDialog(
+    #     choicelist,titles,
+    #     parent=frm)
+    # if dlg.ShowModal() == wx.ID_OK:
+    #     print 'Got OK'

trunk/imports/G2pwd_xye.py ¶

@@ -49 +49 @@
                 print 'ContentsValidator: '+self.formatName
                 print 'Unexpected information in line:',i+1 # debug info
-                print line
+                print S
                 return False
         return True # no errors encountered