Changeset 5734


Ignore:
Timestamp:
12/11/09 09:38:31 (10 years ago)
Author:
melissa
Message:

Fixed AIOOB and a few OME-XML validation problems.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/bio-formats/src/loci/formats/in/LeicaHandler.java

    r5729 r5734  
    488488      if (attribute.equals("NumericalAperture")) { 
    489489        store.setObjectiveLensNA(new Double(variant), numDatasets, 0); 
     490        store.setObjectiveCorrection("Unknown", numDatasets, 0); 
     491        store.setObjectiveImmersion("Unknown", numDatasets, 0); 
    490492      } 
    491493      else if (attribute.equals("OrderNumber")) { 
    492494        store.setObjectiveSerialNumber(variant, numDatasets, 0); 
     495        store.setObjectiveCorrection("Unknown", numDatasets, 0); 
     496        store.setObjectiveImmersion("Unknown", numDatasets, 0); 
    493497      } 
    494498      else if (objectClass.equals("CDetectionUnit")) { 
     
    534538        } 
    535539 
     540        String immersion = "Unknown"; 
    536541        if (tokens.hasMoreTokens()) { 
    537           String immersion = tokens.nextToken(); 
     542          immersion = tokens.nextToken(); 
    538543          if (immersion == null || immersion.trim().equals("")) { 
    539544            immersion = "Unknown"; 
    540545          } 
    541           store.setObjectiveImmersion(immersion, numDatasets, 0); 
    542         } 
     546        } 
     547        store.setObjectiveImmersion(immersion, numDatasets, 0); 
     548 
     549        String correction = "Unknown"; 
    543550        if (tokens.hasMoreTokens()) { 
    544           String correction = tokens.nextToken(); 
     551          correction = tokens.nextToken(); 
    545552          if (correction == null || correction.trim().equals("")) { 
    546553            correction = "Unknown"; 
    547554          } 
    548           store.setObjectiveCorrection(correction, numDatasets, 0); 
    549         } 
     555        } 
     556        store.setObjectiveCorrection("Unknown", numDatasets, 0); 
    550557 
    551558        store.setObjectiveModel(model.toString().trim(), numDatasets, 0); 
     
    706713      if (l.intensity > 0) lasers.add(l); 
    707714    } 
    708     else if (qName.equals("TimeStamp")) { 
     715    else if (qName.equals("TimeStamp") && numDatasets >= 0) { 
    709716      long high = Long.parseLong(attributes.getValue("HighInteger")); 
    710717      long low = Long.parseLong(attributes.getValue("LowInteger")); 
Note: See TracChangeset for help on using the changeset viewer.