Changeset 1187


Ignore:
Timestamp:
07/25/06 13:30:47 (14 years ago)
Author:
curtis
Message:

Whitespace.

File:
1 edited

Legend:

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

    r1154 r1187  
    407407 
    408408    store.setPixels(sizeX, sizeY, new Integer(numZ), new Integer(numW), 
    409         new Integer(numT), omePixel, new Boolean(!little), dimOrder, null); 
     409      new Integer(numT), omePixel, new Boolean(!little), dimOrder, null); 
    410410 
    411411    store.setDimensions( 
    412         (Float) metadata.get("X element length (in um)"),  
    413         (Float) metadata.get("Y element length (in um)"),  
    414         (Float) metadata.get("Z element length (in um)"),  
    415         null, null, null); 
    416      
     412      (Float) metadata.get("X element length (in um)"), 
     413      (Float) metadata.get("Y element length (in um)"), 
     414      (Float) metadata.get("Z element length (in um)"), 
     415      null, null, null); 
     416 
    417417    String description = (String) metadata.get("Title 1"); 
    418418    description = description.length() == 0? null : description; 
     
    424424      for (int t = 0; t < numT; t++) { 
    425425        for (int w = 0; w < numW; w++) { 
    426           extHdrFields[z][w][t] = new DVExtHdrFields(getTotalOffset(z,w,t), 
    427               numIntsPerSection, extHeader, little); 
    428            
    429           store.setPlaneInfo(z, w, t,  
    430               new Float(extHdrFields[z][w][t].getTimeStampSeconds()), 
    431               new Float(extHdrFields[z][w][t].getExpTime()), null); 
    432  
     426          extHdrFields[z][w][t] = new DVExtHdrFields(getTotalOffset(z, w, t), 
     427            numIntsPerSection, extHeader, little); 
     428 
     429          store.setPlaneInfo(z, w, t, 
     430            new Float(extHdrFields[z][w][t].getTimeStampSeconds()), 
     431            new Float(extHdrFields[z][w][t].getExpTime()), null); 
    433432        } 
    434433      } 
    435434    } 
    436      
    437     for (int w=0; w < numW; w++) 
    438     { 
    439         store.setLogicalChannel(w, "happypuppy",  
    440                 new Float(extHdrFields[0][w][0].getNdFilter()), 
    441                 (Integer) metadata.get("Wavelength " + (w+1) + " (in nm)"), 
    442                 new Integer((int) extHdrFields[0][w][0].getExFilter()), 
    443                 "Monochrome", "Wide-field", null); 
    444     } 
    445  
    446     store.setStageLabel("ome",  
    447             new Float(extHdrFields[0][0][0].getStageXCoord()),  
    448             new Float(extHdrFields[0][0][0].getStageYCoord()),  
    449             new Float(extHdrFields[0][0][0].getStageZCoord()), null); 
    450      
    451     if (numW > 0)  
    452       store.setChannelGlobalMinMax(0, new Double(wave1Min.floatValue()),  
    453                             new Double(wave1Max.floatValue()), null); 
    454     if (numW > 1)  
    455       store.setChannelGlobalMinMax(1, new Double(wave2Min.floatValue()),  
    456                             new Double(wave2Max.floatValue()), null); 
    457     if (numW > 2)  
    458       store.setChannelGlobalMinMax(2, new Double(wave3Min.floatValue()),  
    459                             new Double(wave3Max.floatValue()), null); 
    460     if (numW > 3)  
    461       store.setChannelGlobalMinMax(3, new Double(wave4Min.floatValue()),  
    462                             new Double(wave4Max.floatValue()), null); 
    463     if (numW > 4)  
    464       store.setChannelGlobalMinMax(4, new Double(wave5Min.floatValue()),  
    465                             new Double(wave5Max.floatValue()), null); 
    466  
    467     store.setDefaultDisplaySettings(null) 
    468     ; 
    469      
     435 
     436    for (int w=0; w<numW; w++) { 
     437      store.setLogicalChannel(w, "happypuppy", 
     438        new Float(extHdrFields[0][w][0].getNdFilter()), 
     439        (Integer) metadata.get("Wavelength " + (w+1) + " (in nm)"), 
     440        new Integer((int) extHdrFields[0][w][0].getExFilter()), 
     441        "Monochrome", "Wide-field", null); 
     442    } 
     443 
     444    store.setStageLabel("ome", 
     445      new Float(extHdrFields[0][0][0].getStageXCoord()), 
     446      new Float(extHdrFields[0][0][0].getStageYCoord()), 
     447      new Float(extHdrFields[0][0][0].getStageZCoord()), null); 
     448 
     449    if (numW > 0) { 
     450      store.setChannelGlobalMinMax(0, new Double(wave1Min.floatValue()), 
     451        new Double(wave1Max.floatValue()), null); 
     452    } 
     453    if (numW > 1) { 
     454      store.setChannelGlobalMinMax(1, new Double(wave2Min.floatValue()), 
     455        new Double(wave2Max.floatValue()), null); 
     456    } 
     457    if (numW > 2) { 
     458      store.setChannelGlobalMinMax(2, new Double(wave3Min.floatValue()), 
     459        new Double(wave3Max.floatValue()), null); 
     460    } 
     461    if (numW > 3) { 
     462      store.setChannelGlobalMinMax(3, new Double(wave4Min.floatValue()), 
     463        new Double(wave4Max.floatValue()), null); 
     464    } 
     465    if (numW > 4) { 
     466      store.setChannelGlobalMinMax(4, new Double(wave5Min.floatValue()), 
     467       new Double(wave5Max.floatValue()), null); 
     468    } 
     469 
     470    store.setDefaultDisplaySettings(null); 
    470471  } 
    471472 
Note: See TracChangeset for help on using the changeset viewer.