Changesets: Import 2017-06-07 23:51:09

master 9f2df718

2014-07-04 03:15:57

jcfr

Details Diff
ENH: Update dashboard driver to support customization using env variable

After a nightly or continuous dashboard starts, it not uncommon to
(1) first stop the script and then (2) manually edit the script and driver
script to skip the directory cleaning part and (3) finally, after
fixing something, relaunching the script.

This commit introduces the variable "run_ctest_with_disable_clean"
set to FALSE by default. It basically allows to explicitly disable the
cleaning step.

Finally, the macro "setOnlyIfNotDefined" has been updated to also
check if the variable name is set in the environment. For more details,
refer to the inlined comments. This will basically allow to restart a
nightly build without (1) cleaning the build directory
and (2) without having to edit the dashboard files.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23417 3bd1e089-480b-0410-8dfb-8563597acbee
mod - CMake/SlicerDashboardDriverScript.cmake Diff File

master 990d0500

2014-07-04 02:36:09

jcfr

Details Diff
COMP: Fix BRAINSTools configure error related to missing ITKVtkGlue

Commit Slicer/BRAINSTools@94d53a64:

//---------------
COMP: Conditionally specify ITK component "ITKVtkGlue" to fix Slicer build.

This commit conditionally append "ITKVtkGlue" to the list of components
introduced in commit 2c751a5. Considering that (1) Slicer does NOT build
the module BRAINSConstellationDetector and ConvertBetweenFileFormats
depending on "ITKVtkGlue" and (2) Slicer does NOT build ITK with
module ITKVtkGlue enabled, this commit will ensure BRAINSTools can
be built within Slicer.

Ideally, every module should specify the list of ITK components it expects.

To find out which module depended on "ITKVtkGlue", assuming the source of
ITKv4 are in /path/to/src/ITKv5, the following one-liner has been used:

cd /path/to/src/BRAINSTools

for i in `ls -d */`; do \
echo Directory [$i]; \
../ITKv4/Utilities/Maintenance/WhatModulesITK.py \
../ITKv4 $(find $i -type f) | ack -i ITKVtkGlue; \
done
//---------------

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23416 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild.cmake Diff File

master b5b6e3be

2014-07-03 21:34:31

jcfr

Details Diff
STYLE: Associate error message with MRML node attribute Get/Set/Remove func.

This commit removes the last assert from vtkMRMLNode implementation.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23415 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/Testing/vtkMRMLNodeTest1.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLNode.cxx Diff File

master bf5a7591

2014-07-03 21:34:28

jcfr

Details Diff
BUG: Restore original behavior of vtkMRMLNode reference functions

This commit continues what has been started in r23395, it basically reverts
the logic handling reference to the implementation existing prior to r23192.

It reverts all the changes (r23192, r23196) that were done to be
able to set/get a reference at a position N. But it keeps:
* the readability improvements to complete successfully. (r23193)
* the transition to smart pointer simplifying the code (r23191)
* changes done as part of r23192 and this commit fixing the
following tests:
- py_AtlasTests
- py_CompareVolumes
- py_SlicerMRBTest
- py_RSNAVisTutorial
- py_VolumeRenderingSceneClose
- py_Slicer4Minute


It fixes "py_SubjectHierarchyGenericSelfTest" crash that is reported in
issue 0003754 and was "related to MRML references. There are still one more
problem that is most likely related to the way SubjectHierarchySceneModel
deals with QModelIndex. See [1]

[1] https://www.assembla.com/spaces/slicerrt/tickets/598#/activity/ticket:

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23414 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/vtkMRMLNode.cxx Diff File

master f0f0df61

2014-07-03 21:34:23

jcfr

Details Diff
COMP: Move most of find_package calls into each Slicer sub-project.

To help address issue 0003741 [1], call to find_package associated to CTK,
DCMTK, ITK and SlicerExecutionModel have been moved in every Slicer
sub project, library or module expecting it.

This allows to reduce both the number of include directories and
the number of libraries passed to the compiler.

Moving forward, every Slicer sub project, library or module will be
responsible to call find_package (optionally specifying a list of
components) and (if it applies) include the associated "use file".

