Changeset 2215

Timestamp:

Apr 15, 2016 1:17:34 PM (7 years ago)

Author:

toby

Message:

load images to tree as read in

Location:

trunk

Files:

• GSASII.py (modified) (6 diffs)
• GSASIIIO.py (modified) (1 diff)

trunk/GSASII.py

@@ -339 +339 @@
     
     def OnImportGeneric(self,reader,readerlist,label,multiple=False,
-                        usedRanIdList=[],Preview=True):
+                        usedRanIdList=[],Preview=True,
+                        load2Tree=False):
         '''Used for all imports, including Phases, datasets, images...
 
@@ -380 +381 @@
         :param bool Preview: indicates if a preview of the file should
           be shown. Default is True, but set to False for image files
-          which are all binary. 
+          which are all binary.
+
+        :param bool load2Tree: indicates if the file should be loaded
+          into the data tree immediately (used for images only)
 
         :returns: a list of reader objects (rd_list) that were able
@@ -518 +522 @@
                     if flag: # this read succeeded
                         rd.readfilename = filename
-                        rd_list.append(copy.deepcopy(rd)) # save the result before it is written over
+                        if load2Tree:
+                            if rd.repeatcount == 1 and not rd.repeat: # skip image number if only one in set
+                                rd.Data['ImageTag'] = None
+                            else:
+                                rd.Data['ImageTag'] = rd.repeatcount
+                            G2IO.LoadImage2Tree(rd.readfilename,self,rd.Comments,rd.Data,rd.Npix,rd.Image)
+                            rd_list.append(True) # save a stub the result before it is written over
+                            del rd.Image
+                        else:                                                   
+                            rd_list.append(copy.deepcopy(rd)) # save the result before it is written over
                         if rd.repeat:
                             repeat = True
@@ -751 +764 @@
         A reader object is filled each time an image is read. 
         '''
+        self.CheckNotebook()
         # look up which format was requested
         reqrdr = self.ImportMenuId.get(event.GetId())
-        rdlist = self.OnImportGeneric(reqrdr,self.ImportImageReaderlist,
-            'image',multiple=True,Preview=False)
-        if not rdlist: return
-        first = True
-        for rd in rdlist:
-            if first:
-                first = False
-                self.CheckNotebook()
-            if rd.repeatcount == 1 and not rd.repeat: # skip image number if only one in set
-                rd.Data['ImageTag'] = None
-            else:
-                rd.Data['ImageTag'] = rd.repeatcount
-            G2IO.LoadImage2Tree(rd.readfilename,self,rd.Comments,rd.Data,rd.Npix,rd.Image)
-        self.PatternTree.SelectItem(G2gd.GetPatternTreeItemId(self,self.Image,'Image Controls'))             #show last image to have beeen read
+        rdlist = self.OnImportGeneric(reqrdr,
+                    self.ImportImageReaderlist,
+                    'image',multiple=True,Preview=False,
+                    load2Tree=True)
+        if rdlist: 
+            self.PatternTree.SelectItem(G2gd.GetPatternTreeItemId(self,self.Image,'Image Controls'))             #show last image to have beeen read
                     
     def _Add_ImportMenu_Sfact(self,parent):
@@ -2267 +2273 @@
             style=wx.DEFAULT_FRAME_STYLE ^ wx.CLOSE_BOX)
         self.G2plotNB = G2plt.G2PlotNoteBook(plotFrame)
+        #self.G2plotNB = G2plt.G2PlotNoteBook(plotFrame,G2frame=self)
         plotFrame.Show()
         
@@ -2508 +2515 @@
     def OnImageRead(self,event):
         '''Called to read in an image in any known format. *** Depreciated. ***
-        Note: When removed, G2IO.ReadLoadImage can also be removed
         '''
         G2G.G2MessageBox(self,'Please use the Import/Image/... menu item rather than this','depreciating menu item')
-        self.CheckNotebook()
-        dlg = wx.FileDialog(
-            self, 'Choose image files', '.', '',
-            'Any supported image file (*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img;*.stl;*.G2img;*.png)|'
-            '*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img;*.stl;*.G2img;*.png;*.zip|'
-            'European detector file (*.edf)|*.edf|'
-            'Any detector tif (*.tif;*.tiff)|*.tif;*.tiff|'
-            'MAR file (*.mar*)|*.mar*|'
-            'GE Image (*.ge*;*.avg;*.sum)|*.ge*;*.avg;*.sum|'
-            'ADSC Image (*.img)|*.img|'
-            'Rigaku R-Axis IV (*.stl)|*.stl|'
-            'GSAS-II Image (*.G2img)|*.G2img|'
-            'Portable Network Graphics image (*.png)|*.png|'
-            'Zip archive (*.zip)|*.zip|'
-            'All files (*.*)|*.*',
-            wx.OPEN | wx.MULTIPLE)
-        try:
-            if dlg.ShowModal() == wx.ID_OK:
-                imagefiles = dlg.GetPaths()
-                imagefiles.sort()
-                for imagefile in imagefiles:
-                    G2IO.ReadLoadImage(imagefile,self)
-                os.chdir(dlg.GetDirectory())           # to get Mac/Linux to change directory!
-                self.PatternTree.SelectItem(G2gd.GetPatternTreeItemId(self,self.Image,'Image Controls'))             #show last image to be read
-        finally:
-            path = dlg.GetDirectory()           # to get Mac/Linux to change directory!
-            os.chdir(path)
-            dlg.Destroy()
 
     def CheckNotebook(self):

trunk/GSASIIIO.py

@@ -272 +272 @@
     dlg.CenterOnParent()
     dlg.ShowModal()
-    
-def ReadLoadImage(imagefile,G2frame):
-    '''Read a GSAS-II image file and load it into the data tree
-    Called only from GSASII.OnImageRead (depreciated).
-    '''
-    # if a zip file, open and extract
-    if os.path.splitext(imagefile)[1].lower() == '.zip':
-        extractedfile = ExtractFileFromZip(imagefile,parent=G2frame)
-        if extractedfile is not None and extractedfile != imagefile:
-            imagefile = extractedfile
-    Comments,Data,Npix,Image = GetImageData(G2frame,imagefile) # can only read 1st image
-    if Comments:
-        LoadImage2Tree(imagefile,G2frame,Comments,Data,Npix,Image)
     
 def LoadImage2Tree(imagefile,G2frame,Comments,Data,Npix,Image):