|
@ -16,7 +16,7 @@ var Points = require('./graph2d_types/points'); |
|
|
*/ |
|
|
*/ |
|
|
function GraphGroup(group, groupId, options, groupsUsingDefaultStyles) { |
|
|
function GraphGroup(group, groupId, options, groupsUsingDefaultStyles) { |
|
|
this.id = groupId; |
|
|
this.id = groupId; |
|
|
var fields = ['sampling', 'style', 'sort', 'yAxisOrientation', 'barChart', 'drawPoints', 'shaded', 'interpolation', 'zIndex']; |
|
|
|
|
|
|
|
|
var fields = ['sampling', 'style', 'sort', 'yAxisOrientation', 'barChart', 'drawPoints', 'shaded', 'interpolation', 'zIndex','excludeFromStacking', 'excludeFromLegend']; |
|
|
this.options = util.selectiveBridgeObject(fields, options); |
|
|
this.options = util.selectiveBridgeObject(fields, options); |
|
|
this.usingDefaultStyle = group.className === undefined; |
|
|
this.usingDefaultStyle = group.className === undefined; |
|
|
this.groupsUsingDefaultStyles = groupsUsingDefaultStyles; |
|
|
this.groupsUsingDefaultStyles = groupsUsingDefaultStyles; |
|
@ -65,7 +65,7 @@ GraphGroup.prototype.setZeroPosition = function (pos) { |
|
|
*/ |
|
|
*/ |
|
|
GraphGroup.prototype.setOptions = function (options) { |
|
|
GraphGroup.prototype.setOptions = function (options) { |
|
|
if (options !== undefined) { |
|
|
if (options !== undefined) { |
|
|
var fields = ['sampling', 'style', 'sort', 'yAxisOrientation', 'barChart', 'excludeFromLegend', 'excludeFromStacking', 'zIndex']; |
|
|
|
|
|
|
|
|
var fields = ['sampling', 'style', 'sort', 'yAxisOrientation', 'barChart', 'zIndex','excludeFromStacking', 'excludeFromLegend']; |
|
|
util.selectiveDeepExtend(fields, this.options, options); |
|
|
util.selectiveDeepExtend(fields, this.options, options); |
|
|
|
|
|
|
|
|
// if the group's drawPoints is a function delegate the callback to the onRender property
|
|
|
// if the group's drawPoints is a function delegate the callback to the onRender property
|
|
|