Changeset 3328


Ignore:
Timestamp:
10/30/07 08:50:21 (12 years ago)
Author:
melissa
Message:

Make sure pixel sizes get reset; check for invalid min/max values before populating.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/in/ImarisHDFReader.java

    r3323 r3328  
    149149    if (noNetCDF) throw new FormatException(NO_NETCDF_MSG); 
    150150 
     151    pixelSizeX = pixelSizeY = pixelSizeZ = 1.0f; 
     152 
    151153    previousImageNumber = -1; 
    152154    MetadataStore store = getMetadataStore(); 
     
    235237      catch (NullPointerException exc) { } 
    236238 
    237       if (minValue != null && maxValue != null) { 
     239      if (minValue != null && maxValue != null && maxValue.doubleValue() > 0) { 
    238240        store.setChannelGlobalMinMax(i, minValue, maxValue, null); 
    239241      } 
     
    320322          else if (name.equals("LSMEmissionWavelength")) params[1] = v; 
    321323          else if (name.equals("LSMExcitationWavelength")) params[2] = v; 
    322           else if (name.equals("Max")) params[3] = v; 
    323           else if (name.equals("Min")) params[4] = v; 
     324          else if (name.equals("Max")) { 
     325            params[3] = v; 
     326          } 
     327          else if (name.equals("Min")) { 
     328            params[4] = v; 
     329          } 
    324330          else if (name.equals("Pinhole")) params[5] = v; 
    325331          else if (name.equals("Name")) params[6] = v; 
Note: See TracChangeset for help on using the changeset viewer.