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

Search Browse Back to Index

master e80e3c1b

2015-11-30 14:13:46

lassoan

Details Diff 		ENH: Simplified vtkSlicerApplicationLogic

Problem:
vtkSlicerApplicationLogic had node-specific logic for creating storage and display nodes.
This made it necessary to modify vtkSlicerApplicationLogic whenever a new node type is added.
CreateDefaultStorageNode and CreateDefaultDisplayNodes methods are introduced some time ago
to encapsulate all node-specific storage and display node creation. These methods were partly
used by vtkSlicerApplicationLogic, but not for all cases; also, CreateDefaultStorageNode and
CreateDefaultDisplayNodes methods were not implemented for all nodes.

Solution:
Moved node-specific storage and display node creation code to CreateDefaultStorageNode and
CreateDefaultDisplayNodes methods of the corresponding nodes.
Replaced node-specific logic from vtkSlicerApplicationLogic by CreateDefaultStorageNode and
CreateDefaultDisplayNodes method calls.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24780 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/Logic/vtkSlicerApplicationLogic.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLDiffusionTensorVolumeNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLDiffusionTensorVolumeNode.h Diff File
mod - Libs/MRML/Core/vtkMRMLDiffusionWeightedVolumeNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLDiffusionWeightedVolumeNode.h Diff File
mod - Libs/MRML/Core/vtkMRMLLabelMapVolumeNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLModelNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLModelNode.h Diff File
mod - Libs/MRML/Core/vtkMRMLScalarVolumeNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLScalarVolumeNode.h Diff File
mod - Libs/MRML/Core/vtkMRMLVectorVolumeNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLVectorVolumeNode.h Diff File

master 030427a1

2015-11-27 23:23:50

jcfr

Details Diff 		COMP: Update ExternalProjectDependency based on commontk/Artichoke@7115980

$ git shortlog 82fa9f4..7115980 --no-merges
Jean-Christophe Fillion-Robin (1):
_sb_list_to_string: Update function to not set CMP0007 to OLD

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

master e4488d10

2015-11-27 23:23:48

jcfr

Details Diff 		STYLE: ListToString: Update function to not set CMP0007 to OLD

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

master d0dbf9d6

2015-11-26 17:22:31

jcfr

Details Diff 		STYLE: CMakeLists.txt: Set CMP0048 policy to NEW

This commit also updates projects EMSegment, MultiVolumeExplorer,
OpenIGTLinkIF and SlicerSimpleFilters.

EMSegment:

r17114
STYLE: Fix CMake warning setting CMP0048 to NEW


MultiVolumeExplorer:

$ git shortlog 9cd4730..a0743dc --no-merges
Jean-Christophe Fillion-Robin (5):
STYLE: Remove unused extension packaging code
STYLE: Simplify CMakeLists.txt removing extra comments
STYLE: Update CMakeLists.txt to use recommended variable names
STYLE: Update testing/CMakeLists.txt to use slicerMacroConfigureModuleCxxTestDriver
STYLE: Fix CMake warning setting CMP0048 to NEW


OpenIGTLinkIF:

$ git shortlog 435b1c3..3ad1f67 --no-merges
Jean-Christophe Fillion-Robin (3):
STYLE: Simplify CMakelists directly including find_package(Slicer)
STYLE: CMakeLists.txt: Use recommended variable names
STYLE: Fix CMake warning setting CMP0048 to NEW


SlicerSimpleFilters:

$ git shortlog 48b7873..c58cfe5 --no-merges
Jean-Christophe Fillion-Robin (1):
STYLE: Fix CMake warning setting CMP0048 to NEW

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24777 3bd1e089-480b-0410-8dfb-8563597acbee
mod - CMake/UseSlicer.cmake.in Diff File
mod - CMakeLists.txt Diff File
mod - Extensions/CMake/CMakeLists.txt Diff File
mod - Modules/Loadable/DoubleArrays/CMakeLists.txt Diff File
mod - SuperBuild.cmake Diff File

master 5d277aec

2015-11-26 15:49:35

pinter

Details Diff 		BUG: Fixed SubjectHierarchyCorePluginsSelfTest

Test broke after rev24770 that fixed a bug in SH clone node plugin. The test was asserting the opposite of what it was supposed to. Access of postfix made possible from python so that no hard-coded strings need to be used.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24776 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Applications/SlicerApp/Testing/Python/SubjectHierarchyCorePluginsSelfTest.py Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyCloneNodePlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyCloneNodePlugin.h Diff File

master df14baeb

2015-11-25 01:52:46

jcfr

Details Diff 		BUG: Update EMSegment to fix loading of centred atlas

