Skip to content

Update slicer and slicer surface toolbox #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 17, 2025
Merged

Update slicer and slicer surface toolbox #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7ed9adf
ENH: Update Slicer from 5.3.0 to 5.9.0
jcfr Apr 7, 2025
3c17f61
ENH: Update Slicer backporting SlicerSurfaceToolbox's MeshAligment up…
jcfr Apr 7, 2025
79b692b
COMP: Update MeshToLabelMap for Slicer 5.9
vicory Apr 7, 2025
238c3c5
COMP: Update SlicerSALT for Slicer 5.9
vicory Apr 7, 2025
7361f6a
COMP: Disable unused WebServer module to workaround startup error
jcfr Apr 8, 2025
8f42616
ENH: Update Slicer backporting SlicerSurfaceToolbox's module updates
jcfr Apr 9, 2025
a289c16
STYLE: Facilitate review of bundled extensions in top-level CMakeLists
jcfr Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Applications/SlicerSALTApp/qSlicerSALTAppMainWindow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ void qSlicerSALTAppMainWindowPrivate::setupUi(QMainWindow * mainWindow)
this->ModuleToolBar->setVisible(false);
//this->ViewToolBar->setVisible(false);
//this->MouseModeToolBar->setVisible(false);
this->CaptureToolBar->setVisible(false);
// this->CaptureToolBar->setVisible(false);
//this->ViewersToolBar->setVisible(false);
this->DialogToolBar->setVisible(false);

Expand Down
24 changes: 22 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if(NOT DEFINED slicersources_SOURCE_DIR)
# Download Slicer sources and set variables slicersources_SOURCE_DIR and slicersources_BINARY_DIR
FetchContent_Populate(slicersources
GIT_REPOSITORY https://github.com/slicersalt/Slicer
GIT_TAG 51a608261c1dccd296793479f72f618c51610187 #slicersalt-v5.3.0-2023-06-17-c3d74d6
GIT_TAG 23a3bdb0e124d8c27d253fc3aa261b04c5810b94 # slicersalt-v5.9.0-2025-04-07-4eaa784567
GIT_PROGRESS 1
)
else()
Expand Down Expand Up @@ -140,6 +140,7 @@ set(Slicer_QTSCRIPTEDMODULES_DISABLED
LabelStatistics
PerformanceTests
VectorToScalarVolume
WebServer
)

# Enable/Disable Slicer custom modules: To create a new module, use the SlicerExtensionWizard.
Expand Down Expand Up @@ -194,7 +195,7 @@ set(${extension_name}_SOURCE_DIR "${CMAKE_BINARY_DIR}/${extension_name}")
FetchContent_Populate(${extension_name}
SOURCE_DIR ${${extension_name}_SOURCE_DIR}
GIT_REPOSITORY ${EP_GIT_PROTOCOL}://github.com/slicersalt/${extension_name}
GIT_TAG abba97578cf86a21e89a21b81be8bcc142f0e897
GIT_TAG 5c60a54b2dc0fb744c1a080928330de50f9f9983 # slicersalt-2024-06-14-5c60a54b2
GIT_PROGRESS 1
QUIET
)
Expand Down Expand Up @@ -409,6 +410,7 @@ list(APPEND Slicer_EXTENSION_SOURCE_DIRS ${${extension_name}_SOURCE_DIR})

#-----------------------------------------------------------------------------
# RegistrationBasedCorrespondence

set(RegistrationBasedCorrespondence_BUILD_TESTING OFF)
mark_as_superbuild(RegistrationBasedCorrespondence_BUILD_TESTING:BOOL)

Expand Down Expand Up @@ -443,6 +445,9 @@ if (UNIX AND NOT APPLE)
list(APPEND Slicer_EXTENSION_SOURCE_DIRS ${${extension_name}_SOURCE_DIR})
endif()

#-----------------------------------------------------------------------------
# SlicerDWD

set(SlicerDWD_BUILD_TESTING OFF)
mark_as_superbuild(SlicerDWD_BUILD_TESTING:BOOL)

Expand All @@ -457,6 +462,9 @@ FetchContent_Populate(${extension_name}
)
list(APPEND Slicer_EXTENSION_SOURCE_DIRS ${${extension_name}_SOURCE_DIR})

#-----------------------------------------------------------------------------
# SlicerPipelines

set(extension_name "SlicerPipelines")
set(${extension_name}_SOURCE_DIR "${CMAKE_BINARY_DIR}/${extension_name}")
FetchContent_Populate(${extension_name}
Expand All @@ -468,6 +476,9 @@ FetchContent_Populate(${extension_name}
)
list(APPEND Slicer_EXTENSION_SOURCE_DIRS ${${extension_name}_SOURCE_DIR})

#-----------------------------------------------------------------------------
# SlicerSurfaceLearner

set(extension_name "SlicerSurfaceLearner")
set(${extension_name}_SOURCE_DIR "${CMAKE_BINARY_DIR}/${extension_name}")
FetchContent_Populate(${extension_name}
Expand All @@ -479,6 +490,9 @@ FetchContent_Populate(${extension_name}
)
list(APPEND Slicer_EXTENSION_SOURCE_DIRS ${${extension_name}_SOURCE_DIR})

#-----------------------------------------------------------------------------
# SRepHypothesisTesting

set(extension_name "SRepHypothesisTesting")
set(${extension_name}_SOURCE_DIR "${CMAKE_BINARY_DIR}/${extension_name}")
FetchContent_Populate(${extension_name}
Expand All @@ -490,6 +504,9 @@ FetchContent_Populate(${extension_name}
)
list(APPEND Slicer_EXTENSION_SOURCE_DIRS ${${extension_name}_SOURCE_DIR})

#-----------------------------------------------------------------------------
# HierarchicalGeodesicModeling

set(extension_name "HierarchicalGeodesicModeling")
set(${extension_name}_SOURCE_DIR "${CMAKE_BINARY_DIR}/${extension_name}")
FetchContent_Populate(${extension_name}
Expand All @@ -501,6 +518,9 @@ FetchContent_Populate(${extension_name}
)
list(APPEND Slicer_EXTENSION_SOURCE_DIRS ${${extension_name}_SOURCE_DIR})

#-----------------------------------------------------------------------------
# DifferenceStatistics

set(extension_name "DifferenceStatistics")
set(${extension_name}_SOURCE_DIR "${CMAKE_BINARY_DIR}/${extension_name}")
FetchContent_Populate(${extension_name}
Expand Down