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

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

Revision: 758
          http://openautomation.svn.sourceforge.net/openautomation/?rev=758&view=rev
Author:   mayerch
Date:     2012-04-15 19:00:08 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Show 2D pages in demo config (+ little bugfix)

(Note: The "fixed" and "scaled" is still to be implemented)

Modified Paths:
--------------
    CometVisu/trunk/visu/structure/pure/_common.js
    CometVisu/trunk/visu/structure/pure/iframe.js
    CometVisu/trunk/visu/structure/pure/image.js
    CometVisu/trunk/visu/structure/pure/imagetrigger.js
    CometVisu/trunk/visu/structure/pure/info.js
    CometVisu/trunk/visu/structure/pure/infotrigger.js
    CometVisu/trunk/visu/structure/pure/multitrigger.js
    CometVisu/trunk/visu/structure/pure/page.js
    CometVisu/trunk/visu/structure/pure/slide.js
    CometVisu/trunk/visu/structure/pure/switch.js
    CometVisu/trunk/visu/structure/pure/text.js
    CometVisu/trunk/visu/structure/pure/toggle.js
    CometVisu/trunk/visu/structure/pure/trigger.js
    CometVisu/trunk/visu/structure/pure/video.js
    CometVisu/trunk/visu/visu_config_demo.xml

