Skip to content

Commit ad5f1c2

Browse files
JulienChampagnolJulienChampagnol
committed
style(python): run black formater
1 parent a3d792a commit ad5f1c2

21 files changed

+494
-187
lines changed

‎src/opengeodeweb_viewer/config.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ def dev_config():
2727
def test_config(path):
2828
default_config()
2929
print(f"{os.path.dirname(__file__)=}", flush=True)
30-
os.environ["DATA_FOLDER_PATH"] = os.path.join(path,
31-
"data"
32-
)
30+
os.environ["DATA_FOLDER_PATH"] = os.path.join(path, "data")
3331

3432
print(f"{os.environ.get('DATA_FOLDER_PATH')=}", flush=True)

‎src/opengeodeweb_viewer/object/object_methods.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema
99
from opengeodeweb_viewer.vtk_protocol import VtkView
1010

11+
1112
class VtkObjectView(VtkView):
1213
def __init__(self):
1314
super().__init__()
@@ -98,27 +99,27 @@ def SetOpacity(self, id, opacity):
9899
actor = self.get_object(id)["actor"]
99100
actor.GetProperty().SetOpacity(opacity)
100101
self.render()
101-
102+
102103
def SetColor(self, id, red, green, blue):
103104
mapper = self.get_object(id)["mapper"]
104105
mapper.ScalarVisibilityOff()
105106
actor = self.get_object(id)["actor"]
106-
actor.GetProperty().SetColor([red/255, green/255, blue/255])
107+
actor.GetProperty().SetColor([red / 255, green / 255, blue / 255])
107108
self.render()
108109

109110
def SetEdgesVisibility(self, id, visibility):
110111
actor = self.get_object(id)["actor"]
111112
actor.GetProperty().SetEdgeVisibility(visibility)
112113
self.render()
113-
114+
114115
def SetEdgesSize(self, id, size):
115116
actor = self.get_object(id)["actor"]
116117
actor.GetProperty().SetEdgeWidth(size)
117118
self.render()
118119

119120
def SetEdgesColor(self, id, red, green, blue):
120121
actor = self.get_object(id)["actor"]
121-
actor.GetProperty().SetEdgeColor([red/255, green/255, blue/255])
122+
actor.GetProperty().SetEdgeColor([red / 255, green / 255, blue / 255])
122123
self.render()
123124

124125
def SetPointsVisibility(self, id, visibility):
@@ -134,7 +135,7 @@ def SetPointsSize(self, id, size):
134135

135136
def SetPointsColor(self, id, red, green, blue):
136137
actor = self.get_object(id)["actor"]
137-
actor.GetProperty().SetVertexColor([red/255, green/255, blue/255])
138+
actor.GetProperty().SetVertexColor([red / 255, green / 255, blue / 255])
138139
self.render()
139140

140141
def clearColors(self, id):
@@ -143,4 +144,4 @@ def clearColors(self, id):
143144
reader = db["reader"]
144145
reader.GetOutput().GetPointData().SetActiveScalars("")
145146
reader.GetOutput().GetCellData().SetActiveScalars("")
146-
mapper.ScalarVisibilityOff()
147+
mapper.ScalarVisibilityOff()

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,28 @@
1111
from opengeodeweb_viewer.vtk_protocol import VtkView
1212
from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema
1313

14+
1415
class VtkGenericView(VtkView):
1516
generic_prefix = "opengeodeweb_viewer.generic."
16-
generic_schemas_dict = get_schemas_dict(os.path.join(os.path.dirname(__file__), "schemas"))
17+
generic_schemas_dict = get_schemas_dict(
18+
os.path.join(os.path.dirname(__file__), "schemas")
19+
)
1720

1821
def __init__(self, mesh_protocols, model_protocols):
1922
super().__init__()
2023
self.mesh_protocols = mesh_protocols
2124
self.model_protocols = model_protocols
22-
25+
2326
@exportRpc(generic_prefix + generic_schemas_dict["register"]["rpc"])
2427
def register(self, params):
25-
print(self.generic_prefix + self.generic_schemas_dict["register"]["rpc"], f"{params=}", flush=True)
28+
print(
29+
self.generic_prefix + self.generic_schemas_dict["register"]["rpc"],
30+
f"{params=}",
31+
flush=True,
32+
)
2633
validate_schema(params, self.generic_schemas_dict["register"])
2734
viewer_object = params["viewer_object"]
28-
params.pop('viewer_object', None)
35+
params.pop("viewer_object", None)
2936
print(f"{params=}", flush=True)
3037
if viewer_object == "mesh":
3138
self.mesh_protocols.registerMesh(params)
@@ -34,13 +41,15 @@ def register(self, params):
3441

