scikit-surgeryvtk 2.3.0__tar.gz → 2.4.0__tar.gz

{scikit_surgeryvtk-2.3.0/scikit_surgeryvtk.egg-info → scikit_surgeryvtk-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scikit-surgeryvtk
-Version: 2.3.0
+Version: 2.4.0
 Summary: scikit-surgeryvtk uses VTK for Image Guided Surgery applications
 Home-page: https://github.com/SciKit-Surgery/scikit-surgeryvtk
 Author: Thomas Dowrick
@@ -21,7 +21,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: numpy>=1.11
 Requires-Dist: vtk>=9.5.0
-Requires-Dist: PySide6>=6.5.1.1
+Requires-Dist: PySide6<6.10.0,>=6.5.1.1
 Requires-Dist: opencv-contrib-python-headless>=4.2.0.32
 Requires-Dist: scikit-surgerycore>=0.1.7
 Requires-Dist: scikit-surgeryimage>=0.10.1

{scikit_surgeryvtk-2.3.0 → scikit_surgeryvtk-2.4.0/scikit_surgeryvtk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scikit-surgeryvtk
-Version: 2.3.0
+Version: 2.4.0
 Summary: scikit-surgeryvtk uses VTK for Image Guided Surgery applications
 Home-page: https://github.com/SciKit-Surgery/scikit-surgeryvtk
 Author: Thomas Dowrick
@@ -21,7 +21,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: numpy>=1.11
 Requires-Dist: vtk>=9.5.0
-Requires-Dist: PySide6>=6.5.1.1
+Requires-Dist: PySide6<6.10.0,>=6.5.1.1
 Requires-Dist: opencv-contrib-python-headless>=4.2.0.32
 Requires-Dist: scikit-surgerycore>=0.1.7
 Requires-Dist: scikit-surgeryimage>=0.10.1

{scikit_surgeryvtk-2.3.0 → scikit_surgeryvtk-2.4.0}/scikit_surgeryvtk.egg-info/SOURCES.txt

@@ -36,11 +36,13 @@ sksurgeryvtk/utils/polydata_utils.py
 sksurgeryvtk/utils/projection_utils.py
 sksurgeryvtk/widgets/__init__.py
 sksurgeryvtk/widgets/vtk_base_calibrated_window.py
+sksurgeryvtk/widgets/vtk_base_stereo_window.py
 sksurgeryvtk/widgets/vtk_interlaced_stereo_window.py
 sksurgeryvtk/widgets/vtk_lus_simulator.py
 sksurgeryvtk/widgets/vtk_overlay_window.py
 sksurgeryvtk/widgets/vtk_rendering_generator.py
 sksurgeryvtk/widgets/vtk_reslice_widget.py
+sksurgeryvtk/widgets/vtk_stacked_stereo_window.py
 sksurgeryvtk/widgets/vtk_zbuffer_window.py
 tests/test_requirements.py
 tests/camera/__init__.py
@@ -62,9 +64,9 @@ tests/utils/test_matrix_utills.py
 tests/utils/test_polydata_utils.py
 tests/utils/test_projection_utils.py
 tests/widgets/__init__.py
-tests/widgets/test_interlaced_stereo_window.py
 tests/widgets/test_lus_simulator.py
 tests/widgets/test_rendering_generator.py
+tests/widgets/test_stereo_window.py
 tests/widgets/test_vtk_overlay_window.py
 tests/widgets/test_vtk_overlay_window_5_layers.py
 tests/widgets/test_vtk_overlay_window_with_outlines.py

{scikit_surgeryvtk-2.3.0 → scikit_surgeryvtk-2.4.0}/scikit_surgeryvtk.egg-info/requires.txt

@@ -1,6 +1,6 @@
 numpy>=1.11
 vtk>=9.5.0
-PySide6>=6.5.1.1
+PySide6<6.10.0,>=6.5.1.1
 opencv-contrib-python-headless>=4.2.0.32
 scikit-surgerycore>=0.1.7
 scikit-surgeryimage>=0.10.1

{scikit_surgeryvtk-2.3.0 → scikit_surgeryvtk-2.4.0}/setup.py

@@ -54,7 +54,7 @@ setup(
     install_requires=[
         'numpy>=1.11',
         'vtk>=9.5.0',
-        'PySide6>=6.5.1.1',
+        'PySide6>=6.5.1.1,<6.10.0',
         'opencv-contrib-python-headless>=4.2.0.32',
         'scikit-surgerycore>=0.1.7',
         'scikit-surgeryimage>=0.10.1',

{scikit_surgeryvtk-2.3.0 → scikit_surgeryvtk-2.4.0}/sksurgeryvtk/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-09-03T07:49:14+0100",
+ "date": "2026-04-20T06:13:00+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "f505235c59e32ca11f5172769e659f62e4e8ed53",
- "version": "2.3.0"
+ "full-revisionid": "0422a88b01c027061aef20a450a63f3ba6100e3f",
+ "version": "2.4.0"
 }
 '''  # END VERSION_JSON
 

{scikit_surgeryvtk-2.3.0 → scikit_surgeryvtk-2.4.0}/sksurgeryvtk/utils/projection_utils.py

@@ -36,12 +36,11 @@ def _validate_input_for_projection(points,
 
     if camera_to_world is None:
         raise ValueError('camera_to_world is NULL')
-
-    vm.validate_rigid_matrix(camera_to_world)
+    if not isinstance(camera_to_world, np.ndarray):
+        raise TypeError('camera_to_world is not an np.ndarray')
 
     if camera_matrix is None:
         raise ValueError('camera_matrix is NULL')
-
     vm.validate_camera_matrix(camera_matrix)
 
     if distortion is not None:
@@ -63,7 +62,6 @@ def project_points(points,
     :raises: ValueError, TypeError:
     :return: nx2 ndarray representing 2D points, typically in pixels
     """
-
     _validate_input_for_projection(points,
                                    camera_to_world,
                                    camera_matrix,

{scikit_surgeryvtk-2.3.0 → scikit_surgeryvtk-2.4.0}/sksurgeryvtk/widgets/vtk_base_calibrated_window.py

@@ -32,6 +32,9 @@ class VTKBaseCalibratedWindow(QVTKRenderWindowInteractor):
     :param clipping_range: Near/Far clipping range.
     :param opencv_style: If True, adopts OpenCV camera convention, otherwise OpenGL.
     :param reset_camera: If True, resets camera when a new model is added.
+    :param aspect_ratio: to adjust for slight differences in pixel size, expressed as x/y.
+    :param xscale: horizontal scale factor, for horizontal stacking
+    :param yscale: vertical scale factor, for vertical stacking
     """
     def __init__(
         self,
@@ -39,7 +42,10 @@ class VTKBaseCalibratedWindow(QVTKRenderWindowInteractor):
         camera_matrix=None,
         clipping_range=(1, 1000),
         opencv_style=True,
-        reset_camera=True
+        reset_camera=True,
+        aspect_ratio=1,
+        xscale=1,
+        yscale=1
     ):
         """
         Constructs a new VTKBaseCalibratedWindow.
@@ -58,7 +64,9 @@ class VTKBaseCalibratedWindow(QVTKRenderWindowInteractor):
         self.reset_camera = reset_camera
 
         # Member variables.
-        self.aspect_ratio = 1
+        self.aspect_ratio = aspect_ratio
+        self.xscale = xscale
+        self.yscale = yscale
         self.camera_to_world = np.eye(4)
         self.screen = None
 
@@ -212,7 +220,6 @@ class VTKBaseCalibratedWindow(QVTKRenderWindowInteractor):
         # Issue #236: Take size from vtkRenderWindow, not Qt widget.
         # Issue #236: On Mac Retina displays, size given by Qt is halved.
         window_size = self.GetRenderWindow().GetSize()
-
         if window_size[0] == 0:
             LOGGER.warning("VTK Render Window appears to have zero width, so abandoning _update_projection_matrix.")
             return opengl_mat, vtk_mat
@@ -227,8 +234,8 @@ class VTKBaseCalibratedWindow(QVTKRenderWindowInteractor):
             opengl_mat, vtk_mat = cm.set_camera_intrinsics(
                 renderer,
                 camera,
-                input_image.shape[1],
-                input_image.shape[0],
+                input_image.shape[1] * self.xscale,
+                input_image.shape[0] * self.yscale,
                 self.camera_matrix[0][0],
                 self.camera_matrix[1][1],
                 self.camera_matrix[0][2],
@@ -242,7 +249,7 @@ class VTKBaseCalibratedWindow(QVTKRenderWindowInteractor):
                 window_size[1],
                 input_image.shape[1],
                 input_image.shape[0],
-                self.aspect_ratio,
+                aspect_ratio=self.aspect_ratio,
             )
 
             x_min, y_min, x_max, y_max = cm.compute_viewport(
@@ -332,7 +339,6 @@ class VTKBaseCalibratedWindow(QVTKRenderWindowInteractor):
         Sets the camera position and orientation, from a numpy 4x4 array.
         :param camera_to_world: camera_to_world transform.
         """
-        vm.validate_rigid_matrix(camera_to_world)
         self.camera_to_world = camera_to_world
         vtk_mat = mu.create_vtk_matrix_from_numpy(camera_to_world)
         self._update_pose_matrices(vtk_mat)

scikit_surgeryvtk-2.4.0/sksurgeryvtk/widgets/vtk_base_stereo_window.py

@@ -0,0 +1,123 @@
+# -*- coding: utf-8 -*-
+
+"""
+Base class for vtk_interlaced_stereo_window.py and vtk_stacked_stereo_window.py
+"""
+
+import abc
+from PySide6 import QtWidgets
+from PySide6.QtWidgets import QSizePolicy
+import sksurgeryvtk.widgets.vtk_overlay_window as ow
+
+
+class VTKBaseStereoWindow(QtWidgets.QWidget):
+    """
+    Class to contain a pair of VTKOverlayWindows, left, right,
+    and common methods.
+
+    :param init_widget: If True we will call self.Initialize and self.Start
+        as part of the init function. Set to false if you're on Linux.
+    """
+    # pylint: disable=too-many-positional-arguments
+    def __init__(self,
+                 offscreen=False,
+                 left_camera_matrix=None,
+                 right_camera_matrix=None,
+                 clipping_range=(1, 10000),
+                 init_widget=True,
+                 left_is_top=True,
+                 aspect_ratio=1,
+                 xscale=1,
+                 yscale=1
+                 ):
+
+        super().__init__()
+        self.left_is_top = left_is_top
+        self.xscale = xscale
+        self.yscale = yscale
+        self.aspect_ratio = aspect_ratio
+
+        self.left_widget = ow.VTKOverlayWindow(
+            offscreen=offscreen,
+            camera_matrix=left_camera_matrix,
+            clipping_range=clipping_range,
+            init_widget=init_widget,
+            aspect_ratio=aspect_ratio,
+            xscale=xscale,
+            yscale=yscale
+        )
+        self.left_widget.setContentsMargins(0, 0, 0, 0)
+
+        self.right_widget = ow.VTKOverlayWindow(
+            offscreen=offscreen,
+            camera_matrix=right_camera_matrix,
+            clipping_range=clipping_range,
+            init_widget=init_widget,
+            aspect_ratio=aspect_ratio,
+            xscale=xscale,
+            yscale=yscale
+        )
+        self.right_widget.setContentsMargins(0, 0, 0, 0)
+
+        self.size_policy = \
+            QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        self.setSizePolicy(self.size_policy)
+        self.setContentsMargins(0, 0, 0, 0)
+
+    def set_camera_matrices(self, left_camera_matrix, right_camera_matrix):
+        """
+        Sets both the left and right camera matrices.
+
+        :param left_camera_matrix: numpy 3x3 ndarray containing fx, fy, cx, cy
+        :param right_camera_matrix: numpy 3x3 ndarray containing fx, fy, cx, cy
+        """
+        self.left_widget.set_camera_matrix(left_camera_matrix)
+        self.right_widget.set_camera_matrix(right_camera_matrix)
+
+    def set_camera_poses(self, left_camera_to_world, right_camera_to_world):
+        """
+        Sets the pose of both the left and right camera.
+
+        :param left_camera_to_world: 4x4 numpy ndarray, rigid transform
+        :param right_camera_to_world: 4x4 numpy ndarray, rigid transform
+        """
+        self.left_widget.set_camera_pose(left_camera_to_world)
+        self.right_widget.set_camera_pose(right_camera_to_world)
+
+    def add_vtk_models(self, models):
+        """
+        Add models to both left and right widgets.
+        Here a model is anything with an attribute called actor that
+        is a vtkActor.
+
+        :param models: vtk_base_model
+        """
+        self.left_widget.add_vtk_models(models)
+        self.right_widget.add_vtk_models(models)
+
+    def add_vtk_actor(self, actor):
+        """
+        Adds a vtkActor to both left and right widgets.
+
+        :param actor: vtkActor
+        """
+        self.left_widget.add_vtk_actor(actor)
+        self.right_widget.add_vtk_actor(actor)
+
+    @abc.abstractmethod
+    def set_video_images(self, left_image, right_image):
+        """
+        Derived classes must implement this method.
+        """
+
+    @abc.abstractmethod
+    def render(self):
+        """
+        Derived classes must implement this method.
+        """
+
+    @abc.abstractmethod
+    def save_scene_to_file(self, file_name):
+        """
+        Derived classes must implement this method.
+        """

scikit_surgeryvtk-2.4.0/sksurgeryvtk/widgets/vtk_interlaced_stereo_window.py

@@ -0,0 +1,181 @@
+# -*- coding: utf-8 -*-
+
+"""
+Module to provide an interlaced stereo window, designed for
+driving things like the Storz 3D laparoscope monitor.
+"""
+
+# pylint: disable=c-extension-no-member, no-name-in-module, too-many-instance-attributes
+import cv2
+import numpy as np
+from PySide6 import QtWidgets
+import sksurgeryimage.processing.interlace as i
+import sksurgeryvtk.widgets.vtk_base_stereo_window as bw
+import sksurgeryvtk.widgets.vtk_overlay_window as ow
+
+
+class VTKInterlacedStereoWindow(bw.VTKBaseStereoWindow):
+    """
+    Class to contain a pair of VTKOverlayWindows, left, right, that we render,
+    grab, interlace, and then display as a background image
+    on a separate VTKOverlayWindow.
+
+    :param init_widget: If True we will call self.Initialize and self.Start
+        as part of the init function. Set to false if you're on Linux.
+    """
+    # pylint: disable=too-many-positional-arguments
+    def __init__(self,
+                 offscreen=False,
+                 left_camera_matrix=None,
+                 right_camera_matrix=None,
+                 clipping_range=(1, 10000),
+                 init_widget=True,
+                 left_is_top=True,
+                 aspect_ratio=1
+                 ):
+
+        # Superclass creates left/right viewer.
+        super().__init__(offscreen=offscreen,
+                         left_camera_matrix=left_camera_matrix,
+                         right_camera_matrix=right_camera_matrix,
+                         clipping_range=clipping_range,
+                         init_widget=init_widget,
+                         left_is_top=left_is_top,
+                         aspect_ratio=aspect_ratio,
+                         xscale=1,
+                         yscale=1
+                         )
+
+        # This class adds an interlaced widget and a layout.
+        self.interlaced_widget = ow.VTKOverlayWindow(
+            offscreen=offscreen,
+            init_widget=init_widget,
+            aspect_ratio=aspect_ratio,
+            xscale=1,
+            yscale=1
+        )
+        self.interlaced_widget.setContentsMargins(0, 0, 0, 0)
+
+        self.stacked = QtWidgets.QStackedWidget()
+        self.stacked.addWidget(self.left_widget)
+        self.stacked.addWidget(self.right_widget)
+        self.stacked.addWidget(self.interlaced_widget)
+        self.stacked.setContentsMargins(0, 0, 0, 0)
+        self.stacked.setSizePolicy(self.size_policy)
+
+        self.layout = QtWidgets.QVBoxLayout(self)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.layout.setSpacing(0)
+        self.layout.addWidget(self.stacked)
+
+        # Default the view to show the interlaced window.
+        self.stacked.setCurrentIndex(2)
+
+    # pylint: disable=invalid-name
+    def paintEvent(self, ev):
+        """
+        Ensure that the interlaced image is recomputed.
+        """
+        self.render()
+        super().paintEvent(ev)
+
+    # pylint: disable=invalid-name
+    def resizeEvent(self, ev):
+        """
+        Ensure that the interlaced image is recomputed.
+        """
+        self.set_current_viewer_index(0)
+        self.left_widget.resizeEvent(ev)
+        self.left_widget.Render()
+        self.left_widget.update()
+        self.set_current_viewer_index(1)
+        self.right_widget.resizeEvent(ev)
+        self.right_widget.Render()
+        self.right_widget.update()
+        self.set_current_viewer_index(2)
+        self.interlaced_widget.resizeEvent(ev)
+        self.interlaced_widget.Render()
+        self.interlaced_widget.update()
+        super().resizeEvent(ev)
+
+
+    def closeEvent(self, QCloseEvent):
+        self.left_widget.Finalize()
+        self.right_widget.Finalize()
+        self.interlaced_widget.Finalize()
+        super().closeEvent(QCloseEvent)
+
+    def set_current_viewer_index(self, viewer_index):
+        """
+        Sets the current viewer selection.
+        Defaults to 2
+
+            0 = left
+            1 = right
+            2 = interlaced
+
+        :param viewer_index: index of viewer, as above.
+        """
+        if viewer_index < 0:
+            raise ValueError('viewer_index must be >= 0')
+        if viewer_index > 2:
+            raise ValueError('viewer_index must be <= 2')
+        self.stacked.setCurrentIndex(viewer_index)
+
+    def set_video_images(self, left_image, right_image):
+        """
+        Sets both left and right video images. Images
+        must be the same shape, and have an even number of rows.
+
+        :param left_image: left numpy image
+        :param right_image: right numpy image
+        :raises: ValueError, TypeError
+        """
+        if not isinstance(left_image, np.ndarray):
+            raise TypeError('left image is not an np.ndarray')
+        if not isinstance(right_image, np.ndarray):
+            raise TypeError('right image is not an np.ndarray')
+        if left_image.shape != right_image.shape:
+            raise ValueError('left and right images differ in shape')
+        if left_image.shape[0] % 2 != 0:
+            raise ValueError('left image does not have an even number of rows')
+        if right_image.shape[0] % 2 != 0:
+            raise ValueError('right image does not have an even number of rows')
+
+        self.left_widget.set_video_image(left_image)
+        self.right_widget.set_video_image(right_image)
+
+    def render(self):
+        """
+        Calls Render on all 3 contained vtk_overlay_windows.
+        """
+        self.left_widget.Render()
+        self.left_widget.update()
+        self.right_widget.Render()
+        self.right_widget.update()
+
+        left = self.left_widget.convert_scene_to_numpy_array()
+        right = self.right_widget.convert_scene_to_numpy_array()
+
+        left_rescaled = cv2.resize(left, (0, 0), fx=1.0, fy=0.5)
+        right_rescaled = cv2.resize(right, (0, 0), fx=1.0, fy=0.5)
+
+        if self.left_is_top:
+            interlaced = i.interlace_to_new(left_rescaled,
+                                            right_rescaled)
+        else:
+            interlaced = i.interlace_to_new(right_rescaled,
+                                            left_rescaled)
+
+        self.interlaced_widget.set_video_image(interlaced)
+        self.interlaced_widget.Render()
+        self.interlaced_widget.update()
+
+    def save_scene_to_file(self, file_name):
+        """
+        Writes the interlaced widget contents to file.
+
+        :param file_name: file name compatible with cv2.imwrite()
+        """
+        self.render()
+        self.interlaced_widget.save_scene_to_file(file_name)

{scikit_surgeryvtk-2.3.0 → scikit_surgeryvtk-2.4.0}/sksurgeryvtk/widgets/vtk_overlay_window.py

@@ -73,6 +73,9 @@ class VTKOverlayWindow(bcw.VTKBaseCalibratedWindow):
     :param layer_2_video_mask: Mask image for layer 2.
     :param layer_1_interactive: True if you want the VTK interactor to pickup events in this layer.
     :param layer_3_interactive: True if you want the VTK interactor to pickup events in this layer.
+    :param aspect_ratio: to adjust for slight differences in pixel size, expressed as x/y.
+    :param xscale: horizontal scale factor, for horizontal stacking
+    :param yscale: vertical scale factor, for vertical stacking
     layer_1_interactive and layer_3_interactive are mutually exclusive.
     """
     # pylint: disable=too-many-positional-arguments
@@ -90,7 +93,10 @@ class VTKOverlayWindow(bcw.VTKBaseCalibratedWindow):
         layer_2_video_mask=None,  # For masking in Layer 3
         use_depth_peeling=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.
+        layer_3_interactive=False,  # For backwards compatibility, prior to 3rd Feb 2024.
+        aspect_ratio=1,
+        xscale=1,
+        yscale=1
     ):
         """
         Constructs a new VTKOverlayWindow.
@@ -99,7 +105,10 @@ class VTKOverlayWindow(bcw.VTKBaseCalibratedWindow):
                                                camera_matrix,
                                                clipping_range,
                                                opencv_style,
-                                               reset_camera
+                                               reset_camera,
+                                               aspect_ratio=aspect_ratio,
+                                               xscale=xscale,
+                                               yscale=yscale
                                                )
         LOGGER.info("Creating VTKOverlayWindow")
 

scikit_surgeryvtk-2.4.0/sksurgeryvtk/widgets/vtk_stacked_stereo_window.py

@@ -0,0 +1,113 @@
+# -*- coding: utf-8 -*-
+
+"""
+Module to provide an stacked stereo window, designed for
+driving things like a 3D monitor that accepts left=top, right=bottom
+"""
+
+# pylint: disable=c-extension-no-member, no-name-in-module, too-many-instance-attributes
+import cv2
+import numpy as np
+from PySide6 import QtWidgets
+import sksurgeryvtk.widgets.vtk_base_stereo_window as bw
+
+
+class VTKStackedStereoWindow(bw.VTKBaseStereoWindow):
+    """
+    Class to contain a pair of VTKOverlayWindows, left, right, that are
+    stacked on top of each other. Left=top. Right=bottom.
+
+    :param init_widget: If True we will call self.Initialize and self.Start
+        as part of the init function. Set to false if you're on Linux.
+    : param left_is_top: If True left is top. Else left is bottom.
+    """
+    # pylint: disable=too-many-positional-arguments
+    def __init__(self,
+                 offscreen=False,
+                 left_camera_matrix=None,
+                 right_camera_matrix=None,
+                 clipping_range=(1, 10000),
+                 init_widget=True,
+                 left_is_top=True,
+                 aspect_ratio=1
+                 ):
+
+        # Superclass creates left/right viewer.
+        super().__init__(offscreen=offscreen,
+                         left_camera_matrix=left_camera_matrix,
+                         right_camera_matrix=right_camera_matrix,
+                         clipping_range=clipping_range,
+                         init_widget=init_widget,
+                         left_is_top=left_is_top,
+                         aspect_ratio=aspect_ratio,
+                         xscale=1,
+                         yscale=2
+                         )
+
+        self.layout = QtWidgets.QVBoxLayout(self)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.layout.setSpacing(0)
+        if self.left_is_top:
+            self.layout.addWidget(self.left_widget)
+            self.layout.addWidget(self.right_widget)
+        else:
+            self.layout.addWidget(self.right_widget)
+            self.layout.addWidget(self.left_widget)
+
+    def resizeEvent(self, ev):
+        """
+        Ensure that the interlaced image is recomputed.
+        """
+        self.left_widget.resizeEvent(ev)
+        self.left_widget.Render()
+        self.left_widget.update()
+        self.right_widget.resizeEvent(ev)
+        self.right_widget.Render()
+        self.right_widget.update()
+        super().resizeEvent(ev)
+
+    def set_video_images(self, left_image, right_image):
+        """
+        Sets both left and right video images. Images
+        must be the same shape, and have an even number of rows.
+
+        :param left_image: left numpy image
+        :param right_image: right numpy image
+        :raises: ValueError, TypeError
+        """
+        if not isinstance(left_image, np.ndarray):
+            raise TypeError('left image is not an np.ndarray')
+        if not isinstance(right_image, np.ndarray):
+            raise TypeError('right image is not an np.ndarray')
+        if left_image.shape != right_image.shape:
+            raise ValueError('left and right images differ in shape')
+
+        left_rescaled = cv2.resize(left_image, (0, 0), fx=1.0, fy=0.5)
+        right_rescaled = cv2.resize(right_image, (0, 0), fx=1.0, fy=0.5)
+
+        self.left_widget.set_video_image(left_rescaled)
+        self.right_widget.set_video_image(right_rescaled)
+
+    def render(self):
+        """
+        Simply triggers rendering on both widgets.
+        """
+        self.left_widget.Render()
+        self.left_widget.update()
+        self.right_widget.Render()
+        self.right_widget.update()
+
+    def save_scene_to_file(self, file_name):
+        """
+        Writes the interlaced widget contents to file.
+
+        :param file_name: file name compatible with cv2.imwrite()
+        """
+        self.render()
+        left_image = self.left_widget.convert_scene_to_numpy_array()
+        right_image = self.right_widget.convert_scene_to_numpy_array()
+        if self.left_is_top:
+            stacked = np.vstack((left_image, right_image))
+        else:
+            stacked = np.vstack((right_image, left_image))
+        cv2.imwrite(file_name, stacked)

{scikit_surgeryvtk-2.3.0 → scikit_surgeryvtk-2.4.0}/sksurgeryvtk/widgets/vtk_zbuffer_window.py

@@ -70,6 +70,7 @@ class VTKZBufferWindow(bcw.VTKBaseCalibratedWindow):
         reset_camera=True,
         init_widget=True,
         use_depth_peeling=True,
+        aspect_ratio=1
     ):
         """
         Constructs a new VTKZBufferWindow.
@@ -78,7 +79,8 @@ class VTKZBufferWindow(bcw.VTKBaseCalibratedWindow):
                                                camera_matrix,
                                                clipping_range,
                                                opencv_style,
-                                               reset_camera
+                                               reset_camera,
+                                               aspect_ratio=aspect_ratio
                                                )
         LOGGER.info("Creating VTKZBufferWindow")
 

{scikit_surgeryvtk-2.3.0 → scikit_surgeryvtk-2.4.0}/tests/test_requirements.py

@@ -31,7 +31,7 @@ def test_requirements_vs_setup():
     setup_reqs = []
 
     for line in searchlines[install_line + 1: end_line]:
-        req = line.replace(',', '').replace("'", "")
+        req = line.replace("',", "'").replace("'", "")
         req = req.replace(' ', '').replace('\n', '')
         setup_reqs.append(req)