Changesets: Import 2017-06-07 23:51:09
|
master 2e4ea62c 2016-10-12 23:50:37 Details Diff |
BUG: ExtensionBuildSystem: Update tests to illustrate 0004247 problem. Note: This commit causes the extension build system tests to fail. For sake of clarity, it is NOT squashed with the next commit that is fixing the problem. --- On Ubuntu using 3.4.2 $ ctest -R py_cmake_slicer_extensions Test project /home/jcfr/Projects/Slicer-Release/Slicer-build Start 7: py_cmake_slicer_extensions_index_build_without_upload 1/4 Test 0000007: py_cmake_slicer_extensions_index_build_without_upload ............... Passed 7.05 sec Start 8: py_cmake_slicer_extensions_index_build_with_upload 2/4 Test 0000008: py_cmake_slicer_extensions_index_build_with_upload ..................***Failed 12.53 sec Start 9: py_cmake_slicer_extensions_index_build_with_upload_using_ctest 3/4 Test 0000009: py_cmake_slicer_extensions_index_build_with_upload_using_ctest ...... Passed 33.31 sec Start 10: py_cmake_slicer_extensions_index_build_without_upload_using_ctest 4/4 Test 0000010: py_cmake_slicer_extensions_index_build_without_upload_using_ctest ... Passed 7.29 sec Tested-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> --- On Windows: C:\dev\slcr\s4-vs13\Slicer-build>ctest -C Debug -R py_cmake_slicer_extensions Test project C:/dev/slcr/s4-vs13/Slicer-build Start 7: py_cmake_slicer_extensions_index_build_without_upload 1/4 Test 0000007: py_cmake_slicer_extensions_index_build_without_upload ............... Passed 129.20 sec Start 8: py_cmake_slicer_extensions_index_build_with_upload 2/4 Test 0000008: py_cmake_slicer_extensions_index_build_with_upload ..................***Failed 106.77 sec Start 9: py_cmake_slicer_extensions_index_build_with_upload_using_ctest 3/4 Test 0000009: py_cmake_slicer_extensions_index_build_with_upload_using_ctest ......***Failed 104.04 sec Start 10: py_cmake_slicer_extensions_index_build_without_upload_using_ctest 4/4 Test 0000010: py_cmake_slicer_extensions_index_build_without_upload_using_ctest ... Passed 125.68 sec Tested-by: Isaiah Norton <inorton@bwh.harvard.edu> --- On MacOSX: The following tests passed: py_cmake_slicer_extensions_index_build_without_upload py_cmake_slicer_extensions_index_build_with_upload_using_ctest py_cmake_slicer_extensions_index_build_without_upload_using_ctest 75% tests passed, 1 tests failed out of 4 Label Time Summary: CMake = 174.82 sec (4 tests) Total Test time (real) = 174.95 sec The following tests FAILED: 8 - py_cmake_slicer_extensions_index_build_with_upload (Failed) Tested-by: Steve Pieper <pieper@isomics.com> --- git-svn-id: http://svn.slicer.org/Slicer4/trunk@25438 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Extensions/CMake/Testing/SlicerExtensionBuildSystemTest.py | Diff File | ||
|
master 06a551a3 2016-10-12 23:50:35 Details Diff |
BUG: midas_api_upload_extension: Do not report warning if metadata are empty This commit is a follow up of r25434 (BUG: Extension upload: Ensure missing optional metatdata do not cause failure), it fixes the following warning: ``` 8: CMake Warning (dev) at /home/jcfr/Projects/Slicer/Extensions/CMake/MIDASAPIUploadExtension.cmake:75 (message): 8: warning: CMake variable EXTENSION_CATEGORY is empty ! 8: Call Stack (most recent call first): 8: /home/jcfr/Projects/Slicer/Extensions/CMake/SlicerExtensionPackageAndUploadTarget.cmake:260 (midas_api_upload_extension) 8: 8: This warning is for project developers. Use -Wno-dev to suppress it. ``` git-svn-id: http://svn.slicer.org/Slicer4/trunk@25437 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Extensions/CMake/MIDASAPIUploadExtension.cmake | Diff File | ||
|
master 48cdc292 2016-10-12 14:34:54 Details Diff |
BUG: Slice view controller segmentation selector selects segmentation It was quite confusing that even if there was a segmentation node in the scene, the selector in the slice view controllers showed None selection until the user changed it (note that the segmentation selector works differently than the volume selectors, as instead of setting there what to show on that layer, it can be used to change the visibility options of any segmentation, as multiple of those can be shown at the same time). Addition of selectNodeUponCreation was not the change that fixed the issue, but still committing, because it may be useful later. git-svn-id: http://svn.slicer.org/Slicer4/trunk@25436 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Widgets/Resources/UI/qMRMLSliceControllerWidget.ui | Diff File | ||
| mod - Libs/MRML/Widgets/qMRMLSegmentSelectorWidget.cxx | Diff File | ||
| mod - Libs/MRML/Widgets/qMRMLSegmentSelectorWidget.h | Diff File | ||
| mod - Libs/MRML/Widgets/qMRMLSliceControllerWidget.cxx | Diff File | ||
|
master c861caba 2016-10-12 14:13:19 Details Diff |
BUG: Ensure ExtensionBuildSystem tests propagate CMAKE_OSX_* vars This commit fixes error like this one: ``` 7: -- Setting OSX_ARCHITECTURES to 'x86_64' as none was specified. 7: -- Setting OSX_SYSROOT to latest '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk' as none was specified. 7: CMake Error at /Users/inorton/git/slcr/r4/CMake/SlicerBlockSetCMakeOSXVariables.cmake:102 (message): 7: The OSX_SYSROOT is set to version 10.12 (>10.8) and OSX_DEPLOYMENT_TARGET 7: is not explicitly set! 7: 7: Since: 7: 7: (1) the default runtime associated with >=10.9 deployment target is 'libc++'.[1] 7: (2) the default runtime associated with <=10.8 deployment target is 'libstdc++'. 7: (3) Qt support for 'macx-clang-libc++' is listed as 'unsupported' mkspecs. 7: (4) Qt binaries may be build against 'libstdc++' or 'libc++'. 7: (5) Mixing the two different runtime in binaries is unstable. 7: [1]http://stackoverflow.com/questions/19637164/c-linking-error-after-upgrading-to-mac-os-x-10-9-xcode-5-0-1/19637199#19637199 7: 7: -------------------------------- 7: 7: Run '$otool -L $(which qmake) |grep lib.\*c++' to check what library Qt is 7: built against: 7: 7: (1) if it is libstdc++ then add '-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.8' (or older) to the cmake command line. 7: (2) if it is libc++ then add '-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.9' (or newer) to the cmake command line. 7: 7: Call Stack (most recent call first): 7: CMakeLists.txt:14 (include) 7: ``` Reported-by: Isaiah Norton <isaiah.norton@gmail.com> Tested-by: Isaiah Norton <isaiah.norton@gmail.com> git-svn-id: http://svn.slicer.org/Slicer4/trunk@25435 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Extensions/CMake/Testing/SlicerExtensionBuildSystemTest.py | Diff File | ||
| mod - Extensions/CMake/Testing/SlicerExtensionBuildSystemTestConfig.py.in | Diff File | ||
|
master 3e9cfb48 2016-10-12 14:13:17 Details Diff |
BUG: Extension upload: Ensure missing optional metatdata do not cause failure This commit improves the Extension build system tests to check that: (1) optional extension metatdata NOT specified in the CMakeLists do NOT prevent the configure/build/test/upload from happening (2) metadata submitted to the extension server during the upload are the expected ones. Fixes 0004276 git-svn-id: http://svn.slicer.org/Slicer4/trunk@25434 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/UseSlicer.cmake.in | Diff File | ||
| mod - Extensions/CMake/MIDASAPIUploadExtension.cmake | Diff File | ||
| mod - Extensions/CMake/Testing/SlicerExtensionBuildSystemTest.py | Diff File | ||
|
master b5982e71 2016-10-12 14:13:15 Details Diff |
STYLE: UseSlicerMacros: setting_variable_message function learn PRETEXT arg It is now possible to override the default pretext, specifying PRETEXT argument. git-svn-id: http://svn.slicer.org/Slicer4/trunk@25433 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/UseSlicerMacros.cmake | Diff File | ||
|
master dc71a74d 2016-10-12 14:13:14 Details Diff |
STYLE: UseSlicerMacros: Use CMakeParseArguments with setting_variable_message This is done anticipating a other change. git-svn-id: http://svn.slicer.org/Slicer4/trunk@25432 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/UseSlicerMacros.cmake | Diff File | ||
|
master 4addb44d 2016-10-12 14:13:13 Details Diff |
STYLE: UseSlicer: Simplify how list of optional extension variable is obtained git-svn-id: http://svn.slicer.org/Slicer4/trunk@25431 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/UseSlicer.cmake.in | Diff File | ||
|
master 22d0074d 2016-10-12 05:40:28 Details Diff |
ENH: SlicerWelcome: Automatically update Wiki URL to reference expected pages If the running version of Slicer is a release package, the links will be updated to point to the corresponding namespaced wiki pages. Otherwise, they will be updated to point to "Nightly" documentation. git-svn-id: http://svn.slicer.org/Slicer4/trunk@25430 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/SlicerWelcome/qSlicerWelcomeModuleWidget.cxx | Diff File | ||
|
master cbefdee3 2016-10-12 05:40:27 Details Diff |
STYLE: SlicerWelcome: Update links * Update link to Slicer Registration Case Library * Update link to Acknowledgments * Add link to Segment Editor (instead of Editor) * Add link to Markups module git-svn-id: http://svn.slicer.org/Slicer4/trunk@25429 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/SlicerWelcome/Resources/HTML/Acknowledgment.html | Diff File | ||
| mod - Modules/Loadable/SlicerWelcome/Resources/HTML/OtherUsefulHints.html | Diff File | ||
|
master bde34985 2016-10-12 05:40:25 Details Diff |
STYLE: Fix unused variable warning in vtkMRMLAbstractDisplayableManager git-svn-id: http://svn.slicer.org/Slicer4/trunk@25428 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/DisplayableManager/vtkMRMLAbstractDisplayableManager.h | Diff File | ||
|
master 8addf427 2016-10-12 00:57:58 Details Diff |
ENH: DMRIInstall module: Tweak UI * Change help text into HTML and use a ctkTextFittedBrowser to display it * Associated icon with the "Open Extension Manager" button * Other minor code layout tweaks From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> git-svn-id: http://svn.slicer.org/Slicer4/trunk@25427 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Scripted/DMRIInstall/DMRIInstall.py | Diff File | ||
|
master a7626487 2016-10-12 00:57:56 Details Diff |
STYLE: Remove commented code from qSlicerModulePanel From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> git-svn-id: http://svn.slicer.org/Slicer4/trunk@25426 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTGUI/qSlicerModulePanel.cxx | Diff File | ||
|
master b7043686 2016-10-12 00:57:54 Details Diff |
ENH: Add helper module to suggest installation of SlicerDMRI extension This commit adds a scripted module named "DMRIInstall". After the user open the module, a button to open the extension manager along side a label with the following text will be visible: Please use the Extension Manager to install the "SlicerDMRI" extension for diffusion-related tools including: Diffusion Tensor Estimation Tractography Display Tractography Seeding Fiber Tract Measurement From: Isaiah Norton <isaiah.norton@gmail.com> git-svn-id: http://svn.slicer.org/Slicer4/trunk@25425 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Scripted/CMakeLists.txt | Diff File | ||
| add - Modules/Scripted/DMRIInstall/CMakeLists.txt | Diff File | ||
| add - Modules/Scripted/DMRIInstall/DMRIInstall.py | Diff File | ||
|
master ef2eb595 2016-10-11 16:30:44 Details Diff |
BUG: Make sure the segment selector widget combobox is updated The checkable combobox was not repainted unless it was the first segment whose visibility was changed, otherwise it was only updated on mouse hover. Now repaint is forced when selection is changed to make sure the changes are reflected in the checkable combobox. git-svn-id: http://svn.slicer.org/Slicer4/trunk@25424 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Widgets/qMRMLSegmentSelectorWidget.cxx | Diff File | ||
|
master aca0f5db 2016-10-11 14:30:46 Details Diff |
ENH: Update Qt link in about box git-svn-id: http://svn.slicer.org/Slicer4/trunk@25423 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTCore/qSlicerCoreApplication.cxx | Diff File | ||
|
master 1c38abaa 2016-10-11 14:26:49 Details Diff |
ENH: Update MultiVolumeImporter: Better support for 4D Cardiac CT This commit updates MultiVolumeImporter plugin to include an improved handling of certain types of 4D Cardiac CT. Thanks to @lassoan for identifying the use case and contributing the patch. $ git shortlog 669594f..2ebb4d2 --no-merges Andras Lasso (1): ENH: Allow loading of multi-volumes when multiple series are selected in the DICOM browser Andrey Fedorov (1): BUG: re-enable parsing multi-series with the IPP+AcquisitionTime strategy From: Andrey Fedorov <andrey.fedorov@gmail.com> git-svn-id: http://svn.slicer.org/Slicer4/trunk@25422 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild.cmake | Diff File | ||
|
master cc0ed3fc 2016-10-11 14:09:25 Details Diff |
ENH: Added OBJ file save option for model nodes From: Andras Lasso <lasso@queensu.ca> git-svn-id: http://svn.slicer.org/Slicer4/trunk@25421 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMakeLists.txt | Diff File | ||
| mod - Libs/MRML/Core/Testing/CMakeLists.txt | Diff File | ||
| mod - Libs/MRML/Core/Testing/vtkMRMLModelStorageNodeTest1.cxx | Diff File | ||
| mod - Libs/MRML/Core/vtkMRMLModelStorageNode.cxx | Diff File | ||
|
master 8b8fe6da 2016-10-08 19:10:21 Details Diff |
BUG: Update CTK to include vtkLightBoxRendererManager fix. It fixes problem discussed in [1] and is related to Slicer issue 4251 [1] https://app.assembla.com/spaces/slicerrt/tickets/823-segmentation-disappears-after-deselecting-volume-in-slice-view/details commit commontk/CTK@6b40e56 Author: Andras Lasso <lasso@queensu.ca> Date: Sat Oct 8 12:13:59 2016 -0400 ENH: Preserve actor order in vtkLightBoxRendererManager The order of how 2D actors are added to the renderer greatly influences the rendering result. Therefore, for consistent rendering results actor ordering in slice viewer has to be preserved when just changing the input image data. Old behavior: When input to slice viewer was set to NULL (no image is selected for display), the image actor was removed from the renderer. When an image was selected again, the image actor was added again. This changed the actor order. Implemented fix: Modified the behavior to only hide the image actor when input is set to NULL. This way when image input is later set to non-NULL, the image actor does not get promoted to the top of the actor list (but keeps its original position). git-svn-id: http://svn.slicer.org/Slicer4/trunk@25420 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_CTK.cmake | Diff File | ||
|
master 2d54809b 2016-10-07 14:23:11 Details Diff |
COMP: remove vtkTeem/DMRI-related tests. Tractography-related parts of vtkTeem were removed in commit r25408 so tests using that functionality will be moved to SlicerDMRI: https://github.com/SlicerDMRI/SlicerDMRI From: Isaiah Norton <inorton@bwh.harvard.edu> git-svn-id: http://svn.slicer.org/Slicer4/trunk@25419 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Applications/SlicerApp/Testing/Python/CMakeLists.txt | Diff File | ||
| rm - Applications/SlicerApp/Testing/Python/DTINotReproducibleIssue3977.py | Diff File | ||
| rm - Applications/SlicerApp/Testing/Python/SlicerMRBTest.py | Diff File | ||
| rm - Applications/SlicerApp/Testing/Python/fiber_visibility_crash2438.py | Diff File | ||
| rm - Applications/SlicerApp/Testing/Python/test_tractography_display.py | Diff File | ||
| mod - Modules/Loadable/Markups/Testing/Python/CMakeLists.txt | Diff File | ||
| rm - Modules/Loadable/Markups/Testing/Python/NeurosurgicalPlanningTutorialMarkupsSelfTest.py | Diff File | ||
|
master 6f7a8d0e 2016-10-06 15:43:07 Details Diff |
ENH: Re-enable Slicer_BUILD_PARAMETERSERIALIZER_SUPPORT git-svn-id: http://svn.slicer.org/Slicer4/trunk@25418 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMakeLists.txt | Diff File | ||
|
master 0717680c 2016-10-06 15:43:01 Details Diff |
BUG: Fix windows packaging with Slicer_BUILD_PARAMETERSERIALIZER_SUPPORT The packaging was broken in r25346 as the packaging relies on the JsonCpp_DIR variable. No label is given to this superbuild variable as projects that want to depend explicitly on JsonCpp should rely on the JsonCpp_INCLUDE_DIR and JsonCpp_LIBRARY variables. git-svn-id: http://svn.slicer.org/Slicer4/trunk@25417 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_JsonCpp.cmake | Diff File | ||
|
master 2227cb88 2016-10-05 19:41:07 Details Diff |
BUG: Introduce macro to set "Prefer CLI executable" settings default value This commit fixes a regression introduced in r25404 (ENH: prefer executable CLIs by default) and ensures the settings default value is consistently set. git-svn-id: http://svn.slicer.org/Slicer4/trunk@25416 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTApp/qSlicerApplicationHelper.cxx | Diff File | ||
| mod - Base/QTGUI/qSlicerApplication.cxx | Diff File | ||
| mod - Base/QTGUI/qSlicerSettingsModulesPanel.cxx | Diff File | ||
| mod - CMake/vtkSlicerConfigure.h.in | Diff File | ||
|
master f255aff6 2016-10-05 18:32:30 Details Diff |
ENH: Changed default segment editor threshold max to image max As susggested by Steve Pieper: I usually find people use the default when they want skin and bones vs air and cutting off the top of the range could lead to a lot of noisy holes in the segmentation (that take a long time to process as surfaces). git-svn-id: http://svn.slicer.org/Slicer4/trunk@25415 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/Segmentations/EditorEffects/Python/SegmentEditorThresholdEffect.py | Diff File | ||
|
master 539d8edb 2016-10-05 17:32:56 Details Diff |
ENH: Revert previous commit "Added Terminology module skeleton" The commit was accidentally integrated into the trunk. git-svn-id: http://svn.slicer.org/Slicer4/trunk@25414 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/CMakeLists.txt | Diff File | ||
| rm - Modules/Loadable/Terminologies/CMakeLists.txt | Diff File | ||
| rm - Modules/Loadable/Terminologies/Logic/CMakeLists.txt | Diff File | ||
| rm - Modules/Loadable/Terminologies/Logic/vtkSlicerTerminologiesModuleLogic.cxx | Diff File | ||
| rm - Modules/Loadable/Terminologies/Logic/vtkSlicerTerminologiesModuleLogic.h | Diff File | ||
| rm - Modules/Loadable/Terminologies/Resources/UI/qSlicerTerminologiesModule.ui | Diff File | ||
| rm - Modules/Loadable/Terminologies/qSlicerTerminologiesModule.cxx | Diff File | ||
| rm - Modules/Loadable/Terminologies/qSlicerTerminologiesModule.h | Diff File | ||
| rm - Modules/Loadable/Terminologies/qSlicerTerminologiesModuleWidget.cxx | Diff File | ||
| rm - Modules/Loadable/Terminologies/qSlicerTerminologiesModuleWidget.h | Diff File | ||
