Changesets: Import 2017-06-07 23:51:09

Search Browse Back to Index

master a9cb28c4

2015-10-19 15:04:26

jcfr

Details Diff 		STYLE: Remove executable bit from FindGit.cmake.

From: Matt McCormick <matt.mccormick@kitware.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24629 3bd1e089-480b-0410-8dfb-8563597acbee
mod - CMake/FindGit.cmake Diff File

master fc38d161

2015-10-16 18:34:03

lassoan

Details Diff 		ENH: Use word wrap in node info box

Node inspector became very wide when some long attributes were present. Enabled word wrapping to prevent this.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24628 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Widgets/Resources/UI/qMRMLNodeAttributeTableWidget.ui Diff File

master c087e5a1

2015-10-16 16:58:25

msmolens

Details Diff 		BUG: Fix packaging on Windows

A regression was introduced in r24591 [1] and r24593 [2] that causes packaging
to fail on Windows because of the following errors:

CMake Error: Error in cmake code at
C:/D/N/Slicer-1-build/Slicer-build/CPackConfig.cmake:109:
Parse error. Function missing ending ")". Instead found unterminated string wi
th text ")
endif()

if(EXISTS ${CPACK_PROPERTIES_FILE})
include(${CPACK_PROPERTIES_FILE})
endif()
".
CPack Error: Problem reading CPack config file: "C:/D/N/Slicer-1-build/Slicer-bu
ild/CPackConfig.cmake"

and

CMake Warning (dev) at C:/dev/SR2/Slicer-build/CPackConfig.cmake:74 (SET):
Syntax error in cmake code at

C:/dev/SR2/Slicer-build/CPackConfig.cmake:74

when parsing string

..\Slicer;Slicer

Invalid escape sequence \S

The issue is that the slicer_verbose_set() macro doesn't function as a drop-in
replacement for the CMake set() function.

The first error occurs because CPACK_NSIS_INSTALL_SUBDIRECTORY remains unset
even after the following lines:

set(Slicer_CPACK_NSIS_INSTALL_SUBDIRECTORY "")
slicer_cpack_set("CPACK_NSIS_INSTALL_SUBDIRECTORY")

and the conditional below erroneously evaluates to true:

if(NOT CPACK_NSIS_INSTALL_SUBDIRECTORY STREQUAL "")

Adding quotation marks around the ${ARGN} variable address this error.

The second error occurs because macros consume escapes in string literals, as
documented in CMake bug 5389 [3].

Change the macro to a function and making its set() call use PARENT_SCOPE
addresses this error.

[1] http://viewvc.slicer.org/viewvc.cgi/Slicer4?view=revision&revision=24591
[2] http://viewvc.slicer.org/viewvc.cgi/Slicer4?view=revision&revision=24593
[3] https://cmake.org/Bug/view.php?id=5389

Co-authored-by: Francois Budin <fbudin@email.unc.edu>

From: Max Smolens <max.smolens@kitware.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24627 3bd1e089-480b-0410-8dfb-8563597acbee
mod - CMake/SlicerCPack.cmake Diff File

master 2b116618

2015-10-16 13:42:58

pinter

Details Diff 		ENH: Adaptor classes facilitating python scripted subject hierarchy plugins

Assembla ticket for this task:
https://www.assembla.com/spaces/slicerrt/tickets/614
Example plugin available for VolumeClip modules:
https://subversion.assembla.com/svn/slicerrt/trunk/VolumeClip/src

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24626 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/SubjectHierarchy/Widgets/CMakeLists.txt Diff File
add - Modules/Loadable/SubjectHierarchy/Widgets/Python/AbstractScriptedSubjectHierarchyPlugin.py Diff File
add - Modules/Loadable/SubjectHierarchy/Widgets/Python/CMakeLists.txt Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSceneSubjectHierarchyModel.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSubjectHierarchyTreeView.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyAbstractPlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyAbstractPlugin.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyPluginHandler.cxx Diff File
add - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyScriptedPlugin.cxx Diff File
add - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyScriptedPlugin.h Diff File

master 11b1d5df

