Changeset 6239


Ignore:
Timestamp:
05/05/10 16:10:16 (10 years ago)
Author:
curtis
Message:

Minor progress on Bio-Formats Importer refactoring.

Location:
trunk/components/loci-plugins/src/loci/plugins/in
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/loci-plugins/src/loci/plugins/in/Importer.java

    r6229 r6239  
    8383 
    8484      BF.debug("read pixel data"); 
    85       ImagePlus[] imps = readPixels(options, displayHandler); 
     85      ImagePlusReader ipr = new ImagePlusReader(options); 
     86      ImagePlus[] imps = readPixels(ipr, options, displayHandler); 
     87 
     88      BF.debug("display pixels"); 
     89      displayHandler.displayImages(imps, ipr.stackOrder, ipr.colorModels); 
    8690 
    8791      BF.debug("display ROIs"); 
     
    131135  } 
    132136 
    133   public ImagePlus[] readPixels(ImporterOptions options, 
     137  public ImagePlus[] readPixels(ImagePlusReader ipr, ImporterOptions options, 
    134138    DisplayHandler displayHandler) throws FormatException, IOException 
    135139  { 
    136140    if (options.isViewNone()) return null; 
    137     ImagePlusReader ipr = new ImagePlusReader(options); 
    138141    ipr.addStatusListener(displayHandler); 
    139142    ImagePlus[] imps = ipr.openImagePlus(); 
    140  
    141     // TEMP! 
    142     displayHandler.displayImages(imps, ipr.stackOrder, ipr.colorModels); 
    143  
    144143    return imps; 
    145144  } 
  • trunk/components/loci-plugins/src/loci/plugins/in/ImporterOptions.java

    r6229 r6239  
    481481    FilePattern fp = new FilePattern(id); 
    482482    if (!fp.isValid()) id = reader.currentFile; 
    483     setId(id); // CTR CHECK -- probably the wrong way to do this 
     483    setId(id); // overwrite base filename with file pattern 
    484484    return true; 
    485485  } 
Note: See TracChangeset for help on using the changeset viewer.