Skip to content

Commit 7e04d4f

Browse files
JulienChampagnolJulienChampagnol
committed
save
1 parent e3afe0d commit 7e04d4f

23 files changed

+357
-114
lines changed

‎src/opengeodeweb_viewer/object/object_methods.py‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def SetOpacity(self, id, opacity):
9898
actor = self.get_object(id)["actor"]
9999
actor.GetProperty().SetOpacity(opacity)
100100
self.render()
101-
101+
102102
def SetColor(self, id, red, green, blue):
103103
mapper = self.get_object(id)["mapper"]
104104
mapper.ScalarVisibilityOff()
@@ -110,7 +110,7 @@ def SetEdgesVisibility(self, id, visibility):
110110
actor = self.get_object(id)["actor"]
111111
actor.GetProperty().SetEdgeVisibility(visibility)
112112
self.render()
113-
113+
114114
def SetEdgesSize(self, id, size):
115115
actor = self.get_object(id)["actor"]
116116
actor.GetProperty().SetEdgeWidth(size)
@@ -137,11 +137,22 @@ def SetPointsColor(self, id, red, green, blue):
137137
actor.GetProperty().SetVertexColor([red/255, green/255, blue/255])
138138
self.render()
139139

140-
def setBlockPointsSize(self, id, block_ids, size):
141-
actor = self.get_object(id)["actor"]
140+
def SetBlocksVisibility(self, id, block_ids, visibility):
141+
mapper = self.get_object(id)["mapper"]
142142
for block_id in block_ids:
143-
block_actor = actor.GetChildren().GetItemAsObject(block_id)
144-
block_actor.GetProperty().SetPointSize(size)
143+
mapper.SetBlockVisibility(block_id, visibility)
144+
145+
# def SetBlocksPointsVisibility(self, id, block_ids, visibility):
146+
# mapper = self.get_object(id)["mapper"]
147+
# for block_id in block_ids:
148+
# block_actor = actor.GetChildren().GetItemAsObject(block_id)
149+
# block_actor.GetProperty().SetVertexVisibility(visibility)
150+
151+
# def SetBlocksPointsSize(self, id, block_ids, size):
152+
# actor = self.get_object(id)["actor"]
153+
# for block_id in block_ids:
154+
# block_actor = actor.GetChildren().GetItemAsObject(block_id)
155+
# block_actor.GetProperty().SetPointSize(size)
145156

146157

147158
def clearColors(self, id):

‎src/opengeodeweb_viewer/rpc/mesh/edges/edges_protocols.py‎ renamed to ‎src/opengeodeweb_viewer/rpc/mesh/edges/mesh_edges_protocols.py‎

File renamed without changes.

‎src/opengeodeweb_viewer/rpc/model/corners/points/corners_points_protocols.py‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,26 @@ class VtkModelCornersPointsView(VtkModelView):
1414

1515
def __init__(self):
1616
super().__init__()
17-
18-
@exportRpc(model_corners_points_prefix + model_corners_points_schemas_dict["size"]["rpc"])
17+
18+
@exportRpc(model_corners_points_prefix + model_corners_points_schemas_dict["visibility"]["rpc"])
1919
def setCornersPointsSize(self, params):
20-
print(self.model_corners_points_prefix + self.model_corners_points_schemas_dict["size"]["rpc"], f"{params=}", flush=True)
21-
validate_schema(params, self.model_corners_points_schemas_dict["size"])
22-
id, block_ids, size = params["id"], params["block_ids"], params["size"]
23-
self.setBlockPointsSize(id, block_ids, size)
20+
print(self.model_corners_points_prefix + self.model_corners_points_schemas_dict["visibility"]["rpc"], f"{params=}", flush=True)
21+
validate_schema(params, self.model_corners_points_schemas_dict["visibility"])
22+
id, block_ids, visibility = params["id"], params["block_ids"], params["visibility"]
23+
self.SetBlocksVisibility(id, block_ids, visibility)
24+
25+
# @exportRpc(model_corners_points_prefix + model_corners_points_schemas_dict["size"]["rpc"])
26+
# def setCornersPointsSize(self, params):
27+
# print(self.model_corners_points_prefix + self.model_corners_points_schemas_dict["size"]["rpc"], f"{params=}", flush=True)
28+
# validate_schema(params, self.model_corners_points_schemas_dict["size"])
29+
# id, block_ids, size = params["id"], params["block_ids"], params["size"]
30+
# self.setBlockPointsSize(id, block_ids, size)
2431

25-
@exportRpc(model_corners_points_prefix + model_corners_points_schemas_dict["color"]["rpc"])
26-
def setCornersPointsColor(self, params):
27-
print(self.model_corners_points_prefix + self.model_corners_points_schemas_dict["color"]["rpc"], f"{params=}", flush=True)
28-
validate_schema(params, self.model_corners_points_schemas_dict["color"])
29-
id, block_ids = params["id"], params["block_ids"]
30-
red, green, blue = params["color"]["r"], params["color"]["g"], params["color"]["b"]
31-
self.setBlockPointsColor(id, block_ids, red, green, blue)
32+
# @exportRpc(model_corners_points_prefix + model_corners_points_schemas_dict["color"]["rpc"])
33+
# def setCornersPointsColor(self, params):
34+
# print(self.model_corners_points_prefix + self.model_corners_points_schemas_dict["color"]["rpc"], f"{params=}", flush=True)
35+
# validate_schema(params, self.model_corners_points_schemas_dict["color"])
36+
# id, block_ids = params["id"], params["block_ids"]
37+
# red, green, blue = params["color"]["r"], params["color"]["g"], params["color"]["b"]
38+
# self.setBlockPointsColor(id, block_ids, red, green, blue)
3239

