Changesets: Import 2017-06-07 23:51:09
|
master 5bae4bd1 2015-01-28 23:13:47 Details Diff |
STYLE: Fix "constness" of qMRMLSliceWidget::sliceView From: Sergey Aleshin <4memph@gmail.com> git-svn-id: http://svn.slicer.org/Slicer4/trunk@23929 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Widgets/qMRMLSliceWidget.cxx | Diff File | ||
| mod - Libs/MRML/Widgets/qMRMLSliceWidget.h | Diff File | ||
|
master c59455b6 2015-01-28 23:13:44 Details Diff |
ENH: Add handling of loadable.referencedInstanceUIDs This topic has been discussed at SLC2015 Project Week, see: http://www.na-mic.org/Wiki/index.php/2015_Winter_Project_Week:DICOM_References The implementation follows the plan outlined during the project week. The idea is the following: 1) plugins will populate referencedInstanceUIDs in loadable during Examine 2) on Load, referencedInstanceUIDs corresponding to the selected loadables is checked, and the files matching those UIDs are located 3) plugins selected (by the user) are invoked to identify loadables corresponding to the referenced file lists 4) popup dialog with the list of identified loadables (only those 'selected' by plugins are considered) and the checkboxes allowing the user to cancel loading 5) when the user hits 'Done' button in the popup, selected referenced loadables are added to the pluginsByLoadable dictionary, and all loadables are loaded per usual procedure From: Andrey Fedorov <fedorov@bwh.harvard.edu> git-svn-id: http://svn.slicer.org/Slicer4/trunk@23928 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Scripted/DICOMLib/DICOMWidgets.py | Diff File | ||
|
master 70559aeb 2015-01-28 22:36:21 Details Diff |
ENH: Tweak how CPack package variables can be set. This commit introduces a convenience macro named "slicer_cpack_set" allowing to set a given CPack variable to either "Slicer_<cpack_varname>" or "<${Slicer_MAIN_PROJECT}_APPLICATION_NAME>_<cpack_varname>". A configure time message displaying the package properties has also been added: [...] -- Setting CPACK_PACKAGE_NAME to 'Slicer' -- Setting CPACK_PACKAGE_VENDOR to 'NA-MIC' -- Setting CPACK_PACKAGE_DESCRIPTION_SUMMARY to 'Medical Visualization and Processing Environment for Research' -- Setting CPACK_PACKAGE_DESCRIPTION_FILE to '/home/jchris/Projects/Slicer-2/README.txt' -- Setting CPACK_RESOURCE_FILE_LICENSE to '/home/jchris/Projects/Slicer-2/License.txt' -- Setting CPACK_PACKAGE_VERSION_MAJOR to '4' -- Setting CPACK_PACKAGE_VERSION_MINOR to '4' -- Setting CPACK_PACKAGE_VERSION_PATCH to '0' -- Setting CPACK_PACKAGE_VERSION to '4.4.0-2015-01-23' -- Setting CPACK_PACKAGE_INSTALL_DIRECTORY to 'Slicer 4.4.0-2015-01-23' [...] git-svn-id: http://svn.slicer.org/Slicer4/trunk@23927 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/SlicerCPack.cmake | Diff File | ||
|
master e2eb6706 2015-01-28 22:36:19 Details Diff |
STYLE: Change configure time message to use main project application name This commit further improves r21896 using Slicer_MAIN_PROJECT_APPLICATION_NAME instead of SlicerApp_APPLICATION_NAME. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23926 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/SlicerMacroBuildBaseQtLibrary.cmake | Diff File | ||
| mod - CMakeLists.txt | Diff File | ||
|
master 90c4504d 2015-01-28 22:36:16 Details Diff |
ENH: Set CPack package vendor using organization name git-svn-id: http://svn.slicer.org/Slicer4/trunk@23925 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/SlicerCPack.cmake | Diff File | ||
|
master 70022fca 2015-01-28 22:36:14 Details Diff |
STYLE: Fix spell check in qSlicerAbstractModuleRepresentation doxygen git-svn-id: http://svn.slicer.org/Slicer4/trunk@23924 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTCore/qSlicerAbstractModuleRepresentation.h | Diff File | ||
|
master 5eb19e93 2015-01-28 19:31:48 naucoin Details Diff |
BUG: user loaded color files don't need to be singletons The load data dialogue uses the color logic methods to load in color files. These methods were originally written to load the built in color files and have variables set that need to be unset for user files. The singleton tag needs to be unset for user loaded files or else they won't be cleared out of the scene on close and can cause unexpected behaviour when saved in MRBs. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23923 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Logic/vtkMRMLColorLogic.cxx | Diff File | ||
| mod - Libs/MRML/Logic/vtkMRMLColorLogic.h | Diff File | ||
|
master 380b1fb9 2015-01-28 13:07:35 Details Diff |
ENH: Store StudyInstanceUID and StudyID to support adding exported series to existing study These two tags are stored in the study subject hierarchy nodes as tags; Fixed misleading variable name in scalar volume plugin; Reduced default size of DICOM export window (after request). Related to 0003937 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23922 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/SubjectHierarchy/MRML/vtkMRMLSubjectHierarchyConstants.h | Diff File | ||
| mod - Modules/Scripted/DICOMLib/DICOMPlugin.py | Diff File | ||
| mod - Modules/Scripted/DICOMLib/Widgets/Resources/UI/qSlicerDICOMExportDialog.ui | Diff File | ||
| mod - Modules/Scripted/DICOMPlugins/DICOMScalarVolumePlugin.py | Diff File | ||
|
master a4cebdcb 2015-01-26 17:48:05 Details Diff |
COMP: Update VTKv6/OpenGL2 to fix MacOSX build error // ---------------- Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> Date: Mon Jan 26 17:10:01 2015 -0500 Fix MacOSX build error related to OpenGL2/vtkOpenGL.h. See #15285 This commit ensures the file defining VTK_USE_{CARBON|COCOA} is included and fixes the following build error caught by Slicer dashboard: // --------- In file included from /Users/kitware/Dashboards/Experimental/Slicer-0/Modules/Loadable/VolumeRendering/VolumeRenderingReplacements/vtkSlicerOpenGLRayCastImageDisplayHelper.cxx:25: /Users/kitware/Dashboards/Experimental/Slicer-0-build/VTKv6/Rendering/OpenGL2/vtkOpenGL.h:26:11: fatal error: 'GL/gl.h' file not found # include // Include OpenGL API. ^ 1 error generated. // --------- // ---------------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23921 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_VTKv6.cmake | Diff File | ||
|
master 28236d35 2015-01-26 15:56:28 Details Diff |
ENH: Update VolumeRendering code to exclude mangled mesa with VTK6 Mangled Mesa has been removed from VTK6. See the following commits: kitware/VTK@3977699 kitware/VTK@0659c80 Note that this commit does NOT address any particular build issue. It simply re-organize the code for sake of readability. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23920 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/VolumeRendering/VolumeRenderingReplacements/vtkSlicerOpenGLRayCastImageDisplayHelper.cxx | Diff File | ||
| mod - Modules/Loadable/VolumeRendering/VolumeRenderingReplacements/vtkSlicerVolumeRenderingFactory.cxx | Diff File | ||
|
master fe89c959 2015-01-26 15:56:26 Details Diff |
STYLE: Re-organize includes in vtkSlicerOpenGLRayCastImageDisplayHelper git-svn-id: http://svn.slicer.org/Slicer4/trunk@23919 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/VolumeRendering/VolumeRenderingReplacements/vtkSlicerOpenGLRayCastImageDisplayHelper.cxx | Diff File | ||
|
master fdb93f38 2015-01-26 15:56:24 Details Diff |
COMP: Remove unused vtkSlicerMesaRayCastImageDisplayHelper classes This class first introduced by commit r4673 (ENH: Integrated VTK ray cast classes, started with modifications for incremental update) has been copied in the code based but was not compiled. Then, none of following commit (See [1][2][3]) related to this class updated the CMakeLists.txt to compile the file. This commit takes care of removing this unused files. [1] r5517: ENH: Create own dll for vtkReplacements [2] r9952: ENH: added new volume rendering module [3] r15837: ENH: added first cut of VolumeRendering module git-svn-id: http://svn.slicer.org/Slicer4/trunk@23918 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| rm - Modules/Loadable/VolumeRendering/VolumeRenderingReplacements/vtkSlicerMesaRayCastImageDisplayHelper.cxx | Diff File | ||
| rm - Modules/Loadable/VolumeRendering/VolumeRenderingReplacements/vtkSlicerMesaRayCastImageDisplayHelper.h | Diff File | ||
|
master 195e689e 2015-01-26 13:31:06 Details Diff |
COMP: Remove unused class vtkSlicerGPUVolumeMapper Following commit r23888 (ENH: Remove unused NCI volume rendering classes) this class is not used anymore. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23917 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt | Diff File | ||
| rm - Modules/Loadable/VolumeRendering/VolumeRenderingReplacements/vtkSlicerGPUVolumeMapper.cxx | Diff File | ||
| rm - Modules/Loadable/VolumeRendering/VolumeRenderingReplacements/vtkSlicerGPUVolumeMapper.h | Diff File | ||
|
master cf4768c3 2015-01-23 14:14:09 Details Diff |
COMP: Update VTKv6 to include fix for hdf5-hl library install rule This commit will ensure vtk module can be imported from an installed tree. //-------------- Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> Date: Fri Jan 23 13:53:13 2015 -0500 Fix component names in "vtkhdf5-hl" install rules //-------------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23916 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_VTKv6.cmake | Diff File | ||
|
master 1526ab35 2015-01-23 12:55:28 Details Diff |
ENH: Allow vtk module to be imported from Slicer python This commit update launcher settings associated with VTKv6 project so that "import vtk" can be successfully executed from the python interpreter executed in the Slicer environment. ./Slicer --launch python -c 'import vtk' git-svn-id: http://svn.slicer.org/Slicer4/trunk@23915 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_VTKv6.cmake | Diff File | ||
|
master 5d3cd04a 2015-01-23 12:55:26 Details Diff |
BUG: Fix qSlicerLoadableModuleWithPythonTest To fix the failing test due to a regression introduced by r23828, this commit (1) updates CTK to include update to ctk/__init__.py (2) update slicer/__init__.py to ensure "slicer" module can be imported without an instantiated (3) update launcher settings associated with CTK external project to allow ctk module to be imported without having a qSlicerCoreApplication instantiated. (See function "pythonPaths" at line 65 of qSlicerCorePythonManager.cpp) QApplication. CTK changes: $ git shortlog a3d8aa9..e23537d --no-merges Andreas Fetzer (32): Use same way to display data like in the ctkXnatTreeModel Make root object protected to allow access to the root object from within subclasses. Use lower case property keys consistently. Use label instead of abstractresourceid since a newly generated resource may not have an id yet Fixed resource uri for ctkXnatFile Added new file which contains all the xnat object fields that are accessible via the xnat rest api Use properties for fields that are accessible via the rest api instead of members of the private implementation. Use the object field constants for accessing the properties. Use constants for accessing the properties of an object Use constants for accessing the properties of an subject Use constants for accessing the properties of an xnat object Added convenience methods for setting file properties Added missing includes Use constant for accessing properties Added functions for getting/setting the description of a project The description which is displayed as a tooltip by the Tree- and TableModel must not be synchronized with the XNAT server. Hence it should be a member of the private implementation Don't store the ID within a property. Since the ID is created automatically and cannot be changed afterwards it should be stored as a field of the private implementation. Added convenience methods for setting xnatScan properties Overwrote the ID and name accessors for xnatResource Fixed return type Fixed fetching xnatObjects by using the correct properties/fields Reverted changes regarding ID handling. ID is no longer stored within the private implementation but as property again. Overwrote ID getters and setter where this was necessary. Added get/set label methods to xnatResource, since the xnatResource object has no field name. Fixed access to reconstruction file names Removed debug messages Fixed property access Stylistic improvements Made id getter and setter virtual Added more missing virtual declarations Fixed compiler warning. No longer returning reference to local temporary object. Removed file with xnat constants. The respective constants are now located in the according xnat object implementation Removed unused includes Removed commented-out legacy code Ivo Wolf (1): Refactored and extended download Jean-Christophe Fillion-Robin (1): BUG: Allow ctk to be imported if neither Core or Widget kit are loaded git-svn-id: http://svn.slicer.org/Slicer4/trunk@23914 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/Python/slicer/__init__.py.in | Diff File | ||
| mod - SuperBuild/External_CTK.cmake | Diff File | ||
|
master 7614ba3c 2015-01-23 05:39:09 Details Diff |
COMP: Update curl project to fix more CMP0054 warnings This commit fixes warnings occurring when using CMake >= 3.1.0 // --------------- Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> Date: Fri Jan 23 05:33:51 2015 -0500 Simplify an other if() conditions on check result variables Remove use of an old hack that takes advantage of the auto-dereference behavior of the if() command to detect if a variable is defined. The hack has the form: if("${VAR} MATCHES "^${VAR}$") where "${VAR}" is a macro argument reference. Use if(NOT DEFINED) instead. This also avoids warnings for CMake Policy CMP0054. // --------------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23913 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_curl.cmake | Diff File | ||
|
master 8470f509 2015-01-23 05:39:07 Details Diff |
COMP: Update DCMTK to fix additional CMP0054 warnings This commit fixes warnings occurring when using CMake >= 3.1.0 //------------ Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> Date: Fri Jan 23 05:17:58 2015 -0500 Simplify if() conditions on check result variables Remove use of an old hack that takes advantage of the auto-dereference behavior of the if() command to detect if a variable is defined. The hack has the form: if("${VAR} MATCHES "^${VAR}$") where "${VAR}" is a macro argument reference. Use if(NOT DEFINED) instead. This also avoids warnings for CMake Policy CMP0054. //------------ git-svn-id: http://svn.slicer.org/Slicer4/trunk@23912 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_DCMTK.cmake | Diff File | ||
|
master c2199157 2015-01-23 05:39:05 Details Diff |
COMP: Update python to fix CMP0054 warnings This commit fixes warnings occurring when using CMake >= 3.1.0 $ git shortlog ee53f7..0838470 --no-merges Chuck Atkins (1): Allow system BZip2 Jean-Christophe Fillion-Robin (1): Simplify if() conditions on check result variables to fix CMP0054 warnings git-svn-id: http://svn.slicer.org/Slicer4/trunk@23911 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_python.cmake | Diff File | ||
|
master be76760e 2015-01-23 04:15:44 Details Diff |
BUG: Update VTK - Fix tests reverting commit updating After reverting kitware/VTK@238163f (6657: Add out-of-range colors to color maps) , the following tests are now passing (tested on MacOSX 10.6.8): py_sceneImport2428 py_ThresholdThreadingTest py_StandaloneEditorWidgetTest py_labelToggleBug2049 py_RSNAVisTutorial py_RSNAQuantTutorial py_JRC2013Vis py_NeurosurgicalPlanningTutorialMarkupsSelfTest py_NeurosurgicalPlanningTutorial git-svn-id: http://svn.slicer.org/Slicer4/trunk@23910 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_VTKv6.cmake | Diff File | ||
|
master 6a54471d 2015-01-23 03:05:15 Details Diff |
STYLE: Fix indent and provide clarification related to previous commit. The vtkImageAccumulate filter has been fixed in kitware/VTK@a952720 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23909 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/vtkImageBimodalAnalysis.cxx | Diff File | ||
|
master b63c6510 2015-01-23 02:54:15 Details Diff |
BUG: Fix vtkImageBimodalAnalysis to work with any input scalar type Following kitware/VTK@238163f, the vtkImageAccumulate filter has been fixed to work with large images by changing its output type from "int" to "vtkIdType". Considering that (1) the output of the vtkImageAccumulate filter was the input of the vtkImageBimodalAnalysis filter and (2) the vtkImageBimodalAnalysis "ExecuteData" function didn't specify the vtkIdType scalar type in its list of hard-coded switch cases The window and level computed by the bimodal filter were 0 and the ad-hoc approach was then used to compute the windows and level. This commit fixes the problem by updating the bimodal filter to use the vtkTemplateMacro avoiding to systematically list all cases. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23908 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/vtkImageBimodalAnalysis.cxx | Diff File | ||
|
master 79efc3d4 2015-01-23 02:54:13 Details Diff |
COMP: Fix unused parameter warning in vtkITKTransformInverse git-svn-id: http://svn.slicer.org/Slicer4/trunk@23907 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/vtkITKTransformInverse.h | Diff File | ||
|
master f59a689a 2015-01-22 19:05:01 Details Diff |
BUG: Update VTK to fix crash when opening Volumes module after loading MRHead //-------------- Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> Date: Thu Jan 22 19:02:46 2015 -0500 Fix vtkColorTransferFunction crash most likely introduced by kitware/VTK@238163f Crash happen when calling AdjustRange() with [0, 279] //-------------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23906 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_VTKv6.cmake | Diff File | ||
|
master 49d649b1 2015-01-22 10:01:20 Details Diff |
ENH: Changed default ITK bspline transform writing file format to ITKv4 BRAINS now fully supports the new ITKv4 bspline and composite transform file formats therefore by default PreferITKv3CompatibleTransforms flag in vtkMRMLTransformStorageNode can be turned off. From now on, if a bspline transform can be saved in both ITKv3 and ITKv4 format then ITKv4 format is used. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23905 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/vtkMRMLTransformStorageNode.cxx | Diff File | ||
