Changeset 13248

Timestamp:

03/31/08 21:14:48 (8 months ago)

Author:

ttrenka

Message:

Added new Bubble chart plotter, very minor tweaks in Default and Stacked, added a quick test. !strict.

Location:

dojox/trunk/charting

Files:

• plot2d/Bubble.js (added)
• plot2d/Default.js (modified) (1 diff)
• plot2d/Stacked.js (modified) (1 diff)
• tests/test_chart2d.html (modified) (3 diffs)

dojox/trunk/charting/plot2d/Default.js

@@ -56 +56 @@
                                 //      inner function for translating polylines to curves with tension
                                 function curve(arr, tension){
-                                        var p=dojo.map(arr, function(item, i){
+                                        return dojo.map(arr, function(item, i){
                                                 if(i==0){ return "M" + item.x + "," + item.y; }
                                                 var dx=item.x-arr[i-1].x, dy=arr[i-1].y;
                                                 return "C"+(item.x-(tension-1)*(dx/tension))+","+dy+" "+(item.x-(dx/tension))+","+item.y+" "+item.x+","+item.y;
-                                        });
-                                        return p.join(" ");
+                                        }).join(" ");
                                 }
                                 

dojox/trunk/charting/plot2d/Stacked.js

@@ -40 +40 @@
                         //      inner function for translating polylines to curves with tension
                         function curve(arr, tension){
-                                var p=dojo.map(arr, function(item, i){
+                                return dojo.map(arr, function(item, i){
                                         if(i==0){ return "M" + item.x + "," + item.y; }
                                         var dx=item.x-arr[i-1].x, dy=arr[i-1].y;
                                         return "C"+(item.x-(tension-1)*(dx/tension))+","+dy+" "+(item.x-(dx/tension))+","+item.y+" "+item.x+","+item.y;
-                                });
-                                return p.join(" ");
+                                }).join(" ");
                         }
                                 

dojox/trunk/charting/tests/test_chart2d.html

@@ -37 +37 @@
 <script type="text/javascript" src="../plot2d/StackedBars.js"></script>
 <script type="text/javascript" src="../plot2d/ClusteredBars.js"></script>
+<script type="text/javascript" src="../plot2d/Bubble.js"></script>
 <script type="text/javascript" src="../plot2d/Grid.js"></script>
 <script type="text/javascript" src="../plot2d/Pie.js"></script>
@@ -282 +283 @@
         chart29.render();
 
+        var chart30 = new dojox.charting.Chart2D("test30");
+        chart30.setTheme(dojox.charting.themes.PlotKit.green);
+        chart30.addPlot("default", {type: "Bubble", shadows: {dx: 2, dy: 2, dw: 2}});
+        chart30.addAxis("x", {min: 0, max: 6, majorTick: {stroke: "black", length: 3}, minorTick: {stroke: "gray", length: 3}});
+        chart30.addAxis("y", {vertical: true, min: 0, max: 10, majorTick: {stroke: "black", length: 3}, minorTick: {stroke: "gray", length: 3}});
+        chart30.addSeries("Series A", [{x: 0.5, y: 5, size: 1.4}, {x: 1.5, y: 1.5, size:4.5}, {x: 2, y: 9, size:1.5}, {x: 5, y: 0.3, size:0.8}]);
+        chart30.addSeries("Series B", [{x: 0.3, y: 8, size: 2.5}, {x: 4, y: 6, size:1.1}, {x: 5.5, y: 2, size: 3.2}]);
+        chart30.render();
 };
 
@@ -349 +358 @@
 <p>29: Clustered columns with positive and negative values, readable theme.</p>
 <div id="test29" style="width: 500px; height: 300px;"></div>
+<p>30: Bubble chart, green theme.</p>
+<div id="test30" style="width: 500px; height: 300px;"></div>
 <p>That's all Folks!</p>
 </body>