Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[216] CometVisu/trunk/visu
|
From: <ma...@us...> - 2010-12-13 20:42:40
|
Revision: 216
http://openautomation.svn.sourceforge.net/openautomation/?rev=216&view=rev
Author: mayerch
Date: 2010-12-13 20:42:34 +0000 (Mon, 13 Dec 2010)
Log Message:
-----------
Changed address-element structure from using the src attribute to it's textContent
E.g.
<address src="12/4/250" transform="DPT:9" />
becomes
<address transform="DPT:9">12/4/250</address>
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
CometVisu/trunk/visu/visu_config_neu.xml
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2010-12-12 21:33:55 UTC (rev 215)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2010-12-13 20:42:34 UTC (rev 216)
@@ -116,7 +116,7 @@
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
var address = {};
$p.find('address').each( function(){
- var src = this.getAttribute('src');
+ var src = this.textContent;
var transform = this.getAttribute('transform');
ga_list.push( src )
address[ '_' + src ] = [transform];
@@ -153,7 +153,7 @@
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
var address = {};
$p.find('address').each( function(){
- var src = this.getAttribute('src');
+ var src = this.textContent;
var transform = this.getAttribute('transform');
ga_list.push( src )
address[ '_' + src ] = [transform];
@@ -242,7 +242,7 @@
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
var address = {};
$p.find('address').each( function(){
- var src = this.getAttribute('src');
+ var src = this.textContent;
var transform = this.getAttribute('transform');
var readonly = this.getAttribute('readonly');
ga_list.push( src )
@@ -295,7 +295,7 @@
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
var address = {};
$p.find('address').each( function(){
- var src = this.getAttribute('src');
+ var src = this.textContent;
var transform = this.getAttribute('transform');
var readonly = this.getAttribute('readonly');
ga_list.push( src )
Modified: CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2010-12-12 21:33:55 UTC (rev 215)
+++ CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2010-12-13 20:42:34 UTC (rev 216)
@@ -30,11 +30,11 @@
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
var address = {};
$p.find('address').each( function(){
- var src = this.getAttribute('src');
+ var src = this.textContent;
var transform = this.getAttribute('transform');
var color = this.getAttribute('color' );
var readonly = this.getAttribute('readonly' );
- ga_list.push( src )
+ ga_list.push( src );
address[ '_' + src ] = [ transform, color, readonly=='true' ];
});
Modified: CometVisu/trunk/visu/visu_config_neu.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_neu.xml 2010-12-12 21:33:55 UTC (rev 215)
+++ CometVisu/trunk/visu/visu_config_neu.xml 2010-12-13 20:42:34 UTC (rev 216)
@@ -58,26 +58,26 @@
<text align="center">CometVisu format neu</text>
<info styling="BluePurpleRed">
<label>Slide Info</label>
- <address src="12/4/250" transform="DPT:9" />
- <address src="12/4/251" transform="DPT:9.001" />
+ <address transform="DPT:9">12/4/250</address>
+ <address transform="DPT:9.001">12/4/251</address>
</info>
<switch mapping="OnOff" styling="RedGreen">
<label>Terrase Licht</label>
- <address src="1/0/2" transform="DPT:1.001" />
- <address src="12/4/253" transform="DPT:9.001" readonly="true" />
+ <address transform="DPT:1.001">1/0/2</address>
+ <address transform="DPT:9.001" readonly="true">12/4/253</address>
</switch>
<slide min="-18" max="26">
<label>Slide</label>
- <address src="12/4/250" transform="DPT:9" />
+ <address transform="DPT:9">12/4/250</address>
</slide>
<break />
<trigger value="0" mapping="OnOff">
<label>Terrase Licht 0</label>
- <address src="1/0/2" transform="DPT:1.001" />
+ <address transform="DPT:1.001">1/0/2</address>
</trigger>
<trigger value="1" mapping="OnOff">
<label>Terrase Licht 1</label>
- <address src="1/0/2" transform="DPT:1.001" />
+ <address transform="DPT:1.001">1/0/2</address>
</trigger>
<line />
<image src="icon/comet_128_ff8000.png" width="500px" height="46px"/>
@@ -90,13 +90,13 @@
</page>
<colorchooser>
<label>A colorChooser</label>
- <address src="1/2/59" transform="DPT:5.001" color="r" />
- <address src="1/2/60" transform="DPT:5.001" color="g" />
- <address src="1/2/61" transform="DPT:5.001" color="b" />
+ <address transform="DPT:5.001" color="r">1/2/59</address>
+ <address transform="DPT:5.001" color="g">1/2/60</address>
+ <address transform="DPT:5.001" color="b">1/2/61</address>
</colorchooser>
- <info><label>R</label><address src="1/2/59" transform="DPT:5.001" /></info>
- <info><label>G</label><address src="1/2/60" transform="DPT:5.001" /></info>
- <info><label>B</label><address src="1/2/61" transform="DPT:5.001" /></info>
- <slide><label>B</label><address src="1/2/61" transform="DPT:5.001" /></slide>
+ <info><label>R</label><address transform="DPT:5.001">1/2/59</address></info>
+ <info><label>G</label><address transform="DPT:5.001">1/2/60</address></info>
+ <info><label>B</label><address transform="DPT:5.001">1/2/61</address></info>
+ <slide><label>B</label><address transform="DPT:5.001">1/2/61</address></slide>
</page>
</pages>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
