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

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

Revision: 167
          http://openautomation.svn.sourceforge.net/openautomation/?rev=167&view=rev
Author:   mayerch
Date:     2010-11-26 21:21:48 +0000 (Fri, 26 Nov 2010)

Log Message:
-----------
Scaling for RGB from byte to percent

Modified Paths:
--------------
    CometVisu/trunk/visu/plugins/colorChooser/structure_plugin.js
    CometVisu/trunk/visu/visu_config.xml

Modified: CometVisu/trunk/visu/plugins/colorChooser/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/colorChooser/structure_plugin.js	2010-11-26 20:14:18 UTC (rev 166)
+++ CometVisu/trunk/visu/plugins/colorChooser/structure_plugin.js	2010-11-26 21:21:48 UTC (rev 167)
@@ -35,9 +35,9 @@
                         'type'    : 'toggle'
                     })
                     .farbtastic( function(color){
-                      var r = parseInt(color.substring(1, 3), 16);
-                      var g = parseInt(color.substring(3, 5), 16);
-                      var b = parseInt(color.substring(5, 7), 16);
+                      var r = parseInt(color.substring(1, 3), 16) * 100 / 255;
+                      var g = parseInt(color.substring(3, 5), 16) * 100 / 255;
+                      var b = parseInt(color.substring(5, 7), 16) * 100 / 255;
                       var a_r =  $(page).attr('address_r');
                       var a_g =  $(page).attr('address_g');
                       var a_b =  $(page).attr('address_b');

Modified: CometVisu/trunk/visu/visu_config.xml
===================================================================
--- CometVisu/trunk/visu/visu_config.xml	2010-11-26 20:14:18 UTC (rev 166)
+++ CometVisu/trunk/visu/visu_config.xml	2010-11-26 21:21:48 UTC (rev 167)
@@ -49,6 +49,9 @@
     <info address="12/4/250"  datatype="9" styling="BluePurpleRed" mapping="Sign">Slide Info</info>
     <designtoggle>Change design</designtoggle>
     <colorChooser address_r="1/2/13" address_g="1/2/14" address_b="1/2/15" datatype="5.001">A colorChooser</colorChooser>
+    <info address="1/2/13"  datatype="5.001" >R</info>
+    <info address="1/2/14"  datatype="5.001" >G</info>
+    <info address="1/2/15"  datatype="5.001" >B</info>
     <line />
     <image src="icon/comet_128_ff8000.png" >Ein Bild</image>
     <image src="icon/comet_128_ff8000.png" />


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