Changeset 5618


Ignore:
Timestamp:
10/19/09 09:22:42 (11 years ago)
Author:
melissa
Message:

Fixed IPLab Mac type checking.

Files:
4 edited

Legend:

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

    r5615 r5618  
    8383  /* @see loci.formats.IFormatReader#isThisType(RandomAccessInputStream) */ 
    8484  public boolean isThisType(RandomAccessInputStream stream) throws IOException { 
    85     final int blockCheckLen = 8; 
     85    final int blockCheckLen = 4; 
    8686    if (!FormatTools.validStream(stream, blockCheckLen, true)) return false; 
    87     stream.seek(4); 
    88     return stream.readInt() == 0x600; 
     87    String version = stream.readString(4); 
     88    return version.equals("3.9a"); 
    8989  } 
    9090 
  • branches/4.1/components/bio-formats/src/loci/formats/in/ZeissZVIReader.java

    r5614 r5618  
    633633    store.setObjectiveID(objectiveID, 0, 0); 
    634634    store.setObjectiveSettingsObjective(objectiveID, 0); 
     635    store.setObjectiveCorrection("Unknown", 0, 0); 
     636    store.setObjectiveImmersion("Unknown", 0, 0); 
    635637  } 
    636638 
     
    815817        else if (key.equals("User company")) { 
    816818          store.setExperimenterInstitution(value, 0); 
     819          store.setExperimenterOMEName("Unknown", 0); 
    817820        } 
    818821        else if (key.startsWith("Objective Magnification")) { 
  • trunk/components/bio-formats/src/loci/formats/in/IvisionReader.java

    r5613 r5618  
    8383  /* @see loci.formats.IFormatReader#isThisType(RandomAccessInputStream) */ 
    8484  public boolean isThisType(RandomAccessInputStream stream) throws IOException { 
    85     final int blockCheckLen = 8; 
     85    final int blockCheckLen = 4; 
    8686    if (!FormatTools.validStream(stream, blockCheckLen, true)) return false; 
    87     stream.seek(4); 
    88     return stream.readInt() == 0x600; 
     87    String version = stream.readString(4); 
     88    return version.equals("3.9a"); 
    8989  } 
    9090 
  • trunk/components/bio-formats/src/loci/formats/in/ZeissZVIReader.java

    r5614 r5618  
    633633    store.setObjectiveID(objectiveID, 0, 0); 
    634634    store.setObjectiveSettingsObjective(objectiveID, 0); 
     635    store.setObjectiveCorrection("Unknown", 0, 0); 
     636    store.setObjectiveImmersion("Unknown", 0, 0); 
    635637  } 
    636638 
     
    815817        else if (key.equals("User company")) { 
    816818          store.setExperimenterInstitution(value, 0); 
     819          store.setExperimenterOMEName("Unknown", 0); 
    817820        } 
    818821        else if (key.startsWith("Objective Magnification")) { 
Note: See TracChangeset for help on using the changeset viewer.