|
From: <ma...@us...> - 2011-01-01 14:31:31
|
Revision: 237
http://openautomation.svn.sourceforge.net/openautomation/?rev=237&view=rev
Author: mayerch
Date: 2011-01-01 14:31:24 +0000 (Sat, 01 Jan 2011)
Log Message:
-----------
Cleaned up the tranforms
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2010-12-28 22:07:57 UTC (rev 236)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-01-01 14:31:24 UTC (rev 237)
@@ -117,9 +117,8 @@
var address = {};
$p.find('address').each( function(){
var src = this.textContent;
- var transform = this.getAttribute('transform');
ga_list.push( src )
- address[ '_' + src ] = [transform];
+ address[ '_' + src ] = [ this.getAttribute('transform') ];
});
var actor = '<div class="actor">';
if( $p.attr('pre') ) actor += '<div>' + $p.attr('pre') + '</div>';
@@ -156,9 +155,8 @@
var address = {};
$p.find('address').each( function(){
var src = this.textContent;
- var transform = this.getAttribute('transform');
ga_list.push( src )
- address[ '_' + src ] = [transform];
+ address[ '_' + src ] = [ this.getAttribute('transform') ];
});
var actor = $('<div class="actor">');
// ret_val.append( label ).append( actor );
@@ -191,7 +189,7 @@
},
update: function( e, data ) {
var element = $(this);
- var value = transform( data, element.data().address[ e.type ][0] );
+ var value = Transform[ element.data().address[ e.type ][0] ].decode( data );
if( element.data( 'value' ) != value )
{
element.data( 'value', value );
@@ -281,7 +279,6 @@
for( var addr in data.address )
{
if( data.address[addr][1] == true ) continue; // skip read only
-// visu.write( addr.substr(1), data.value=='1' ? '0' : '1', data.address[addr][0].substr(4) );
visu.write( addr.substr(1), Transform[data.address[addr][0]].encode( data.value ) );
}
},
@@ -602,18 +599,10 @@
return { x: 0, y: 0 }; // sanity return
}
-/**
- * temporary function till the transformation framework is implemented
- */
-function transform( raw, type )
-{
- return Transform[type].decode( raw );
-}
-
function defaultUpdate( e, data, passedElement )
{
var element = passedElement || $(this);
- var value = transform( data, element.data().address[ e.type ][0] );
+ var value = Transform[ element.data().address[ e.type ][0] ].decode( data );
if( element.data( 'precision' ) )
value = Number( value ).toPrecision( element.data( 'precision' ) );
element.data( 'value', value );
Modified: CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2010-12-28 22:07:57 UTC (rev 236)
+++ CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2011-01-01 14:31:24 UTC (rev 237)
@@ -101,7 +101,7 @@
},
update_r: function( e, data ) {
var element = $(this);
- var value = transform( data, element.data().address[ e.type ][0] );
+ var value = Transform[ element.data().address[ e.type ][0] ].decode( data );
element.data( 'value_r', value );
function toHex( x ) { var r = parseInt( x ).toString(16); return r.length == 1 ? '0'+r : r; }
var color = jQuery.farbtastic( element ).color || '#000000';
@@ -112,7 +112,7 @@
},
update_g: function( e, data ) {
var element = $(this);
- var value = transform( data, element.data().address[ e.type ][0] );
+ var value = Transform[ element.data().address[ e.type ][0] ].decode( data );
element.data( 'value_g', value );
function toHex( x ) { var r = parseInt( x ).toString(16); return r.length == 1 ? '0'+r : r; }
var color = jQuery.farbtastic( element ).color || '#000000';
@@ -123,7 +123,7 @@
},
update_b: function( e, data ) {
var element = $(this);
- var value = transform( data, element.data().address[ e.type ][0] );
+ var value = Transform[ element.data().address[ e.type ][0] ].decode( data );
element.data( 'value_b', value );
function toHex( x ) { var r = parseInt( x ).toString(16); return r.length == 1 ? '0'+r : r; }
var color = jQuery.farbtastic( element ).color || '#000000';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|