Changeset 522


Ignore:
Timestamp:
10/03/05 17:17:59 (15 years ago)
Author:
curtis
Message:

Finish tying in support for IPLab.

Location:
trunk/loci/visbio
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/visbio/data/DataManager.java

    r512 r522  
    442442    String s = "File formats"; 
    443443    hm.addHelpTopic(s, "formats.html"); 
     444    hm.addHelpTopic(s + "/TIFF stacks", "tiff.html"); 
     445    hm.addHelpTopic(s + "/Olympus Fluoview TIFF", "fluoview.html"); 
    444446    hm.addHelpTopic(s + "/Bio-Rad PIC", "biorad.html"); 
    445     hm.addHelpTopic(s + "/Olympus Fluoview TIFF", "fluoview.html"); 
     447    hm.addHelpTopic(s + "/IPLab", "iplab.html"); 
    446448    hm.addHelpTopic(s + "/Metamorph STK", "metamorph.html"); 
    447449    hm.addHelpTopic(s + "/Openlab LIFF", "openlab.html"); 
    448450    hm.addHelpTopic(s + "/QuickTime movies", "quicktime.html"); 
    449     hm.addHelpTopic(s + "/TIFF stacks", "tiff.html"); 
    450451    hm.addHelpTopic(s + "/Zeiss LSM", "zeiss_lsm.html"); 
    451452    hm.addHelpTopic(s + "/Zeiss ZVI (Axiovision)", "zeiss_zvi.html"); 
  • trunk/loci/visbio/data/ImageFamily.java

    r517 r522  
    7575    super("ImageFamily" + id++); 
    7676    list = new FormNode[] { 
     77      new BioRadForm(), // proprietary 
    7778      new IPLabForm(), // proprietary 
    7879      new ZVIForm(), // proprietary 
    79       new BioRadForm(), // proprietary 
    8080      new MetamorphForm(), // TIFF variant 
    8181      new ZeissForm(), // TIFF variant 
     
    305305        // compute format string 
    306306        if (list[ii] instanceof BioRadForm) format = "Bio-Rad PIC file"; 
     307        else if (list[ii] instanceof IPLabForm) format = "IPLab file"; 
     308        else if (list[ii] instanceof ZVIForm) format = "Zeiss ZVI file"; 
    307309        else if (list[ii] instanceof MetamorphForm) { 
    308310          format = "Metamorph STK file"; 
    309311        } 
    310         else if (list[ii] instanceof OpenlabForm) { 
    311           format = "Openlab LIFF file"; 
    312         } 
     312        else if (list[ii] instanceof ZeissForm) format = "Zeiss LSM file"; 
    313313        else if (list[ii] instanceof FluoviewTiffForm) { 
    314314          format = "Olympus Fluoview TIFF file"; 
    315315        } 
    316         else if (list[ii] instanceof ZeissForm) format = "Zeiss LSM file"; 
    317         else if (list[ii] instanceof ZVIForm) format = "Zeiss ZVI file"; 
    318316        else if (list[ii] instanceof TiffForm) format = "TIFF file"; 
     317        else if (list[ii] instanceof AVIForm) format = "AVI movie"; 
    319318        else if (list[ii] instanceof ImageJForm) { 
    320319          int ndx = id.lastIndexOf("."); 
     
    323322            String ext = id.substring(ndx + 1).toUpperCase(); 
    324323            if (ext.equals("JPG")) ext = "JPEG"; 
    325             format = ext + " image file"; 
     324            format = ext + " image"; 
    326325          } 
    327326        } 
    328         else if (list[ii] instanceof AVIForm) format = "AVI movie"; 
    329327        else if (list[ii] instanceof QTForm) format = "QuickTime movie"; 
    330         else format = "Unknown format"; 
     328        else if (list[ii] instanceof PictForm) format = "PICT image"; 
     329        else if (list[ii] instanceof OpenlabForm) { 
     330          format = "Openlab LIFF file"; 
     331        } 
     332        else format = "Unknown file"; 
    331333 
    332334        return; 
  • trunk/loci/visbio/help/fluoview.html

    r212 r522  
    11<html><body><h2>Olympus Fluoview TIFF</h2> 
    22 
    3 <p>VisBio supports reading Olympus Fluoview TIFF files (not including 
    4 metadata). Support is completely native, with no additional libraries required. 
     3<p>VisBio supports reading Olympus Fluoview TIFF files, including metadata. 
     4Support is completely native, with no additional libraries required. 
    55 
    66<br><h3>See also:</h3> 
  • trunk/loci/visbio/help/formats.html

    r469 r522  
    66 
    77<ul> 
     8  <li><a href="tiff.html">TIFF stacks</a></li> 
     9  <li><a href="fluoview.html">Olympus Fluoview TIFF</a></li> 
    810  <li><a href="biorad.html">Bio-Rad PIC</a></li> 
     11  <li><a href="iplab.html">IPLab</a></li> 
    912  <li><a href="metamorph.html">Metamorph STK</a></li> 
    10   <li><a href="fluoview.html">Olympus Fluoview TIFF</a></li> 
    1113  <li><a href="openlab.html">Openlab LIFF</a></li> 
    1214  <li><a href="quicktime.html">QuickTime movies</a></li> 
    13   <li><a href="tiff.html">TIFF stacks</a></li> 
    1415  <li><a href="zeiss_lsm.html">Zeiss LSM</a></li> 
    1516  <li><a href="zeiss_zvi.html">Zeiss ZVI (Axiovision)</a></li> 
     
    1819</ul> 
    1920 
    20 Not yet supported (but planned eventually) are Leica, Nikon, IPLab, Image-Pro, 
     21Not yet supported (but planned eventually) are Leica, Nikon, Image-Pro, 
    2122Gatan Digital Micrograph and OME-XML. Note that Leica and Nikon are generally 
    2223TIFF-compatible, meaning VisBio can import and visualize them, although there 
  • trunk/loci/visbio/help/zeiss_lsm.html

    r212 r522  
    11<html><body><h2>Zeiss LSM</h2> 
    22 
    3 <p>VisBio supports reading uncompressed and LZW-compressed Zeiss LSM files (not 
    4 including metadata). Support is completely native, with no additional libraries 
    5 required. 
     3<p>VisBio supports reading uncompressed and LZW-compressed Zeiss LSM files, 
     4including metadata. 
     5Support is completely native, with no additional libraries required. 
    66 
    77<br><h3>See also:</h3> 
  • trunk/loci/visbio/help/zeiss_zvi.html

    r212 r522  
    22 
    33<p>VisBio supports reading some types of Zeiss Axiovision (ZVI) files (not 
    4 including metadata). Support is completely native, with no additional libraries 
    5 required. 
     4including metadata). 
     5Support is completely native, with no additional libraries required. 
    66 
    77<p>ZVI support was added through trial and error (i.e., reverse engineering 
  • trunk/loci/visbio/util/SwingUtil.java

    r465 r522  
    196196    Vector filters = new Vector(); 
    197197 
     198    // TIFF - tiff/TiffForm, ij/ImageJForm 
     199    FileFilter tiff = new ExtensionFileFilter( 
     200      new String[] {"tif", "tiff"}, "Multi-page TIFF stacks"); 
     201    dialog.addChoosableFileFilter(tiff); 
     202    filters.add(tiff); 
     203 
    198204    // Bio-Rad PIC - bio/BioRadForm 
    199205    FileFilter biorad = new ExtensionFileFilter("pic", "Bio-Rad PIC files"); 
    200206    dialog.addChoosableFileFilter(biorad); 
    201207    filters.add(biorad); 
     208 
     209    // IPLab - bio/IPLabForm 
     210    FileFilter iplab = new ExtensionFileFilter("ipl", "IPLab files"); 
     211    dialog.addChoosableFileFilter(iplab); 
     212    filters.add(iplab); 
    202213 
    203214    // Metamorph STK - bio/MetamorphForm 
     
    212223    filters.add(openlab); 
    213224 
     225    // QuickTime - qt/QTForm 
     226    FileFilter qt = new ExtensionFileFilter("mov", "QuickTime movies"); 
     227    dialog.addChoosableFileFilter(qt); 
     228    filters.add(qt); 
     229 
    214230    // Zeiss LSM - bio/ZeissForm 
    215231    FileFilter lsm = new ExtensionFileFilter("lsm", "Zeiss LSM files"); 
     
    221237    dialog.addChoosableFileFilter(zvi); 
    222238    filters.add(zvi); 
    223  
    224     // TIFF - tiff/TiffForm, ij/ImageJForm 
    225     FileFilter tiff = new ExtensionFileFilter( 
    226       new String[] {"tif", "tiff"}, "Multi-page TIFF stacks"); 
    227     dialog.addChoosableFileFilter(tiff); 
    228     filters.add(tiff); 
    229  
    230     // QuickTime - qt/QTForm 
    231     FileFilter qt = new ExtensionFileFilter("mov", "QuickTime movies"); 
    232     dialog.addChoosableFileFilter(qt); 
    233     filters.add(qt); 
    234239 
    235240    // BMP - ij/ImageJForm 
Note: See TracChangeset for help on using the changeset viewer.