Changeset 2010


Ignore:
Timestamp:
01/04/07 10:02:14 (13 years ago)
Author:
melissa
Message:
  • Tweaked OIB and OIF metadata parsing so that the output looks the same.
  • Changed my email address in relevant files.
Location:
trunk/loci
Files:
55 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/Compression.java

    r1688 r2010  
    3636 * @author Curtis Rueden ctrueden at wisc.edu 
    3737 * @author Eric Kjellman egkjellman at wisc.edu 
    38  * @author Melissa Linkert linkert at cs.wisc.edu 
     38 * @author Melissa Linkert linkert at wisc.edu 
    3939 */ 
    4040public final class Compression { 
  • trunk/loci/formats/OMEXMLMetadataStore.java

    r1990 r2010  
    4242 * 
    4343 * @author Curtis Rueden ctrueden at wisc.edu 
    44  * @author Melissa Linkert linkert at cs.wisc.edu 
     44 * @author Melissa Linkert linkert at wisc.edu 
    4545 */ 
    4646public class OMEXMLMetadataStore implements MetadataStore { 
  • trunk/loci/formats/RandomAccessStream.java

    r1814 r2010  
    3232 * byte arrays. 
    3333 * 
    34  * @author Melissa Linkert, linkert at cs.wisc.edu 
     34 * @author Melissa Linkert, linkert at wisc.edu 
    3535 */ 
    3636public class RandomAccessStream extends InputStream implements DataInput { 
  • trunk/loci/formats/TiffTools.java

    r2001 r2010  
    3838 * @author Curtis Rueden ctrueden at wisc.edu 
    3939 * @author Eric Kjellman egkjellman at wisc.edu 
    40  * @author Melissa Linkert linkert at cs.wisc.edu 
     40 * @author Melissa Linkert linkert at wisc.edu 
    4141 * @author Chris Allan callan at blackcat.ca 
    4242 */ 
  • trunk/loci/formats/in/AndorReader.java

    r1947 r2010  
    3333 * Andor Bio-imaging Division (ABD) TIFF files. 
    3434 * 
    35  * @author Melissa Linkert linkert at cs.wisc.edu 
     35 * @author Melissa Linkert linkert at wisc.edu 
    3636 */ 
    3737public class AndorReader extends BaseTiffReader { 
  • trunk/loci/formats/in/BMPReader.java

    r1958 r2010  
    3434 * description of the BMP file format. 
    3535 * 
    36  * @author Melissa Linkert linkert at cs.wisc.edu 
     36 * @author Melissa Linkert linkert at wisc.edu 
    3737 */ 
    3838public class BMPReader extends FormatReader { 
  • trunk/loci/formats/in/BaseTiffReader.java

    r1988 r2010  
    3737 * 
    3838 * @author Curtis Rueden ctrueden at wisc.edu 
    39  * @author Melissa Linkert linkert at cs.wisc.edu 
     39 * @author Melissa Linkert linkert at wisc.edu 
    4040 */ 
    4141public abstract class BaseTiffReader extends FormatReader { 
  • trunk/loci/formats/in/BioRadReader.java

    r1947 r2010  
    3535 * 
    3636 * @author Curtis Rueden ctrueden at wisc.edu 
    37  * @author Melissa Linkert linkert at cs.wisc.edu 
     37 * @author Melissa Linkert linkert at wisc.edu 
    3838 */ 
    3939 
  • trunk/loci/formats/in/DeltavisionReader.java

    r1947 r2010  
    3232 * DeltavisionReader is the file format reader for Deltavision files. 
    3333 * 
    34  * @author Melissa Linkert linkert at cs.wisc.edu 
     34 * @author Melissa Linkert linkert at wisc.edu 
    3535 */ 
    3636public class DeltavisionReader extends FormatReader { 
  • trunk/loci/formats/in/EPSReader.java

    r1947 r2010  
    3434 * Some regular PostScript files are also supported. 
    3535 * 
    36  * @author Melissa Linkert linkert at cs.wisc.edu 
     36 * @author Melissa Linkert linkert at wisc.edu 
    3737 */ 
    3838public class EPSReader extends FormatReader { 
  • trunk/loci/formats/in/FluoviewReader.java

    r1826 r2010  
    3535 * 
    3636 * @author Eric Kjellman egkjellman at wisc.edu 
    37  * @author Melissa Linkert linkert at cs.wisc.edu 
     37 * @author Melissa Linkert linkert at wisc.edu 
    3838 * @author Curtis Rueden ctrueden at wisc.edu 
    3939 */ 
  • trunk/loci/formats/in/GatanReader.java

    r1947 r2010  
    3232 * GatanReader is the file format reader for Gatan files. 
    3333 * 
    34  * @author Melissa Linkert linkert at cs.wisc.edu 
     34 * @author Melissa Linkert linkert at wisc.edu 
    3535 */ 
    3636public class GatanReader extends FormatReader { 
  • trunk/loci/formats/in/GelReader.java

    r1759 r2010  
    3232 * Molecular Dynamics GEL TIFF files. 
    3333 * 
    34  * @author Melissa Linkert linkert at cs.wisc.edu 
     34 * @author Melissa Linkert linkert at wisc.edu 
    3535 */ 
    3636public class GelReader extends BaseTiffReader { 
  • trunk/loci/formats/in/ICSReader.java

    r1959 r2010  
    3636 * files. More information on ICS can be found at http://libics.sourceforge.net 
    3737 * 
    38  * @author Melissa Linkert linkert at cs.wisc.edu 
     38 * @author Melissa Linkert linkert at wisc.edu 
    3939 */ 
    4040 
  • trunk/loci/formats/in/IPLabReader.java

    r1947 r2010  
    3232 * IPLabReader is the file format reader for IPLab (.IPL) files. 
    3333 * 
    34  * @author Melissa Linkert linkert at cs.wisc.edu 
     34 * @author Melissa Linkert linkert at wisc.edu 
    3535 * @author Curtis Rueden ctrueden at wisc.edu 
    3636 */ 
  • trunk/loci/formats/in/IPWReader.java

    r1947 r2010  
    3535 * IPWReader is the file format reader for Image-Pro Workspace (IPW) files. 
    3636 * 
    37  * @author Melissa Linkert linkert at cs.wisc.edu 
     37 * @author Melissa Linkert linkert at wisc.edu 
    3838 */ 
    3939public class IPWReader extends BaseTiffReader { 
  • trunk/loci/formats/in/ImarisReader.java

    r1947 r2010  
    3434 * http://flash.bitplane.com/support/faqs/faqsview.cfm?inCat=6&inQuestionID=104 
    3535 * 
    36  * @author Melissa Linkert linkert at cs.wisc.edu 
     36 * @author Melissa Linkert linkert at wisc.edu 
    3737 */ 
    3838public class ImarisReader extends FormatReader { 
  • trunk/loci/formats/in/ImarisTiffReader.java

    r1947 r2010  
    3333 * Imaris 5 files (TIFF variant). 
    3434 * 
    35  * @author Melissa Linkert linkert at cs.wisc.edu 
     35 * @author Melissa Linkert linkert at wisc.edu 
    3636 */ 
    3737public class ImarisTiffReader extends BaseTiffReader { 
  • trunk/loci/formats/in/LIFReader.java

    r1947 r2010  
    3333 * LIFReader is the file format reader for Leica LIF files. 
    3434 * 
    35  * @author Melissa Linkert linkert at cs.wisc.edu 
     35 * @author Melissa Linkert linkert at wisc.edu 
    3636 */ 
    3737public class LIFReader extends FormatReader { 
  • trunk/loci/formats/in/LegacyZVIReader.java

    r1947 r2010  
    3737 * 
    3838 * @author Curtis Rueden ctrueden at wisc.edu 
    39  * @author Melissa Linkert linkert at cs.wisc.edu 
     39 * @author Melissa Linkert linkert at wisc.edu 
    4040 * @author Michel Boudinot Michel dot boudinot at iaf.cnrs-gif.fr 
    4141 */ 
  • trunk/loci/formats/in/LeicaReader.java

    r1988 r2010  
    3333 * LeicaReader is the file format reader for Leica files. 
    3434 * 
    35  * @author Melissa Linkert linkert at cs.wisc.edu 
     35 * @author Melissa Linkert linkert at wisc.edu 
    3636 */ 
    3737public class LeicaReader extends BaseTiffReader { 
  • trunk/loci/formats/in/MetamorphReader.java

    r1988 r2010  
    3939 * 
    4040 * @author Eric Kjellman egkjellman at wisc.edu 
    41  * @author Melissa Linkert linkert at cs.wisc.edu 
     41 * @author Melissa Linkert linkert at wisc.edu 
    4242 * @author Curtis Rueden ctrueden at wisc.edu 
    4343 */ 
  • trunk/loci/formats/in/NikonReader.java

    r1989 r2010  
    3434 * Nikon NEF (TIFF) files. 
    3535 * 
    36  * @author Melissa Linkert linkert at cs.wisc.edu 
     36 * @author Melissa Linkert linkert at wisc.edu 
    3737 */ 
    3838public class NikonReader extends BaseTiffReader { 
  • trunk/loci/formats/in/OIBReader.java

    r1988 r2010  
    3333 * OIBReader is the file format reader for Fluoview FV1000 OIB files. 
    3434 * 
    35  * @author Melissa Linkert linkert at cs.wisc.edu 
     35 * @author Melissa Linkert linkert at wisc.edu 
    3636 */ 
    3737public class OIBReader extends FormatReader { 
     
    331331        dims[i] = 
    332332          (String) metadata.get("[Axis " + i + " Parameters Common] - MaxSize"); 
     333        if (labels[i] == null) labels[i] = ""; 
     334        if (dims[i] == null) dims[i] = "0"; 
    333335      } 
    334336 
     
    533535        else if (TiffTools.checkHeader(b) != null) { 
    534536          // this is an actual image plane 
     537           
    535538          RandomAccessStream ras = new RandomAccessStream(data); 
    536539          Hashtable ifd = TiffTools.getIFDs(ras)[0]; 
     
    577580          // INI-style metadata 
    578581 
    579           String ini = new String(data); 
    580           if (ini.indexOf("????????") != -1) ini = ""; 
    581  
     582          String ini = DataTools.stripString(new String(data)); 
    582583          StringTokenizer st = new StringTokenizer(ini, "\n"); 
    583  
    584584          String prefix = ""; 
    585  
    586585          while (st.hasMoreTokens()) { 
    587             String token = st.nextToken(); 
    588             token = DataTools.stripString(token); 
    589             if (token.indexOf("!!!!!!") != -1) token = ""; 
    590             if (token.indexOf("=") != -1) { 
    591               String key = token.substring(0, token.indexOf("=")); 
    592               String value = token.substring(token.indexOf("=") + 1); 
    593               String s = (prefix + key).trim(); 
    594               if (s.equals("[FileInformation] - Resolution")) { 
    595                 int max = Integer.parseInt(value.trim()); 
     586            String line = st.nextToken().trim(); 
     587            if (!line.startsWith("[") && (line.indexOf("=") > 0)) { 
     588              String key = line.substring(0, line.indexOf("=")).trim(); 
     589              String value = line.substring(line.indexOf("=") + 1).trim(); 
     590 
     591              if (prefix.equals("[FileInformation] - ") &&  
     592                key.equals("Resolution"))  
     593              { 
     594                int max = Integer.parseInt(value); 
    596595                int bytes = ((Integer) bpp.get(0)).intValue(); 
    597596                while (Math.pow(2, bytes) < max) bytes++; 
     
    601600                } 
    602601              } 
    603               metadata.put(prefix + key.trim(), value.trim()); 
     602 
     603              if (prefix.indexOf("Red") == -1 &&  
     604                prefix.indexOf("Green") == -1 && prefix.indexOf("Blue") == -1) 
     605              { 
     606                metadata.put(prefix + key, value); 
     607              } 
    604608            } 
    605609            else { 
    606               prefix = token.trim() + " - "; 
    607               if (prefix.charAt(2) == '[') prefix = prefix.substring(2); 
     610              if (line.indexOf("[") == 2) { 
     611                line = line.substring(2, line.length()); 
     612              } 
     613              prefix = line + " - "; 
    608614            } 
    609615          } 
    610  
    611616          data = null; 
    612617        } 
  • trunk/loci/formats/in/OIFReader.java

    r1988 r2010  
    3434 * OIFReader is the file format reader for Fluoview FV 1000 OIF files. 
    3535 * 
    36  * @author Melissa Linkert linkert at cs.wisc.edu 
     36 * @author Melissa Linkert linkert at wisc.edu 
    3737 */ 
    3838public class OIFReader extends FormatReader { 
     
    120120  { 
    121121    if (!id.equals(currentId)) initFile(id); 
    122     return new Double((String) metadata.get("Image 0 : DataMin")); 
     122    return new Double((String) metadata.get("[Image Parameters] - DataMin")); 
    123123  } 
    124124 
     
    128128  { 
    129129    if (!id.equals(currentId)) initFile(id); 
    130     return new Double((String) metadata.get("Image 0: DataMax")); 
     130    return new Double((String) metadata.get("[Image Parameters] - DataMax")); 
    131131  } 
    132132 
     
    263263    Hashtable filenames = new Hashtable(); 
    264264    String line = reader.readLine(); 
     265    String prefix = ""; 
    265266    while (line != null) { 
     267      line = DataTools.stripString(line); 
    266268      if (!line.startsWith("[") && (line.indexOf("=") > 0)) { 
    267         String key = line.substring(0, line.indexOf("=") - 1).trim(); 
     269        String key = line.substring(0, line.indexOf("=")).trim(); 
    268270        String value = line.substring(line.indexOf("=") + 1).trim(); 
    269         key = DataTools.stripString(key); 
    270         value = DataTools.stripString(value); 
    271271        if (key.startsWith("IniFileName") && key.indexOf("Thumb") == -1) { 
    272272          int pos = Integer.parseInt(key.substring(11)); 
    273273          filenames.put(new Integer(pos), value); 
    274274        } 
    275         metadata.put(key, value); 
     275        metadata.put(prefix + key, value); 
     276      } 
     277      else if (line.length() > 0) { 
     278        if (line.indexOf("[") == 2) {   
     279          line = line.substring(2, line.length()); 
     280        } 
     281        prefix = line + " - "; 
    276282      } 
    277283      line = reader.readLine(); 
     
    316322    } 
    317323 
    318     sizeX[0] = Integer.parseInt((String) metadata.get("ImageWidth")); 
    319     sizeY[0] = Integer.parseInt((String) metadata.get("ImageHeight")); 
    320     String metadataOrder = (String) metadata.get("AxisOrder"); 
     324    for (int i=0; i<9; i++) { 
     325      String pre = "[Axis " + i + " Parameters Common] - "; 
     326      String code = (String) metadata.get(pre + "AxisCode"); 
     327      String size = (String) metadata.get(pre + "MaxSize"); 
     328      if (code.equals("\"X\"")) sizeX[0] = Integer.parseInt(size); 
     329      else if (code.equals("\"Y\"")) sizeY[0] = Integer.parseInt(size); 
     330      else if (code.equals("\"C\"")) sizeC[0] = Integer.parseInt(size); 
     331      else if (code.equals("\"T\"")) sizeT[0] = Integer.parseInt(size); 
     332      else if (code.equals("\"Z\"")) sizeZ[0] = Integer.parseInt(size); 
     333    } 
     334    
     335    if (sizeZ[0] == 0) sizeZ[0] = 1; 
     336    if (sizeC[0] == 0) sizeC[0] = 1; 
     337    if (sizeT[0] == 0) sizeT[0] = 1; 
     338 
     339    while (numImages > sizeZ[0] * sizeT[0] * getEffectiveSizeC(id)) { 
     340      if (sizeZ[0] == 1) sizeT[0]++; 
     341      else if (sizeT[0] == 1) sizeZ[0]++; 
     342    } 
     343 
     344    String metadataOrder =  
     345      (String) metadata.get("[Axis Parameter Common] - AxisOrder"); 
    321346    metadataOrder = metadataOrder.substring(1, metadataOrder.length() - 1); 
    322347    if (metadataOrder == null) metadataOrder = "XYZTC"; 
     
    331356    currentOrder[0] = metadataOrder; 
    332357 
    333     String axis = (String) metadata.get("View Max CH"); 
    334     int axisCount = 1; 
    335     if (axis != null) { 
    336       axis = axis.substring(1, axis.length() -1 ); 
    337       axisCount = Integer.parseInt(axis.trim()); 
    338     } 
    339     if (isRGB(currentId)) axisCount *= 3; 
    340  
    341     sizeC[0] = axisCount; 
    342     int remainingImages = numImages; 
    343     if (metadataOrder.indexOf("C") == 2) remainingImages /= axisCount; 
    344     sizeZ[0] = metadataOrder.indexOf("Z") < metadataOrder.indexOf("T") ? 
    345       remainingImages : 1; 
    346     sizeT[0] = metadataOrder.indexOf("T") < metadataOrder.indexOf("Z") ? 
    347       remainingImages : 1; 
    348  
    349358    // The metadata store we're working with. 
    350359    MetadataStore store = getMetadataStore(oifFile); 
    351360 
    352     int imageDepth = Integer.parseInt((String) metadata.get("ImageDepth")); 
     361    int imageDepth = Integer.parseInt( 
     362      (String) metadata.get("[Reference Image Parameter] - ImageDepth")); 
    353363    switch (imageDepth) { 
    354364      case 1: 
     
    369379    if (validBits.length == 2) validBits = new int[3]; 
    370380    for (int i=0; i<validBits.length; i++) { 
    371       String s = (String) metadata.get("Image " + i + " : ValidBitCounts"); 
     381      String s =  
     382        (String) metadata.get("[Reference Image Parameter] - ValidBitCounts"); 
    372383      if (s != null) { 
    373384        validBits[i] = Integer.parseInt(s); 
     
    384395 
    385396    store.setPixels( 
    386       new Integer(Integer.parseInt((String) metadata.get("ImageWidth"))), 
    387       new Integer(Integer.parseInt((String) metadata.get("ImageHeight"))), 
     397      new Integer(sizeX[0]), 
     398      new Integer(sizeY[0]), 
    388399      new Integer(sizeZ[0]), 
    389400      new Integer(sizeC[0]), 
     
    394405      null); 
    395406 
    396     Float pixX = 
    397       new Float(metadata.get("Image 0 : WidthConvertValue").toString()); 
    398     Float pixY = 
    399       new Float(metadata.get("Image 0 : HeightConvertValue").toString()); 
     407    Float pixX = new Float((String)  
     408      metadata.get("[Reference Image Parameter] - WidthConvertValue")); 
     409    Float pixY = new Float((String)  
     410      metadata.get("[Reference Image Parameter] - HeightConvertValue")); 
    400411 
    401412    store.setDimensions(pixX, pixY, null, null, null, null); 
  • trunk/loci/formats/in/OMEXMLReader.java

    r1947 r2010  
    3535 * OMEXMLReader is the file format reader for OME-XML files. 
    3636 * 
    37  * @author Melissa Linkert linkert at cs.wisc.edu 
     37 * @author Melissa Linkert linkert at wisc.edu 
    3838 */ 
    3939public class OMEXMLReader extends FormatReader { 
  • trunk/loci/formats/in/OpenlabRawReader.java

    r1947 r2010  
    3535 * http://www.improvision.com/support/tech_notes/detail.php?id=344 
    3636 * 
    37  * @author Melissa Linkert linkert at cs.wisc.edu 
     37 * @author Melissa Linkert linkert at wisc.edu 
    3838 */ 
    3939public class OpenlabRawReader extends FormatReader { 
  • trunk/loci/formats/in/PerkinElmerReader.java

    r1996 r2010  
    3535 * PerkinElmerReader is the file format reader for PerkinElmer files. 
    3636 * 
    37  * @author Melissa Linkert linkert at cs.wisc.edu 
     37 * @author Melissa Linkert linkert at wisc.edu 
    3838 */ 
    3939public class PerkinElmerReader extends FormatReader { 
  • trunk/loci/formats/in/QTReader.java

    r1947 r2010  
    3838 * Additional video codecs will be added as time permits. 
    3939 * 
    40  * @author Melissa Linkert linkert at cs.wisc.edu 
     40 * @author Melissa Linkert linkert at wisc.edu 
    4141 */ 
    4242public class QTReader extends FormatReader { 
  • trunk/loci/formats/in/SEQReader.java

    r1759 r2010  
    3232 * SEQReader is the file format reader for Image-Pro Sequence files. 
    3333 * 
    34  * @author Melissa Linkert linkert at cs.wisc.edu 
     34 * @author Melissa Linkert linkert at wisc.edu 
    3535 */ 
    3636public class SEQReader extends BaseTiffReader { 
  • trunk/loci/formats/in/SlidebookReader.java

    r1947 r2010  
    3333 * SlidebookReader is the file format reader for 3I Slidebook files. 
    3434 * 
    35  * @author Melissa Linkert linkert at cs.wisc.edu 
     35 * @author Melissa Linkert linkert at wisc.edu 
    3636 */ 
    3737public class SlidebookReader extends FormatReader { 
  • trunk/loci/formats/in/TiffReader.java

    r1988 r2010  
    3838 * 
    3939 * @author Curtis Rueden ctrueden at wisc.edu 
    40  * @author Melissa Linkert linkert at cs.wisc.edu 
     40 * @author Melissa Linkert linkert at wisc.edu 
    4141 */ 
    4242public class TiffReader extends BaseTiffReader { 
  • trunk/loci/formats/in/ZeissLSMReader.java

    r1988 r2010  
    3535 * 
    3636 * @author Eric Kjellman egkjellman at wisc.edu 
    37  * @author Melissa Linkert linkert at cs.wisc.edu 
     37 * @author Melissa Linkert linkert at wisc.edu 
    3838 * @author Curtis Rueden ctrueden at wisc.edu 
    3939 */ 
     
    578578          put("EventType" + i, data); 
    579579 
     580          if (numBytes > in.length() - in.getFilePointer()) { 
     581            numBytes = in.length() - in.getFilePointer(); 
     582          } 
    580583          byte[] descr = new byte[(int) (numBytes - 16)]; 
    581584          in.read(descr); 
  • trunk/loci/formats/in/ZeissZVIReader.java

    r1988 r2010  
    3535 * ZeissZVIReader is the file format reader for Zeiss ZVI files. 
    3636 * 
    37  * @author Melissa Linkert linkert at cs.wisc.edu 
     37 * @author Melissa Linkert linkert at wisc.edu 
    3838 */ 
    3939public class ZeissZVIReader extends FormatReader { 
  • trunk/loci/formats/out/EPSWriter.java

    r2001 r2010  
    3333 * EPSWriter is the file format writer for Encapsulated PostScript (EPS) files. 
    3434 * 
    35  * @author Melissa Linkert linkert at cs.wisc.edu 
     35 * @author Melissa Linkert linkert at wisc.edu 
    3636 */ 
    3737public class EPSWriter extends FormatWriter { 
  • trunk/loci/formats/out/QTWriter.java

    r2006 r2010  
    3434 * QTWriter is the file format writer for uncompressed QuickTime movie files. 
    3535 * 
    36  * @author Melissa Linkert linkert at cs.wisc.edu 
     36 * @author Melissa Linkert linkert at wisc.edu 
    3737 */ 
    3838 
  • trunk/loci/plugins/Exporter.java

    r1989 r2010  
    4141 * Core logic for the LOCI Exporter ImageJ plugin. 
    4242 * 
    43  * @author Melissa Linkert linkert at cs.wisc.edu 
     43 * @author Melissa Linkert linkert at wisc.edu 
    4444 */ 
    4545public class Exporter implements ItemListener { 
  • trunk/loci/plugins/Importer.java

    r1998 r2010  
    4646 * 
    4747 * @author Curtis Rueden ctrueden at wisc.edu 
    48  * @author Melissa Linkert linkert at cs.wisc.edu 
     48 * @author Melissa Linkert linkert at wisc.edu 
    4949 */ 
    5050public class Importer { 
  • trunk/loci/plugins/LociExporter.java

    r1544 r2010  
    3535 * to classes in the external Bio-Formats library. 
    3636 * 
    37  * @author Melissa Linkert linkert at cs.wisc.edu 
     37 * @author Melissa Linkert linkert at wisc.edu 
    3838 */ 
    3939public class LociExporter implements PlugInFilter { 
  • trunk/loci/plugins/LociImporter.java

    r1792 r2010  
    3434 * 
    3535 * @author Curtis Rueden ctrueden at wisc.edu 
    36  * @author Melissa Linkert linkert at cs.wisc.edu 
     36 * @author Melissa Linkert linkert at wisc.edu 
    3737 */ 
    3838public class LociImporter implements PlugIn { 
  • trunk/loci/plugins/LociUploader.java

    r1987 r2010  
    3939 * ImageJ plugin for uploading images to an OME server. 
    4040 * 
    41  * @author Melissa Linkert linket at cs.wisc.edu 
     41 * @author Melissa Linkert linket at wisc.edu 
    4242 */ 
    4343public class LociUploader implements PlugIn { 
  • trunk/loci/plugins/browser/LociDataBrowser.java

    r2007 r2010  
    4040 * @author Francis Wong yutaiwong at wisc.edu 
    4141 * @author Curtis Rueden ctrueden at wisc.edu 
    42  * @author Melissa Linkert linkert at cs.wisc.edu 
     42 * @author Melissa Linkert linkert at wisc.edu 
    4343 */ 
    4444public class LociDataBrowser { 
  • trunk/loci/plugins/ome/MetaPanel.java

    r1989 r2010  
    4848 * 
    4949 * @author Philip Huettl pmhuettl at wisc.edu 
    50  * @author Melissa Linkert linkert at cs.wisc.edu 
     50 * @author Melissa Linkert linkert at wisc.edu 
    5151 */ 
    5252public class MetaPanel implements ActionListener, TreeSelectionListener { 
  • trunk/loci/plugins/ome/OMEController.java

    r1989 r2010  
    3232 * associated XML nodes for use with OMESidePanel. 
    3333 * 
    34  * @author Melissa Linkert linkert at cs.wisc.edu 
     34 * @author Melissa Linkert linkert at wisc.edu 
    3535 * @author Curtis Rueden ctrueden at wisc.edu 
    3636 */ 
  • trunk/loci/plugins/ome/OMEDomainPanel.java

    r1273 r2010  
    3636 * 
    3737 * @author Philip Huettl pmhuettl at wisc.edu 
    38  * @author Melissa Linkert linkert at cs.wisc.edu 
     38 * @author Melissa Linkert linkert at wisc.edu 
    3939 */ 
    4040public class OMEDomainPanel implements ActionListener, ChangeListener { 
  • trunk/loci/plugins/ome/OMEDownPanel.java

    r1346 r2010  
    3535 * 
    3636 * @author Philip Huettl pmhuettl at wisc.edu 
    37  * @author Melissa Linkert linkert at cs.wisc.edu 
     37 * @author Melissa Linkert linkert at wisc.edu 
    3838 */ 
    3939public class OMEDownPanel implements ActionListener { 
  • trunk/loci/plugins/ome/OMELoginPanel.java

    r1273 r2010  
    3434 * 
    3535 * @author Philip Huettl pmhuettl at wisc.edu 
    36  * @author Melissa Linkert linkert at cs.wisc.edu 
     36 * @author Melissa Linkert linkert at wisc.edu 
    3737 */ 
    3838public class OMELoginPanel implements ActionListener { 
  • trunk/loci/plugins/ome/OMEMetaDataHandler.java

    r1273 r2010  
    4242 * 
    4343 * @author Philip Huettl pmhuettl at wisc.edu 
    44  * @author Melissa Linkert linkert at cs.wisc.edu 
     44 * @author Melissa Linkert linkert at wisc.edu 
    4545 */ 
    4646public class OMEMetaDataHandler { 
  • trunk/loci/plugins/ome/OMEPlugin.java

    r1544 r2010  
    3333 * 
    3434 * @author Philip Huettl pmhuettl at wisc.edu 
    35  * @author Melissa Linkert linkert at cs.wisc.edu 
     35 * @author Melissa Linkert linkert at wisc.edu 
    3636 */ 
    3737public class OMEPlugin implements PlugIn { 
  • trunk/loci/plugins/ome/OMERetrieve.java

    r1989 r2010  
    3838 * 
    3939 * @author Philip Huettl pmhuettl at wisc.edu 
    40  * @author Melissa Linkert linkert at cs.wisc.edu 
     40 * @author Melissa Linkert linkert at wisc.edu 
    4141 */ 
    4242public class OMERetrieve { 
  • trunk/loci/plugins/ome/OMESidePanel.java

    r1989 r2010  
    3737 * 
    3838 * @author Philip Huettl pmhuettl at wisc.edu 
    39  * @author Melissa Linkert linkert at cs.wisc.edu 
     39 * @author Melissa Linkert linkert at wisc.edu 
    4040 * @author Curtis Rueden ctrueden at wisc.edu 
    4141 */ 
  • trunk/loci/plugins/ome/OMETablePanel.java

    r1346 r2010  
    3737 * 
    3838 * @author Philip Huettl pmhuettl at wisc.edu 
    39  * @author Melissa Linkert, linkert at cs.wisc.edu 
     39 * @author Melissa Linkert, linkert at wisc.edu 
    4040 */ 
    4141public class OMETablePanel implements ActionListener { 
  • trunk/loci/plugins/ome/OMETools.java

    r1989 r2010  
    4343 * 
    4444 * @author Philip Huettl pmhuettl at wisc.edu 
    45  * @author Melissa Linkert linkert at cs.wisc.edu 
     45 * @author Melissa Linkert linkert at wisc.edu 
    4646 * @author Curtis Rueden ctrueden at wisc.edu 
    4747 */ 
  • trunk/loci/plugins/ome/WindowMonitor.java

    r1273 r2010  
    3131 * changes in the how many files are open. 
    3232 * 
    33  * @author Melissa Linkert linkert at cs.wisc.edu 
     33 * @author Melissa Linkert linkert at wisc.edu 
    3434 * @author Curtis Rueden ctrueden at wisc.edu 
    3535 */ 
  • trunk/loci/plugins/ome/XMLObject.java

    r1273 r2010  
    2929 * 
    3030 * @author Philip Huettl pmhuettl at wisc.edu 
    31  * @author Melissa Linkert linkert at cs.wisc.edu 
     31 * @author Melissa Linkert linkert at wisc.edu 
    3232 */ 
    3333public class XMLObject { 
Note: See TracChangeset for help on using the changeset viewer.