Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[335] CometVisu/trunk/visu
|
From: <j-...@us...> - 2011-05-14 07:17:20
|
Revision: 335
http://openautomation.svn.sourceforge.net/openautomation/?rev=335&view=rev
Author: j-n-k
Date: 2011-05-14 07:17:13 +0000 (Sat, 14 May 2011)
Log Message:
-----------
Fix bug #3301566
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/visu_config.xsd
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-05-14 06:42:23 UTC (rev 334)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-05-14 07:17:13 UTC (rev 335)
@@ -135,11 +135,7 @@
ga_list.push( src )
address[ '_' + src ] = [ this.getAttribute('transform') ];
});
- var actor = '<div class="actor">';
- if( $p.attr('pre') ) actor += '<div>' + $p.attr('pre') + '</div>';
- actor += '<div class="value">-</div>';
- if( $p.attr('post') ) actor += '<div>' + $p.attr('post') + '</div>';
- actor += '</div>';
+ var actor = '<div class="actor"><div class="value">-</div></div>';
var $actor = $(actor).data({
'address' : address,
'format' : $p.attr('format'),
@@ -152,8 +148,6 @@
},
update: defaultUpdate,
attributes: {
- pre: { type: 'string', required: false },
- post: { type: 'string', required: false },
format: { type: 'format', required: false },
mapping: { type: 'mapping', required: false },
styling: { type: 'styling', required: false }
@@ -287,11 +281,7 @@
ga_list.push( src )
address[ '_' + src ] = [ transform, readonly=='true' ];
});
- var actor = '<div class="actor switchUnpressed">';
- if( $p.attr('pre') ) actor += $p.attr('pre');
- actor += '<div class="value">-</div>';
- if( $p.attr('post') ) actor += $p.attr('post');
- actor += '</div>';
+ var actor = '<div class="actor switchUnpressed"><div class="value">-</div></div>';
var $actor = $(actor).data( {
'address' : address,
'mapping' : $p.attr('mapping'),
@@ -322,8 +312,6 @@
attributes: {
on_value: { type: 'string' , required: false },
off_value: { type: 'string' , required: false },
- pre: { type: 'string' , required: false },
- post: { type: 'string' , required: false },
mapping: { type: 'mapping' , required: false },
styling: { type: 'styling' , required: false }
},
@@ -465,13 +453,11 @@
address[ '_' + src ] = [ transform, readonly=='true' ];
});
var actor = '<div class="actor switchUnpressed">';
- if( $p.attr('pre') ) actor += $p.attr('pre');
var map = $p.attr('mapping');
if( mappings[map] && mappings[map][value] )
actor += '<div class="value">' + mappings[map][value] + '</div>';
else
actor += '<div class="value">' + value + '</div>';
- if( $p.attr('post') ) actor += $p.attr('post');
actor += '</div>';
var $actor = $(actor).data( {
'address' : address,
@@ -493,8 +479,6 @@
},
attributes: {
value: { type: 'string' , required: true },
- pre: { type: 'string' , required: false },
- post: { type: 'string' , required: false },
mapping: { type: 'mapping' , required: false },
styling: { type: 'styling' , required: false }
},
@@ -583,7 +567,7 @@
height: { type: 'string', required: false }
},
elements: {
- label: { type: 'string', required: false, multi: false }
+ label: { type: 'string', required: false, multi: false }
},
content: false
});
Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd 2011-05-14 06:42:23 UTC (rev 334)
+++ CometVisu/trunk/visu/visu_config.xsd 2011-05-14 07:17:13 UTC (rev 335)
@@ -213,8 +213,12 @@
</xsd:choice>
<xsd:attribute ref="styling" use="optional" />
<xsd:attribute ref="mapping" use="optional" />
- </xsd:complexType>
+ <xsd:attribute name="on_value" type="xsd:string" use="optional" />
+ <xsd:attribute name="off_value" type="xsd:string" use="optional" />
+ <xsd:attribute ref="pre" use="optional" />
+ <xsd:attribute ref="post" use="optional" />
+</xsd:complexType>
<xsd:complexType name="trigger">
<xsd:choice maxOccurs="unbounded" minOccurs="1">
@@ -224,6 +228,8 @@
<xsd:attribute ref="value" use="required" />
<xsd:attribute ref="mapping" use="optional"/>
<xsd:attribute ref="styling" use="optional"/>
+ <xsd:attribute ref="pre" use="optional" />
+ <xsd:attribute ref="post" use="optional" />
</xsd:complexType>
<xsd:complexType name="multitrigger">
@@ -245,7 +251,7 @@
<xsd:complexType name="slide">
<xsd:choice maxOccurs="unbounded" minOccurs="1">
- <xsd:element name="label" type="xsd:string" minOccurs="0"/>
+ <xsd:element name="label" type="xsd:string" minOccurs="0" maxOccurs="1" />
<xsd:element name="address" type="address" minOccurs="1" />
</xsd:choice>
<xsd:attribute ref="min" />
@@ -256,15 +262,15 @@
</xsd:complexType>
<xsd:complexType name="info">
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element name="label" type="xsd:string" />
- <xsd:element name="address" type="address" minOccurs="1"/>
- </xsd:choice>
- <xsd:attribute ref="pre" use="optional" />
- <xsd:attribute ref="post" use="optional" />
- <xsd:attribute ref="format" use="optional" />
- <xsd:attribute ref="styling" use="optional" />
- <xsd:attribute ref="mapping" use="optional" />
+ <xsd:choice maxOccurs="unbounded" minOccurs="1">
+ <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+ <xsd:element name="address" type="address" minOccurs="1"/>
+ </xsd:choice>
+ <xsd:attribute ref="pre" use="optional" />
+ <xsd:attribute ref="post" use="optional" />
+ <xsd:attribute ref="format" use="optional" />
+ <xsd:attribute ref="styling" use="optional" />
+ <xsd:attribute ref="mapping" use="optional" />
</xsd:complexType>
<xsd:complexType name="image">
@@ -278,36 +284,42 @@
</xsd:complexType>
<xsd:complexType name="video">
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:attribute name="src" type="uri" use="required" />
- <xsd:attribute name="width" type="dimension" />
- <xsd:attribute name="height" type="dimension" />
- </xsd:extension>
- </xsd:simpleContent>
-</xsd:complexType>
+ <xsd:choice maxOccurs="unbounded" minOccurs="0">
+ <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+ </xsd:choice>
+ <xsd:attribute name="src" type="uri" use="required" />
+ <xsd:attribute name="width" type="dimension" />
+ <xsd:attribute name="height" type="dimension" />
+ </xsd:complexType>
<xsd:complexType name="iframe">
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:attribute name="src" type="uri" use="required" />
- <xsd:attribute name="width" type="dimension" />
- <xsd:attribute name="height" type="dimension" />
- </xsd:extension>
- </xsd:simpleContent>
+ <xsd:choice maxOccurs="unbounded" minOccurs="0">
+ <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+ </xsd:choice>
+ <xsd:attribute name="src" type="uri" use="required" />
+ <xsd:attribute name="width" type="dimension" />
+ <xsd:attribute name="height" type="dimension" />
</xsd:complexType>
<xsd:complexType name="colorchooser" >
<xsd:choice maxOccurs="unbounded" minOccurs="0" >
- <xsd:element name="label" type="xsd:string" />
+ <xsd:element name="label" type="xsd:string" maxOccurs="1" />
<xsd:element name="address" type="address" minOccurs="3" maxOccurs="3"/>
</xsd:choice>
</xsd:complexType>
<xsd:complexType name="diagram_inline">
- <xsd:attribute name="rrd" type="xsd:string" use="required" />
- <xsd:attribute name="width" type="dimension" use="optional"/>
- <xsd:attribute name="height" type="dimension" use="optional"/>
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute name="rrd" type="xsd:string" use="required" />
+ <xsd:attribute name="unit" type="xsd:string" use="optional" />
+ <xsd:attribute name="width" type="dimension" use="optional"/>
+ <xsd:attribute name="series" type="xsd:string" use="optional"/>
+ <xsd:attribute name="height" type="dimension" use="optional"/>
+ <xsd:attribute name="refresh" type="xsd:integer" use="optional" />
+ <xsd:attribute name="period" type="xsd:string" use="optional" />
+ </xsd:extension>
+ </xsd:simpleContent>
</xsd:complexType>
<xsd:complexType name="diagram_popup" >
@@ -317,6 +329,9 @@
<xsd:attribute name="unit" type="xsd:string" use="optional" />
<xsd:attribute name="series" type="xsd:string" use="optional" />
<xsd:attribute name="refresh" type="xsd:integer" use="optional" />
+ <xsd:attribute name="period" type="xsd:string" use="optional" />
+ <xsd:attribute name="datasource" type="xsd:string" use="optional" />
+ <xsd:attribute name="tooltip" type="xsd:string" use="optional" />
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
@@ -329,6 +344,4 @@
<!-- shade is not yet implemented -->
-
-
</xsd:schema>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
