Skip to content

Commit 3827f76

Browse files
committed
fix(unregister_vtkobject): fix internal method call
1 parent c8bd857 commit 3827f76

2 files changed

Lines changed: 14 additions & 12 deletions

File tree

src/trame_vtklocal/module/protocol.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1+
import json
12
import time
2-
from functools import wraps
33
import zipfile
4-
import json
4+
from functools import wraps
55
from pathlib import Path
6-
from wslink import register as export_rpc
7-
from wslink.websocket import LinkProtocol
6+
7+
from vtkmodules.vtkCommonCore import vtkVersion
88

99
# from vtkmodules.vtkCommonCore import vtkLogger
1010
from vtkmodules.vtkSerializationManager import vtkObjectManager
11-
from vtkmodules.vtkCommonCore import vtkVersion
11+
from wslink import register as export_rpc
12+
from wslink.websocket import LinkProtocol
1213

1314
try:
1415
import zlib # noqa
@@ -83,9 +84,9 @@ def register_widget(self, root_obj, dep_obj):
8384
# print(f"Register widget: {dep_obj.GetClassName()}={dep_id}")
8485

8586
def unregister_widget(self, root_obj, dep_obj):
86-
self.vtk_object_manager.UnRegisterObject(dep_obj)
8787
root_id = self.vtk_object_manager.GetId(root_obj)
8888
dep_id = self.vtk_object_manager.GetId(dep_obj)
89+
self.vtk_object_manager.UnRegisterObject(dep_id)
8990
if root_id in self._widgets:
9091
self._widgets[root_id].discard(dep_id)
9192

src/trame_vtklocal/widgets/vtklocal.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
import asyncio
2+
import base64
23
import io
34
import json
4-
import zipfile
5-
import base64
65
import warnings
6+
import zipfile
77
from pathlib import Path
8-
from trame_client.widgets.core import AbstractElement
9-
from trame_vtklocal import module
108

9+
from trame_client.widgets.core import AbstractElement
1110
from trame_common.exec.throttle import Throttle
1211

12+
from trame_vtklocal import module
13+
1314
try:
1415
import zlib # noqa
1516

@@ -235,15 +236,15 @@ def register_widget(self, w):
235236
def unregister_vtk_object(self, vtk_instance):
236237
"""Unregister external element (i.e. widget) from the scene so it can removed from tracking"""
237238
if vtk_instance in self.__registered_obj:
238-
self.api.unregister(self._render_window, vtk_instance)
239+
self.api.unregister_widget(self._render_window, vtk_instance)
239240
return True
240241

241242
return False
242243

243244
def unregister_all_vtk_objects(self):
244245
"""Unregister all external element (i.e. widget) from the scene"""
245246
for vtk_instance in self.__registered_obj:
246-
self.api.unregister(self._render_window, vtk_instance)
247+
self.api.unregister_widget(self._render_window, vtk_instance)
247248
self.__registered_obj.remove(vtk_instance)
248249

249250
def unregister_widgets(self):

0 commit comments

Comments
 (0)