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

master be0c09f1

2017-05-25 13:11:57

pieper

Details Diff
BUG: 0004323 add close button to DICOM widgets

Without the hint, there was no way to close these windows
on certain OS/window managers (e.g. ubuntu 14.04, 16.04).

From: Steve Pieper <pieper@isomics.com>

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

master 4a241b04

2017-05-25 11:31:37

lassoan

Details Diff
BUG: Fixed crash during application exit in SubjectHierarchy PluginHandler

On application exit, qSlicerSubjectHierarchyPluginHandler is deleted before
subject hierarchy node is deleted. Deletion of the node caused the callback command
to execute and call qSlicerSubjectHierarchyPluginHandler::onSubjectHierarchyNodeEvent,
which referred to the deleted pluginHandler.

Solution was to remove observers in the pluginHandler destructor.

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

master 13473a51

2017-05-25 11:31:34

lassoan

Details Diff
BUG: Fixed FreeSurfer overlay colormap table

Color names were overridden with default generated names (R=..., G=..., B=...).
Changed the color table name to match the overlay file it is read from.
Made overlay reading options in Add data dialog a bit more clear: added a "Apply to model:" label to the model node selector.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@26045 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/vtkMRMLFreeSurferModelOverlayStorageNode.cxx Diff File
mod - Modules/Loadable/Models/Resources/UI/qSlicerScalarOverlayIOOptionsWidget.ui Diff File

master 05760a56

2017-05-25 11:31:30

lassoan

Details Diff
BUG: Fixed infinite loop in qMRMLModelDisplayNodeWidget::updateWidgetFromMRML

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

master 61bdc58d

2017-05-25 01:17:27

jcfr

Details Diff
STYLE: Fix typo in License.txt

Likely a Word character set issue.

Reviewed-by: Steve Pieper <pieper@bwh.harvard.edu>

From: mhalle <m@halle.us>

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

master 653f37d1

2017-05-25 01:06:47

jcfr

Details Diff
ENH: Add support for reading launcher setting using CTKAppLauncherLib

This commit introduces a dependency to the statically linked
library CTKAppLauncherLib

This library also used internally by the regular Slicer launcher allows
to read the launcher main settings and its associated revision specific
settings listing extensions paths.

Since on all platforms, environment variables are now consistently read
from settings files, this commit removes:

(1) the duplicated code path settings variables from the application
using methods like:
* qSlicerCoreApplicationPrivate::setPythonEnvironmentVariables()
* qSlicerCoreApplicationPrivate::setTclEnvironmentVariables()
* qSlicerCoreApplicationPrivate::discoverITKFactoriesDirectory()
* qSlicerCorePythonManager::pythonPaths()

(2) the application settings "Python/AdditionalPythonPaths" originally
introduced in r20852 (BUG: Ensure extension python paths are set on MacOSX)
to workaround the fact launcher settings were not used on MacOSX.

Finally, this commit also ensures that PYTHONPATH associated with thirdparty
libraries bundled in extension are considered on MacOSX. See Radiomics/SlicerRadiomics#18

[ci skip]

git-svn-id: http://svn.slicer.org/Slicer4/trunk@26042 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTCore/CMakeLists.txt Diff File
mod - Base/QTCore/qSlicerCoreApplication.cxx Diff File
mod - Base/QTCore/qSlicerCoreApplication_p.h Diff File
mod - Base/QTCore/qSlicerCorePythonManager.cxx Diff File
mod - Base/QTCore/qSlicerExtensionsManagerModel.cxx Diff File
mod - CMake/SlicerBlockCTKAppLauncherSettings.cmake Diff File
mod - CMake/SlicerMacroBuildApplication.cmake Diff File
mod - SuperBuild.cmake Diff File
add - SuperBuild/External_CTKAppLauncherLib.cmake Diff File
mod - SuperBuild/External_VTKv7.cmake Diff File

master 896b2988

2017-05-25 01:06:43

jcfr

Details Diff
ENH: SlicerCoreApplication: Introduces "isUsingLauncher()" function

git-svn-id: http://svn.slicer.org/Slicer4/trunk@26041 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTCore/qSlicerCoreApplication.cxx Diff File
mod - Base/QTCore/qSlicerCoreApplication_p.h Diff File

master 855af2b1

2017-05-25 01:06:41

jcfr

Details Diff
STYLE: SlicerCoreApplication: Simplify code removing updatePythonOsEnviron()

This commit simplifies the code removing optimization (use of "updatePythonOsEnviron()"
function and associated cache variable "EnvironmentVariablesCache") initially introduced
in commits:

