Changesets: Import 2017-06-07 23:51:09
|
master 76a40987 2015-11-06 23:36:24 Details Diff |
STYLE: vtkMRMLScene: Refactor code introducing IsReservedID() function. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24704 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/vtkMRMLScene.cxx | Diff File | ||
| mod - Libs/MRML/Core/vtkMRMLScene.h | Diff File | ||
|
master 0c9c4666 2015-11-06 23:36:22 Details Diff |
STYLE: vtkSlicerMarkupsLogicTest1: Use smart pointer to avoid leak git-svn-id: http://svn.slicer.org/Slicer4/trunk@24703 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/Markups/Testing/Cxx/vtkSlicerMarkupsLogicTest1.cxx | Diff File | ||
|
master db97e6de 2015-11-06 23:36:20 Details Diff |
STYLE: vtkMRMLNodeTest1: Prepend "Line " in error message. This change will allow to more easily identify the line associated with the failing test. Instead of having an output of the form: 50: 30: TestSomething failed 50: Something went wrong 1/1 Test 0000050: vtkMRMLNodeTest1 .................***Failed 1.12 sec where the "50:" and the "30:" are hard to distinguish. This commit changes the output into: 50: Line 30: TestSomething failed 50: Something went wrong 1/1 Test 0000050: vtkMRMLNodeTest1 .................***Failed 1.12 sec git-svn-id: http://svn.slicer.org/Slicer4/trunk@24702 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/Testing/vtkMRMLNodeTest1.cxx | Diff File | ||
|
master 9eaefc28 2015-11-06 23:36:18 Details Diff |
STYLE: MRMLScene: Remove non-implemented function GetTransformBetweenNodes() This commit removes function GetTransformBetweenNodes() originally introduced in r40 (COMP: added vtkITK and MRML libs) but never implemented. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24701 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/vtkMRMLScene.cxx | Diff File | ||
| mod - Libs/MRML/Core/vtkMRMLScene.h | Diff File | ||
|
master c5cf5b4e 2015-11-06 23:36:16 Details Diff |
STYLE: MRMLScene: Improve readability adding function IsNodeWithoutName() git-svn-id: http://svn.slicer.org/Slicer4/trunk@24700 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/vtkMRMLScene.cxx | Diff File | ||
|
master 4e4862ed 2015-11-06 23:36:13 Details Diff |
STYLE: MRMLScene: Improve readability adding local function IsNodeWithoutID() git-svn-id: http://svn.slicer.org/Slicer4/trunk@24699 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/vtkMRMLScene.cxx | Diff File | ||
|
master 515541b1 2015-11-06 23:36:11 Details Diff |
BUG: Update VTK to include fix for vtkVariant stream operator. $ git shortlog 8e43f69..fe92273 --no-merges Jean-Christophe Fillion-Robin (1): Ensure vtkVariant stream associated with << operator is set back to "dec". git-svn-id: http://svn.slicer.org/Slicer4/trunk@24698 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_VTKv6.cmake | Diff File | ||
|
master 609cc9aa 2015-11-06 23:36:10 Details Diff |
STYLE: Improve code readability in qMRMLSceneDisplayableModel Use downcast-ed variable "displayableNode" instead of "node", it unambiguously describes what the code is doing. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24697 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Widgets/qMRMLSceneDisplayableModel.cxx | Diff File | ||
|
master 43be39f2 2015-11-06 23:36:08 Details Diff |
STYLE: Simplify code in qMRMLSceneDisplayable removing extra ivar git-svn-id: http://svn.slicer.org/Slicer4/trunk@24696 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Widgets/qMRMLSceneDisplayableModel.cxx | Diff File | ||
|
master 5437ac9c 2015-11-06 23:36:06 Details Diff |
STYLE: vtkMRMLSelectionNode: Fix typo in variable name. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24695 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/vtkMRMLSelectionNode.cxx | Diff File | ||
| mod - Libs/MRML/Core/vtkMRMLSelectionNode.h | Diff File | ||
|
master 05f8365e 2015-11-06 10:26:51 Details Diff |
BUG: Fixed extension install failure Extension installation silently failed after a previous extension installation was partially completed due to running out of disk space. 1. No errors were displayed => Added error display for all failure branches in qSlicerExtensionsManagerModel::extractExtensionArchive 2. SlicerIGT-XXXXXX intermediate directory was left in the extension directory, that prevented all further attempts to move the extracted archive content to the correct location (directory copy fails if the target directory is not empty) => Added deletion of the intermediate directory before copying. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24694 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTCore/qSlicerExtensionsManagerModel.cxx | Diff File | ||
|
master 1fcbc399 2015-11-03 16:08:11 Details Diff |
BUG: Update DCMTK to fix segment access via number in DcmSegmentation Tested-by: Andriy Fedorov <fedorov@bwh.harvard.edu> //-------------- commit commontk/DCMTK@f55f3c8 Author: Michael Onken <onken@open-connections.de> Date: Tue Nov 3 13:33:23 2015 -0500 [PATCH] Fixed segment access via Segment Number. Fixed segment access via Segment Number which now assumes that the first Segment Number is not 0 as in the underlying vector, but starts with 1. Thanks to Andrey Fedorov <andrey.fedorov@gmail.com> for the report. //-------------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@24693 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_DCMTK.cmake | Diff File | ||
|
master 6b5b0d6e 2015-11-03 15:05:09 Details Diff |
BUG: Update VTK to include fix for empty corner annotation. See 0004043 This commit includes the proper fix and remove the workarounds implemented in r24649 (BUG: SliceViewAnnotations: Do not show blank when corner annotation is off.) $ git shortlog d620f8f..8e43f69 --no-merges Alexis Girault (1): Fix bug 15787 : empty vtkCornerAnnotation text renders incorrectly git-svn-id: http://svn.slicer.org/Slicer4/trunk@24692 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Scripted/DataProbe/DataProbeLib/SliceViewAnnotations.py | Diff File | ||
| mod - SuperBuild/External_VTKv6.cmake | Diff File | ||
|
master 173918eb 2015-11-03 13:15:54 Details Diff |
COMP: Update SlicerExecutionModel to include support for ITK+ExternalModule This commit updates the SlicerExecutionModel so that it can build against the version of ITK including ExternalModule support introduced in the previous commit. It will fix the following error: Linking CXX executable bin/GenerateCLP ../ModuleDescriptionParser/bin/libModuleDescriptionParser.so: undefined reference to `XML_ParserCreate' ../ModuleDescriptionParser/bin/libModuleDescriptionParser.so: undefined reference to `XML_GetErrorCode' ../ModuleDescriptionParser/bin/libModuleDescriptionParser.so: undefined reference to `XML_SetUserData' ../ModuleDescriptionParser/bin/libModuleDescriptionParser.so: undefined reference to `XML_GetSpecifiedAttributeCount' ../ModuleDescriptionParser/bin/libModuleDescriptionParser.so: undefined reference to `XML_GetCurrentLineNumber' ../ModuleDescriptionParser/bin/libModuleDescriptionParser.so: undefined reference to `XML_ErrorString' ../ModuleDescriptionParser/bin/libModuleDescriptionParser.so: undefined reference to `XML_ParserFree' ../ModuleDescriptionParser/bin/libModuleDescriptionParser.so: undefined reference to `XML_SetElementHandler' ../ModuleDescriptionParser/bin/libModuleDescriptionParser.so: undefined reference to `XML_Parse' ../ModuleDescriptionParser/bin/libModuleDescriptionParser.so: undefined reference to `XML_SetCharacterDataHandler' collect2: error: ld returned 1 exit status $ git shortlog 608c7b0..311eff9 --no-merges Hans Johnson (1): COMP: Add missing link dependancy for ITKExpat Lucas Gandel (5): ENH: Support submission of test results on CDash ENH: Add Docker Test file ENH: Reorganize docker files to support testing against multiple ITK version ENH: Add support for continuous integration testing using CircleCI ENH: Add Relevant BUILDNAME for CDash submission git-svn-id: http://svn.slicer.org/Slicer4/trunk@24691 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_SlicerExecutionModel.cmake | Diff File | ||
|
master 3cd452a7 2015-11-03 12:47:13 Details Diff |
ENH: Update ITK to include backported ExternalModule support This will allow to build Slicer extensions based on custom ITK modules. BRAINSTools: $ git shortlog 26cb12b..c658c75 --no-merges Hans J. Johnson (1): BUG: Incorrect library specification ITK: $ git shortlog 087e938..0f346bf --no-merges Bill Lorensen (1): COMP: VTkGlue linker errors Hans Johnson (2): COMP: Need to propagate ITKGDCM ENH: Missing ITK_OVERRIDE Hyun Jae Kang (1): BUG: Fix a compilation issue on ITK4 with FFTW and shared libraries Lucas Gandel (1): BUG: Fix external module BUILD_SHARED_LIBS status Matthew McCormick (4): ENH: Add ITKModuleExternal.cmake ENH: Allow projects to build against an external module. ENH: Add wrapping support for building modules externally. BUG: Fix KWStyle test paths when building a module externally. Zach Williamson (5): ENH: Consolidate Library Dependencies COMP: Add a missing link to Review module COMP: Use correct linking macro in DCMTK ENH: Use new linking system macros PERF: Avoid searching private dependencies for include directories git-svn-id: http://svn.slicer.org/Slicer4/trunk@24690 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild.cmake | Diff File | ||
| mod - SuperBuild/External_ITKv4.cmake | Diff File | ||
|
master 630b9cdd 2015-11-03 12:47:12 Details Diff |
BUG: Fix ScriptedLoadableModuleLogic.clickAndDrag() to work with editor Since the EffectTool observes the interactor events with a priority of 1.0, this commit updates the code in clickAndDrag() to use interactor functions instead of interactor style ones. This will ensure the interactor events are invoked. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24689 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/Python/slicer/ScriptedLoadableModule.py | Diff File | ||
|
master a8cbe3d7 2015-11-02 23:52:00 Details Diff |
BUG: Fixed transform splitting. Fixes 0004073 Fixes https://www.na-mic.org/Mantis/view.php?id=4073 Problem was that when a composite transform contained an inverse linear transform, the inverse transform was used as transformToParent. When transformToParent was later modified by the transform sliders on the GUI, transformToParent was updated, but transformFromParent was unchanged. Script to reproduce the issue: t1=vtk.vtkTransform() m1=vtk.vtkMatrix4x4() m1.SetElement(0,3,15) t1.SetMatrix(m1) t2=t1.GetInverse() print t1.GetMatrix() print t1.GetInverseFlag() print t2.GetMatrix() # this is required, otherwise the behavior will not be inconsistent print t2.GetInverseFlag() t2.Inverse() # editing the inverse transform print t1.GetMatrix() # returns ... 15 ... print t1.GetInverseFlag() # returns 0 print t2.GetMatrix() # returns ... 15 ... print t2.GetInverseFlag() # returns 0 0 on both and the matrix values are the same. It seems that if a computed inverse transform is modified then the transform pipeline becomes inconsistent. It may be the expected behavior in VTK, one should simply never modify a computed transform. I'll confirm this with David Gobbi. The solution was to always set the forward transform in the node so that when it is modified, it updates the inverse transform as well. Tested-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> From: Andras Lasso <lasso@queensu.ca> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24688 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/Testing/NonLinearTransformScene.mrml | Diff File | ||
| add - Libs/MRML/Core/Testing/TestData/BSplineLinearCompositeTransform.h5 | Diff File | ||
| mod - Libs/MRML/Core/Testing/vtkMRMLNonlinearTransformNodeTest1.cxx | Diff File | ||
| mod - Libs/MRML/Core/vtkMRMLTransformNode.cxx | Diff File | ||
| mod - Libs/MRML/Core/vtkMRMLTransformNode.h | Diff File | ||
|
master 47845216 2015-11-02 13:33:06 Details Diff |
BUG: Editor: Gracefully handle "Create new LabelMap" without master volume This commit avoids the following error when user attempts to create a label map without any master volume: Traceback (most recent call last): File "/home/jcfr/Projects/Slicer-Debug/Slicer-build/lib/Slicer-4.4/qt-scripted-modules/EditorLib/HelperBox.py", line 99, in newMerge self.labelCreateDialog() File "/home/jcfr/Projects/Slicer-Debug/Slicer-build/lib/Slicer-4.4/qt-scripted-modules/EditorLib/HelperBox.py", line 317, in labelCreateDialog dlg = LabelCreateDialog(slicer.util.mainWindow(), self.master, self.mergeVolumePostfix) File "/home/jcfr/Projects/Slicer-Debug/Slicer-build/lib/Slicer-4.4/qt-scripted-modules/EditorLib/LabelCreateDialog.py", line 78, in __init__ """ %(self._master.GetName(), self._master.GetName()+self._mergeVolumePostfix) AttributeError: 'NoneType' object has no attribute 'GetName' git-svn-id: http://svn.slicer.org/Slicer4/trunk@24687 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Scripted/EditorLib/HelperBox.py | Diff File | ||
| mod - Modules/Scripted/EditorLib/LabelCreateDialog.py | Diff File | ||
|
master 3337b416 2015-11-01 19:55:00 Details Diff |
COMP: Fix "unused parameter" warning in qSlicerSubjectHierarchyAbstractPlugin git-svn-id: http://svn.slicer.org/Slicer4/trunk@24686 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyAbstractPlugin.cxx | Diff File | ||
|
master 062f36f9 2015-11-01 19:51:59 Details Diff |
COMP: Update EMSegment: Fix "comparison of pointer with integer zero" warning //---------- /home/jcfr/Projects/Slicer-Debug/EMSegment/AMF/vtkImageLevelSets.cxx: In member function ‘unsigned char vtkImageLevelSets::CheckConvergence()’: /home/jcfr/Projects/Slicer-Debug/EMSegment/AMF/vtkImageLevelSets.cxx:1301:24: warning: ordered comparison of pointer with integer zero [-Wextra] if (this->u[p] <= 0) total++; ^ /home/jcfr/Projects/Slicer-Debug/EMSegment/AMF/vtkImageLevelSets.cxx:1306:65: warning: ordered comparison of pointer with integer zero [-Wextra] if ((this->stored_seg[p] == ON_STORED) && (this->u[p] > 0)) ^ /home/jcfr/Projects/Slicer-Debug/EMSegment/AMF/vtkImageLevelSets.cxx:1309:66: warning: ordered comparison of pointer with integer zero [-Wextra] if ((this->stored_seg[p] == OFF_STORED) && (this->u[p] <= 0)) ^ /home/jcfr/Projects/Slicer-Debug/EMSegment/AMF/vtkImageLevelSets.cxx:1313:24: warning: ordered comparison of pointer with integer zero [-Wextra] if (this->u[p] <= 0) ^ //---------- Co-authored-by: Kilian Pohl <pohl.kilian@gmail.com> Reviewed-by: Steve Pieper <pieper@bwh.harvard.edu> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24685 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild.cmake | Diff File | ||
|
master 9e6ea0cd 2015-10-30 15:12:26 Details Diff |
BUG: Fix AttributeError in SliceViewAnnotations.updateViewAnnotations() This commit fixes a regression introduced in r24238 (BUG: Fix SliceViewAnnotations AttributeError happening on closing Slicer) where the ivar sliceViewNames (of type 'list') is directly set with the value returned by app.layoutManager().sliceViewNames() (of type 'tuple'). Considering that tuple are immutable and list mutable, this explained the error in the function "updateViewAnnotations": AttributeError: 'tuple' object has no attribute 'append' By converting the returned tuple to a list, it fixes the issue. Reviewed-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> From: Christian Herz <christian.herz@mevis.fraunhofer.de> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24684 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Scripted/DataProbe/DataProbeLib/SliceViewAnnotations.py | Diff File | ||
|
master a1e3b9e6 2015-10-30 13:46:19 Details Diff |
STYLE: Improve vtkSlicerDoubleArraysLogicAddTest output display Reviewed-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> From: Alexis Girault <alexis.girault@kitware.com> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24683 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/DoubleArrays/Testing/Cxx/vtkSlicerDoubleArraysLogicAddFileTest.cxx | Diff File | ||
|
master 8337be74 2015-10-30 13:44:59 Details Diff |
ENH: Improve vtkSlicerDoubleArraysLogic::AddDoubleArray Check if the filename is empty (and not just NULL) to avoid unnecessary node creation and deletion. Reviewed-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> From: Alexis Girault <alexis.girault@kitware.com> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24682 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/DoubleArrays/Logic/vtkSlicerDoubleArraysLogic.cxx | Diff File | ||
|
master 539c5e5f 2015-10-30 13:44:58 Details Diff |
BUG: Fix doubleArrayStorageNode Reader return value Corrects typo returning wrong value at the end of ReadData. It is now returning 0 if the DoubleArray is empty. This is not a usual behavior as we should allow reading an empty node, but we are doing this for backward compatibility with the behavior prior to r24675 (BUG: Fix support for missing labels in vtkMRMLDoubleArrayStorage reader) [1]. [1] http://viewvc.slicer.org/viewvc.cgi/Slicer4/trunk/Libs/MRML/Core/vtkMRMLDoubleArrayStorageNode.cxx?revision=23021&view=markup&pathrev=24674#l200 This fixes those two failing tests: (1) vtkSlicerDoubleArraysLogicAddFileTest (2) vtkMRMLDoubleArrayNodeTest1 //---------- $ ctest -R "DoubleArray[s]?(Logic|Node)" Test project /home/jcfr/Projects/Slicer-Debug/Slicer-build Start 25: vtkMRMLDoubleArrayNodeTest1 1/2 Test 0000025: vtkMRMLDoubleArrayNodeTest1 ............. Passed 0.95 sec Start 326: vtkSlicerDoubleArraysLogicAddFileTest 2/2 Test 0000326: vtkSlicerDoubleArraysLogicAddFileTest ... Passed 1.19 sec //---------- Reviewed-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> From: Alexis Girault <alexis.girault@kitware.com> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24681 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/vtkMRMLDoubleArrayStorageNode.cxx | Diff File | ||
|
master 99d3b4d7 2015-10-30 13:44:56 Details Diff |
STYLE: Improve vtkMRMLDoubleArrayNodeTest1 By improving this test we can deduce that ReadData does not work appropriately since it returns 0 even though the file is correctly read. This is the same error that makes the test below fail : 'vtkSlicerDoubleArraysLogicAddFileTest', as shown in PR 0000392 Reviewed-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> and on CDash: http://slicer.cdash.org/testDetails.php?test=6885663&build=700523 From: Alexis Girault <alexis.girault@kitware.com> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24680 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/Testing/vtkMRMLDoubleArrayNodeTest1.cxx | Diff File | ||
