Changesets: Import 2017-06-07 23:51:09
|
master cd4784b3 2015-02-24 12:29:41 Details Diff |
BUG: 3936. Disabled multiple models selection in Models module since the widget does not support multiple nodes re-parenting. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23979 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/Models/qSlicerModelsModuleWidget.cxx | Diff File | ||
|
master 9ab851e6 2015-02-21 11:02:53 Details Diff |
BUG: Fixed VisualStudio launcher option for VS10 and later CMAKE_BUILD_TOOL (http://www.cmake.org/cmake/help/v3.0/variable/CMAKE_BUILD_TOOL.html, http://www.cmake.org/cmake/help/v3.0/variable/CMAKE_MAKE_PROGRAM.html#variable:CMAKE_MAKE_PROGRAM) points to IDE (msdev, VS9 an earlier) or build tool (msbuild, VS10 or later). The --VisualStudio option should launch the IDE, so the correct CMake variable to use is CMAKE_VS_DEVENV_COMMAND (http://www.cmake.org/cmake/help/v3.0/variable/CMAKE_VS_DEVENV_COMMAND.html#variable:CMAKE_VS_DEVENV_COMMAND). git-svn-id: http://svn.slicer.org/Slicer4/trunk@23978 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Applications/SlicerApp/CMakeLists.txt | Diff File | ||
|
master 04420ebf 2015-02-20 12:41:32 Details Diff |
ENH: pass the hierarchy scene to the CLI module instead of external mrml file git-svn-id: http://svn.slicer.org/Slicer4/trunk@23977 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/CLI/FiberTractMeasurements/FiberTractMeasurements.cxx | Diff File | ||
| mod - Modules/CLI/FiberTractMeasurements/FiberTractMeasurements.xml | Diff File | ||
|
master 2236ce04 2015-02-20 12:03:46 Details Diff |
ENH: Jim Miller's fix for enabling Hierarchy sub-scenes to be passed to CLI git-svn-id: http://svn.slicer.org/Slicer4/trunk@23976 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTCLI/vtkSlicerCLIModuleLogic.cxx | Diff File | ||
| mod - Base/QTCLI/vtkSlicerCLIModuleLogic.h | Diff File | ||
|
master 1bfd0812 2015-02-17 18:46:16 Details Diff |
BUG: reset the default editor color node each time dialog is opened This addresses an issue where the color combo box becomes unpopulated when the scene is closed. There is still an issue with the thumbnails of the colors are not visible but this is an issue with the color combo box and not the editor. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23975 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Scripted/EditorLib/HelperBox.py | Diff File | ||
|
master ee84fba5 2015-02-17 11:17:26 naucoin Details Diff |
BUG: fix restoring voxel based vs interpolation When switching from a parameter node that had voxel based turned on to one that didn't, the widget wasn't updating. This was because of the way the radio buttons were set to toggle: If a node had the voxel based flag on, the voxel based radio button had checked set to true and the interpolation radio button had checked set to false. Switching to the node with the voxel based flag set to false, the previous commit was just setting the voxel based radio button to unchecked but that was not forcing the interpolation radio button to be checked. This change explicitly sets the checked flag to true for the mode, which results in the other radio button in the group being set to unchecked. Issue 0003947 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23974 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/CropVolume/qSlicerCropVolumeModuleWidget.cxx | Diff File | ||
|
master 5d8e51a1 2015-02-17 11:17:24 naucoin Details Diff |
BUG: update management of crop volume parameters node The module was holding a pointer to the parameter node that could get out of date on scene changes and cause crashes. Switch to using a mrml node combo box to manage the parameters node. Adjusted the UI file to allow the generic module widget test to pass. Update the widget more fully on enter and scene changes. Select a newly added input volume or ROI if none already selected. When picking a new input volume, or switching ot a new parameter set one, set it to be active in the slice viewers. Update the parameters node constructor, destructor, read/write xml, copy and print for missing calls. Make sure that the GUI updates the parameters node (was missing the input volume and ROI node IDs). Added a scene close to the self test, and add the CMake command to make it show up as a self test in the GUI. Added error checking, took out debugging print outs. Tested against issues: 0003947 0001764 0003313 Issue 0003947 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23973 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/CropVolume/MRML/vtkMRMLCropVolumeParametersNode.cxx | Diff File | ||
| mod - Modules/Loadable/CropVolume/Resources/UI/qSlicerCropVolumeModuleWidget.ui | Diff File | ||
| mod - Modules/Loadable/CropVolume/Testing/Python/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/CropVolume/Testing/Python/CropVolumeSelfTest.py | Diff File | ||
| mod - Modules/Loadable/CropVolume/Testing/vtkMRMLCropVolumeParametersNodeTest1.cxx | Diff File | ||
| mod - Modules/Loadable/CropVolume/qSlicerCropVolumeModuleWidget.cxx | Diff File | ||
| mod - Modules/Loadable/CropVolume/qSlicerCropVolumeModuleWidget.h | Diff File | ||
|
master ceeb2232 2015-02-15 14:24:00 Details Diff |
ENH: add accessor for vertex points of models as numpy array git-svn-id: http://svn.slicer.org/Slicer4/trunk@23972 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/Python/slicer/util.py | Diff File | ||
|
master 021dc690 2015-02-13 17:34:44 Details Diff |
ENH: Update CTK to include pythonqt wrapping improvements $ git shortlog 59dfc7f..6983ecc --no-merges Alex Yarmarkovich (1): ENH: Improve ctkVTKHistogram/ctkTransferFunctionItem pythonqt wrapping git-svn-id: http://svn.slicer.org/Slicer4/trunk@23971 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_CTK.cmake | Diff File | ||
|
master 31b28a67 2015-02-12 02:27:24 Details Diff |
ENH: Update VTKv5/VTKv6 to include vtkCornerAnnotation API improvement //----------- Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> Date: Tue Feb 10 19:43:30 2015 -0500 vtkCornerAnnotation: Add convenience TextPosition enum Note: This changed has been submitted on gerrit for its integration into VTK master. See http://review.source.kitware.com/#/c/19191/ This commit extends the API of the corner annotation by introducing an enum named "TextPosition". Considering that enums are also wrapped in Python, this will improve the readability of both python and c++ code. The words Lower{Left|Right} and Upper{Left|Right} have been selected to be consistent with vtkLabelPlacer API //----------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23970 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_VTKv5.cmake | Diff File | ||
| mod - SuperBuild/External_VTKv6.cmake | Diff File | ||
|
master 0a71d240 2015-02-09 17:19:13 Details Diff |
ENH: Update PythonQt CMake install code to check value of PYTHONQT_INSTALL_DIR git-svn-id: http://svn.slicer.org/Slicer4/trunk@23969 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/SlicerBlockInstallPythonQt.cmake | Diff File | ||
|
master 5db960de 2015-02-09 17:19:11 Details Diff |
COMP: Update CTK to fix Slicer packaging issue on windows and linux This commit fixes a regression introduced in r23958 and discussed in [1] [1] http://slicer-devel.65872.n3.nabble.com/Windows-and-Linux-nightly-packages-tp4033451p4033452.html // ------------- Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> Date: Mon Feb 9 17:02:42 2015 -0500 Ensure PYTHONQT_INSTALL_DIR is not reset in project including CTK This commit is an attempt to fix a regression introduced by commontk/CTK@fc92239 that was causing the Slicer packaging to fail (mainly because the variable PYTHONQT_INSTALL_DIR was reset to an empty value after "find_path" was called in FindPythonQt.cmake) Note that this a workaround, the issue is being discussed with CMake developer. // ------------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23968 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_CTK.cmake | Diff File | ||
|
master c46e9711 2015-02-07 21:06:16 Details Diff |
COMP: Update VTK to fix hdf5 build error on system with glibc >= 2.19 //-------------- Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> Date: Sat Feb 7 20:59:51 2015 -0500 vtkhdf5: Fix build error when building on system with glic >= 2.19 A topic has been pushed on VTK gerrit: http://review.source.kitware.com/#/c/ As described in [1], since _BSD_SOURCE has been deprecated, _DEFAULT_SOURCE should now be used. This commit fixes the following build error happening when buiding on Ubuntu 14.04 LTS (with gcc (Ubuntu 4.8.2-19ubuntu1) 4.8.2, GNU C Library (Ubuntu EGLIBC 2.19-0ubuntu6.5)): $ make H5detect [...] /home/jcfr/Projects/Slicer-Release/VTKv6/ThirdParty/hdf5/vtkhdf5/src/H5detec static H5JMP_BUF jbuf_g; [1] http://www.sourceware.org/ml/glibc-cvs/2014-q1/msg00252.html //-------------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23967 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_VTKv6.cmake | Diff File | ||
|
master 681a9818 2015-02-07 14:45:11 Details Diff |
ENH: Improved performance of transform widget Only update transform info string if transform info section is shown. Prevent firing duplicate transform modified event from the transform slider (when the transform was modified, the slider was updated, and the slider fired a transform modified event; now the slider only fires modified if the transform is actually changed) git-svn-id: http://svn.slicer.org/Slicer4/trunk@23966 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Widgets/qMRMLLinearTransformSlider.cxx | Diff File | ||
| mod - Modules/Loadable/Transforms/Widgets/qMRMLTransformInfoWidget.cxx | Diff File | ||
| mod - Modules/Loadable/Transforms/Widgets/qMRMLTransformInfoWidget.h | Diff File | ||
| mod - Modules/Loadable/Transforms/qSlicerTransformsModuleWidget.cxx | Diff File | ||
|
master 22301ab2 2015-02-07 14:24:07 Details Diff |
ENH: Make annotation ROI display about 10x faster (from a few 100 to a few 10 milliseconds) Annotation ROI rendering was very very slow (several hundreds of milliseconds), mainly due to the slow performance of vtkCutter. This became an issue while doing real-time volume rendering of 4D ultrasound data. The volume rendering speed dropped from 15fps to a few fps when a transform is applied to the volume because of the ROI node that the volume renderer associates with each volume. Solution: Replaced vtkCutter with a specific plane/plane intersection line computation and optimized the pipeline to only compute data when it is actually used. How to see the speed improvement: * Create a ROI * Create a linear transform, apply it to the ROI * Change the transform and measure the rendering time using the script below: def roitest(): transform = slicer.util.getNode('LinearTransform_3') transformYmin=-100 transformYmax=100 transformYinc=5 matrix=vtk.vtkMatrix4x4() timer=vtk.vtkTimerLog() timer.StartTimer() for i in xrange(10): transform.GetMatrixTransformToParent(matrix) oldElem=matrix.GetElement(0 ,3) matrix.SetElement(0 ,3, -oldElem) oldElem=matrix.GetElement(1 ,3) oldElem=oldElem+transformYinc matrix.SetElement(1 ,3, oldElem) if oldElem > transformYmax or oldElem < transformYmin: transformYinc=-transformYinc transform.SetMatrixTransformToParent(matrix) slicer.app.processEvents() timer.StopTimer() print timer.GetElapsedTime() roitest() git-svn-id: http://svn.slicer.org/Slicer4/trunk@23965 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationROIDisplayableManager.cxx | Diff File | ||
| mod - Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationROIRepresentation2D.cxx | Diff File | ||
| mod - Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationROIRepresentation2D.h | Diff File | ||
|
master b077f996 2015-02-05 16:22:34 Details Diff |
BUG: Fixed warning in vtkMRMLSliceLogicTest2_fixed.nrrd test Warnings caused by the test code expecting a binary image and the reslice filter providing a stencil as mask: 125: vtkMRMLScalarVolumeDisplayNode::pipeline updated: 0.000349045 fps: 2864.96 125: ERROR: In /home/jchris/Projects/Slicer-2-SuperBuild-Debug/VTKv6/Common/ExecutionModel/vtkDemandDrivenPipeline.cxx, line 810 125: vtkCompositeDataPipeline (0x2cadda0): Input for connection index 0 on input port index 0 for algorithm vtkImageCast(0x2cabb40) is of type vtkImageStencilData, but a vtkImageData is required. 125: 125: vtkMRMLScalarVolumeDisplayNode::window updated: 0.000169039 fps: 5915.8 125: ERROR: In /home/jchris/Projects/Slicer-2-SuperBuild-Debug/VTKv6/Common/ExecutionModel/vtkDemandDrivenPipeline.cxx, line 810 125: vtkCompositeDataPipeline (0x2cadda0): Input for connection index 0 on input port index 0 for algorithm vtkImageCast(0x2cabb40) is of type vtkImageStencilData, but a vtkImageData is required. 125: 125: vtkMRMLScalarVolumeDisplayNode::threshold updated: 0.000144958 fps: 6898.53 125: ERROR: In /home/jchris/Projects/Slicer-2-SuperBuild-Debug/VTKv6/Common/ExecutionModel/vtkDemandDrivenPipeline.cxx, line 810 125: vtkCompositeDataPipeline (0x2cadda0): Input for connection index 0 on input port index 0 for algorithm vtkImageCast(0x2cabb40) is of type vtkImageStencilData, but a vtkImageData is required. 125: 125: vtkMRMLScalarVolumeDisplayNode::alpha updated: 8.79765e-05 fps: 11366.7 1/1 Test 0000125: vtkMRMLSliceLogicTest2_fixed.nrrd ... Passed 0.99 sec After the fix there are no warnings anymore. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23964 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Logic/Testing/Cxx/vtkMRMLSliceLogicTest2.cxx | Diff File | ||
|
master 87073c17 2015-02-05 13:57:31 Details Diff |
BUG: Update VTKv6 - Potential fixes for 0003949 and 0003950 related to OpenGL2 Aashish Chaudhary (27): Re-added volume benchmark test Typedef the volume test Updated volume test Tweaked opacity function to force more computation Clean up cmake a bit Adding GPU independent component feature Updated test to highlight mappings Adding support for multiple components in GPU RayCast Remove limiting check for independent components Adding support for multi RGB tables Fixed erroneous logic Updating shader code to support independent components Adding support for independent components for opacity and color function Some more updates to support independent components Fixed composite blend mode Added independent support for min and max projections Pass component weights to the shader Fixed testing Renaming classes for consistency Added support for independent components for gradient opacity Improved the test a bit Reinitialize transfer functions if the property changes Independent component is not supported in OpenGL GPU mapper Fixed MIP independent shader Fixed independent component computing for min intensity projection Fixing volume tests not passing on intel machine Removed unused code and check Andrew Bauer (1): Improving testing of deleting cells from a polydata. Ben Boeckel (1): vtkRenderingVolumeOpenGL2: remove copy_shaders target Berk Geveci (1): Improved unstructured grid support in dataset_adapter. Burlen Loring (2): vtkweb: buffering issue vtkweb: connect to existing session issue Chris Harris (2): vtkWeb: Use unbuffered file read/write for stdout vtkWeb: Cleanup python processes that timeout on startup Christoph Kolb (1): Add a method to enable multisampling in the QVTKWidget2 Cory Quammen (1): Fixed memory leak when RGBPoints are read Dan Lipsa (3): Accumulate strings printed to console by Python and send them in one piece. Fix style problems. BUG: Buffer output only for RunSimpleString. Dave DeMarle (1): COMP: fix macro redefinition comp warning David C. Lonie (3): Reenable GL2PS MathText tests. Add background color/opacity settings to vtkTextProperty. Use the new background color rendering for the labeled contour test. Jean-Christophe Fillion-Robin (3): Fix regression ensuring macro VTK_MAKE_INSTANTIATOR3 configure files Fix component names in "vtkhdf5-hl" install rules. Fixes #15282 Fix MacOSX build error related to OpenGL2/vtkOpenGL.h. See #15285 Joachim Pouderoux (2): Small fixes to allow empty cells. Fix EnSight Reader BUG 0015268 Julien Jomier (1): BUG: RenderedAreaPicker was not using the PickFromList Ken Martin (14): Add valid image for OpenGL2 Use MCDCMatrix in shaders Use MCDCMatrix in shaders Fix a compiler warning Add two valid images Add a subclass for faster composite dataset mapping Fix compile issues for es2 Expose more methods in opengles3 Fix GLES3 Add support for vtkTextures Transform ivar Fix some dashboard warnings Fix for systems with spaces in the path Fix memory leak in helper class holding input data Fix two compiler warnings Marcus D. Hanwell (6): Benchmarking triangles, chart that updates Made a benchmark module, moved the benchmark tools Added a --timeout option, default to 1 second Call Write on the delimited text writer Just make the benchmark module depend on volume rendering Use the resolution variable to set the cube size Matt McCormick (1): Reset VTK_MODULES_REQUESTED to all modules with multiple calls. Paul Edwards (1): Fixing how polydata cells are deleted. Roger Bramon (1): Fix QVTKWidget problem on Windows with Aero off and Qt5 Scott Wittenburg (5): In the vtkweb loader, add css specific to the proxy editor widget. Changes to viewports supporting capturing screenshots for pvweb. Support vtkweb and pvweb servers using http only (no websockets). Added missing import which broke http-only servers not serving content. Updating launcher to include a complete set of example profiles. Shawn Waldon (2): Made sure composite data iterators were deleted properly Made vtkPointGaussianMapper handle NULL arrays Sujin Philip (4): Toolchain files for MICs on stampede Fix compile warnings in SMP under Windows Additions to SMP API Fix SMP examples warnings Tim Thirion (5): Create iOS framework in one pass through CMake config Clean up iOS build script Make vtkVersion available sooner in CMakeLists.txt iOS build: check install directories before any compilation iOS build: pass OpenGL ES version string to child builds Utkarsh Ayachit (4): Fix inverted ifdef NDEBUG in commit f1a90fd2. Forward InteractionEvent to Interactor. Miscellaneous vtkContextInteractorStyle fixes. Fix missing headers. Will Schroeder (1): Progress reporting was broken git-svn-id: http://svn.slicer.org/Slicer4/trunk@23963 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_VTKv6.cmake | Diff File | ||
|
master 13f6c36c 2015-02-05 10:02:04 Details Diff |
COMP: Fix ResampleDTIVolume build error on macosx This commit fixes a build error happening without ITKV3_COMPATIBILITY enabled. To address the error message reported below, the module now uses the concrete class VersorRigid3DTransform instead of the base class Rigid3DTransform. //----------- In file included from /path/to/Slicer/Modules/CLI/ResampleDTIVolume/ResampleDTIVolume.cxx:16: In file included from /path/to/Slicer/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DRigidTransform.h:68: /path/to/Slicer/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DRigidTransform.txx:53:42: error: no viable conversion from 'Pointer' (aka 'SmartPointer') to 'typename Rigid3DTransformType::Pointer' (aka 'SmartPointer') typename Rigid3DTransformType::Pointer rigidTransform = Rigid3DTransformType::New(); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ /path/to/Slicer-build/ITKv4/Modules/Core/Common/include/itkSmartPointer.h:65:3: note: candidate constructor not viable: no known conversion from 'Pointer' (aka 'SmartPointer') to 'const SmartPointer &' for 1st argument; SmartPointer (const SmartPointer< ObjectType > & p): ^ /path/to/Slicer-build/ITKv4/Modules/Core/Common/include/itkSmartPointer.h:70:3: note: candidate constructor not viable: no known conversion from 'Pointer' (aka 'SmartPointer') to 'ObjectType *' (aka 'itk::Rigid3DTransform *') for 1st argument; SmartPointer (ObjectType *p): ^ /path/to/Slicer-build/ITKv4/Modules/Core/Common/include/itkSmartPointer.h:86:3: note: candidate function operator ObjectType *() const ^ 1 error generated. //----------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23962 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DRigidTransform.h | Diff File | ||
| mod - Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DRigidTransform.txx | Diff File | ||
|
master 94f10559 2015-02-04 19:11:16 Details Diff |
ENH: Improve build targets organization in IDE that support folders This commit set the FOLDER property on all targets to group them into meaningful "units". This will make development easier ensuring it is possible to quickly re-build and open the source files associated with the targets of either a given module, the core libraries or even the Slicer application. Currently the grouping is: * App-SlicerApp * CMakePredefinedTargets * Core-Base * Core-Libs * FreeSurfer * ITKFactoryRegistration * [...] * Module-<NameOfModule> * [...] If for some reason, the folder organization needs to be disabled. Slicer could be configured with Slicer_USE_FOLDERS set to OFF. Projects updated in this commit: * CTK * SlicerExecutionModel * OtsuThresholdImageFilter Notes: (1) some of the targets (EMSegment, BRAINSTools, MultiVolume, ...) are still associated to the root and not yet categorized. (2) ideally few more macros/functions should be introduced: one to easily configure subject hierarchy plugin, and one to easily configure tests associated with a CLI. CTK changes: // ------------- commit commontk/CTK@ac1370e Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> Date: Wed Feb 4 14:47:09 2015 -0500 Add FOLDER parameter to ctkMacroBuildQtPlugin If specified, the target(s) associated with designer, icon engine and style plugins will be added into the specified folder when the project is configured for an IDE supporting it. For more details, see http://www.cmake.org/cmake/help/v2.8.9/cmake.html#prop_tgt:FOLDER // ------------- SlicerExecutionModel changes: // ------------- commit Slicer/SlicerExecutionModel@0b780eb Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> Date: Wed Feb 4 18:06:25 2015 -0500 ENH: SEMMacroBuildCLI - Add possibility to associate FOLDER with CLI targets In project building a lot of modules (i.e Slicer), whenever possible, it is better to keep the huge list of targets organized. To help with this, CMake allows to set a FOLDER target property. See http://www.cmake.org/cmake/help/v2.8.3/cmake.html#prop_tgt:FOLDER This commit extends the SEMMacroBuildCLI API to accept an optional FOLDER parameter. If not set, the folder name will default to: <SlicerExecutionModel_DEFAULT_CLI_TARGETS_FOLDER_PREFIX><MODULE_NAME> By default the prefix is set to an empty string and the folder will be named after the module name. There are two ways to specify a default prefix value: (1) Set the variable SlicerExecutionModel_DEFAULT_CLI_TARGETS_FOLDER_PREFIX in the current scope before calling 'SEMMacroBuildCLI' (2) Configure the SlicerExecutionModel project with the option SlicerExecutionModel_DEFAULT_CLI_TARGETS_FOLDER_PREFIX Note that: - FOLDER support has been introduced in CMake >= 2.8.3 and - it can optionally be enabled in a project by setting the global property named USE_FOLDERS. See http://www.cmake.org/cmake/help/v2.8.3/cmake.html#prop_global:USE_FOLDERS Finally, to associate CLI test expected to be in the same "FOLDER", a variable named <MODULE_NAME>_TARGETS_FOLDER is conveniently set in the current scope each time the macro SEMMacroBuildCLI is called. commit Slicer/SlicerExecutionModel@e84d231 Author: Matt McCormick <matt.mccormick@kitware.com> Date: Thu Aug 7 11:09:39 2014 -0400 BUG: Fix ModuleDescriptionParser test data dir. Fixes Parser1Test{1,2}. Simplify by consolidation of variables. // ------------- OtsuThresholdImageFilter changes: // ------------- commit :Slicer/Slicer-OtsuThresholdImageFilter@5efe412 Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> Date: Wed Feb 4 18:08:28 2015 -0500 Associate folder with test targets. [...] // ------------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23961 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Applications/SlicerApp/CMakeLists.txt | Diff File | ||
| mod - Applications/SlicerApp/Testing/Cpp/CMakeLists.txt | Diff File | ||
| mod - Base/CLI/CMakeLists.txt | Diff File | ||
| mod - Base/Logic/CMakeLists.txt | Diff File | ||
| mod - Base/Logic/Testing/CMakeLists.txt | Diff File | ||
| mod - Base/QTCLI/CMakeLists.txt | Diff File | ||
| mod - Base/QTCLI/DesignerPlugins/CMakeLists.txt | Diff File | ||
| mod - Base/QTCLI/Testing/CMakeLists.txt | Diff File | ||
| mod - Base/QTCore/Testing/Cxx/CMakeLists.txt | Diff File | ||
| mod - Base/QTGUI/CMakeLists.txt | Diff File | ||
| mod - Base/QTGUI/DesignerPlugins/CMakeLists.txt | Diff File | ||
| mod - Base/QTGUI/StylePlugins/CMakeLists.txt | Diff File | ||
| mod - Base/QTGUI/Testing/Cxx/CMakeLists.txt | Diff File | ||
| mod - CMake/SlicerMacroBuildBaseQtLibrary.cmake | Diff File | ||
| mod - CMake/SlicerMacroBuildModuleLogic.cmake | Diff File | ||
| mod - CMake/SlicerMacroBuildModuleMRML.cmake | Diff File | ||
| mod - CMake/SlicerMacroBuildModuleQtLibrary.cmake | Diff File | ||
| mod - CMake/SlicerMacroBuildModuleVTKLibrary.cmake | Diff File | ||
| mod - CMake/SlicerMacroBuildModuleWidgets.cmake | Diff File | ||
| mod - CMake/SlicerMacroBuildQtModule.cmake | Diff File | ||
| mod - CMake/SlicerMacroConfigureModuleCxxTestDriver.cmake | Diff File | ||
| mod - CMakeLists.txt | Diff File | ||
| mod - Libs/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/Core/Testing/CMakeLists.txt | Diff File | ||
| mod - Libs/MRML/DisplayableManager/CMakeLists.txt | Diff File | ||
| mod - Libs/MRML/DisplayableManager/Testing/Cxx/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/MRML/Widgets/DesignerPlugins/CMakeLists.txt | Diff File | ||
| mod - Libs/MRML/Widgets/Testing/CMakeLists.txt | Diff File | ||
| mod - Libs/RemoteIO/CMakeLists.txt | Diff File | ||
| mod - Libs/vtkITK/CMakeLists.txt | Diff File | ||
| mod - Libs/vtkITK/Testing/CMakeLists.txt | Diff File | ||
| mod - Libs/vtkTeem/CMakeLists.txt | Diff File | ||
| mod - Libs/vtkTeem/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/ACPCTransform/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/AddScalarVolumes/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/CastScalarVolume/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/CheckerBoardFilter/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/CreateDICOMSeries/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/DWIToDTIEstimation/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/DiffusionTensorScalarMeasurements/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/DiffusionTensorTest/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/DiffusionWeightedVolumeMasking/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/ExecutionModelTour/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/ExpertAutomatedRegistration/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/ExtractSkeleton/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/FiducialRegistration/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/GaussianBlurImageFilter/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/GradientAnisotropicDiffusion/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/GrayscaleFillHoleImageFilter/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/GrayscaleGrindPeakImageFilter/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/GrayscaleModelMaker/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/HistogramMatching/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/ImageLabelCombine/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/LabelMapSmoothing/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/MaskScalarVolume/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/MedianImageFilter/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/MergeModels/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/ModelMaker/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/ModelToLabelMap/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/MultiplyScalarVolumes/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/N4ITKBiasFieldCorrection/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/OrientScalarVolume/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/PETStandardUptakeValueComputation/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/ResampleDTIVolume/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/ResampleScalarVectorDWIVolume/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/ResampleScalarVolume/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/RobustStatisticsSegmenter/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/SimpleRegionGrowingSegmentation/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/SubtractScalarVolumes/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/TestGridTransformRegistration/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/ThresholdScalarVolume/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/TractographyLabelMapSeeding/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/CLI/VotingBinaryHoleFillingImageFilter/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/Annotations/Widgets/DesignerPlugins/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/Markups/SubjectHierarchyPlugins/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/Markups/Widgets/DesignerPlugins/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/Models/SubjectHierarchyPlugins/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/Models/Widgets/DesignerPlugins/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/SceneViews/SubjectHierarchyPlugins/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/SubjectHierarchy/Widgets/DesignerPlugins/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/Transforms/SubjectHierarchyPlugins/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/Transforms/Widgets/DesignerPlugins/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/Transforms/Widgets/Testing/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/Units/Widgets/DesignerPlugins/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/VolumeRendering/Widgets/DesignerPlugins/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/Volumes/SubjectHierarchyPlugins/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/Volumes/Testing/Cxx/CMakeLists.txt | Diff File | ||
| mod - Modules/Scripted/DICOMLib/SubjectHierarchyPlugins/CMakeLists.txt | Diff File | ||
| mod - Modules/Scripted/DICOMLib/Widgets/DesignerPlugins/CMakeLists.txt | Diff File | ||
| mod - SuperBuild.cmake | Diff File | ||
| mod - SuperBuild/External_CTK.cmake | Diff File | ||
| mod - SuperBuild/External_SlicerExecutionModel.cmake | Diff File | ||
|
master 47ee30af 2015-02-04 09:45:14 Details Diff |
ENH: Disable ITKv3 compatibility to enable 64-bit ids on windows Enable processing of images greater that 4GB on windows. This changes ITK's size type on windows from long to long long, by also turning on ITK_USE64BITS_IDS. Remove ITK's Deprecated and V3Compatibility modules. Additionally deprecated APIs are also removed. Migration for these changes can be found in the ITK migration guide: http://itk.org/migrationv4/ From: Bradley Lowekamp <blowekamp@mail.nih.gov> git-svn-id: http://svn.slicer.org/Slicer4/trunk@23960 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMakeLists.txt | Diff File | ||
|
master a405bb4d 2015-02-04 00:37:05 Details Diff |
ENH: Update SimpleITK $ git shortlog 57e6a52..1fe2f56 --no-merges Bradley Lowekamp (47): Adding preliminary displacement transform interface Adding additional PimpleTransform method for SetIdentity Adding MakeUnique before set methods are called Implementing Setting of smoothing parameters and interpolators COMP: Default template arguments cannot be used with function Fix incorrect argument place holder for DisplacementTrasform functor Fix typeo in name of internal function WIP: hacking at displacement example Add documentation note for the GetDisplacementField methods Adding comprehensive testing for displacement field transform adding testing for setting interpolator for displacement field Adding testing for transformation of point by displacement field Adding initial implementation of ImageSeriesWriter Adding testing for ImageSeriesWriter class Fix up documentation for image series writer. BUG: Move show in example to conditional block DOC: Improving docs in internal transform class Suppress warning about sprintf warning in image series writer. Update ITK superbuild version to 4.7.0+ Don't always display with Displacement examples Reduce tolerance for RMS Fix leaking of DisplacementField Pimples Adding accessors for global physical tolerance of images Update ITK Superbuild version along ITK 4.7 release branch Fix Doxygen warnings in Command page Fix clang warning in lua BUG: Disable SimpleITKExamples Superbuild project with flag Rename MakeUniqueForWrite to MakeUnique Change MakeUnique's access-specifier to public Improve ImageRegistrationMethod::SetInitialRegistration copy handling Adding testing for new const argument SetInitialTransform method Adding implementation of the ScaleTransform Adding comprehensive testing for the ScaleTransform class improve style in translation transform Fixing indenting Moving implementation from header file Remove unneeded conditional Rename r variable to avoid CMP0054 warning Updating Java an Python DocStrings Updating superbuild along ITK v4.7.0 release branch Updating Scalar transforms to expect fixed parameters Adding SetMatrix method to Transform classes Adding testing for the SetMatrix methods Change matrix to pi/2 rotation Adding GetName for SimpleITK class Include SimpleITK class type in transform ToString Adding testing for GetName via ToString methods Jean-Christophe Fillion-Robin (1): Simplify if() conditions on check result variables Matt McCormick (1): ENH: Update doxygen.config for Doxygen version 1.8.9.1. Ziv Yaniv (1): BUG: default translation vector corrected from 3D to 2D git-svn-id: http://svn.slicer.org/Slicer4/trunk@23959 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_SimpleITK.cmake | Diff File | ||
|
master 1483bd84 2015-02-04 00:29:16 Details Diff |
ENH: Update CTK to include python decorator update and external project fix $ git shortlog e23537d..d8cd14e --no-merges Jean-Christophe Fillion-Robin (2): Improve ctkVTKHistogram metaobject for better pythonqt wrapping Extend ctkTransferFunction*Item for better pythonqt wrapping Sascha Zelzer (5): Removed left-over method from git merge without implementation. Support CMAKE_DEBUG_POSTFIX for CTK superbuild and external DCMTK. Ensure find_package() is called in CTKConfig.cmake for external projects. Some systems need PYTHON_INCLUDE_DIR2 for FindPythonLibs.cmake. Added custom moc options again when moc'ing plug-in headers. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23958 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/SlicerBlockInstallDCMTKApps.cmake | Diff File | ||
| mod - CMake/UseSlicer.cmake.in | Diff File | ||
| mod - CMakeLists.txt | Diff File | ||
| mod - SuperBuild/External_CTK.cmake | Diff File | ||
|
master 73e5940f 2015-02-03 14:24:59 Details Diff |
BUG: Fix python parse error when DICOM loading vtkMRMLSubjectHierarchyConstants was used without specifying containing python module git-svn-id: http://svn.slicer.org/Slicer4/trunk@23957 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Scripted/DICOMLib/DICOMPlugin.py | Diff File | ||
| mod - Modules/Scripted/DICOMLib/DICOMWidgets.py | Diff File | ||
|
master df99a209 2015-02-03 13:18:38 Details Diff |
COMP: Configure ITKv4 with python executable If on the build machine there is a python installed on the system, this one will be found by the ITKModuleHeaderTest.cmake module. To keep the SlicerConfig.cmake sanity checks quiet, this commit ensure ITKv4 will be configured with the same python executable accross the entire Slicer build tree. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23956 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_ITKv4.cmake | Diff File | ||
|
master f0636732 2015-02-03 12:06:12 Details Diff |
COMP: Workaround to fix HAVE_STAT redefined warning in SlicerDICOMExportDialog This commit fixes the following warning: //----------- In file included from /path/to/Slicer-build/DCMTK/dcmdata/include/dcmtk/dcmdata/dcdatset.h:26:0, from /path/to/Slicer-build/CTK/Libs/DICOM/Core/ctkDICOMItem.h:28, from /path/to/Slicer-build/CTK/Libs/DICOM/Core/ctkDICOMDatabase.h:29, from /path/to/Slicer/Modules/Scripted/DICOMLib/Widgets/qSlicerDICOMExportDialog.cxx:55: /path/to/Slicer-build/DCMTK-build/config/include/dcmtk/config/osconfig.h:540:0: warning: "HAVE_STAT" redefined [enabled by default] #define HAVE_STAT 1 ^ In file included from /path/to/Slicer-build/python-install/include/python2.7/Python.h:58:0, from /path/to/Slicer-build/CTK-build/CMakeExternals/Install/include/PythonQt/PythonQtPythonInclude.h:93, from /path/to/Slicer-build/CTK-build/CMakeExternals/Install/include/PythonQt/PythonQtInstanceWrapper.h:45, from /path/to/Slicer-build/CTK-build/CMakeExternals/Install/include/PythonQt/PythonQt.h:46, from /path/to/Slicer/Modules/Scripted/DICOMLib/Widgets/qSlicerDICOMExportDialog.cxx:46: /path/to/Slicer-build/python-install/include/python2.7/pyport.h:361:0: note: this is the location of the previous definition #define HAVE_STAT ^ //----------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23955 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Scripted/DICOMLib/Widgets/qSlicerDICOMExportDialog.cxx | Diff File | ||
