scikit-surgeryvtk 2.2.3__tar.gz → 2.3.1__tar.gz

{scikit-surgeryvtk-2.2.3/scikit_surgeryvtk.egg-info → scikit_surgeryvtk-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: scikit-surgeryvtk
-Version: 2.2.3
+Version: 2.3.1
 Summary: scikit-surgeryvtk uses VTK for Image Guided Surgery applications
 Home-page: https://github.com/SciKit-Surgery/scikit-surgeryvtk
 Author: Thomas Dowrick
@@ -19,6 +19,23 @@ Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Classifier: Topic :: Scientific/Engineering :: Medical Science Apps.
 Description-Content-Type: text/x-rst
 License-File: LICENSE
+Requires-Dist: numpy>=1.11
+Requires-Dist: vtk>=9.5.0
+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
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 scikit-surgeryvtk
 =================

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1/scikit_surgeryvtk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: scikit-surgeryvtk
-Version: 2.2.3
+Version: 2.3.1
 Summary: scikit-surgeryvtk uses VTK for Image Guided Surgery applications
 Home-page: https://github.com/SciKit-Surgery/scikit-surgeryvtk
 Author: Thomas Dowrick
@@ -19,6 +19,23 @@ Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Classifier: Topic :: Scientific/Engineering :: Medical Science Apps.
 Description-Content-Type: text/x-rst
 License-File: LICENSE
+Requires-Dist: numpy>=1.11
+Requires-Dist: vtk>=9.5.0
+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
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 scikit-surgeryvtk
 =================

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1}/scikit_surgeryvtk.egg-info/SOURCES.txt

@@ -42,6 +42,7 @@ sksurgeryvtk/widgets/vtk_overlay_window.py
 sksurgeryvtk/widgets/vtk_rendering_generator.py
 sksurgeryvtk/widgets/vtk_reslice_widget.py
 sksurgeryvtk/widgets/vtk_zbuffer_window.py
+tests/test_requirements.py
 tests/camera/__init__.py
 tests/camera/test_liver_overlay.py
 tests/camera/test_vtk_camera_model.py

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1}/scikit_surgeryvtk.egg-info/requires.txt

@@ -1,6 +1,6 @@
 numpy>=1.11
-vtk>=9.2.6
-PySide6>=6.5.1.1
+vtk>=9.5.0
+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.2.3 → scikit_surgeryvtk-2.3.1}/setup.py