3542
@exportRpc(generic_prefix + generic_schemas_dict["deregister"]["rpc"])
3643
def deregister(self, params):
37-
print(self.generic_prefix + self.generic_schemas_dict["deregister"]["rpc"], f"{params=}", flush=True)
44+
print(
45+
self.generic_prefix + self.generic_schemas_dict["deregister"]["rpc"],
46+
f"{params=}",
47+
flush=True,
48+
)
3849
validate_schema(params, self.generic_schemas_dict["deregister"])
3950
viewer_object = params["viewer_object"]
40-
params.pop('viewer_object', None)
51+
params.pop("viewer_object", None)
4152
if viewer_object == "mesh":
4253
self.mesh_protocols.deregisterMesh(params)
4354
elif viewer_object == "model":
4455
self.model_protocols.deregisterModel(params)
45-
46-

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

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,52 @@
88
from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema
99
from opengeodeweb_viewer.rpc.mesh.mesh_protocols import VtkMeshView
1010

11+
1112
class VtkMeshEdgesView(VtkMeshView):
1213
mesh_edges_prefix = "opengeodeweb_viewer.mesh.edges."
13-
mesh_edges_schemas_dict = get_schemas_dict(os.path.join(os.path.dirname(__file__), "schemas"))
14+
mesh_edges_schemas_dict = get_schemas_dict(
15+
os.path.join(os.path.dirname(__file__), "schemas")
16+
)
1417

1518
def __init__(self):
1619
super().__init__()
1720

1821
@exportRpc(mesh_edges_prefix + mesh_edges_schemas_dict["visibility"]["rpc"])
1922
def setMeshEdgesVisibility(self, params):
20-
print(self.mesh_edges_prefix + self.mesh_edges_schemas_dict["visibility"]["rpc"], f"{params=}", flush=True)
23+
print(
24+
self.mesh_edges_prefix + self.mesh_edges_schemas_dict["visibility"]["rpc"],
25+
f"{params=}",
26+
flush=True,
27+
)
2128
validate_schema(params, self.mesh_edges_schemas_dict["visibility"])
2229
id = params["id"]
2330
visibility = bool(params["visibility"])
2431
self.SetEdgesVisibility(id, visibility)
2532

2633
@exportRpc(mesh_edges_prefix + mesh_edges_schemas_dict["color"]["rpc"])
2734
def setMeshEdgesColor(self, params):
28-
print(self.mesh_edges_prefix + self.mesh_edges_schemas_dict["color"]["rpc"], f"{params=}", flush=True)
35+
print(
36+
self.mesh_edges_prefix + self.mesh_edges_schemas_dict["color"]["rpc"],
37+
f"{params=}",
38+
flush=True,
39+
)
2940
validate_schema(params, self.mesh_edges_schemas_dict["color"])
3041
id = params["id"]
31-
red, green, blue = params["color"]["r"], params["color"]["g"], params["color"]["b"]
42+
red, green, blue = (
43+
params["color"]["r"],
44+
params["color"]["g"],
45+
params["color"]["b"],
46+
)
3247
self.SetEdgesColor(id, red, green, blue)
3348

3449
@exportRpc(mesh_edges_prefix + mesh_edges_schemas_dict["size"]["rpc"])
3550
def setMeshEdgesSize(self, params):
36-
print(self.mesh_edges_prefix + self.mesh_edges_schemas_dict["size"]["rpc"], f"{params=}", flush=True)
51+
print(
52+
self.mesh_edges_prefix + self.mesh_edges_schemas_dict["size"]["rpc"],
53+
f"{params=}",
54+
flush=True,
55+
)
3756
validate_schema(params, self.mesh_edges_schemas_dict["size"])
3857
id = params["id"]
3958
size = bool(params["size"])
4059
self.SetEdgesSize(id, size)
41-
42-
43-

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

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,23 @@
99
from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema
1010
from opengeodeweb_viewer.object.object_methods import VtkObjectView
1111

12+
1213
class VtkMeshView(VtkObjectView):
1314
mesh_prefix = "opengeodeweb_viewer.mesh."
14-
mesh_schemas_dict = get_schemas_dict(os.path.join(os.path.dirname(__file__), "schemas"))
15+
mesh_schemas_dict = get_schemas_dict(
16+
os.path.join(os.path.dirname(__file__), "schemas")
17+
)
1518