This commit fixes the passing of loadAtlasNonCentered option to
LoadUserDefinedAtlas in EMSegmentCommandLine. This should allow
centred atlas to be used from the command line. (See EMSegment r17113)

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

master 51e9c8f6

2015-11-25 01:52:44

jcfr

Details Diff 		ENH: Update EMSegment to add autoBoundaryDetection for command line module

This commit adds the option "autoBoundaryDetection" to EMSegmentCommandLine
If flag is set then the method will automatically determine the boundary
box which includes non-zero voxels in the input images. This speed things
up when working with skull stripped images. (See EMSegment r17112)

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

master 582d5e51

2015-11-25 01:41:47

jcfr

Details Diff 		STYLE: vtkTeem: Remove setting of policy CMP0033 unneeded since teem r6233

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24773 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/vtkTeem/CMakeLists.txt Diff File

master 02052217

2015-11-25 01:41:45

jcfr

Details Diff 		STYLE: Remove setting of CMP0017 to OLD in Libs

This commit is the first of series modernizing the build system by removing
the setting of CMake policies to OLD.

Since the policy is still set to OLD in the top level CMakeLists.txt, this
change will have no impact.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24772 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/FreeSurfer/CMakeLists.txt Diff File
mod - Libs/MRML/CLI/CMakeLists.txt Diff File
mod - Libs/MRML/Core/CMakeLists.txt Diff File
mod - Libs/MRML/DisplayableManager/CMakeLists.txt Diff File
mod - Libs/MRML/IDImageIO/CMakeLists.txt Diff File
mod - Libs/MRML/Logic/CMakeLists.txt Diff File
mod - Libs/MRML/Widgets/CMakeLists.txt Diff File
mod - Libs/RemoteIO/CMakeLists.txt Diff File
mod - Libs/vtkAddon/CMakeLists.txt Diff File
mod - Libs/vtkITK/CMakeLists.txt Diff File
mod - Libs/vtkTeem/CMakeLists.txt Diff File

master 89e24e48

2015-11-24 23:01:26

jcfr

Details Diff 		ENH: Fix scene save with default parameters

Novice Slicer users often complain that scene saving fails. The problem
is that Slicer offers scene saving in a read-only directory by default
(into the current working directory, which is the read-only program
binary directory by default).

Fixes applied:

1. Changed the default scene root directory to be the user's documents
folder (determined the same way as the default DICOM database directory).

2. Made default scene directory configurable in the application settings
GUI (selection is stored in application settings under "DefaultScenePath" key).

From: Andras Lasso <lasso@queensu.ca>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24771 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTCore/qSlicerCoreApplication.cxx Diff File
mod - Base/QTCore/qSlicerCoreApplication.h Diff File
mod - Base/QTGUI/Resources/UI/qSlicerSettingsGeneralPanel.ui Diff File
mod - Base/QTGUI/qSlicerSettingsGeneralPanel.cxx Diff File
mod - Base/QTGUI/qSlicerSettingsGeneralPanel.h Diff File

master 7cfc9d6f

2015-11-24 11:24:06

pinter

Details Diff 		BUG: Fixed subject hierarchy cloned node name

In some cases the cloned data node had the same name as the original one. Now the name is set after the Copy call, and the name postfix is properly applied.

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

master 670f0a7a

2015-11-23 15:35:55

pieper

Details Diff 		ENH: Add option for exporting DICOM segmentation objects from editor

This commit transitions some functionality that was buried in
the LabelStructureListWidget into the EditUtil class so that it
can be used in other parts of the code (in particular in the
DICOMSegmentationPlugin provided by the Reporting extension).

This code is in a transitional state where the core depends
on code from the extension (the EncodeSEG CLI module). Once
the SEGSupport converters are moved to the core that dependency
will go away.

From: Steve Pieper <pieper@isomics.com>

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

master 8c62342f

2015-11-23 15:35:53

pieper

Details Diff 		ENH: factor out default DICOM series name generation to superclass

This allows multiple plugins to adopt the same naming
convention for the mapping of series number and description
into the names of nodes.

From: Steve Pieper <pieper@isomics.com>

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

master d51d490c

2015-11-21 00:39:29

jcfr

Details Diff 		BUG: Fix regression in SubjectHierarchyCorePluginsSelfTest

This commit fixes a typo introduced in r24759 (STYLE: Update python
tests to use more specific asserts.):

