diff --git a/dataframe.js b/dataframe.js index 27bfdcf..f9e1163 100644 --- a/dataframe.js +++ b/dataframe.js @@ -1,6 +1,5 @@ /* an attempt to wrap dataframe access in an abstract interface that should work for other data too (?) - note: test on array-of-records data! */ var dataframe = { cols: function(data) { diff --git a/dcplot.js b/dcplot.js index 9061023..7626cba 100644 --- a/dcplot.js +++ b/dcplot.js @@ -435,7 +435,8 @@ function dcplot(frame, groupname, definition) { // abstract this into a plugin - this is RCloud-specific (rserve.js) function get_levels(dim) { var levels = null; - if(_.isFunction(dim)) levels = dim.attrs.r_attributes.levels; + if(_.isFunction(dim)) + levels = dim.attrs.r_attributes.levels; else if(_.has(dims, dim) && mhas(accessor(dims[dim]), 'attrs', 'r_attributes', 'levels')) levels = accessor(dims[dim]).attrs.r_attributes.levels; return levels; @@ -816,7 +817,7 @@ function dcplot(frame, groupname, definition) { if(_.has(defn, 'wedge')) chart.keyAccessor(key_value(defn.wedge)); if(_.has(defn, 'size')) - chart.keyAccessor(key_value(defn.size)); + chart.valueAccessor(key_value(defn.size)); if(_.has(defn, 'radius')) chart.radius(defn.radius);