Changeset 5596 for branches/4.1


Ignore:
Timestamp:
10/14/09 13:19:51 (11 years ago)
Author:
melissa
Message:

Fixed IPLab/IPLab Mac type detection and Deltavision Objective IDs.

Location:
branches/4.1/components/bio-formats/src/loci/formats/in
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/4.1/components/bio-formats/src/loci/formats/in/DeltavisionReader.java

    r5550 r5596  
    640640        } 
    641641        else if (key.equals("Lens ID")) { 
     642          if (value.indexOf(",") != -1) { 
     643            value = value.substring(0, value.indexOf(",")); 
     644          } 
    642645          String objectiveID = "Objective:" + value; 
    643646          store.setObjectiveID(objectiveID, 0, 0); 
  • branches/4.1/components/bio-formats/src/loci/formats/in/IPLabReader.java

    r5517 r5596  
    6262    super("IPLab", "ipl"); 
    6363    suffixNecessary = false; // allow extensionless IPLab files 
     64    suffixSufficient = false; 
    6465    domains = new String[] {FormatTools.GRAPHICS_DOMAIN}; 
    6566  } 
  • branches/4.1/components/bio-formats/src/loci/formats/in/IvisionReader.java

    r5517 r5596  
    7474  public IvisionReader() { 
    7575    super("IVision", "ipm"); 
     76    suffixSufficient = false; 
     77    suffixNecessary = false; 
    7678    domains = new String[] {FormatTools.GRAPHICS_DOMAIN}; 
    7779  } 
    7880 
    7981  // -- IFormatReader API methods -- 
     82 
     83  /* @see loci.formats.IFormatReader#isThisType(RandomAccessInputStream) */ 
     84  public boolean isThisType(RandomAccessInputStream stream) throws IOException { 
     85    final int blockCheckLen = 8; 
     86    if (!FormatTools.validStream(stream, blockCheckLen, true)) return false; 
     87    stream.seek(4); 
     88    return stream.readInt() == 0x600; 
     89  } 
    8090 
    8191  /** 
Note: See TracChangeset for help on using the changeset viewer.