File "<string>", line 1, in <module>
File "/path/to/Slicer-build/lib/Slicer-4.5/qt-scripted-modules/SubjectHierarchyCorePluginsSelfTest.py", line 186
self.assertEqual( slicer.mrmlScene.GetNumberOfNodesByClass('vtkMRMLMarkupsFiducialStorageNode'), 2 )
^
SyntaxError: invalid syntax

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24767 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Applications/SlicerApp/Testing/Python/SubjectHierarchyCorePluginsSelfTest.py Diff File

master ce7a1766

2015-11-21 00:30:43

jcfr

Details Diff 		STYLE: vtkThreeDViewInteractorStyle: Refactor code introducing keySym ivar

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@24766 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/DisplayableManager/vtkThreeDViewInteractorStyle.cxx Diff File

master 28053102

2015-11-21 00:30:40

jcfr

Details Diff 		STYLE: vtkThreeDViewInteractorStyle: Display error message if KeySym null

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@24765 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/DisplayableManager/vtkThreeDViewInteractorStyle.cxx Diff File

master 92572860

2015-11-20 23:50:33

jcfr

Details Diff 		BUG: vtkThreeDViewInteractorStyle: Exit OnKeyPress if CameraNode null

In the vtkThreeDViewInteractorStyle, OnKeyPress did not check for
the cameraNode before applying transformations to the camera,
resulting in Slicer crashing if the InteractorStyle was changed
and reset to a vtkThreeDViewInteractorStyle.

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@24764 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/DisplayableManager/vtkThreeDViewInteractorStyle.cxx Diff File

master 76cc5930

2015-11-20 23:28:20

jcfr

Details Diff 		STYLE: qMRMLSliceControllerWidget: Add ctor allowing to use specialized pimpl.

Suggested-by: Davide Punzo <punzodavide@hotmail.it>

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

master 90df4692

2015-11-20 23:28:16

jcfr

Details Diff 		STYLE: qMRMLSliceWidget: Add ctor allowing to use specialized pimpl.

Suggested-by: Davide Punzo <punzodavide@hotmail.it>

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

master f0d45cdd

2015-11-20 14:39:16

jcfr

Details Diff 		BUG: Fix regression in LabelStatisticsTest

This commit fixes a regression introduced in r24759 (STYLE: Update python
tests to use more specific asserts.) where

self.assertTrue( warnings == "" )

has improperly changed into

self.assertNotEqual( warnings, "" )

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

master 20646f0e

2015-11-20 12:57:30

lassoan

Details Diff 		BUG: Fixed volume rendering at incorrect position

Modification of any transforms applied on any volume may alter location where volume rendering appears.

How to reproduce:
•Load MRHead sample (MRHead)
•Load MRHead sample (MRHead_1)
•Apply a new linear transform (LinearTransform_3) to MRHead
•Go to Volume Rendering module
•Switch to MRHead_1, show volume rendering => volume rendering of MRHead_1 is displayed
•Go to transforms module
•Modify LinearTransform_3 => ERROR: volume rendering of MRHead_1 moves on the image (while the transform is only applied to MRHead)
•Slightly rotate the 3D view => volume rendering of MRHead_1 jumps (back to the location where it should be)

