Changeset 194 for Xml/Working
- Timestamp:
- 08/14/08 17:02:28 (4 months ago)
- Files:
-
- 1 modified
-
Xml/Working/ome-roi-sa.xsd (modified) (105 diffs)
Legend:
- Unmodified
- Added
- Removed
-
Xml/Working/ome-roi-sa.xsd
r191 r194 31 31 <xsd:import namespace="http://www.openmicroscopy.org/Schemas/STD/2008-02" schemaLocation="http://www.openmicroscopy.org/Schemas/STD/2008-02/STD.xsd"/> 32 32 <xsd:import namespace="http://www.openmicroscopy.org/Schemas/BinaryFile/2008-02" schemaLocation="http://www.openmicroscopy.org/Schemas/BinaryFile/2008-02/BinaryFile.xsd"/> 33 <xsd:import namespace="http://www.openmicroscopy.org/Schemas/CA/2008-02" schemaLocation=" http://www.openmicroscopy.org/Schemas/CA/2008-02/CA.xsd"/>33 <xsd:import namespace="http://www.openmicroscopy.org/Schemas/CA/2008-02" schemaLocation="CA.xsd"/> 34 34 <xsd:import namespace="http://www.openmicroscopy.org/Schemas/SPW/2008-02" schemaLocation="http://www.openmicroscopy.org/Schemas/SPW/2008-02/SPW.xsd"/> 35 35 <xsd:import namespace="http://www.openmicroscopy.org/Schemas/SA/2008-02" schemaLocation="SA.xsd"/> … … 44 44 </xsd:documentation> 45 45 </xsd:annotation> 46 <xsd:element name="OME"> 46 <xsd:element name="OME"> <!-- top level definition --> 47 47 <xsd:annotation> 48 48 <xsd:documentation> … … 69 69 <xsd:element ref="SA:StructuredAnnotations" minOccurs="0" maxOccurs="1"/> 70 70 </xsd:sequence> 71 <xsd:attribute name="UUID" type="UniversallyUniqueIdentifier" />72 </xsd:complexType> 73 </xsd:element> 74 <xsd:element name="Image"> 71 <xsd:attribute name="UUID" type="UniversallyUniqueIdentifier" use="optional"/> 72 </xsd:complexType> 73 </xsd:element> 74 <xsd:element name="Image"> <!-- top level definition --> 75 75 <xsd:annotation> 76 76 <xsd:documentation> … … 92 92 <xsd:complexType> 93 93 <xsd:sequence> 94 <xsd:element ref="CreationDate" />95 <xsd:element ref="ExperimenterRef" minOccurs="0" />96 <xsd:element ref="Description" minOccurs="0" />97 <xsd:element ref="ExperimentRef" minOccurs="0" />98 <xsd:element ref="GroupRef" minOccurs="0" />94 <xsd:element ref="CreationDate" minOccurs="1" maxOccurs="1"/> 95 <xsd:element ref="ExperimenterRef" minOccurs="0" maxOccurs="1"/> 96 <xsd:element ref="Description" minOccurs="0" maxOccurs="1"/> 97 <xsd:element ref="ExperimentRef" minOccurs="0" maxOccurs="1"/> 98 <xsd:element ref="GroupRef" minOccurs="0" maxOccurs="1"/> 99 99 <xsd:element ref="DatasetRef" minOccurs="0" maxOccurs="unbounded"/> 100 <xsd:element ref="InstrumentRef" minOccurs="0" />101 <xsd:element ref="ObjectiveRef" minOccurs="0" />102 <xsd:element ref="ImagingEnvironment" minOccurs="0" />103 <xsd:element ref="Thumbnail" minOccurs="0" />100 <xsd:element ref="InstrumentRef" minOccurs="0" maxOccurs="1"/> 101 <xsd:element ref="ObjectiveRef" minOccurs="0" maxOccurs="1"/> 102 <xsd:element ref="ImagingEnvironment" minOccurs="0" maxOccurs="1"/> 103 <xsd:element ref="Thumbnail" minOccurs="0" maxOccurs="1"/> 104 104 <xsd:element ref="LogicalChannel" minOccurs="0" maxOccurs="unbounded"/> 105 <xsd:element ref="DisplayOptions" minOccurs="0" />106 <xsd:element ref="StageLabel" minOccurs="0" />107 <xsd:element ref="Pixels" m axOccurs="unbounded"/>105 <xsd:element ref="DisplayOptions" minOccurs="0" maxOccurs="1"/> 106 <xsd:element ref="StageLabel" minOccurs="0" maxOccurs="1"/> 107 <xsd:element ref="Pixels" minOccurs="1" maxOccurs="unbounded"/> 108 108 <xsd:element ref="Region" minOccurs="0" maxOccurs="unbounded"/> 109 <xsd:element ref="CA:CustomAttributes" minOccurs="0" />109 <xsd:element ref="CA:CustomAttributes" minOccurs="0" maxOccurs="1"/> 110 110 <xsd:element ref="ROI" minOccurs="0" maxOccurs="unbounded"/> 111 111 <xsd:element ref="MicrobeamManipulation" minOccurs="0" maxOccurs="unbounded"/> … … 121 121 </xsd:annotation> 122 122 </xsd:attribute> 123 <xsd:attribute name="AcquiredPixels" type="PixelsID">123 <xsd:attribute name="AcquiredPixels" use="optional" type="PixelsID"> 124 124 <xsd:annotation> 125 125 <xsd:documentation> … … 132 132 </xsd:complexType> 133 133 </xsd:element> 134 <xsd:element name="CreationDate" type="xsd:dateTime"> 134 <xsd:element name="CreationDate" type="xsd:dateTime"> <!-- top level definition --> 135 135 <xsd:annotation> 136 136 <xsd:documentation> … … 140 140 </xsd:annotation> 141 141 </xsd:element> 142 <xsd:element name="Pixels"> 142 <xsd:element name="Pixels"> <!-- top level definition --> 143 143 <xsd:annotation> 144 144 <xsd:documentation> … … 152 152 <xsd:complexType> 153 153 <xsd:sequence> 154 <xsd:choice m axOccurs="unbounded">155 <xsd:element ref="Bin:BinData" />156 <xsd:element ref="TiffData" />154 <xsd:choice minOccurs="1" maxOccurs="unbounded"> 155 <xsd:element ref="Bin:BinData" minOccurs="1" maxOccurs="1"/> 156 <xsd:element ref="TiffData" minOccurs="1" maxOccurs="1"/> 157 157 </xsd:choice> 158 158 <xsd:element ref="Plane" minOccurs="0" maxOccurs="unbounded"/> … … 202 202 </xsd:annotation> 203 203 </xsd:attribute> 204 <xsd:attribute name="PhysicalSizeX" type="xsd:float">204 <xsd:attribute name="PhysicalSizeX" use="optional" type="xsd:float"> 205 205 <xsd:annotation> 206 206 <xsd:documentation>Physical size of a pixel</xsd:documentation> 207 207 </xsd:annotation> 208 208 </xsd:attribute> 209 <xsd:attribute name="PhysicalSizeY" type="xsd:float">209 <xsd:attribute name="PhysicalSizeY" use="optional" type="xsd:float"> 210 210 <xsd:annotation> 211 211 <xsd:documentation>Physical size of a pixel</xsd:documentation> 212 212 </xsd:annotation> 213 213 </xsd:attribute> 214 <xsd:attribute name="PhysicalSizeZ" type="xsd:float">214 <xsd:attribute name="PhysicalSizeZ" use="optional" type="xsd:float"> 215 215 <xsd:annotation> 216 216 <xsd:documentation>Physical size of a pixel</xsd:documentation> 217 217 </xsd:annotation> 218 218 </xsd:attribute> 219 <xsd:attribute name="TimeIncrement" type="xsd:float"/>220 <xsd:attribute name="WaveStart" type="xsd:positiveInteger"/>221 <xsd:attribute name="WaveIncrement" type="xsd:positiveInteger"/>222 </xsd:complexType> 223 </xsd:element> 224 <xsd:element name="TiffData"> 219 <xsd:attribute name="TimeIncrement" use="optional" type="xsd:float"/> 220 <xsd:attribute name="WaveStart" use="optional" type="xsd:positiveInteger"/> 221 <xsd:attribute name="WaveIncrement" use="optional" type="xsd:positiveInteger"/> 222 </xsd:complexType> 223 </xsd:element> 224 <xsd:element name="TiffData"> <!-- top level definition --> 225 225 <xsd:annotation> 226 226 <xsd:documentation> … … 230 230 <xsd:complexType> 231 231 <xsd:sequence> 232 <xsd:element name="UUID" minOccurs="0" >232 <xsd:element name="UUID" minOccurs="0" maxOccurs="1"> 233 233 <xsd:annotation> 234 234 <xsd:documentation> … … 240 240 <xsd:simpleContent> 241 241 <xsd:extension base = "UniversallyUniqueIdentifier"> 242 <xsd:attribute name="FileName" type="xsd:string">242 <xsd:attribute name="FileName" use="optional" type="xsd:string"> 243 243 <xsd:annotation> 244 244 <xsd:documentation> … … 257 257 </xsd:element> 258 258 </xsd:sequence> 259 <xsd:attribute name="IFD" type="xsd:integer" default="0" >259 <xsd:attribute name="IFD" type="xsd:integer" default="0" use="optional"> 260 260 <xsd:annotation> 261 261 <xsd:documentation> … … 265 265 </xsd:annotation> 266 266 </xsd:attribute> 267 <xsd:attribute name="FirstZ" type="xsd:integer" default="0" >267 <xsd:attribute name="FirstZ" type="xsd:integer" default="0" use="optional"> 268 268 <xsd:annotation> 269 269 <xsd:documentation> … … 273 273 </xsd:annotation> 274 274 </xsd:attribute> 275 <xsd:attribute name="FirstT" type="xsd:integer" default="0" >275 <xsd:attribute name="FirstT" type="xsd:integer" default="0" use="optional"> 276 276 <xsd:annotation> 277 277 <xsd:documentation> … … 281 281 </xsd:annotation> 282 282 </xsd:attribute> 283 <xsd:attribute name="FirstC" type="xsd:integer" default="0" >283 <xsd:attribute name="FirstC" type="xsd:integer" default="0" use="optional"> 284 284 <xsd:annotation> 285 285 <xsd:documentation> … … 289 289 </xsd:annotation> 290 290 </xsd:attribute> 291 <xsd:attribute name="NumPlanes" type="xsd:integer">291 <xsd:attribute name="NumPlanes" use="optional" type="xsd:integer"> 292 292 <xsd:annotation> 293 293 <xsd:documentation> … … 301 301 </xsd:element> 302 302 303 <xsd:element name="Plane"> 303 <xsd:element name="Plane"> <!-- top level definition --> 304 304 <xsd:annotation> 305 305 <xsd:documentation> … … 318 318 </xsd:documentation> 319 319 </xsd:annotation> 320 <xsd:element name="HashSHA1" type="Hex40" />320 <xsd:element name="HashSHA1" type="Hex40" minOccurs="1" maxOccurs="1"/> 321 321 </xsd:choice> 322 322 </xsd:sequence> … … 355 355 </xsd:complexType> 356 356 357 <xsd:element name="Experiment"> 357 <xsd:element name="Experiment"> <!-- top level definition --> 358 358 <xsd:annotation> 359 359 <xsd:documentation> … … 368 368 <xsd:complexType> 369 369 <xsd:sequence> 370 <xsd:element ref="Description" minOccurs="0" />371 <xsd:element ref="ExperimenterRef" >370 <xsd:element ref="Description" minOccurs="0" maxOccurs="1"/> 371 <xsd:element ref="ExperimenterRef" minOccurs="1" maxOccurs="1"> 372 372 <xsd:annotation> 373 373 <xsd:documentation> … … 407 407 </xsd:complexType> 408 408 </xsd:element> 409 <xsd:element name="ExperimentRef"> 409 <xsd:element name="ExperimentRef"> <!-- top level definition --> 410 410 <xsd:complexType> 411 411 <xsd:complexContent> … … 417 417 </xsd:element> 418 418 419 <xsd:element name="MicrobeamManipulation"> 419 <xsd:element name="MicrobeamManipulation"> <!-- top level definition --> 420 420 <xsd:annotation> 421 421 <xsd:documentation> … … 452 452 </xsd:element> 453 453 454 <xsd:element name="MicrobeamManipulationRef"> 454 <xsd:element name="MicrobeamManipulationRef"> <!-- top level definition --> 455 455 <xsd:complexType> 456 456 <xsd:complexContent> … … 461 461 </xsd:complexType> 462 462 </xsd:element> 463 <xsd:element name="LogicalChannel"> 463 <xsd:element name="LogicalChannel"> <!-- top level definition --> 464 464 <xsd:annotation> 465 465 <xsd:documentation> … … 472 472 The SamplesPerPixel attribute is the number of channel components in the logical channel. 473 473 The IlluminationType attribute is a string enumeration which may be set to 'Transmitted', 'Epifluorescence', 'Oblique', or 'NonLinear'. 474 The optional Pinhole Aize attribute allows specifying adjustable pin hole diameters for confocal microscopes.474 The optional PinholeSize attribute allows specifying adjustable pin hole diameters for confocal microscopes. 475 475 The PhotometricInterpretation attribute is used to describe how to display a multi-component channel. This attribute may be set to: 476 476 'monochrome', 'RGB', 'ARGB', 'CMYK', 'HSV'. The default for single-component channels is 'monochrome'. … … 489 489 <xsd:complexType> 490 490 <xsd:sequence> 491 <xsd:element ref="LightSourceRef" minOccurs="0" />492 <xsd:element ref="OTFRef" minOccurs="0" />493 <xsd:element ref="DetectorRef" minOccurs="0" />494 <xsd:element ref="FilterSetRef" minOccurs="0" />495 <xsd:element ref="ChannelComponent" m axOccurs="unbounded"/>491 <xsd:element ref="LightSourceRef" minOccurs="0" maxOccurs="1"/> 492 <xsd:element ref="OTFRef" minOccurs="0" maxOccurs="1"/> 493 <xsd:element ref="DetectorRef" minOccurs="0" maxOccurs="1"/> 494 <xsd:element ref="FilterSetRef" minOccurs="0" maxOccurs="1"/> 495 <xsd:element ref="ChannelComponent" minOccurs="1" maxOccurs="unbounded"/> 496 496 </xsd:sequence> 497 497 <xsd:attribute name="ID" use="required" type="LogicalChannelID"/> … … 514 514 </xsd:simpleType> 515 515 </xsd:attribute> 516 <xsd:attribute name="PinholeSize" type="xsd:positiveInteger"/>517 <xsd:attribute name="PhotometricInterpretation" default="Monochrome" >516 <xsd:attribute name="PinholeSize" use="optional" type="xsd:float"/> 517 <xsd:attribute name="PhotometricInterpretation" default="Monochrome" use="optional"> 518 518 <xsd:annotation> 519 519 <xsd:documentation> … … 533 533 </xsd:simpleType> 534 534 </xsd:attribute> 535 <xsd:attribute name="Mode" >535 <xsd:attribute name="Mode" use="optional"> 536 536 <xsd:simpleType> 537 537 <xsd:restriction base="xsd:string"> … … 554 554 </xsd:simpleType> 555 555 </xsd:attribute> 556 <xsd:attribute name="ContrastMethod" >556 <xsd:attribute name="ContrastMethod" use="optional"> 557 557 <xsd:simpleType> 558 558 <xsd:restriction base="xsd:string"> … … 575 575 </xsd:complexType> 576 576 </xsd:element> 577 <xsd:element name="LogicalChannelRef"> 577 <xsd:element name="LogicalChannelRef"> <!-- top level definition --> 578 578 <xsd:complexType> 579 579 <xsd:complexContent> … … 584 584 </xsd:complexType> 585 585 </xsd:element> 586 <xsd:element name="DisplayOptions"> 587 <xsd:annotation> 588 <xsd:documentation> 589 There is optionally one of these per Image. 586 <xsd:element name="DisplayOptions"> <!-- top level definition --> 587 <xsd:annotation> 588 <xsd:documentation> 589 There is optionally one of these per Image. They provide support for the Origionam OME Perl server. 590 590 This specifies mapping of image channel components to RGB or greyscale colorspace with one byte per pixel per RGB channel. 591 591 RedChannel, GreenChannel, BlueChannel, and GreyChannel specify the scaling of pixel values to 8-bit colorspace values. … … 596 596 The range of timepoints to display is specified by the TStart and TStop attributes. 597 597 The MIME type of the desired video format is specified by Movie's MIMEtype attribute. 598 The ROI element describes a 3-D region of interest. It is up to the viewer to either display the ROI only, 599 or to simply mark it somehow. 598 The ROI element originally describes a 3-D region of interest. It now use the new ROI 599 model. It is up to the loader to convert the new ROI structure to the old format if 600 it is required. It is up to the viewer to either display the ROI only, or to simply 601 mark it somehow. 600 602 </xsd:documentation> 601 603 </xsd:annotation> 602 604 <xsd:complexType> 603 605 <xsd:sequence> 604 <xsd:element ref="RedChannel" />605 <xsd:element ref="GreenChannel" />606 <xsd:element ref="BlueChannel" />607 <xsd:element ref="GreyChannel" />608 <xsd:element ref="Projection" minOccurs="0" />609 <xsd:element ref="Time" minOccurs="0" />606 <xsd:element ref="RedChannel" minOccurs="1" maxOccurs="1"/> 607 <xsd:element ref="GreenChannel" minOccurs="1" maxOccurs="1"/> 608 <xsd:element ref="BlueChannel" minOccurs="1" maxOccurs="1"/> 609 <xsd:element ref="GreyChannel" minOccurs="1" maxOccurs="1"/> 610 <xsd:element ref="Projection" minOccurs="0" maxOccurs="1"/> 611 <xsd:element ref="Time" minOccurs="0" maxOccurs="1"/> 610 612 <xsd:element ref="ROI" minOccurs="0" maxOccurs="unbounded"/> 611 613 </xsd:sequence> … … 625 627 </xsd:complexType> 626 628 </xsd:element> 627 <xsd:element name="RedChannel" type="ChannelSpecType"> 629 <xsd:element name="RedChannel" type="ChannelSpecType"> <!-- top level definition --> 628 630 <xsd:annotation> 629 631 <xsd:documentation> … … 634 636 </xsd:annotation> 635 637 </xsd:element> 636 <xsd:element name="GreenChannel" type="ChannelSpecType"> 638 <xsd:element name="GreenChannel" type="ChannelSpecType"> <!-- top level definition --> 637 639 <xsd:annotation> 638 640 <xsd:documentation> … … 643 645 </xsd:annotation> 644 646 </xsd:element> 645 <xsd:element name="BlueChannel" type="ChannelSpecType"> 647 <xsd:element name="BlueChannel" type="ChannelSpecType"> <!-- top level definition --> 646 648 <xsd:annotation> 647 649 <xsd:documentation> … … 652 654 </xsd:annotation> 653 655 </xsd:element> 654 <xsd:element name="GreyChannel"> 656 <xsd:element name="GreyChannel"> <!-- top level definition --> 655 657 <xsd:annotation> 656 658 <xsd:documentation> … … 677 679 </xsd:complexType> 678 680 </xsd:element> 679 <xsd:element name="Projection"> 681 <xsd:element name="Projection"> <!-- top level definition --> 680 682 <xsd:annotation> 681 683 <xsd:documentation> … … 690 692 </xsd:complexType> 691 693 </xsd:element> 692 <xsd:element name="Time"> 694 <xsd:element name="Time"> <!-- top level definition --> 693 695 <xsd:annotation> 694 696 <xsd:documentation> … … 705 707 </xsd:complexType> 706 708 </xsd:element> 707 <xsd:element name="Instrument"> 709 <xsd:element name="Instrument"> <!-- top level definition --> 708 710 <xsd:annotation> 709 711 <xsd:documentation> … … 725 727 <xsd:complexType> 726 728 <xsd:sequence> 727 <xsd:element ref="Microscope" />729 <xsd:element ref="Microscope" minOccurs="1" maxOccurs="1"/> 728 730 <xsd:element ref="LightSource" minOccurs="0" maxOccurs="unbounded"/> 729 731 <xsd:element ref="Detector" minOccurs="0" maxOccurs="unbounded"/> … … 737 739 </xsd:complexType> 738 740 </xsd:element> 739 <xsd:element name="StageLabel"> 741 <xsd:element name="StageLabel"> <!-- top level definition --> 740 742 <xsd:annotation> 741 743 <xsd:documentation> … … 750 752 </xsd:complexType> 751 753 </xsd:element> 752 <xsd:element name="Experimenter"> 754 <xsd:element name="Experimenter"> <!-- top level definition --> 753 755 <xsd:annotation> 754 756 <xsd:documentation> … … 761 763 <xsd:complexType> 762 764 <xsd:sequence> 763 <xsd:choice >765 <xsd:choice minOccurs="1" maxOccurs="1"> 764 766 <xsd:annotation> 765 767 <xsd:documentation> … … 777 779 <xsd:element ref="LastName" minOccurs="1" maxOccurs="1"/> 778 780 <xsd:element ref="Email" minOccurs="0" maxOccurs="1"/> 779 <xsd:element ref="Institution" minOccurs="0" />781 <xsd:element ref="Institution" minOccurs="0" maxOccurs="1"/> 780 782 <xsd:element ref="OMEName" minOccurs="0" maxOccurs="1"/> 781 783 </xsd:sequence> … … 795 797 </xsd:complexType> 796 798 </xsd:element> 797 <xsd:element name="OMEName" type="xsd:string"> 799 <xsd:element name="OMEName" type="xsd:string"> <!-- top level definition --> 798 800 <xsd:annotation> 799 801 <xsd:documentation>This is the username of the experimenter (in a 'unix' or 'database' sense).</xsd:documentation> 800 802 </xsd:annotation> 801 803 </xsd:element> 802 <xsd:element name="FirstName" type="xsd:string"> 804 <xsd:element name="FirstName" type="xsd:string"> <!-- top level definition --> 803 805 <xsd:annotation> 804 806 <xsd:documentation>First name, optionally containing a middle initial.</xsd:documentation> 805 807 </xsd:annotation> 806 808 </xsd:element> 807 <xsd:element name="LastName" type="xsd:string"> 809 <xsd:element name="LastName" type="xsd:string"> <!-- top level definition --> 808 810 <xsd:annotation> 809 811 <xsd:documentation>A person's last or surname.</xsd:documentation> 810 812 </xsd:annotation> 811 813 </xsd:element>
