Changeset 189 for Xml/Working

Timestamp:

07/01/08 15:52:04 (5 months ago)

Author:

andrew

Message:

Minor changes to text in the index pages.

Location:

Xml/Working

Files:

• SPW.xsd (modified) (1 diff)
• STD.xsd (modified) (1 diff)
• min-sample.xml (modified) (1 diff)
• ome.xsd (modified) (8 diffs)
• omeOxySvnProject.xpr (modified) (1 diff)

Xml/Working/SPW.xsd

@@ -276 +276 @@
                 A Well is a component of the Well/Plate/Screen construct to describe screening applications.
                 A Well has a number of WellSample elements that link to the Images collected in this well.
-                                The ReagentRef links any Reagents that were used in this Well. A well is part of one or more Plates.
+                                The ReagentRef links any Reagents that were used in this Well. A well is part of only one Plate.
                                 The origin for the row and column identifiers is the top left corner of the plate starting at zero.
                                 i.e The top left well of a plate is index (0,0)

Xml/Working/STD.xsd

@@ -87 +87 @@
                         <attribute name = "AppliesTo" use = "required">
                                 <annotation>
-                                        <documentation>This specifies what this record is an attribute of. The options are Global, Dataset, Image, or Region.
+                                        <documentation>This specifies what this record is an attribute of. The options are Global, Dataset, Image, or Region (was called Feature hence letter F).
                                         </documentation>
                                 </annotation>

Xml/Working/min-sample.xml

@@ -5 +5 @@
  xsi:schemaLocation="http://www.openmicroscopy.org/Schemas/OME/2008-02 http://www.openmicroscopy.org/Schemas/OME/2008-02/ome.xsd">
     <ome:Image ID="Image:a" Name="Name92" DefaultPixels="Pixels:b">
-        <ome:CreationDate>2006-05-04T18:13:51.0Z</ome:CreationDate>
+        <ome:CreationDate>2008-03-04T14:17:43.0Z</ome:CreationDate>
         <ome:Pixels ID="Pixels:a" DimensionOrder="XYZCT" PixelType="int8" BigEndian="false" SizeX="2" SizeY="2" SizeZ="2"
              SizeC="2" SizeT="2">

Xml/Working/ome.xsd

@@ -25 +25 @@
         xmlns:SPW="http://www.openmicroscopy.org/Schemas/SPW/2008-02" 
         xmlns:xml="http://www.w3.org/XML/1998/namespace"
-        version="1" 
+        version="2" 
         elementFormDefault="qualified">
         <xsd:import namespace="http://www.openmicroscopy.org/Schemas/AnalysisModule/2008-02" schemaLocation="http://www.openmicroscopy.org/Schemas/AnalysisModule/2008-02/AnalysisModule.xsd"/>
@@ -36 +36 @@
                 <xsd:documentation>
                         Open Microscopy Environment
-                        OME XML Schema February 2008 - Version 1
+                        OME XML Schema February 2008 - Update Version 2 May 2008
                         Author:  Ilya G. Goldberg, Andrew J Patterson
                         Copyright 2002 - 2008 OME. All rights reserved.
@@ -95 +95 @@
                                 <xsd:element ref="DatasetRef" minOccurs="0" maxOccurs="unbounded"/>
                                 <xsd:element ref="InstrumentRef" minOccurs="0"/>
-                                <xsd:element ref="ObjectiveSettingsRef" minOccurs="0"/>
+                                <xsd:element ref="ObjectiveRef" minOccurs="0"/>
                                 <xsd:element ref="ImagingEnvironment" minOccurs="0"/>
                                 <xsd:element ref="Thumbnail" minOccurs="0"/>
@@ -806 +806 @@
                         <xsd:documentation>
                                 A description of the microscope's objective lens.