‎src/opengeodeweb_viewer/rpc/model/corners/points/schemas/visibility.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"rpc": "visibility",
3+
"type": "object",
4+
"properties": {
5+
"id": {
6+
"type": "string",
7+
"minLength": 1
8+
},
9+
"block_ids": {
10+
"type": "array",
11+
"items": {
12+
"type": "string",
13+
"minLength": 1
14+
},
15+
"minItems": 1
16+
},
17+
"visibility": {
18+
"type": "boolean"
19+
}
20+
},
21+
"required": [
22+
"id",
23+
"block_ids",
24+
"visibility"
25+
],
26+
"additionalProperties": false
27+
}

‎src/opengeodeweb_viewer/rpc/model/surfaces/edges/schemas/visibility.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"rpc": "visibility",
3+
"type": "object",
4+
"properties": {
5+
"id": {
6+
"type": "string",
7+
"minLength": 1
8+
},
9+
"block_ids": {
10+
"type": "array",
11+
"items": {
12+
"type": "string",
13+
"minLength": 1
14+
},
15+
"minItems": 1
16+
},
17+
"visibility": {
18+
"type": "boolean"
19+
}
20+
},
21+
"required": [
22+
"id",
23+
"block_ids",
24+
"visibility"
25+
],
26+
"additionalProperties": false
27+
}

‎src/opengeodeweb_viewer/rpc/model/surfaces/points/schemas/visibility.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"rpc": "visibility",
3+
"type": "object",
4+
"properties": {
5+
"id": {
6+
"type": "string",
7+
"minLength": 1
8+
},
9+
"block_ids": {
10+
"type": "array",
11+
"items": {
12+
"type": "string",
13+
"minLength": 1
14+
},
15+
"minItems": 1
16+
},
17+
"visibility": {
18+
"type": "boolean"
19+
}
20+
},
21+
"required": [
22+
"id",
23+
"block_ids",
24+
"visibility"
25+
],
26+
"additionalProperties": false
27+
}

‎src/opengeodeweb_viewer/rpc/model/surfaces/polygons/schemas/visibility.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"rpc": "visibility",
3+
"type": "object",
4+
"properties": {
5+
"id": {
6+
"type": "string",
7+
"minLength": 1
8+
},
9+
"block_ids": {
10+
"type": "array",
11+
"items": {
12+
"type": "string",
13+
"minLength": 1
14+
},
15+
"minItems": 1
16+
},
17+
"visibility": {
18+
"type": "boolean"
19+
}
20+
},
21+
"required": [
22+
"id",
23+
"block_ids",
24+
"visibility"
25+
],
26+
"additionalProperties": false
27+
}

‎src/opengeodeweb_viewer/rpc/model/surfaces/polygons/surfaces_polygons_protocols.py‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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+
class VtkModelSurfacesPolygonsView(VtkModelView):
12+
model_surfaces_polygons_prefix = "opengeodeweb_viewer.model.surfaces.polygons."
13+
model_surfaces_polygons_schemas_dict = get_schemas_dict(os.path.join(os.path.dirname(__file__), "schemas"))
14+
15+
def __init__(self):
16+
super().__init__()
17+
18+
@exportRpc(model_surfaces_polygons_prefix + model_surfaces_polygons_schemas_dict["visibility"]["rpc"])
19+
def setCornersPointsSize(self, params):
20+
print(self.model_surfaces_polygons_prefix + self.model_surfaces_polygons_schemas_dict["visibility"]["rpc"], f"{params=}", flush=True)
21+
validate_schema(params, self.model_surfaces_polygons_schemas_dict["visibility"])
22+
id, block_ids, visibility = params["id"], params["block_ids"], params["visibility"]
23+
self.SetBlocksVisibility(id, block_ids, visibility)
24+

‎src/opengeodeweb_viewer/vtkw_server.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
from .vtk_protocol import VtkView
1414
from .rpc.viewer.viewer_protocols import VtkViewerView
1515
from .rpc.mesh.mesh_protocols import VtkMeshView
16-
from .rpc.mesh.points.points_protocols import VtkMeshPointsView
17-
from .rpc.mesh.edges.edges_protocols import VtkMeshEdgesView
16+
from .rpc.mesh.points.mesh_points_protocols import VtkMeshPointsView
17+
from .rpc.mesh.edges.mesh_edges_protocols import VtkMeshEdgesView
1818
from .rpc.mesh.polygons.polygons_protocols import VtkMeshPolygonsView
1919
from .rpc.mesh.polyhedrons.polyhedrons_protocols import VtkMeshPolyhedronsView
2020
from .rpc.model.model_protocols import VtkModelView

‎src/tests/conftest.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ def compare_image(self, nb_messages, filename):
109109

110110
path_image = os.path.join(self.images_dir_path, filename)
111111

112-
return self.images_diff(test_file_path, path_image)==0.0
113-
112+
return self.images_diff(test_file_path, path_image) == 0.0
114113

115114

116115
class FixtureHelper:

0 commit comments

Comments
 (0)