Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion opengeodeweb_viewer_schemas.json
Original file line number Diff line number Diff line change
Expand Up @@ -4964,7 +4964,8 @@
"type": "string",
"enum": [
"axes",
"compass"
"compass",
"none"
]
}
},
Expand Down
2 changes: 1 addition & 1 deletion opengeodeweb_viewer_typed_schemas.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1346,7 +1346,7 @@ export interface ViewerSetOrientationWidgetParams {
marker: Marker;
}

export type Marker = "axes" | "compass";
export type Marker = "axes" | "compass" | "none";

export interface ViewerSetOrientationWidgetResponse {
}
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,3 @@ wslink==2.6.0
yarl==1.*
# via aiohttp

opengeodeweb-microservice==1.*,>=1.3.3
3 changes: 3 additions & 0 deletions src/opengeodeweb_viewer/orientation_marker.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
from vtkmodules.vtkCommonExecutionModel import vtkAlgorithm
from vtkmodules.vtkRenderingCore import vtkProp, vtkTextProperty

# Marker value hiding the VTK orientation marker, for fronts drawing their own
NO_MARKER = "none"

# VTK's own caption look, kept while the scene text style is the default one
DEFAULT_CAPTION_COLOR = (1.0, 1.0, 1.0)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"type": "string",
"enum": [
"axes",
"compass"
"compass",
"none"
]
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
class Marker(Enum):
AXES = "axes"
COMPASS = "compass"
NONE = "none"


@dataclass
Expand Down
10 changes: 8 additions & 2 deletions src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
)
from vtkmodules.vtkRenderingUI import vtkGenericRenderWindowInteractor

from opengeodeweb_viewer.orientation_marker import build_marker, style_marker
from opengeodeweb_viewer.orientation_marker import NO_MARKER, build_marker, style_marker
from opengeodeweb_viewer.rpc.viewer import schemas
from opengeodeweb_viewer.text_style import TextStyle
from opengeodeweb_viewer.typed_rpc import typed_rpc
Expand Down Expand Up @@ -138,9 +138,15 @@ def update_orientation_widget(
if widget is None:
return schemas.SetOrientationWidgetResponse()
visibility = widget.GetOrientationMarker().GetVisibility()
widget.EnabledOff()
if params.marker.value == NO_MARKER:
# The front draws its own marker. Disabling the widget hides the current marker and
# resets its visibility flag: restore it, so axes toggles keep applying to it until
# a VTK marker is requested again
widget.GetOrientationMarker().SetVisibility(visibility)
return schemas.SetOrientationWidgetResponse()
marker = build_marker(params.marker.value)
style_marker(marker, self.get_scene_text_style())
widget.EnabledOff()
widget.SetOrientationMarker(marker)
widget.EnabledOn()
widget.InteractiveOff()
Expand Down
30 changes: 30 additions & 0 deletions tests/test_viewer_protocols.py
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,36 @@ def test_orientation_widget_keeps_visibility(server: ServerMonitor) -> None:
assert server.compare_image("viewer/axes_off.jpeg")


def test_set_orientation_widget_none(server: ServerMonitor) -> None:
test_reset_visualization(server)
orientation_widget_rpc = (
VtkViewerView.viewer_prefix
+ VtkViewerView.viewer_schemas_dict["set_orientation_widget"]["rpc"]
)
server.call(orientation_widget_rpc, [{"marker": "none"}])
assert server.compare_image("viewer/axes_off.jpeg")

server.call(orientation_widget_rpc, [{"marker": "axes"}])
assert server.compare_image("viewer/reset_visualization.jpeg")


def test_orientation_widget_none_keeps_visibility(server: ServerMonitor) -> None:
test_reset_visualization(server)
orientation_widget_rpc = (
VtkViewerView.viewer_prefix
+ VtkViewerView.viewer_schemas_dict["set_orientation_widget"]["rpc"]
)
server.call(orientation_widget_rpc, [{"marker": "none"}])
server.call(
VtkViewerView.viewer_prefix + VtkViewerView.viewer_schemas_dict["axes"]["rpc"],
[{"visibility": False}],
)
assert server.compare_image("viewer/axes_off.jpeg")

server.call(orientation_widget_rpc, [{"marker": "axes"}])
assert server.compare_image("viewer/axes_off.jpeg")


def test_update_camera(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
test_register_mesh(server, dataset_factory)

Expand Down
Loading