1619
def __init__(self):
1720
super().__init__()
1821

1922
@exportRpc(mesh_prefix + mesh_schemas_dict["register"]["rpc"])
2023
def registerMesh(self, params):
21-
print(self.mesh_prefix + self.mesh_schemas_dict["register"]["rpc"], f"{params=}", flush=True)
24+
print(
25+
self.mesh_prefix + self.mesh_schemas_dict["register"]["rpc"],
26+
f"{params=}",
27+
flush=True,
28+
)
2229
validate_schema(params, self.mesh_schemas_dict["register"])
2330
id = params["id"]
2431
file_name = params["file_name"]
@@ -33,45 +40,67 @@ def registerMesh(self, params):
3340

3441
@exportRpc(mesh_prefix + mesh_schemas_dict["deregister"]["rpc"])
3542
def deregisterMesh(self, params):
36-
print(self.mesh_prefix + self.mesh_schemas_dict["deregister"]["rpc"], f"{params=}", flush=True)
43+
print(
44+
self.mesh_prefix + self.mesh_schemas_dict["deregister"]["rpc"],
45+
f"{params=}",
46+
flush=True,
47+
)
3748
validate_schema(params, self.mesh_schemas_dict["deregister"])
3849
id = params["id"]
3950
self.deregisterObject(id)
4051

4152
@exportRpc(mesh_prefix + mesh_schemas_dict["visibility"]["rpc"])
4253
def SetMeshVisibility(self, params):
43-
print(self.mesh_prefix + self.mesh_schemas_dict["visibility"]["rpc"], f"{params=}", flush=True)
54+
print(
55+
self.mesh_prefix + self.mesh_schemas_dict["visibility"]["rpc"],
56+
f"{params=}",
57+
flush=True,
58+
)
4459
validate_schema(params, self.mesh_schemas_dict["visibility"])
4560
id = params["id"]
4661
visibility = bool(params["visibility"])
4762
self.SetVisibility(id, visibility)
4863

4964
@exportRpc(mesh_prefix + mesh_schemas_dict["opacity"]["rpc"])
5065
def setMeshOpacity(self, params):
51-
print(self.mesh_prefix + self.mesh_schemas_dict["opacity"]["rpc"], f"{params=}", flush=True)
66+
print(
67+
self.mesh_prefix + self.mesh_schemas_dict["opacity"]["rpc"],
68+
f"{params=}",
69+
flush=True,
70+
)
5271
validate_schema(params, self.mesh_schemas_dict["opacity"])
5372
id = params["id"]
5473
opacity = float(params["opacity"])
5574
self.SetOpacity(id, opacity)
5675

5776
@exportRpc(mesh_prefix + mesh_schemas_dict["color"]["rpc"])
5877
def setMeshColor(self, params):
59-
print(self.mesh_prefix + self.mesh_schemas_dict["color"]["rpc"], f"{params=}", flush=True)
78+
print(
79+
self.mesh_prefix + self.mesh_schemas_dict["color"]["rpc"],
80+
f"{params=}",
81+
flush=True,
82+
)
6083
validate_schema(params, self.mesh_schemas_dict["color"])
6184
id = params["id"]
62-
red, green, blue = params["color"]["r"], params["color"]["g"], params["color"]["b"]
85+
red, green, blue = (
86+
params["color"]["r"],
87+
params["color"]["g"],
88+
params["color"]["b"],
89+
)
6390
self.SetColor(id, red, green, blue)
6491

65-
6692
@exportRpc(mesh_prefix + mesh_schemas_dict["apply_textures"]["rpc"])
6793
def meshApplyTextures(self, params):
68-
print(self.mesh_prefix + self.mesh_schemas_dict["apply_textures"]["rpc"], f"{params=}", flush=True)
94+
print(
95+
self.mesh_prefix + self.mesh_schemas_dict["apply_textures"]["rpc"],
96+
f"{params=}",
97+
flush=True,
98+
)
6999
validate_schema(params, self.mesh_schemas_dict["apply_textures"])
70100
id = params["id"]
71101
textures = params["textures"]
72102
self.applyTextures(id, textures)
73103

74-
75104
def displayAttributeOnVertices(self, id, name):
76105
reader = self.get_object(id)["reader"]
77106
points = reader.GetOutput().GetPointData()
@@ -82,7 +111,6 @@ def displayAttributeOnVertices(self, id, name):
82111
mapper.SetScalarRange(points.GetScalars().GetRange())
83112
self.render()
84113

