PR: automatic registration to iDVC (#206)

* Add automatic registration functionality
TomographicImaging · Apr 11, 2024 · 0fed047 · 0fed047
1 parent 0ba76c3
commit 0fed047
Show file tree

Hide file tree

Showing 7 changed files with 1,009 additions and 166 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,21 +1,22 @@
 # ChangeLog
 
 ## vx.x.x
+* Add automatic registration functionality
 * Set empty pop-up menus for the main windows
 * Set Tabified widgets not to move or close
-* Set QDockWidgets flag to NoDockWidgetFeatures to prevent them being moved or lost.
-* Consume events 'w' and 's' in viewers to avoid render changes between wireframe and surface respectively.
-* Added argument parser to idvc command. This allows the user to specify the debugging level.
+* Set QDockWidgets flag to NoDockWidgetFeatures to prevent them being moved or lost
+* Consume events 'w' and 's' in viewers to avoid render changes between wireframe and surface respectively
+* Added argument parser to idvc command. This allows the user to specify the debugging level
 * Add workaround for box clipping due to VTK behaviour change from 9.1. Removed requirement for VTK 8.1.2
 * add build directory to gitignore
 * Add setting to set the number of OpenMP threads to use during DVC analysis
 * Use os.path.join to create all filepaths, previously in some cases we were forcing "\" or "/" to be in some paths
-* renames input files with names reference and correlate for the relative images, if data are copied in the session.
+* renames input files with names reference and correlate for the relative images, if data are copied in the session
 * More efficient pointcloud creation by not shifting the pointcloud to the make such that point0 is one point of the 
-  created cloud. Point0 is simply added as first point of the cloud even if it does not lie on the regular grid.
-* Updates progress bar for setting up a DVC run configuration - previously this was hanging.
-* Improves progress reporting when loading a saved session, including displaying file names as they are loaded.
-* Make splash screen appear instantly when app is opened.
+  created cloud. Point0 is simply added as first point of the cloud even if it does not lie on the regular grid
+* Updates progress bar for setting up a DVC run configuration - previously this was hanging
+* Improves progress reporting when loading a saved session, including displaying file names as they are loaded
+* Make splash screen appear instantly when app is opened
 * Restructure to create:
   * ui/dialogs.py
   * ui/widgets.py

diff --git a/recipe/dev_environment.yml b/recipe/dev_environment.yml
@@ -6,6 +6,7 @@ channels:
 dependencies:    
     - python
     - numpy
+    - scipy
     - ccpi::ccpi-viewer >=22.2.0
     - ccpi::ccpi-dvc >=22.0.0
     - natsort

diff --git a/setup.py b/setup.py
@@ -58,7 +58,7 @@ def version2pep440(version):
       name = "idvc",
       description = 'CCPi DVC Configurator',
 	  version = dversion,
-	  packages = {'idvc', 'idvc.ui'},
+	  packages = {'idvc', 'idvc.ui', 'idvc.utils'},
       package_dir = {'idvc': os.path.join('src','idvc')},
       package_data = {'idvc':['DVCIconSquare.png']},
       # metadata for upload to PyPI

diff --git a/src/idvc/dvc_interface.py b/src/idvc/dvc_interface.py
diff --git a/src/idvc/ui/dialogs.py b/src/idvc/ui/dialogs.py
@@ -3,6 +3,7 @@
 from PySide2.QtCore import *
 from PySide2.QtGui import *
 import multiprocessing
+import vtk
 
 
 class SettingsWindow(QDialog):