Skip to content

Make surface handle zmin/zmax [fixes #86] #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 5, 2016
Merged

Make surface handle zmin/zmax [fixes #86] #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ffa0af7
lint (gl-vis -> plotly.js formatting)
etpinard Dec 30, 2015
24301b3
pass colorBounds to createSurface using zmin and zmax
etpinard Dec 30, 2015
3ad512b
bump gl-surface3d requirement
etpinard Jan 4, 2016
8e28d9a
update surface baseline images:
etpinard Jan 4, 2016
e3928e3
add custom zmin and zmax to gl3d_autocolorscale
etpinard Jan 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"gl-scatter3d": "^1.0.4",
"gl-select-box": "^1.0.1",
"gl-spikes2d": "^1.0.1",
"gl-surface3d": "^1.0.6",
"gl-surface3d": "^1.1.0",
"mouse-change": "^1.1.1",
"mouse-wheel": "^1.0.2",
"ndarray": "^1.0.16",
Expand Down
240 changes: 128 additions & 112 deletions src/traces/surface/convert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,58 +20,68 @@ var str2RgbaArray = require('../../lib/str2rgbarray');

var MIN_RESOLUTION = 128;


function SurfaceTrace(scene, surface, uid) {
this.scene = scene;
this.uid = uid;
this.surface = surface;
this.data = null;
this.showContour = [false,false,false];
this.dataScale = 1.0;
this.scene = scene;
this.uid = uid;
this.surface = surface;
this.data = null;
this.showContour = [false, false, false];
this.dataScale = 1.0;
}

var proto = SurfaceTrace.prototype;

proto.handlePick = function(selection) {
if(selection.object === this.surface) {
var selectIndex = [
Math.min(Math.round(selection.data.index[0]/this.dataScale-1)|0, this.data.z[0].length-1),
Math.min(Math.round(selection.data.index[1]/this.dataScale-1)|0, this.data.z.length-1) ];
var traceCoordinate = [0,0,0];
if(Array.isArray(this.data.x[0])) {
traceCoordinate[0] = this.data.x[selectIndex[1]][selectIndex[0]];
} else {
traceCoordinate[0] = this.data.x[selectIndex[0]];
}
if(Array.isArray(this.data.y[0])) {
traceCoordinate[1] = this.data.y[selectIndex[1]][selectIndex[0]];
} else {
traceCoordinate[1] = this.data.y[selectIndex[1]];
}
traceCoordinate[2] = this.data.z[selectIndex[1]][selectIndex[0]];
selection.traceCoordinate = traceCoordinate;

var sceneLayout = this.scene.fullSceneLayout;
selection.dataCoordinate = [
sceneLayout.xaxis.d2l(traceCoordinate[0])*this.scene.dataScale[0],
sceneLayout.yaxis.d2l(traceCoordinate[1])*this.scene.dataScale[1],
sceneLayout.zaxis.d2l(traceCoordinate[2])*this.scene.dataScale[2]
];

var text = this.data.text;
if(text && text[selectIndex[1]] && text[selectIndex[1]][selectIndex[0]]!==undefined) {
selection.textLabel = text[selectIndex[1]][selectIndex[0]];
}
else selection.textLabel = '';
if(selection.object === this.surface) {
var selectIndex = [
Math.min(
Math.round(selection.data.index[0]/this.dataScale-1)|0,
this.data.z[0].length-1
),
Math.min(
Math.round(selection.data.index[1]/this.dataScale-1)|0,
this.data.z.length-1
)
];
var traceCoordinate = [0,0,0];

if(Array.isArray(this.data.x[0])) {
traceCoordinate[0] = this.data.x[selectIndex[1]][selectIndex[0]];
} else {
traceCoordinate[0] = this.data.x[selectIndex[0]];
}
if(Array.isArray(this.data.y[0])) {
traceCoordinate[1] = this.data.y[selectIndex[1]][selectIndex[0]];
} else {
traceCoordinate[1] = this.data.y[selectIndex[1]];
}

traceCoordinate[2] = this.data.z[selectIndex[1]][selectIndex[0]];
selection.traceCoordinate = traceCoordinate;

selection.data.dataCoordinate = selection.dataCoordinate.slice();
var sceneLayout = this.scene.fullSceneLayout;
selection.dataCoordinate = [
sceneLayout.xaxis.d2l(traceCoordinate[0]) * this.scene.dataScale[0],
sceneLayout.yaxis.d2l(traceCoordinate[1]) * this.scene.dataScale[1],
sceneLayout.zaxis.d2l(traceCoordinate[2]) * this.scene.dataScale[2]
];

this.surface.highlight(selection.data);
var text = this.data.text;
if(text && text[selectIndex[1]] && text[selectIndex[1]][selectIndex[0]]!==undefined) {
selection.textLabel = text[selectIndex[1]][selectIndex[0]];
}
else selection.textLabel = '';

//Snap spikes to data coordinate
this.scene.glplot.spikes.position = selection.dataCoordinate;
selection.data.dataCoordinate = selection.dataCoordinate.slice();

return true;
}
this.surface.highlight(selection.data);

// Snap spikes to data coordinate
this.scene.glplot.spikes.position = selection.dataCoordinate;

return true;
}
};

function parseColorScale (colorscale, alpha) {
Expand All @@ -88,42 +98,44 @@ function parseColorScale (colorscale, alpha) {
});
}

//Pad coords by +1
// Pad coords by +1
function padField(field) {
var shape = field.shape;
var nshape = [shape[0]+2, shape[1]+2];
var nfield = ndarray(new Float32Array(nshape[0] * nshape[1]), nshape);

//Center
ops.assign(nfield.lo(1, 1).hi(shape[0], shape[1]), field);

//Edges
ops.assign(nfield.lo(1).hi(shape[0], 1),
field.hi(shape[0], 1));
ops.assign(nfield.lo(1, nshape[1]-1).hi(shape[0], 1),
field.lo(0, shape[1]-1).hi(shape[0], 1));
ops.assign(nfield.lo(0, 1).hi(1, shape[1]),
field.hi(1));
ops.assign(nfield.lo(nshape[0]-1, 1).hi(1, shape[1]),
field.lo(shape[0]-1));

//Corners
nfield.set(0, 0, field.get(0, 0));
nfield.set(0, nshape[1]-1, field.get(0, shape[1]-1));
nfield.set(nshape[0]-1, 0, field.get(shape[0]-1, 0));
nfield.set(nshape[0]-1, nshape[1]-1, field.get(shape[0]-1, shape[1]-1));

return nfield;
var shape = field.shape;
var nshape = [shape[0]+2, shape[1]+2];
var nfield = ndarray(new Float32Array(nshape[0] * nshape[1]), nshape);

// Center
ops.assign(nfield.lo(1, 1).hi(shape[0], shape[1]), field);

// Edges
ops.assign(nfield.lo(1).hi(shape[0], 1),
field.hi(shape[0], 1));
ops.assign(nfield.lo(1, nshape[1]-1).hi(shape[0], 1),
field.lo(0, shape[1]-1).hi(shape[0], 1));
ops.assign(nfield.lo(0, 1).hi(1, shape[1]),
field.hi(1));
ops.assign(nfield.lo(nshape[0]-1, 1).hi(1, shape[1]),
field.lo(shape[0]-1));

// Corners
nfield.set(0, 0, field.get(0, 0));
nfield.set(0, nshape[1]-1, field.get(0, shape[1]-1));
nfield.set(nshape[0]-1, 0, field.get(shape[0]-1, 0));
nfield.set(nshape[0]-1, nshape[1]-1, field.get(shape[0]-1, shape[1]-1));

return nfield;
}

function refine(coords) {
var minScale = Math.max(coords[0].shape[0], coords[0].shape[1]);

if(minScale < MIN_RESOLUTION) {
var scaleF = MIN_RESOLUTION / minScale;
var nshape = [
Math.floor((coords[0].shape[0]) * scaleF+1)|0,
Math.floor((coords[0].shape[1]) * scaleF+1)|0 ];
var nsize = nshape[0] * nshape[1];

for(var i = 0; i < 3; ++i) {
var padImg = padField(coords[i]);
var scaledImg = ndarray(new Float32Array(nsize), nshape);
Expand All @@ -132,20 +144,24 @@ function refine(coords) {
0, 0, 1]);
coords[i] = scaledImg;
}

return scaleF;
}

return 1.0;
}