Note that call to find_package(VTK) is still done at the top-level, before
moving the call to the expected sub-directories, the CTKConfig.cmake
will have to be updated to call find_package(VTK) specifying the required
components where it is needed.

[1] http://na-mic.org/Mantis/view.php?id=3741

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23413 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/CLI/CMakeLists.txt Diff File
mod - Base/Logic/CMakeLists.txt Diff File
mod - Base/QTApp/CMakeLists.txt Diff File
mod - Base/QTCLI/CMakeLists.txt Diff File
mod - Base/QTCLI/Testing/CMakeLists.txt Diff File
mod - Base/QTCore/CMakeLists.txt Diff File
mod - Base/QTGUI/CMakeLists.txt Diff File
mod - CMake/SlicerMacroBuildBaseQtLibrary.cmake Diff File
mod - CMake/SlicerMacroPythonWrapModuleVTKLibrary.cmake Diff File
mod - CMake/vtkMacroKitPythonWrap.cmake Diff File
mod - CMakeLists.txt Diff File
mod - Extensions/Testing/CLIExtensionTemplate/CLIModuleTemplate/CMakeLists.txt Diff File
mod - Extensions/Testing/CLIExtensionTemplate/CLIModuleTemplate/Testing/Cxx/CMakeLists.txt Diff File
mod - Extensions/Testing/SuperBuildExtensionTemplate/SuperCLIModuleTemplate/CMakeLists.txt Diff File
mod - Extensions/Testing/SuperBuildExtensionTemplate/SuperCLIModuleTemplate/Testing/Cxx/CMakeLists.txt Diff File
mod - Libs/FreeSurfer/CMakeLists.txt Diff File
mod - Libs/ITKFactoryRegistration/CMakeLists.txt Diff File
mod - Libs/MGHImageIO/CMakeLists.txt Diff File
mod - Libs/MRML/CLI/CMakeLists.txt Diff File
mod - Libs/MRML/Core/CMakeLists.txt Diff File
mod - Libs/MRML/DisplayableManager/CMakeLists.txt Diff File
mod - Libs/MRML/IDImageIO/CMakeLists.txt Diff File
mod - Libs/MRML/Logic/CMakeLists.txt Diff File
mod - Libs/MRML/Logic/Testing/Cxx/CMakeLists.txt Diff File
mod - Libs/MRML/Widgets/CMakeLists.txt Diff File
mod - Libs/vtkITK/CMakeLists.txt Diff File
mod - Libs/vtkTeem/CMakeLists.txt Diff File
mod - Modules/CLI/ACPCTransform/CMakeLists.txt Diff File
mod - Modules/CLI/ACPCTransform/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/AddScalarVolumes/CMakeLists.txt Diff File
mod - Modules/CLI/AddScalarVolumes/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/AffineRegistration/CMakeLists.txt Diff File
mod - Modules/CLI/AffineRegistration/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/BSplineDeformableRegistration/CMakeLists.txt Diff File
mod - Modules/CLI/BSplineDeformableRegistration/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/BSplineToDeformationField/CMakeLists.txt Diff File
mod - Modules/CLI/BlobDetection/CMakeLists.txt Diff File
mod - Modules/CLI/BlobDetection/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/CMakeLists.txt Diff File
mod - Modules/CLI/CastScalarVolume/CMakeLists.txt Diff File
mod - Modules/CLI/CastScalarVolume/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/CheckerBoardFilter/CMakeLists.txt Diff File
mod - Modules/CLI/CheckerBoardFilter/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/ConnectedComponent/CMakeLists.txt Diff File
mod - Modules/CLI/ConnectedComponent/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/CreateDICOMSeries/CMakeLists.txt Diff File
mod - Modules/CLI/CreateDICOMSeries/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/CurvatureAnisotropicDiffusion/CMakeLists.txt Diff File
mod - Modules/CLI/CurvatureAnisotropicDiffusion/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/DTIImportExport/CMakeLists.txt Diff File
mod - Modules/CLI/DWIJointRicianLMMSEFilter/CMakeLists.txt Diff File
mod - Modules/CLI/DWIRicianLMMSEFilter/CMakeLists.txt Diff File
mod - Modules/CLI/DWIToDTIEstimation/CMakeLists.txt Diff File
mod - Modules/CLI/DWIToDTIEstimation/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/DWIUnbiasedNonLocalMeansFilter/CMakeLists.txt Diff File
mod - Modules/CLI/DiffusionTensorScalarMeasurements/CMakeLists.txt Diff File
mod - Modules/CLI/DiffusionTensorScalarMeasurements/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/DiffusionTensorTest/CMakeLists.txt Diff File
mod - Modules/CLI/DiffusionTensorTest/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/DiffusionWeightedVolumeMasking/CMakeLists.txt Diff File
mod - Modules/CLI/DiffusionWeightedVolumeMasking/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/ExecutionModelTour/CMakeLists.txt Diff File
mod - Modules/CLI/ExecutionModelTour/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/ExpertAutomatedRegistration/CMakeLists.txt Diff File
mod - Modules/CLI/ExtractSkeleton/CMakeLists.txt Diff File
mod - Modules/CLI/FiberBundleLabelSelect/CMakeLists.txt Diff File
mod - Modules/CLI/FiducialRegistration/CMakeLists.txt Diff File
mod - Modules/CLI/FiducialRegistration/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/FreesurferSurfaceSectionExtraction/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/GaussianBlurImageFilter/CMakeLists.txt Diff File
mod - Modules/CLI/GaussianBlurImageFilter/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/GradientAnisotropicDiffusion/CMakeLists.txt Diff File
mod - Modules/CLI/GradientAnisotropicDiffusion/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/GrayscaleFillHoleImageFilter/CMakeLists.txt Diff File
mod - Modules/CLI/GrayscaleFillHoleImageFilter/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/GrayscaleGrindPeakImageFilter/CMakeLists.txt Diff File
mod - Modules/CLI/GrayscaleGrindPeakImageFilter/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/GrayscaleModelMaker/CMakeLists.txt Diff File
mod - Modules/CLI/GrayscaleModelMaker/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/HistogramMatching/CMakeLists.txt Diff File
mod - Modules/CLI/HistogramMatching/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/ImageLabelCombine/CMakeLists.txt Diff File
mod - Modules/CLI/ImageLabelCombine/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/LabelMapSmoothing/CMakeLists.txt Diff File
mod - Modules/CLI/LabelMapSmoothing/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/LinearRegistration/CMakeLists.txt Diff File
mod - Modules/CLI/LinearRegistration/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/MRIBiasFieldCorrection/CMakeLists.txt Diff File
mod - Modules/CLI/MaskScalarVolume/CMakeLists.txt Diff File
mod - Modules/CLI/MaskScalarVolume/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/MedianImageFilter/CMakeLists.txt Diff File
mod - Modules/CLI/MedianImageFilter/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/MergeModels/CMakeLists.txt Diff File
mod - Modules/CLI/MergeModels/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/ModelMaker/CMakeLists.txt Diff File
mod - Modules/CLI/ModelMaker/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/ModelToLabelMap/CMakeLists.txt Diff File
mod - Modules/CLI/ModelToLabelMap/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/MultiResolutionAffineRegistration/CMakeLists.txt Diff File
mod - Modules/CLI/MultiResolutionAffineRegistration/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/MultiplyScalarVolumes/CMakeLists.txt Diff File
mod - Modules/CLI/MultiplyScalarVolumes/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/N4ITKBiasFieldCorrection/CMakeLists.txt Diff File
mod - Modules/CLI/N4ITKBiasFieldCorrection/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/OrientScalarVolume/CMakeLists.txt Diff File
mod - Modules/CLI/OrientScalarVolume/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/OtsuThresholdImageFilter/CMakeLists.txt Diff File
mod - Modules/CLI/OtsuThresholdImageFilter/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/OtsuThresholdSegmentation/CMakeLists.txt Diff File
mod - Modules/CLI/OtsuThresholdSegmentation/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/PETStandardUptakeValueComputation/CMakeLists.txt Diff File
mod - Modules/CLI/PETStandardUptakeValueComputation/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/ProbeVolumeWithModel/CMakeLists.txt Diff File
mod - Modules/CLI/ROITest/CMakeLists.txt Diff File
mod - Modules/CLI/ResampleDTIVolume/CMakeLists.txt Diff File
mod - Modules/CLI/ResampleDTIVolume/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/ResampleScalarVectorDWIVolume/CMakeLists.txt Diff File
mod - Modules/CLI/ResampleScalarVectorDWIVolume/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/ResampleScalarVolume/CMakeLists.txt Diff File
mod - Modules/CLI/ResampleScalarVolume/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/RigidRegistration/CMakeLists.txt Diff File
mod - Modules/CLI/RigidRegistration/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/RobustStatisticsSegmenter/CMakeLists.txt Diff File
mod - Modules/CLI/RobustStatisticsSegmenter/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/SimpleRegionGrowingSegmentation/CMakeLists.txt Diff File
mod - Modules/CLI/SimpleRegionGrowingSegmentation/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/SubtractScalarVolumes/CMakeLists.txt Diff File
mod - Modules/CLI/SubtractScalarVolumes/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/TestGridTransformRegistration/CMakeLists.txt Diff File
mod - Modules/CLI/TestGridTransformRegistration/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/ThresholdScalarVolume/CMakeLists.txt Diff File
mod - Modules/CLI/ThresholdScalarVolume/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/TractographyLabelMapSeeding/CMakeLists.txt Diff File
mod - Modules/CLI/TractographyLabelMapSeeding/Testing/CMakeLists.txt Diff File
mod - Modules/CLI/VotingBinaryHoleFillingImageFilter/CMakeLists.txt Diff File
mod - Modules/CLI/VotingBinaryHoleFillingImageFilter/Testing/CMakeLists.txt Diff File
mod - Modules/Core/CMakeLists.txt Diff File
mod - Modules/Loadable/TractographyDisplay/MRML/CMakeLists.txt Diff File
mod - Modules/Loadable/VolumeRendering/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/Volumes/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Scripted/EditorLib/Logic/CMakeLists.txt Diff File
mod - SuperBuild/External_ITKv4.cmake Diff File
mod - Utilities/Templates/Modules/CLI/CMakeLists.txt Diff File
mod - Utilities/Templates/Modules/CLI/Testing/Cxx/CMakeLists.txt Diff File