2015-10-12 23:59:47

lassoan

Details Diff 		BUG: Fixed chart view crash when no data series is selected

Crash occurred when creating a chart using Label statistics module and then in the chart view deselected the data series.

Fixed crash by adding checks for the number of available data series (does not assume anymore that at least one exists).

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24625 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Widgets/qMRMLChartView.cxx Diff File

master 3d48cf0d

2015-10-09 08:56:27

lassoan

Details Diff 		BUG: Fixed default DICOM database directory

When Slicer is installed on a computer the first time it set the DICOM directory to a read-only directory (silently) and all DICOM imports were failed (silently).

Root cause: ctkDICOMBrowser is created before the DICOM module checks the DICOM directory (and initializes it if empty). This is an issue, because ctkDICOMBrowser constructor sets the DICOM directory to be in the current working directory if it is not set in the settings. The current directory is typically C:\Program Files\..., which is read-only.

Solution: check the DICOM directory and initialize it properly before creating the ctkDICOMBrowser object.

Also added a check to warn the user if a non-empty directory is selected (if that is not a previously created DICOM database directory). This might prevent users from trying to import DICOM files by setting the DICOM database directory to the location where those files are stored (it would not import the files anyway).

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24624 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/DICOMLib/DICOMWidgets.py Diff File

master 345f604b

2015-10-09 08:37:40

lassoan

Details Diff 		BUG: Fixed default filename generation in data bundle saving

When storage node existed but filename was NULL (e.g., when created an output node and run a CLI to set it) bundle saving crashed.
Now if thefilename is NULL then it is properly set and then restored to NULL. Restoring it to NULL is important because otherwise the node file would be saved by default into a temporary directory when the user opens the save dialog.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24623 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Logic/vtkMRMLApplicationLogic.cxx Diff File

master 002a4a7d

2015-10-08 13:15:57

jcfr

Details Diff 		STYLE: Update python scripts to not import from __main__

This commit simplifies the scripts removing extra `from __main__`
statements and improve the integration with Python IDE ensuring python
package like "slicer" can simply be imported.

The `from __main__` statement most likely became obsolete since
r24155 (ENH: Fixes 0003549. Import scripted module as python module).

Remarks:

