From d98ebdeec1552ffc78b54821e6cdc9379e4ddd5c Mon Sep 17 00:00:00 2001 From: Andras Lasso Date: Thu, 3 Aug 2023 00:32:53 -0400 Subject: [PATCH] BUG: Fix unselectable "Generic (rigid)" preset If the user selected "Generic (rigid)" preset, the selection was reverted to "generic (all)" due identifier of the rigid and deformable presets were the same ("default0"). Fixed by setting rigid preset name to "default-rigid". Also made advanced section collapsed by default. --- .../ElastixParameterSetDatabase.xml | 2 +- Elastix/Resources/UI/Elastix.ui | 1460 +++++++++-------- 2 files changed, 734 insertions(+), 728 deletions(-) diff --git a/Elastix/Resources/RegistrationParameters/ElastixParameterSetDatabase.xml b/Elastix/Resources/RegistrationParameters/ElastixParameterSetDatabase.xml index aa97438..66e8fa6 100644 --- a/Elastix/Resources/RegistrationParameters/ElastixParameterSetDatabase.xml +++ b/Elastix/Resources/RegistrationParameters/ElastixParameterSetDatabase.xml @@ -10,7 +10,7 @@ - - - Elastix - - - - 0 - 0 - 391 - 790 - - - - - 0 - 0 - - - - - - - Parameter set - - - false - - - - - - Parameter Set: - - - - - - - - vtkMRMLScriptedModuleNode - - - - true - - - - - - ElastixParameters - - - true - - - - - - - - - - - - - Pick input volume sequence. Each time point will be registered to the fixed frame. - - - Inputs - - - false - - - - - - Fixed volume: - - - - - - - true - - - The moving volume will be transformed into this image space. - - - - vtkMRMLScalarVolumeNode - - - - false - - - - - - - - - false - - - false - - - false - - - true - - - - - - - - - - Moving volume: - - - - - - - true - - - This volume will be transformed into the fixed image space - - - - vtkMRMLScalarVolumeNode - - - - false - - - - - - - - - false - - - false - - - false - - - true - - - - - - - - - - - - - Preset: - - - - - - - - - - Masking - - - true - - - - - - Fixed volume mask: - - - - - - - Areas of the fixed volume where mask label is 0 will be ignored in the registration. - - - - vtkMRMLLabelMapVolumeNode - - - - false - - - - - - true - - - false - - - false - - - - - - true - - - - - - - Areas of the moving volume where mask label is 0 will be ignored in the registration - - - - vtkMRMLLabelMapVolumeNode - - - - false - - - - - - true - - - false - - - false - - - - - - - - - - Moving volume mask: - - - - - - - - - - Outputs - - - - - - Output volume: - - - - - - - Output transform: - - - - - - - (optional) The moving image warped to the fixed image space. NOTE: You must set at least one output object (transform and/or output volume) - - - - vtkMRMLScalarVolumeNode - - - - false - - - - - - true - - - true - - - - - - - - - - (optional) Computed displacement field that transform nodes from moving volume space to fixed volume space. NOTE: You must set at least one output object (transform and/or output volume). - - - - vtkMRMLTransformNode - - - - - - - true - - - true - - - - - - - - - - - - - Advanced - - - false - - - - - - Force grid output transform: - - - - - - - If this checkbox is checked then computed transform will be always returned as a grid transform (displacement field). - - - - - - - - - - Show detailed log during registration. - - - Show detailed log during registration: - - - - - - - Show detailed log during registration. - - - - - - - - - - Keep temporary files (inputs, computed outputs, logs) after the registration is completed. - - - Keep temporary files: - - - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - Keep temporary files (inputs, computed outputs, logs) after the registration is completed. - - - - - - - - - - Open the folder where temporary files are stored. - - - Show temp folder - - - - - - - - - - Registration presets: - - - - - - - Open the folder where temporary files are stored. - - - Show database folder - - - - - - - Custom Elastix toolbox location: - - - - - - - Set bin directory of an Elastix installation (where elastix executable is located). " - "If value is empty then default elastix (bundled with SlicerElastix extension) will be used. - - - ctkPathLineEdit::Dirs|ctkPathLineEdit::Executable|ctkPathLineEdit::NoDot|ctkPathLineEdit::NoDotDot|ctkPathLineEdit::Readable - - - - - - - Initial transform: - - - - - - - Start the registration from the selected initial transform. - - - - vtkMRMLTransformNode - vtkMRMLLinearTransformNode - - - - false - - - - - - true - - - false - - - - - - true - - - - - - - - - - false - - - Run the algorithm. - - - QPushButton { - font: 16px; -} - - - Apply - - - - - - - Qt::TextSelectableByMouse - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 20 - 40 - - - - - - - - - ctkCollapsibleButton - QWidget -
ctkCollapsibleButton.h
- 1 - - - ctkPathLineEdit - QWidget -
ctkPathLineEdit.h
- - - qMRMLNodeComboBox - QWidget -
qMRMLNodeComboBox.h
- 1 - - - qMRMLWidget - QWidget -
qMRMLWidget.h
- 1 - - - - - - Elastix - mrmlSceneChanged(vtkMRMLScene*) - fixedVolumeSelector - setMRMLScene(vtkMRMLScene*) - - - 314 - 381 - - - 365 - 104 - - - - - Elastix - mrmlSceneChanged(vtkMRMLScene*) - fixedVolumeMaskSelector - setMRMLScene(vtkMRMLScene*) - - - 314 - 381 - - - 383 - 206 - - - - - Elastix - mrmlSceneChanged(vtkMRMLScene*) - movingVolumeMaskSelector - setMRMLScene(vtkMRMLScene*) - - - 314 - 381 - - - 383 - 210 - - - - - Elastix - mrmlSceneChanged(vtkMRMLScene*) - movingVolumeSelector - setMRMLScene(vtkMRMLScene*) - - - 314 - 381 - - - 365 - 131 - - - - - Elastix - mrmlSceneChanged(vtkMRMLScene*) - parameterNodeSelector - setMRMLScene(vtkMRMLScene*) - - - 314 - 381 - - - 361 - 45 - - - - - Elastix - mrmlSceneChanged(vtkMRMLScene*) - outputTransformSelector - setMRMLScene(vtkMRMLScene*) - - - 314 - 381 - - - 372 - 285 - - - - - Elastix - mrmlSceneChanged(vtkMRMLScene*) - outputVolumeSelector - setMRMLScene(vtkMRMLScene*) - - - 314 - 381 - - - 372 - 258 - - - - - Elastix - mrmlSceneChanged(vtkMRMLScene*) - initialTransformSelector - setMRMLScene(vtkMRMLScene*) - - - 314 - 381 - - - 429 - 478 - - - - - + + + Elastix + + + + 0 + 0 + 391 + 790 + + + + + 0 + 0 + + + + + + + Parameter set + + + false + + + + + + Parameter Set: + + + + + + + + vtkMRMLScriptedModuleNode + + + + true + + + + + + ElastixParameters + + + true + + + + + + + + + + + + + Pick input volume sequence. Each time point will be registered to the fixed frame. + + + Inputs + + + false + + + + + + Fixed volume: + + + + + + + true + + + The moving volume will be transformed into this image space. + + + + vtkMRMLScalarVolumeNode + + + + false + + + + + + + + + false + + + false + + + false + + + true + + + + + + + + + + Moving volume: + + + + + + + true + + + This volume will be transformed into the fixed image space + + + + vtkMRMLScalarVolumeNode + + + + false + + + + + + + + + false + + + false + + + false + + + true + + + + + + + + + + + + + Preset: + + + + + + + + + + Masking + + + true + + + + + + Fixed volume mask: + + + + + + + Areas of the fixed volume where mask label is 0 will be ignored in the registration. + + + + vtkMRMLLabelMapVolumeNode + + + + false + + + + + + true + + + false + + + false + + + + + + true + + + + + + + Areas of the moving volume where mask label is 0 will be ignored in the registration + + + + vtkMRMLLabelMapVolumeNode + + + + false + + + + + + true + + + false + + + false + + + + + + + + + + Moving volume mask: + + + + + + + + + + Outputs + + + + + + Output volume: + + + + + + + Output transform: + + + + + + + (optional) The moving image warped to the fixed image space. NOTE: You must set at least one output object (transform and/or output volume) + + + + vtkMRMLScalarVolumeNode + + + + false + + + + + + true + + + true + + + + + + + + + + (optional) Computed displacement field that transform nodes from moving volume space to fixed volume space. NOTE: You must set at least one output object (transform and/or output volume). + + + + vtkMRMLTransformNode + + + + + + + true + + + true + + + + + + + + + + + + + Advanced + + + true + + + + + + Force grid output transform: + + + + + + + If this checkbox is checked then computed transform will be always returned as a grid transform (displacement field). + + + + + + + + + + Show detailed log during registration. + + + Show detailed log during registration: + + + + + + + Show detailed log during registration. + + + + + + + + + + Keep temporary files (inputs, computed outputs, logs) after the registration is completed. + + + Keep temporary files: + + + + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + Keep temporary files (inputs, computed outputs, logs) after the registration is completed. + + + + + + + + + + Open the folder where temporary files are stored. + + + Show temp folder + + + + + + + + + + Registration presets: + + + + + + + Open the folder where temporary files are stored. + + + Show database folder + + + + + + + Custom Elastix toolbox location: + + + + + + + Set bin directory of an Elastix installation (where elastix executable is located). " + "If value is empty then default elastix (bundled with SlicerElastix extension) will be used. + + + ctkPathLineEdit::Dirs|ctkPathLineEdit::Executable|ctkPathLineEdit::NoDot|ctkPathLineEdit::NoDotDot|ctkPathLineEdit::Readable + + + + + + + Initial transform: + + + + + + + Start the registration from the selected initial transform. + + + + vtkMRMLTransformNode + vtkMRMLLinearTransformNode + + + + false + + + + + + true + + + false + + + + + + true + + + + + + + + + + false + + + Run the algorithm. + + + QPushButton { + font: 16px; +} + + + Apply + + + true + + + true + + + + + + + Qt::TextSelectableByMouse + + + true + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 40 + + + + + + + + + ctkCollapsibleButton + QWidget +
ctkCollapsibleButton.h
+ 1 + + + ctkPathLineEdit + QWidget +
ctkPathLineEdit.h
+ + + qMRMLNodeComboBox + QWidget +
qMRMLNodeComboBox.h
+ 1 + + + qMRMLWidget + QWidget +
qMRMLWidget.h
+ 1 + + + + + + Elastix + mrmlSceneChanged(vtkMRMLScene*) + fixedVolumeSelector + setMRMLScene(vtkMRMLScene*) + + + 314 + 381 + + + 365 + 104 + + + + + Elastix + mrmlSceneChanged(vtkMRMLScene*) + fixedVolumeMaskSelector + setMRMLScene(vtkMRMLScene*) + + + 314 + 381 + + + 383 + 206 + + + + + Elastix + mrmlSceneChanged(vtkMRMLScene*) + movingVolumeMaskSelector + setMRMLScene(vtkMRMLScene*) + + + 314 + 381 + + + 383 + 210 + + + + + Elastix + mrmlSceneChanged(vtkMRMLScene*) + movingVolumeSelector + setMRMLScene(vtkMRMLScene*) + + + 314 + 381 + + + 365 + 131 + + + + + Elastix + mrmlSceneChanged(vtkMRMLScene*) + parameterNodeSelector + setMRMLScene(vtkMRMLScene*) + + + 314 + 381 + + + 361 + 45 + + + + + Elastix + mrmlSceneChanged(vtkMRMLScene*) + outputTransformSelector + setMRMLScene(vtkMRMLScene*) + + + 314 + 381 + + + 372 + 285 + + + + + Elastix + mrmlSceneChanged(vtkMRMLScene*) + outputVolumeSelector + setMRMLScene(vtkMRMLScene*) + + + 314 + 381 + + + 372 + 258 + + + + + Elastix + mrmlSceneChanged(vtkMRMLScene*) + initialTransformSelector + setMRMLScene(vtkMRMLScene*) + + + 314 + 381 + + + 429 + 478 + + + + +