Skip to content

Commit 5677be7

Browse files
JulienChampagnolJulienChampagnol
committed
refactor prcs
1 parent 9c19564 commit 5677be7

File tree

15 files changed

+74
-105
lines changed

15 files changed

+74
-105
lines changed

‎src/opengeodeweb_viewer/rpc/generic/generic_protocols.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema
1313

1414
class VtkGenericView(VtkView):
15-
prefix = "opengeodeweb_viewer.generic."
16-
schemas_dict = get_schemas_dict(os.path.join(os.path.dirname(__file__), "schemas"))
15+
generic_prefix = "opengeodeweb_viewer.generic."
16+
generic_schemas_dict = get_schemas_dict(os.path.join(os.path.dirname(__file__), "schemas"))
1717

1818
def __init__(self, mesh_protocols, model_protocols):
1919
super().__init__()
2020
self.mesh_protocols = mesh_protocols
2121
self.model_protocols = model_protocols
2222

23-
@exportRpc(prefix + schemas_dict["register"]["rpc"])
23+
@exportRpc(generic_prefix + generic_schemas_dict["register"]["rpc"])
2424
def register(self, params):
25-
print(self.prefix + self.schemas_dict["register"]["rpc"], f"{params=}", flush=True)
26-
validate_schema(params, self.schemas_dict["register"])
25+
print(self.generic_prefix + self.generic_schemas_dict["register"]["rpc"], f"{params=}", flush=True)
26+
validate_schema(params, self.generic_schemas_dict["register"])
2727
viewer_object = params["viewer_object"]
2828
params.pop('viewer_object', None)
2929
print(f"{params=}", flush=True)
@@ -32,10 +32,10 @@ def register(self, params):
3232
elif viewer_object == "model":
3333
self.model_protocols.registerModel(params)
3434

35-
@exportRpc(prefix + schemas_dict["deregister"]["rpc"])
35+
@exportRpc(generic_prefix + generic_schemas_dict["deregister"]["rpc"])
3636
def deregister(self, params):
37-
print(self.prefix + self.schemas_dict["deregister"]["rpc"], f"{params=}", flush=True)
38-
validate_schema(params, self.schemas_dict["deregister"])
37+
print(self.generic_prefix + self.generic_schemas_dict["deregister"]["rpc"], f"{params=}", flush=True)
38+
validate_schema(params, self.generic_schemas_dict["deregister"])
3939
viewer_object = params["viewer_object"]
4040
params.pop('viewer_object', None)
4141
if viewer_object == "mesh":

‎src/opengeodeweb_viewer/rpc/mesh/edges/edges_protocols.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ def setMeshEdgesColor(self, params):
2828
print(self.mesh_edges_prefix + self.mesh_edges_schemas_dict["color"]["rpc"], f"{params=}", flush=True)
2929
validate_schema(params, self.mesh_edges_schemas_dict["color"])
3030
id = params["id"]
31-
red = 1.0 * params["color"]["r"]
32-
green = 1.0 * params["color"]["g"]
33-
blue = 1.0 * params["color"]["b"]
31+
red, green, blue = params["color"]["r"], params["color"]["g"], params["color"]["b"]
3432
self.SetEdgesColor(id, [red, green, blue])
3533

3634
@exportRpc(mesh_edges_prefix + mesh_edges_schemas_dict["size"]["rpc"])

‎src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ def setMeshColor(self, params):
5959
print(self.mesh_prefix + self.mesh_schemas_dict["color"]["rpc"], f"{params=}", flush=True)
6060
validate_schema(params, self.mesh_schemas_dict["color"])
6161
id = params["id"]
62-
red = params["red"]
63-
green = params["green"]
64-
blue = params["blue"]
62+
red, green, blue = params["color"]["r"], params["color"]["g"], params["color"]["b"]
6563
self.SetColor(id, red, green, blue)
6664

6765
def setMeshVertexAttribute(self, id, name):

