Changeset 4752


Ignore:
Timestamp:
01/20/09 15:39:55 (11 years ago)
Author:
melissa
Message:

Fixed Objective IDs.

File:
1 edited

Legend:

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

    r4750 r4752  
    277277    store.setImageInstrumentRef("Instrument:0", 0); 
    278278 
    279     store.setObjectiveID(String.valueOf(lensID), 0, 0); 
    280     store.setObjectiveSettingsObjective(String.valueOf(lensID), 0); 
     279    String objectiveID = "Objective:" + String.valueOf(lensID); 
     280    store.setObjectiveID(objectiveID, 0, 0); 
     281    store.setObjectiveSettingsObjective(objectiveID, 0); 
     282    store.setObjectiveCorrection("Unknown", 0, 0); 
     283    store.setObjectiveImmersion("Unknown", 0, 0); 
    281284 
    282285    in.skipBytes(4); 
     
    474477            // TODO:  Token #2 is the microscope model name. 
    475478            if (tokens.length > 3) store.setObjectiveModel(tokens[3], 0, 0); 
    476             store.setObjectiveImmersion("Unknown", 0, 0); 
    477479          } 
    478480        } 
    479481        else if (key.equals("Lens ID")) { 
    480           store.setObjectiveID(value, 0, 0); 
    481           store.setObjectiveSettingsObjective(value, 0); 
     482          store.setObjectiveID("Objective:" + value, 0, 0); 
     483          store.setObjectiveSettingsObjective("Objective:" + value, 0); 
    482484        } 
    483485        //else if (key.equals("Aux Magn")) { } 
Note: See TracChangeset for help on using the changeset viewer.