A global replace of "from __main__ import" into "import" as been done
except in:
* EditOptions: "from __main__ getNodes" changed into "from slicer.util import getNodes"
* slicer/module[dm|logic|mrml|widget]/__init__.py where it makes sense to keep it.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24622 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Applications/SlicerApp/Testing/Python/AtlasTests.py Diff File
mod - Applications/SlicerApp/Testing/Python/Charting.py Diff File
mod - Applications/SlicerApp/Testing/Python/DTINotReproducibleIssue3977.py Diff File
mod - Applications/SlicerApp/Testing/Python/FiducialLayoutSwitchBug1914.py Diff File
mod - Applications/SlicerApp/Testing/Python/JRC2013Vis.py Diff File
mod - Applications/SlicerApp/Testing/Python/RSNA2012ProstateDemo.py Diff File
mod - Applications/SlicerApp/Testing/Python/RSNAQuantTutorial.py Diff File
mod - Applications/SlicerApp/Testing/Python/RSNAVisTutorial.py Diff File
mod - Applications/SlicerApp/Testing/Python/ScenePerformance.py Diff File
mod - Applications/SlicerApp/Testing/Python/SliceLinkLogic.py Diff File
mod - Applications/SlicerApp/Testing/Python/Slicer4Minute.py Diff File
mod - Applications/SlicerApp/Testing/Python/SubjectHierarchyCorePluginsSelfTest.py Diff File
mod - Applications/SlicerApp/Testing/Python/SubjectHierarchyGenericSelfTest.py Diff File
mod - Applications/SlicerApp/Testing/Python/ViewControllersSliceInterpolationBug1926.py Diff File
mod - Applications/SlicerApp/Testing/Python/fiber_visibility_crash2438.py Diff File
mod - Applications/SlicerApp/Testing/Python/sceneImport2428.py Diff File
mod - Applications/SlicerApp/Testing/Python/slicerCloseCrashBug2590.py Diff File
mod - Applications/SlicerApp/Testing/Python/test_tractography_display.py Diff File
mod - Base/Python/slicer/ScriptedLoadableModule.py Diff File
mod - Base/Python/slicer/util.py Diff File
mod - Base/Python/tpycl/tpycl.py Diff File
mod - Extensions/Testing/EditorExtensionTemplate/EditorEffectTemplate/EditorEffectTemplate.py Diff File
mod - Extensions/Testing/ScriptedLoadableExtensionTemplate/ScriptedLoadableModuleTemplate/ScriptedLoadableModuleTemplate.py Diff File
mod - Modules/Loadable/Colors/Testing/Python/ColorsScalarBarSelfTest.py Diff File
mod - Modules/Loadable/CropVolume/Testing/Python/CropVolumeSelfTest.py Diff File
mod - Modules/Loadable/Markups/Testing/Python/AddManyMarkupsFiducialTest.py Diff File
mod - Modules/Loadable/Markups/Testing/Python/MarkupsInCompareViewersSelfTest.py Diff File
mod - Modules/Loadable/Markups/Testing/Python/MarkupsInViewsSelfTest.py Diff File
mod - Modules/Loadable/Markups/Testing/Python/NeurosurgicalPlanningTutorialMarkupsSelfTest.py Diff File
mod - Modules/Loadable/SceneViews/Testing/Python/AddStorableDataAfterSceneViewTest.py Diff File
mod - Modules/Loadable/VolumeRendering/Testing/Python/VolumeRenderingSceneClose.py Diff File
mod - Modules/Scripted/DICOM/DICOM.py Diff File
mod - Modules/Scripted/DICOM2FullBrainTractography/DICOM2FullBrainTractography.py Diff File
mod - Modules/Scripted/DICOMLib/DICOMExportScalarVolume.py Diff File
mod - Modules/Scripted/DICOMLib/DICOMExportScene.py Diff File
mod - Modules/Scripted/DICOMLib/DICOMPlugin.py Diff File
mod - Modules/Scripted/DICOMLib/DICOMProcesses.py Diff File
mod - Modules/Scripted/DICOMLib/DICOMWidgets.py Diff File
mod - Modules/Scripted/DICOMPlugins/DICOMDiffusionVolumePlugin.py Diff File
mod - Modules/Scripted/DICOMPlugins/DICOMScalarVolumePlugin.py Diff File
mod - Modules/Scripted/DICOMPlugins/DICOMSlicerDataBundlePlugin.py Diff File
mod - Modules/Scripted/DataProbe/DataProbe.py Diff File
mod - Modules/Scripted/DataProbe/DataProbeLib/SliceViewAnnotations.py Diff File
mod - Modules/Scripted/Editor/Editor.py Diff File
mod - Modules/Scripted/EditorLib/ChangeIslandEffect.py Diff File
mod - Modules/Scripted/EditorLib/ChangeLabelEffect.py Diff File
mod - Modules/Scripted/EditorLib/ColorBox.py Diff File
mod - Modules/Scripted/EditorLib/DilateEffect.py Diff File
mod - Modules/Scripted/EditorLib/DrawEffect.py Diff File
mod - Modules/Scripted/EditorLib/EditBox.py Diff File
mod - Modules/Scripted/EditorLib/EditColor.py Diff File
mod - Modules/Scripted/EditorLib/EditOptions.py Diff File
mod - Modules/Scripted/EditorLib/Effect.py Diff File
mod - Modules/Scripted/EditorLib/ErodeEffect.py Diff File
mod - Modules/Scripted/EditorLib/FastMarchingEffect.py Diff File
mod - Modules/Scripted/EditorLib/GrowCutEffect.py Diff File
mod - Modules/Scripted/EditorLib/HelperBox.py Diff File
mod - Modules/Scripted/EditorLib/IdentifyIslandsEffect.py Diff File
mod - Modules/Scripted/EditorLib/IslandEffect.py Diff File
mod - Modules/Scripted/EditorLib/LabelEffect.py Diff File
mod - Modules/Scripted/EditorLib/LevelTracingEffect.py Diff File
mod - Modules/Scripted/EditorLib/MakeModelEffect.py Diff File
mod - Modules/Scripted/EditorLib/MorphologyEffect.py Diff File
mod - Modules/Scripted/EditorLib/PaintEffect.py Diff File
mod - Modules/Scripted/EditorLib/RectangleEffect.py Diff File
mod - Modules/Scripted/EditorLib/RemoveIslandsEffect.py Diff File
mod - Modules/Scripted/EditorLib/SaveIslandEffect.py Diff File
mod - Modules/Scripted/EditorLib/ThresholdEffect.py Diff File
mod - Modules/Scripted/EditorLib/WandEffect.py Diff File
mod - Modules/Scripted/EditorLib/WatershedFromMarkerEffect.py Diff File
mod - Modules/Scripted/Endoscopy/Endoscopy.py Diff File
mod - Modules/Scripted/ExtensionWizard/ExtensionWizard.py Diff File
mod - Modules/Scripted/ExtensionWizard/ExtensionWizardLib/CreateComponentDialog.py Diff File
mod - Modules/Scripted/ExtensionWizard/ExtensionWizardLib/DirectoryListWidget.py Diff File
mod - Modules/Scripted/ExtensionWizard/ExtensionWizardLib/EditExtensionMetadataDialog.py Diff File
mod - Modules/Scripted/ExtensionWizard/ExtensionWizardLib/EditableTreeWidget.py Diff File
mod - Modules/Scripted/ExtensionWizard/ExtensionWizardLib/LoadModulesDialog.py Diff File
mod - Modules/Scripted/ExtensionWizard/ExtensionWizardLib/ModuleInfo.py Diff File
mod - Modules/Scripted/ExtensionWizard/ExtensionWizardLib/SettingsPanel.py Diff File
mod - Modules/Scripted/ExtensionWizard/ExtensionWizardLib/TemplatePathUtilities.py Diff File
mod - Modules/Scripted/FiberBundleToLabelMap/FiberBundleToLabelMap.py Diff File
mod - Modules/Scripted/LabelStatistics/LabelStatistics.py Diff File
mod - Modules/Scripted/PerformanceTests/PerformanceTests.py Diff File
mod - Modules/Scripted/SampleData/SampleData.py Diff File
mod - Modules/Scripted/SelfTests/SelfTests.py Diff File
mod - Modules/Scripted/SurfaceToolbox/SurfaceToolbox.py Diff File
mod - Modules/Scripted/VectorToScalarVolume/VectorToScalarVolume.py Diff File
mod - Utilities/Scripts/qrcc.py Diff File
mod - Utilities/Templates/Modules/Scripted/TemplateKey.py Diff File

