Merge pull request #679 from plotly/cones-and-tubes

cone and streamtube initial

Author: dmt0

dev/mocks.json

@@ -271,6 +271,14 @@
   "gl3d_bunny-hull.json",
   "gl3d_bunny.json",
   "gl3d_chrisp-nan-1.json",
+  "gl3d_cone-absolute.json",
+  "gl3d_cone-autorange.json",
+  "gl3d_cone-lighting.json",
+  "gl3d_cone-rossler.json",
+  "gl3d_cone-simple.json",
+  "gl3d_cone-single.json",
+  "gl3d_cone-wind.json",
+  "gl3d_cone-with-streamtube.json",
   "gl3d_contour-lines.json",
   "gl3d_convex-hull.json",
   "gl3d_cube.json",
@@ -301,6 +309,9 @@
   "gl3d_set-ranges.json",
   "gl3d_snowden.json",
   "gl3d_snowden_altered.json",
+  "gl3d_streamtube-simple.json",
+  "gl3d_streamtube-thin.json",
+  "gl3d_streamtube-wind.json",
   "gl3d_surface-circular-colorscale.json",
   "gl3d_surface-lighting.json",
   "gl3d_surface_intensity.json",

src/components/fields/derived.js

@@ -597,6 +597,17 @@ export const HoverInfo = connectToContainer(UnconnectedFlaglist, {
       ];
     } else if (container.type === 'table') {
       plotProps.isVisible = false;
+    } else if (['cone', 'streamtube'].includes(container.type)) {
+      options = [
+        {label: _('X'), value: 'x'},
+        {label: _('Y'), value: 'y'},
+        {label: _('Z'), value: 'z'},
+        {label: _('U'), value: 'u'},
+        {label: _('V'), value: 'v'},
+        {label: _('W'), value: 'w'},
+        {label: _('Norm'), value: 'norm'},
+        {label: _('Divergence'), value: 'divergence'},
+      ];
     }
 
     if (container.text) {

src/components/widgets/TraceTypeSelector.js

@@ -117,7 +117,10 @@ class TraceTypeSelector extends Component {
 
       let columnClasses = 'trace-grid__column';
 
-      if (items.length > MAX_ITEMS) {
+      if (
+        (items.length > MAX_ITEMS && !category.maxColumns) ||
+        (category.maxColumns && category.maxColumns > 1)
+      ) {
         columnClasses += ' trace-grid__column--double';
       }
 

src/default_panels/GraphCreatePanel.js

@@ -79,6 +79,9 @@ const GraphCreatePanel = (props, {localize: _}) => {
       <DataSelector label={_('A')} attr="a" />
       <DataSelector label={_('B')} attr="b" />
       <DataSelector label={_('C')} attr="c" />
+      <DataSelector label={_('U')} attr="u" />
+      <DataSelector label={_('V')} attr="v" />
+      <DataSelector label={_('W')} attr="w" />
       <DataSelector label={_('Headers')} attr="header.values" />
       <DataSelector label={_('Columns')} attr="cells.values" />
 

src/lib/computeTraceOptionsFromSchema.js

@@ -62,6 +62,14 @@ function computeTraceOptionsFromSchema(schema, _, context) {
       value: 'mesh3d',
       label: _('3D Mesh'),
     },
+    {
+      value: 'cone',
+      label: _('Cone'),
+    },
+    {
+      value: 'streamtube',
+      label: _('Streamtube'),
+    },
     {
       value: 'scattergeo',
       label: _('Atlas Map'),

src/lib/constants.js

@@ -70,7 +70,7 @@ export const TRACE_TO_AXIS = {
     'histogram2dcontour',
   ],
   ternary: ['scatterternary'],
-  gl3d: ['scatter3d', 'surface', 'mesh3d'],
+  gl3d: ['scatter3d', 'surface', 'mesh3d', 'cone', 'streamtube'],
   geo: ['scattergeo', 'choropleth'],
   mapbox: ['scattermapbox'],
   polar: ['scatterpolar', 'scatterpolargl'],

src/lib/traceTypes.js

@@ -31,6 +31,7 @@ export const chartCategory = _ => {
     THREE_D: {
       value: '3D',
       label: _('3D'),
+      maxColumns: 1,
     },
   };
 };
@@ -106,6 +107,18 @@ export const traceTypes = _ => [
     label: _('3D Mesh'),
     category: chartCategory(_).THREE_D,
   },
+  {
+    value: 'cone',
+    label: _('Cone'),
+    icon: 'scatter3d',
+    category: chartCategory(_).THREE_D,
+  },
+  {
+    value: 'streamtube',
+    label: _('Streamtube'),
+    icon: 'line3d',
+    category: chartCategory(_).THREE_D,
+  },
   {
     value: 'box',
     label: _('Box'),