‎src/opengeodeweb_viewer/rpc/mesh/polygons/polygons_protocols.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ def setMeshPolygonsColor(self, params):
2828
print(self.mesh_polygons_prefix + self.mesh_polygons_schemas_dict["color"]["rpc"], f"{params=}", flush=True)
2929
validate_schema(params, self.mesh_polygons_schemas_dict["color"])
3030
id = params["id"]
31-
red = params["color"]["r"]
32-
green = params["color"]["g"]
33-
blue = params["color"]["b"]
31+
red, green, blue = params["color"]["r"], params["color"]["g"], params["color"]["b"]
3432
self.SetPolygonsColor(id, [red, green, blue])
3533

3634
@exportRpc(mesh_polygons_prefix + mesh_polygons_schemas_dict["vertex_attribute"]["rpc"])

‎src/opengeodeweb_viewer/rpc/model/model_protocols.py‎

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
from opengeodeweb_viewer.object.object_methods import VtkObjectView
1111

1212
class VtkModelView(VtkObjectView):
13-
prefix = "opengeodeweb_viewer.model."
14-
schemas_dict = get_schemas_dict(os.path.join(os.path.dirname(__file__), "schemas"))
13+
model_prefix = "opengeodeweb_viewer.model."
14+
model_schemas_dict = get_schemas_dict(os.path.join(os.path.dirname(__file__), "schemas"))
1515

1616
def __init__(self):
1717
super().__init__()
1818

19-
@exportRpc(prefix + schemas_dict["register"]["rpc"])
19+
@exportRpc(model_prefix + model_schemas_dict["register"]["rpc"])
2020
def registerModel(self, params):
21-
print(self.schemas_dict["register"]["rpc"], f"{params=}", flush=True)
22-
validate_schema(params, self.schemas_dict["register"])
21+
print(self.model_prefix + self.model_schemas_dict["register"]["rpc"], f"{params=}", flush=True)
22+
validate_schema(params, self.model_schemas_dict["register"])
2323
id = params["id"]
2424
file_name = params["file_name"]
2525
try:
@@ -32,43 +32,34 @@ def registerModel(self, params):
3232
except Exception as e:
3333
print("error : ", str(e), flush=True)
3434

35-
@exportRpc(prefix + schemas_dict["deregister"]["rpc"])
35+
@exportRpc(model_prefix + model_schemas_dict["deregister"]["rpc"])
3636
def deregisterModel(self, params):
37-
print(self.schemas_dict["deregister"]["rpc"], f"{params=}", flush=True)
38-
validate_schema(params, self.schemas_dict["deregister"])
37+
print(self.model_prefix + self.model_schemas_dict["deregister"]["rpc"], f"{params=}", flush=True)
38+
validate_schema(params, self.model_schemas_dict["deregister"])
3939
id = params["id"]
4040
self.deregisterObject(id)
4141

42-
@exportRpc(prefix + schemas_dict["set_mesh_visibility"]["rpc"])
42+
@exportRpc(model_prefix + model_schemas_dict["set_mesh_visibility"]["rpc"])
4343
def setMeshVisibility(self, params):
44-
print(self.schemas_dict["set_mesh_visibility"]["rpc"], f"{params=}", flush=True)
45-
validate_schema(params, self.schemas_dict["set_mesh_visibility"])
44+
print(self.model_prefix + self.model_schemas_dict["set_mesh_visibility"]["rpc"], f"{params=}", flush=True)
45+
validate_schema(params, self.model_schemas_dict["set_mesh_visibility"])
4646
id = params["id"]
4747
visibility = bool(params["visibility"])
48-
self.SetEdgeVisibility(id, visibility)
48+
self.SetEdgesVisibility(id, visibility)
4949