master ed66be9f

2015-10-08 01:41:19

jcfr

Details Diff 		BUG: Fix incorrect truncation to integer in vtkSlicerTransformLogic

The rotation was incorrectly truncated to integer.

This commit fixes the following clang warnings:

Slicer/Base/Logic/vtkSlicerTransformLogic.cxx:718:59: warning: using integer absolute value function 'abs' when argument is of
floating point type [-Wabsolute-value]
rotateArrow->RotateX(vtkMath::DegreesFromRadians(acos(abs(sliceNormal_RAS[2])))); // TODO: check this, it might not be correct for an arbi...
^

From: Hans Johnson <hans-johnson@uiowa.edu>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24621 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/Logic/vtkSlicerTransformLogic.cxx Diff File

master 16e73c0b

2015-10-08 01:07:53

jcfr

Details Diff 		COMP: Fix "pointer-bool-conversion" clang warnings in vtkMRMLDisplayNode

Slicer/Libs/MRML/Core/vtkMRMLDisplayNode.cxx:127:13: warning: address of array 'this->Color' will always evaluate to 'true' [-Wpointer-bool-conversion]
if (this->Color)
~~ ~~~~~~^~~~~
Slicer/Libs/MRML/Core/vtkMRMLDisplayNode.cxx:136:13: warning: address of array 'this->SelectedColor' will always evaluate to 'true' [-Wpointer-bool-conversion]
if (this->SelectedColor)
~~ ~~~~~~^~~~~~~~~~~~~