master 2dc292f2

2014-07-03 21:33:36

jcfr

Details Diff
COMP: Disable VTK find_package/use_file_include in sub directory.

Calling "find_package(VTK)/include(${VTK_USE_FILE})" in both the top-level
directory and sub-directories is undefined. Indeed, If we include
VTK_USE_FILE (UseVTK.cmake) in the top level then it is probably adding
the autoinit definitions to the COMPILE_DEFINITIONS directory property.
Then that inherits to the sub-directory and could conflict with any such
property defined there. Thanks to Brad King for his insight.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23412 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/CLI/CMakeLists.txt Diff File
mod - Libs/FreeSurfer/CMakeLists.txt Diff File
mod - Libs/MRML/Core/CMakeLists.txt Diff File
mod - Libs/MRML/IDImageIO/CMakeLists.txt Diff File
mod - Libs/RemoteIO/CMakeLists.txt Diff File
mod - Libs/vtkITK/CMakeLists.txt Diff File
mod - Libs/vtkTeem/CMakeLists.txt Diff File
mod - Modules/CLI/DiffusionWeightedVolumeMasking/CMakeLists.txt Diff File
mod - Modules/Loadable/TractographyDisplay/MRML/CMakeLists.txt Diff File

master 89226036

2014-07-03 21:33:30

