Skip to content

Commit 446c895

Browse files
committed
fix(view): use a single vtkRenderView
1 parent 22add96 commit 446c895

4 files changed

Lines changed: 669 additions & 9 deletions

File tree

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ requires-python = ">=3.10"
2424
dependencies = [
2525
"trame>=3.12",
2626
"trame-vuetify>=3.1",
27-
"trame-rca[turbo]>=2.3.1",
27+
"trame-rca[turbo]>=2.4",
2828
"pyproj>=3.6.1",
2929
"netCDF4>=1.6.5",
3030
"trame-dataclass >=2.0.2",

src/e3sm_quickview/app.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from trame.app import TrameApp, asynchronous, file_upload
1111
from trame.decorators import change, controller, life_cycle, trigger
1212
from trame.ui.vuetify3 import VAppLayout
13-
from trame.widgets import client, dataclass, html, tauri
13+
from trame.widgets import client, dataclass, html, rca, tauri
1414
from trame.widgets import trame as tw
1515
from trame.widgets import vuetify3 as v3
1616

@@ -19,7 +19,7 @@
1919
from e3sm_quickview.components import css, dialogs, doc, drawers, file_browser, toolbars
2020
from e3sm_quickview.pipeline import EAMVisSource
2121
from e3sm_quickview.utils import cli, compute
22-
from e3sm_quickview.view_manager import ViewManager
22+
from e3sm_quickview.view_manager2 import ViewManager
2323

2424
v3.enable_lab()
2525

@@ -210,10 +210,17 @@ def _build_ui(self, **_):
210210
toolbars.Animation()
211211

212212
# View of all the variables
213-
client.ServerTemplate(
214-
name=("active_layout", "auto_layout"),
215-
v_if="variables_selected.length",
216-
)
213+
with rca.ImageStream(
214+
self.view_manager._render_window,
215+
encoder="turbo-jpeg",
216+
ctx_name="view",
217+
):
218+
# To debug vtkRenderWindow content
219+
# html.Img(src=["image?.src"], height="300px")
220+
client.ServerTemplate(
221+
name=("active_layout", "auto_layout"),
222+
v_if="variables_selected.length",
223+
)
217224

218225
# Show documentation when no variable selected
219226
with html.Div(v_if="!variables_selected.length"):

src/e3sm_quickview/view_manager.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,7 @@ def build_auto_layout(self, variables=None):
507507
existed_order = set()
508508
order_max = 0
509509
orders_to_update = []
510-
for var_type in variables.keys():
511-
var_names = variables[var_type]
510+
for var_type, var_names in variables.items():
512511
for name in var_names:
513512
config = self.get_view(name, var_type).config
514513
self._active_configs[name] = config

0 commit comments

Comments
 (0)