Skip to content

Commit da89d3a

Browse files
wip refactor & tests
1 parent c1c0244 commit da89d3a

File tree

37 files changed

+334
-664
lines changed

37 files changed

+334
-664
lines changed

src/opengeodeweb_viewer/object/object_methods.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,19 +142,14 @@ def SetBlocksVisibility(self, id, block_ids, visibility):
142142
mapper = self.get_object(id)["mapper"]
143143
for block_id in block_ids:
144144
mapper.SetBlockVisibility(block_id, visibility)
145-
146-
# def SetBlocksPointsVisibility(self, id, block_ids, visibility):
147-
# mapper = self.get_object(id)["mapper"]
148-
# for block_id in block_ids:
149-
# block_actor = actor.GetChildren().GetItemAsObject(block_id)
150-
# block_actor.GetProperty().SetVertexVisibility(visibility)
145+
print(f"{block_id=}{mapper.GetBlockVisibility(block_id)=}", flush=True)
146+
self.render()
151147

152148
# def SetBlocksPointsSize(self, id, block_ids, size):
153149
# actor = self.get_object(id)["actor"]
154150
# for block_id in block_ids:
155151
# block_actor = actor.GetChildren().GetItemAsObject(block_id)
156152
# block_actor.GetProperty().SetPointSize(size)
157-
158153

159154
def clearColors(self, id):
160155
db = self.get_object(id)

src/opengeodeweb_viewer/rpc/model/blocks/edges/schemas/color.json

Lines changed: 0 additions & 56 deletions
This file was deleted.

src/opengeodeweb_viewer/rpc/model/blocks/edges/schemas/size.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/opengeodeweb_viewer/rpc/model/blocks/points/schemas/color.json

Lines changed: 0 additions & 56 deletions
This file was deleted.

src/opengeodeweb_viewer/rpc/model/blocks/points/schemas/size.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/opengeodeweb_viewer/rpc/model/blocks/polygons/schemas/color.json

Lines changed: 0 additions & 56 deletions
This file was deleted.

src/opengeodeweb_viewer/rpc/model/blocks/polygons/schemas/size.json

Lines changed: 0 additions & 27 deletions
This file was deleted.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Standard library imports
2+
import os
3+
4+
# Third party imports
5+
from wslink import register as exportRpc
6+
7+
# Local application imports
8+
from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema
9+
from opengeodeweb_viewer.rpc.model.model_protocols import VtkModelView
10+
11+
12+
class VtkModelBlocksPolyhedronsView(VtkModelView):
13+
model_blocks_polyhedrons_prefix = "opengeodeweb_viewer.model.blocks.polyhedrons."
14+
model_blocks_polyhedrons_schemas_dict = get_schemas_dict(
15+
os.path.join(os.path.dirname(__file__), "schemas")
16+
)
17+
18+
def __init__(self):
19+
super().__init__()
20+
21+
@exportRpc(
22+
model_blocks_polyhedrons_prefix
23+
+ model_blocks_polyhedrons_schemas_dict["visibility"]["rpc"]
24+
)
25+
def setModelBlocksPolyhedronsVisibility(self, params):
26+
print(
27+
self.model_blocks_polyhedrons_prefix
28+
+ self.model_blocks_polyhedrons_schemas_dict["visibility"]["rpc"],
29+
f"{params=}",
30+
flush=True,
31+
)
32+
validate_schema(
33+
params, self.model_blocks_polyhedrons_schemas_dict["visibility"]
34+
)
35+
id, block_ids, visibility = (
36+
params["id"],
37+
params["block_ids"],
38+
params["visibility"],
39+
)
40+
self.SetBlocksVisibility(id, block_ids, visibility)

src/opengeodeweb_viewer/rpc/model/blocks/polyhedrons/schemas/size.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/opengeodeweb_viewer/rpc/model/surfaces/edges/schemas/visibility.json renamed to src/opengeodeweb_viewer/rpc/model/blocks/polyhedrons/schemas/visibility.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"block_ids": {
1010
"type": "array",
1111
"items": {
12-
"type": "string",
12+
"type": "integer",
1313
"minLength": 1
1414
},
1515
"minItems": 1

0 commit comments

Comments
 (0)