jcfr

Details Diff
COMP: Shut-up CMake 3.0 warning for use of deprecated function by Teem

Waiting Teem gets ride of 'export_library_dependencies' and switches
to an export of targets, set policy CMP0033.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23411 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/vtkTeem/CMakeLists.txt Diff File

master 43e4168d

2014-07-03 14:18:27

naucoin

Details Diff
BUG: fix the path to the ruler scene file for test

Pass the Input data directory via the CMakeLists file on the command line.
Avoids the hard coded path that assumes a specific directory name for
the Slicer source code check out.

Issue 0003758


git-svn-id: http://svn.slicer.org/Slicer4/trunk@23410 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Annotations/Testing/Python/CMakeLists.txt Diff File
mod - Modules/Loadable/Annotations/Testing/Python/LoadAnnotationRulerScene.py Diff File

master 5a2cee77

2014-07-02 22:59:40

jcfr

Details Diff
COMP: Ensure that easy-install.pth is not concurrently updated. Fixes 0003757

Project that can NOT be built in parallel should set the
variable _EP_<projectName>_<lockname>_LOCK to 1.

For example, to address issue 0003757 and ensure that project
building and python module are not updating the file 'easy-install.pth'
concurrently, these project are setting the variable:

set(_EP_${proj}_SETUPTOOLS_LOCK 1)