-                                Required elements include the lens numerical aperture, and the magnification, both of which a floating point (real) numbers.
+                                Required elements include the lens numerical aperture, 
+                                and the magnification, both of which a floating 
+                                point (real) numbers.
+                                The values are those that are fixed for a particular 
+                                objective: either because it has been manufactured to 
+                                this specification or the value has been measured on 
+                                this particular objective.
+                                Correction: This is the type of correction coating applied to this lens.
+                                Immersion: This is the types of immersion medium the lens is designed to
+                                work with. It is not the same as 'Medium' in ObjectiveRef (a 
+                                single type) as here Immersion can have compound values like 'Multi'.
+                                LensNA: The numerical aperture of the lens (as a float)
+                                NominalMagnification: The specified magnification e.g. x10
+                                CalibratedMagnification: The measured magnification e.g. x10.3
+                                WorkingDistance: WorkingDistance of the lense. The Units are um.
                         </xsd:documentation>
                 </xsd:annotation>
@@ -827 +841 @@
                 </xsd:complexType>
         </xsd:element>
-        <xsd:element name="ObjectiveSettings">
-                <xsd:annotation>
-                        <xsd:documentation>
-                                A description of the user settings on a microscope's objective lens.
-                        </xsd:documentation>
-                </xsd:annotation>
-                <xsd:complexType>
-                        <xsd:sequence>
-                                <xsd:element ref="ObjectiveRef"/>
-                        </xsd:sequence>
-                        <xsd:attribute name="CorrectionCollar" type="xsd:float"/>
-                        <xsd:attribute name="Medium" type="Medium"/>
-                        <xsd:attribute name="RefractiveIndex" type="xsd:float"/>
-                </xsd:complexType>
-        </xsd:element>
         <xsd:simpleType name="Medium">
                 <xsd:annotation>
                         <xsd:documentation>
-                                A description of a Medium used either for the sample or the lens.
+                                A description of a Medium used for the lens.
                         </xsd:documentation>
                 </xsd:annotation>
@@ -1262 +1261 @@
                 </xsd:restriction>
         </xsd:simpleType>
-        <xsd:simpleType name="ObjectiveSettingsID">
-                <xsd:restriction base="LSID">
-                        <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:ObjectiveSettings:\S+)|(ObjectiveSettings:\S+)"/>
-                </xsd:restriction>
-        </xsd:simpleType>
         <xsd:simpleType name="LightSourceID">
                 <xsd:restriction base="LSID">
@@ -1831 +1825 @@
         </xsd:element>
         <xsd:element name="ObjectiveRef">
+                <xsd:annotation>
+                        <xsd:documentation> 
+                                This holds the setting applied to an objective as well as a
+                                reference to the objective. 
+                                The ID is the objective used in this case.
+                                The CorrectionCollar is it normal an adjustable ring on the 
+                                objective. Each has an arbitrary scale on it so the values 
+                                is unit-less.
+                                The Medium is the actual immersion medium used in this case.
+                                The RefractiveIndex is that of the immersion medium. This is
+                                a ratio so it also unit-less.
+                        </xsd:documentation>
+                </xsd:annotation>
                 <xsd:complexType>
                         <xsd:complexContent>
@@ -1840 +1847 @@
                                                 <xsd:annotation><xsd:documentation>This is unit-less, it is a ratio.</xsd:documentation></xsd:annotation>
                                         </xsd:attribute>
-                                </xsd:extension>
-                        </xsd:complexContent>
-                </xsd:complexType>
-        </xsd:element>
-        <xsd:element name="ObjectiveSettingsRef">
-                <xsd:complexType>
-                        <xsd:complexContent>
-                                <xsd:extension base="Reference">
-                                        <xsd:attribute name="ID" use="required" type="ObjectiveSettingsID"/>
                                 </xsd:extension>
                         </xsd:complexContent>

Xml/Working/omeOxySvnProject.xpr

@@ -18 +18 @@
         <file name="min-sample.xml"/>
         <file name="MLI.xsd"/>
+        <file name="objective-sample.xml"/>
         <file name="ome.xsd"/>
         <file name="sample-updated.ome.xml"/>