Changesets: Import 2017-06-07 23:51:09
|
master 139c902a 2015-03-06 20:09:15 Details Diff |
BUG: Ensure libvtkViewsQt is packaged on MacOSX. Fixes 0003973 This commit add libvtkViewsQt to the VTK component list so that it show up as a dependency when fixup script are used to create the MacOSX package. See commit r23755 for more details on why this problem arises. This previous commit fixes the same issue for another VTK library. From: Francois Budin <fbudin@unc.edu> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24029 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMakeLists.txt | Diff File | ||
|
master 7802d145 2015-03-06 08:19:01 Details Diff |
STYLE: Cleanup unused code in slicerMacroBuildApplication git-svn-id: http://svn.slicer.org/Slicer4/trunk@24028 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/SlicerMacroBuildApplication.cmake | Diff File | ||
|
master 2d27467c 2015-03-05 18:40:30 Details Diff |
ENH: Enable SSL support by default. OpenSSL is needed: * for python to provide the integration with github when using the extension wizard * by the extension manager to display images hosted using https * for python to install packages downloaded from https server Note that Qt is required to be built with openssl support. The default version of OpenSSL used on windows is "1.0.1h" and it matches the version used by the packages available on sourceforge.net/projects/qtx64/files/qt-x64/4.8.6/msvc2008/ To build Qt from source, instruction are provided on the Slicer wiki. See http://www.slicer.org/slicerWiki/index.php/Documentation/Nightly/Developers/Build_Instructions Co-authored-by: Hans Johnson <hans-johnson@uiowa.edu> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24027 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMakeLists.txt | Diff File | ||
| mod - SuperBuild.cmake | Diff File | ||
|
master 4772da36 2015-03-05 18:20:04 Details Diff |
ENH: Update SimpleFilter with latest SimpleITK json support This SimpleFilter adds some new filters include noise filters, more fast marching, and registration image filters ( although they have not been testing in the SimpleFilters framework ) From: Bradley Lowekamp <blowekamp@mail.nih.gov> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24026 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild.cmake | Diff File | ||
|
master 13131d38 2015-03-05 18:20:03 Details Diff |
ENH: Update SimpleITK to v0.9b01 with Registration beta $ git shortlog 1fe2f56..v0.9b01 --no-merges Bradley Lowekamp (58): Update CastITKToImage to take CovarientVector Images Adding initial implementation of FastMarchingUpwindGradientImageFilter Add template support for a "point_vec" class of members Fixup functions name for adding a seed point Block SWIG from processing private method Add initial wrapping interface for the CollidingFronts filter. Adding CollidingFronts test and updating test generation Fixing CollidingFronts tests for wrapped lanuages Improved UpwindGradient to include TargetPoints Fix initial unsigned integer type warning in test Adding baseline images for fast marching colliding fronts and upwind Update PCRE superbuild to 8.36 Update superbuild SWIG to 3.0.5 release Add typeid check for transform interfaces Fix typeo in name of transform initialize test Adding test to prevent polymorphic conversion Adding method to set using image gradient filter Updating ITK Superbuild version along 4.7 release branch Add missing headers to source files Moved CreateMetric method to separate file with explicit instantiation Adding automatic displacement parameter adapter across scales Updating displacement test to follow ITK's SimpleRegistrationTest1 Adding baseline images to displacement registration tests Make displacement example baselines CMake external data with DATA{} Adding C++ DisplacementField image registration example Fix warning unused parameter warning Fix SWIG warning in python about hidden self variable Add GetOptimizerLearningRate active measurement for registration Adding GetCurrentLevel method to registration method Updating StopCondition to be active measurement Adding GetOptimizerConvergenceValue active metric Improve callback in Displacement registration examples Factored out common metric setup code Adding Evaluate method to the registration method Must initialize metric before it is evaluated Correct construction of the composite initial transform. Rename Evaluate to MetricEvaluate to be more inline with conventions Adding testing for the MetricEvaluate method Adding documentation for the MetricEvaluate method Fix RegionGrowning template to pass point list by reference Update Colliding Fronts testing for Tcl and Lua Renaming FastMarchingImageFilter to FastMarchingBaseImageFilter Fixing the FastMarchingBase StoppingValue to match ITK Adding original FastMarchingImageFilter Add support for fast marching seed values Adding test for writing VectorImages with the series writer Adding baseline image for FastMarchingImageFilter test Updating along ITK 4.7 release Adding C++ Example for BSpline registration with LBFGSB optimizer Remove todo comments in Python example Fix erroneous extra character Adjusting tolerance for results on the dashboard Adding CTest warning suppression for internal header for gcc 4.1.2 rename typedef to avoid shadowing typename Adding a utility script to convert the HTML release notes to Wiki Add missing space in wiki link output Updating the SWIG doc strings from SimpleITK doxygen Update ITK Superbuild version tag v4.7.1 Ziv Yaniv (2): ENH: Added non default constructors to all global transformations. STYLE: Changed variable names to be consistent with usage in other methods. From: Bradley Lowekamp <blowekamp@mail.nih.gov> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24025 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_SimpleITK.cmake | Diff File | ||
|
master 836b7d66 2015-03-05 17:41:18 Details Diff |
ENH: Add slicerMacroBuildAppLibrary and slicerMacroBuildApplication Facilitate maintenance introducing two new marcos allowing to more easily create application executable and library. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24024 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Applications/SlicerApp/CMakeLists.txt | Diff File | ||
| mod - Applications/SlicerApp/Testing/Cpp/CMakeLists.txt | Diff File | ||
| mod - Applications/SlicerApp/Testing/Python/CMakeLists.txt | Diff File | ||
| add - CMake/SlicerMacroBuildApplication.cmake | Diff File | ||
| mod - CMakeLists.txt | Diff File | ||
| mod - SuperBuild.cmake | Diff File | ||
|
master 567055d0 2015-03-05 11:24:14 Details Diff |
BUG: Fixed Slicer settings and paths issues The issue was that on Windows \ is used instead of / in paths. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24023 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Applications/SlicerApp/Main.cxx | Diff File | ||
|
master 26eab978 2015-03-05 03:46:13 Details Diff |
BUG: Fix qMRMLLayoutManagerTest1 Fix regression introduced by previous commit (ENH: Add qMRMLLayoutViewFactory). Prior to commit(ENH: Add qMRMLLayoutViewFactory): (1) views were not created without a viewport and (2) scene was re-scanned in the function "updateWidgetsFromViewNodes" to create missing widgets if needed. This commit restores the previous behavior by: (1) avoiding creating a view if there are no viewport and (2) ensuring missing view are created when setting a new viewport git-svn-id: http://svn.slicer.org/Slicer4/trunk@24022 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Widgets/qMRMLLayoutManager.cxx | Diff File | ||
| mod - Libs/MRML/Widgets/qMRMLLayoutViewFactory.cxx | Diff File | ||
|
master 3f84f87f 2015-03-05 03:46:11 Details Diff |
BUG: Fix RSNAQuantTutorial test After downloading and extracting the dataset "dataset3_PETCT.zip" associated with this test using url [1], it was possible to reproduce the problem by executing these two lines in the python interpretor: slicer.util.loadScene('/path/to/PET_CT_pre-treatment.mrb') slicer.mrmlScene.Clear(0) Considering that (1) the corresponding scene has four vtkMRMLViewNode nodes and (2) the conventional layout is include only one vtkMRMLViewNode node, there was a discrepancy between the method "viewCount()" and "viewWidget(int id)". More specifically, the "viewCount()" method was returning the number of entries in the Views ivar of the qMRMLLayoutViewFactory whereas the method "viewWidget(int id)" was looking up the widget from within the registered views associated with the ctkLayoutViewFactory. It means that when "PET_CT_pre-treatment.mrb", was loaded and the scene cleared, the method XXXX was failing to retrieve the view widget because only one view was in the list of "registeredViews". [1] http://slicer.kitware.com/midas3/download?items=124185 git-svn-id: http://svn.slicer.org/Slicer4/trunk@24021 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Widgets/qMRMLLayoutViewFactory.cxx | Diff File | ||
|
master 0b7dc93b 2015-03-05 03:46:09 Details Diff |
BUG: Fix MRML layout logic to maintain backward compatibility This commit fixes regression introduced by previous commit (ENH: Add qMRMLLayoutViewFactory) and ensured that threeD, Slice and Chart node will be named as expected. Before this commit: Chart -> ViewChartView1, ViewChartView1, ... ThreeD -> View1, View2, ... Slice -> ViewSliceGreen, ViewSliceYello, ... After this commit: Chart -> ChartView1, ChartView1, ... ThreeD -> View1, View2, ... Slice -> SliceGreen, SliceRed, ... Co-authored-by: Johan Andruejol <johan.andruejol@kitware.com> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24020 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Logic/vtkMRMLLayoutLogic.cxx | Diff File | ||
|
master 9b45ade0 2015-03-05 03:46:07 Details Diff |
COMP: Fix unused variable warning git-svn-id: http://svn.slicer.org/Slicer4/trunk@24019 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Widgets/qMRMLLayoutViewFactory.cxx | Diff File | ||
|
master 231e24eb 2015-03-05 03:46:05 Details Diff |
STYLE: Remove unused dead code git-svn-id: http://svn.slicer.org/Slicer4/trunk@24018 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTGUI/qSlicerLayoutManager.cxx | Diff File | ||
| mod - Base/QTGUI/qSlicerLayoutManager.h | Diff File | ||
| mod - Libs/MRML/Widgets/qMRMLLayoutManager.h | Diff File | ||
| mod - Libs/MRML/Widgets/qMRMLLayoutManager_p.h | Diff File | ||
|
master a95df863 2015-03-05 03:45:43 Details Diff |
ENH: Add qMRMLLayoutViewFactory This gives the ability to instantiate a different QWidget for any view (e.g. 3D, slice, chart). Limited support is given to handle a new type view (subclass of vtkMRMLAbstractViewNode). For full support, the layout logic would need a similar plugin mechanism. /// MRML layout manager that instantiates the QT widgets and layouts from the /// layout node and the view nodes in the scene. /// The management (creation, configuration and deletion) of the view widgets /// are delegated to qMRMLLayoutViewFactory. /// Example to change a default factory: /// \code /// qMRMLLayoutSliceViewFactory* mrmlSliceViewFactory = /// qobject_cast<qMRMLLayoutSliceViewFactory*>( /// app->layoutManager()->mrmlViewFactory("vtkMRMLSliceNode")); /// MySliceViewFactory* mySliceViewFactory = /// new MySliceViewFactory(app->layoutManager()); /// mySliceViewFactory->setSliceLogics(mrmlSliceViewFactory->sliceLogics()); /// /// app->layoutManager()->unregisterViewFactory(mrmlSliceViewFactory); /// app->layoutManager()->registerViewFactory(mySliceViewFactory); /// \endcode /// You can also register ctkLayoutViewFactories that are not related to MRML /// view nodes. From: Julien Finet <julien.finet@kitware.com> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24017 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTGUI/qSlicerLayoutManager.cxx | Diff File | ||
| mod - Base/QTGUI/qSlicerLayoutManager.h | Diff File | ||
| mod - Libs/MRML/Logic/vtkMRMLLayoutLogic.cxx | Diff File | ||
| mod - Libs/MRML/Logic/vtkMRMLLayoutLogic.h | Diff File | ||
| mod - Libs/MRML/Widgets/CMakeLists.txt | Diff File | ||
| mod - Libs/MRML/Widgets/qMRMLChartView.cxx | Diff File | ||
| mod - Libs/MRML/Widgets/qMRMLLayoutManager.cxx | Diff File | ||
| mod - Libs/MRML/Widgets/qMRMLLayoutManager.h | Diff File | ||
| mod - Libs/MRML/Widgets/qMRMLLayoutManager_p.h | Diff File | ||
| add - Libs/MRML/Widgets/qMRMLLayoutViewFactory.cxx | Diff File | ||
| add - Libs/MRML/Widgets/qMRMLLayoutViewFactory.h | Diff File | ||
| mod - Libs/MRML/Widgets/qMRMLLayoutWidget.cxx | Diff File | ||
| mod - Libs/MRML/Widgets/qMRMLLayoutWidget.h | Diff File | ||
|
master 7176e425 2015-03-04 15:49:09 Details Diff |
ENH: set layout spacing to 9 to improve presentation git-svn-id: http://svn.slicer.org/Slicer4/trunk@24016 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Scripted/DICOMLib/DICOMWidgets.py | Diff File | ||
|
master 18e7a8e0 2015-03-04 15:49:03 Details Diff |
BUG: improve loading of DICOM referenced datasets See issue http://www.na-mic.org/Bug/view.php?id=3952 * try to improve the sizing policy for the popup (works as expected on Mac) * make popup modal * add checks for the referenced datasets that will prevent them from being loaded when the list of files for the referenced dataset matches the one user already selected in the DICOM widget GUI git-svn-id: http://svn.slicer.org/Slicer4/trunk@24015 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Scripted/DICOMLib/DICOMWidgets.py | Diff File | ||
|
master 95e6cb26 2015-03-04 09:27:28 Details Diff |
BUG: Do not attempt to create DICOM annotation if no local database exists In case no local database has been created on the system, running test "py_RSNAQuantTutorial" will fail because SliceViewAnnotation attempts to use "slicer.dicomDatabase" object whereas non has been created. Error like the following were reported: 551: Test using the PETCT module ... Traceback (most recent call last): 551: File "/path/to/lib/Slicer-4.4/qt-scripted-modules/DataProbeLib/SliceViewAnnotations.py", line 622, in updateCornerAnnotations 551: self.makeAnnotationText(caller) 551: File "/path/to/lib/Slicer-4.4/qt-scripted-modules/DataProbeLib/SliceViewAnnotations.py", line 832, in makeAnnotationText 551: self.makeDicomAnnotation(bgUid,fgUid) 551: File "/path/to/lib/Slicer-4.4/qt-scripted-modules/DataProbeLib/SliceViewAnnotations.py", line 901, in makeDicomAnnotation 551: backgroundDicomDic = self.extractDICOMValues(bgUid) 551: File "/path/to/lib/Slicer-4.4/qt-scripted-modules/DataProbeLib/SliceViewAnnotations.py", line 1078, in extractDICOMValues 551: value = slicer.dicomDatabase.instanceValue(uid,tag) The steps to reproduce the problem independently of the test are the following: (1) clear Slicer settings: $ rm -rf ~/.config/NA-MIC (2) start Slicer $ ./Slicer (3) load PET_CT_pre-treatment.mrb that can be obtained after extracting the zip archive available here: http://slicer.kitware.com/midas3/download?items=124185 git-svn-id: http://svn.slicer.org/Slicer4/trunk@24014 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Scripted/DataProbe/DataProbeLib/SliceViewAnnotations.py | Diff File | ||
|
master fea88892 2015-03-03 18:27:43 Details Diff |
BUG: Do not fire incorrect events when closing scene * onNodeIDChanged() was using a never set "Quantity" property. * The unitComboBox is not exposed to the user, so the current node id can only be changed by the selection node. Such workflow is already handled and does not need extra signal/slot connection. It had the side effect of resetting the number of decimals to the slider widget of the slice views when closing the scene. That would send (queued) signals to set the slice offset to be 0.0 AFTER (because queued connection) the new slice offset was initialized when loading a new scene. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24013 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/Units/qSlicerUnitsSettingsPanel.cxx | Diff File | ||
| mod - Modules/Loadable/Units/qSlicerUnitsSettingsPanel.h | Diff File | ||
|
master d1899940 2015-03-03 17:34:48 Details Diff |
COMP: Fix windows packaging error introduced by r24006 This commit updates the OpenSSL install rules to consider the library keyword "debug" or "optimized" introduced in r24006 by the use of select_library_configurations macro. Error fixed by this commit is the following: 5>CPack: - Install project: Slicer 5>CMake Error at C:/D/N/Slicer-1-build/Slicer-build/CMake/LastConfigureStep/cmake_install.cmake:255 (file): 5> file INSTALL cannot find 5> "C:/D/N/Slicer-1-build/OpenSSL-install/Release/bin/optimized.dll". 5>Call Stack (most recent call first): 5> C:/D/N/Slicer-1-build/Slicer-build/cmake_install.cmake:47 (include) 5>CMake Error at C:/D/N/Slicer-1-build/Slicer-build/CMake/LastConfigureStep/cmake_install.cmake:263 (file): 5> file INSTALL cannot find 5> "C:/D/N/Slicer-1-build/OpenSSL-install/Release/bin/debug.dll". 5>Call Stack (most recent call first): 5> C:/D/N/Slicer-1-build/Slicer-build/cmake_install.cmake:47 (include) 5>CMake Error at C:/D/N/Slicer-1-build/Slicer-build/CMake/LastConfigureStep/cmake_install.cmake:271 (file): 5> file INSTALL cannot find 5> "C:/D/N/Slicer-1-build/OpenSSL-install/Release/bin/optimized.dll". 5>Call Stack (most recent call first): 5> C:/D/N/Slicer-1-build/Slicer-build/cmake_install.cmake:47 (include) 5>CMake Error at C:/D/N/Slicer-1-build/Slicer-build/CMake/LastConfigureStep/cmake_install.cmake:279 (file): 5> file INSTALL cannot find 5> "C:/D/N/Slicer-1-build/OpenSSL-install/Release/bin/debug.dll". git-svn-id: http://svn.slicer.org/Slicer4/trunk@24012 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/SlicerBlockInstallOpenSSL.cmake | Diff File | ||
|
master 7263a801 2015-03-03 17:34:45 Details Diff |
STYLE: Associate application test driver with correct folder This commit fixes a typo first introduced in r23961 (ENH: Improve build targets organization in IDE that support folders). git-svn-id: http://svn.slicer.org/Slicer4/trunk@24011 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Applications/SlicerApp/Testing/Cpp/CMakeLists.txt | Diff File | ||
|
master 0d6d4872 2015-03-02 18:18:33 Details Diff |
COMP: Fix redistributable system libraries in packaging. Fixes 0003972 This commit fixes a regression introduced by r23158 (Explicitly installs the needed component and skips the development component if not explicitly requested.). When Slicer switched to using component for packaging, the VS redistributable libraries were not included anymore in the package. This is explained by the fact the CMake module "InstallRequiredSystemLibraries" does not support components. Waiting the issue reported on CMake bug tracker [1] is resolved and the minimum required CMake version is updated, this commit duplicates the logic installing the redistributable libraries specifying the "RuntimeLibraries" component. [1] http://www.cmake.org/Bug/view.php?id=15428) Co-authored-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24010 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/SlicerCPack.cmake | Diff File | ||
|
master e6f4f135 2015-03-02 17:53:15 Details Diff |
BUG: Do not disable the picking in 2D, widget is never pickable 0003971 This prevent the following error to appear when using 2D projection: ERROR: In c:\d\p\slicer-440-package\vtkv6\interaction\widgets\vtkWidgetRepresentation.h, line 176 vtkPointHandleRepresentation2D (0000000010537080): Subclass should allow enable/disable picking The fix is to remove the DisablePicking call. It's not used since for the 2D projection, the widget is never enabled (i.e. it's visible but the user cannot interact with it). For reference, the disable call is here at line 783 of vtkMRMLMarkupsFiducialDisplayableManager2D.cxx. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24009 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/Markups/MRMLDM/vtkMRMLMarkupsFiducialDisplayableManager2D.cxx | Diff File | ||
|
master 47579984 2015-03-02 17:42:24 Details Diff |
BUG: 0001853 - fix issue where paint radius if forgotten switching effects Now the calculation of the volume-dependent radius is done before the mrml defaults are set. This means that the first volume edited will get a spacing-dependent radius, and from then on the radius will remain at the user's setting no matter what volume is selected. This is probably the right answer in most cases. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24008 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Scripted/EditorLib/PaintEffect.py | Diff File | ||
|
master 6c125d99 2015-03-02 14:29:43 Details Diff |
COMP: Simplify logic selecting if OpenSSL project should be built or not OpenSSL will *NOT* be built if one of these condition is true: - OPENSSL_LIBRARIES is defined - LIB_EAY_DEBUG and SSL_EAY_DEBUG are defined - LIB_EAY_RELEASE and SSL_EAY_RELEASE are defined - Slicer_USE_SYSTEM_OpenSSL is True git-svn-id: http://svn.slicer.org/Slicer4/trunk@24007 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_OpenSSL.cmake | Diff File | ||
|
master 53008631 2015-03-02 14:29:41 Details Diff |
ENH: Improve OpenSSL external project automatically setting OPENSSL_LIBRARIES git-svn-id: http://svn.slicer.org/Slicer4/trunk@24006 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_OpenSSL.cmake | Diff File | ||
|
master 6c84a94c 2015-03-02 14:29:40 Details Diff |
COMP: Fix download url associated with OpenSSL 1.0.1l The previous url were using "bitstream id" instead of "item id" git-svn-id: http://svn.slicer.org/Slicer4/trunk@24005 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_OpenSSL.cmake | Diff File | ||
