Added cable3d and instance_cable3d to schema

- Added cable3d to schema
- Added instance_cable3d to schema
- Added corresponding schema tron validation

Author: stephane-pv

schema/pvcollada_references_2.0.sch

@@ -96,6 +96,19 @@
             </assert>
         </rule>
     </pattern>
+	
+    <!-- Pattern: Validate instance_cable3d references -->
+    <pattern id="instance_cable3d_references">
+        <rule context="pv:instance_cable3d">
+            <let name="instance_geom" value="ancestor::collada:instance_geometry"/>
+            <let name="geom_url" value="substring-after($instance_geom/@url, '#')"/>
+            <let name="referenced_geom" value="//collada:geometry[@id=$geom_url]"/>
+            <assert test="$referenced_geom//pv:cable3d">
+                instance_cable3d must be in an instance_geometry that references a geometry containing a cable3d element.
+                Referenced geometry: <value-of select="$geom_url"/>
+            </assert>
+        </rule>
+    </pattern>
 
     <!-- Pattern: Validate instance_table references -->
     <pattern id="instance_table_references">
@@ -131,7 +144,7 @@
             </assert>
         </rule>
     </pattern>
-    
+	   
     <!-- Pattern: Validate combiner3d component references -->
     <pattern id="combiner3d_component_references">
         <rule context="pv:combiner3d[@combiner_id]">
@@ -142,6 +155,17 @@
             </assert>
         </rule>
     </pattern>
+
+    <!-- Pattern: Validate cable3d component references -->
+    <pattern id="cable3d_component_references">
+        <rule context="pv:cable3d[@cable_id]">
+            <let name="cable_ref" value="@cable_id"/>
+            <assert test="//pv:cable[@id=$cable_ref]">
+                cable3d element references non-existent cable '<value-of select="$cable_ref"/>'.
+                Must reference a cable defined in components/cables.
+            </assert>
+        </rule>
+    </pattern>
 
     <!-- Pattern: Validate instance_inverter3d circuit references -->
     <pattern id="instance_inverter3d_circuit_references">
@@ -175,6 +199,17 @@
             </assert>
         </rule>
     </pattern>
+
+    <!-- Pattern: Validate instance_cable3d circuit references -->
+    <pattern id="instance_cable3d_circuit_references">
+        <rule context="pv:instance_cable3d[@cable_to_parent_id]">
+            <let name="cable_to_parent_ref" value="@cable_to_parent_id"/>
+            <assert test="//pv:cable_to_parent[@id=$cable_to_parent_ref]">
+                instance_cable3d element references non-existent cable_to_parent '<value-of select="$cable_to_parent_ref"/>'.
+                Must reference a cable_to_parent defined in the circuit.
+            </assert>
+        </rule>
+    </pattern>
 
     <!-- Pattern: Validate instance_inverter URL references -->
     <pattern id="instance_inverter_url_references">

schema/pvcollada_schema_0.1.xsd

@@ -1225,4 +1225,31 @@ xmlns:collada="http://www.collada.org/2008/03/COLLADASchema">
       </xs:attribute>
     </xs:complexType>
   </xs:element>
+  <xs:element name="cable3d">
+    <xs:annotation>
+      <xs:documentation>This tag should only appear in the extra/technique section of a Collada geometry tag to signal a 3D model
+      for a cable.</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attribute name="cable_id" type="xs:IDREF">
+        <xs:annotation>
+          <xs:documentation>Id of the cable defined in the components part</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="instance_cable3d">
+    <xs:annotation>
+      <xs:documentation>This tag should only appear in the extra/technique section of a Collada instance_geometry tag to signal a
+      3D instance of a cable. The attribute url of the instance_geometry must reference a Collada geometry that is a model
+      for a cable3d (has an cable3d tag in its extra/technique tag).</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attribute name="cable_to_parent_id" type="xs:IDREF">
+        <xs:annotation>
+          <xs:documentation>Id of the cable_to_parent defined in the circuit part</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
 </xs:schema>

