Changesets: Import 2017-06-07 23:51:09
|
master dd595ab9 2014-06-18 11:02:11 Details Diff |
COMP: Update CTK to fix build warnings $ git shortlog 1dbffd..48ef9aeb --no-merges Jean-Christophe Fillion-Robin (2): Fix warning complaining about missing resource with resource list is empty. Fix unused variable warnings git-svn-id: http://svn.slicer.org/Slicer4/trunk@23342 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_CTK.cmake | Diff File | ||
|
master 6c12ae6a 2014-06-18 09:53:25 Details Diff |
COMP: Update EMSegment project to fix VTKv6 build error. //------------------ r17058 | jcfr | 2014-06-18 09:47:30 -0400 (Wed, 18 Jun 2014) | 9 lines COMP: Fix compilation against VTKv6. This commits fixes build error introduced by r17053. Few tests are still failing due to memory leaks and will be fixed at a later time: * EMSegCL_Task_MRIHumanBrain_BRAINS_small * EMSegCL_Task_MRIHumanBrainFullParcellation_BRAINS_small //------------------ git-svn-id: http://svn.slicer.org/Slicer4/trunk@23341 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild.cmake | Diff File | ||
|
master d355ad56 2014-06-18 01:45:16 Details Diff |
COMP: Update SlicerExecutionModel This commit both (1) fixes CMake 3.0 config warnings (see below) and (2) updates the project to include fixes and improvements contributed by the community: //------------------------------ $ git shortlog 46f3d89..865e2a7 --no-merges Jean-Christophe Fillion-Robin (4): ENH: Set default value for CMAKE_BUILD_TYPE ENH: Add support for CMake 3.0 removing use of LOCATION target property ENH: Re-factor GenerateCLP tests to support multi config system COMP: By default, disable JsonCpp support. Jim Miller (2): Update README.md Update README.md Julien Finet (1): Don't search default path when JsonCpp_DIR is provided Matt McCormick (3): BUG: Output vector argument should not be assigned. BUG: Serialize a geometry Parameter with aggregate="true", multiple="true". BUG: Fix serialization/deserialization with not Multiple but vector. Matthew Woehlke (2): ENH: Refactor [de]serialize format for brevity STYLE: Avoid file(GLOB) ivmartel (1): Allow for reference attribute for geometries. //------------------------------ This commit fixes the following warning: //-------------------- CMake Warning (dev) at GenerateCLP/GenerateGenerateCLPConfig.cmake:7 (get_target_property): Policy CMP0026 is not set: Disallow use of the LOCATION target property. Run "cmake --help-policy CMP0026" for policy details. Use the cmake_policy command to set the policy and suppress this warning. The LOCATION property should not be read from target "GenerateCLPLauncher". Use the target name directly with add_custom_command, or use the generator expression $<TARGET_FILE>, as appropriate. Call Stack (most recent call first): GenerateCLP/CMakeLists.txt:201 (include) This warning is for project developers. Use -Wno-dev to suppress it. //-------------------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23340 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_SlicerExecutionModel.cmake | Diff File | ||
|
master ed27fd87 2014-06-18 01:45:14 Details Diff |
COMP: Update VTK project to fix CMake 3.0 configuration warnings This commits updates Slicer VTK fork to include two commits backported from VTK master. See commit kitware/VTK@7df9a25f and kitware/VTK@d19b4db8 $ git shortlog baa177b..4d7abb2 Brad King (2): COMP: Drop invalid custom commands from HDF5 COMP: Drop missing dependencies of target 'vtkpython_pyc' git-svn-id: http://svn.slicer.org/Slicer4/trunk@23339 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_VTKv6.cmake | Diff File | ||
|
master cbb9eccf 2014-06-18 00:18:43 Details Diff |
BUG: Update VTK project to fix build using Xcode 5.1.1 This commit updates the Slicer VTK project to include the following patch cherry-picked from current VTK development branch. Thanks to Hans Johnson for suggesting the backport. 8<-----8<-----8<-----8<-----8<-----8<-----8<-----8<----- Author: Sean McBride <sean@rogue-research.com> Date: Thu Feb 13 14:26:42 2014 -0500 Removed -fobjc-gc from VTK_REQUIRED_OBJCXX_FLAGS There are 3 memory management models in Cocoa, chronologically by introduction: MRR, GC, ARC. VTK supports the first two. GC is now deprecated however, and Xcode 5.1 will no longer even build GC code. Therefore removed the -fobjc-gc option as a default. (It built the libraries as both MRR and GC compatible, which was convienent for library code.) 8<-----8<-----8<-----8<-----8<-----8<-----8<-----8<----- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23338 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_VTKv6.cmake | Diff File | ||
|
master cdf8cf79 2014-06-18 00:18:41 Details Diff |
BUG: Update ExecutionModelTourTest input scene to include MRML version This commit updates the test input data to account for commit r23331 including MRML version in the mrml file. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23337 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Testing/Data/Input/ExecutionModelTourTest.mrml | Diff File | ||
|
master fd2dedf4 2014-06-18 00:18:39 Details Diff |
COMP: Change default version of VTK to 6 As discussed during June 17 developer hangout and also highlighted on the Slicer developer list [1], consider that a lot of developer have been reporting issue and we now have the Slicer application able to build and run when build against VTK6. This commit changes the default version of VTK. It is anticipated that some extension will fail to build, error will be addressed as they come. Additional help will also be provided for extension developers during the coming project week. See [2] [1] http://slicer-devel.65872.n3.nabble.com/VTK-6-enabled-by-default-tt4031841.htm [2] http://www.na-mic.org/Wiki/index.php/2014_Summer_Project_Week git-svn-id: http://svn.slicer.org/Slicer4/trunk@23336 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMakeLists.txt | Diff File | ||
|
master 57f14d0d 2014-06-17 13:59:25 Details Diff |
BUG: Replaced outdated sliceWidgetRed_interactorStyle slicer.sliceWidgetRed_sliceLogic git-svn-id: http://svn.slicer.org/Slicer4/trunk@23335 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild.cmake | Diff File | ||
|
master 5db1ce60 2014-06-17 12:21:11 Details Diff |
BUG: Test failed as MRML node now also include version number in mrml file git-svn-id: http://svn.slicer.org/Slicer4/trunk@23334 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild.cmake | Diff File | ||
|
master a7893ce7 2014-06-16 22:56:24 Details Diff |
ENH: Tweak Multi-sampling option This commits improve the user experience related to new multi sample option introduced in r23305. It now allows to specify the number of samples. Finally the code has been refactored to improve the flow of changes and to use a cleaner signal/slot interface. From: Eric Larson <larson.eric.d@gmail.com> git-svn-id: http://svn.slicer.org/Slicer4/trunk@23333 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTGUI/Resources/UI/qSlicerSettingsViewsPanel.ui | Diff File | ||
| mod - Base/QTGUI/qSlicerSettingsViewsPanel.cxx | Diff File | ||
| mod - Base/QTGUI/qSlicerSettingsViewsPanel.h | Diff File | ||
| mod - SuperBuild/External_CTK.cmake | Diff File | ||
|
master ace35549 2014-06-16 19:04:12 Details Diff |
BUG: data() is not part of std::vector on windows compilers git-svn-id: http://svn.slicer.org/Slicer4/trunk@23332 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild.cmake | Diff File | ||
|
master b8bae2ce 2014-06-13 14:17:44 Details Diff |
BUG: 3231. Added MRML scene version check and warning on scene load. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23331 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/vtkMRMLScene.cxx | Diff File | ||
| mod - Libs/MRML/Core/vtkMRMLScene.h | Diff File | ||
| mod - Modules/Loadable/Data/qSlicerSceneReader.cxx | Diff File | ||
| mod - Modules/Loadable/Data/qSlicerSceneWriter.cxx | Diff File | ||
|
master 7e952c0c 2014-06-12 22:37:02 Details Diff |
BUG: N4ITKBiasFieldCorrection - Change output type to float Cast of the output to the input type led to occasional overflows. Output of this module is inherently floating point, as it is a multuplication of the recovered bias field by the input image. From: Andrey Fedorov <fedorov@bwh.harvard.edu> git-svn-id: http://svn.slicer.org/Slicer4/trunk@23330 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/CLI/N4ITKBiasFieldCorrection/N4ITKBiasFieldCorrection.cxx | Diff File | ||
|
master e005b2ca 2014-06-12 22:17:26 Details Diff |
BUG: vtkSlicerCommonInterface did not define the right plugin path to plugins when EMSEgmenter was run by installed package git-svn-id: http://svn.slicer.org/Slicer4/trunk@23329 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild.cmake | Diff File | ||
|
master b3781f8c 2014-06-11 17:42:39 Details Diff |
BUG: N4ITK changes the image range which can cause problems for images of scalar type short if they fall outside the range git-svn-id: http://svn.slicer.org/Slicer4/trunk@23328 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild.cmake | Diff File | ||
|
master 12049606 2014-06-11 15:23:11 Details Diff |
STYLE: update to latest CompareVolumes code Changes style of slice view name. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23327 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild.cmake | Diff File | ||
|
master 46783073 2014-06-11 15:23:08 Details Diff |
STYLE: remove unused backwards compatibility code This snippet of code was used during the initial porting of code from slicer3 to slicer4 but has since been replaced with direct access to the corresponding items via the regular layoutManager API. This code also had the unwanted restriction that all Slice View layout names had to be valid python identifiers (no hyphens or spaces) which led to spurious syntax error messages for some use cases. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23326 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTGUI/qSlicerLayoutManager.cxx | Diff File | ||
|
master 2153c296 2014-06-11 15:12:09 Details Diff |
BUG: don't try updating a 2D displayable manager if there is no slice node This is an invalid condition that can lead to errors being generated by the rest of the displayable manager code. The condition that this checks for happens when a slice view is being created but has not yet been fully configured (that is, this can be triggered when the scene is assigned to the slice view, but the slice node has not yet been assigned; in this case the slice node being assigned will trigger the needed update). git-svn-id: http://svn.slicer.org/Slicer4/trunk@23325 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/Markups/MRMLDM/vtkMRMLMarkupsDisplayableManager2D.cxx | Diff File | ||
|
master 1ac16a45 2014-06-10 15:31:35 naucoin Details Diff |
BUG: calculate range of active scalar Getting the scalar range on the poly data was returning an incorrect tuple. Get the range of the active scalar array instead. Issue 0003672 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23324 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/TractographyDisplay/MRML/vtkMRMLFiberBundleGlyphDisplayNode.cxx | Diff File | ||
| mod - Modules/Loadable/TractographyDisplay/MRML/vtkMRMLFiberBundleLineDisplayNode.cxx | Diff File | ||
| mod - Modules/Loadable/TractographyDisplay/MRML/vtkMRMLFiberBundleTubeDisplayNode.cxx | Diff File | ||
|
master ef0a5efe 2014-06-09 18:35:07 mwoehlke Details Diff |
COMP: Don't specify themed icons in .ui file Remove specification of themed icons from qSlicerAppMainWindow.ui, as this requires Qt 4.8 (and apparently uic gets really grumpy about attributes it doesn't recognize, rather than just ignoring them). For now, we set them in qSlicerAppMainWindow.cxx instead. See also r23322. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23323 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Applications/SlicerApp/Resources/UI/qSlicerAppMainWindow.ui | Diff File | ||
| mod - Applications/SlicerApp/qSlicerAppMainWindow.cxx | Diff File | ||
|
master 37c38968 2014-06-09 15:18:24 mwoehlke Details Diff |
ENH: Clean up icon usage Create new "XSmall" icon size for 16x16 icons, enabling us to provide separate 16x16 (e.g. menu) and 22x22 (e.g. tool bar) icon sizes. Replace ugly undo/redo icons with icons from the (public domain) Tango[1] theme. Replace home icon with its Tango version for better consistency. Create a script to generate qSlicerBaseQTGUI.qrc, as manually adding as many as five entries per new icon is unnecessarily awkward. Arrange to use themed icons when possible. (1: http://tango.freedesktop.org/Tango_Icon_Library) git-svn-id: http://svn.slicer.org/Slicer4/trunk@23322 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Applications/SlicerApp/Resources/UI/qSlicerAppMainWindow.ui | Diff File | ||
| mod - Applications/SlicerApp/qSlicerAppMainWindow.cxx | Diff File | ||
| mod - Base/QTGUI/Resources/Icons/Large/SlicerHome.png | Diff File | ||
| add - Base/QTGUI/Resources/Icons/Large/SlicerRedo.png | Diff File | ||
| add - Base/QTGUI/Resources/Icons/Large/SlicerUndo.png | Diff File | ||
| mod - Base/QTGUI/Resources/Icons/Medium/SlicerHome.png | Diff File | ||
| add - Base/QTGUI/Resources/Icons/Medium/SlicerRedo.png | Diff File | ||
| add - Base/QTGUI/Resources/Icons/Medium/SlicerUndo.png | Diff File | ||
| rm - Base/QTGUI/Resources/Icons/Redo.png | Diff File | ||
| mod - Base/QTGUI/Resources/Icons/Small/SlicerEditCopy.png | Diff File | ||
| mod - Base/QTGUI/Resources/Icons/Small/SlicerEditCut.png | Diff File | ||
| mod - Base/QTGUI/Resources/Icons/Small/SlicerEditPaste.png | Diff File | ||
| mod - Base/QTGUI/Resources/Icons/Small/SlicerHome.png | Diff File | ||
| add - Base/QTGUI/Resources/Icons/Small/SlicerRedo.png | Diff File | ||
| add - Base/QTGUI/Resources/Icons/Small/SlicerUndo.png | Diff File | ||
| rm - Base/QTGUI/Resources/Icons/Undo.png | Diff File | ||
| mod - Base/QTGUI/Resources/Icons/XLarge/SlicerHome.png | Diff File | ||
| add - Base/QTGUI/Resources/Icons/XLarge/SlicerRedo.png | Diff File | ||
| add - Base/QTGUI/Resources/Icons/XLarge/SlicerUndo.png | Diff File | ||
| add - Base/QTGUI/Resources/Icons/XSmall/SlicerEditCopy.png | Diff File | ||
| add - Base/QTGUI/Resources/Icons/XSmall/SlicerEditCut.png | Diff File | ||
| add - Base/QTGUI/Resources/Icons/XSmall/SlicerEditPaste.png | Diff File | ||
| add - Base/QTGUI/Resources/Icons/XSmall/SlicerHome.png | Diff File | ||
| add - Base/QTGUI/Resources/Icons/XSmall/SlicerRedo.png | Diff File | ||
| add - Base/QTGUI/Resources/Icons/XSmall/SlicerUndo.png | Diff File | ||
| mod - Base/QTGUI/Resources/qSlicerBaseQTGUI.qrc | Diff File | ||
| mod - Base/QTGUI/qSlicerIconEnginePlugin.cxx | Diff File | ||
| add - Utilities/Scripts/genqrc.py | Diff File | ||
|
master 7a197338 2014-06-09 15:18:22 mwoehlke Details Diff |
STYLE: Remove unused icons Remove some icon files from the repository that are not used anywhere. This is in preparation for a major clean-up and refactoring. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23321 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| rm - Base/QTGUI/Resources/Icons/LoadScene.png | Diff File | ||
| rm - Base/QTGUI/Resources/Icons/LoadVolume.png | Diff File | ||
|
master 6ef55106 2014-06-09 15:18:21 mwoehlke Details Diff |
ENH: Improvements to extension notification icons Clean up the SVG for the existing extension notification icons, and change the error icon from a circle to a box (matches oxygen, and "frees" the circle for the information icon, such that all three have different shapes). Add an information icon. It's not in use yet, but will be used for updates. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23320 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTGUI/Resources/Icons/ExtensionError.svg | Diff File | ||
| mod - Base/QTGUI/Resources/Icons/ExtensionIncompatible.svg | Diff File | ||
| add - Base/QTGUI/Resources/Icons/ExtensionUpdateAvailable.svg | Diff File | ||
|
master 7fe1aef5 2014-06-09 13:02:03 mwoehlke Details Diff |
BUG: Don't stop uninstall on first error Change how we process scheduled extension uninstall operations to continue trying to uninstall all extensions, rather than stopping the process after the first error. The old behavior is a result of operand order to the '&&' operator, which employs short-circuit evaluation to skip evaluation of the second argument (the call to uninstall the extension) if the first argument (the overall result 'accumulator') is false, and was likely unintentional, due to overlooking the short circuit evaluation. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23319 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTCore/qSlicerExtensionsManagerModel.cxx | Diff File | ||
|
master 118f869a 2014-06-09 13:02:02 mwoehlke Details Diff |
STYLE: Fix spelling error in comment git-svn-id: http://svn.slicer.org/Slicer4/trunk@23318 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTGUI/CMakeLists.txt | Diff File | ||
