From 56015b01ddfecb7d8ad8efe086829d07e68af287 Mon Sep 17 00:00:00 2001 From: David Allemang Date: Wed, 20 Dec 2023 12:15:27 -0500 Subject: [PATCH] COMP: Add missing __init__.py and CMake entries. - Add missing __init__.py for all Python packages. - Add missing __init__.py CMake declarations. - Sort CMake declarations. - Reformat only modified CMake files. --- ALI_IOS/CMakeLists.txt | 18 ++++++++-------- ALI_IOS/utils_windows/__init__.py | 0 AREG/AREG_Method/__init__.py | 0 AREG/CMakeLists.txt | 16 +++++++-------- AREG_CBCT/CMakeLists.txt | 12 +++++------ AREG_IOS/CMakeLists.txt | 24 ++++++++++------------ ASO/ASO_Method/IOS_utils/__init__.py | 0 ASO/ASO_Method/__init__.py | 0 ASO/CMakeLists.txt | 12 ++++++----- ASO_CBCT/CMakeLists.txt | 3 --- ASO_CBCT/ImportLibrary.cmake | 13 ++++++------ ASO_IOS/CMakeLists.txt | 2 -- ASO_IOS/ImportLibrary.cmake | 18 ++++++++-------- AutoCrop3D/Crop_Volumes_CLI/CMakeLists.txt | 16 +++++++-------- AutoMatrix/CMakeLists.txt | 10 ++++----- AutoMatrix/Method/__init__.py | 0 16 files changed, 68 insertions(+), 76 deletions(-) create mode 100644 ALI_IOS/utils_windows/__init__.py create mode 100644 AREG/AREG_Method/__init__.py create mode 100644 ASO/ASO_Method/IOS_utils/__init__.py create mode 100644 ASO/ASO_Method/__init__.py create mode 100644 AutoMatrix/Method/__init__.py diff --git a/ALI_IOS/CMakeLists.txt b/ALI_IOS/CMakeLists.txt index 092c928..43faf0d 100644 --- a/ALI_IOS/CMakeLists.txt +++ b/ALI_IOS/CMakeLists.txt @@ -3,18 +3,18 @@ set(MODULE_NAME ALI_IOS) SlicerMacroBuildScriptedCLI( NAME ${MODULE_NAME} - ) +) set(FOLDER_LIBRARY utils_windows) set(MODULE_PYTHON_SCRIPTS -${FOLDER_LIBRARY}/__init__.py -${FOLDER_LIBRARY}/first.py -${FOLDER_LIBRARY}/in_wsl.py -${FOLDER_LIBRARY}/server.py - ) + ${FOLDER_LIBRARY}/__init__.py + ${FOLDER_LIBRARY}/first.py + ${FOLDER_LIBRARY}/in_wsl.py + ${FOLDER_LIBRARY}/server.py +) - slicerMacroBuildScriptedModule( - NAME ${FOLDER_LIBRARY} - SCRIPTS ${MODULE_PYTHON_SCRIPTS} +slicerMacroBuildScriptedModule( + NAME ${FOLDER_LIBRARY} + SCRIPTS ${MODULE_PYTHON_SCRIPTS} ) \ No newline at end of file diff --git a/ALI_IOS/utils_windows/__init__.py b/ALI_IOS/utils_windows/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/AREG/AREG_Method/__init__.py b/AREG/AREG_Method/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/AREG/CMakeLists.txt b/AREG/CMakeLists.txt index 620b423..cbdd1fe 100644 --- a/AREG/CMakeLists.txt +++ b/AREG/CMakeLists.txt @@ -4,17 +4,18 @@ set(MODULE_NAME AREG) #----------------------------------------------------------------------------- set(MODULE_PYTHON_SCRIPTS ${MODULE_NAME}.py - AREG_Method/Method.py - AREG_Method/IOS.py + AREG_Method/__init__.py AREG_Method/CBCT.py + AREG_Method/IOS.py AREG_Method/IOSCBCT.py + AREG_Method/Method.py AREG_Method/Progress.py - ) +) set(MODULE_PYTHON_RESOURCES Resources/Icons/${MODULE_NAME}.png Resources/UI/${MODULE_NAME}.ui - ) +) #----------------------------------------------------------------------------- slicerMacroBuildScriptedModule( @@ -22,11 +23,10 @@ slicerMacroBuildScriptedModule( SCRIPTS ${MODULE_PYTHON_SCRIPTS} RESOURCES ${MODULE_PYTHON_RESOURCES} WITH_GENERIC_TESTS - ) - +) #----------------------------------------------------------------------------- -if(BUILD_TESTING) +if (BUILD_TESTING) # Register the unittest subclass in the main script as a ctest. # Note that the test will also be available at runtime. @@ -34,4 +34,4 @@ if(BUILD_TESTING) # Additional build-time testing add_subdirectory(Testing) -endif() +endif () diff --git a/AREG_CBCT/CMakeLists.txt b/AREG_CBCT/CMakeLists.txt index 40bc956..f53c445 100644 --- a/AREG_CBCT/CMakeLists.txt +++ b/AREG_CBCT/CMakeLists.txt @@ -9,11 +9,11 @@ SlicerMacroBuildScriptedCLI( set(FOLDER_LIBRARY AREG_CBCT_utils) set(MODULE_PYTHON_SCRIPTS -${FOLDER_LIBRARY}/__init__.py -${FOLDER_LIBRARY}/utils.py - ) + ${FOLDER_LIBRARY}/__init__.py + ${FOLDER_LIBRARY}/utils.py +) - slicerMacroBuildScriptedModule( - NAME ${FOLDER_LIBRARY} - SCRIPTS ${MODULE_PYTHON_SCRIPTS} +slicerMacroBuildScriptedModule( + NAME ${FOLDER_LIBRARY} + SCRIPTS ${MODULE_PYTHON_SCRIPTS} ) \ No newline at end of file diff --git a/AREG_IOS/CMakeLists.txt b/AREG_IOS/CMakeLists.txt index d12ddf2..b85013c 100644 --- a/AREG_IOS/CMakeLists.txt +++ b/AREG_IOS/CMakeLists.txt @@ -1,8 +1,6 @@ #----------------------------------------------------------------------------- set(MODULE_NAME AREG_IOS) - - SlicerMacroBuildScriptedCLI( NAME ${MODULE_NAME} ) @@ -10,20 +8,20 @@ SlicerMacroBuildScriptedCLI( set(FOLDER_LIBRARY AREG_IOS_utils) set(MODULE_PYTHON_SCRIPTS -${FOLDER_LIBRARY}/__init__.py -${FOLDER_LIBRARY}/dataset.py -${FOLDER_LIBRARY}/ICP.py -${FOLDER_LIBRARY}/net.py -${FOLDER_LIBRARY}/orientation.py -${FOLDER_LIBRARY}/post_process.py -${FOLDER_LIBRARY}/PredPatch.py -${FOLDER_LIBRARY}/transformation.py -${FOLDER_LIBRARY}/utils.py -${FOLDER_LIBRARY}/vtkSegTeeth.py + ${FOLDER_LIBRARY}/__init__.py + ${FOLDER_LIBRARY}/dataset.py + ${FOLDER_LIBRARY}/ICP.py + ${FOLDER_LIBRARY}/net.py + ${FOLDER_LIBRARY}/orientation.py + ${FOLDER_LIBRARY}/post_process.py + ${FOLDER_LIBRARY}/PredPatch.py + ${FOLDER_LIBRARY}/transformation.py + ${FOLDER_LIBRARY}/utils.py + ${FOLDER_LIBRARY}/vtkSegTeeth.py ) slicerMacroBuildScriptedModule( - NAME ${FOLDER_LIBRARY} + NAME ${FOLDER_LIBRARY} SCRIPTS ${MODULE_PYTHON_SCRIPTS} ) \ No newline at end of file diff --git a/ASO/ASO_Method/IOS_utils/__init__.py b/ASO/ASO_Method/IOS_utils/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/ASO/ASO_Method/__init__.py b/ASO/ASO_Method/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/ASO/CMakeLists.txt b/ASO/CMakeLists.txt index 1bbadd8..e9e912a 100644 --- a/ASO/CMakeLists.txt +++ b/ASO/CMakeLists.txt @@ -4,11 +4,13 @@ set(MODULE_NAME ASO) #----------------------------------------------------------------------------- set(MODULE_PYTHON_SCRIPTS ${MODULE_NAME}.py - ASP_Method/Method.py - ASP_Method/IOS.py - ASP_Method/CBCT.py - ASP_Method/Progress.py - ASP_Method/IOS_utils/Reader.py + ASO_Method/__init__.py + ASO_Method/CBCT.py + ASO_Method/IOS.py + ASO_Method/IOS_utils/__init__.py + ASO_Method/IOS_utils/Reader.py + ASO_Method/Method.py + ASO_Method/Progress.py ) set(MODULE_PYTHON_RESOURCES diff --git a/ASO_CBCT/CMakeLists.txt b/ASO_CBCT/CMakeLists.txt index f00a741..0d211e3 100644 --- a/ASO_CBCT/CMakeLists.txt +++ b/ASO_CBCT/CMakeLists.txt @@ -1,7 +1,4 @@ -add_subdirectory(ASO_CBCT_utils) add_subdirectory(PRE_ASO_CBCT) add_subdirectory(SEMI_ASO_CBCT) include(ImportLibrary.cmake) - - diff --git a/ASO_CBCT/ImportLibrary.cmake b/ASO_CBCT/ImportLibrary.cmake index cbc5d1d..18909de 100644 --- a/ASO_CBCT/ImportLibrary.cmake +++ b/ASO_CBCT/ImportLibrary.cmake @@ -3,15 +3,14 @@ set(MODULE_NAME ASO_CBCT_utils) #----------------------------------------------------------------------------- set(MODULE_PYTHON_SCRIPTS - ${MODULE_NAME}/__init__.py - ${MODULE_NAME}/Net.py - ${MODULE_NAME}/ResamplePreASO.py - ${MODULE_NAME}/utils.py - - ) + ${MODULE_NAME}/__init__.py + ${MODULE_NAME}/Net.py + ${MODULE_NAME}/ResamplePreASO.py + ${MODULE_NAME}/utils.py +) #----------------------------------------------------------------------------- slicerMacroBuildScriptedModule( NAME ${MODULE_NAME} SCRIPTS ${MODULE_PYTHON_SCRIPTS} - ) \ No newline at end of file +) diff --git a/ASO_IOS/CMakeLists.txt b/ASO_IOS/CMakeLists.txt index 87d6808..2d28c96 100644 --- a/ASO_IOS/CMakeLists.txt +++ b/ASO_IOS/CMakeLists.txt @@ -1,5 +1,3 @@ - add_subdirectory(PRE_ASO_IOS) add_subdirectory(SEMI_ASO_IOS) include(ImportLibrary.cmake) -add_subdirectory(ASO_IOS_utils) \ No newline at end of file diff --git a/ASO_IOS/ImportLibrary.cmake b/ASO_IOS/ImportLibrary.cmake index 8e97058..b33841c 100644 --- a/ASO_IOS/ImportLibrary.cmake +++ b/ASO_IOS/ImportLibrary.cmake @@ -3,17 +3,17 @@ set(MODULE_NAME ASO_IOS_utils) #----------------------------------------------------------------------------- set(MODULE_PYTHON_SCRIPTS -ASO_IOS_utils/__init__.py -ASO_IOS_utils/data_file.py -ASO_IOS_utils/icp.py -ASO_IOS_utils/OFFReader.py -ASO_IOS_utils/pre_icp.py -ASO_IOS_utils/transformation.py -ASO_IOS_utils/utils.py - ) + ${MODULE_NAME}/__init__.py + ${MODULE_NAME}/data_file.py + ${MODULE_NAME}/icp.py + ${MODULE_NAME}/OFFReader.py + ${MODULE_NAME}/pre_icp.py + ${MODULE_NAME}/transformation.py + ${MODULE_NAME}/utils.py +) #----------------------------------------------------------------------------- slicerMacroBuildScriptedModule( NAME ${MODULE_NAME} SCRIPTS ${MODULE_PYTHON_SCRIPTS} - ) \ No newline at end of file +) diff --git a/AutoCrop3D/Crop_Volumes_CLI/CMakeLists.txt b/AutoCrop3D/Crop_Volumes_CLI/CMakeLists.txt index 7cc4d2f..e64b809 100644 --- a/AutoCrop3D/Crop_Volumes_CLI/CMakeLists.txt +++ b/AutoCrop3D/Crop_Volumes_CLI/CMakeLists.txt @@ -3,18 +3,18 @@ set(MODULE_NAME AutoCrop3D_CLI) SlicerMacroBuildScriptedCLI( NAME ${MODULE_NAME} - ) +) set(FOLDER_LIBRARY Crop_Volumes_utils) set(MODULE_PYTHON_SCRIPTS -${FOLDER_LIBRARY}/__init__.py -${FOLDER_LIBRARY}/CropCBCT.py -${FOLDER_LIBRARY}/FilesType.py -${FOLDER_LIBRARY}/GenerateVTKfromSeg.py - ) + ${FOLDER_LIBRARY}/__init__.py + ${FOLDER_LIBRARY}/CropCBCT.py + ${FOLDER_LIBRARY}/FilesType.py + ${FOLDER_LIBRARY}/GenerateVTKfromSeg.py +) slicerMacroBuildScriptedModule( - NAME ${FOLDER_LIBRARY} + NAME ${FOLDER_LIBRARY} SCRIPTS ${MODULE_PYTHON_SCRIPTS} -) \ No newline at end of file +) diff --git a/AutoMatrix/CMakeLists.txt b/AutoMatrix/CMakeLists.txt index ac4fda2..e7068fa 100644 --- a/AutoMatrix/CMakeLists.txt +++ b/AutoMatrix/CMakeLists.txt @@ -8,12 +8,10 @@ set(MODULE_PYTHON_SCRIPTS ${FOLDER_LIBRARY}/General_tools.py ) - - set(MODULE_PYTHON_RESOURCES Resources/Icons/${MODULE_NAME}.png Resources/UI/${MODULE_NAME}.ui - ) +) #----------------------------------------------------------------------------- slicerMacroBuildScriptedModule( @@ -21,10 +19,10 @@ slicerMacroBuildScriptedModule( SCRIPTS ${MODULE_PYTHON_SCRIPTS} RESOURCES ${MODULE_PYTHON_RESOURCES} WITH_GENERIC_TESTS - ) +) #----------------------------------------------------------------------------- -if(BUILD_TESTING) +if (BUILD_TESTING) # Register the unittest subclass in the main script as a ctest. # Note that the test will also be available at runtime. @@ -32,4 +30,4 @@ if(BUILD_TESTING) # Additional build-time testing add_subdirectory(Testing) -endif() +endif () diff --git a/AutoMatrix/Method/__init__.py b/AutoMatrix/Method/__init__.py new file mode 100644 index 0000000..e69de29