Changeset 643 for trunk/GSASII.py


Ignore:
Timestamp:
May 30, 2012 2:12:46 PM (10 years ago)
Author:
toby
Message:

allow multiple selection from zip on data input, read structure CIFs w/o atom type

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r641 r643  
    298298            dlg.Destroy()
    299299        rd_list = []
     300        filelist1 = []
     301        for filename in filelist:
     302            # is this a zip file?
     303            if os.path.splitext(filename)[1].lower() == '.zip':
     304                extractedfiles = G2IO.ExtractFileFromZip(
     305                    filename,parent=self,
     306                    multipleselect=True)
     307                if extractedfiles is None: continue # error or Cancel
     308                if extractedfiles != filename:
     309                    self.zipfile = filename # save zip name
     310                    filelist1 += extractedfiles
     311                    continue
     312            filelist1.append(filename)
     313        filelist = filelist1
    300314        for filename in filelist:
    301315            # is this a zip file?
Note: See TracChangeset for help on using the changeset viewer.