diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eea436a8..6584aa1c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-12] python-ver: [3.8, 3.9] experimental: [false] include: @@ -16,7 +16,7 @@ jobs: os: ubuntu-latest experimental: true - python-ver: '3.10' - os: macos-latest + os: macos-12 experimental: true - python-ver: '3.10' os: windows-latest @@ -25,7 +25,7 @@ jobs: os: ubuntu-latest experimental: true - python-ver: 3.11 - os: macos-latest + os: macos-12 experimental: true - python-ver: 3.11 os: windows-latest diff --git a/sksurgeryvtk/widgets/vtk_overlay_window.py b/sksurgeryvtk/widgets/vtk_overlay_window.py index 51ea0238..5e35f804 100644 --- a/sksurgeryvtk/widgets/vtk_overlay_window.py +++ b/sksurgeryvtk/widgets/vtk_overlay_window.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# pylint: disable=too-many-instance-attributes, no-name-in-module +# pylint: disable=too-many-instance-attributes, no-name-in-module, too-many-statements # pylint:disable=super-with-arguments, too-many-arguments, line-too-long, too-many-public-methods """ @@ -94,6 +94,8 @@ def __init__( video_in_layer_2=False, # For backwards compatibility, prior to 3rd Feb 2024. layer_2_video_mask=None, # For masking in Layer 3 use_depth_peeling=True, # Historically, has defaulted to true. + layer_1_interactive=True, # For backwards compatibility, prior to 3rd Feb 2024. + layer_3_interactive=False # For backwards compatibility, prior to 3rd Feb 2024. ): """ Constructs a new VTKOverlayWindow. @@ -180,6 +182,10 @@ def __init__( self.layer_1_renderer = vtk.vtkRenderer() self.layer_1_renderer.SetLayer(1) self.layer_1_renderer.LightFollowCameraOn() + if layer_1_interactive: + self.layer_1_renderer.InteractiveOn() + else: + self.layer_1_renderer.InteractiveOff() # Create and setup layer 2 (masked video) renderer. self.layer_2_image_actor = vtk.vtkImageActor() @@ -196,6 +202,10 @@ def __init__( self.layer_3_renderer = vtk.vtkRenderer() self.layer_3_renderer.SetLayer(3) self.layer_3_renderer.LightFollowCameraOn() + if layer_3_interactive: + self.layer_3_renderer.InteractiveOn() + else: + self.layer_3_renderer.InteractiveOff() # Create and setup layer 4 (Overlay's, like text annotations) renderer. self.layer_4_renderer = vtk.vtkRenderer()