From: Hans Johnson <hans-johnson@uiowa.edu>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24620 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/vtkMRMLDisplayNode.cxx Diff File

master 39640479

2015-10-08 01:07:51

jcfr

Details Diff 		COMP: Fix "pointer-bool-conversion" warnings in VolumeHeaderlessStorageNode

FileDimensions and FileSpacing are not dynamically allocated, so
these pointers to arrays are always true.

Slicer/Libs/MRML/Core/vtkMRMLVolumeHeaderlessStorageNode.cxx:152:13: warning: address of array 'this->FileDimensions' will always
evaluate to 'true' [-Wpointer-bool-conversion]
if (this->FileDimensions)
~~ ~~~~~~^~~~~~~~~~~~~~
Slicer/Libs/MRML/Core/vtkMRMLVolumeHeaderlessStorageNode.cxx:158:13: warning: address of array 'this->FileSpacing' will always
evaluate to 'true' [-Wpointer-bool-conversion]
if (this->FileSpacing)
~~ ~~~~~~^~~~~~~~~~~

From: Hans Johnson <hans-johnson@uiowa.edu>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24619 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/vtkMRMLVolumeHeaderlessStorageNode.cxx Diff File

master 00b843ca

2015-10-08 01:07:49

jcfr

Details Diff 		COMP: Fix "tautological-undefined-compare" clang warning in vtkMRMLScene

Slicer/Libs/MRML/Core/vtkMRMLScene.cxx:1707:7: warning: 'this' pointer cannot be null in well-defined C++ code; comparison may be assumed to always evaluate to false [-Wtautological-undefined-compare]
if (this == NULL)
^~~~ ~~~~

From: Hans Johnson <hans-johnson@uiowa.edu>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24618 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/vtkMRMLScene.cxx Diff File

master a5608546

2015-10-08 01:07:47

jcfr

Details Diff 		COMP: Fix "undefined-bool-conversion" clang warnings in vtkMRMLScene

Slicer/Libs/MRML/Core/vtkMRMLScene.cxx:533:9: warning: 'this' pointer cannot be null in well-defined C++ code; pointer may be assumed to always convert to true [-Wundefined-bool-conversion]
if ( !this )
~^~~~
Slicer/Libs/MRML/Core/vtkMRMLScene.cxx:1492:9: warning: 'this' pointer cannot be null in well-defined C++ code; pointer may be assumed to always convert to true [-Wundefined-bool-conversion]
if ( !this || !this->Nodes)
~^~~~

From: Hans Johnson <hans-johnson@uiowa.edu>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24617 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/vtkMRMLScene.cxx Diff File

master bdfc475c

2015-10-08 01:07:44

jcfr

Details Diff 		COMP: Fix "pointer-bool-conversion" warning in vtkFSSurfaceAnnotationReader

Fix the warning by managing "ColorTableFileName" similarly to how "FileName"
is managed in vtkMRMLStorageNode.

Suggested-by: Hans Johnson <hans-johnson@uiowa.edu>

From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24616 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/FreeSurfer/vtkFSSurfaceAnnotationReader.cxx Diff File
mod - Libs/FreeSurfer/vtkFSSurfaceAnnotationReader.h Diff File

master 30a27e77

2015-10-08 00:34:12

lassoan

Details Diff 		ENH: Make vtkAddon classes available in Python as vtkITK

Similarly to vtkITK make vtkAddon classes (vtkOrientedGridTransform, vtkOrientedBSplineTransform) easily accessible in Python.
One can now write: import vtkAddon (instead of import vtkAddonPython) to make classes available.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24615 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/Python/CMakeLists.txt Diff File
mod - Base/Python/slicer/slicerqt-with-tcl.py Diff File
add - Base/Python/vtkAddon.py Diff File
mod - CMake/SlicerConfig.cmake.in Diff File
mod - CMake/SlicerGenerateSlicerConfig.cmake Diff File
mod - CMake/SlicerInstallConfig.cmake.in Diff File
mod - CMakeLists.txt Diff File