@@ -53,8 +53,8 @@ setup(
 
     install_requires=[
         'numpy>=1.11',
-        'vtk>=9.2.6',
-        'PySide6>=6.5.1.1',
+        'vtk>=9.5.0',
+        '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.2.3 → scikit_surgeryvtk-2.3.1}/sksurgeryvtk/_version.py

@@ -1,5 +1,5 @@
 
-# This file was generated by 'versioneer.py' (0.18) from
+# This file was generated by 'versioneer.py' (0.29) from
 # revision-control system data, or from the parent directory name of an
 # unpacked source archive. Distribution tarballs contain a pre-generated copy
 # of this file.
@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-03-14T16:48:59+0000",
+ "date": "2025-10-24T08:32:40+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "ebf8ea25cc4a9fa18773b5fed644293922bff5cb",
- "version": "2.2.3"
+ "full-revisionid": "1a0b61bcda94c0aaad8cf148516f7260dde2e9fa",
+ "version": "2.3.1"
 }
 '''  # END VERSION_JSON
 

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1}/sksurgeryvtk/camera/vtk_camera_model.py

@@ -7,6 +7,7 @@ Functions to setup a VTK camera to match the OpenCV calibrated camera.
 import vtk
 import numpy as np
 
+# pylint: disable=too-many-positional-arguments
 
 def compute_right_camera_pose(left_camera_to_world, left_to_right):
     """

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1}/sksurgeryvtk/models/voxelise.py

@@ -211,6 +211,8 @@ def load_points_from_file(filename):
     mesh = reader.GetOutput()
     return mesh
 
+
+# pylint: disable=too-many-positional-arguments, too-many-statements
 def voxelise(input_mesh: Union[np.ndarray, vtk.vtkDataObject, str],
              output_grid: Union[vtk.vtkStructuredGrid, str] \
                  = None,
@@ -327,7 +329,9 @@ def voxelise(input_mesh: Union[np.ndarray, vtk.vtkDataObject, str],
                 raise IOError(err)
             b = grid.GetBounds()
             size = b[1] - b[0]
-            grid_elements = grid.GetDimensions()[0]
+            dimensions = [0] * 3
+            grid.GetDimensions(dimensions)
+            grid_elements = dimensions[0]
 
         else:
             grid = createGrid(size, grid_elements)
@@ -336,7 +340,9 @@ def voxelise(input_mesh: Union[np.ndarray, vtk.vtkDataObject, str],
         grid = output_grid
         b = grid.GetBounds()
         size = b[1] - b[0]
-        grid_elements = grid.GetDimensions()[0]
+        dimensions = [0] * 3
+        grid.GetDimensions(dimensions)
+        grid_elements = dimensions[0]
 
     # We don't already have a grid, create one
     else:

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1}/sksurgeryvtk/models/vtk_base_model.py

@@ -9,6 +9,7 @@ import sksurgeryvtk.utils.matrix_utils as mu
 from sksurgeryvtk.models.vtk_base_actor import VTKBaseActor
 from sksurgeryvtk.models.outline_render import VTKOutlineActor
 
+# pylint: disable=too-many-positional-arguments
 
 class VTKBaseModel(VTKBaseActor):
     """

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1}/sksurgeryvtk/models/vtk_cylinder_model.py

@@ -7,8 +7,7 @@ VTKCylinderModel contains a VTK pipeline to render a cylinder.
 import vtk
 import sksurgeryvtk.models.vtk_surface_model as vbs
 
-# pylint:disable=super-with-arguments
-
+# pylint: disable=too-many-positional-arguments
 
 class VTKCylinderModel(vbs.VTKSurfaceModel):
     """
@@ -35,8 +34,7 @@ class VTKCylinderModel(vbs.VTKSurfaceModel):
         :param opacity: float [0,1]
         """
 
-        super(VTKCylinderModel, self).__init__(None, colour, visibility,
-                                               opacity)
+        super().__init__(None, colour, visibility, opacity)
         self.name = name
 
         cyl = vtk.vtkCylinderSource()

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1}/sksurgeryvtk/models/vtk_grid_model.py

@@ -14,7 +14,7 @@ import sksurgerycore.utilities.validate_file as vf
 import sksurgeryvtk.models.vtk_base_model as vbm
 
 # pylint: disable=too-many-instance-attributes
-# pylint: disable=super-with-arguments, dangerous-default-value
+# pylint: disable=too-many-positional-arguments, dangerous-default-value
 
 
 class VTKUnstructuredGridModel(vbm.VTKBaseModel):
@@ -32,8 +32,7 @@ class VTKUnstructuredGridModel(vbm.VTKBaseModel):
         :param opacity: float [0,1]
         :param pickable: boolean, True|False
         """
-        super(VTKUnstructuredGridModel, self).__init__(colour, visibility,
-                                                       opacity, pickable)
+        super().__init__(colour, visibility, opacity, pickable)
 
         self.source_file = None
         self.reader = None

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1}/sksurgeryvtk/models/vtk_sphere_model.py

@@ -11,7 +11,7 @@ from vtk.util import numpy_support
 
 import sksurgeryvtk.models.vtk_base_model as vbm
 
-# pylint:disable=super-with-arguments
+# pylint: disable=too-many-positional-arguments
 
 
 class VTKSphereModel(vbm.VTKBaseModel):
@@ -32,8 +32,7 @@ class VTKSphereModel(vbm.VTKBaseModel):
         :param pickable: boolean, True|False
         :param resolution: the resolution (theta and phy)
         """
-        super(VTKSphereModel, self).__init__(colour, visibility, opacity,
-                                             pickable)
+        super().__init__(colour, visibility, opacity, pickable)
 
         # Validate as much as possible, up front.
         if points is None:

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1}/sksurgeryvtk/models/vtk_surface_model.py

@@ -13,8 +13,7 @@ import sksurgerycore.utilities.validate_file as vf
 import sksurgeryvtk.models.vtk_base_model as vbm
 import sksurgeryvtk.utils.matrix_utils as mu
 
-# pylint: disable=too-many-instance-attributes
-# pylint:disable=super-with-arguments
+# pylint: disable=too-many-instance-attributes, too-many-positional-arguments
 
 
 class VTKSurfaceModel(vbm.VTKBaseModel):
@@ -34,8 +33,7 @@ class VTKSurfaceModel(vbm.VTKBaseModel):
         :param pickable: boolean, True|False
         :param outline: boolean, do we render a model outline?
         """
-        super(VTKSurfaceModel, self).__init__(colour, visibility, opacity,
-                                              pickable, outline)
+        super().__init__(colour, visibility, opacity, pickable, outline)
 
         self.source_file = None
         self.reader = None

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1}/sksurgeryvtk/models/vtk_tube_model.py

@@ -10,7 +10,7 @@ import numpy as np
 import vtk
 import sksurgeryvtk.models.vtk_base_model as vbm
 
-# pylint:disable=super-with-arguments
+# pylint:disable=too-many-positional-arguments
 
 
 class VTKTubeModel(vbm.VTKBaseModel):
@@ -33,8 +33,7 @@ class VTKTubeModel(vbm.VTKBaseModel):
         :param pickable: boolean, True|False
         :param outline: boolean, do we render a model outline?
         """
-        super(VTKTubeModel, self).__init__(colour, visibility, opacity,
-                                           pickable, outline)
+        super().__init__(colour, visibility, opacity, pickable, outline)
 
         # Validate as much as possible, up front.
         if points is None:

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1}/sksurgeryvtk/text/text_overlay.py

@@ -12,7 +12,7 @@ import vtk
 logging.basicConfig(level=logging.INFO)
 LOGGER = logging.getLogger(__name__)
 
-#pylint:disable = invalid-name, no-member, attribute-defined-outside-init
+# pylint:disable=invalid-name,no-member,attribute-defined-outside-init
 
 class VTKCornerAnnotation:
     """
@@ -184,6 +184,7 @@ class VTKText(VTKTextBase):
     :param colour: Colour, RGB tuple
     """
 
+    # pylint: disable=too-many-positional-arguments
     def __init__(self, text, x, y, font_size=24, colour=(1.0, 0, 0)):
         """ Create a VTK text actor.
         """

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1}/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,
@@ -85,6 +83,7 @@ def project_points(points,
     return projected
 
 
+# pylint: disable=too-many-positional-arguments
 def project_facing_points(points,
                           normals,
                           camera_to_world,
@@ -146,6 +145,7 @@ def project_facing_points(points,
     return projected_points
 
 
+# pylint: disable=too-many-positional-arguments
 def compute_rms_error(model_points,
                       image_points,
                       renderer,

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1}/sksurgeryvtk/widgets/vtk_base_calibrated_window.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # 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
+# pylint:disable=too-many-positional-arguments, too-many-arguments, line-too-long, too-many-public-methods
 
 """
 Module to provide a base class for OpenCV-style calibrated windows.
@@ -44,7 +44,7 @@ class VTKBaseCalibratedWindow(QVTKRenderWindowInteractor):
         """
         Constructs a new VTKBaseCalibratedWindow.
         """
-        super(VTKBaseCalibratedWindow, self).__init__()
+        super().__init__()
         LOGGER.info("Creating VTKBaseCalibratedWindow")
 
         # Take and cache/store constructor arguments.
@@ -82,7 +82,7 @@ class VTKBaseCalibratedWindow(QVTKRenderWindowInteractor):
         will ensure that cameras are correctly scaled as the window size changes.
         :param ev: Event
         """
-        super(VTKBaseCalibratedWindow, self).resizeEvent(ev)
+        super().resizeEvent(ev)
         self._update_video_image_cameras()
         self._update_projection_matrices()
         self.Render()
@@ -332,7 +332,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.2.3 → scikit_surgeryvtk-2.3.1}/sksurgeryvtk/widgets/vtk_interlaced_stereo_window.py

@@ -6,14 +6,12 @@ driving things like the Storz 3D laparoscope monitor.
 """
 
 # pylint: disable=c-extension-no-member, no-name-in-module, too-many-instance-attributes
-# pylint:disable=super-with-arguments
 
 import cv2
 import numpy as np
 from PySide6 import QtWidgets
 from PySide6.QtWidgets import QSizePolicy
 import sksurgeryimage.processing.interlace as i
-import sksurgerycore.utilities.validate_matrix as vm
 import sksurgeryvtk.widgets.vtk_overlay_window as ow
 import sksurgeryvtk.camera.vtk_camera_model as cm
 
@@ -26,7 +24,7 @@ class VTKStereoInterlacedWindow(QtWidgets.QWidget):
     :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,
@@ -116,7 +114,7 @@ class VTKStereoInterlacedWindow(QtWidgets.QWidget):
         """
         Ensure that the interlaced image is recomputed.
         """
-        super(VTKStereoInterlacedWindow, self).paintEvent(ev)
+        super().paintEvent(ev)
         self.render()
 
     # pylint: disable=invalid-name
@@ -124,7 +122,7 @@ class VTKStereoInterlacedWindow(QtWidgets.QWidget):
         """
         Ensure that the interlaced image is recomputed.
         """
-        super(VTKStereoInterlacedWindow, self).resizeEvent(ev)
+        super().resizeEvent(ev)
         self.render()
 
     def set_current_viewer_index(self, viewer_index):
@@ -227,7 +225,6 @@ class VTKStereoInterlacedWindow(QtWidgets.QWidget):
 
         :param left_to_right: 4x4 numpy ndarray, rigid transform
         """
-        vm.validate_rigid_matrix(left_to_right)
         self.left_to_right = left_to_right
 
     def set_camera_poses(self, left_camera_to_world):

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1}/sksurgeryvtk/widgets/vtk_lus_simulator.py

@@ -32,6 +32,7 @@ class VTKLUSSimulator(rg.VTKRenderingGenerator):
     :param liver2camera_reference_file: [4x4] matrix in text file, numpy format
     :param probe2camera_reference_file: [4x4] matrix in text file, numpy format
     """
+    # pylint: disable=too-many-positional-arguments
     def __init__(self,
                  models_json_file,
                  background_image_file,

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1}/sksurgeryvtk/widgets/vtk_overlay_window.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# pylint: disable=too-many-instance-attributes, no-name-in-module, too-many-statements
+# 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
 
 """
@@ -75,6 +75,7 @@ class VTKOverlayWindow(bcw.VTKBaseCalibratedWindow):
     :param layer_3_interactive: True if you want the VTK interactor to pickup events in this layer.
     layer_1_interactive and layer_3_interactive are mutually exclusive.
     """
+    # pylint: disable=too-many-positional-arguments
     def __init__(
         self,
         offscreen=False,

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1}/sksurgeryvtk/widgets/vtk_rendering_generator.py

@@ -5,7 +5,7 @@ Module to provide a basic VTK render window for test data generation.
 """
 
 # pylint: disable=too-many-instance-attributes,
-# pylint: disable=no-name-in-module, too-many-arguments
+# pylint: disable=no-name-in-module, too-many-positional-arguments, too-many-arguments
 
 import os
 import numpy as np

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1}/sksurgeryvtk/widgets/vtk_reslice_widget.py

@@ -130,6 +130,8 @@ class VTKResliceWidget(QVTKRenderWindowInteractor):
 
     def reset_position(self):
         """ Set slice position to the middle of the axis. """
+        lower = 0
+        upper = 0
         if self.axis == 'x':
             lower, upper = self.x_min, self.x_max
         if self.axis == 'y':

{scikit-surgeryvtk-2.2.3 → scikit_surgeryvtk-2.3.1}/sksurgeryvtk/widgets/vtk_zbuffer_window.py

@@ -59,7 +59,7 @@ class VTKZBufferWindow(bcw.VTKBaseCalibratedWindow):
     :param init_widget: If True we call self.Initialise 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,

scikit_surgeryvtk-2.3.1/tests/test_requirements.py

@@ -0,0 +1,51 @@
+# coding=utf-8
+
+"""scikit-surgery-evaluation tests"""
+
+# Pytest style
+
+def test_requirements_vs_setup():
+    """
+    Test that requirements.txt matches setup.py
+    """
+
+   # setup=open("setup.py","r")
+   # setuptxt = setup.read()
+   # setup.close()
+
+    with open("setup.py", "r") as file_to_read:
+        searchlines = file_to_read.readlines()
+
+    install_line = -1
+    for i, line in enumerate(searchlines):
+        if "install_requires" in line:
+            install_line = i
+            break
+
+    end_line = -1
+    for i, line in enumerate(searchlines[install_line:]):
+        if "]" in line:
+            end_line = install_line + i
+            break
+
+    setup_reqs = []
+
+    for line in searchlines[install_line + 1: end_line]:
+        req = line.replace("',", "'").replace("'", "")
+        req = req.replace(' ', '').replace('\n', '')
+        setup_reqs.append(req)
+
+
+    with open("requirements.txt", "r") as file_to_read:
+        searchlines = file_to_read.readlines()
+
+    reqs = []
+    for line in searchlines:
+        if "#" not in line:
+            reqs.append(line.replace('\n', ''))
+
+    for setup_req in setup_reqs:
+        assert setup_req in reqs
+
+    for req in reqs:
+        assert req in setup_reqs