dojo_src 1.4.102 → 1.5.0

data/dojo/dojox/charting/plot2d/StackedColumns.js

@@ -11,15 +11,28 @@ dojo.require("dojox.lang.functional.reversed");
 		purgeGroup = df.lambda("item.purgeGroup()");
 
 	dojo.declare("dojox.charting.plot2d.StackedColumns", dojox.charting.plot2d.Columns, {
-		calculateAxes: function(dim){
+		//	summary:
+		//		The plot object representing a stacked column chart (vertical bars).
+		getSeriesStats: function(){
+			//	summary:
+			//		Calculate the min/max on all attached series in both directions.
+			//	returns: Object
+			//		{hmin, hmax, vmin, vmax} min/max in both directions.
 			var stats = dc.collectStackedStats(this.series);
 			this._maxRunLength = stats.hmax;
 			stats.hmin -= 0.5;
 			stats.hmax += 0.5;
-			this._calc(dim, stats);
-			return this;
+			return stats;
 		},
 		render: function(dim, offsets){
+			//	summary:
+			//		Run the calculations for any axes for this plot.
+			//	dim: Object
+			//		An object in the form of { width, height }
+			//	offsets: Object
+			//		An object of the form { l, r, t, b}.
+			//	returns: dojox.charting.plot2d.StackedColumns
+			//		A reference to this plot for functional chaining.
 			if(this._maxRunLength <= 0){
 				return this;
 			}
@@ -29,97 +42,95 @@ dojo.require("dojox.lang.functional.reversed");
 			for(var i = 0; i < this.series.length; ++i){
 				var run = this.series[i];
 				for(var j = 0; j < run.data.length; ++j){
-					var value = run.data[j], v = typeof value == "number" ? value : value.y;
-					if(isNaN(v)){ v = 0; }
-					acc[j] += v;
+					var value = run.data[j];
+					if(value !== null){
+						var v = typeof value == "number" ? value : value.y;
+						if(isNaN(v)){ v = 0; }
+						acc[j] += v;
+					}
 				}
 			}
 			// draw runs in backwards
+			if(this.zoom && !this.isDataDirty()){
+				return this.performZoom(dim, offsets);
+			}
+			this.resetEvents();
 			this.dirty = this.isDirty();
 			if(this.dirty){
 				dojo.forEach(this.series, purgeGroup);
+				this._eventSeries = {};
 				this.cleanGroup();
 				var s = this.group;
 				df.forEachRev(this.series, function(item){ item.cleanGroup(s); });
 			}
-			var t = this.chart.theme, color, stroke, fill, f, gap, width,
+			var t = this.chart.theme, f, gap, width,
 				ht = this._hScaler.scaler.getTransformerFromModel(this._hScaler),
 				vt = this._vScaler.scaler.getTransformerFromModel(this._vScaler),
 				events = this.events();
 			f = dc.calculateBarSize(this._hScaler.bounds.scale, this.opt);
 			gap = f.gap;
 			width = f.size;
-			this.resetEvents();
 			for(var i = this.series.length - 1; i >= 0; --i){
 				var run = this.series[i];
-				if(!this.dirty && !run.dirty){ continue; }
-				run.cleanGroup();
-				var s = run.group;
-				if(!run.fill || !run.stroke){
-					// need autogenerated color
-					color = run.dyn.color = new dojo.Color(t.next("color"));
+				if(!this.dirty && !run.dirty){
+					t.skip();
+					this._reconnectEvents(run.name);
+					continue;
 				}
-				stroke = run.stroke ? run.stroke : dc.augmentStroke(t.series.stroke, color);
-				fill = run.fill ? run.fill : dc.augmentFill(t.series.fill, color);
+				run.cleanGroup();
+				var theme = t.next("column", [this.opt, run]), s = run.group,
+					eventSeries = new Array(acc.length);
 				for(var j = 0; j < acc.length; ++j){
-					var v = acc[j],
-						height = vt(v),
-						value = run.data[j],
-						specialColor  = color,
-						specialFill   = fill,
-						specialStroke = stroke;
-					if(typeof value != "number"){
-						if(value.color){
-							specialColor = new dojo.Color(value.color);
-						}
-						if("fill" in value){
-							specialFill = value.fill;
-						}else if(value.color){
-							specialFill = dc.augmentFill(t.series.fill, specialColor);
-						}
-						if("stroke" in value){
-							specialStroke = value.stroke;
-						}else if(value.color){
-							specialStroke = dc.augmentStroke(t.series.stroke, specialColor);
-						}
-					}
-					if(width >= 1 && height >= 1){
-						var shape = s.createRect({
-							x: offsets.l + ht(j + 0.5) + gap,
-							y: dim.height - offsets.b - vt(v),
-							width: width, height: height
-						}).setFill(specialFill).setStroke(specialStroke);
-						run.dyn.fill   = shape.getFill();
-						run.dyn.stroke = shape.getStroke();
-						if(events){
-							var o = {
-								element: "column",
-								index:   j,
-								run:     run,
-								plot:    this,
-								hAxis:   this.hAxis || null,
-								vAxis:   this.vAxis || null,
-								shape:   shape,
-								x:       j + 0.5,
-								y:       v
+					var value = run.data[j];
+					if(value !== null){
+						var v = acc[j],
+							height = vt(v),
+							finalTheme = typeof value != "number" ?
+								t.addMixin(theme, "column", value, true) :
+								t.post(theme, "column");
+						if(width >= 1 && height >= 1){
+							var rect = {
+								x: offsets.l + ht(j + 0.5) + gap,
+								y: dim.height - offsets.b - vt(v),
+								width: width, height: height
 							};
-							this._connectEvents(shape, o);
-						}
-						if(this.animate){
-							this._animateColumn(shape, dim.height - offsets.b, height);
+							var specialFill = this._plotFill(finalTheme.series.fill, dim, offsets);
+							specialFill = this._shapeFill(specialFill, rect);
+							var shape = s.createRect(rect).setFill(specialFill).setStroke(finalTheme.series.stroke);
+							run.dyn.fill   = shape.getFill();
+							run.dyn.stroke = shape.getStroke();
+							if(events){
+								var o = {
+									element: "column",
+									index:   j,
+									run:     run,
+									shape:   shape,
+									x:       j + 0.5,
+									y:       v
+								};
+								this._connectEvents(o);
+								eventSeries[j] = o;
+							}
+							if(this.animate){
+								this._animateColumn(shape, dim.height - offsets.b, height);
+							}
 						}
 					}
 				}
+				this._eventSeries[run.name] = eventSeries;
 				run.dirty = false;
 				// update the accumulator
 				for(var j = 0; j < run.data.length; ++j){
-					var value = run.data[j], v = typeof value == "number" ? value : value.y;
-					if(isNaN(v)){ v = 0; }
-					acc[j] -= v;
+					var value = run.data[j];
+					if(value !== null){
+						var v = typeof value == "number" ? value : value.y;
+						if(isNaN(v)){ v = 0; }
+						acc[j] -= v;
+					}
 				}
 			}
 			this.dirty = false;
-			return this;
+			return this;	//	dojox.charting.plot2d.StackedColumns
 		}
 	});
 })();

data/dojo/dojox/charting/plot2d/StackedLines.js

@@ -3,7 +3,11 @@ dojo.provide("dojox.charting.plot2d.StackedLines");
 dojo.require("dojox.charting.plot2d.Stacked");
 
 dojo.declare("dojox.charting.plot2d.StackedLines", dojox.charting.plot2d.Stacked, {
+	//	summary:
+	//		A convenience object to create a stacked line chart.
 	constructor: function(){
+		//	summary:
+		//		Force our Stacked base to be lines only.
 		this.opt.lines = true;
 	}
 });

data/dojo/dojox/charting/plot2d/_PlotEvents.js

@@ -0,0 +1,123 @@
+dojo.provide("dojox.charting.plot2d._PlotEvents");
+
+dojo.declare("dojox.charting.plot2d._PlotEvents", null, {
+	constructor: function(){
+		this._shapeEvents = [];
+		this._eventSeries = {};
+	},
+	destroy: function(){
+		//	summary:
+		//		Destroy any internal elements and event handlers.
+		this.resetEvents();
+		this.inherited(arguments);
+	},
+	plotEvent: function(o){
+		//	summary:
+		//		Stub function for use by specific plots.
+		//	o: Object
+		//		An object intended to represent event parameters.
+	},
+	raiseEvent: function(o){
+		//	summary:
+		//		Raises events in predefined order
+		//	o: Object
+		//		An object intended to represent event parameters.
+		this.plotEvent(o);
+		var t = dojo.delegate(o);
+		t.originalEvent = o.type;
+		t.originalPlot  = o.plot;
+		t.type = "onindirect";
+		dojo.forEach(this.chart.stack, function(plot){
+			if(plot !== this && plot.plotEvent){
+				t.plot = plot;
+				plot.plotEvent(t);
+			}
+		}, this);
+	},
+	connect: function(object, method){
+		//	summary:
+		//		Helper function to connect any object's method to our plotEvent.
+		//	object: Object
+		//		The object to connect to.
+		//	method: String|Function
+		//		The method to fire when our plotEvent is fired.
+		//	returns: Array
+		//		The handle as returned from dojo.connect (see dojo.connect).
+		this.dirty = true;
+		return dojo.connect(this, "plotEvent", object, method);	//	Array
+	},
+	events: function(){
+		//	summary:
+		//		Find out if any event handlers have been connected to our plotEvent.
+		//	returns: Boolean
+		//		A flag indicating that there are handlers attached.
+		var ls = this.plotEvent._listeners;
+		if(!ls || !ls.length){ return false; }
+		for(var i in ls){
+			if(!(i in Array.prototype)){
+				return true;
+			}
+		}
+		return false;
+	},
+	resetEvents: function(){
+		//	summary:
+		//		Reset all events attached to our plotEvent (i.e. disconnect).
+		if(this._shapeEvents.length){
+			dojo.forEach(this._shapeEvents, function(item){
+				item.shape.disconnect(item.handle);
+			});
+			this._shapeEvents = [];
+		}
+		this.raiseEvent({type: "onplotreset", plot: this});
+	},
+	_connectSingleEvent: function(o, eventName){
+		this._shapeEvents.push({
+			shape:  o.eventMask,
+			handle: o.eventMask.connect(eventName, this, function(e){
+				o.type  = eventName;
+				o.event = e;
+				this.raiseEvent(o);
+				o.event = null;
+			})
+		});
+	},
+	_connectEvents: function(o){
+		o.chart = this.chart;
+		o.plot  = this;
+		o.hAxis = this.hAxis || null;
+		o.vAxis = this.vAxis || null;
+		o.eventMask = o.eventMask || o.shape;
+		this._connectSingleEvent(o, "onmouseover");
+		this._connectSingleEvent(o, "onmouseout");
+		this._connectSingleEvent(o, "onclick");
+	},
+	_reconnectEvents: function(seriesName){
+		var a = this._eventSeries[seriesName];
+		if(a){
+			dojo.forEach(a, this._connectEvents, this);
+		}
+	},
+	fireEvent: function(seriesName, eventName, index, eventObject){
+		//	summary:
+		//		Emulates firing an event for a given data value (specified by
+		//		an index) of a given series.
+		//	seriesName: String:
+		//		Series name.
+		//	eventName: String:
+		//		Event name to emulate.
+		//	index:	Number:
+		//		Valid data value index used to raise an event.
+		//	eventObject: Object?:
+		//		Optional event object. Especially useful for synthetic events.
+		//		Default: null.
+		var s = this._eventSeries[seriesName];
+		if(s && s.length && index < s.length){
+			var o = s[index];
+			o.type  = eventName;
+			o.event = eventObject || null;
+			this.raiseEvent(o);
+			o.event = null;
+		}
+	}
+});

data/dojo/dojox/charting/plot2d/common.js

@@ -42,44 +42,53 @@ dojo.require("dojox.lang.functional");
 		},
 
 		collectSimpleStats: function(series){
-			var stats = dojo.clone(dc.defaultStats);
+			var stats = dojo.delegate(dc.defaultStats);
 			for(var i = 0; i < series.length; ++i){
 				var run = series[i];
-				if(!run.data.length){ continue; }
-				if(typeof run.data[0] == "number"){
-					// 1D case
-					var old_vmin = stats.vmin, old_vmax = stats.vmax;
-					if(!("ymin" in run) || !("ymax" in run)){
-						dojo.forEach(run.data, function(val, i){
-							var x = i + 1, y = val;
-							if(isNaN(y)){ y = 0; }
-							stats.hmin = Math.min(stats.hmin, x);
-							stats.hmax = Math.max(stats.hmax, x);
-							stats.vmin = Math.min(stats.vmin, y);
-							stats.vmax = Math.max(stats.vmax, y);
-						});
-					}
-					if("ymin" in run){ stats.vmin = Math.min(old_vmin, run.ymin); }
-					if("ymax" in run){ stats.vmax = Math.max(old_vmax, run.ymax); }
-				}else{
-					// 2D case
-					var old_hmin = stats.hmin, old_hmax = stats.hmax,
-						old_vmin = stats.vmin, old_vmax = stats.vmax;
-					if(!("xmin" in run) || !("xmax" in run) || !("ymin" in run) || !("ymax" in run)){
-						dojo.forEach(run.data, function(val, i){
-							var x = "x" in val ? val.x : i + 1, y = val.y;
-							if(isNaN(x)){ x = 0; }
-							if(isNaN(y)){ y = 0; }
-							stats.hmin = Math.min(stats.hmin, x);
-							stats.hmax = Math.max(stats.hmax, x);
-							stats.vmin = Math.min(stats.vmin, y);
-							stats.vmax = Math.max(stats.vmax, y);
-						});
+				for(var j = 0; j < run.data.length; j++){
+					if(run.data[j] !== null){
+						if(typeof run.data[j] == "number"){
+							// 1D case
+							var old_vmin = stats.vmin, old_vmax = stats.vmax;
+							if(!("ymin" in run) || !("ymax" in run)){
+								dojo.forEach(run.data, function(val, i){
+									if(val !== null){
+										var x = i + 1, y = val;
+										if(isNaN(y)){ y = 0; }
+										stats.hmin = Math.min(stats.hmin, x);
+										stats.hmax = Math.max(stats.hmax, x);
+										stats.vmin = Math.min(stats.vmin, y);
+										stats.vmax = Math.max(stats.vmax, y);
+									}
+								});
+							}
+							if("ymin" in run){ stats.vmin = Math.min(old_vmin, run.ymin); }
+							if("ymax" in run){ stats.vmax = Math.max(old_vmax, run.ymax); }
+						}else{
+							// 2D case
+							var old_hmin = stats.hmin, old_hmax = stats.hmax,
+								old_vmin = stats.vmin, old_vmax = stats.vmax;
+							if(!("xmin" in run) || !("xmax" in run) || !("ymin" in run) || !("ymax" in run)){
+								dojo.forEach(run.data, function(val, i){
+									if(val !== null){
+										var x = "x" in val ? val.x : i + 1, y = val.y;
+										if(isNaN(x)){ x = 0; }
+										if(isNaN(y)){ y = 0; }
+										stats.hmin = Math.min(stats.hmin, x);
+										stats.hmax = Math.max(stats.hmax, x);
+										stats.vmin = Math.min(stats.vmin, y);
+										stats.vmax = Math.max(stats.vmax, y);
+									}
+								});
+							}
+							if("xmin" in run){ stats.hmin = Math.min(old_hmin, run.xmin); }
+							if("xmax" in run){ stats.hmax = Math.max(old_hmax, run.xmax); }
+							if("ymin" in run){ stats.vmin = Math.min(old_vmin, run.ymin); }
+							if("ymax" in run){ stats.vmax = Math.max(old_vmax, run.ymax); }
+						}
+
+						break;
 					}
-					if("xmin" in run){ stats.hmin = Math.min(old_hmin, run.xmin); }
-					if("xmax" in run){ stats.hmax = Math.max(old_hmax, run.xmax); }
-					if("ymin" in run){ stats.vmin = Math.min(old_vmin, run.ymin); }
-					if("ymax" in run){ stats.vmax = Math.max(old_vmax, run.ymax); }
 				}
 			}
 			return stats;

data/dojo/dojox/charting/scaler/primitive.js

@@ -2,6 +2,12 @@ dojo.provide("dojox.charting.scaler.primitive");
 
 dojox.charting.scaler.primitive = {
 	buildScaler: function(/*Number*/ min, /*Number*/ max, /*Number*/ span, /*Object*/ kwArgs){
+		if(min == max){
+			// artificially extend bounds
+			min -= 0.5;
+			max += 0.5;
+			// now the line will be centered
+		}
 		return {
 			bounds: {
 				lower: min,

data/dojo/dojox/charting/tests/gradients/test_grad_bars1.html

@@ -0,0 +1,85 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7">
+    <title>Gradient: Bars #1</title>
+	<script type="text/javascript" src="../../../../dojo/dojo.js" djConfig="isDebug: true"></script>
+    <script>
+		dojo.require("dojox.charting.Chart2D");
+        
+        run = function(){
+            dojo.attr("start", "disabled", true);
+            
+            var theme1 = new dojox.charting.Theme({
+                    seriesThemes: [
+                        {
+                            fill: {
+                                type: "linear", space: "plot", x1: 0, y1: 0, x2: 100, y2: 0,
+                                colors: [{ offset: 0, color: "#ed0" }, { offset: 0.5, color: "#eda" }, { offset: 1, color: "#ed0" }]
+                            }
+                        },
+                        {
+                            fill: {
+                                type: "linear", space: "plot", x1: 0, y1: 0, x2: 100, y2: 0,
+                                colors: [{ offset: 0, color: "#e00" }, { offset: 0.5, color: "#eaa" }, { offset: 1, color: "#e00" }]
+                            }
+                        },
+                        {
+                            fill: {
+                                type: "linear", space: "plot", x1: 0, y1: 0, x2: 100, y2: 0,
+                                colors: [{ offset: 0, color: "#0e0" }, { offset: 0.5, color: "#aea" }, { offset: 1, color: "#0e0" }]
+                            }
+                        },
+                        {
+                            fill: {
+                                type: "linear", space: "plot", x1: 0, y1: 0, x2: 100, y2: 0,
+                                colors: [{ offset: 0, color: "#00e" }, { offset: 0.5, color: "#aae" }, { offset: 1, color: "#00e" }]
+                            }
+                        }
+                    ]
+                });
+
+            var chart1 = new dojox.charting.Chart2D("c1").
+                setTheme(theme1).
+                addAxis("x", {fixLower: "major", fixUpper: "major", includeZero: true,  minorTickStep: 0.5}).
+                addAxis("y", {vertical: true, fixLower: "major", fixUpper: "major", natural: true}).
+                addPlot("default", {type: "Bars"}).
+                addSeries("Series A", [1, 2, 3, 4, 5]).
+                addSeries("Series B", [5, 4, 3, 2, 1]).
+                render();
+
+            var chart2 = new dojox.charting.Chart2D("c2").
+                setTheme(theme1).
+                addAxis("x", {fixLower: "major", fixUpper: "major", includeZero: true,  minorTickStep: 0.5}).
+                addAxis("y", {vertical: true, fixLower: "major", fixUpper: "major", natural: true}).
+                addPlot("default", {type: "StackedBars"}).
+                addSeries("Series A", [2, 3, 3, 3, 5]).
+                addSeries("Series B", [1, 4, 5, 2, 1]).
+                addSeries("Series C", [2, 1, 2, 1, 3]).
+                render();
+
+            var chart3 = new dojox.charting.Chart2D("c3").
+                setTheme(theme1).
+                addAxis("x", {fixLower: "major", fixUpper: "major", includeZero: true,  minorTickStep: 0.5}).
+                addAxis("y", {vertical: true, fixLower: "major", fixUpper: "major", natural: true}).
+                addPlot("default", {type: "ClusteredBars", gap: 5}).
+                addSeries("Series A", [2, 3, 3, 3, 5]).
+                addSeries("Series B", [1, 4, 5, 2, 1]).
+                addSeries("Series C", [2, 1, 2, 1, 3]).
+                render();
+        };
+        
+        dojo.addOnLoad(run);
+    </script>
+</head>
+<body>
+    <p><button id="start" onclick="run();">Start!</button></p>
+	<h1>plot-space left-to-right gradient</h1>
+	<p>Bars</p>
+    <div id="c1" style="position: relative; width: 600px; height: 400px;"></div>
+	<p>Stacked Bars</p>
+    <div id="c2" style="position: relative; width: 600px; height: 400px;"></div>
+	<p>Clustered Bars</p>
+    <div id="c3" style="position: relative; width: 600px; height: 400px;"></div>
+</body>
+</html>