Skip to content

Correct streamtube positions and colouring - #4271

Merged
archmoj merged 16 commits into
masterfrom
streamtube-positions
Oct 23, 2019
Merged

Correct streamtube positions and colouring#4271
archmoj merged 16 commits into
masterfrom
streamtube-positions

Conversation

@archmoj

@archmojarchmoj commented Oct 11, 2019

Copy link
Copy Markdown
Contributor

Fixes#4206 and fixes#4275

The gl-streamtube3d module used to make assumptions about the order of input data which could be false in cases where the data cube was not filled in orders than xyz (i.e first x | next y | last z).
This PR addresses this issue by considering the order of data in calc step and using this info inside gl-streamtube3d module.

Before fixing 4206
After fixing 4206

Before fixing 4275
After fixing 4275

In addition gl-cone3d module is patched in this PR.

Please refer to the following gl-vis PRs for more details on the changes within dependecies:
gl-vis/gl-cone3d#16
gl-vis/gl-cone3d#17
gl-vis/gl-cone3d#18
gl-vis/gl-streamtube3d#10
gl-vis/gl-streamtube3d#11

@plotly/plotly_js

Comment threadpackage.json Outdated
"gl-select-box": "^1.0.3",
"gl-spikes2d": "^1.0.2",
"gl-streamtube3d": "^1.3.1",
"gl-streamtube3d": "git://github.com/gl-vis/gl-streamtube3d.git#82a0dd7a8dc601f48ed4afdc5a3e40394b758deb",

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Comment threadtest/image/mocks/gl3d_directions-cone1.json Outdated
@etpinard

Copy link
Copy Markdown
Contributor

To clarify, order xyz (i.e first x | next y | last z) means:

varx=[];vary=[];varz=[];for(vark=0;k<Nz;k++)// last changing indexfor(varj=0;j<Ny;j++)// next changing indexfor(vari=0;i<Nx;i++)// first changing indexx.push(i);y.push(j);z.push(k)

thanks @archmoj for the tip!

Comment threadpackage.json Outdated
Comment threadsrc/traces/streamtube/calc.js Outdated
Comment threadtest/jasmine/tests/streamtube_test.js
@etpinardetpinard added this to the v1.51.0 milestone Oct 15, 2019
 - reduced duplicated code between gl modules
- bump gl-cone3d 1.5.0
- bump gl-streamtube3d 1.4.0
@archmojarchmoj self-assigned this Oct 16, 2019
@etpinard

etpinard commented Oct 23, 2019

Copy link
Copy Markdown
Contributor

Superb fix. Thanks very much @archmoj !!

💃 💃 💃 - oh let's start merging things for 1.51.0 🚀

@archmoj
archmoj merged commit 8c5f66d into masterOct 23, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething broken

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Expecting reversed normals and colors on streamtube when grid is reversed streamtube coloring and positions depend on data order

2 participants

@archmoj@etpinard