openautomation-svn

[Openautomation-svn] SF.net SVN: openautomation:[482] CometVisu/tags/post_0.6.0/visu

[<j-...@us...>]

Revision: 482
          http://openautomation.svn.sourceforge.net/openautomation/?rev=482&view=rev
Author:   j-n-k
Date:     2011-10-30 21:22:54 +0000 (Sun, 30 Oct 2011)
Log Message:
-----------
Add color-attributes for diagram grid and line. Color is #RRGGBB (FR #3353575)

Modified Paths:
--------------
    CometVisu/tags/post_0.6.0/visu/plugins/diagram/structure_plugin.js
    CometVisu/tags/post_0.6.0/visu/visu_config.xsd

Modified: CometVisu/tags/post_0.6.0/visu/plugins/diagram/structure_plugin.js
===================================================================
--- CometVisu/tags/post_0.6.0/visu/plugins/diagram/structure_plugin.js	2011-10-30 14:10:53 UTC (rev 481)
+++ CometVisu/tags/post_0.6.0/visu/plugins/diagram/structure_plugin.js	2011-10-30 21:22:54 UTC (rev 482)
@@ -55,6 +55,8 @@
         diagram.data("datasource", $p.attr("datasource") || "AVERAGE");
         diagram.data("label", page.textContent);
         diagram.data("refresh", $p.attr("refresh"));
+		diagram.data("linecolor", $p.attr("linecolor") || "");
+        diagram.data("gridcolor", $p.attr("gridcolor") || "");
 
         refreshDiagram(diagram, {});
 
@@ -68,7 +70,9 @@
         series:     {type: "list", required: false, list: {hour: "hours", day: "days", week: "weeks", month: "months", year: "years"}},
         period:     {type: "numeric", required: false},
         datasource: {type: "list", required: false, list: {'MIN': "Min", 'AVERAGE': "Avg", 'MAX': "Max"}},
-        refresh:    {type: "numeric", required: false}
+        refresh:    {type: "numeric", required: false},
+		linecolor:  {type: "string", required: false},
+        gridcolor:  {type: "string", required: false}
     },
     content: {type: "string", required: true}
 });
@@ -107,6 +111,8 @@
         diagram.data("datasource", $p.attr("datasource") || "AVERAGE");
         diagram.data("label", page.textContent);
         diagram.data("refresh", $p.attr("refresh"));
+		diagram.data("linecolor", $p.attr("linecolor") || "");
+        diagram.data("gridcolor", $p.attr("gridcolor") || "");
 
         var bDiagram = $("<div class=\"diagram\" id=\"" + id + "_big\"/>");
         
@@ -173,6 +179,8 @@
         datasource: {type: "list", required: false, list: {'MIN': "Min", 'AVERAGE': "Avg", 'MAX': "Max"}},
         refresh:    {type: "numeric", required: false},
         tooltip:    {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
+		linecolor:  {type: "string", required: false},
+        gridcolor:  {type: "string", required: false}
     },
     content: {type: "string", required: true}
 });
@@ -201,7 +209,9 @@
     var refresh = diagram.data("refresh");
     var datasource = diagram.data("datasource") || "AVERAGE";
     var period = diagram.data("period") || 1;