* r16909 (BUG: Call updatePythonOsEnviron() after python is initialized.)
* r18762 (ENH: Initialization of python context done within qSlicerCoreApplication)
* r17611 (ENH: qSlicerCoreApplication - Add convenient function allowing to update environment).

git-svn-id: http://svn.slicer.org/Slicer4/trunk@26040 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTCore/qSlicerCoreApplication.cxx Diff File
mod - Base/QTCore/qSlicerCoreApplication_p.h Diff File

master 68188d76

2017-05-24 19:23:27

jcfr

Details Diff
STYLE: vtkITKArchetypeImageSeriesReader: Fix -Wsign-compare warnings

/path/to/Projects/Slicer/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.cxx: In member function ‘void vtkITKArchetypeImageSeriesReader::SetMetaDataScalarRangeToPointDataInfo(vtkImageData*)’:
/path/to/Projects/Slicer/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.cxx:903:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (nbrOfComponents != this->MetaDataScalarRangeMinima.size() ||
^
/path/to/Projects/Slicer/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.cxx:904:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
nbrOfComponents != this->MetaDataScalarRangeMaxima.size())
^
/path/to/Projects/Slicer/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.cxx:923:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
for (unsigned int i = 0; i < nbrOfComponents; ++i)
^

git-svn-id: http://svn.slicer.org/Slicer4/trunk@26039 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/vtkITK/vtkITKArchetypeImageSeriesReader.cxx Diff File

master 78969fe2

2017-05-24 19:23:26

jcfr

Details Diff
STYLE: vtkPolyDataToFractionalLabelmapFilter: Fix -Woverloaded-virtual warning

In file included from /path/to/Projects/Slicer-Release/VTKv7/Common/Core/vtkVariant.h:37:0,
from /path/to/Projects/Slicer-Release/Slicer-build/Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilterPython.cxx:10:
/path/to/Projects/Slicer-Release/VTKv7/Common/Core/vtkSetGet.h:312:14: warning: ‘virtual void vtkImageStencilSource::GetOutputOrigin(double&, double&, double&)’ was hidden [-Woverloaded-virtual]
virtual void Get##name (type &_arg1, type &_arg2, type &_arg3) \
^
/path/to/Projects/Slicer-Release/VTKv7/Imaging/Core/vtkImageStencilSource.h:71:3: note: in expansion of macro ‘vtkGetVector3Macro’
vtkGetVector3Macro(OutputOrigin, double);
^
In file included from /path/to/Projects/Slicer-Release/Slicer-build/Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilterPython.cxx:11:0:
/path/to/Projects/Slicer/Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilter.h:89:8: warning: by ‘vtkPolyDataToFractionalLabelmapFilter::GetOutputOrigin’ [-Woverloaded-virtual]
void GetOutputOrigin(double origin[3]);
^
In file included from /path/to/Projects/Slicer-Release/VTKv7/Common/Core/vtkVariant.h:37:0,
from /path/to/Projects/Slicer-Release/Slicer-build/Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilterPython.cxx:10:
/path/to/Projects/Slicer-Release/VTKv7/Common/Core/vtkSetGet.h:312:14: warning: ‘virtual void vtkImageStencilSource::GetOutputSpacing(double&, double&, double&)’ was hidden [-Woverloaded-virtual]
virtual void Get##name (type &_arg1, type &_arg2, type &_arg3) \
^
/path/to/Projects/Slicer-Release/VTKv7/Imaging/Core/vtkImageStencilSource.h:81:3: note: in expansion of macro ‘vtkGetVector3Macro’
vtkGetVector3Macro(OutputSpacing, double);
^
In file included from /path/to/Projects/Slicer-Release/Slicer-build/Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilterPython.cxx:11:0:
/path/to/Projects/Slicer/Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilter.h:95:8: warning: by ‘vtkPolyDataToFractionalLabelmapFilter::GetOutputSpacing’ [-Woverloaded-virtual]
void GetOutputSpacing(double spacing[3]);
^

git-svn-id: http://svn.slicer.org/Slicer4/trunk@26038 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilter.h Diff File

master ad1518f4

2017-05-24 19:23:24

jcfr

Details Diff
STYLE: vtkMRMLSubjectHierarchyNode: Fix sign-compare warning


/path/to/Slicer/Libs/MRML/Core/vtkMRMLSubjectHierarchyNode.cxx: In member function ‘bool vtkMRMLSubjectHierarchyNode::vtkInternal::ResolveUnresolvedItems()’:
/path/to/Slicer/Libs/MRML/Core/vtkMRMLSubjectHierarchyNode.cxx:1639:33: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (numberOfUnresolvedItems == this->UnresolvedItems->Children.size())
^

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

master 5c168e56

