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

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

Revision: 233
          http://openautomation.svn.sourceforge.net/openautomation/?rev=233&view=rev
Author:   mayerch
Date:     2010-12-27 23:54:56 +0000 (Mon, 27 Dec 2010)

Log Message:
-----------
Added ability to set precision for displaying float values

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/structure_pure.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-27 23:12:29 UTC (rev 232)
+++ CometVisu/trunk/visu/designs/structure_pure.js	2010-12-27 23:54:56 UTC (rev 233)
@@ -127,9 +127,10 @@
       if( $p.attr('post') ) actor += '<div>' + $p.attr('post') + '</div>';
       actor += '</div>';
       var $actor = $(actor).data({
-        'address' : address,
-        'mapping' : $p.attr('mapping'),
-        'styling' : $p.attr('styling')
+        'address'  : address,
+        'precision': $p.attr('precision'),
+        'mapping'  : $p.attr('mapping'),
+        'styling'  : $p.attr('styling')
       });
       for( var addr in address ) $actor.bind( addr, this.update );
       ret_val.append( label ).append( $actor );
@@ -137,10 +138,11 @@
     },
     update:       defaultUpdate,
     attributes: {
-      pre:        { type: 'string' , required: false },
-      post:       { type: 'string' , required: false },
-      mapping:    { type: 'mapping', required: false },
-      styling:    { type: 'styling', required: false }
+      pre:        { type: 'string'   , required: false },
+      post:       { type: 'string'   , required: false },
+      precision:  { type: 'precision', required: false },
+      mapping:    { type: 'mapping'  , required: false },
+      styling:    { type: 'styling'  , required: false }
     },
     content:      { type: 'string' , required: true  }
   });
@@ -612,6 +614,8 @@
 {
   var element = passedElement || $(this);
   var value = transform( data, element.data().address[ e.type ][0] );
+  if( element.data( 'precision' ) )
+    value = Number( value ).toPrecision( element.data( 'precision' ) );
   element.data( 'value', value );
   element.find('.value').text( map( value, element ) );
 

Modified: CometVisu/trunk/visu/visu_config_neu.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_neu.xml	2010-12-27 23:12:29 UTC (rev 232)
+++ CometVisu/trunk/visu/visu_config_neu.xml	2010-12-27 23:54:56 UTC (rev 233)
@@ -92,11 +92,11 @@
       <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 transform="DPT:5.001">1/2/59</address></info>
+    <info precision="4"><label>R</label><address transform="DPT:5.001">1/2/59</address></info>
     <slide><label>R</label><address transform="DPT:5.001">1/2/59</address></slide>
-    <info><label>G</label><address transform="DPT:5.001">1/2/60</address></info>
+    <info precision="4"><label>G</label><address transform="DPT:5.001">1/2/60</address></info>
     <slide><label>G</label><address transform="DPT:5.001">1/2/60</address></slide>
-    <info><label>B</label><address transform="DPT:5.001">1/2/61</address></info>
+    <info precision="4"><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>
     <diagram_popup undefined="DALI Strom L1" rrd="200_DALI_Linie_1_Strom" unit="mA" series="day" refresh="300">DALI Strom L1</diagram_popup>
   </page>


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