Changeset 3394


Ignore:
Timestamp:
11/21/07 13:16:33 (12 years ago)
Author:
melissa
Message:

Formats that don't support multiple series now set the Image name to null, instead of using the file name. This was changed to be consistent with the behaviour of formats that do support multiple series.

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

Legend:

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

    r3389 r3394  
    477477    MetadataStore store = getMetadataStore(); 
    478478 
    479     store.setImage(currentId, null, null, null); 
     479    store.setImage(null, null, null, null); 
    480480 
    481481    FormatTools.populatePixels(store, this); 
  • trunk/loci/formats/in/AliconaReader.java

    r3354 r3394  
    157157    MetadataStore store = getMetadataStore(); 
    158158 
    159     store.setImage(currentId, null, null, null); 
     159    store.setImage(null, null, null, null); 
    160160 
    161161    FormatTools.populatePixels(store, this); 
  • trunk/loci/formats/in/BMPReader.java

    r3354 r3394  
    254254    MetadataStore store = getMetadataStore(); 
    255255 
    256     store.setImage(currentId, null, null, null); 
     256    store.setImage(null, null, null, null); 
    257257 
    258258    FormatTools.populatePixels(store, this); 
  • trunk/loci/formats/in/BaseTiffReader.java

    r3392 r3394  
    637637      // populate Image element 
    638638 
    639       store.setImage(getImageName(), 
    640         creationDate, getImageDescription(), null); 
     639      store.setImage(null, creationDate, getImageDescription(), null); 
    641640 
    642641      // populate Logical Channel elements 
  • trunk/loci/formats/in/BioRadReader.java

    r3342 r3394  
    768768 
    769769    // populate Image element 
    770     store.setImage(name, null, null, null); 
     770    store.setImage(null, null, null, null); 
    771771 
    772772    // populate Pixels element 
  • trunk/loci/formats/in/DeltavisionReader.java

    r3354 r3394  
    344344    if (title == null) title = ""; 
    345345    title = title.length() == 0 ? null : title; 
    346     store.setImage(id, null, title, null); 
     346    store.setImage(null, null, title, null); 
    347347 
    348348    // Run through every timeslice, for each wavelength, for each z section 
  • trunk/loci/formats/in/DicomReader.java

    r3369 r3394  
    409409    if (stamp == null || stamp.trim().equals("")) stamp = null; 
    410410 
    411     store.setImage(currentId, stamp, (String) getMeta("Image Type"), null); 
     411    store.setImage(null, stamp, (String) getMeta("Image Type"), null); 
    412412 
    413413    store.setInstrument( 
  • trunk/loci/formats/in/EPSReader.java

    r3354 r3394  
    196196 
    197197      MetadataStore store = getMetadataStore(); 
    198       store.setImage(currentId, null, null, null); 
     198      store.setImage(null, null, null, null); 
    199199 
    200200      FormatTools.populatePixels(store, this); 
  • trunk/loci/formats/in/FitsReader.java

    r3354 r3394  
    144144    MetadataStore store = getMetadataStore(); 
    145145 
    146     store.setImage(currentId, null, null, null); 
     146    store.setImage(null, null, null, null); 
    147147    FormatTools.populatePixels(store, this); 
    148148 
  • trunk/loci/formats/in/GIFReader.java

    r3354 r3394  
    336336 
    337337    MetadataStore store = getMetadataStore(); 
    338     store.setImage(currentId, null, null, null); 
     338    store.setImage(null, null, null, null); 
    339339 
    340340    core.pixelType[0] = FormatTools.UINT8; 
  • trunk/loci/formats/in/GatanReader.java

    r3354 r3394  
    158158    // The metadata store we're working with. 
    159159    MetadataStore store = getMetadataStore(); 
    160     store.setImage(currentId, null, null, null); 
     160    store.setImage(null, null, null, null); 
    161161 
    162162    FormatTools.populatePixels(store, this); 
  • trunk/loci/formats/in/ICSReader.java

    r3354 r3394  
    373373    MetadataStore store = getMetadataStore(); 
    374374 
    375     String fname = (String) getMeta("filename"); 
    376     if (fname == null) fname = currentId; 
    377     store.setImage(fname, null, null, null); 
     375    store.setImage(null, null, null, null); 
    378376 
    379377    // populate Pixels element 
  • trunk/loci/formats/in/IPLabReader.java

    r3354 r3394  
    185185    // The metadata store we're working with. 
    186186    MetadataStore store = getMetadataStore(); 
    187     store.setImage(currentId, null, null, null); 
     187    store.setImage(null, null, null, null); 
    188188    FormatTools.populatePixels(store, this); 
    189189 
  • trunk/loci/formats/in/IPWReader.java

    r3372 r3394  
    332332 
    333333    FormatTools.populatePixels(store, this); 
    334     store.setImage(currentId, null, (String) getMeta("Version"), null); 
     334    store.setImage(null, null, (String) getMeta("Version"), null); 
    335335    for (int i=0; i<core.sizeC[0]; i++) { 
    336336      store.setLogicalChannel(i, null, null, null, null, null, null, null, null, 
  • trunk/loci/formats/in/ImageIOReader.java

    r3354 r3394  
    122122    // populate the metadata store 
    123123    MetadataStore store = getMetadataStore(); 
    124     store.setImage(currentId, null, null, null); 
     124    store.setImage(null, null, null, null); 
    125125    FormatTools.populatePixels(store, this); 
    126126    for (int i=0; i<core.sizeC[0]; i++) { 
  • trunk/loci/formats/in/ImarisReader.java

    r3354 r3394  
    173173    core.pixelType[0] = FormatTools.UINT8; 
    174174 
    175     store.setImage(currentId, null, null, null); 
     175    store.setImage(null, null, null, null); 
    176176    FormatTools.populatePixels(store, this); 
    177177 
  • trunk/loci/formats/in/KhorosReader.java

    r3354 r3394  
    179179 
    180180    MetadataStore store = getMetadataStore(); 
    181     store.setImage(currentId, null, null, null); 
     181    store.setImage(null, null, null, null); 
    182182    FormatTools.populatePixels(store, this); 
    183183 
  • trunk/loci/formats/in/LIFReader.java

    r3336 r3394  
    467467        seriesName = "Series " + (i + 1); 
    468468      } 
    469       store.setImage(seriesName, null, null, ii); 
     469      store.setImage(null, null, null, ii); 
    470470 
    471471      FormatTools.populatePixels(store, this); 
  • trunk/loci/formats/in/LIMReader.java

    r3354 r3394  
    140140    MetadataStore store = getMetadataStore(); 
    141141    FormatTools.populatePixels(store, this); 
    142     store.setImage(currentId, null, null, null); 
     142    store.setImage(null, null, null, null); 
    143143    for (int i=0; i<core.sizeC[0]; i++) { 
    144144      store.setLogicalChannel(i, null, null, null, null, null, null, null, 
  • trunk/loci/formats/in/LegacyPictReader.java

    r3204 r3394  
    111111 
    112112    MetadataStore store = getMetadataStore(); 
    113     store.setImage(currentId, null, null, null); 
     113    store.setImage(null, null, null, null); 
    114114    FormatTools.populatePixels(store, this); 
    115115 
  • trunk/loci/formats/in/LegacyQTReader.java

    r3354 r3394  
    227227 
    228228      MetadataStore store = getMetadataStore(); 
    229       store.setImage(currentId, null, null, null); 
     229      store.setImage(null, null, null, null); 
    230230      FormatTools.populatePixels(store, this); 
    231231 
  • trunk/loci/formats/in/LegacyZVIReader.java

    r3354 r3394  
    404404 
    405405      MetadataStore store = getMetadataStore(); 
    406       store.setImage(currentId, null, null, null); 
     406      store.setImage(null, null, null, null); 
    407407 
    408408      FormatTools.populatePixels(store, this); 
  • trunk/loci/formats/in/MNGReader.java

    r3354 r3394  
    187187 
    188188    MetadataStore store = getMetadataStore(); 
    189     store.setImage(currentId, null, null, null); 
     189    store.setImage(null, null, null, null); 
    190190 
    191191    FormatTools.populatePixels(store, this); 
  • trunk/loci/formats/in/MRCReader.java

    r3354 r3394  
    219219 
    220220    MetadataStore store = getMetadataStore(); 
    221     store.setImage(currentId, null, null, null); 
     221    store.setImage(null, null, null, null); 
    222222    FormatTools.populatePixels(store, this); 
    223223 
  • trunk/loci/formats/in/MicromanagerReader.java

    r3197 r3394  
    227227 
    228228    MetadataStore store = getMetadataStore(); 
    229     store.setImage(currentId, null, null, null); 
     229    store.setImage(null, null, null, null); 
    230230 
    231231    FormatTools.populatePixels(store, this); 
  • trunk/loci/formats/in/ND2Reader.java

    r3392 r3394  
    484484 
    485485      MetadataStore store = getMetadataStore(); 
    486       store.setImage(currentId, null, null, null); 
     486      store.setImage(null, null, null, null); 
    487487      FormatTools.populatePixels(store, this); 
    488488      for (int i=0; i<core.sizeC.length; i++) { 
  • trunk/loci/formats/in/OIFReader.java

    r3354 r3394  
    356356    // The metadata store we're working with. 
    357357    MetadataStore store = getMetadataStore(); 
    358     store.setImage(currentId, null, null, null); 
     358    store.setImage(null, null, null, null); 
    359359 
    360360    switch (imageDepth) { 
  • trunk/loci/formats/in/OpenlabRawReader.java

    r3354 r3394  
    183183    } 
    184184 
    185     store.setImage((String) getMeta("Image name"), 
     185    store.setImage(null, 
    186186      timestamp == null ? null : sdf.format(timestamp), null, null); 
    187187    FormatTools.populatePixels(store, this); 
  • trunk/loci/formats/in/PCIReader.java

    r3392 r3394  
    186186      MetadataStore store = getMetadataStore(); 
    187187      FormatTools.populatePixels(store, this); 
    188       store.setImage(currentId, null, null, null); 
     188      store.setImage(null, null, null, null); 
    189189      for (int i=0; i<core.sizeC[0]; i++) { 
    190190        store.setLogicalChannel(i, null, null, null, null, null, null, null, 
  • trunk/loci/formats/in/PGMReader.java

    r3354 r3394  
    147147 
    148148    MetadataStore store = getMetadataStore(); 
    149     store.setImage(currentId, null, null, null); 
     149    store.setImage(null, null, null, null); 
    150150    FormatTools.populatePixels(store, this); 
    151151 
  • trunk/loci/formats/in/PSDReader.java

    r3354 r3394  
    259259    MetadataStore store = getMetadataStore(); 
    260260    FormatTools.populatePixels(store, this); 
    261     store.setImage(currentId, null, null, null); 
     261    store.setImage(null, null, null, null); 
    262262    for (int i=0; i<core.sizeC[0]; i++) { 
    263263      store.setLogicalChannel(i, null, null, null, null, null, null, null, null, 
  • trunk/loci/formats/in/PerkinElmerReader.java

    r3354 r3394  
    610610      time = fmt.format(date); 
    611611    } 
    612     store.setImage(currentId, time, null, null); 
     612    store.setImage(null, time, null, null); 
    613613 
    614614    // populate Pixels element 
  • trunk/loci/formats/in/PictReader.java

    r3392 r3394  
    333333    // The metadata store we're working with. 
    334334    MetadataStore store = getMetadataStore(); 
    335     store.setImage(currentId, null, null, null); 
     335    store.setImage(null, null, null, null); 
    336336 
    337337    core.pixelType[0] = ImageTools.getPixelType(openImage(0)); 
  • trunk/loci/formats/in/PrairieReader.java

    r3354 r3394  
    362362          date = fmt.format(d); 
    363363        } 
    364         store.setImage(currentId, date, null, null); 
     364        store.setImage(null, date, null, null); 
    365365 
    366366        String laserPower = (String) getMeta("laserPower_0"); 
  • trunk/loci/formats/in/QTReader.java

    r3369 r3394  
    353353    // The metadata store we're working with. 
    354354    MetadataStore store = getMetadataStore(); 
    355     store.setImage(currentId, null, null, null); 
     355    store.setImage(null, null, null, null); 
    356356 
    357357    FormatTools.populatePixels(store, this); 
  • trunk/loci/formats/in/SDTReader.java

    r3354 r3394  
    206206 
    207207    MetadataStore store = getMetadataStore(); 
    208     store.setImage(currentId, null, null, null); 
     208    store.setImage(null, null, null, null); 
    209209    FormatTools.populatePixels(store, this); 
    210210    for (int i=0; i<core.sizeC[0]; i++) { 
  • trunk/loci/formats/in/VisitechReader.java

    r3354 r3394  
    203203 
    204204    MetadataStore store = getMetadataStore(); 
    205     store.setImage(currentId, null, null, null); 
     205    store.setImage(null, null, null, null); 
    206206    FormatTools.populatePixels(store, this); 
    207207 
  • trunk/loci/formats/in/ZeissZVIReader.java

    r3377 r3394  
    410410    MetadataStore store = getMetadataStore(); 
    411411 
    412     String fname = (String) getMeta("Title"); 
    413     if (fname == null) fname = currentId; 
    414     store.setImage(fname, null, null, null); 
     412    store.setImage(null, null, null, null); 
    415413 
    416414    if (bpp == 1 || bpp == 3) core.pixelType[0] = FormatTools.UINT8; 
Note: See TracChangeset for help on using the changeset viewer.