Changeset 6765


Ignore:
Timestamp:
08/04/10 10:39:12 (9 years ago)
Author:
melissa
Message:

Only populate Objective.NominalMagnification if the magnification stored in the file is valid.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.2/components/bio-formats/src/loci/formats/in/ZeissLSMReader.java

    r6744 r6765  
    936936        getCorrection(recording.correction), series, 0); 
    937937      store.setObjectiveImmersion(getImmersion(recording.immersion), series, 0); 
    938       store.setObjectiveNominalMagnification( 
     938      if (recording.magnification != null && recording.magnification > 0) { 
     939        store.setObjectiveNominalMagnification( 
    939940          new PositiveInteger(recording.magnification), series, 0); 
     941      } 
    940942      store.setObjectiveLensNA(recording.lensNA, series, 0); 
    941943      store.setObjectiveIris(recording.iris, series, 0); 
  • trunk/components/bio-formats/src/loci/formats/in/ZeissLSMReader.java

    r6744 r6765  
    967967        getCorrection(recording.correction), series, 0); 
    968968      store.setObjectiveImmersion(getImmersion(recording.immersion), series, 0); 
    969       store.setObjectiveNominalMagnification( 
     969      if (recording.magnification != null && recording.magnification > 0) { 
     970        store.setObjectiveNominalMagnification( 
    970971          new PositiveInteger(recording.magnification), series, 0); 
     972      } 
    971973      store.setObjectiveLensNA(recording.lensNA, series, 0); 
    972974      store.setObjectiveIris(recording.iris, series, 0); 
Note: See TracChangeset for help on using the changeset viewer.