-
+    var linecolor = diagram.data("linecolor") || diagramColors.data;
+    var gridcolor = diagram.data("gridcolor");
+	
     var series = {
         hour:   {label: "hour", res: "60", start: "hour", end: "now"},
         day:    {label: "day", res: "300", start: "day", end: "now"},
@@ -228,10 +238,10 @@
             grid: {
                 show: true,
                 aboveData: false,
-                color: "#81664B",
+                color: gridcolor || "#81664B",
                 backgroundColor: "black",
-                tickColor: "#81664B",
-                borderColor: "#81664B"//,
+                tickColor: gridcolor || "#81664B",
+                borderColor: gridcolor || "#81664B"//,
                 //axisMargin: 0,
                 //labelMargin: 0
             }
@@ -247,7 +257,7 @@
             dataType: "json",
             type: "GET",
             success: function(data) {
-                var color = diagramColors.data || options.grid.color;
+                var color = linecolor || options.grid.color;
                 var offset = new Date().getTimezoneOffset() * 60 * 1000;
                 //TODO: find a better way
                 for (var j = 0; j < data.length; j++) {

Modified: CometVisu/tags/post_0.6.0/visu/visu_config.xsd
===================================================================
--- CometVisu/tags/post_0.6.0/visu/visu_config.xsd	2011-10-30 14:10:53 UTC (rev 481)
+++ CometVisu/tags/post_0.6.0/visu/visu_config.xsd	2011-10-30 21:22:54 UTC (rev 482)
@@ -367,6 +367,8 @@
 			<xsd:attribute name="refresh" type="xsd:integer" use="optional" />
 			<xsd:attribute name="period" type="xsd:string" use="optional" />
 			<xsd:attribute name="datasource" type="xsd:string" use="optional" />
+			<xsd:attribute name="linecolor" type="xsd:string" use="optional" />
+			<xsd:attribute name="gridcolor" type="xsd:string" use="optional" />
 		</xsd:extension>
     </xsd:simpleContent>
 </xsd:complexType>
@@ -381,6 +383,8 @@
 			<xsd:attribute name="period" type="xsd:string" use="optional" />
 			<xsd:attribute name="datasource" type="xsd:string" use="optional" />
 			<xsd:attribute name="tooltip" type="xsd:string" use="optional" />
+			<xsd:attribute name="linecolor" type="xsd:string" use="optional" />
+			<xsd:attribute name="gridcolor" type="xsd:string" use="optional" />
         </xsd:extension>
     </xsd:simpleContent>
 </xsd:complexType>

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

[Openautomation-svn] SF.net SVN: openautomation:[493] CometVisu/tags/post_0.6.0/visu

[<j-...@us...>]

Revision: 493
          http://openautomation.svn.sourceforge.net/openautomation/?rev=493&view=rev
Author:   j-n-k
Date:     2011-11-01 17:00:32 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
Added Pageswitching via GA (FR #3383206):
Added "ga" attribute to page widget (DPT:1.001 hardcoded)
Page is called when address receives 1
0 is returned on same address after switching

Modified Paths:
--------------
    CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js
    CometVisu/tags/post_0.6.0/visu/visu_config.xsd

Modified: CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js
===================================================================
--- CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js	2011-11-01 13:49:37 UTC (rev 492)
+++ CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js	2011-11-01 17:00:32 UTC (rev 493)
@@ -60,7 +60,16 @@
   this.addCreator('page', {
     create: function( page, path, flavour ) {
       var $p = $(page);
-      var ret_val = $('<div class="widget" />');
+      var address = {};
+      if ($p.attr('ga')) {
+        src = $p.attr('ga');
+        ga_list.push($p.attr('ga'));
+        address[ '_' + $p.attr('ga') ] = [ 'DPT:1.001', 0 ];
+      }
+      
+      var $header = $('<div class="widget" path="'+path+'"/>');
+      for( var addr in address ) $header.bind( addr, this.update );
+      var ret_val = $header;
       var pstyle  = ( '0' != path ) ? 'display:none;' : ''; // subPage style
       var name    = $p.attr('name');
       var type    = $p.attr('type');                        //text, 2d or 3d
@@ -89,6 +98,12 @@
     },
     elements: {
     },
+    update: function(e, data) {
+      if (data==01) {
+        scrollToPage(this.attributes.path.nodeValue, 1);
+        visu.write(e.type.substr(1), transformEncode("DPT:1.001", 0));
+      }
+    },
     content: true
   });
   

Modified: CometVisu/tags/post_0.6.0/visu/visu_config.xsd
===================================================================
--- CometVisu/tags/post_0.6.0/visu/visu_config.xsd	2011-11-01 13:49:37 UTC (rev 492)
+++ CometVisu/tags/post_0.6.0/visu/visu_config.xsd	2011-11-01 17:00:32 UTC (rev 493)
@@ -152,17 +152,17 @@
 <xsd:element name="page">
     <xsd:complexType>
         <xsd:choice minOccurs="0" maxOccurs="unbounded">
-		    <!-- visual effects -->
+            <!-- visual effects -->
             <xsd:element name="line" type="line" />			
-			<xsd:element name="break" type="break" />
-			<xsd:element name="group" type="group" />
+            <xsd:element name="break" type="break" />
+            <xsd:element name="group" type="group" />
             <!-- list all possbile widgets here -->
             <xsd:element name="text" type="text" />
             <xsd:element name="switch" type="switch" />
             <xsd:element name="toggle" type="switch" />
             <xsd:element name="trigger" type="trigger" />
             <xsd:element name="multitrigger" type="multitrigger" />
-			<xsd:element name="infotrigger" type="infotrigger" />
+            <xsd:element name="infotrigger" type="infotrigger" />
             <xsd:element name="designtoggle" type="designtoggle" />
             <xsd:element name="slide" type="slide" />
             <xsd:element name="info" type="info" />
@@ -179,6 +179,7 @@
         <xsd:attribute name="name" type="xsd:string" use="required" />
         <xsd:attribute name="flavour" type="xsd:string" use="optional" />
         <xsd:attribute ref="align" use="optional" />
+        <xsd:attribute name="ga" type="addr" use="optional" />
     </xsd:complexType>
 </xsd:element>
 

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

[Openautomation-svn] SF.net SVN: openautomation:[495] CometVisu/tags/post_0.6.0/visu

[<j-...@us...>]

Revision: 495
          http://openautomation.svn.sourceforge.net/openautomation/?rev=495&view=rev
Author:   j-n-k
Date:     2011-11-01 19:33:50 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
Added invisible pages (attribute 'visible="false"' in xml-config). FR #3432015

Modified Paths:
--------------
    CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js
    CometVisu/tags/post_0.6.0/visu/visu_config.xsd

Modified: CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js
===================================================================
--- CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js	2011-11-01 19:02:27 UTC (rev 494)
+++ CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js	2011-11-01 19:33:50 UTC (rev 495)
@@ -60,6 +60,7 @@
   this.addCreator('page', {
     create: function( page, path, flavour ) {
       var $p = $(page);
+  
       var address = {};
       if ($p.attr('ga')) {
         src = $p.attr('ga');
@@ -67,9 +68,6 @@
         address[ '_' + $p.attr('ga') ] = [ 'DPT:1.001', 0 ];
       }
       
-      var $header = $('<div class="widget" path="'+path+'"/>');
-      for( var addr in address ) $header.bind( addr, this.update );
-      var ret_val = $header;
       var pstyle  = ( '0' != path ) ? 'display:none;' : ''; // subPage style
       var name    = $p.attr('name');
       var type    = $p.attr('type');                        //text, 2d or 3d
@@ -77,10 +75,23 @@
       var wstyle  = '';                                     // widget style
       if( $p.attr('align') ) wstyle += 'text-align:' + $p.attr('align') + ';';
       if( wstyle != '' ) wstyle = 'style="' + wstyle + '"';
-      ret_val.addClass( 'link' ).addClass('pagelink');
-      ret_val.append( '<div ' + wstyle + '><a href="javascript:scrollToPage(\''+path+'\')">' + name + '</a></div>' );
+    
+      var ret_val;
+      
+      if ($p.attr('visible')=='false') {
+        ret_val=$('');
+      } else { // default is visible
+        ret_val = $('<div class="widget"/>');
+        ret_val.addClass( 'link' ).addClass('pagelink');
+        ret_val.append( '<div ' + wstyle + '><a href="javascript:scrollToPage(\''+path+'\')">' + name + '</a></div>' );
+      }
+
       var childs = $p.children();
-      var container = $( '<div class="clearfix"/>' );
+      
+      var $container = $( '<div class="clearfix" path="'+path+'"/>'); 
+      for( var addr in address ) $container.bind( addr, this.update );
+      var container=$container;
+      
       container.append( '<h1>' + name + '</h1>' );
       $( childs ).each( function(i){
           container.append( create_pages( childs[i], path + '_' + i, flavour ) );
@@ -89,12 +100,15 @@
       subpage.append(container);
       if( flavour ) subpage.addClass( 'flavour_' + flavour );
       $('#pages').prepend( subpage );
+      
       return ret_val;
     },
     attributes: {
       align:  { type: 'string', required: false },
       flavour:{ type: 'string', required: false },
-      name:   { type: 'string', required: true }
+      name:   { type: 'string', required: true },
+      ga:     { type: 'addr', required: false },
+      visible:{ type: 'string', required: false }
     },
     elements: {
     },

Modified: CometVisu/tags/post_0.6.0/visu/visu_config.xsd
===================================================================
--- CometVisu/tags/post_0.6.0/visu/visu_config.xsd	2011-11-01 19:02:27 UTC (rev 494)
+++ CometVisu/tags/post_0.6.0/visu/visu_config.xsd	2011-11-01 19:33:50 UTC (rev 495)
@@ -180,6 +180,7 @@
         <xsd:attribute name="flavour" type="xsd:string" use="optional" />
         <xsd:attribute ref="align" use="optional" />
         <xsd:attribute name="ga" type="addr" use="optional" />
+        <xsd:attribute name="visible" type="xsd:boolean" />
     </xsd:complexType>
 </xsd:element>
 

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

[Openautomation-svn] SF.net SVN: openautomation:[499] CometVisu/tags/post_0.6.0/visu

[<j-...@us...>]

Revision: 499
          http://openautomation.svn.sourceforge.net/openautomation/?rev=499&view=rev
Author:   j-n-k
Date:     2011-11-04 17:22:40 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Solving FR 3362154 (refresh for iframe-widget) 
Fixed refresh for video-widget

Modified Paths:
--------------
    CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js
    CometVisu/tags/post_0.6.0/visu/lib/templateengine.js
    CometVisu/tags/post_0.6.0/visu/visu_config.xsd

Modified: CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js
===================================================================
--- CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js	2011-11-03 20:25:14 UTC (rev 498)
+++ CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js	2011-11-04 17:22:40 UTC (rev 499)
@@ -715,8 +715,12 @@
       if( $p.attr('frameborder') == "false" ) style += 'border: 0px ;';
       if( $p.attr('background') ) style += 'background-color:' + $p.attr('background') + ';';
       if( style != '' ) style = 'style="' + style + '"';
+      
       var actor = '<div class="actor"><iframe src="' +$p.attr('src') + '" ' + style + '></iframe></div>';
-      ret_val.append( $(actor) ); 
+      var refresh = $p.attr('refresh') ? $p.attr('refresh')*1000 : 0;
+      ret_val.append( $(actor).data( {
+        'refresh': refresh
+      } ).each(setupRefreshAction) ); // abuse "each" to call in context...
       return ret_val;
     },
     attributes: {
@@ -724,7 +728,8 @@
       width:       { type: 'string', required: false },
       height:      { type: 'string', required: false },
       frameborder: { type: 'list'  , required: false, list: {'true': "yes", 'false': "no"} },
-      background:  { type: 'string', required: false }
+      background:  { type: 'string', required: false },
+      refresh: { type: 'numeric', required: false }
     },
     elements: {
       label:  { type: 'string',    required: false, multi: false }

Modified: CometVisu/tags/post_0.6.0/visu/lib/templateengine.js
===================================================================
--- CometVisu/tags/post_0.6.0/visu/lib/templateengine.js	2011-11-03 20:25:14 UTC (rev 498)
+++ CometVisu/tags/post_0.6.0/visu/lib/templateengine.js	2011-11-04 17:22:40 UTC (rev 499)
@@ -397,7 +397,7 @@
   var refresh = $(this).data('refresh');
   if( refresh && refresh > 0 )
   {
-    var target = $('img', $(this) )[0];
+    var target = $('img', $(this) )[0] || $('video', $(this) )[0] || $('iframe', $(this) )[0];
     var src = target.src;
     if( src.indexOf('?') < 0 ) src += '?';
     $(this).data('interval', setInterval( function(){refreshAction(target, src);}, refresh ) );

Modified: CometVisu/tags/post_0.6.0/visu/visu_config.xsd
===================================================================
--- CometVisu/tags/post_0.6.0/visu/visu_config.xsd	2011-11-03 20:25:14 UTC (rev 498)
+++ CometVisu/tags/post_0.6.0/visu/visu_config.xsd	2011-11-04 17:22:40 UTC (rev 499)
@@ -323,7 +323,7 @@
 
 <xsd:complexType name="image">
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
-        <xsd:element name="label" type="xsd:string" />
+      <xsd:element name="label" type="xsd:string" />
     </xsd:choice>
     <xsd:attribute name="src" type="uri" use="required" />
     <xsd:attribute name="width" type="dimension" />
@@ -333,22 +333,24 @@
 
 <xsd:complexType name="video">
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
-	   <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+      <xsd:element name="label" type="xsd:string" maxOccurs="1" />
     </xsd:choice>
     <xsd:attribute name="src" type="uri" use="required" />
     <xsd:attribute name="width" type="dimension" />
     <xsd:attribute name="height" type="dimension" />
+    <xsd:attribute name="refresh" type="xsd:decimal" />
  </xsd:complexType>
 
 <xsd:complexType name="iframe">
     <xsd:choice maxOccurs="unbounded" minOccurs="0">
-	   <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+      <xsd:element name="label" type="xsd:string" maxOccurs="1" />
     </xsd:choice>
     <xsd:attribute name="src" type="uri" use="required" />
     <xsd:attribute name="width" type="dimension" />
     <xsd:attribute name="height" type="dimension" />
     <xsd:attribute name="frameborder" type="xsd:string" />
     <xsd:attribute name="background" type="xsd:string" />
+    <xsd:attribute name="refresh" type="xsd:decimal" />
 </xsd:complexType>
 
 <xsd:complexType name="colorchooser" >

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

[Openautomation-svn] SF.net SVN: openautomation:[540] CometVisu/tags/post_0.6.0/visu

[<j-...@us...>]

Revision: 540
          http://openautomation.svn.sourceforge.net/openautomation/?rev=540&view=rev
Author:   j-n-k
Date:     2011-11-23 19:43:39 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
FR 3128533 : Added diagram_info (combined diagram_popup/info) widget

Modified Paths:
--------------
    CometVisu/tags/post_0.6.0/visu/plugins/diagram/structure_plugin.js
    CometVisu/tags/post_0.6.0/visu/visu_config.xsd
    CometVisu/tags/post_0.6.0/visu/visu_config_demo.xml

Modified: CometVisu/tags/post_0.6.0/visu/plugins/diagram/structure_plugin.js
===================================================================
--- CometVisu/tags/post_0.6.0/visu/plugins/diagram/structure_plugin.js	2011-11-20 21:45:11 UTC (rev 539)
+++ CometVisu/tags/post_0.6.0/visu/plugins/diagram/structure_plugin.js	2011-11-23 19:43:39 UTC (rev 540)
@@ -185,6 +185,140 @@
     content: {type: "string", required: true}
 });
 
+VisuDesign_Custom.prototype.addCreator("diagram_info", {
+    create: function( page, path ) {
+        var $p = $(page);
+
+        var address = {};
+        $p.find('address').each( function(){ 
+          var src = this.textContent;
+          ga_list.push( src ) 
+          address[ '_' + src ] = [ this.getAttribute('transform') ];
+        });
+        
+        function uniqid() {
+            var newDate = new Date;
+            return newDate.getTime();
+        }
+
+        var id = "diagram_" + uniqid();
+
+        var ret_val = $('<div class="widget" />');
+        ret_val.addClass( 'diagram' );
+        
+        var labelElement = $p.find('label')[0];
+        var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
+                
+        var actor = '<div class="actor switchUnpressed ';
+        if ( $p.attr( 'align' ) ) 
+          actor += $p.attr( 'align' ); 
+        actor += '">';
+        var map = $p.attr('mapping');
+        if( mappings[map] && mappings[map][value] )
+          actor += '<div class="value">' + mappings[map][value] + '</div>';
+        else
+          actor += '<div class="value">-</div>';
+        actor += '</div>';
+                
+        var $actor = $(actor).data({
+          'address'  : address,
+          'format'   : $p.attr('format'),
+          'mapping'  : $p.attr('mapping'),
+          'styling'  : $p.attr('styling')
+        });
+        for( var addr in address ) $actor.bind( addr, this.update );
+        
+        ret_val.append(label).append($actor);
+
+        $actor.addClass("clickable");
+
+        var bDiagram = $("<div class=\"diagram\" id=\"" + id + "_big\"/>");
+        
+        bDiagram.data("id", id);
+        bDiagram.data("rrd", $p.attr("rrd"));
+        bDiagram.data("unit", $p.attr("unit") || "");
+        bDiagram.data("series", $p.attr("series") || "day");
+        bDiagram.data("period", $p.attr("period") || 1);
+        bDiagram.data("datasource", $p.attr("datasource") || "AVERAGE");
+        bDiagram.data("label", labelElement.textContent);
+        bDiagram.data("refresh", $p.attr("refresh"));
+        bDiagram.data("linecolor", $p.attr("linecolor") || "");
+        bDiagram.data("gridcolor", $p.attr("gridcolor") || "");
+               
+        var data = jQuery.extend({}, bDiagram.data());
+
+        $actor.bind("click", function() {
+            bDiagram.data(data);
+            bDiagram.css({height: "90%"});
+
+            showPopup("unknown", {title: labelElement.textContent, content: bDiagram});
+            bDiagram.parent("div").css({height: "100%", width: "90%", margin: "auto"}); // define parent as 100%!
+ 
+            var bDiagramOpts = {yaxis: {labelWidth: null}};
+            if ($p.attr("tooltip") == "true") {
+                // if we want to display a tooltip, we need to listen to the event
+                var previousPoint = null;
+                jQuery(bDiagram).bind("plothover", function (event, pos, item) {
+                    jQuery("#x").text(pos.x.toFixed(2));
+                    jQuery("#y").text(pos.y.toFixed(2));
+                    
+                    if (item) {
+                        if (previousPoint != item.datapoint) {
+                            previousPoint = item.datapoint;
+                            
+                            $("#diagramTooltip").remove();
+                            var x = item.datapoint[0],
+                                y = item.datapoint[1].toFixed(2);
+                            
+                            //This is a mess but toLocaleString expects UTC again
+                            var offset = new Date().getTimezoneOffset() * 60 * 1000;
+                            var dte = new Date(x + offset);
+                            showDiagramTooltip(item.pageX, item.pageY,
+                                        dte.toLocaleString() + ": " + y + jQuery(this).data("unit"));
+                        }
+                    }
+                    else {
+                        $("#diagramTooltip").remove();
+                        previousPoint = null;            
+                    }
+
+                })
+                .bind("click", function(event) {
+                    // don't let the popup know about the click, or it will close on touch-displays
+                    event.stopPropagation();
+                });
+                
+                bDiagramOpts = jQuery.extend(bDiagramOpts, {grid: {hoverable: true, clickable: true} });
+            }
+
+            refreshDiagram(bDiagram, bDiagramOpts);
+            return false;
+        });
+
+        return ret_val;
+    },
+    update:       defaultUpdate,
+    attributes: {
+      rrd:        {type: "string", required: true},
+      unit:       {type: "string", required: false},
+      series:     {type: "list", required: false, list: {hour: "hours", day: "days", week: "weeks", month: "months", year: "years"}},
+      period:     {type: "numeric", required: false},
+      datasource: {type: "list", required: false, list: {'MIN': "Min", 'AVERAGE': "Avg", 'MAX': "Max"}},
+      refresh:    {type: "numeric", required: false},
+      tooltip:    {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
+      linecolor:  {type: "string", required: false},
+      gridcolor:  {type: "string", required: false},
+      format:     { type: 'format',    required: false },
+      mapping:    { type: 'mapping',   required: false },
+      styling:    { type: 'styling',   required: false }
+    },
+    elements: {
+      label:      { type: 'string',    required: true, multi: false },
+      address:    { type: 'address',   required: true, multi: true }
+    },
+    content: {type: "string", required: true}
+});
+
 diagramColors = {
     data: $("<span class='link'><a href='#' /></a>").find("a").css("color")
 };

Modified: CometVisu/tags/post_0.6.0/visu/visu_config.xsd
===================================================================
--- CometVisu/tags/post_0.6.0/visu/visu_config.xsd	2011-11-20 21:45:11 UTC (rev 539)
+++ CometVisu/tags/post_0.6.0/visu/visu_config.xsd	2011-11-23 19:43:39 UTC (rev 540)
@@ -393,6 +393,26 @@
     </xsd:simpleContent>
 </xsd:complexType>
 
+<xsd:complexType name="diagram_info" >
+    <xsd:choice maxOccurs="unbounded" minOccurs="1">
+        <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+        <xsd:element name="address" type="address" minOccurs="1"/>
+    </xsd:choice>
+    <xsd:attribute ref="format" use="optional" />
+    <xsd:attribute ref="styling" use="optional" />
+    <xsd:attribute ref="mapping" use="optional" />
+    <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+    <xsd:attribute name="rrd" type="xsd:string" use="required" />
+    <xsd:attribute name="unit" type="xsd:string" use="optional" />
+    <xsd:attribute name="series" type="xsd:string" use="optional" />
+    <xsd:attribute name="refresh" type="xsd:integer" use="optional" />
+    <xsd:attribute name="period" type="xsd:string" use="optional" />
+    <xsd:attribute name="datasource" type="xsd:string" use="optional" />
+    <xsd:attribute name="tooltip" type="xsd:string" use="optional" />
+    <xsd:attribute name="linecolor" type="xsd:string" use="optional" />
+    <xsd:attribute name="gridcolor" type="xsd:string" use="optional" />
+</xsd:complexType>
+
 <xsd:complexType name="break" />
 
 <xsd:complexType name="line" />

Modified: CometVisu/tags/post_0.6.0/visu/visu_config_demo.xml
===================================================================
--- CometVisu/tags/post_0.6.0/visu/visu_config_demo.xml	2011-11-20 21:45:11 UTC (rev 539)
+++ CometVisu/tags/post_0.6.0/visu/visu_config_demo.xml	2011-11-23 19:43:39 UTC (rev 540)
@@ -271,6 +271,10 @@
     </slide>
     <diagram_popup rrd="200_DALI_Linie_1_Strom" unit="mA" series="day" refresh="300">DALI Strom L1</diagram_popup>
     <diagram_inline rrd="200_DALI_Linie_1_Strom" width="600" height="400"/>
+    <diagram_info rrd="200_DALI_Linie_1_Strom" unit="mA" series="day" refresh="300">
+      <label>DALI Strom L1</label>
+      <address transform="DPT:9.021">14/2/7</address>
+    </diagram_info>
     <infotrigger uplabel="wärmer" downlabel="kälter" upvalue="1" downvalue="0" align="center" format="%.1f °C">
       <label>Temperatur Sollwert</label>
       <address transform="DPT:1.001">4/1/3</address>

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