Then, by calling the function "_ep_setup_lock", we are
sure that they won't be run in parallel.

Since "gitdb", "async" and "NUMPY" project are not updating easy-install.pth,
there is no need to "lock" them.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23409 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild.cmake Diff File
mod - SuperBuild/External_GitPython.cmake Diff File
mod - SuperBuild/External_PyGithub.cmake Diff File
mod - SuperBuild/External_SimpleITK.cmake Diff File
mod - SuperBuild/External_pydicom.cmake Diff File
mod - SuperBuild/External_python-chardet.cmake Diff File
mod - SuperBuild/External_python-smmap.cmake Diff File

master 59278def

2014-07-02 22:59:37

jcfr

Details Diff
COMP: Update python module external project to depend on setuptools

In an attempt to resolve 0003757, this commit systematically adds setuptools
as a dependency to external projects building and installing python
eggs.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23408 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild/External_NUMPY.cmake Diff File
mod - SuperBuild/External_SciPy.cmake Diff File
mod - SuperBuild/External_SimpleITK.cmake Diff File
mod - SuperBuild/External_pydicom.cmake Diff File

master 47469521

2014-07-02 20:56:35

lassoan

Details Diff
STYLE: Made vtkMRMLVolumeNode::SetAndObserveImageData description more accurate

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23407 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/vtkMRMLVolumeNode.h Diff File

master 273e71be

2014-07-02 16:44:13

pieper

Details Diff
ENH: move duplicated code into volumes logic

Both the Editor and LabelStatistics modules had code to check
that volume geometry matched for a label map. The duplicated
code is removed and there is a test in LabelStatistics.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23406 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Volumes/Logic/vtkSlicerVolumesLogic.cxx Diff File
mod - Modules/Loadable/Volumes/Logic/vtkSlicerVolumesLogic.h Diff File
mod - Modules/Scripted/EditorLib/HelperBox.py Diff File
mod - Modules/Scripted/LabelStatistics/CMakeLists.txt Diff File
mod - Modules/Scripted/LabelStatistics/LabelStatistics.py Diff File

master 229ed68c

2014-07-02 09:56:15

pinter

Details Diff
STYLE: Reduced debug messages related to subject hierarchy

Didn't delete them, just commented out, so that they can be restored when debugging plugin ownership changes and other issues.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23405 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/SubjectHierarchy/MRML/vtkMRMLSubjectHierarchyNode.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSceneSubjectHierarchyModel.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSubjectHierarchyTreeView.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/qSlicerSubjectHierarchyModule.cxx Diff File

master bc4a3533

2014-06-30 17:18:35

mwoehlke

Details Diff
COMP: Silence unused parameter warning

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23404 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTGUI/qSlicerExtensionsManagerWidget.cxx Diff File

master a486852a

2014-06-30 17:18:34

mwoehlke

Details Diff
ENH: Show messages while installing extension file

Tweak extension 'install from file' logic to catch and display (via
QMessageBox) any messages reported relevant to the install process. This
includes errors and the success message added in the previous commit.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23403 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTGUI/qSlicerExtensionsManagerWidget.cxx Diff File
mod - Base/QTGUI/qSlicerExtensionsManagerWidget.h Diff File

master 27a072d9

2014-06-30 17:18:33

mwoehlke

Details Diff
ENH: Add logging message for installed extension

Add helper to qSlicerExtensionsManagerModel to spit out info-level
logging messages from the same. Add such message on successful install
of an extension.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23402 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTCore/qSlicerExtensionsManagerModel.cxx Diff File

master 7fed1f7c

2014-06-30 17:18:32

mwoehlke

Details Diff
ENH: Add ability to install extension from file

Hook up 'install from file' action in extension manager. Create an
overload of qSlicerExtensionsManagerModel::installExtension taking only
an archive file name, which uses the new list_archive method to
determine the extension name and then hands off to the existing method.
Modify the existing overload to cope with the lack of server metadata
that occurs in this case, and to fill in a sufficient subset from common
information (i.e. the os/arch/revision of currently running Slicer) and
the description file provided in the extension archive.

