Changeset 6681


Ignore:
Timestamp:
07/09/10 10:04:47 (9 years ago)
Author:
melissa
Message:

Only populate Objective.NominalMagnification if the magnification is greater than 0.

Files:
2 edited

Legend:

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

    r6663 r6681  
    488488 
    489489      store.setObjectiveLensNA(new Double(lens), 0, 0); 
    490       store.setObjectiveNominalMagnification( 
     490      if ((int) magFactor > 0) { 
     491        store.setObjectiveNominalMagnification( 
    491492          new PositiveInteger((int) magFactor), 0, 0); 
     493      } 
    492494      store.setObjectiveCorrection(getCorrection("Other"), 0, 0); 
    493495      store.setObjectiveImmersion(getImmersion("Other"), 0, 0); 
  • trunk/components/bio-formats/src/loci/formats/in/BioRadReader.java

    r6655 r6681  
    488488 
    489489      store.setObjectiveLensNA(new Double(lens), 0, 0); 
    490       store.setObjectiveNominalMagnification( 
     490      if ((int) magFactor > 0) { 
     491        store.setObjectiveNominalMagnification( 
    491492          new PositiveInteger((int) magFactor), 0, 0); 
     493      } 
    492494      store.setObjectiveCorrection(getCorrection("Other"), 0, 0); 
    493495      store.setObjectiveImmersion(getImmersion("Other"), 0, 0); 
Note: See TracChangeset for help on using the changeset viewer.