Changeset 1241


Ignore:
Timestamp:
08/11/06 13:10:16 (14 years ago)
Author:
melissa
Message:

fixed Data Browser to work with new Bio-Formats API

Location:
trunk/loci/browser
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/browser/ImagePlusWrapper.java

    r1231 r1241  
    2727    java.io.IOException, FormatException 
    2828  { 
    29     FormatReader r = LociDataBrowser.reader.getReader(name); 
     29    FormatReader r = (FormatReader) LociDataBrowser.reader.getReader(name); 
    3030    try { 
    3131      OMEXMLMetadataStore s = new OMEXMLMetadataStore(); 
  • trunk/loci/browser/ImagePreview.java

    r1201 r1241  
    4242 
    4343      ImageReader ir = new ImageReader(); 
    44       FormatReader fr = ir.getReader(file.getAbsolutePath()); 
     44      FormatReader fr = (FormatReader) ir.getReader(file.getAbsolutePath()); 
    4545      BufferedImage image = fr.openImage(file.getAbsolutePath(),0); 
    4646 
  • trunk/loci/browser/LociDataBrowser.java

    r1231 r1241  
    131131 
    132132        if (virtual) { 
    133           FormatReader fr = reader.getReader(absname); 
     133          FormatReader fr = (FormatReader) reader.getReader(absname); 
    134134          fr.setMetadataStore(new OMEXMLMetadataStore()); 
    135135          fr.getMetadataStore(absname).createRoot(); 
     
    142142          if (num < size) size = num; 
    143143 
     144          String ord = cm.getDimensionOrder(absname); 
     145          ord = ord.substring(2); 
     146          int minor, major; 
     147          if (ord.charAt(0) == 'Z') { 
     148            minor = reader.getSizeZ(filename); 
     149            major = reader.getSizeT(filename); 
     150          }       
     151          else if (ord.charAt(0) == 'T') { 
     152            major = reader.getSizeZ(filename); 
     153            minor = reader.getSizeT(filename); 
     154          } 
     155          else { 
     156            if (ord.charAt(1) == 'Z') { 
     157              minor = reader.getSizeZ(filename); 
     158              major = reader.getSizeT(filename); 
     159            } 
     160            else { 
     161              major = reader.getSizeZ(filename); 
     162              minor = reader.getSizeT(filename); 
     163            } 
     164          } 
     165 
     166          //manager = new CacheManager(size, minor, major, cm, absname); 
    144167          manager = new CacheManager(size, cm, absname); 
    145168          manager.init(); 
Note: See TracChangeset for help on using the changeset viewer.