Changeset 205 for Xml/Working/ome.xsd
- Timestamp:
- 09/18/08 14:23:44 (4 months ago)
- Files:
-
- 1 modified
-
Xml/Working/ome.xsd (modified) (102 diffs)
Legend:
- Unmodified
- Added
- Removed
-
Xml/Working/ome.xsd
r189 r205 24 24 xmlns:CA="http://www.openmicroscopy.org/Schemas/CA/2008-02" 25 25 xmlns:SPW="http://www.openmicroscopy.org/Schemas/SPW/2008-02" 26 xmlns:SA="http://www.openmicroscopy.org/Schemas/SA/2008-02" 26 27 xmlns:xml="http://www.w3.org/XML/1998/namespace" 27 28 version="2" … … 30 31 <xsd:import namespace="http://www.openmicroscopy.org/Schemas/STD/2008-02" schemaLocation="http://www.openmicroscopy.org/Schemas/STD/2008-02/STD.xsd"/> 31 32 <xsd:import namespace="http://www.openmicroscopy.org/Schemas/BinaryFile/2008-02" schemaLocation="http://www.openmicroscopy.org/Schemas/BinaryFile/2008-02/BinaryFile.xsd"/> 32 <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"/> 33 34 <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"/> 34 36 <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/> 37 35 38 <xsd:annotation> 36 39 <xsd:documentation> … … 41 44 </xsd:documentation> 42 45 </xsd:annotation> 43 <xsd:element name="OME"> 46 <xsd:element name="OME"> <!-- top level definition --> 44 47 <xsd:annotation> 45 48 <xsd:documentation> … … 61 64 <xsd:element ref="Instrument" minOccurs="0" maxOccurs="unbounded"/> 62 65 <xsd:element ref="Image" minOccurs="0" maxOccurs="unbounded"/> 63 <xsd:element ref="STD:SemanticTypeDefinitions" minOccurs="0"/> 64 <xsd:element ref="AML:AnalysisModuleLibrary" minOccurs="0"/> 65 <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"/> 66 70 </xsd:sequence> 67 <xsd:attribute name="UUID" type="UniversallyUniqueIdentifier"/>68 </xsd:complexType> 69 </xsd:element> 70 <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 --> 71 75 <xsd:annotation> 72 76 <xsd:documentation> … … 88 92 <xsd:complexType> 89 93 <xsd:sequence> 90 <xsd:element ref="CreationDate" />91 <xsd:element ref="ExperimenterRef" minOccurs="0" />92 <xsd:element ref="Description" minOccurs="0" />93 <xsd:element ref="ExperimentRef" minOccurs="0" />94 <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"/> 95 99 <xsd:element ref="DatasetRef" minOccurs="0" maxOccurs="unbounded"/> 96 <xsd:element ref="InstrumentRef" minOccurs="0" />97 <xsd:element ref="ObjectiveRef" minOccurs="0" />98 <xsd:element ref="ImagingEnvironment" minOccurs="0" />99 <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"/> 100 104 <xsd:element ref="LogicalChannel" minOccurs="0" maxOccurs="unbounded"/> 101 <xsd:element ref="DisplayOptions" minOccurs="0" />102 <xsd:element ref="StageLabel" minOccurs="0" />103 <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"/> 104 108 <xsd:element ref="Region" minOccurs="0" maxOccurs="unbounded"/> 105 <xsd:element ref="CA:CustomAttributes" minOccurs="0" />109 <xsd:element ref="CA:CustomAttributes" minOccurs="0" maxOccurs="1"/> 106 110 <xsd:element ref="ROI" minOccurs="0" maxOccurs="unbounded"/> 107 111 <xsd:element ref="MicrobeamManipulation" minOccurs="0" maxOccurs="unbounded"/> … … 117 121 </xsd:annotation> 118 122 </xsd:attribute> 119 <xsd:attribute name="AcquiredPixels" type="PixelsID">123 <xsd:attribute name="AcquiredPixels" use="optional" type="PixelsID"> 120 124 <xsd:annotation> 121 125 <xsd:documentation> … … 128 132 </xsd:complexType> 129 133 </xsd:element> 130 <xsd:element name="CreationDate" type="xsd:dateTime"> 134 <xsd:element name="CreationDate" type="xsd:dateTime"> <!-- top level definition --> 131 135 <xsd:annotation> 132 136 <xsd:documentation> … … 136 140 </xsd:annotation> 137 141 </xsd:element> 138 <xsd:element name="Pixels"> 142 <xsd:element name="Pixels"> <!-- top level definition --> 139 143 <xsd:annotation> 140 144 <xsd:documentation> … … 148 152 <xsd:complexType> 149 153 <xsd:sequence> 150 <xsd:choice m axOccurs="unbounded">151 <xsd:element ref="Bin:BinData" />152 <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"/> 153 157 </xsd:choice> 154 158 <xsd:element ref="Plane" minOccurs="0" maxOccurs="unbounded"/> … … 198 202 </xsd:annotation> 199 203 </xsd:attribute> 200 <xsd:attribute name="PhysicalSizeX" type="xsd:float">204 <xsd:attribute name="PhysicalSizeX" use="optional" type="xsd:float"> 201 205 <xsd:annotation> 202 206 <xsd:documentation>Physical size of a pixel</xsd:documentation> 203 207 </xsd:annotation> 204 208 </xsd:attribute> 205 <xsd:attribute name="PhysicalSizeY" type="xsd:float">209 <xsd:attribute name="PhysicalSizeY" use="optional" type="xsd:float"> 206 210 <xsd:annotation> 207 211 <xsd:documentation>Physical size of a pixel</xsd:documentation> 208 212 </xsd:annotation> 209 213 </xsd:attribute> 210 <xsd:attribute name="PhysicalSizeZ" type="xsd:float">214 <xsd:attribute name="PhysicalSizeZ" use="optional" type="xsd:float"> 211 215 <xsd:annotation> 212 216 <xsd:documentation>Physical size of a pixel</xsd:documentation> 213 217 </xsd:annotation> 214 218 </xsd:attribute> 215 <xsd:attribute name="TimeIncrement" type="xsd:float"/>216 <xsd:attribute name="WaveStart" type="xsd:positiveInteger"/>217 <xsd:attribute name="WaveIncrement" type="xsd:positiveInteger"/>218 </xsd:complexType> 219 </xsd:element> 220 <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 --> 221 225 <xsd:annotation> 222 226 <xsd:documentation> … … 226 230 <xsd:complexType> 227 231 <xsd:sequence> 228 <xsd:element name="UUID" minOccurs="0" >232 <xsd:element name="UUID" minOccurs="0" maxOccurs="1"> 229 233 <xsd:annotation> 230 234 <xsd:documentation> … … 236 240 <xsd:simpleContent> 237 241 <xsd:extension base = "UniversallyUniqueIdentifier"> 238 <xsd:attribute name="FileName" type="xsd:string">242 <xsd:attribute name="FileName" use="optional" type="xsd:string"> 239 243 <xsd:annotation> 240 244 <xsd:documentation> … … 253 257 </xsd:element> 254 258 </xsd:sequence> 255 <xsd:attribute name="IFD" type="xsd:integer" default="0" >259 <xsd:attribute name="IFD" type="xsd:integer" default="0" use="optional"> 256 260 <xsd:annotation> 257 261 <xsd:documentation> … … 261 265 </xsd:annotation> 262 266 </xsd:attribute> 263 <xsd:attribute name="FirstZ" type="xsd:integer" default="0" >267 <xsd:attribute name="FirstZ" type="xsd:integer" default="0" use="optional"> 264 268 <xsd:annotation> 265 269 <xsd:documentation> … … 269 273 </xsd:annotation> 270 274 </xsd:attribute> 271 <xsd:attribute name="FirstT" type="xsd:integer" default="0" >275 <xsd:attribute name="FirstT" type="xsd:integer" default="0" use="optional"> 272 276 <xsd:annotation> 273 277 <xsd:documentation> … … 277 281 </xsd:annotation> 278 282 </xsd:attribute> 279 <xsd:attribute name="FirstC" type="xsd:integer" default="0" >283 <xsd:attribute name="FirstC" type="xsd:integer" default="0" use="optional"> 280 284 <xsd:annotation> 281 285 <xsd:documentation> … … 285 289 </xsd:annotation> 286 290 </xsd:attribute> 287 <xsd:attribute name="NumPlanes" type="xsd:integer">291 <xsd:attribute name="NumPlanes" use="optional" type="xsd:integer"> 288 292 <xsd:annotation> 289 293 <xsd:documentation> … … 297 301 </xsd:element> 298 302 299 <xsd:element name="Plane"> 303 <xsd:element name="Plane"> <!-- top level definition --> 300 304 <xsd:annotation> 301 305 <xsd:documentation> … … 314 318 </xsd:documentation> 315 319 </xsd:annotation> 316 <xsd:element name="HashSHA1" type="Hex40" />320 <xsd:element name="HashSHA1" type="Hex40" minOccurs="1" maxOccurs="1"/> 317 321 </xsd:choice> 318 322 </xsd:sequence> … … 351 355 </xsd:complexType> 352 356 353 <xsd:element name="Experiment"> 357 <xsd:element name="Experiment"> <!-- top level definition --> 354 358 <xsd:annotation> 355 359 <xsd:documentation> … … 364 368 <xsd:complexType> 365 369 <xsd:sequence> 366 <xsd:element ref="Description" minOccurs="0" />367 <xsd:element ref="ExperimenterRef" >370 <xsd:element ref="Description" minOccurs="0" maxOccurs="1"/> 371 <xsd:element ref="ExperimenterRef" minOccurs="1" maxOccurs="1"> 368 372 <xsd:annotation> 369 373 <xsd:documentation> … … 403 407 </xsd:complexType> 404 408 </xsd:element> 405 <xsd:element name="ExperimentRef"> 409 <xsd:element name="ExperimentRef"> <!-- top level definition --> 406 410 <xsd:complexType> 407 411 <xsd:complexContent> … … 413 417 </xsd:element> 414 418 415 <xsd:element name="MicrobeamManipulation"> 419 <xsd:element name="MicrobeamManipulation"> <!-- top level definition --> 416 420 <xsd:annotation> 417 421 <xsd:documentation> … … 448 452 </xsd:element> 449 453 450 <xsd:element name="MicrobeamManipulationRef"> 454 <xsd:element name="MicrobeamManipulationRef"> <!-- top level definition --> 451 455 <xsd:complexType> 452 456 <xsd:complexContent> … … 457 461 </xsd:complexType> 458 462 </xsd:element> 459 <xsd:element name="LogicalChannel"> 463 <xsd:element name="LogicalChannel"> <!-- top level definition --> 460 464 <xsd:annotation> 461 465 <xsd:documentation> … … 468 472 The SamplesPerPixel attribute is the number of channel components in the logical channel. 469 473 The IlluminationType attribute is a string enumeration which may be set to 'Transmitted', 'Epifluorescence', 'Oblique', or 'NonLinear'. 470 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. 471 475 The PhotometricInterpretation attribute is used to describe how to display a multi-component channel. This attribute may be set to: 472 476 'monochrome', 'RGB', 'ARGB', 'CMYK', 'HSV'. The default for single-component channels is 'monochrome'. … … 485 489 <xsd:complexType> 486 490 <xsd:sequence> 487 <xsd:element ref="LightSourceRef" minOccurs="0" />488 <xsd:element ref="OTFRef" minOccurs="0" />489 <xsd:element ref="DetectorRef" minOccurs="0" />490 <xsd:element ref="FilterSetRef" minOccurs="0" />491 <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"/> 492 496 </xsd:sequence> 493 497 <xsd:attribute name="ID" use="required" type="LogicalChannelID"/> 494 <xsd:attribute name="Name" type="xsd:string"/>495 <xsd:attribute name="SamplesPerPixel" type="xsd:integer"/>496 <xsd:attribute name="SecondaryEmissionFilter" type="FilterID"/>497 <xsd:attribute name="SecondaryExcitationFilter" type="FilterID"/>498 <xsd:attribute name="IlluminationType" >498 <xsd:attribute name="Name" use="optional" type="xsd:string"/> 499 <xsd:attribute name="SamplesPerPixel" use="optional" type="xsd:integer"/> 500 <xsd:attribute name="SecondaryEmissionFilter" use="optional" type="FilterID"/> 501 <xsd:attribute name="SecondaryExcitationFilter" use="optional" type="FilterID"/> 502 <xsd:attribute name="IlluminationType" use="optional"> 499 503 <xsd:annotation><xsd:documentation> 500 504 Attribute is called Illumination in EA diagram - ajp … … 510 514 </xsd:simpleType> 511 515 </xsd:attribute> 512 <xsd:attribute name="PinholeSize" type="xsd:positiveInteger"/>513 <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"> 514 518 <xsd:annotation> 515 519 <xsd:documentation> … … 529 533 </xsd:simpleType> 530 534 </xsd:attribute> 531 <xsd:attribute name="Mode" >535 <xsd:attribute name="Mode" use="optional"> 532 536 <xsd:simpleType> 533 537 <xsd:restriction base="xsd:string"> … … 550 554 </xsd:simpleType> 551 555 </xsd:attribute> 552 <xsd:attribute name="ContrastMethod" >556 <xsd:attribute name="ContrastMethod" use="optional"> 553 557 <xsd:simpleType> 554 558 <xsd:restriction base="xsd:string"> … … 564 568 </xsd:simpleType> 565 569 </xsd:attribute> 566 <xsd:attribute name="ExWave" type="xsd:positiveInteger"/> 567 <xsd:attribute name="EmWave" type="xsd:positiveInteger"/> 568 <xsd:attribute name="Fluor" type="xsd:string"/> 569 <xsd:attribute name="NdFilter" type="xsd:float"/> 570 <xsd:attribute name="PockelCellSetting" type="xsd:integer"/> 571 </xsd:complexType> 572 </xsd:element> 573 <xsd:element name="DisplayOptions"> 574 <xsd:annotation> 575 <xsd:documentation> 576 There is optionally one of these per Image. 570 <xsd:attribute name="ExWave" use="optional" type="xsd:positiveInteger"/> 571 <xsd:attribute name="EmWave" use="optional" type="xsd:positiveInteger"/> 572 <xsd:attribute name="Fluor" use="optional" type="xsd:string"/> 573 <xsd:attribute name="NdFilter" use="optional" type="xsd:float"/> 574 <xsd:attribute name="PockelCellSetting" use="optional" type="xsd:integer"/> 575 </xsd:complexType> 576 </xsd:element> 577 <xsd:element name="LogicalChannelRef"> <!-- top level definition --> 578 <xsd:complexType> 579 <xsd:complexContent> 580 <xsd:extension base="Reference"> 581 <xsd:attribute name="ID" use="required" type="LogicalChannelID"/> 582 </xsd:extension> 583 </xsd:complexContent> 584 </xsd:complexType> 585 </xsd:element> 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 Origional OME Perl server. 577 590 This specifies mapping of image channel components to RGB or greyscale colorspace with one byte per pixel per RGB channel. 578 591 RedChannel, GreenChannel, BlueChannel, and GreyChannel specify the scaling of pixel values to 8-bit colorspace values. … … 583 596 The range of timepoints to display is specified by the TStart and TStop attributes. 584 597 The MIME type of the desired video format is specified by Movie's MIMEtype attribute. 585 The ROI element describes a 3-D region of interest. It is up to the viewer to either display the ROI only, 586 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. 587 602 </xsd:documentation> 588 603 </xsd:annotation> 589 604 <xsd:complexType> 590 605 <xsd:sequence> 591 <xsd:element ref="RedChannel" />592 <xsd:element ref="GreenChannel" />593 <xsd:element ref="BlueChannel" />594 <xsd:element ref="GreyChannel" />595 <xsd:element ref="Projection" minOccurs="0" />596 <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"/> 597 612 <xsd:element ref="ROI" minOccurs="0" maxOccurs="unbounded"/> 598 613 </xsd:sequence> 599 <xsd:attribute name="Zoom" type="xsd:float"/>614 <xsd:attribute name="Zoom" use="optional" type="xsd:float"/> 600 615 <xsd:attribute name="ID" use="required" type="DisplayOptionsID"/> 601 616 <xsd:attribute name="Display" use="required"> … … 612 627 </xsd:complexType> 613 628 </xsd:element> 614 <xsd:element name="RedChannel" type="ChannelSpecType"> 629 <xsd:element name="RedChannel" type="ChannelSpecType"> <!-- top level definition --> 615 630 <xsd:annotation> 616 631 <xsd:documentation> … … 621 636 </xsd:annotation> 622 637 </xsd:element> 623 <xsd:element name="GreenChannel" type="ChannelSpecType"> 638 <xsd:element name="GreenChannel" type="ChannelSpecType"> <!-- top level definition --> 624 639 <xsd:annotation> 625 640 <xsd:documentation> … … 630 645 </xsd:annotation> 631 646 </xsd:element> 632 <xsd:element name="BlueChannel" type="ChannelSpecType"> 647 <xsd:element name="BlueChannel" type="ChannelSpecType"> <!-- top level definition --> 633 648 <xsd:annotation> 634 649 <xsd:documentation> … … 639 654 </xsd:annotation> 640 655 </xsd:element> 641 <xsd:element name="GreyChannel"> 656 <xsd:element name="GreyChannel"> <!-- top level definition --> 642 657 <xsd:annotation> 643 658 <xsd:documentation> … … 651 666 <xsd:complexContent> 652 667 <xsd:extension base="ChannelSpecType"> 653 <xsd:attribute name="ColorMap" default="Greyscale">668 <xsd:attribute name="ColorMap" use="optional" default="Greyscale"> 654 669 <xsd:simpleType> 655 670 <xsd:restriction base="xsd:string"> … … 664 679 </xsd:complexType> 665 680 </xsd:element> 666 <xsd:element name="Projection"> 681 <xsd:element name="Projection"> <!-- top level definition --> 667 682 <xsd:annotation> 668 683 <xsd:documentation> … … 673 688 </xsd:annotation> 674 689 <xsd:complexType> 675 <xsd:attribute name="ZStart" type="xsd:integer"/>676 <xsd:attribute name="ZStop" type="xsd:integer"/>677 </xsd:complexType> 678 </xsd:element> 679 <xsd:element name="Time"> 690 <xsd:attribute name="ZStart" use="optional" type="xsd:integer"/> 691 <xsd:attribute name="ZStop" use="optional" type="xsd:integer"/> 692 </xsd:complexType> 693 </xsd:element> 694 <xsd:element name="Time"> <!-- top level definition --> 680 695 <xsd:annotation> 681 696 <xsd:documentation>
