Changeset 6223


Ignore:
Timestamp:
05/03/10 17:43:52 (10 years ago)
Author:
curtis
Message:

Temporary fix for compile errors.

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

Legend:

Unmodified
Added
Removed
  • trunk/components/loci-plugins/src/loci/plugins/importer/Concatenator.java

    r6155 r6223  
    103103    for (int j=0; j<newImps.size(); j++) { 
    104104      ImagePlus imp = newImps.get(j); 
    105       if (splitC || splitZ || splitT) { 
    106         imp = Slicer.reslice(imp, splitC, splitZ, splitT, 
    107           options.isViewHyperstack(), stackOrder); 
    108       } 
     105      // CTR FIXME 
     106      //if (splitC || splitZ || splitT) { 
     107      //  imp = Slicer.reslice(imp, splitC, splitZ, splitT, 
     108      //    options.isViewHyperstack(), stackOrder); 
     109      //} 
    109110      if (options.isMergeChannels() && options.isWindowless()) { 
    110111        imp = Colorizer.colorize(imp, true, stackOrder, null, 
  • trunk/components/loci-plugins/src/loci/plugins/importer/DisplayHandler.java

    r6155 r6223  
    6767 
    6868  // -- Fields -- 
    69    
     69 
    7070  protected ImporterOptions options; 
    7171  protected XMLWindow xmlWindow; 
     
    8282  public SearchableWindow displayOriginalMetadata() { 
    8383    if (!options.isShowMetadata()) return null; 
    84      
     84 
    8585    String name = options.getIdName(); 
    8686    ImporterMetadata meta = options.getOriginalMetadata(); 
     
    114114    return metaWindow; 
    115115  } 
    116    
     116 
    117117  /** Displays the given images according to the configured options. */ 
    118118  public void displayImages(ImagePlus[] imps, String stackOrder, IndexColorModel[] colorModels) { 
    119119    for (ImagePlus imp : imps) displayImage(imp, stackOrder, colorModels); 
    120120  } 
    121    
     121 
    122122  /** Displays the given image according to the configured options. */ 
    123123  public void displayImage(ImagePlus imp, String stackOrder, IndexColorModel[] colorModels) { 
     
    153153      if (WindowManager.getCurrentImage().getID() != imp.getID()) imp.close(); 
    154154    } 
    155      
     155 
    156156    // NB: ImageJ 1.39+ is required for hyperstacks 
    157157 
     
    184184      } 
    185185 
    186       if (splitC || splitZ || splitT) { 
    187         imp = Slicer.reslice(imp, splitC, splitZ, splitT, hyper, stackOrder); 
    188       } 
     186      // CTR FIXME 
     187      //if (splitC || splitZ || splitT) { 
     188      //  imp = Slicer.reslice(imp, splitC, splitZ, splitT, hyper, stackOrder); 
     189      //} 
    189190    } 
    190191 
    191192    imp.show(); 
    192193  } 
    193    
     194 
    194195  public void displayDataBrowser(ImagePlus imp, String stackOrder, 
    195196      IndexColorModel[] colorModels) 
     
    205206//    new DataBrowser(imp, null, dimTypes, dimLengths, xmlWindow); 
    206207  } 
    207    
     208 
    208209  public void displayImage5D(ImagePlus imp, String stackOrder, IndexColorModel[] colorModels) { 
    209210    displayNormal(imp, stackOrder, colorModels); //TEMP? 
Note: See TracChangeset for help on using the changeset viewer.