Slicer merge requestshttps://gitlab.kitware.com/sjh26/Slicer/-/merge_requests2011-07-28T11:07:45-04:00https://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/1Fix ITKv4 missing header.2011-07-28T11:07:45-04:00Hans JohnsonFix ITKv4 missing header.A header file was missing in two files when ITKv4 is compiled.
A header file was missing in two files when ITKv4 is compiled.
https://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/2Testing directory was required relative to execute directory2011-07-28T11:13:38-04:00Hans JohnsonTesting directory was required relative to execute directoryWhen testing, this was failing because the execute directory did not have a "tmp" subdirectory.
By changing to the default "/tmp" directory, failures do not occur with verbose testing turned on.
When testing, this was failing because the execute directory did not have a "tmp" subdirectory.
By changing to the default "/tmp" directory, failures do not occur with verbose testing turned on.
https://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/3Merges with Slicer trunk for conditional ITKv4 build in Superbuild system.2011-07-28T21:07:37-04:00Hans JohnsonMerges with Slicer trunk for conditional ITKv4 build in Superbuild system.I have just completed creating a patchset for slicer that builds against ITKv4 (from a few days ago), and is NOT using the ITKv3 compatibility options.
This patchset adds a new cmake option: Slicer_BUILD_WITH_ITKv4:BOOL=[ON|OFF] with t...I have just completed creating a patchset for slicer that builds against ITKv4 (from a few days ago), and is NOT using the ITKv3 compatibility options.
This patchset adds a new cmake option: Slicer_BUILD_WITH_ITKv4:BOOL=[ON|OFF] with the default setting to off. When ITKv4 is set to ON, SimpleITK is also built, but it is currently NOT integrated very well into the slicer environment.
I then built both the ITKv3 and the ITKv4 versions from the one common source tree.
In both build scenarios, the following tests failed in both cases (and only the following cases).
The following tests FAILED:
96 - vtkMRMLSceneTest2_helixGlyphs.mrml (Failed)
97 - vtkMRMLSceneTest2_helix_roi_tract.mrml (Failed)
100 - vtkMRMLSceneTest2_name.mrml (Failed)
101 - vtkMRMLSceneTest2_SlicePipeline.mrml (Failed)
103 - vtkMRMLSceneTest2_vol_and_cube_camera.mrml (Failed)
104 - vtkMRMLSceneTest2_vol_and_cube.mrml (Failed)
105 - vtkMRMLSceneTest2_vol.mrml (Failed)
106 - vtkMRMLSceneTest2_volRender.mrml (Failed)
107 - vtkMRMLSceneTest2_volScene.mrml (Failed)
174 - vtkDataIOManagerLogicTest1 (Failed)
228 - qSlicerAnnotationsModuleTest1 (Failed)
236 - qSlicerDiffusionTensorVolumeDisplayWidgetTest1 (Failed)
245 - qSlicerVolumeRenderingModuleTest1 (Failed)
246 - qSlicerVolumeRenderingModuleWidgetTest1 (Failed)
247 - qSlicerVolumeRenderingModuleWidgetTest2 (Failed)
Errors while running CTest
https://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/520110821 addb42011-08-21T16:25:53-04:00Hans Johnson20110821 addb4JC and Julien,
I have addressed all the issues that each of you posed in earlier pull requests.
This set of patches addresses several problems I ran into while making a version of ITKv3 and ITKv4 versions of Slicer4 that also resurect ...JC and Julien,
I have addressed all the issues that each of you posed in earlier pull requests.
This set of patches addresses several problems I ran into while making a version of ITKv3 and ITKv4 versions of Slicer4 that also resurect the BRAINSTools integration.
I've successfully built both ITKv3 and ITKv4 versions from the same source tree, and verified that the same tests pass/fail on both versions. (qSlicerAnnotationModuleTest1 and qSlicerVolumeRenderingModuleTest1 fail in both cases, but that is unrelated to this work).
I feel that this version is ready to be merged into Slicer, and can do that soon. I just wanted to give you the opportunity to evaluate this set of patches before I submit, but since this has been mostly reviewed in previous e-mails, I do plant to submit late tonight so that I can address the dashboards early tomorrow morning.
PS: Ron K. is interested in getting BRAINSTools back into the normal build cycle right away, so that is why I want to get this pushed in as soon as possible so that he can work on tutorials and other marketing again.
Regards,
Hans
https://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/8ENH: make CLI shared modules globally optional2012-04-25T22:55:37-04:00IsaiahENH: make CLI shared modules globally optionalhttps://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/13COMP: consistently pass chosen compilers to sub-builds2012-05-08T16:41:34-04:00Sam HorvathCOMP: consistently pass chosen compilers to sub-builds*Created by: Chaircrusher*
There was trouble with building Slicer with a compiler other than the system-default compiler, because the CMAKE_C_COMPILER and CMAKE_CXX_COMPILER variables weren't being passed to external project builds.
*Created by: Chaircrusher*
There was trouble with building Slicer with a compiler other than the system-default compiler, because the CMAKE_C_COMPILER and CMAKE_CXX_COMPILER variables weren't being passed to external project builds.
https://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/20Fix fortran compilations2012-07-18T00:16:26-04:00Hans JohnsonFix fortran compilationsPropogate compiler flags from CMake.
Propogate compiler flags from CMake.
https://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/19Fix compiler propogation and update it kv42012-07-18T00:20:21-04:00Hans JohnsonFix compiler propogation and update it kv4I can dcommit this to svn once you approve it.
I can dcommit this to svn once you approve it.
https://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/14COMP: Fix VTK ExternalProject build with Ninja generator.2012-07-18T23:27:42-04:00thewtexCOMP: Fix VTK ExternalProject build with Ninja generator.This fixes the passing of the build command, e.g. "ninja", when not using the
'Unix Makefile' generator for the "make" command on unix, to the VTK external
build.
This fixes the passing of the build command, e.g. "ninja", when not using the
'Unix Makefile' generator for the "make" command on unix, to the VTK external
build.
https://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/23COMP: Add DWIConvert as a CLI Module2012-09-11T14:24:02-04:00Sam HorvathCOMP: Add DWIConvert as a CLI Module*Created by: Chaircrusher*
DWIConvert is a compatible replacement for DicomToNrrdConverter. This patch uses CMake's ExternalProject to download the source code from
https://github.com/Chaircrusher/NewDicomToNrrdConverter
and build i...*Created by: Chaircrusher*
DWIConvert is a compatible replacement for DicomToNrrdConverter. This patch uses CMake's ExternalProject to download the source code from
https://github.com/Chaircrusher/NewDicomToNrrdConverter
and build it as part of the Modules/CLI build.
https://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/160001998 new dicom to nrrd converter2012-12-04T15:24:02-05:00Sam Horvath0001998 new dicom to nrrd converter*Created by: Chaircrusher*
Contains all the changes, bug fixes and refactoring I've done with DicomToNrrdConverter
*Created by: Chaircrusher*
Contains all the changes, bug fixes and refactoring I've done with DicomToNrrdConverter
https://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/27Bills dcmtk patches2012-12-06T12:17:01-05:00Sam HorvathBills dcmtk patches*Created by: Chaircrusher*
This implements Bills double-free patch for DCMTK.
It changes the snapshot to today's DCMTK master -- they just pushed another bugfix I sent them.
*Created by: Chaircrusher*
This implements Bills double-free patch for DCMTK.
It changes the snapshot to today's DCMTK master -- they just pushed another bugfix I sent them.
https://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/33BUG: Baseline for ResampleDTIVolumeBSplineWSInterpolationTest and for Re...2013-03-06T10:08:03-05:00Francois BudinBUG: Baseline for ResampleDTIVolumeBSplineWSInterpolationTest and for Re......sampleScalarVectorDWIVolumeBSplineInterpolationTest have been updated. Tests were failing since ITKv3 had been replaced by ITKv4
...sampleScalarVectorDWIVolumeBSplineInterpolationTest have been updated. Tests were failing since ITKv3 had been replaced by ITKv4
https://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/34Git pull request test2013-03-06T10:38:08-05:00Ghost UserGit pull request testPull request test
Pull request test
https://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/35Git pull request test2013-03-06T10:48:19-05:00Ghost UserGit pull request testAnother pull request
Another pull request
https://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/29ENH: Add qMRMLTreeView::setSortFilterProxyModel function to be able to set cu...2013-03-06T10:56:57-05:00Csaba PinterENH: Add qMRMLTreeView::setSortFilterProxyModel function to be able to set custom proxy models to the tree viewhttps://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/31ENH: Implement feature 2885, display ruler projection on 2D viewers2013-03-06T10:58:41-05:00Sam HorvathENH: Implement feature 2885, display ruler projection on 2D viewers*Created by: lchauvin*
*Created by: lchauvin*
https://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/10ENH: patch to support visual c++ express 20102013-04-08T18:28:24-04:00IsaiahENH: patch to support visual c++ express 2010Based on value of CMAKE_BUILD_TOOL:
1. customizes the target parameter, either "/target:TARGET" for msbuild (Visual C++ Express 2010) or "/project " for devenv (VS full versions 2008 and 2010)
2. customizes the configuration/platform arg...Based on value of CMAKE_BUILD_TOOL:
1. customizes the target parameter, either "/target:TARGET" for msbuild (Visual C++ Express 2010) or "/project " for devenv (VS full versions 2008 and 2010)
2. customizes the configuration/platform argument:
msbuild: /p:Configuration=CONFIGURATION /p:Platform=PLATFORM
devenv: simply "CONFIGURATION|PLATFORM"
Additionally:
1. adds a check for Slicer_USE_PYTHONQT_WITH_TCL. If true, sets the python_PATCH_COMMAND. This needs to be conditional because CMake fails if there is no argument for "-P" switch when the patch command is called. The ${script} variable is set under the same conditional Slicer_USE_PYTHONQT_WITH_TCL at line 35.
https://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/18change in RSS module xml file2013-04-25T15:48:48-04:00Sam Horvathchange in RSS module xml file*Created by: gaoyi*
change the xml file of the RSS module at four places:
1. force the input label image to be of the Label image. By doing this, for an image to be appeared in that spot, it must be of a label image type.
1. default val...*Created by: gaoyi*
change the xml file of the RSS module at four places:
1. force the input label image to be of the Label image. By doing this, for an image to be appeared in that spot, it must be of a label image type.
1. default value for homogeneity set to 0.3
2. default value for smoothness set to 0.3
3. default expected volume set to 100ml
https://gitlab.kitware.com/sjh26/Slicer/-/merge_requests/36BUG: Fix spacing buttons in slice controller widget2013-05-14T17:32:44-04:00Ghost UserBUG: Fix spacing buttons in slice controller widgetEnsures automatic spacing button in slice view controller widget toggles automatic spacing on and off, and updates the icon in the widget to reflect the spacing mode. Ensures automatic spacing, manual spacing, and field of view buttons a...Ensures automatic spacing button in slice view controller widget toggles automatic spacing on and off, and updates the icon in the widget to reflect the spacing mode. Ensures automatic spacing, manual spacing, and field of view buttons are synchronized with MRML slice nodes. Ensures automatic spacing, manual spacing, and field of view buttons for each of R, Y, G update together appropriately when linked. #2993, in part similar to #2676-2685.