From 27a330705497192a2725b189e41016fa3d3ed847 Mon Sep 17 00:00:00 2001 From: Jaswant Panchumarti Date: Sat, 28 Mar 2026 10:10:24 -0400 Subject: [PATCH 1/2] chore: bump min emsdk version in readme --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index ba7e2c3..0c5be68 100644 --- a/README.rst +++ b/README.rst @@ -82,7 +82,7 @@ Optionally, you can develop with bleeding edge VTK by following these steps. Mak 3. Ninja 4. Python 5. NodeJS >= 24.0.1: https://nodejs.org/en/download/package-manager -6. Emscripten SDK version 4.0.10: See https://emscripten.org/docs/getting_started/downloads.html#download-and-install +6. Emscripten SDK version 4.0.20: See https://emscripten.org/docs/getting_started/downloads.html#download-and-install .. code-block:: console From a2f31984488bb7d6c19dc0ddb86121c57feed83f Mon Sep 17 00:00:00 2001 From: Jaswant Panchumarti Date: Sat, 28 Mar 2026 12:46:23 -0400 Subject: [PATCH 2/2] chore: import manual registrar func only when vtk < 9.5.20250920 - closes https://github.com/Kitware/trame-vtklocal/issues/58 --- examples/cpp/highlight_picked_actor.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/examples/cpp/highlight_picked_actor.py b/examples/cpp/highlight_picked_actor.py index 9e95b5e..6d3167c 100644 --- a/examples/cpp/highlight_picked_actor.py +++ b/examples/cpp/highlight_picked_actor.py @@ -2,7 +2,6 @@ import vtk from addonModules.addonStyle import ( HighlightPickedActorStyle, - RegisterClasses_addonStyle, ) # type: ignore from trame.app import get_server @@ -10,6 +9,20 @@ from trame.widgets import html, client, vtklocal from trame.decorators import TrameApp +VTK_VERSION = vtk.vtkVersion() +# needed for vtk < 9.5.20250920 +MANUAL_SERDES_REGISTRATION_NEEDED = ( + VTK_VERSION.GetVTKMajorVersion() <= 9 + and VTK_VERSION.GetVTKMinorVersion() <= 5 + and VTK_VERSION.GetVTKBuildVersion() < 20250920 +) # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/12426 + +addon_serdes_registrars = [] +if MANUAL_SERDES_REGISTRATION_NEEDED: + from addonModules.addonStyle import RegisterClasses_addonStyle # noqa: E402 + + addon_serdes_registrars.append(RegisterClasses_addonStyle) + FULL_SCREEN = "position:absolute; left:0; top:0; width:100vw; height:100vh;" TOP_RIGHT = "position: absolute; top: 1rem; right: 1rem; z-index: 10;" TOP_LEFT = "position: absolute; top: 1rem; left: 1rem; z-index: 10;" @@ -110,7 +123,7 @@ def _build_ui(self): with html.Div(style=FULL_SCREEN): with vtklocal.LocalView( self.render_window, - addon_serdes_registrars=[RegisterClasses_addonStyle], + addon_serdes_registrars=addon_serdes_registrars, wasm_dir=WASM_DIR, wasm_base_name=WASM_BASE_NAME, ) as view: