Skip to content

Commit 6100c08

Browse files
Apply prepare changes
1 parent 2c42968 commit 6100c08

File tree

11 files changed

+20
-65
lines changed

11 files changed

+20
-65
lines changed

src/opengeodeweb_viewer/rpc/mesh/polyhedra/polyhedra_protocols.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ class VtkMeshPolyhedraView(VtkMeshView):
1818
def __init__(self):
1919
super().__init__()
2020

21-
@exportRpc(
22-
mesh_polyhedra_prefix + mesh_polyhedra_schemas_dict["visibility"]["rpc"]
23-
)
21+
@exportRpc(mesh_polyhedra_prefix + mesh_polyhedra_schemas_dict["visibility"]["rpc"])
2422
def setMeshPolyhedraVisibility(self, params):
2523
validate_schema(
2624
params,
@@ -46,8 +44,7 @@ def setMeshPolyhedraColor(self, params):
4644
self.SetColor(id, red, green, blue)
4745

4846
@exportRpc(
49-
mesh_polyhedra_prefix
50-
+ mesh_polyhedra_schemas_dict["vertex_attribute"]["rpc"]
47+
mesh_polyhedra_prefix + mesh_polyhedra_schemas_dict["vertex_attribute"]["rpc"]
5148
)
5249
def setMeshPolyhedraVertexAttribute(self, params):
5350
validate_schema(

src/opengeodeweb_viewer/rpc/model/blocks/blocks_protocols.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ class VtkModelBlocksView(VtkModelView):
1818
def __init__(self):
1919
super().__init__()
2020

21-
@exportRpc(
22-
model_blocks_prefix
23-
+ model_blocks_schemas_dict["visibility"]["rpc"]
24-
)
21+
@exportRpc(model_blocks_prefix + model_blocks_schemas_dict["visibility"]["rpc"])
2522
def setModelBlocksPolyhedraVisibility(self, params):
2623
validate_schema(
2724
params,
@@ -35,10 +32,7 @@ def setModelBlocksPolyhedraVisibility(self, params):
3532
)
3633
self.SetBlocksVisibility(id, block_ids, visibility)
3734

38-
@exportRpc(
39-
model_blocks_prefix
40-
+ model_blocks_schemas_dict["color"]["rpc"]
41-
)
35+
@exportRpc(model_blocks_prefix + model_blocks_schemas_dict["color"]["rpc"])
4236
def setModelBlocksPolyhedraColor(self, params):
4337
validate_schema(
4438
params,

src/opengeodeweb_viewer/rpc/model/corners/corners_protocols.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ class VtkModelCornersView(VtkModelView):
1818
def __init__(self):
1919
super().__init__()
2020

21-
@exportRpc(
22-
model_corners_prefix
23-
+ model_corners_schemas_dict["visibility"]["rpc"]
24-
)
21+
@exportRpc(model_corners_prefix + model_corners_schemas_dict["visibility"]["rpc"])
2522
def setModelCornersPointsVisibility(self, params):
2623
validate_schema(
2724
params,
@@ -35,9 +32,7 @@ def setModelCornersPointsVisibility(self, params):
3532
)
3633
self.SetBlocksVisibility(id, block_ids, visibility)
3734

38-
@exportRpc(
39-
model_corners_prefix + model_corners_schemas_dict["color"]["rpc"]
40-
)
35+
@exportRpc(model_corners_prefix + model_corners_schemas_dict["color"]["rpc"])
4136
def setModelCornersPointsColor(self, params):
4237
validate_schema(
4338
params,

src/opengeodeweb_viewer/rpc/model/lines/lines_protocols.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ class VtkModelLinesView(VtkModelView):
1818
def __init__(self):
1919
super().__init__()
2020

21-
@exportRpc(
22-
model_lines_prefix + model_lines_schemas_dict["visibility"]["rpc"]
23-
)
21+
@exportRpc(model_lines_prefix + model_lines_schemas_dict["visibility"]["rpc"])
2422
def setModelLinesEdgesVisibility(self, params):
2523
validate_schema(
2624
params,
@@ -34,9 +32,7 @@ def setModelLinesEdgesVisibility(self, params):
3432
)
3533
self.SetBlocksVisibility(id, block_ids, visibility)
3634

37-
@exportRpc(
38-
model_lines_prefix + model_lines_schemas_dict["color"]["rpc"]
39-
)
35+
@exportRpc(model_lines_prefix + model_lines_schemas_dict["color"]["rpc"])
4036
def setModelLinesEdgesColor(self, params):
4137
validate_schema(
4238
params,

src/opengeodeweb_viewer/rpc/model/surfaces/surfaces_protocols.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ class VtkModelSurfacesView(VtkModelView):
1818
def __init__(self):
1919
super().__init__()
2020

21-
@exportRpc(
22-
model_surfaces_prefix
23-
+ model_surfaces_schemas_dict["visibility"]["rpc"]
24-
)
21+
@exportRpc(model_surfaces_prefix + model_surfaces_schemas_dict["visibility"]["rpc"])
2522
def setModelSurfacesPolygonsVisibility(self, params):
2623
validate_schema(
2724
params,
@@ -35,10 +32,7 @@ def setModelSurfacesPolygonsVisibility(self, params):
3532
)
3633
self.SetBlocksVisibility(id, block_ids, visibility)
3734

38-
@exportRpc(
39-
model_surfaces_prefix
40-
+ model_surfaces_schemas_dict["color"]["rpc"]
41-
)
35+
@exportRpc(model_surfaces_prefix + model_surfaces_schemas_dict["color"]["rpc"])
4236
def setModelSurfacesPolygonsCOlor(self, params):
4337
validate_schema(
4438
params,

src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ def resetVisualization(self, params):
5555
# grid_scale.SetFlyModeToStaticEdges()
5656
self.register_object("grid_scale", "", "", grid_scale, "", "")
5757

58-
5958
renderer.AddActor(grid_scale)
6059
renderer.SetBackground([180 / 255, 180 / 255, 180 / 255])
6160

src/tests/mesh/polyhedra/test_polyhedra_protocols.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ def test_vertex_attribute(server):
4848

4949
server.call(
5050
VtkMeshPolyhedraView.mesh_polyhedra_prefix
51-
+ VtkMeshPolyhedraView.mesh_polyhedra_schemas_dict["vertex_attribute"][
52-
"rpc"
53-
],
51+
+ VtkMeshPolyhedraView.mesh_polyhedra_schemas_dict["vertex_attribute"]["rpc"],
5452
[{"id": "123456789", "name": "toto_on_vertices"}],
5553
)
5654
assert server.compare_image(3, "mesh/polyhedra/vertex_attribute.jpeg") == True

src/tests/model/blocks/test_model_blocks_protocols.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ def test_blocks_polyhedra_visibility(server):
1515

1616
server.call(
1717
VtkModelBlocksView.model_blocks_prefix
18-
+ VtkModelBlocksView.model_blocks_schemas_dict[
19-
"visibility"
20-
]["rpc"],
18+
+ VtkModelBlocksView.model_blocks_schemas_dict["visibility"]["rpc"],
2119
[
2220
{
2321
"id": "123456789",
@@ -31,9 +29,7 @@ def test_blocks_polyhedra_visibility(server):
3129

3230
server.call(
3331
VtkModelBlocksView.model_blocks_prefix
34-
+ VtkModelBlocksView.model_blocks_schemas_dict[
35-
"visibility"
36-
]["rpc"],
32+
+ VtkModelBlocksView.model_blocks_schemas_dict["visibility"]["rpc"],
3733
[
3834
{
3935
"id": "123456789",
@@ -52,9 +48,7 @@ def test_blocks_polyhedra_color(server):
5248

5349
server.call(
5450
VtkModelBlocksView.model_blocks_prefix
55-
+ VtkModelBlocksView.model_blocks_schemas_dict["color"][
56-
"rpc"
57-
],
51+
+ VtkModelBlocksView.model_blocks_schemas_dict["color"]["rpc"],
5852
[
5953
{
6054
"id": "123456789",

src/tests/model/corners/test_model_corners_protocols.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ def test_corners_points_visibility(server):
1515

1616
server.call(
1717
VtkModelCornersView.model_corners_prefix
18-
+ VtkModelCornersView.model_corners_schemas_dict["visibility"][
19-
"rpc"
20-
],
18+
+ VtkModelCornersView.model_corners_schemas_dict["visibility"]["rpc"],
2119
[
2220
{
2321
"id": "123456789",
@@ -30,9 +28,7 @@ def test_corners_points_visibility(server):
3028

3129
server.call(
3230
VtkModelCornersView.model_corners_prefix
33-
+ VtkModelCornersView.model_corners_schemas_dict["visibility"][
34-
"rpc"
35-
],
31+
+ VtkModelCornersView.model_corners_schemas_dict["visibility"]["rpc"],
3632
[
3733
{
3834
"id": "123456789",

src/tests/model/surfaces/test_model_surfaces_protocols.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ def test_surfaces_polygons_visibility(server):
1515

1616
server.call(
1717
VtkModelSurfacesView.model_surfaces_prefix
18-
+ VtkModelSurfacesView.model_surfaces_schemas_dict[
19-
"visibility"
20-
]["rpc"],
18+
+ VtkModelSurfacesView.model_surfaces_schemas_dict["visibility"]["rpc"],
2119
[
2220
{
2321
"id": "123456789",
@@ -30,9 +28,7 @@ def test_surfaces_polygons_visibility(server):
3028

3129
server.call(
3230
VtkModelSurfacesView.model_surfaces_prefix
33-
+ VtkModelSurfacesView.model_surfaces_schemas_dict[
34-
"visibility"
35-
]["rpc"],
31+
+ VtkModelSurfacesView.model_surfaces_schemas_dict["visibility"]["rpc"],
3632
[
3733
{
3834
"id": "123456789",
@@ -51,9 +47,7 @@ def test_surfaces_polygons_color(server):
5147

5248
server.call(
5349
VtkModelSurfacesView.model_surfaces_prefix
54-
+ VtkModelSurfacesView.model_surfaces_schemas_dict["color"][
55-
"rpc"
56-
],
50+
+ VtkModelSurfacesView.model_surfaces_schemas_dict["color"]["rpc"],
5751
[
5852
{
5953
"id": "123456789",

0 commit comments

Comments
 (0)