Skip to content

Commit ac51c5f

Browse files
committed
registerObject in registerMesh for mesh_protocols simplified
1 parent dd9ef78 commit ac51c5f

File tree

2 files changed

+6
-17
lines changed

2 files changed

+6
-17
lines changed

src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,16 @@ def registerMesh(self, params: dict[str, str | int | float | bool]) -> None:
2626
validate_schema(params, self.mesh_schemas_dict["register"], self.mesh_prefix)
2727
data_id = str(params["id"])
2828
try:
29-
_ = self.get_data(data_id)
30-
file_path = self.get_data_file_path(data_id)
29+
data = self.get_data(data_id)
30+
file_name = str(data["viewable_file_name"])
3131

3232
reader = vtk.vtkXMLGenericDataObjectReader()
33-
reader.SetFileName(file_path)
3433
filter = {}
3534
mapper = vtk.vtkDataSetMapper()
3635
mapper.SetInputConnection(reader.GetOutputPort())
3736

38-
actor = vtk.vtkActor()
39-
actor.SetMapper(mapper)
37+
self.registerObject(data_id, file_name, reader, filter, mapper)
4038

41-
renderer = self.get_renderer()
42-
renderer.AddActor(actor)
43-
44-
self.register_object(data_id, reader, filter, actor, mapper, {})
45-
46-
reader.Update()
4739
data_object = reader.GetOutput()
4840
data_set = vtk.vtkDataSet.SafeDownCast(data_object)
4941
cell_types = vtk.vtkCellTypes()
@@ -65,12 +57,7 @@ def registerMesh(self, params: dict[str, str | int | float | bool]) -> None:
6557
max_dimension = "polyhedra"
6658
self.get_data_base()[data_id]["max_dimension"] = max_dimension
6759

68-
renderWindow = self.getView("-1")
69-
renderer.ResetCamera()
70-
renderWindow.Render()
71-
self.render()
7260
except Exception as e:
73-
print("error : ", str(e), flush=True)
7461
print(f"Error registering mesh {data_id}: {str(e)}", flush=True)
7562
raise
7663

src/opengeodeweb_viewer/rpc/model/model_protocols.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ def registerModel(self, params):
3636
mapper.SetInputConnection(filter.GetOutputPort())
3737
attributes = vtkCompositeDataDisplayAttributes()
3838
mapper.SetCompositeDataDisplayAttributes(attributes)
39-
self.registerObject(data_id, file_path, reader, filter, mapper)
39+
data = self.get_data(data_id)
40+
file_name = data["viewable_file_name"]
41+
self.registerObject(data_id, file_name, reader, filter, mapper)
4042
self.get_object(data_id)["max_dimension"] = "default"
4143
except Exception as e:
4244
print(f"Error registering model {data_id}: {str(e)}", flush=True)

0 commit comments

Comments
 (0)