This should allow users to install extensions from externally obtained
archives of the same (e.g. manually downloading from the server with an
external web browser).

Issue 0002145

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23401 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTCore/qSlicerExtensionsManagerModel.cxx Diff File
mod - Base/QTCore/qSlicerExtensionsManagerModel.h Diff File
mod - Base/QTGUI/qSlicerExtensionsManagerWidget.cxx Diff File
mod - Base/QTGUI/qSlicerExtensionsManagerWidget.h Diff File

master 59cd6731

2014-06-30 17:18:31

mwoehlke

Details Diff
BUG: Correctly encode archive file name

Use qPrintable() (which uses QString::toLocal8Bit() under the hood) to
encode the QString archive file name to char const* for passing to
extract_tar, rather than QString::toLatin1(), which is unlikely to
produce the correct bytes (the underlying system calls are more likely
to want system locale encoding) in case of a non-ASCII file name.

This sort of thing appears to be endemic to Slicer, but I don't care to
propagate that to the forthcoming call to list_archive(); thus, making
it consistent in this file at least.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23400 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTCore/qSlicerExtensionsManagerModel.cxx Diff File

master 4c3b1f9f

2014-06-30 17:18:30

mwoehlke

Details Diff
ENH: Add function to list archives

Add a function to vtkArchive.cxx to obtain the list of files in an
archive without extracting the archive. Also, fix parameter name in
(misnamed) extract_tar to make at least some kind of sense.
("archiveFileName", as in list_archive(), would be better, since
extract_tar likewise works on non-tar archives, but for now leaving it
consistent with the function name.)

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23399 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/Logic/Testing/vtkArchiveTest1.cxx Diff File
mod - Base/QTGUI/qSlicerExtensionsManagerWidget.cxx Diff File
mod - Libs/MRML/Logic/vtkArchive.cxx Diff File
mod - Libs/MRML/Logic/vtkArchive.h Diff File

master fc739771

2014-06-30 17:18:28

mwoehlke

Details Diff
ENH: Initial refactoring of extension manager UI

Refactor right corner area of extension manager into a .ui file, similar
to how the left corner area (navigation buttons) is already handled.
This allows us to have separate search widgets per tab (allowing for
independent search states, if/when support for searching installed
extensions is added), and also to add a 'configure' button (which we do)
that provides independent menus per tab.

The menus are created, but not yet functional. Icons (from the Public
Domain Tango theme) are also added. (The 'check for updates' icon uses
the theme pixmaps. Tango does not provide a 'configure' icon as such, so
the modified svg from which the pixmaps were generated is also being
committed.)

Issue 0002089
Issue 0002145

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23398 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTGUI/CMakeLists.txt Diff File
add - Base/QTGUI/Resources/Icons/Large/SlicerCheckForUpdates.png Diff File
add - Base/QTGUI/Resources/Icons/Large/SlicerConfigure.png Diff File
add - Base/QTGUI/Resources/Icons/Medium/SlicerCheckForUpdates.png Diff File
add - Base/QTGUI/Resources/Icons/Medium/SlicerConfigure.png Diff File
add - Base/QTGUI/Resources/Icons/Scalable/SlicerConfigure.svg Diff File
add - Base/QTGUI/Resources/Icons/Small/SlicerCheckForUpdates.png Diff File
add - Base/QTGUI/Resources/Icons/Small/SlicerConfigure.png Diff File
add - Base/QTGUI/Resources/Icons/XLarge/SlicerCheckForUpdates.png Diff File
add - Base/QTGUI/Resources/Icons/XLarge/SlicerConfigure.png Diff File
add - Base/QTGUI/Resources/Icons/XSmall/SlicerCheckForUpdates.png Diff File
add - Base/QTGUI/Resources/Icons/XSmall/SlicerConfigure.png Diff File
mod - Base/QTGUI/Resources/UI/qSlicerExtensionsActionsWidget.ui Diff File
mod - Base/QTGUI/Resources/UI/qSlicerExtensionsManagerWidget.ui Diff File
add - Base/QTGUI/Resources/UI/qSlicerExtensionsToolsWidget.ui Diff File
mod - Base/QTGUI/qSlicerExtensionsManagerWidget.cxx Diff File

