Changeset 6483


Ignore:
Timestamp:
06/04/10 09:58:17 (10 years ago)
Author:
melissa
Message:

Populate Laser.Model, if present. See  omero:2475.

Files:
2 edited

Legend:

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

    r6376 r6483  
    942942      if (laser.type != null) { 
    943943        store.setLaserType(getLaserType(laser.type), series, nextLaser); 
     944      } 
     945      if (laser.model != null) { 
     946        store.setLaserModel(laser.model, series, nextLaser); 
    944947      } 
    945948      String lightSourceID = 
     
    17251728 
    17261729  class Laser extends SubBlock { 
    1727     public String medium, type; 
     1730    public String medium, type, model; 
    17281731    public Double power; 
    17291732 
    17301733    protected void read() throws IOException { 
    17311734      super.read(); 
     1735      model = getStringValue(LASER_NAME); 
    17321736      type = getStringValue(LASER_NAME); 
    17331737      if (type == null) type = ""; 
  • trunk/components/bio-formats/src/loci/formats/in/ZeissLSMReader.java

    r6377 r6483  
    942942      if (laser.type != null) { 
    943943        store.setLaserType(getLaserType(laser.type), series, nextLaser); 
     944      } 
     945      if (laser.model != null) { 
     946        store.setLaserModel(laser.model, series, nextLaser); 
    944947      } 
    945948      String lightSourceID = 
     
    17251728 
    17261729  class Laser extends SubBlock { 
    1727     public String medium, type; 
     1730    public String medium, type, model; 
    17281731    public Double power; 
    17291732 
    17301733    protected void read() throws IOException { 
    17311734      super.read(); 
     1735      model = getStringValue(LASER_NAME); 
    17321736      type = getStringValue(LASER_NAME); 
    17331737      if (type == null) type = ""; 
Note: See TracChangeset for help on using the changeset viewer.