Modified: CometVisu/trunk/visu/structure/pure/_common.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/_common.js	2012-04-15 13:56:35 UTC (rev 757)
+++ CometVisu/trunk/visu/structure/pure/_common.js	2012-04-15 19:00:08 UTC (rev 758)
@@ -355,6 +355,8 @@
 
 function extractLayout( layout, defaultValues )
 {
+  if (typeof defaultValue === 'undefined') defaultValues = [];
+
   var ret_val = 'position:absolute;';
   if( layout.getAttribute('x'     ) ) ret_val += 'left:'   + layout.getAttribute('x'     ) + ';';
   else if( defaultValues[ 'x'     ] ) ret_val += 'left:'   + defaultValues[      'x'     ] + ';';

Modified: CometVisu/trunk/visu/structure/pure/iframe.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/iframe.js	2012-04-15 13:56:35 UTC (rev 757)
+++ CometVisu/trunk/visu/structure/pure/iframe.js	2012-04-15 19:00:08 UTC (rev 758)
@@ -18,7 +18,7 @@
 basicdesign.addCreator('iframe', {
   create: function( element, path ) {
     var $e = $(element);
-    var layout = $e.find('layout')[0];
+    var layout = $e.children('layout')[0];
     var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
     var ret_val = $('<div class="widget iframe" ' + style + '/>');
     ret_val.setWidgetLayout($e);

Modified: CometVisu/trunk/visu/structure/pure/image.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/image.js	2012-04-15 13:56:35 UTC (rev 757)
+++ CometVisu/trunk/visu/structure/pure/image.js	2012-04-15 19:00:08 UTC (rev 758)
@@ -18,7 +18,7 @@
 basicdesign.addCreator('image', {
   create: function( element, path ) {
     var $e = $(element);
-    var layout = $e.find('layout')[0];
+    var layout = $e.children('layout')[0];
     var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
     var ret_val = $('<div class="widget clearfix image" ' + style + '/>');
     ret_val.setWidgetLayout($e);

Modified: CometVisu/trunk/visu/structure/pure/imagetrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/imagetrigger.js	2012-04-15 13:56:35 UTC (rev 757)
+++ CometVisu/trunk/visu/structure/pure/imagetrigger.js	2012-04-15 19:00:08 UTC (rev 758)
@@ -35,7 +35,7 @@
         }
       ];
     });
-    var layout = $e.find('layout')[0];
+    var layout = $e.children('layout')[0];
     var style = layout ? 'style="' + extractLayout( layout, {width:'100%'} ) + '"' : '';
 
     var actor = '<div class="actor">';

Modified: CometVisu/trunk/visu/structure/pure/info.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/info.js	2012-04-15 13:56:35 UTC (rev 757)
+++ CometVisu/trunk/visu/structure/pure/info.js	2012-04-15 19:00:08 UTC (rev 758)
@@ -18,7 +18,7 @@
 basicdesign.addCreator('info', {
   create: function( element, path, flavour, type ) {
     var $e = $(element);
-    var layout = $e.find('layout')[0];
+    var layout = $e.children('layout')[0];
     var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
     var ret_val = $('<div class="widget clearfix info" ' + style + ' />');
     //type == '3d' && ret_val.data( extractLayout3d( layout ) ).bind( 'update3d', this.update3d );

Modified: CometVisu/trunk/visu/structure/pure/infotrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/infotrigger.js	2012-04-15 13:56:35 UTC (rev 757)
+++ CometVisu/trunk/visu/structure/pure/infotrigger.js	2012-04-15 19:00:08 UTC (rev 758)
@@ -18,7 +18,7 @@
 basicdesign.addCreator('infotrigger', {
   create: function( element, path ) {
     var $e = $(element);
-    var layout = $e.find('layout')[0];
+    var layout = $e.children('layout')[0];
     var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
     var ret_val = $('<div class="widget clearfix switch" ' + style + '/>');
     ret_val.setWidgetLayout($e);

Modified: CometVisu/trunk/visu/structure/pure/multitrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/multitrigger.js	2012-04-15 13:56:35 UTC (rev 757)
+++ CometVisu/trunk/visu/structure/pure/multitrigger.js	2012-04-15 19:00:08 UTC (rev 758)
@@ -18,7 +18,7 @@
 basicdesign.addCreator('multitrigger', {
   create: function( element, path ) {
     var $e = $(element);
-    var layout = $e.find('layout')[0];
+    var layout = $e.children('layout')[0];
     var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
     var ret_val = $('<div class="widget clearfix switch" ' + style + '/>');
     ret_val.setWidgetLayout($e)

Modified: CometVisu/trunk/visu/structure/pure/page.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/page.js	2012-04-15 13:56:35 UTC (rev 757)
+++ CometVisu/trunk/visu/structure/pure/page.js	2012-04-15 19:00:08 UTC (rev 758)
@@ -40,7 +40,7 @@
     if ($p.attr('visible')=='false') {
       ret_val=$('');
     } else { // default is visible
-      var layout = $p.find('layout')[0];
+      var layout = $p.children('layout')[0];
       var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
       ret_val = $('<div class="widget clearfix link pagelink" ' + style + '/>');
       ret_val.setWidgetLayout($p);

Modified: CometVisu/trunk/visu/structure/pure/slide.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/slide.js	2012-04-15 13:56:35 UTC (rev 757)
+++ CometVisu/trunk/visu/structure/pure/slide.js	2012-04-15 19:00:08 UTC (rev 758)
@@ -18,7 +18,7 @@
 basicdesign.addCreator('slide', {
   create: function( element, path ) {
     var $e = $(element);
-    var layout = $e.find('layout')[0];
+    var layout = $e.children('layout')[0];
     var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
     var ret_val = $('<div class="widget clearfix slide" ' + style + ' />');
     ret_val.setWidgetLayout($e).makeWidgetLabel($e);

Modified: CometVisu/trunk/visu/structure/pure/switch.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/switch.js	2012-04-15 13:56:35 UTC (rev 757)
+++ CometVisu/trunk/visu/structure/pure/switch.js	2012-04-15 19:00:08 UTC (rev 758)
@@ -18,7 +18,7 @@
 basicdesign.addCreator('switch', {
   create: function( element, path ) {
     var $e = $(element);
-    var layout = $e.find('layout')[0];
+    var layout = $e.children('layout')[0];
     var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
     var ret_val = $('<div class="widget clearfix switch" ' + style + '/>');
     ret_val.setWidgetLayout($e)

Modified: CometVisu/trunk/visu/structure/pure/text.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/text.js	2012-04-15 13:56:35 UTC (rev 757)
+++ CometVisu/trunk/visu/structure/pure/text.js	2012-04-15 19:00:08 UTC (rev 758)
@@ -18,7 +18,7 @@
 basicdesign.addCreator('text', {
   create: function( element, path ) {
     var $e = $(element);
-    var layout = $e.find('layout')[0];
+    var layout = $e.children('layout')[0];
     var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
     var ret_val = $('<div class="widget clearfix text" ' + style + '/>');
     ret_val.setWidgetLayout($e);

Modified: CometVisu/trunk/visu/structure/pure/toggle.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/toggle.js	2012-04-15 13:56:35 UTC (rev 757)
+++ CometVisu/trunk/visu/structure/pure/toggle.js	2012-04-15 19:00:08 UTC (rev 758)
@@ -18,7 +18,7 @@
 basicdesign.addCreator('toggle', {
   create: function( element, path ) {
     var $e = $(element);
-    var layout = $e.find('layout')[0];
+    var layout = $e.children('layout')[0];
     var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
     var ret_val = $('<div class="widget clearfix toggle" ' + style + '/>');
     ret_val.setWidgetLayout($e);

Modified: CometVisu/trunk/visu/structure/pure/trigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/trigger.js	2012-04-15 13:56:35 UTC (rev 757)
+++ CometVisu/trunk/visu/structure/pure/trigger.js	2012-04-15 19:00:08 UTC (rev 758)
@@ -18,7 +18,7 @@
 basicdesign.addCreator('trigger', {
   create: function( element, path ) {
     var $e = $(element);
-    var layout = $e.find('layout')[0];
+    var layout = $e.children('layout')[0];
     var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
     var value = $e.attr('value') ? $e.attr('value') : 0;
     var ret_val = $('<div class="widget clearfix switch" ' + style + ' />');

Modified: CometVisu/trunk/visu/structure/pure/video.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/video.js	2012-04-15 13:56:35 UTC (rev 757)
+++ CometVisu/trunk/visu/structure/pure/video.js	2012-04-15 19:00:08 UTC (rev 758)
@@ -18,7 +18,7 @@
 basicdesign.addCreator('video', {
   create: function( element, path ) {
     var $e = $(element);
-    var layout = $e.find('layout')[0];
+    var layout = $e.children('layout')[0];
     var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
     var ret_val = $('<div class="widget clearfix video" ' + style + '/>');
     ret_val.setWidgetLayout($e);

Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml	2012-04-15 13:56:35 UTC (rev 757)
+++ CometVisu/trunk/visu/visu_config_demo.xml	2012-04-15 19:00:08 UTC (rev 758)
@@ -384,6 +384,51 @@
           <address transform="DPT:9" type="">12/7/10</address>
         </slide>
     </page>
+    <page name="2D fixed Bitmap" type="2d" backdrop="media/demo_2d_backdrop_nikolaushaus.png" align="center">
+      <switch mapping="On_Off" styling="Red_Green">
+        <layout x="200px" y="300px" width="600px" />
+        <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+      </switch>
+      <trigger value="0" mapping="On_Off">
+        <layout x="0px" y="500px" width="600px" />
+        <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+      </trigger>
+      <trigger value="1" mapping="On_Off">
+        <layout x="360px" y="500px" width="600px" />
+        <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+      </trigger>
+    </page>
+    <page name="2D scaled Bitmap" type="2d" backdrop="media/demo_2d_backdrop_nikolaushaus.png" align="center">
+      <switch mapping="On_Off" styling="Red_Green">
+        <layout x="45%" y="45%" width="600px" />
+        <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+      </switch>
+      <trigger value="0" mapping="On_Off">
+        <layout x="5%" y="70%" width="600px" />
+        <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+      </trigger>
+      <trigger value="1" mapping="On_Off">
+        <layout x="90%" y="70%" width="600px" />
+        <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+      </trigger>
+    </page>
+    <page name="2D SVG" type="2d" backdrop="media/demo_2d_backdrop_nikolaushaus.svg" align="center">
+      <switch mapping="On_Off" styling="Red_Green">
+        <layout x="200px" y="300px" width="600px" />
+        <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+      </switch>
+      <trigger value="0" mapping="On_Off">
+        <layout x="0px" y="500px" width="600px" />
+        <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+      </trigger>
+      <trigger value="1" mapping="On_Off">
+        <layout x="360px" y="500px" width="600px" />
+        <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+      </trigger>
+    </page>
+    <page name="3D" align="center">
+      <text>Not in this demo yet...</text>
+    </page>
     <line/>
     <text align="center">&lt;b&gt;Plugins&lt;/b&gt;</text>
     <text>Diese Widgets sind Plugins und stehen dann zur Verfügung, wenn sie in

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