master fa1e1c31

2014-06-30 09:55:44

jcfr

Details Diff
COMP: Fix test to work with restored "Set(AndObserve)NthNodeReference" funcs

This commit integrates the remaining of the test updates required for
commit r23395.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23397 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/Testing/vtkMRMLNodeTest1.cxx Diff File

master 07baa8ce

2014-06-30 09:18:21

jcfr

Details Diff
COMP: Remove unused CLIs MIDASApplications and BatchMakeApplications

See 0003401

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23396 3bd1e089-480b-0410-8dfb-8563597acbee
mod - CMake/CTestCustom.cmake.in Diff File
mod - CMake/SlicerBlockCTKAppLauncherSettings.cmake Diff File
mod - CMake/SlicerBlockInstallCMakeProjects.cmake Diff File
mod - CMake/SlicerCPack.cmake Diff File
mod - CMake/SlicerCPackBundleFixup.cmake.in Diff File
mod - CMake/SlicerConfig.cmake.in Diff File
mod - CMake/SlicerGenerateSlicerConfig.cmake Diff File
mod - CMake/SlicerInstallConfig.cmake.in Diff File
mod - CMake/vtkSlicerConfigure.h.in Diff File
mod - CMakeLists.txt Diff File
rm - Modules/CLI/BatchMakeApplications/CMakeLists.txt Diff File
rm - Modules/CLI/BatchMakeApplications/DiffusionTensorEstimationBatchMakeModule/CMakeLists.txt Diff File
rm - Modules/CLI/BatchMakeApplications/DiffusionTensorEstimationBatchMakeModule/DiffusionTensorEstimation.bmm.in Diff File
rm - Modules/CLI/BatchMakeApplications/DiffusionTensorEstimationBatchMakeModule/DiffusionTensorEstimationBatchMakeModule.cxx Diff File
rm - Modules/CLI/BatchMakeApplications/DiffusionTensorEstimationBatchMakeModule/DiffusionTensorEstimationBatchMakeModule.xml Diff File
rm - Modules/CLI/BatchMakeApplications/DiffusionTensorEstimationBatchMakeModule/SlicerBatchMakeConfig.h.in Diff File
rm - Modules/CLI/BatchMakeApplications/EMSegmentBatchMakeModule/CMakeLists.txt Diff File
rm - Modules/CLI/BatchMakeApplications/EMSegmentBatchMakeModule/EMSegmentBatchMakeModule.cxx Diff File
rm - Modules/CLI/BatchMakeApplications/EMSegmentBatchMakeModule/EMSegmentBatchMakeModule.xml Diff File
rm - Modules/CLI/BatchMakeApplications/EMSegmentBatchMakeModule/EMSegmentBatchMakeModuleLogo.h Diff File
rm - Modules/CLI/BatchMakeApplications/EMSegmentBatchMakeModule/EMSegmentBatchMakeModuleLogo.png Diff File
rm - Modules/CLI/BatchMakeApplications/EMSegmentBatchMakeModule/EMSegmentCommandLine_GUIVersion.bmm.in Diff File
rm - Modules/CLI/BatchMakeApplications/EMSegmentBatchMakeModule/SlicerBatchMakeConfig.h.in Diff File
rm - Modules/CLI/BatchMakeApplications/GaussianBlurBatchMakeModule/CMakeLists.txt Diff File
rm - Modules/CLI/BatchMakeApplications/GaussianBlurBatchMakeModule/GaussianBlurBatchMakeModule.cxx Diff File
rm - Modules/CLI/BatchMakeApplications/GaussianBlurBatchMakeModule/GaussianBlurBatchMakeModule.xml Diff File
rm - Modules/CLI/BatchMakeApplications/GaussianBlurBatchMakeModule/GaussianBlurBatchMakeModuleLogo.h Diff File
rm - Modules/CLI/BatchMakeApplications/GaussianBlurBatchMakeModule/GaussianBlurBatchMakeModuleLogo.png Diff File
rm - Modules/CLI/BatchMakeApplications/GaussianBlurBatchMakeModule/GaussianBlurImageFilter.bmm.in Diff File
rm - Modules/CLI/BatchMakeApplications/GaussianBlurBatchMakeModule/SlicerBatchMakeConfig.h.in Diff File
rm - Modules/CLI/BatchMakeApplications/GenericBatchMakeModule/BatchMakeModule.cxx Diff File
rm - Modules/CLI/BatchMakeApplications/GenericBatchMakeModule/BatchMakeModuleConfig.h.in Diff File
rm - Modules/CLI/BatchMakeApplications/RegisterImagesBatchMakeModule/CMakeLists.txt Diff File
rm - Modules/CLI/BatchMakeApplications/RegisterImagesBatchMakeModule/RegisterImagesBatchMakeModule.xml Diff File
rm - Modules/CLI/BatchMakeApplications/ResampleVolumeBatchMakeModule/CMakeLists.txt Diff File
rm - Modules/CLI/BatchMakeApplications/ResampleVolumeBatchMakeModule/ResampleVolumeBatchMake.xml Diff File
rm - Modules/CLI/BatchMakeApplications/bmGridSend.bmm.in Diff File
rm - Modules/CLI/BatchMakeApplications/bmGridStore.bmm.in Diff File
rm - Modules/CLI/BatchMakeApplications/bmSliceExtractor.bmm.in Diff File
mod - Modules/CLI/CMakeLists.txt Diff File
rm - Modules/CLI/MIDASApplications/CMakeLists.txt Diff File
rm - Modules/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt Diff File
rm - Modules/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx Diff File
rm - Modules/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.xml Diff File
mod - SuperBuild.cmake Diff File
rm - SuperBuild/External_BatchMake.cmake Diff File

