• Login
  • Help/Guide
  • About Trac
  • Preferences
  • Wiki
  • Timeline
  • Roadmap
  • Browse Source
  • View Tickets
  • Search

Context Navigation

  • ← Previous Change
  • Next Change →

Changeset 191 for Xml/Working

Show
Ignore:
Timestamp:
07/10/08 17:17:52 (5 months ago)
Author:
andrew
Message:

Added some initial SA blocks. Not yet maped to existing OMERO annotations/

Location:
Xml/Working
Files:
1 added
2 modified

  • SA.xsd (added)
  • ome-roi-sa.xsd (modified) (3 diffs)
  • roi-sample.xml (modified) (2 diffs)

Legend:

Unmodified
Added
Removed

  • Xml/Working/ome-roi-sa.xsd

    r190 r191  
    2424        xmlns:CA="http://www.openmicroscopy.org/Schemas/CA/2008-02"  
    2525        xmlns:SPW="http://www.openmicroscopy.org/Schemas/SPW/2008-02"  
     26        xmlns:SA="http://www.openmicroscopy.org/Schemas/SA/2008-02"  
    2627        xmlns:xml="http://www.w3.org/XML/1998/namespace" 
    2728        version="2"  
    … …  
    3233        <xsd:import namespace="http://www.openmicroscopy.org/Schemas/CA/2008-02" schemaLocation="http://www.openmicroscopy.org/Schemas/CA/2008-02/CA.xsd"/> 
    3334        <xsd:import namespace="http://www.openmicroscopy.org/Schemas/SPW/2008-02" schemaLocation="http://www.openmicroscopy.org/Schemas/SPW/2008-02/SPW.xsd"/> 
     35        <xsd:import namespace="http://www.openmicroscopy.org/Schemas/SA/2008-02" schemaLocation="SA.xsd"/> 
    3436        <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/> 
    3537         
    … …  
    6264                                <xsd:element ref="Instrument" minOccurs="0" maxOccurs="unbounded"/> 
    6365                                <xsd:element ref="Image" minOccurs="0" maxOccurs="unbounded"/> 
    64                                 <xsd:element ref="STD:SemanticTypeDefinitions" minOccurs="0"/> 
    65                                 <xsd:element ref="AML:AnalysisModuleLibrary" minOccurs="0"/> 
    66                                 <xsd:element ref="CA:CustomAttributes" minOccurs="0"/> 
     66                                <xsd:element ref="STD:SemanticTypeDefinitions" minOccurs="0" maxOccurs="1"/> 
     67                                <xsd:element ref="AML:AnalysisModuleLibrary" minOccurs="0" maxOccurs="1"/> 
     68                                <xsd:element ref="CA:CustomAttributes" minOccurs="0" maxOccurs="1"/> 
     69                                <xsd:element ref="SA:StructuredAnnotations" minOccurs="0" maxOccurs="1"/> 
    6770                        </xsd:sequence> 
    68                                 <xsd:attribute name="UUID" type="UniversallyUniqueIdentifier"/> 
     71                        <xsd:attribute name="UUID" type="UniversallyUniqueIdentifier"/> 
    6972                </xsd:complexType> 
    7073        </xsd:element> 

  • Xml/Working/roi-sample.xml

    r190 r191  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <ome:OME xmlns:bf="http://www.openmicroscopy.org/Schemas/BinaryFile/2008-02" xmlns:ome="http://www.openmicroscopy.org/Schemas/OME/2008-02" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openmicroscopy.org/Schemas/OME/2008-02 ome-roi-sa.xsd"> 
    3         <ome:Image ID="Image:a" Name="Name92" DefaultPixels="Pixels:b"> 
     2<ome:OME  
     3        xmlns:bf="http://www.openmicroscopy.org/Schemas/BinaryFile/2008-02"  
     4        xmlns:ome="http://www.openmicroscopy.org/Schemas/OME/2008-02"  
     5        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
     6        xmlns:sa="http://www.openmicroscopy.org/Schemas/SA/2008-02"  
     7        xsi:schemaLocation="http://www.openmicroscopy.org/Schemas/OME/2008-02 ome-roi-sa.xsd http://www.openmicroscopy.org/Schemas/SA/2008-02 SA.xsd" 
     8        > 
     9        <ome:Image ID="Image:1" Name="Name92" DefaultPixels="Pixels:b"> 
    410                <ome:CreationDate>2008-03-04T14:17:43.0Z</ome:CreationDate> 
    511                <ome:Pixels ID="Pixels:a" DimensionOrder="XYZCT" PixelType="int8" BigEndian="false" SizeX="2" SizeY="2" SizeZ="2" SizeC="2" SizeT="2"> 
    … …  
    4349                </ome:ROI> 
    4450        </ome:Image> 
     51        <sa:StructuredAnnotations> 
     52                <sa:FileAnnotation ID="Annotation:1" FileName="file.txt" MimeType="text/plain"> 
     53                        <sa:Link>Shape:5</sa:Link> 
     54                        <sa:ExternalFile>roi-sample-annotations/file.txt</sa:ExternalFile> 
     55                </sa:FileAnnotation> 
     56                <sa:FileAnnotation ID="Annotation:2" FileName="report.pdf" MimeType="application/pdf"> 
     57                        <sa:Link>Image:1</sa:Link> 
     58                        <sa:ExternalFile>roi-sample-annotations/report.pdf</sa:ExternalFile> 
     59                </sa:FileAnnotation> 
     60                <sa:SvgAnnotation ID="Annotation:3" color="green" line-width="2"> 
     61                        <sa:Link>Shape:5</sa:Link> 
     62                        <sa:Link>Shape:4</sa:Link> 
     63                        <sa:Link>Shape:3</sa:Link> 
     64                        <sa:Link>Shape:2</sa:Link> 
     65                </sa:SvgAnnotation> 
     66                <sa:SvgAnnotation ID="Annotation:4" color="red" line-width="3"> 
     67                        <sa:Link>Shape:1</sa:Link> 
     68                </sa:SvgAnnotation> 
     69                <sa:FileAnnotation ID="Annotation:5" FileName="file2.txt" MimeType="text/plain"> 
     70                        <sa:Link>Shape:5</sa:Link> 
     71                        <bf:BinData Compression="none" Length="12">ZGVmYXVsdA==</bf:BinData> 
     72                </sa:FileAnnotation> 
     73        </sa:StructuredAnnotations> 
    4574</ome:OME> 
     75 

Download in other formats:

  • Unified Diff
  • Zip Archive
Trac Powered

Powered by Trac 0.11
By Edgewall Software.

Visit the Trac open source project at
http://trac.edgewall.org/