[Openautomation-svn] SF.net SVN: openautomation:[532] CometVisu/trunk/visu

[<ma...@us...>]

Revision: 532
          http://openautomation.svn.sourceforge.net/openautomation/?rev=532&view=rev
Author:   mayerch
Date:     2011-11-20 21:10:37 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Last minute bug fix as discussed in the forum: in relative mode the infotrigger is using the variant types "button" and "display" now

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/structure_pure.js
    CometVisu/trunk/visu/visu_config_demo.xml

Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js	2011-11-20 16:34:18 UTC (rev 531)
+++ CometVisu/trunk/visu/designs/structure_pure.js	2011-11-20 21:10:37 UTC (rev 532)
@@ -728,10 +728,10 @@
       $p.find('address').each( function(){ 
         var src = this.textContent;
         var transform = this.getAttribute('transform');
-        var readonly  = this.getAttribute('readonly' ) == 'true'    ;
-        var relative  = this.getAttribute('variant'  ) == 'relative';
-        address[ '_' + src ] = [ transform, readonly, relative ];
-        if( !relative ) { // no need to listen to relative address
+        var readonly  = this.getAttribute('readonly' ) == 'true';
+        var isButton  = this.getAttribute('variant'  ) == 'button';
+        address[ '_' + src ] = [ transform, readonly, isButton ];
+        if( !isButton ) { // no need to listen to relative address
           ga_list.push( src );
         };
       });

Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml	2011-11-20 16:34:18 UTC (rev 531)
+++ CometVisu/trunk/visu/visu_config_demo.xml	2011-11-20 21:10:37 UTC (rev 532)
@@ -120,11 +120,11 @@
     <break/>
     <infotrigger uplabel="wärmer" downlabel="kälter" upvalue="0.1" downvalue="-0.1" align="center" format="%.1f °C"  change="absolute" min="7" max="24">
       <label>Infotrigger: Sollwert</label>
-      <address transform="DPT:9" variant="absolute">12/7/9</address>
+      <address transform="DPT:9">12/7/9</address>
     </infotrigger>
     <infotrigger uplabel="&gt;" downlabel="&lt;" upvalue="1" downvalue="-1" min="0" max="5" align="center" infoposition="1" change="absolute" mapping="AudioSource" >
       <label>Infotrigger: Audioquelle</label>
-      <address transform="DPT:5.010" variant="absolute">12/7/105</address>
+      <address transform="DPT:5.010">12/7/105</address>
     </infotrigger>
     <page name="Infotrigger: Erweitert..." align="center">
       <text>Ein Infotrigger lässt sich in zwei verschiedenen Betriebsarten betreiben: relativ und absolut</text>
@@ -133,8 +133,8 @@
       <break/>
       <infotrigger uplabel="+" upvalue="1" downlabel="-" downvalue="0" align="center" infoposition="1" change="relative">
         <label>Lautstärke</label>
-        <address transform="DPT:16.000" readonly="true" variant="absolute">12/7/16</address>
-        <address transform="DPT:1.001" readonly="false" variant="relative">12/7/1</address>
+        <address transform="DPT:16.000" readonly="true" variant="display">12/7/16</address>
+        <address transform="DPT:1.001" readonly="false" variant="button">12/7/1</address>
       </infotrigger>
       <break/>
       <info>
@@ -154,7 +154,7 @@
       <break/>
       <infotrigger uplabel="+" upvalue="5" downlabel="-" downvalue="-5" align="center" infoposition="1" change="absolute" format="%.1f%%" max="100">
         <label>Lautstärke</label>
-        <address transform="DPT:5.001" readonly="false" variant="absolute">12/7/5</address>
+        <address transform="DPT:5.001" readonly="false">12/7/5</address>
       </infotrigger>
     </page>
     <break/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.