Skip to content

Commit 724cb26

Browse files
committed
news test : combined_scaling_and_grid
1 parent 9cc81e0 commit 724cb26

File tree

8 files changed

+53
-25
lines changed

8 files changed

+53
-25
lines changed

requirements.txt

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
#
2-
<<<<<<< HEAD
32
# This file is autogenerated by pip-compile with Python 3.10
4-
=======
5-
# This file is autogenerated by pip-compile with Python 3.12
6-
>>>>>>> 8755a152c8314c852dedd532e2b68823d28ce9cc
73
# by the following command:
84
#
95
# pip-compile requirements.in
@@ -17,20 +13,15 @@ aiosignal==1.4.0
1713
async-timeout==5.0.1
1814
# via aiohttp
1915
attrs==25.3.0
20-
# via
21-
# aiohttp
22-
# jsonschema
23-
# referencing
16+
# via aiohttp
17+
fastjsonschema==2.21.1
18+
# via -r requirements.in
2419
frozenlist==1.7.0
2520
# via
2621
# aiohttp
2722
# aiosignal
2823
idna==3.10
2924
# via yarl
30-
jsonschema==4.24.0
31-
# via -r requirements.in
32-
jsonschema-specifications==2025.4.1
33-
# via jsonschema
3425
multidict==6.6.3
3526
# via
3627
# aiohttp
@@ -39,19 +30,10 @@ propcache==0.3.2
3930
# via
4031
# aiohttp
4132
# yarl
42-
referencing==0.36.2
43-
# via
44-
# jsonschema
45-
# jsonschema-specifications
46-
rpds-py==0.26.0
47-
# via
48-
# jsonschema
49-
# referencing
5033
typing-extensions==4.14.1
5134
# via
5235
# aiosignal
5336
# multidict
54-
# referencing
5537
websocket-client==1.8.0
5638
# via -r requirements.in
5739
wslink==1.12.4

src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,9 @@ def toggleGridScale(self, params):
238238
params, self.viewer_schemas_dict["grid_scale"], self.viewer_prefix
239239
)
240240
id, visibility = "grid_scale", params["visibility"]
241-
actor = self.get_object(id)["actor"]
242-
actor.SetVisibility(visibility)
241+
if "grid_scale" in self.get_data_base():
242+
actor = self.get_object(id)["actor"]
243+
actor.SetVisibility(visibility)
243244
self.render()
244245

245246
@exportRpc(viewer_prefix + viewer_schemas_dict["axes"]["rpc"])
@@ -295,6 +296,4 @@ def setZScaling(self, params):
295296
if "grid_scale" in self.get_data_base():
296297
cube_axes_actor = self.get_object("grid_scale")["actor"]
297298
cube_axes_actor.SetUse2DMode(1)
298-
else:
299-
Exception("The object 'grid_scale' does not exist.")
300299
self.render()
26 KB
Loading
8.53 KB
Loading
-197 Bytes
Loading
891 Bytes
Loading
1.12 KB
Loading

src/tests/test_viewer_protocols.py

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,3 +298,50 @@ def test_set_z_scaling(server):
298298
[{"z_scale": 2.5}],
299299
)
300300
assert server.compare_image(3, "viewer/set_z_scaling.jpeg") == True
301+
302+
303+
def test_combined_scaling_and_grid(server):
304+
# test_set_z_scaling(server)
305+
306+
# server.call(
307+
# VtkViewerView.viewer_prefix
308+
# + VtkViewerView.viewer_schemas_dict["set_background_color"]["rpc"],
309+
# [{"color": {"r": 180, "g": 180, "b": 180}}],
310+
# )
311+
# assert server.compare_image(3, "viewer/scaling_and_grid_color.jpeg") == True
312+
313+
# server.call(
314+
# VtkViewerView.viewer_prefix
315+
# + VtkViewerView.viewer_schemas_dict["grid_scale"]["rpc"],
316+
# [{"visibility": True}],
317+
# )
318+
319+
# assert server.compare_image(3, "viewer/grid_scale_on.jpeg") == True
320+
server.call(
321+
VtkViewerView.viewer_prefix
322+
+ VtkViewerView.viewer_schemas_dict["reset_visualization"]["rpc"],
323+
)
324+
325+
assert server.compare_image(3, "viewer/reset_visualization.jpeg") == True
326+
327+
server.call(
328+
VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
329+
[{"id": "123456789", "file_name": "hat.vtp"}],
330+
)
331+
assert server.compare_image(3, "viewer/register_hat.jpeg") == True
332+
333+
server.call(
334+
VtkViewerView.viewer_prefix
335+
+ VtkViewerView.viewer_schemas_dict["grid_scale"]["rpc"],
336+
[{"visibility": True}],
337+
)
338+
339+
assert server.compare_image(3, "viewer/grid_scale_on.jpeg") == True
340+
341+
server.call(
342+
VtkViewerView.viewer_prefix
343+
+ VtkViewerView.viewer_schemas_dict["set_z_scaling"]["rpc"],
344+
[{"z_scale": 2.5}],
345+
)
346+
347+
assert server.compare_image(3, "viewer/combined_scaling_and_grid.jpeg") == True

0 commit comments

Comments
 (0)