schema/pvcollada_structure_2.0.sch

@@ -56,7 +56,7 @@
     <!-- Pattern: Geometry-level PVCollada elements placement -->
     <pattern id="geometry_pvcollada_placement">
         <rule context="pv:terrain | pv:rack | pv:post | pv:gap | 
-                      pv:inverter3d | pv:combiner3d | pv:transformer3d">
+                      pv:inverter3d | pv:combiner3d | pv:transformer3d | pv:cable3d">
             <assert test="parent::collada:technique/parent::collada:extra/parent::collada:geometry">
                 Element '<name/>' must be inside geometry/extra/technique
             </assert>
@@ -67,18 +67,18 @@
     <pattern id="geometry_unique_elements">
         <rule context="collada:technique[@profile='PVCollada-2.0'][parent::collada:extra/parent::collada:geometry]">
             <assert test="count(pv:terrain | pv:rack | pv:post | pv:gap | 
-                               pv:inverter3d | pv:combiner3d | pv:transformer3d) &lt;= 1">
-                Only one terrain, rack, post, gap, inverter3d, combiner3d or transformer3d element is allowed per geometry. 
+                               pv:inverter3d | pv:combiner3d | pv:transformer3d | pv:cable3d) &lt;= 1">
+                Only one terrain, rack, post, gap, inverter3d, combiner3d, transformer3d or cable3d element is allowed per geometry. 
                 Found <value-of select="count(pv:terrain | pv:rack | pv:post | pv:gap | 
-                                            pv:inverter3d | pv:combiner3d | pv:transformer3d)"/> elements.
+                                            pv:inverter3d | pv:combiner3d | pv:transformer3d | pv:cable3d)"/> elements.
             </assert>
         </rule>
     </pattern>
 
     <!-- Pattern: Instance_geometry-level PVCollada elements placement -->
     <pattern id="instance_geometry_pvcollada_placement">
         <rule context="pv:instance_terrain | pv:instance_rack | pv:instance_post | pv:instance_gap | 
-                      pv:instance_inverter3d | pv:instance_combiner3d | pv:instance_transformer3d">
+                      pv:instance_inverter3d | pv:instance_combiner3d | pv:instance_transformer3d | pv:instance_cable3d">
             <assert test="parent::collada:technique/parent::collada:extra/parent::collada:instance_geometry">
                 Element '<name/>' must be inside instance_geometry/extra/technique
             </assert>
@@ -89,10 +89,10 @@
     <pattern id="instance_geometry_unique_elements">
         <rule context="collada:technique[@profile='PVCollada-2.0'][parent::collada:extra/parent::collada:instance_geometry]">
             <assert test="count(pv:instance_terrain | pv:instance_rack | pv:instance_post | pv:instance_gap | 
-                               pv:instance_inverter3d | pv:instance_combiner3d | pv:instance_transformer3d) &lt;= 1">
-                Only one instance_terrain, instance_rack, instance_post, instance_gap, instance_inverter3d, instance_combiner3d or instance_transformer3d element is allowed per instance_geometry. 
+                               pv:instance_inverter3d | pv:instance_combiner3d | pv:instance_transformer3d | pv:instance_cable3d) &lt;= 1">
+                Only one instance_terrain, instance_rack, instance_post, instance_gap, instance_inverter3d, instance_combiner3d, instance_transformer3d or pv:instance_cable3d element is allowed per instance_geometry. 
                 Found <value-of select="count(pv:instance_terrain |  pv:instance_rack | pv:instance_post | pv:instance_gap | 
-                                            pv:instance_inverter3d | pv:instance_combiner3d | pv:instance_transformer3d)"/> elements.
+                                            pv:instance_inverter3d | pv:instance_combiner3d | pv:instance_transformer3d | pv:instance_cable3d)"/> elements.
             </assert>
         </rule>
     </pattern>