Skip to content

Commit 07610d8

Browse files
rename functions not to overlap
1 parent 03ba21b commit 07610d8

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/opengeodeweb_viewer/object/object_methods.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ class VtkObjectView(VtkView):
1212
def __init__(self):
1313
super().__init__()
1414

15-
def register(self, id, file_name, reader, filter, mapper):
15+
def registerObject(self, id, file_name, reader, filter, mapper):
1616
actor = vtk.vtkActor()
1717
self.register_object(id, reader, filter, actor, mapper, {})
1818

19+
print("registerObject", flush=True)
1920
reader.SetFileName(os.path.join(self.DATA_FOLDER_PATH, file_name))
2021

2122
actor.SetMapper(mapper)
@@ -31,7 +32,7 @@ def register(self, id, file_name, reader, filter, mapper):
3132
renderWindow.Render()
3233
self.render()
3334

34-
def deregister(self, id):
35+
def deregisterObject(self, id):
3536
actor = self.get_object(id)["actor"]
3637
renderWindow = self.getView("-1")
3738
renderer = renderWindow.GetRenderers().GetFirstRenderer()

src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ def registerMesh(self, params):
3434
filter = {}
3535
mapper = vtk.vtkDataSetMapper()
3636
mapper.SetInputConnection(reader.GetOutputPort())
37-
self.register(id, file_name, reader, filter, mapper)
37+
print("VALID")
38+
self.registerObject(id, file_name, reader, filter, mapper)
3839
except Exception as e:
3940
print("error : ", str(e), flush=True)
4041

@@ -43,7 +44,7 @@ def deregisterMesh(self, params):
4344
print(schemas_dict["deregister"]["rpc"], params, flush=True)
4445
validate_schema(params, schemas_dict["deregister"])
4546
id = params["id"]
46-
self.deregister(id)
47+
self.deregisterObject(id)
4748

4849
@exportRpc(prefix + schemas_dict["set_visibility"]["rpc"])
4950
def SetMeshVisibility(self, params):

src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import vtk
88
from vtk.web import protocols as vtk_protocols
99
from vtkmodules.vtkIOImage import vtkPNGWriter, vtkJPEGWriter
10-
from vtkmodules.vtkRenderingCore import (vtkWindowToImageFilter)
10+
from vtkmodules.vtkRenderingCore import vtkWindowToImageFilter
1111
from wslink import register as exportRpc
1212

1313
# Local application imports

0 commit comments

Comments
 (0)