Changeset 2762


Ignore:
Timestamp:
05/08/07 13:39:05 (13 years ago)
Author:
melissa
Message:
  • Fixed used files list for NRRD files
  • Fixed multi-series issue with omebf
  • Fixed ImageTools.make24Bits
Location:
trunk/loci/formats
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/ImageTools.java

    r2526 r2762  
    10041004        a[j] = b[interleaved ? i*c + j : i + j*w*h]; 
    10051005      } 
     1006      if (c == 1) { 
     1007        for (int j=1; j<a.length; j++) { 
     1008          a[j] = a[0]; 
     1009        } 
     1010      } 
     1011       
    10061012      byte tmp = a[0]; 
    10071013      a[0] = a[2]; 
  • trunk/loci/formats/in/DeltavisionReader.java

    r2701 r2762  
    409409    } 
    410410 
    411     store.setDefaultDisplaySettings(null); 
     411    //store.setDefaultDisplaySettings(null); 
    412412  } 
    413413 
  • trunk/loci/formats/in/ICSReader.java

    r2757 r2762  
    204204    status("Finding companion file"); 
    205205 
    206     String icsId = id, idsId = id; 
     206    Location l = new Location(id); 
     207    String icsId = l.getPath(), idsId = l.getPath(); 
    207208    int dot = id.lastIndexOf("."); 
    208209    String ext = dot < 0 ? "" : id.substring(dot + 1).toLowerCase(); 
  • trunk/loci/formats/in/MetamorphReader.java

    r2757 r2762  
    205205      String absPath = abs.getPath().substring( 
    206206        abs.getPath().lastIndexOf(File.separator));  
    207       ndfile = new Location(abs.getParent(),  
    208         absPath.substring(0, absPath.indexOf("_")) + ".nd"); 
     207       
     208      int idx = id.indexOf("_"); 
     209      if (idx == -1) idx = id.lastIndexOf("."); 
     210 
     211      ndfile = new Location(abs.getParent(), id.substring(0, idx) + ".nd"); 
    209212      if (!ndfile.exists()) { 
    210213        ndfile =  
  • trunk/loci/formats/in/NRRDReader.java

    r2725 r2762  
    6262    return block[0] == 'N' && block[1] == 'R' && block[2] == 'R' && 
    6363      block[3] == 'D'; 
     64  } 
     65 
     66  /* @see loci.formats.IFormatReader#getUsedFiles() */ 
     67  public String[] getUsedFiles() { 
     68    if (dataFile == null) return new String[] {currentId}; 
     69    return new String[] {currentId, dataFile}; 
    6470  } 
    6571 
  • trunk/loci/formats/ome/OmeisImporter.java

    r2601 r2762  
    309309      } 
    310310      out.close(); 
    311       reader.close(); 
    312311      if (DEBUG) log("[done]"); 
    313312 
     
    327326      if (DEBUG) log("Pixel attributes injected."); 
    328327    } 
     328 
     329    reader.close(); 
    329330 
    330331    // accumulate XML into buffer 
Note: See TracChangeset for help on using the changeset viewer.