master 5963e8b1

2014-06-30 02:53:04

jcfr

Details Diff
BUG: Restore original behavior of "Set(AndObserve)NthNodeReference" functions

This commit fixes test vtkSlicerUnitsLogicTest1 by partially reverting
commit r23192.

It restores the original behavior of the "Set(AndObserve)NthNodeReference"
functions. Instead of ensuring reference can be set and get at position
n, if n is larger than the number of reference nodes, the node ID
is added at the end of the list. If nodeReferenceID is 0, the node ID is
removed from the list.

Fixes 0003708

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23395 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/Testing/vtkMRMLNodeTest1.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLNode.h Diff File

master 508f4321

2014-06-30 02:53:01

jcfr

Details Diff
STYLE: Add *.pyc files to .gitignore

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23394 3bd1e089-480b-0410-8dfb-8563597acbee
mod - .gitignore Diff File

master f90f789e

2014-06-28 10:00:21

jcfr

Details Diff
COMP: Update ITKv4 - Fix "unused-local-typedefs" warning

This commit fixes the following warning in FiducialRegistration:

// -------
In file included from /path/to/ITKv4/Modules/Core/Transform/include/itkLandmarkBasedTransformInitializer.h:188:0,
from /path/to/Slicer/Modules/CLI/FiducialRegistration/FiducialRegistration.cxx:7:
/path/to/ITKv4/Modules/Core/Transform/include/itkLandmarkBasedTransformInitializer.hxx: In member function ‘void itk::LandmarkBasedTransformInitializer<TTransform, TFixedImage, TMovingImage>::InternalInitializeTransform(itk::LandmarkBasedTransformInitializer<TTransform, TFixedImage, TMovingImage>::VersorRigid3DTransformType*)’:
/path/to/ITKv4/Modules/Core/Transform/include/itkLandmarkBasedTransformInitializer.hxx:252:65: warning: typedef ‘RotationCenterType’ locally defined but not used [-Wunused-local-typedefs]
typedef typename VersorRigid3DTransformType::CenterType RotationCenterType;
// -------


$ git shortlog 79ec70b..3307a27
Jean-Christophe Fillion-Robin (1):
COMP: Fix "unused-local-typedefs" warning in LandmarkBasedTransformInitializer

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23393 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild/External_ITKv4.cmake Diff File
 First  Prev  1 2 3 ... 10 ... 20 ... 30 ... 40 ... 50 ... 60 ... 70 ... 80 ... 90 ... 100 ... 103 104 105 106 107 108 109 110 ... 120 ... 130 ... 133 134 135  Next  Last