Changeset 2215
- Timestamp:
- Apr 15, 2016 1:17:34 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASII.py
r2214 r2215 339 339 340 340 def OnImportGeneric(self,reader,readerlist,label,multiple=False, 341 usedRanIdList=[],Preview=True): 341 usedRanIdList=[],Preview=True, 342 load2Tree=False): 342 343 '''Used for all imports, including Phases, datasets, images... 343 344 … … 380 381 :param bool Preview: indicates if a preview of the file should 381 382 be shown. Default is True, but set to False for image files 382 which are all binary. 383 which are all binary. 384 385 :param bool load2Tree: indicates if the file should be loaded 386 into the data tree immediately (used for images only) 383 387 384 388 :returns: a list of reader objects (rd_list) that were able … … 518 522 if flag: # this read succeeded 519 523 rd.readfilename = filename 520 rd_list.append(copy.deepcopy(rd)) # save the result before it is written over 524 if load2Tree: 525 if rd.repeatcount == 1 and not rd.repeat: # skip image number if only one in set 526 rd.Data['ImageTag'] = None 527 else: 528 rd.Data['ImageTag'] = rd.repeatcount 529 G2IO.LoadImage2Tree(rd.readfilename,self,rd.Comments,rd.Data,rd.Npix,rd.Image) 530 rd_list.append(True) # save a stub the result before it is written over 531 del rd.Image 532 else: 533 rd_list.append(copy.deepcopy(rd)) # save the result before it is written over 521 534 if rd.repeat: 522 535 repeat = True … … 751 764 A reader object is filled each time an image is read. 752 765 ''' 766 self.CheckNotebook() 753 767 # look up which format was requested 754 768 reqrdr = self.ImportMenuId.get(event.GetId()) 755 rdlist = self.OnImportGeneric(reqrdr,self.ImportImageReaderlist, 756 'image',multiple=True,Preview=False) 757 if not rdlist: return 758 first = True 759 for rd in rdlist: 760 if first: 761 first = False 762 self.CheckNotebook() 763 if rd.repeatcount == 1 and not rd.repeat: # skip image number if only one in set 764 rd.Data['ImageTag'] = None 765 else: 766 rd.Data['ImageTag'] = rd.repeatcount 767 G2IO.LoadImage2Tree(rd.readfilename,self,rd.Comments,rd.Data,rd.Npix,rd.Image) 768 self.PatternTree.SelectItem(G2gd.GetPatternTreeItemId(self,self.Image,'Image Controls')) #show last image to have beeen read 769 rdlist = self.OnImportGeneric(reqrdr, 770 self.ImportImageReaderlist, 771 'image',multiple=True,Preview=False, 772 load2Tree=True) 773 if rdlist: 774 self.PatternTree.SelectItem(G2gd.GetPatternTreeItemId(self,self.Image,'Image Controls')) #show last image to have beeen read 769 775 770 776 def _Add_ImportMenu_Sfact(self,parent): … … 2267 2273 style=wx.DEFAULT_FRAME_STYLE ^ wx.CLOSE_BOX) 2268 2274 self.G2plotNB = G2plt.G2PlotNoteBook(plotFrame) 2275 #self.G2plotNB = G2plt.G2PlotNoteBook(plotFrame,G2frame=self) 2269 2276 plotFrame.Show() 2270 2277 … … 2508 2515 def OnImageRead(self,event): 2509 2516 '''Called to read in an image in any known format. *** Depreciated. *** 2510 Note: When removed, G2IO.ReadLoadImage can also be removed2511 2517 ''' 2512 2518 G2G.G2MessageBox(self,'Please use the Import/Image/... menu item rather than this','depreciating menu item') 2513 self.CheckNotebook()2514 dlg = wx.FileDialog(2515 self, 'Choose image files', '.', '',2516 'Any supported image file (*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img;*.stl;*.G2img;*.png)|'2517 '*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img;*.stl;*.G2img;*.png;*.zip|'2518 'European detector file (*.edf)|*.edf|'2519 'Any detector tif (*.tif;*.tiff)|*.tif;*.tiff|'2520 'MAR file (*.mar*)|*.mar*|'2521 'GE Image (*.ge*;*.avg;*.sum)|*.ge*;*.avg;*.sum|'2522 'ADSC Image (*.img)|*.img|'2523 'Rigaku R-Axis IV (*.stl)|*.stl|'2524 'GSAS-II Image (*.G2img)|*.G2img|'2525 'Portable Network Graphics image (*.png)|*.png|'2526 'Zip archive (*.zip)|*.zip|'2527 'All files (*.*)|*.*',2528 wx.OPEN | wx.MULTIPLE)2529 try:2530 if dlg.ShowModal() == wx.ID_OK:2531 imagefiles = dlg.GetPaths()2532 imagefiles.sort()2533 for imagefile in imagefiles:2534 G2IO.ReadLoadImage(imagefile,self)2535 os.chdir(dlg.GetDirectory()) # to get Mac/Linux to change directory!2536 self.PatternTree.SelectItem(G2gd.GetPatternTreeItemId(self,self.Image,'Image Controls')) #show last image to be read2537 finally:2538 path = dlg.GetDirectory() # to get Mac/Linux to change directory!2539 os.chdir(path)2540 dlg.Destroy()2541 2519 2542 2520 def CheckNotebook(self): -
trunk/GSASIIIO.py
r2214 r2215 272 272 dlg.CenterOnParent() 273 273 dlg.ShowModal() 274 275 def ReadLoadImage(imagefile,G2frame):276 '''Read a GSAS-II image file and load it into the data tree277 Called only from GSASII.OnImageRead (depreciated).278 '''279 # if a zip file, open and extract280 if os.path.splitext(imagefile)[1].lower() == '.zip':281 extractedfile = ExtractFileFromZip(imagefile,parent=G2frame)282 if extractedfile is not None and extractedfile != imagefile:283 imagefile = extractedfile284 Comments,Data,Npix,Image = GetImageData(G2frame,imagefile) # can only read 1st image285 if Comments:286 LoadImage2Tree(imagefile,G2frame,Comments,Data,Npix,Image)287 274 288 275 def LoadImage2Tree(imagefile,G2frame,Comments,Data,Npix,Image):
Note: See TracChangeset
for help on using the changeset viewer.