[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.