proto.setContourLevels = function() {
var nlevels = [[], [], []];
var needsUpdate = false;
for(var i=0; i<3; ++i) {

for(var i = 0; i < 3; ++i) {
if(this.showContour[i]) {
needsUpdate = true;
nlevels[i] = this.scene.contourLevels[i];
}
}

if(needsUpdate) {
this.surface.update({ levels: nlevels });
}
Expand Down Expand Up @@ -218,20 +234,23 @@ proto.update = function(data) {
this.dataScale = refine(coords);

var params = {
colormap: colormap,
levels: [[], [], []],
showContour: [ true, true, true ],
showSurface: !data.hidesurface,
contourProject: [ [ false, false, false ],
[ false, false, false ],
[ false, false, false ] ],
contourWidth: [ 1, 1, 1 ],
contourColor: [ [1, 1, 1, 1], [1, 1, 1, 1], [1, 1, 1, 1] ],
contourTint: [ 1, 1, 1 ],
dynamicColor: [ [1, 1, 1, 1], [1, 1, 1, 1], [1, 1, 1, 1] ],
dynamicWidth: [ 1, 1, 1 ],
dynamicTint: [ 1, 1, 1 ],
opacity: 1
colormap: colormap,
levels: [[], [], []],
showContour: [true, true, true],
showSurface: !data.hidesurface,
contourProject: [
[false, false, false],
[false, false, false],
[false, false, false]
],
contourWidth: [1, 1, 1],
contourColor: [[1, 1, 1, 1], [1, 1, 1, 1], [1, 1, 1, 1]],
contourTint: [1, 1, 1],
dynamicColor: [[1, 1, 1, 1], [1, 1, 1, 1], [1, 1, 1, 1]],
dynamicWidth: [1, 1, 1],
dynamicTint: [1, 1, 1],
opacity: 1,
colorBounds: [data.zmin * scaleFactor[2], data.zmax * scaleFactor[2]]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the only interesting part of this PR on the plotly.js side.

};


Expand All @@ -241,24 +260,23 @@ proto.update = function(data) {
}
}

var highlightEnable = [ true, true, true ];
var contourEnable = [ true, true, true ];
var axis = [ 'x', 'y', 'z' ];
var highlightEnable = [true, true, true];
var contourEnable = [true, true, true];
var axis = ['x', 'y', 'z'];

for(i = 0; i < 3; ++i) {
var contourParams = data.contours[axis[i]];
highlightEnable[i] = contourParams.highlight;
contourEnable[i] = contourParams.show;
var contourParams = data.contours[axis[i]];
highlightEnable[i] = contourParams.highlight;
contourEnable[i] = contourParams.show;

params.showContour[i] = contourParams.show || contourParams.highlight;
if (!params.showContour[i]) {
continue;
}
params.showContour[i] = contourParams.show || contourParams.highlight;
if(!params.showContour[i]) continue;

params.contourProject[i] = [
params.contourProject[i] = [
contourParams.project.x,
contourParams.project.y,
contourParams.project.z ];
contourParams.project.z
];

if (contourParams.show) {
this.showContour[i] = true;
Expand All @@ -283,18 +301,18 @@ proto.update = function(data) {
params.coords = coords;
surface.update(params);

surface.highlightEnable = highlightEnable;
surface.contourEnable = contourEnable;
surface.visible = data.visible;
surface.highlightEnable = highlightEnable;
surface.contourEnable = contourEnable;
surface.visible = data.visible;

surface.snapToData = true;

if ('lighting' in data) {
surface.ambientLight = data.lighting.ambient;
surface.diffuseLight = data.lighting.diffuse;
surface.specularLight = data.lighting.specular;
surface.roughness = data.lighting.roughness;
surface.fresnel = data.lighting.fresnel;
surface.ambientLight = data.lighting.ambient;
surface.diffuseLight = data.lighting.diffuse;
surface.specularLight = data.lighting.specular;
surface.roughness = data.lighting.roughness;
surface.fresnel = data.lighting.fresnel;
}

if (alpha && alpha < 1) {
Expand All @@ -304,19 +322,17 @@ proto.update = function(data) {


proto.dispose = function() {
this.glplot.remove(this.surface);
this.surface.dispose();
this.glplot.remove(this.surface);
this.surface.dispose();
};

function createSurfaceTrace(scene, data) {
var gl = scene.glplot.gl;
var surface = createSurface({
gl: gl
});
var result = new SurfaceTrace(scene, surface, data.uid);
result.update(data);
scene.glplot.add(surface);
return result;
var gl = scene.glplot.gl;
var surface = createSurface({ gl: gl });
var result = new SurfaceTrace(scene, surface, data.uid);
result.update(data);
scene.glplot.add(surface);
return result;
}

module.exports = createSurfaceTrace;
Binary file modified test/image/baselines/gl3d_autocolorscale.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_autorange-zero.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_chrisp-nan-1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_contour-lines.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_cufflinks.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_ibm-plot.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_nan-holes.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_opacity-surface.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_ribbons.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_surface-lighting.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_wire-surface.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_xy-defined-ticks.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion test/image/mocks/gl3d_autocolorscale.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
["zero two", "one one", "two one"],
["zero two", "one two", "two two"]
],
"autocolorscale": true
"autocolorscale": true,
"zmin": 0,
"zmax": "50"
}
],
"layout": {
Expand Down