50-
@exportRpc(prefix + schemas_dict["set_components_visibility"]["rpc"])
50+
@exportRpc(model_prefix + model_schemas_dict["set_components_visibility"]["rpc"])
5151
def setComponentsVisibility(self, params):
52-
print(self.schemas_dict["set_components_visibility"]["rpc"], f"{params=}", flush=True)
53-
validate_schema(params, self.schemas_dict["set_components_visibility"])
52+
print(self.model_prefix + self.model_schemas_dict["set_components_visibility"]["rpc"], f"{params=}", flush=True)
53+
validate_schema(params, self.model_schemas_dict["set_components_visibility"])
5454
id = params["id"]
5555
visibility = bool(params["visibility"])
5656
self.SetVisibility(id, visibility)
5757

58-
@exportRpc(prefix + schemas_dict["set_components_color"]["rpc"])
58+
@exportRpc(model_prefix + model_schemas_dict["set_components_color"]["rpc"])
5959
def setComponentsColor(self, params):
60-
print(self.schemas_dict["set_components_color"]["rpc"], f"{params=}", flush=True)
61-
validate_schema(params, self.schemas_dict["set_components_color"])
60+
print(self.model_prefix + self.model_schemas_dict["set_components_color"]["rpc"], f"{params=}", flush=True)
61+
validate_schema(params, self.model_schemas_dict["set_components_color"])
6262
id = params["id"]
63-
red = params["red"]
64-
green = params["green"]
65-
blue = params["blue"]
63+
red, green, blue = params["color"]["r"], params["color"]["g"], params["color"]["b"]
6664
self.SetColor(id, red, green, blue)
6765

68-
@exportRpc(prefix + schemas_dict["set_corners_size"]["rpc"])
69-
def setCornersSize(self, params):
70-
print(self.schemas_dict["set_corners_size"]["rpc"], f"{params=}", flush=True)
71-
validate_schema(params, self.schemas_dict["set_corners_size"])
72-
id = params["id"]
73-
size = float(params["size"])
74-
self.SetPointSize(id, size)

‎src/opengeodeweb_viewer/rpc/model/schemas/set_components_color.json‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,36 @@
55
"id": {
66
"type": "string"
77
},
8-
"red": {
9-
"type": "integer",
10-
"minimum": 0,
11-
"maximum": 255
12-
},
13-
"green": {
14-
"type": "integer",
15-
"minimum": 0,
16-
"maximum": 255
17-
},
18-
"blue": {
19-
"type": "integer",
20-
"minimum": 0,
21-
"maximum": 255
8+
"color": {
9+
"type": "object",
10+
"properties": {
11+
"r": {
12+
"type": "integer",
13+
"minimum": 0,
14+
"maximum": 255
15+
},
16+
"g": {
17+
"type": "integer",
18+
"minimum": 0,
19+
"maximum": 255
20+
},
21+
"b": {
22+
"type": "integer",
23+
"minimum": 0,
24+
"maximum": 255
25+
}
26+
},
27+
"required": [
28+
"r",
29+
"g",
30+
"b"
31+
],
32+
"additionalProperties": false
2233
}
2334
},
2435
"required": [
2536
"id",
26-
"red",
27-
"green",
28-
"blue"
37+
"color"
2938
],
3039
"additionalProperties": false
3140
}

‎src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ def setBackgroundColor(self, params):
4141
validate_schema(params, self.schemas_dict["set_background_color"])
4242
renderWindow = self.getView("-1")
4343
renderer = renderWindow.GetRenderers().GetFirstRenderer()
44-
red = params["red"]
45-
green = params["green"]
46-
blue = params["blue"]
44+
red = params["color"]["r"]
45+
green = params["color"]["g"]
46+
blue = params["color"]["b"]
4747

4848
renderer.SetBackground([red, green, blue])
4949
renderer.ResetCamera()

src/tests/data/images/mesh/set_color.jpeg renamed to src/tests/data/images/mesh/color.jpeg

File renamed without changes.

src/tests/data/images/mesh/set_opacity.jpeg renamed to src/tests/data/images/mesh/opacity.jpeg

File renamed without changes.

‎src/tests/data/images/model/color.jpeg‎

8.28 KB
Loading

0 commit comments

Comments
 (0)