Changeset 4731


Ignore:
Timestamp:
01/06/09 13:15:14 (11 years ago)
Author:
melissa
Message:

Minor metadata updates.

Location:
trunk/components/bio-formats/src/loci/formats/in
Files:
3 edited

Legend:

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

    r4669 r4731  
    509509          store.setDetectorSettingsGain(new Float(value), 0, 0); 
    510510        } 
    511         //else if (key.equals("Speed")) { } 
     511        else if (key.equals("Speed")) { 
     512          value = value.replaceAll("KHz", ""); 
     513          float mhz = Float.parseFloat(value) / 1000; 
     514          store.setDetectorSettingsReadOutRate(new Float(mhz), 0, 0); 
     515        } 
    512516        else if (key.equals("Temp Setting")) { 
    513517          value = value.replaceAll("C", "").trim(); 
  • trunk/components/bio-formats/src/loci/formats/in/FV1000Reader.java

    r4691 r4731  
    990990      store.setLightSourceID("LightSource:" + i, 0, i); 
    991991      store.setLightSourceSettingsLightSource("LightSource:" + i, 0, i); 
     992      if (i < exWaves.size()) { 
     993        store.setLightSourceSettingsWavelength((Integer) exWaves.get(i), 0, i); 
     994      } 
    992995    } 
    993996 
  • trunk/components/bio-formats/src/loci/formats/in/MicromanagerReader.java

    r4727 r4731  
    6767  private Vector voltage; 
    6868  private String cameraRef; 
     69  private String cameraMode; 
    6970 
    7071  // -- Constructor -- 
     
    318319            temperature = Float.parseFloat(value); 
    319320          } 
     321          else if (key.equals(cameraRef + "-CCDMode")) { 
     322            cameraMode = value; 
     323          } 
    320324          else if (key.startsWith("DAC-") && key.endsWith("-Volts")) { 
    321325            voltage.add(new Float(value)); 
     
    437441    store.setDetectorModel(detectorModel, 0, 0); 
    438442    store.setDetectorManufacturer(detectorManufacturer, 0, 0); 
     443    store.setDetectorType(cameraMode, 0, 0); 
    439444 
    440445    store.setImagingEnvironmentTemperature(new Float(temperature), 0); 
Note: See TracChangeset for help on using the changeset viewer.