Changeset 2415


Ignore:
Timestamp:
03/08/07 10:42:04 (13 years ago)
Author:
melissa
Message:

Populate more MetadataStore fields.

Location:
trunk/loci/formats/in
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/in/ND2Reader.java

    r2390 r2415  
    584584      store.setLogicalChannel(i, null, null, null, null, null, null, null); 
    585585    } 
     586   
     587    String prefix = "MetadataSeq _SEQUENCE_INDEX=\"0\" "; 
     588 
     589    String gain = (String) getMeta(prefix + "dGain value"); 
     590    String voltage = (String) getMeta(prefix + "dLampVoltage value"); 
     591    String mag = (String) getMeta(prefix + "dObjectiveMag value"); 
     592    String na = (String) getMeta(prefix + "dObjectiveNA value"); 
     593   
     594    store.setDetector(null, null, null, null,  
     595      gain == null ? null : new Float(gain),  
     596      voltage == null ? null : new Float(voltage), null, null, null); 
     597    store.setObjective(null, null, null, na == null ? null : new Float(na),   
     598      mag == null ? null : new Float(mag), null, null); 
    586599  } 
    587600 
  • trunk/loci/formats/in/OIBReader.java

    r2383 r2415  
    388388      } 
    389389 
    390       //if (zSize[0] == 0) zSize[0]++; 
    391       //if (tSize[0] == 0) tSize[0]++; 
    392  
    393390      pixelType = new int[numSeries]; 
    394391      currentOrder = new String[numSeries]; 
     
    514511      } 
    515512 
     513      String acquisition = "[Acquisition Parameters Common] - "; 
     514      store.setImage(null, (String) getMeta(acquisition + "ImageCaputreDate"),  
     515        null, null); 
     516 
    516517      store.setPixels( 
    517518        new Integer(sizeX[i]), 
     
    534535        store.setLogicalChannel(j, null, null, null, null, null, 
    535536          null, new Integer(i)); 
    536       } 
     537       
     538        String prefix = "[Channel " + (j + 1) + " Parameters] - "; 
     539        String gain = (String) getMeta(prefix + "AnalogPMTGain"); 
     540        String offset = (String) getMeta(prefix + "AnalogPMTOffset"); 
     541        String voltage = (String) getMeta(prefix + "AnalogPMTVoltage"); 
     542 
     543        store.setDetector(null, null, null, null,  
     544          gain == null ? null : new Float(gain),  
     545          voltage == null ? null : new Float(voltage),  
     546          offset == null ? null : new Float(offset), null, new Integer(j));  
     547      } 
     548 
     549      String laserCount = (String) getMeta(acquisition + "Number of use Laser"); 
     550      int numLasers = laserCount == null ? 0 : Integer.parseInt(laserCount); 
     551 
     552      for (int j=0; j<numLasers; j++) { 
     553        String wave =  
     554          (String) getMeta(acquisition + "LaserWavelength0" + (j + 1)); 
     555        if (wave == null) wave = "0";  
     556        store.setLaser(null, null, new Integer(wave), null, null, null, null, 
     557          null, null, null, new Integer(j)); 
     558      } 
     559 
    537560    } 
    538561  } 
  • trunk/loci/formats/in/PrairieReader.java

    r2377 r2415  
    352352          store.setLogicalChannel(i, null, null, null, null, null, null, null); 
    353353        } 
     354       
     355        String date = (String) getMeta(" PVScan date"); 
     356        
     357        store.setImage(null, date, null, null); 
     358         
     359        String laserPower = (String) getMeta("laserPower_0"); 
     360         
     361        store.setLaser(null, null, null, null, null, null,  
     362          laserPower == null ? null : new Float(laserPower),  
     363          null, null, null, null);  
     364         
     365        for (int i=0; i<4; i++) { 
     366          String gain = (String) getMeta("pmtGain_" + i); 
     367          String offset = (String) getMeta("pmtOffset_" + i); 
     368          store.setDetector(null, null, null, null,  
     369            gain == null ? null : new Float(gain), null,  
     370            offset == null ? null : new Float(offset), null, new Integer(i));  
     371        } 
     372    
     373        String zoom = (String) getMeta("opticalZoom"); 
     374        if (zoom != null) { 
     375          store.setDisplayOptions(new Float(zoom), new Boolean(sizeC[0] > 1), 
     376            new Boolean(sizeC[0] > 1), new Boolean(sizeC[0] > 2), Boolean.FALSE, 
     377            null, null, null, null, null, null, null, null, null, null, null); 
     378        } 
    354379      } 
    355380 
Note: See TracChangeset for help on using the changeset viewer.