2017-05-24 19:23:23

jcfr

Details Diff
STYLE: vtkSegmentationCore: Fix unused parameter warnings

git-svn-id: http://svn.slicer.org/Slicer4/trunk@26036 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/vtkSegmentationCore/vtkSegment.cxx Diff File
mod - Libs/vtkSegmentationCore/vtkSegmentation.cxx Diff File

master e61be9a2

2017-05-24 15:09:23

lassoan

Details Diff
ENH: Added centered slice jump crosshair behavior

In Crosshair menu the user can now choose between slice jump with offset or centered (or jump slice disabled).

git-svn-id: http://svn.slicer.org/Slicer4/trunk@26035 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTGUI/qSlicerViewersToolBar.cxx Diff File
mod - Base/QTGUI/qSlicerViewersToolBar_p.h Diff File
mod - Libs/MRML/Core/vtkMRMLCrosshairNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLCrosshairNode.h Diff File
mod - Libs/MRML/DisplayableManager/vtkSliceViewInteractorStyle.cxx Diff File
mod - Libs/MRML/DisplayableManager/vtkThreeDViewInteractorStyle.cxx Diff File

master d1f1d67e

2017-05-24 09:18:25

lassoan

Details Diff
ENH: Scissors cut depth can be limited in slice views

git-svn-id: http://svn.slicer.org/Slicer4/trunk@26034 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorAbstractEffect.cxx Diff File
mod - Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorScissorsEffect.cxx Diff File
mod - Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorScissorsEffect.h Diff File

master f7cbfce2

2017-05-24 09:18:22

lassoan

Details Diff
BUG: Fixed qMRMLSpinBox maximum value setting

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

master ae507ab4

2017-05-23 13:55:56

pinter

Details Diff
BUG: Rebuild subject hierarchy if resolve step fails

If the saved scene is invalid for some reason (in the scene attached to the error report there were empty unresolved items in the unresolved items list, and as they did not have valid parents, resolving them failed), then the subject hierarchy node is removed, which triggers re-building the hierarchy from scratch. The resulting hierarchy will be flat (except for the model and annotation hierarchies that can be rebuilt in SH), but at least there will be a valid subject hierarchy

git-svn-id: http://svn.slicer.org/Slicer4/trunk@26032 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/vtkMRMLSubjectHierarchyNode.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyPluginHandler.cxx Diff File
mod - Modules/Loadable/Volumes/SubjectHierarchyPlugins/qSlicerSubjectHierarchyDiffusionTensorVolumesPlugin.h Diff File

master 2d127cd6

2017-05-23 01:27:52

jcfr

Details Diff
BUG: BuildSystem: Add missing entries from launcher settings

This commit explicitly adds ITK_AUTOLOAD_PATH env. variable
and Slicer_QTSCRIPTEDMODULES_LIB_DIR python path.

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

master 6d3b854f

2017-05-23 01:24:59

jcfr

Details Diff
STYLE: qSlicerPythonManager: Remove unneeded "pythonPaths()" function

git-svn-id: http://svn.slicer.org/Slicer4/trunk@26030 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTGUI/qSlicerPythonManager.cxx Diff File
mod - Base/QTGUI/qSlicerPythonManager.h Diff File

master 1c4d69ae

2017-05-23 01:24:57

jcfr

Details Diff
STYLE: BuildSystem: List one Slicer dependencies per line

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

master 4a39ea6a

2017-05-23 01:24:55

jcfr

Details Diff
STYLE: Doxygen: Remove deprecated settings from config file

git-svn-id: http://svn.slicer.org/Slicer4/trunk@26028 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Utilities/Doxygen/Doxyfile.txt.in Diff File

master 510e3a62

2017-05-23 01:24:54

jcfr

Details Diff
STYLE: BuildSystem: Improve comments associated with launcher settings

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

master ebdd44a5

2017-05-19 00:46:50

lassoan

Details Diff
ENH: Added standard undo/redo shortcut to segment editor

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

master a7e255c3

2017-05-18 15:43:38

lassoan

Details Diff
BUG: Fixed ScreenCapture ffmpeg download

ffmpeg download site added a user agent check which prevented download with default settings.
Solution was to specify a user agent.
Also added the option of specifying multiple mirror sites.

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

master e98b1d39

2017-05-18 11:51:13

jcfr

Details Diff
STYLE: BuildSystem: Update SimpleITK external proj to use recommended opts (2)

Suggested-by: Bradley Lowekamp <blowekamp@mail.nih.gov>

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

master a3928053

2017-05-18 11:24:40

jcfr

Details Diff
STYLE: BuildSystem: Update SimpleITK external proj to use recommended options

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