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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scikit-surgeryvtk
-Version: 2.4.0
+Version: 2.5.2
 Summary: scikit-surgeryvtk uses VTK for Image Guided Surgery applications
 Home-page: https://github.com/SciKit-Surgery/scikit-surgeryvtk
 Author: Thomas Dowrick

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scikit-surgeryvtk
-Version: 2.4.0
+Version: 2.5.2
 Summary: scikit-surgeryvtk uses VTK for Image Guided Surgery applications
 Home-page: https://github.com/SciKit-Surgery/scikit-surgeryvtk
 Author: Thomas Dowrick

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

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2026-04-20T06:13:00+0100",
+ "date": "2026-06-19T09:16:00+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "0422a88b01c027061aef20a450a63f3ba6100e3f",
- "version": "2.4.0"
+ "full-revisionid": "756bb9f83df23ce27561faab216f2481f0315161",
+ "version": "2.5.2"
 }
 '''  # END VERSION_JSON
 

{scikit_surgeryvtk-2.4.0 → scikit_surgeryvtk-2.5.2}/sksurgeryvtk/widgets/vtk_base_stereo_window.py

@@ -5,6 +5,7 @@ Base class for vtk_interlaced_stereo_window.py and vtk_stacked_stereo_window.py
 """
 
 import abc
+import numpy as np
 from PySide6 import QtWidgets
 from PySide6.QtWidgets import QSizePolicy
 import sksurgeryvtk.widgets.vtk_overlay_window as ow
@@ -66,7 +67,7 @@ class VTKBaseStereoWindow(QtWidgets.QWidget):
 
     def set_camera_matrices(self, left_camera_matrix, right_camera_matrix):
         """
-        Sets both the left and right camera matrices.
+        Sets both the left and right camera matrices (i.e. the intrinsics).
 
         :param left_camera_matrix: numpy 3x3 ndarray containing fx, fy, cx, cy
         :param right_camera_matrix: numpy 3x3 ndarray containing fx, fy, cx, cy
@@ -76,7 +77,7 @@ class VTKBaseStereoWindow(QtWidgets.QWidget):
 
     def set_camera_poses(self, left_camera_to_world, right_camera_to_world):
         """
-        Sets the pose of both the left and right camera.
+        Sets the pose of both the left and right camera (i.e. the extrinsics).
 
         :param left_camera_to_world: 4x4 numpy ndarray, rigid transform
         :param right_camera_to_world: 4x4 numpy ndarray, rigid transform
@@ -84,6 +85,28 @@ class VTKBaseStereoWindow(QtWidgets.QWidget):
         self.left_widget.set_camera_pose(left_camera_to_world)
         self.right_widget.set_camera_pose(right_camera_to_world)
 
+    def set_poses_from_left_camera(self, left_camera_to_world, left_to_right):
+        """
+        Sets the pose of both the left and right camera (i.e. the extrinsics).
+
+        :param left_camera_to_world: 4x4 numpy ndarray, rigid transform
+        :param left_to_right: 4x4 numpy ndarray, rigid transform
+        """
+        self.left_widget.set_camera_pose(left_camera_to_world)
+        self.right_widget.set_camera_pose(
+            np.linalg.inv(left_to_right @ np.linalg.inv(left_camera_to_world)))
+
+    def set_poses_from_right_camera(self, right_camera_to_world, right_to_left):
+        """
+        Sets the pose of both the left and right camera (i.e. the extrinsics).
+
+        :param right_camera_to_world: 4x4 numpy ndarray, rigid transform
+        :param right_to_left: 4x4 numpy ndarray, rigid transform
+        """
+        self.left_widget.set_camera_pose(
+            np.linalg.inv(right_to_left @ np.linalg.inv(right_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.

{scikit_surgeryvtk-2.4.0 → scikit_surgeryvtk-2.5.2}/sksurgeryvtk/widgets/vtk_interlaced_stereo_window.py

@@ -154,11 +154,13 @@ class VTKInterlacedStereoWindow(bw.VTKBaseStereoWindow):
         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_rgb = self.left_widget.convert_scene_to_numpy_array()
+        right_rgb = 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)
+        left_rescaled_rgb = cv2.resize(left_rgb, (0, 0), fx=1.0, fy=0.5)
+        left_rescaled = cv2.cvtColor(left_rescaled_rgb, cv2.COLOR_RGB2BGR)
+        right_rescaled_rgb = cv2.resize(right_rgb, (0, 0), fx=1.0, fy=0.5)
+        right_rescaled = cv2.cvtColor(right_rescaled_rgb, cv2.COLOR_RGB2BGR)
 
         if self.left_is_top:
             interlaced = i.interlace_to_new(left_rescaled,