Skip to content

Commit 7e5ff70

Browse files
committed
Merge branch 'fix/database' of https://github.com/Geode-solutions/OpenGeodeWeb-Viewer into fix/database
2 parents 5fcc659 + 222c0d0 commit 7e5ff70

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def registerMesh(self, params: dict[str, Any]) -> None:
2828
try:
2929
_ = self.get_data(data_id)
3030
file_path = self.get_data_file_path(data_id)
31-
31+
3232
reader = vtk.vtkXMLGenericDataObjectReader()
3333
reader.SetFileName(file_path)
3434
filter = {}

src/opengeodeweb_viewer/vtk_protocol.py

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ def __init__(self) -> None:
1919
self.DataReader = vtk.vtkXMLPolyDataReader()
2020
self.ImageReader = vtk.vtkXMLImageDataReader()
2121

22-
def get_data_base(self) -> dict[str, dict[str, Union[vtk.vtkAlgorithm, vtk.vtkActor, vtk.vtkMapper, dict, str]]]:
22+
def get_data_base(
23+
self,
24+
) -> dict[
25+
str, dict[str, Union[vtk.vtkAlgorithm, vtk.vtkActor, vtk.vtkMapper, dict, str]]
26+
]:
2327
return self.getSharedObject("db")
2428

2529
def get_data(self, data_id: str) -> dict[str, str]:
@@ -62,7 +66,9 @@ def get_data_file_path(self, data_id: str, filename: Optional[str] = None) -> st
6266
def get_renderer(self) -> vtk.vtkRenderer:
6367
return self.getSharedObject("renderer")
6468

65-
def get_object(self, id: str) -> dict[str, Union[vtk.vtkAlgorithm, vtk.vtkActor, vtk.vtkMapper, dict, str]]:
69+
def get_object(
70+
self, id: str
71+
) -> dict[str, Union[vtk.vtkAlgorithm, vtk.vtkActor, vtk.vtkMapper, dict, str]]:
6672
return self.get_data_base()[id]
6773

6874
def get_protocol(self, name: str) -> vtk_protocols.vtkWebProtocol:
@@ -79,13 +85,13 @@ def render(self, view: int = -1) -> None:
7985
self.getSharedObject("publisher").imagePush({"view": view})
8086

8187
def register_object(
82-
self,
83-
id: str,
84-
reader: vtk.vtkAlgorithm,
85-
filter: Optional[vtk.vtkAlgorithm],
86-
actor: vtk.vtkActor,
87-
mapper: vtk.vtkMapper,
88-
textures: dict
88+
self,
89+
id: str,
90+
reader: vtk.vtkAlgorithm,
91+
filter: Optional[vtk.vtkAlgorithm],
92+
actor: vtk.vtkActor,
93+
mapper: vtk.vtkMapper,
94+
textures: dict,
8995
) -> None:
9096
self.get_data_base()[id] = {
9197
"reader": reader,

0 commit comments

Comments
 (0)