Skip to content

Commit

Permalink
Build v1.0.22. Added vector unit tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamesleesaunders
jamesleesaunders committed Feb 6, 2019
1 parent 90d83c3 commit 8d2671f
Show file tree
Hide file tree
Showing 28 changed files with 530 additions and 207 deletions.
76 changes: 56 additions & 20 deletions build/d3-x3dom.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2247,7 +2247,7 @@ function componentVectorFields () {
var zScale = void 0;
var colorScale = void 0;
var sizeScale = void 0;
var sizeDomain = [2, 7];
var sizeDomain = [2.0, 7.0];

/**
* Vector Field Function
Expand Down Expand Up @@ -2491,18 +2491,6 @@ function componentVectorFields () {
return my;
};

/**
* Colors Getter / Setter
*
* @param {Array} _v - Array of colours used by color scale.
* @returns {*}
*/
my.colors = function (_v) {
if (!arguments.length) return colors;
colors = _v;
return my;
};

/**
* Size Scale Getter / Setter
*
Expand All @@ -2527,15 +2515,39 @@ function componentVectorFields () {
return my;
};

/**
* Color Scale Getter / Setter
*
* @param {d3.scale} _v - D3 color scale.
* @returns {*}
*/
my.colorScale = function (_v) {
if (!arguments.length) return colorScale;
colorScale = _v;
return my;
};

/**
* Colors Getter / Setter
*
* @param {Array} _v - Array of colours used by color scale.
* @returns {*}
*/
my.colors = function (_v) {
if (!arguments.length) return colors;
colors = _v;
return my;
};

/**
* Vector Function Getter / Setter
*
* @param {string} _v - Vector Function.
* @param {function} _f - Vector Function.
* @returns {*}
*/
my.vectorFunction = function (_v) {
my.vectorFunction = function (_f) {
if (!arguments.length) return vectorFunction;
vectorFunction = _v;
vectorFunction = _f;
return my;
};

Expand Down Expand Up @@ -3996,7 +4008,7 @@ function chartVectorField () {
var zScale = void 0;
var colorScale = void 0;
var sizeScale = void 0;
var sizeDomain = [2, 7];
var sizeDomain = [2.0, 7.0];
var origin = { x: 0, y: 0, z: 0 };

/**
Expand Down Expand Up @@ -4216,6 +4228,30 @@ function chartVectorField () {
return my;
};

/**
* Size Scale Getter / Setter
*
* @param {d3.scale} _v - D3 color scale.
* @returns {*}
*/
my.sizeScale = function (_v) {
if (!arguments.length) return sizeScale;
sizeScale = _v;
return my;
};

/**
* Size Domain Getter / Setter
*
* @param {number[]} _v - Size min and max (e.g. [0.5, 3.0]).
* @returns {*}
*/
my.sizeDomain = function (_v) {
if (!arguments.length) return sizeDomain;
sizeDomain = _v;
return my;
};

/**
* Debug Getter / Setter
*
Expand All @@ -4231,12 +4267,12 @@ function chartVectorField () {
/**
* Vector Function Getter / Setter
*
* @param {string} _v - Vector Function.
* @param {function} _f - Vector Function.
* @returns {*}
*/
my.vectorFunction = function (_v) {
my.vectorFunction = function (_f) {
if (!arguments.length) return vectorFunction;
vectorFunction = _v;
vectorFunction = _f;
return my;
};

Expand Down
99 changes: 98 additions & 1 deletion build/d3-x3dom.min.js
View file

Large diffs are not rendered by default.

Binary file modified build/d3-x3dom.zip
View file
Binary file not shown.
50 changes: 32 additions & 18 deletions examples/Components.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,22 +175,29 @@
.call(ribbonMultiSeriesComponent);

/**
* Axis Component
* Vector Field Component
*/
var countries = d3.x3dom.randomData.countries;
var fruit = d3.x3dom.randomData.fruit;
var xScale = d3.scaleBand().domain(countries).rangeRound([0, 40]);
var yScale = d3.scaleLinear().domain([0, 10]).range([0, 40]);
var zScale = d3.scaleBand().domain(fruit).range([0, 40]);
var axisThreePlaneComponent = d3.x3dom.component.axisThreePlane()
.xScale(xScale)
.yScale(yScale)
.zScale(zScale);
var vectorValues = [];

// Generate some data
d3.range(-4, 5, 1).forEach(function(x) {
d3.range(-4, 5, 1).forEach(function(y) {
d3.range(-4, 5, 1).forEach(function(z) {
vectorValues.push({ key: null, value: null, x: x, y: y, z: z });
});
});
});

var vectorData = {
key: 'VectorFields',
values: vectorValues
};
var vectorComponent = d3.x3dom.component.vectorFields();

// Create scene
var scene8 = d3.select("#chartholder8")
.append("x3d")
.attr("id", "axis")
.attr("id", "vectorFields")
.attr("width", width + "px")
.attr("height", height + "px")
.append("scene");
Expand All @@ -199,18 +206,26 @@
scene8.call(viewpoint)
.append("group")
.attr("class", "chart")
.call(axisThreePlaneComponent);
.datum(vectorData)
.call(vectorComponent);

/**
* Vector Field Component
* Axis Component
*/
var vectorData = d3.x3dom.randomData.dataset3(300);
var vectorComponent = d3.x3dom.component.vectorFields();
var countries = d3.x3dom.randomData.countries;
var fruit = d3.x3dom.randomData.fruit;
var xScale = d3.scaleBand().domain(countries).rangeRound([0, 40]);
var yScale = d3.scaleLinear().domain([0, 10]).range([0, 40]);
var zScale = d3.scaleBand().domain(fruit).range([0, 40]);
var axisThreePlaneComponent = d3.x3dom.component.axisThreePlane()
.xScale(xScale)
.yScale(yScale)
.zScale(zScale);

// Create scene
var scene9 = d3.select("#chartholder9")
.append("x3d")
.attr("id", "vectorFields")
.attr("id", "axis")
.attr("width", width + "px")
.attr("height", height + "px")
.append("scene");
Expand All @@ -219,8 +234,7 @@
scene9.call(viewpoint)
.append("group")
.attr("class", "chart")
.datum(vectorData)
.call(vectorComponent);
.call(axisThreePlaneComponent);

/**
* Sync Viewpoints
Expand Down
32 changes: 28 additions & 4 deletions src/chart/vectorFieldChart.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default function() {
let zScale;
let colorScale;
let sizeScale;
let sizeDomain = [2, 7];
let sizeDomain = [2.0, 7.0];
let origin = { x: 0, y: 0, z: 0 };

/**
Expand Down Expand Up @@ -260,6 +260,30 @@ export default function() {
return my;
};

/**
* Size Scale Getter / Setter
*
* @param {d3.scale} _v - D3 color scale.
* @returns {*}
*/
my.sizeScale = function(_v) {
if (!arguments.length) return sizeScale;
sizeScale = _v;
return my;
};

/**
* Size Domain Getter / Setter
*
* @param {number[]} _v - Size min and max (e.g. [0.5, 3.0]).
* @returns {*}
*/
my.sizeDomain = function(_v) {
if (!arguments.length) return sizeDomain;
sizeDomain = _v;
return my;
};

/**
* Debug Getter / Setter
*
Expand All @@ -275,12 +299,12 @@ export default function() {
/**
* Vector Function Getter / Setter
*
* @param {string} _v - Vector Function.
* @param {function} _f - Vector Function.
* @returns {*}
*/
my.vectorFunction = function(_v) {
my.vectorFunction = function(_f) {
if (!arguments.length) return vectorFunction;
vectorFunction = _v;
vectorFunction = _f;
return my;
};

Expand Down
44 changes: 28 additions & 16 deletions src/component/vectorFields.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default function() {
let zScale;
let colorScale;
let sizeScale;
let sizeDomain = [2, 7];
let sizeDomain = [2.0, 7.0];

/**
* Vector Field Function
Expand Down Expand Up @@ -259,18 +259,6 @@ export default function() {
return my;
};

/**
* Colors Getter / Setter
*
* @param {Array} _v - Array of colours used by color scale.
* @returns {*}
*/
my.colors = function(_v) {
if (!arguments.length) return colors;
colors = _v;
return my;
};

/**
* Size Scale Getter / Setter
*
Expand All @@ -295,15 +283,39 @@ export default function() {
return my;
};

/**
* Color Scale Getter / Setter
*
* @param {d3.scale} _v - D3 color scale.
* @returns {*}
*/
my.colorScale = function(_v) {
if (!arguments.length) return colorScale;
colorScale = _v;
return my;
};

/**
* Colors Getter / Setter
*
* @param {Array} _v - Array of colours used by color scale.
* @returns {*}
*/
my.colors = function(_v) {
if (!arguments.length) return colors;
colors = _v;
return my;
};

/**
* Vector Function Getter / Setter
*
* @param {string} _v - Vector Function.
* @param {function} _f - Vector Function.
* @returns {*}
*/
my.vectorFunction = function(_v) {
my.vectorFunction = function(_f) {
if (!arguments.length) return vectorFunction;
vectorFunction = _v;
vectorFunction = _f;
return my;
};

Expand Down
Loading

0 comments on commit 8d2671f

Please sign in to comment.