85-
86114
def displayAttributeOnCells(self, id, name):
87115
reader = self.get_object(id)["reader"]
88116
cells = reader.GetOutput().GetCellData()
@@ -91,4 +119,4 @@ def displayAttributeOnCells(self, id, name):
91119
mapper.ScalarVisibilityOn()
92120
mapper.SetScalarModeToUseCellData()
93121
mapper.SetScalarRange(cells.GetScalars().GetRange())
94-
self.render()
122+
self.render()

‎src/opengeodeweb_viewer/rpc/mesh/points/points_protocols.py

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,66 @@
88
from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema
99
from opengeodeweb_viewer.rpc.mesh.mesh_protocols import VtkMeshView
1010

11+
1112
class VtkMeshPointsView(VtkMeshView):
1213
mesh_points_prefix = "opengeodeweb_viewer.mesh.points."
13-
mesh_points_schemas_dict = get_schemas_dict(os.path.join(os.path.dirname(__file__), "schemas"))
14+
mesh_points_schemas_dict = get_schemas_dict(
15+
os.path.join(os.path.dirname(__file__), "schemas")
16+
)
1417

1518
def __init__(self):
1619
super().__init__()
1720

1821
@exportRpc(mesh_points_prefix + mesh_points_schemas_dict["visibility"]["rpc"])
1922
def setMeshPointsVisibility(self, params):
20-
print(self.mesh_points_prefix + self.mesh_points_schemas_dict["visibility"]["rpc"], f"{params=}", flush=True)
23+
print(
24+
self.mesh_points_prefix
25+
+ self.mesh_points_schemas_dict["visibility"]["rpc"],
26+
f"{params=}",
27+
flush=True,
28+
)
2129
validate_schema(params, self.mesh_points_schemas_dict["visibility"])
2230
id = str(params["id"])
2331
visibility = bool(params["visibility"])
2432
self.SetPointsVisibility(id, visibility)
2533

2634
@exportRpc(mesh_points_prefix + mesh_points_schemas_dict["color"]["rpc"])
2735
def setMeshPointsColor(self, params):
28-
print(self.mesh_points_prefix + self.mesh_points_schemas_dict["color"]["rpc"], f"{params=}", flush=True)
36+
print(
37+
self.mesh_points_prefix + self.mesh_points_schemas_dict["color"]["rpc"],
38+
f"{params=}",
39+
flush=True,
40+
)
2941
validate_schema(params, self.mesh_points_schemas_dict["color"])
3042
id = str(params["id"])
31-
red, green, blue = params["color"]["r"], params["color"]["g"], params["color"]["b"]
43+
red, green, blue = (
44+
params["color"]["r"],
45+
params["color"]["g"],
46+
params["color"]["b"],
47+
)
3248
self.SetPointsColor(id, red, green, blue)
3349

3450
@exportRpc(mesh_points_prefix + mesh_points_schemas_dict["size"]["rpc"])
3551
def setMeshPointsSize(self, params):
36-
print(self.mesh_points_prefix + self.mesh_points_schemas_dict["size"]["rpc"], f"{params=}", flush=True)
52+
print(
53+
self.mesh_points_prefix + self.mesh_points_schemas_dict["size"]["rpc"],
54+
f"{params=}",
55+
flush=True,
56+
)
3757
validate_schema(params, self.mesh_points_schemas_dict["size"])
3858
id = str(params["id"])
3959
size = float(params["size"])
4060
self.SetPointsSize(id, size)
4161

4262
@exportRpc(mesh_points_prefix + mesh_points_schemas_dict["vertex_attribute"]["rpc"])
4363
def setMeshPointsVertexAttribute(self, params):
44-
print(self.mesh_points_prefix + self.mesh_points_schemas_dict["vertex_attribute"]["rpc"], f"{params=}", flush=True)
64+
print(
65+
self.mesh_points_prefix
66+
+ self.mesh_points_schemas_dict["vertex_attribute"]["rpc"],
67+
f"{params=}",
68+
flush=True,
69+
)
4570
validate_schema(params, self.mesh_points_schemas_dict["vertex_attribute"])
4671
id = str(params["id"])
4772
name = str(params["name"])
4873
self.displayAttributeOnVertices(id, name)
49-

0 commit comments

Comments
 (0)