master a3359099

2015-10-07 19:54:13

jcfr

Details Diff 		ENH: Add test for vtkMRMLDoubleArrayNode set/get methods

From: Alexis Girault <alexis.girault@kitware.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24614 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/Testing/vtkMRMLDoubleArrayNodeTest1.cxx Diff File

master 02d79603

2015-10-07 19:50:27

jcfr

Details Diff 		ENH: Improve vtkMRMLDoubleArrayNode set/get methods

Until now vtkMRMLDoubleArrayNode values could only be obtained using
'GetXYValue(int, double*, double*)', by passing the index and pointers
to doubles. In python such a method can not be wrapped if it passes
pointers. Within VTK classes such methods are wrapped but the mechanism
is not available to external classes [1][2].

[1] http://www.vtk.org/Wiki/VTK/Python_Wrapper_Enhancement#GetTuple.2FSetTuple_.28done_as_of_Aug_6.2C_2010.29
[2] https://github.com/Kitware/VTK/blob/077fcb394f32c76b4c05a2456b61d000563a19d5/Wrapping/Tools/vtkWrap.c#L661-L697

To overcome this limitation, this commit adds:
(1) the methods 'GetValues', 'SetValues' and 'AddValues', that are
managing the whole vectors of components for each datapoint or the
array (not just XY or XYZ)
(2) the methods 'GetValue', 'SetValue' and 'Addvalue' in order to
retrieve/set/add values not just defined by the datapoint index, but
also by the component index. These methods are conveniently wrapped
in python.

The former set/get methods limited to XY values, as well as the new
methods dealing with only one component value, are based on the methods
managing the entire datapoint vectors.

This commit also applies more robust conditions on the index and the
component number.

Rational :

We were interested in creating this method for vtkMRMLDoubleArrayNode
because this node can be used to transfer double vectors between CLIs
and Slicer [3]. The needs we had were :
(1) Getting the returned values in a python module running the CLIs
(2) Being able to get a specified component (not limited to X and Y)

[3] https://github.com/Slicer/Slicer/blob/866900a/Modules/CLI/ExecutionModelTour/ExecutionModelTour.xml#L183-L19

This commit offers features that can greatly facilitate the exchange
of numerical values between Slicer and the CLI modules.

Co-authored-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@24613 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/vtkMRMLDoubleArrayNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLDoubleArrayNode.h Diff File

master 9d89b7d4

2015-10-07 19:50:25

jcfr

Details Diff 		STYLE: Remove unused python imports from SliceViewAnnotations

From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24612 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/DataProbe/DataProbeLib/SliceViewAnnotations.py Diff File

master 361dff55

2015-10-07 19:50:24

jcfr

Details Diff 		STYLE: Consistently use triple double-quoted string in python docstrings

From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24611 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/Python/slicer/cli.py Diff File
mod - Modules/Scripted/DICOMLib/DICOMWidgets.py Diff File

master 3603c1d4

2015-10-07 02:46:33

jcfr

Details Diff 		ENH: Add auto-delete subject hierarchy children to Application Settings

This commit adds an entry in the SubjectHierarchy settings panel for
the property autoDeleteSubjectHierarchyChildren added in the previous
commit.

This is the parallel to was done for autoCreateSubjectHierarchy property
in r24574 (ENH: Added auto-create subject hierarchy option to Application
Settings)

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24610 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/SubjectHierarchy/Resources/UI/qSlicerSubjectHierarchySettingsPanel.ui Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyPluginLogic.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/qSlicerSubjectHierarchySettingsPanel.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/qSlicerSubjectHierarchySettingsPanel.h Diff File

master 3936a6b3

2015-10-07 02:46:29

jcfr

Details Diff 		ENH: Introduce autoDeleteSubjectHierarchyChildren property

Flag determining whether children of subject hierarchy nodes are automatically
deleted upon deleting a parent subject hierarchy node.

