Skip to content
Open
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
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==1.12.4
yarl>=1
# via aiohttp

opengeodeweb-microservice==1.*,>=1.1.1
32 changes: 28 additions & 4 deletions src/opengeodeweb_viewer/vtk_protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
vtkRenderWindow,
vtkCompositePolyDataMapper,
)
from vtkmodules.vtkCommonDataModel import vtkDataObject
from vtkmodules.vtkCommonDataModel import vtkDataObject, vtkBoundingBox
from vtkmodules.vtkRenderingAnnotation import vtkCubeAxesActor, vtkAxesActor
from vtkmodules.vtkInteractionWidgets import vtkOrientationMarkerWidget

Expand Down Expand Up @@ -122,12 +122,36 @@ def get_data_file_path(self, data_id: str, filename: str | None = None) -> str:
def get_renderer(self) -> vtkRenderer:
return cast(vtkRenderer, self.getSharedObject("renderer"))

def render(self, view: int = -1) -> None:
def reset_camera_clipping_range(self) -> None:
renderer = self.get_renderer()
grid_scale = self.get_grid_scale()
if grid_scale is not None and grid_scale.GetVisibility():
grid_scale.SetUseBounds(True)
renderer.ResetCameraClippingRange()
grid_scale.SetUseBounds(False)
else:
renderer.ResetCameraClippingRange()

def update_grid_scale_and_clipping_range(self) -> None:
grid_scale = self.get_grid_scale()
if grid_scale is not None:
renderer = self.get_renderer()
renderer_bounds = renderer.ComputeVisiblePropBounds()
grid_scale.SetBounds(renderer_bounds)
bounds = vtkBoundingBox()
props = renderer.GetViewProps()
props.InitTraversal()
prop = props.GetNextProp()
while prop:
if prop.GetUseBounds() and prop != grid_scale:
bounds.AddBounds(prop.GetBounds())
prop = props.GetNextProp()
if bounds.IsValid():
final_bounds = [0.0] * 6
bounds.GetBounds(final_bounds)
grid_scale.SetBounds(final_bounds)
self.reset_camera_clipping_range()

def render(self, view: int = -1) -> None:
self.update_grid_scale_and_clipping_range()
self.getSharedObject("publisher").imagePush({"view": view})

def register_object(self, id: str, data: VtkPipeline) -> None:
Expand Down
Binary file modified tests/data/images/viewer/combined_scaling_and_grid.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/data/images/viewer/vertex_and_polygon_attribute.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading