Skip to content

Commit 0a66c37

Browse files
wip regenerate tests images
1 parent 64bd309 commit 0a66c37

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+41
-16
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"rpc": "axes",
3+
"type": "object",
4+
"properties": {
5+
"visibility": {
6+
"type": "boolean"
7+
}
8+
},
9+
"required": [
10+
"visibility"
11+
],
12+
"additionalProperties": false
13+
}

src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,24 @@ def resetVisualization(self, params):
5656
self.register_object("grid_scale", "", "", grid_scale, "", "")
5757

5858
renderer.AddActor(grid_scale)
59+
60+
axes = vtk.vtkAxesActor()
61+
62+
renderWindowInteractor = vtk.vtkRenderWindowInteractor()
63+
renderWindowInteractor.SetRenderWindow(renderWindow)
64+
renderWindowInteractor.GetInteractorStyle().SetCurrentStyleToTrackballCamera()
65+
renderWindowInteractor.EnableRenderOff()
66+
widget = vtk.vtkOrientationMarkerWidget()
67+
widget.SetInteractor(renderWindowInteractor)
68+
widget.SetViewport(0.0, 0.0, 0.2, 0.2)
69+
axes = vtk.vtkAxesActor()
70+
71+
widget.SetOrientationMarker(axes)
72+
widget.EnabledOn()
73+
widget.InteractiveOff()
74+
75+
self.register_object("axes", "", "", axes, "", "")
76+
5977
renderer.SetBackground([180 / 255, 180 / 255, 180 / 255])
6078

6179
renderer.ResetCamera()
@@ -216,11 +234,19 @@ def pickedIds(self, params):
216234
return {"array_ids": array_ids}
217235

218236
@exportRpc(viewer_prefix + viewer_schemas_dict["grid_scale"]["rpc"])
219-
def updateData(self, params):
237+
def toggleGridScale(self, params):
220238
validate_schema(
221239
params, self.viewer_schemas_dict["grid_scale"], self.viewer_prefix
222240
)
223241
id, visibility = "grid_scale", params["visibility"]
224242
actor = self.get_object(id)["actor"]
225243
actor.SetVisibility(visibility)
226244
self.render()
245+
246+
@exportRpc(viewer_prefix + viewer_schemas_dict["axes"]["rpc"])
247+
def toggleAxes(self, params):
248+
validate_schema(params, self.viewer_schemas_dict["axes"], self.viewer_prefix)
249+
id, visibility = "axes", params["visibility"]
250+
actor = self.get_object(id)["actor"]
251+
actor.SetVisibility(visibility)
252+
self.render()

src/opengeodeweb_viewer/vtkw_server.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -96,23 +96,9 @@ def initialize(self):
9696
renderWindow = vtk.vtkRenderWindow()
9797
renderWindow.AddRenderer(renderer)
9898
self.setSharedObject("renderer", renderer)
99-
100-
renderWindowInteractor = vtk.vtkRenderWindowInteractor()
101-
renderWindowInteractor.SetRenderWindow(renderWindow)
102-
renderWindowInteractor.GetInteractorStyle().SetCurrentStyleToTrackballCamera()
103-
renderWindowInteractor.EnableRenderOff()
10499
self.getApplication().GetObjectIdMap().SetActiveObject("VIEW", renderWindow)
105100

106-
widget = vtk.vtkOrientationMarkerWidget()
107-
widget.SetInteractor(renderWindowInteractor)
108-
widget.SetViewport(0.0, 0.0, 0.2, 0.2)
109-
axes = vtk.vtkAxesActor()
110-
111-
widget.SetOrientationMarker(axes)
112-
widget.EnabledOn()
113-
widget.InteractiveOff()
114101
renderWindow.SetOffScreenRendering(not _Server.debug)
115-
self.setSharedObject("marker", widget)
116102

117103

118104
# =============================================================================

src/tests/data/images/mesh/color.jpeg

-1.1 KB
-1.03 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-1.96 KB
-1.02 KB
-1.11 KB
-1021 Bytes
-1016 Bytes
-1021 Bytes
-1.06 KB
-1.06 KB
-1.06 KB
-1.03 KB
-781 Bytes
-1.07 KB
-1.04 KB
-946 Bytes
-827 Bytes
-988 Bytes
-1.04 KB
-962 Bytes
-1.03 KB
-1.03 KB
-687 Bytes
-646 Bytes

src/tests/test_viewer_protocols.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def test_take_screenshot(server):
9494
{
9595
"filename": "take_screenshot_without_background",
9696
"output_extension": "png",
97-
"include_background": True,
97+
"include_background": False,
9898
}
9999
],
100100
)

0 commit comments

Comments
 (0)