Problem root cause: vtkMRMLVolumeRenderingDisplayableManager observes all TransformModifiedEvent changes and updates the position of the current volume based on that (even if not the current volume's transform is changed)

Solution: Ignore transform modified changes if not the current volume's transform is modified.

Ideally, event management in the Volume Rendering displayable manager should be refactored to not observe irrelevant events.


git-svn-id: http://svn.slicer.org/Slicer4/trunk@24760 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/VolumeRendering/MRMLDM/vtkMRMLVolumeRenderingDisplayableManager.cxx Diff File

master 820b6be2

2015-11-19 22:56:01

jcfr

Details Diff 		STYLE: Update python tests to use more specific asserts.

Using the more specific assert functions usually gives more useful
error messages.

Suggested-by: Csaba Pinter <csaba.pinter@queensu.ca>
Suggested-by: Max Smolens <max.smolens@kitware.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24759 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/SliceLinkLogic.py Diff File
mod - Applications/SlicerApp/Testing/Python/Slicer4Minute.py Diff File
mod - Applications/SlicerApp/Testing/Python/SlicerMRBMultipleSaveRestoreLoopTest.py Diff File
mod - Applications/SlicerApp/Testing/Python/SlicerMRBMultipleSaveRestoreTest.py Diff File
mod - Applications/SlicerApp/Testing/Python/SlicerMRBSaveRestoreCheckPathsTest.py Diff File
mod - Applications/SlicerApp/Testing/Python/SlicerMRBTest.py Diff File
mod - Applications/SlicerApp/Testing/Python/SlicerUnitTestTest.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/test_tractography_display.py Diff File
mod - Base/Python/slicer/release/midasdata_test.py Diff File
mod - Base/QTCore/Testing/Python/qSlicerModuleGenericTest.py.in Diff File
mod - Extensions/Testing/ScriptedLoadableExtensionTemplate/ScriptedLoadableModuleTemplate/ScriptedLoadableModuleTemplate.py Diff File
mod - Modules/Loadable/SceneViews/Testing/Python/AddStorableDataAfterSceneViewTest.py Diff File
mod - Modules/Scripted/FiberBundleToLabelMap/FiberBundleToLabelMap.py Diff File
mod - Modules/Scripted/LabelStatistics/LabelStatistics.py Diff File
mod - Modules/Scripted/SurfaceToolbox/SurfaceToolbox.py Diff File
mod - Utilities/Templates/Modules/Scripted/TemplateKey.py Diff File

master eb2b4b3b

2015-11-19 22:55:52

jcfr

Details Diff 		STYLE: Update python scripts to use "is None" instead of "== None"

Rational copied from https://www.python.org/dev/peps/pep-0290/#testing-for-none

// -----------------
Since there is only one None object, equality can be tested with identity. Identity tests are slightly faster than equality tests. Also, some object types may overload comparison, so equality testing may be much slower.

Pattern:

if v == None --> if v is None:
if v != None --> if v is not None:
// -----------------

Reviewed-by: Csaba Pinter <csaba.pinter@queensu.ca>
Reviewed-by: Max Smolens <max.smolens@kitware.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24758 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/ScriptedModuleDiscoveryTest.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/SlicerMRBSaveRestoreCheckPathsTest.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/release/midasdata.py Diff File
mod - Base/Python/tpycl/tpycl.py Diff File
mod - Extensions/Testing/ScriptedLoadableExtensionTemplate/ScriptedLoadableModuleTemplate/ScriptedLoadableModuleTemplate.py Diff File
mod - Modules/Loadable/Colors/Testing/Python/CustomColorTableSceneViewRestoreTestBug3992.py Diff File
mod - Modules/Loadable/CropVolume/Testing/Python/CropVolumeSelfTest.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/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/DICOMScalarVolumePlugin.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/EditUtil.py Diff File
mod - Modules/Scripted/EditorLib/HelperBox.py Diff File
mod - Modules/Scripted/EditorLib/RectangleEffect.py Diff File
mod - Modules/Scripted/Endoscopy/Endoscopy.py Diff File
mod - Modules/Scripted/FiberBundleToLabelMap/FiberBundleToLabelMap.py Diff File
mod - Modules/Scripted/LabelStatistics/LabelStatistics.py Diff File
mod - Modules/Scripted/SampleData/SampleData.py Diff File
mod - Modules/Scripted/SurfaceToolbox/SurfaceToolbox.py Diff File
mod - Utilities/Scripts/SEMToMediaWiki.py Diff File
mod - Utilities/Templates/Modules/Scripted/TemplateKey.py Diff File

master f8450373

2015-11-19 21:59:35

jcfr

Details Diff 		ENH: Added output checking to module CXX tests

Added a new option (WITH_VTK_ERROR_OUTPUT_CHECK) to slicerMacroConfigureModuleCxxTestDriver
that enables checking of error and warning messages. If the option is enabled then the test
fails if unexpected error or warning is logged.

Enabled the option for all tests that had debug leaks check option (WITH_VTK_DEBUG_LEAKS_CHECK)
enabled. Fixed failing tests by fixing the test, the tested code, or (most frequently) marking
expected errors/warning (using TESTING_OUTPUT_ASSERT_ERRORS_BEGIN() / TESTING_OUTPUT_ASSERT_ERRORS_END()
and similar macros).

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

From: Andras Lasso <lasso@queensu.ca>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24757 3bd1e089-480b-0410-8dfb-8563597acbee
mod - CMake/SlicerMacroConfigureModuleCxxTestDriver.cmake Diff File
mod - Extensions/Testing/LoadableExtensionTemplate/LoadableModuleTemplate/Testing/Cxx/CMakeLists.txt Diff File
mod - Extensions/Testing/SuperBuildExtensionTemplate/SuperLoadableModuleTemplate/Testing/Cxx/CMakeLists.txt Diff File
mod - Libs/MRML/Core/vtkMRMLCoreTestingMacros.h Diff File
mod - Modules/Loadable/Annotations/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/Annotations/Testing/Cxx/vtkMRMLAnnotationDisplayableManagerTest2.cxx Diff File
mod - Modules/Loadable/Annotations/Testing/Cxx/vtkSlicerAnnotationModuleLogicImportSceneTest.cxx Diff File
mod - Modules/Loadable/Annotations/Testing/Cxx/vtkSlicerAnnotationModuleLogicTest1.cxx Diff File
mod - Modules/Loadable/Cameras/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/Colors/Logic/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/Colors/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/CropVolume/Testing/CMakeLists.txt Diff File
mod - Modules/Loadable/Data/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/DoubleArrays/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/DoubleArrays/Testing/Cxx/vtkSlicerDoubleArraysLogicAddFileTest.cxx Diff File
mod - Modules/Loadable/Markups/Logic/vtkSlicerMarkupsLogic.cxx Diff File
mod - Modules/Loadable/Markups/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/Markups/Testing/Cxx/vtkMRMLMarkupsFiducialStorageNodeTest1.cxx Diff File
mod - Modules/Loadable/Markups/Testing/Cxx/vtkMRMLMarkupsFiducialStorageNodeTest2.cxx Diff File
mod - Modules/Loadable/Markups/Testing/Cxx/vtkMRMLMarkupsNodeTest1.cxx Diff File
mod - Modules/Loadable/Markups/Testing/Cxx/vtkMRMLMarkupsNodeTest2.cxx Diff File
mod - Modules/Loadable/Markups/Testing/Cxx/vtkSlicerMarkupsLogicTest1.cxx Diff File
mod - Modules/Loadable/Markups/Testing/Cxx/vtkSlicerMarkupsLogicTest2.cxx Diff File
mod - Modules/Loadable/Markups/Widgets/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/Models/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/Models/Testing/Cxx/qSlicerModelsModuleWidgetTest.cxx Diff File
mod - Modules/Loadable/Models/Widgets/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/SceneViews/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/SceneViews/Testing/Cxx/vtkSlicerSceneViewsModuleLogicTest1.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/TractographyDisplay/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/TractographyInteractiveSeeding/Testing/CMakeLists.txt Diff File
mod - Modules/Loadable/Transforms/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/Units/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/VolumeRendering/Logic/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/VolumeRendering/Logic/Testing/Cxx/vtkSlicerVolumeRenderingLogicAddFromFileTest.cxx Diff File
mod - Modules/Loadable/VolumeRendering/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/Volumes/Testing/Cxx/CMakeLists.txt Diff File
mod - Modules/Loadable/Volumes/Widgets/Testing/Cxx/CMakeLists.txt Diff File
mod - Utilities/Templates/Modules/Loadable/Testing/Cxx/CMakeLists.txt Diff File

master f5dde09c

2015-11-19 21:27:20

msmolens

Details Diff 		COMP: Fix configuration error with VTK OpenGL2 backend

This commit fixes a CMake error when building Slicer configured with:

Slicer_VTK_RENDERING_BACKEND:STRING=OpenGL2

The error is:

39> Performing configure step for 'Slicer'
...
39> -- Found Qt4: C:/dev/Support/qt-4.8.7-64-vs2013-deb/bin/qmake.exe (found version "4.8.7")
39> -- Configuring Slicer with Qt 4.8.7 (using modules: QTCORE, QTGUI, QTNETWORK, QTOPENGL, QTUITOOLS, QTXML, QTXMLPATTERNS, QTWEBKIT, QTSVG, QTSQL, PHONON, QTSCRIPT, QTTEST, )
39> -- Configuring Slicer for [win-amd64]
39> CMake Error at C:/dev/SB2/VTKv6/CMake/vtkModuleAPI.cmake:120 (message):
39> Requested modules not available:
39>
39> vtkGUISupportQtOpenGL
39> Call Stack (most recent call first):
39> C:/dev/SB2/VTKv6-build/VTKConfig.cmake:67 (vtk_module_config)
39> CMakeLists.txt:790 (find_package)

When using the OpenGL backend the vtkGUISupportQtOpenGL module is built because
of the CMake setting VTK_Group_Qt:BOOL=ON. When using the OpenGL2 backend it's
necessary to explicitly enable the vtkGUISupportQtOpenGL module. In this case,
the module is not part of the Qt group. See [1].

[1] https://github.com/Slicer/VTK/blob/fe92273888219edca422f3a308761ddcd2882e2b/GUISupport/QtOpenGL/module.cmake#L1-L3

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24756 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild/External_VTKv6.cmake Diff File
 First  Prev  1 2 3 ... 10 ... 20 ... 30 ... 40 ... 49 50 51 52 53 54 55 ... 60 ... 70 ... 80 ... 90 ... 100 ... 110 ... 120 ... 130 ... 133 134 135  Next  Last