By default, a pop-up question asking the user to confirm the deletion of
children nodes will be shown.

Reviewed-by: Csaba Pinter <csaba.pinter@queensu.ca>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24609 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyPluginLogic.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyPluginLogic.h Diff File

master c56baf5f

2015-10-06 22:55:56

jcfr

Details Diff 		BUG: Do not reset reference when importing scene. Fixes 0004040

This commit fixes a regression introduced in r24393 [1] where a node and its
referenced nodes would be modified if node with the same ID were imported.

The issue is due to the MRML scene being set to the node just before the
function "ReadXMLAttributes()" is called in "vtkMRMLParser::StartElement".

Indeed, since within "ReadXMLAttributes()", the method "AddNodeReferenceID()"
is called, when the ID of a node being imported conflicts with an existing
one in the scene, it causes the existing node to be updated. For example,
this problem is observed in test where a conflicting "vtkMRMLDisplayableNode"
is imported.

Other approach could be to ensure no events are invoked in the method
"vtkMRMLDisplayableNode::OnNodeReferenceAdded" when scene is being
imported.

[1] r24393 - BUG: remove node SceneRootDir, use RootDirectory on MRML scene

Co-authored-by: Nicole Aucoin <nicole@bwh.harvard.edu>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24608 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/Testing/vtkMRMLSceneImportIDConflictTest.cxx Diff File
mod - Libs/MRML/Core/Testing/vtkMRMLSceneImportIDModelHierarchyConflictTest.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLParser.cxx Diff File

master 30a89fef

2015-10-06 16:49:04

naucoin

Details Diff 		BUG: update EMSegment to fix failing test

Updated the EMSegment testing MRML file to
include the singletonTag so that the comparison
between the baseline mrml file and the written
one will succeed. Fixes test EMSeg_MRML_DiffReadWriteNodes

Issue 0004006



git-svn-id: http://svn.slicer.org/Slicer4/trunk@24607 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild.cmake Diff File

master 0779d413

2015-10-06 13:20:06

jcfr

Details Diff 		COMP: KWSYS code for pre-C++98 STL is removed

Various work arounds for pre C++98 STL compilers
have been removed from KWSYS (and by extension, ITK).

For any C++98 or greater compliant compiler, these
constructs were simply aliases to the stl objects.

This is related to the changes made to
KWSYS(5f3fd465ecc0c2d78f7af2495dfe2604be90d4bd) by
Brad King in August 2015.

These changes will be needed when upgrading to ITK v4.9 or greater.

From: Hans Johnson <hans-johnson@uiowa.edu>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24606 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/Logic/vtkSlicerTransformLogic.cxx Diff File
mod - Modules/Loadable/ModelMirror/Logic/vtkModelMirrorLogic.cxx Diff File
mod - Modules/Loadable/Models/Logic/vtkSlicerModelsLogic.cxx Diff File
mod - Modules/Loadable/TractographyDisplay/Logic/vtkSlicerFiberBundleLogic.cxx Diff File
mod - Modules/Loadable/VolumeRendering/Logic/vtkSlicerVolumeRenderingLogic.cxx Diff File

master db23abee

2015-10-06 09:12:08

jcfr

Details Diff 		BUG: Fix vtkITKTransformConverter to support future ITK >= 4.8.1

Anticipating transition to newer version of ITK, this commit fixes
a build error (most likely copy-n-paste error) originally introduced in
r24338 (ENH: Backwards compatible FixedParameters) by changing
"FixedParametersValueType" into "FixedParametersType" to consider ITK
change InsightSoftwareConsortium/ITK@3592834 (BUG: FixedParameters
should be double precision)

Tested-by: Hans Johnson <hans-johnson@uiowa.edu>

From: Hans Johnson <hans-johnson@uiowa.edu>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24605 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/vtkITKTransformConverter.h Diff File
 First  Prev  1 2 3 ... 10 ... 20 ... 30 ... 40 ... 50 ... 55 56 57 58 59 60 61 ... 70 ... 80 ... 90 ... 100 ... 110 ... 120 ... 130 ... 133 134 135  Next  Last