Merge branch 'master' into toolbar3d

.github/workflows/pull_request_template.md

@@ -0,0 +1,26 @@
+## Describe your changes
+
+
+## Describe any testing you have performed
+*Consider adding example code to [examples](https://github.com/vais-ral/CILViewer/tree/pr-template/Wrappers/Python/examples)*
+
+
+## Link relevant issues
+
+
+## Checklist when you are ready to request a review
+
+- [ ] I have performed a self-review of my code
+- [ ] I have added docstrings in line with the guidance in the [CIL developer guide](https://tomographicimaging.github.io/CIL/nightly/developer_guide.html)
+- [ ] I have implemented unit tests that cover any new or modified functionality
+- [ ] CHANGELOG.md has been updated with any functionality change
+- [ ] Request review from all relevant developers
+- [ ] Change pull request label to 'waiting for review' 
+
+## Contribution Notes
+- [ ] The content of this Pull Request (the Contribution) is intentionally submitted for inclusion in CILViewer (the Work) under the terms and conditions of the [Apache-2.0 License](https://spdx.org/licenses/Apache-2.0.html)
+- [ ] I confirm that the contribution does not violate any intellectual property rights of third parties
+
+Qt contributions should follow Qt naming conventions i.e. camelCase method names.
+
+VTK contributions should follow VTK naming conventions i.e. PascalCase method names.

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## v23.x.x
 - adds Qt GUI toolbar to control 3D viewer
+- Fix bug with setInputAsNumpy() using deprecated `numpy2vtkImporter` in `CILViewer2D` - now uses `numpy2vtkImage`
 
 ## v23.1.0
 - Raise error if try to add multiple widgets with the same name to CILViewer or CILViewer2D.

README.md

@@ -20,7 +20,7 @@ conda create --name cilviewer ccpi-viewer=23.1.0 -c ccpi -c paskino -c conda-for
 
 ## Running the CILViewer app
 
-- Activate your environment using: ``conda activate cil-viewer``.
+- Activate your environment using: ``conda activate cilviewer``.
 - Launch by typing: `cilviewer`
 - Load a dataset using the File menu. Currently supported data formats:
   - HDF5, including Nexus

Wrappers/Python/ccpi/viewer/CILViewer2D.py

@@ -1171,13 +1171,12 @@ def setInputAsNumpy(self,
                         dtype=vtk.VTK_UNSIGNED_SHORT):
         self.rescale[0] = rescale
 
-        importer = Converter.numpy2vtkImporter(numpyarray, spacing, origin)
-        importer.Update()
+        img = Converter.numpy2vtkImage(numpyarray, spacing, origin)
 
         if rescale:
             # rescale to appropriate VTK_UNSIGNED_SHORT
             stats = vtk.vtkImageAccumulate()
-            stats.SetInputData(importer.GetOutput())
+            stats.SetInputData(img)
             stats.Update()
             iMin = stats.GetMin()[0]
             iMax = stats.GetMax()[0]
@@ -1191,14 +1190,14 @@ def setInputAsNumpy(self,
 
             self.rescale[1] = (scale, -iMin)
             shiftScaler = vtk.vtkImageShiftScale()
-            shiftScaler.SetInputData(importer.GetOutput())
+            shiftScaler.SetInputData(img)
             shiftScaler.SetScale(scale)
             shiftScaler.SetShift(-iMin)
             shiftScaler.SetOutputScalarType(dtype)
             shiftScaler.Update()
             self.img3D = shiftScaler.GetOutput()
         else:
-            self.img3D = importer.GetOutput()
+            self.img3D = img
 
         self.installPipeline()