Merge pull request #556 from plotly/update-vtk-cfd

Updates to vtk-cfd demo

Former-commit-id: 71091a5

Author: Xing Han Lu

apps/dash-vtk-explorer/demos/pyvista-point-cloud/app.py

@@ -8,6 +8,8 @@
 import pyvista as pv
 from pyvista import examples
 
+np.random.seed(42)
+
 # Get point cloud data from PyVista
 dataset = examples.download_lidar()
 subset = 0.2

apps/dash-vtk-explorer/demos/slice-rendering/app.py

@@ -26,14 +26,6 @@
 volume_state = to_volume_state(reader.GetOutput())
 
 
-def custom_card(children):
-    return dbc.Card(
-        html.Div(children, style={"height": "100%"}),
-        body=True,
-        style={"height": "100%"},
-    )
-
-
 sliders = {
     "Slice i": dcc.Slider(id="slider-i", min=0, max=256, value=128),
     "Slice j": dcc.Slider(id="slider-j", min=0, max=256, value=128),
@@ -84,23 +76,6 @@ def custom_card(children):
 )
 
 
-volume_view = dash_vtk.View(
-    id="volume-view",
-    background=[0, 0, 0],
-    cameraPosition=[1, 0, 0],
-    cameraViewUp=[0, 0, -1],
-    cameraParallelProjection=False,
-    children=[
-        dash_vtk.VolumeRepresentation(
-            [
-                html.Div(dash_vtk.VolumeController(), style={"display": "none"}),
-                dash_vtk.ShareDataSet(),
-            ]
-        )
-    ],
-)
-
-
 app = dash.Dash(__name__, external_stylesheets=[dbc.themes.BOOTSTRAP])
 server = app.server
 
@@ -112,13 +87,7 @@ def custom_card(children):
             style={"height": "20%", "display": "flex", "align-items": "center"},
             children=[html.Br(), controls, html.Br(),],
         ),
-        dbc.Row(
-            style={"height": "80%"},
-            children=[
-                dbc.Col(width=6, children=custom_card(slice_view)),
-                dbc.Col(width=6, children=custom_card(volume_view)),
-            ],
-        ),
+        html.Div(slice_view, style={"height": "80%"}),
     ],
 )
 

apps/dash-vtk-explorer/demos/synthetic-volume-rendering/requirements.txt

@@ -1,3 +1,2 @@
 # If you skipped `pip install -e ../../`, the package below will be retrieved from pypi:
-dash-vtk
-dash
+dash-vtk

apps/dash-vtk-explorer/demos/usage-vtk-cfd/app.py

@@ -139,28 +139,33 @@ def getSeedState(self):
 # Control UI
 # -----------------------------------------------------------------------------
 
+high = 0.6
+low = -0.55
+
 controls = [
     dbc.Card(
         [
             dbc.CardHeader("Seeds"),
             dbc.CardBody(
                 [
-                    html.P("Seed line:"),
+                    html.P("Line seed position (from bottom):"),
                     dcc.Slider(
                         id="point-1",
-                        min=-1,
-                        max=1,
-                        step=0.01,
+                        min=low,
+                        max=high,
+                        step=0.05,
                         value=0,
-                        marks={-1: "-1", 1: "+1"},
+                        marks={low: str(low), high: str(high)},
                     ),
+                    html.Br(),
+                    html.P("Line seed position (from top):"),
                     dcc.Slider(
                         id="point-2",
-                        min=-1,
-                        max=1,
-                        step=0.01,
+                        min=low,
+                        max=high,
+                        step=0.05,
                         value=0,
-                        marks={-1: "-1", 1: "+1"},
+                        marks={low: str(low), high: str(high)},
                     ),
                     html.Br(),
                     html.P("Line resolution:"),
@@ -244,14 +249,28 @@ def getSeedState(self):
         Output("vtk-view", "triggerRender"),
     ],
     [
+        Input("point-1", "drag_value"),
+        Input("point-2", "drag_value"),
         Input("point-1", "value"),
         Input("point-2", "value"),
         Input("seed-resolution", "value"),
         Input("color-by", "value"),
         Input("preset", "value"),
     ],
 )
-def update_seeds(y1, y2, resolution, colorByField, presetName):
+def update_seeds(y1_drag, y2_drag, y1, y2, resolution, colorByField, presetName):
+    triggered = dash.callback_context.triggered
+
+    if triggered and "drag_value" in triggered[0]["prop_id"]:
+        viz.updateSeedPoints(y1_drag, y2_drag, resolution)
+        return [
+            viz.getSeedState(),
+            dash.no_update,
+            dash.no_update,
+            dash.no_update,
+            random.random(),  # trigger a render
+        ]
+
     viz.updateSeedPoints(y1, y2, resolution)
     return [
         viz.getSeedState(),

apps/dash-vtk-explorer/demos/usage-vtk-cfd/requirements.txt

@@ -1,4 +1,5 @@
 # If you skipped `pip install -e ../../`, the package below will be retrieved from pypi:
+dash >= 1.19.0
 dash-vtk
 dash-bootstrap-components
 pyvista

apps/dash-vtk-explorer/demos/volume-rendering/requirements.txt

@@ -1,5 +1,4 @@
 # If you skipped `pip install -e ../../`, the package below will be retrieved from pypi:
 dash-vtk
-dash
 vtk
 numpy