Changeset 4754


Ignore:
Timestamp:
01/20/09 17:27:04 (11 years ago)
Author:
melissa
Message:

Better Objective population.

File:
1 edited

Legend:

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

    r4750 r4754  
    425425      new FilterMetadata(getMetadataStore(), isMetadataFiltered()); 
    426426 
     427    store.setImageDescription(comment, 0); 
     428 
    427429    // link Instrument and Image 
    428430    store.setInstrumentID("Instrument:0", 0); 
     
    477479    else if (mag == null) mag = "1"; 
    478480 
    479     if (objManu != null) store.setObjectiveManufacturer(objManu, 0, 0); 
     481    store.setObjectiveCorrection("Unknown", 0, 0); 
     482    store.setObjectiveImmersion("Unknown", 0, 0); 
     483 
     484    if (objManu != null) { 
     485      String[] objectiveData = objManu.split(" "); 
     486      store.setObjectiveModel(objectiveData[0], 0, 0); 
     487      if (objectiveData.length > 2) { 
     488        store.setObjectiveImmersion(objectiveData[2], 0, 0); 
     489      } 
     490    } 
     491 
    480492    if (mag != null) { 
    481493      store.setObjectiveCalibratedMagnification(new Float(mag), 0, 0); 
     
    487499      } 
    488500    } 
    489     store.setObjectiveCorrection("Unknown", 0, 0); 
    490     store.setObjectiveImmersion("Unknown", 0, 0); 
    491501 
    492502    // link Objective to Image using ObjectiveSettings 
Note: See TracChangeset for help on using the changeset viewer.