Context Navigation

← Previous Change
Next Change →

ome.xsd

Timestamp:

02/05/08 16:47:29 (10 months ago)

Author:

andrew

Message:

Working changes as I am updating the schema

Files:

: 1 modified

Xml/Working/ome.xsd (modified) (11 diffs)

Legend:

: Unmodified
: Added
: Removed

Xml/Working/ome.xsd

r101	r145
7	7	# National Institutes of Health,
8	8	# University of Dundee,
9		# University of Wisconsin at Madison
	9	# University of Wisconsin at Madison"
10	10	#
11	11	#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
…	…
24	24	xmlns:CA="http://www.openmicroscopy.org/Schemas/CA/2007-06"
25	25	xmlns:SPW="http://www.openmicroscopy.org/Schemas/SPW/2007-06"
	26	xmlns:xml="http://www.w3.org/XML/1998/namespace"
26	27	version="2"
27	28	elementFormDefault="qualified">
…	…
31	32	<xsd:import namespace="http://www.openmicroscopy.org/Schemas/CA/2007-06" schemaLocation="http://www.openmicroscopy.org/Schemas/CA/2007-06/CA.xsd"/>
32	33	<xsd:import namespace="http://www.openmicroscopy.org/Schemas/SPW/2007-06" schemaLocation="http://www.openmicroscopy.org/Schemas/SPW/2007-06/SPW.xsd"/>
	34	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
33	35	<xsd:annotation>
34	36	<xsd:documentation>
…	…
232	234	<xsd:annotation>
233	235	<xsd:documentation>
	236	THis described the location of the pixel data in a tiff file.
234	237	</xsd:documentation>
235	238	</xsd:annotation>
…	…
273	276	Pixels element's DimensionOrder attribute. Default is the number of IFDs in the TIFF
274	277	file, unless an IFD is specified, in which case the default is 1.
	278	</xsd:documentation>
	279	</xsd:annotation>
	280	</xsd:attribute>
	281	<xsd:attribute name="FilePath" type="xsd:string">
	282	<xsd:annotation>
	283	<xsd:documentation>
	284	This is used when the IFDs are located in another file.
	285	The / (forward slash) is used as the path separator.
	286	A relative path is recommended. However an absolute path can be specified.
	287	Default is to use the file the ome-xml data has been pulled from.
	288	Note: It is permissible for this to be self referential. The file image1.tiff
	289	may contain ome-xml data that has FilePath="image1.tiff" or "./image1.tiff"
275	290	</xsd:documentation>
276	291	</xsd:annotation>
…	…
993	1008	</xsd:complexType>
994	1009	</xsd:element>
995		<xsd:element name="Description">
	1010	<xsd:element name = "Description">
996	1011	<xsd:annotation>
997	1012	<xsd:documentation>
998	1013	Just some free-form text to describe Images, Screens and Projects.
999		The content model is currently ANY, but this is going to change to String in
1000		the near future. This is no longer the correct place for an XML sub-document
1001		- use CustomAttributes instead.
1002		</xsd:documentation>
1003		</xsd:annotation>
	1014	The content model is now String.
	1015	This is no longer the correct place for an XML sub-document
	1016	Either
	1017	- use CustomAttributes instead
	1018	Or
	1019	- define your own xml tree outside the OME node and link to the OME objects using references to the IDs
	1020	</xsd:documentation>
	1021	</xsd:annotation>
	1022	<xsd:complexType>
	1023	<xsd:simpleContent>
	1024	<xsd:extension base = "xsd:string">
	1025	<xsd:attribute ref = "xml:lang" default = "en"/>
	1026	</xsd:extension>
	1027	</xsd:simpleContent>
	1028	</xsd:complexType>
1004	1029	</xsd:element>
1005	1030	<xsd:element name="Microscope">
…	…
1600	1625	Laser types are specified using two attributes - the Type and the lasing medium (Medium). Type is a string which may be set to:
1601	1626	'Excimer','Gas','Metal Vapor','Solid State','Dye','Semiconductor', or 'Free Electron'. The Medium attribute specifies the actual lasing medium
1602		for a given laser type (for example, 'Nd-YAG'). Additionally, the Wavelength (in nm), whether or not the laser is ~~FrequencyDoubled or Tuneable~~ may be specified.
	1627	for a given laser type (for example, 'Nd-YAG'). Additionally, the Wavelength (in nm), whether or not the laser is Tuneable, and any FrequencyMultiplication that may be specified.
1603	1628	The Pulse attribute can be set to 'CW' (Continuous Wave),','Single','Q-Switched','Repetitive','Mode-Locked'.
1604	1629	The Power attribute specifies the nominal laser power in watts.
…	…
1655	1680	<xsd:documentation>
1656	1681	The Arc element is used to describe various kinds of Arc lamps - Hg, Xe, HgXe.
1657		The Power ~~attribute is the lamp's nominal power in watts~~.
	1682	The Power of the Arc is now stored in the LightSource.
1658	1683	</xsd:documentation>
1659	1684	</xsd:annotation>
…	…
1668	1693	</xsd:simpleType>
1669	1694	</xsd:attribute>
1670		~~<xsd:attribute name="Power" type="xsd:float"/>~~
1671	1695	</xsd:complexType>
1672	1696	</xsd:element>
…	…
1675	1699	<xsd:documentation>
1676	1700	The Filament element is used to describe various kinds of filament bulbs such as Incadescent or Halogen.
1677		The Power ~~attribute is the bulb's nominal power in watts~~.
	1701	The Power of the Filament is now stored in the LightSource.
1678	1702	</xsd:documentation>
1679	1703	</xsd:annotation>
…	…
1687	1711	</xsd:simpleType>
1688	1712	</xsd:attribute>
1689		~~<xsd:attribute name="Power" type="xsd:float"/>~~
1690	1713	</xsd:complexType>
1691	1714	</xsd:element>

Context Navigation

Changeset 145 for Xml/Working/ome.xsd

Legend:

Xml/Working/ome.xsd

Download in other formats: