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

Search Browse Back to Index

master b8d586e9

2015-02-03 09:54:25

jcfr

Details Diff 		COMP: Update OpenIGTLinkIF to fix sign-compare warnings

//-----------
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: Tue Feb 3 00:27:38 2015 -0500

COMP: Fix sign-compare warnings in vtkIGTLToMRMLPolyData::IGTLToMRML

This commit fixes the following warnings:

//------------
/path/to/OpenIGTLinkIF/MRML/vtkIGTLToMRMLPolyData.cxx: In member function ‘virtual int vtkIGTLToMRMLPolyData::IGTLToMRML(igtl::MessageBase::Pointer, vtkMRMLNode*)’:
/path/to/OpenIGTLinkIF/MRML/vtkIGTLToMRMLPolyData.cxx:171:34: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
for (unsigned int i = 0; i < npoints; i ++)
^
/path/to/OpenIGTLinkIF/MRML/vtkIGTLToMRMLPolyData.cxx:190:34: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
for (unsigned int i = 0; i < nvertices; i ++)
^
/path/to/OpenIGTLinkIF/MRML/vtkIGTLToMRMLPolyData.cxx:213:33: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
for(unsigned int i = 0; i < nlines; i++)
^
/path/to/OpenIGTLinkIF/MRML/vtkIGTLToMRMLPolyData.cxx:238:33: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
for(unsigned int i = 0; i < npolygons; i++)
^
/path/to/OpenIGTLinkIF/MRML/vtkIGTLToMRMLPolyData.cxx:263:33: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
for(unsigned int i = 0; i < ntstrips; i++)
^
/path/to/OpenIGTLinkIF/MRML/vtkIGTLToMRMLPolyData.cxx: In member function ‘virtual int vtkIGTLToMRMLPolyData::MRMLToIGTL(long unsigned int, vtkMRMLNode*, int*, void**)’:
/path/to/OpenIGTLinkIF/MRML/vtkIGTLToMRMLPolyData.cxx:399:38: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
for (unsigned int i = 0; i < npoints; i ++)
//------------
//-----------

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

master 6e42b62a

2015-02-03 01:55:35

jcfr

Details Diff 		COMP: Fix unused variable warning in qSlicerModelsModuleWidget

Fix commit fixes the following warning:

//-------------
Modules/Loadable/Models/qSlicerModelsModuleWidget.cxx:390: warning: unused variable 'scene' [-Wunused-variable]
//-------------

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

master 295cbafe

2015-02-03 01:43:55

jcfr

Details Diff 		COMP: Workaround to fix HAVE_STAT redefined warning in qSlicerCoreApplication

This commit fixes the following warning:

//-------------
In file included from /path/to/Slicer-build/DCMTK/dcmdata/include/dcmtk/dcmdata/dcdatset.h:26:0,
from /path/to/Slicer-build/CTK/Libs/DICOM/Core/ctkDICOMItem.h:28,
from /path/to/Slicer-build/CTK/Libs/DICOM/Core/ctkDICOMDatabase.h:29,
from /path/to/Slicer/Base/QTCore/qSlicerCoreApplication.cxx:101:
/path/to/Slicer-build/DCMTK-build/config/include/dcmtk/config/osconfig.h:540:0: warning: "HAVE_STAT" redefined [enabled by default]
#define HAVE_STAT 1
^
In file included from /path/to/Slicer-build/python-install/include/python2.7/Python.h:58:0,
from /path/to/Slicer-build/CTK-build/CMakeExternals/Install/include/PythonQt/PythonQtPythonInclude.h:93,
from /path/to/Slicer-build/CTK-build/CMakeExternals/Install/include/PythonQt/PythonQtInstanceWrapper.h:45,
from /path/to/Slicer-build/CTK-build/CMakeExternals/Install/include/PythonQt/PythonQt.h:46,
from /path/to/Slicer/Base/QTCore/qSlicerCoreApplication.cxx:52:
/path/to/Slicer-build/python-install/include/python2.7/pyport.h:361:0: note: this is the location of the previous definition
#define HAVE_STAT
^
//-------------

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

master b5c2015c

2015-02-03 01:43:53

jcfr

Details Diff 		COMP: Fix redefined _POSIX_C_SOURCE warning in MRMLScriptedDisplayableManager

See previous commit message for more details.

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

master b0324ee2

2015-02-03 01:28:52

jcfr

Details Diff 		COMP: Fix redefined _POSIX_C_SOURCE warning

As detailed in kitware/VTK@0c8d479, the Python documentation
clearly states the proper approach:

"Since Python may define some pre-processor definitions which
affect the standard headers on some systems, you must include
Python.h before any standard headers are included."
(http://docs.python.org/c-api/intro.html#include-files)

Include "vtkPython.h" prior to any system header in all translation
units that need Python.

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

master 99595d4c

2015-02-03 01:07:11

jcfr

Details Diff 		COMP: Fix overloaded-virtual warnings in itkAnisotropicSimilarity3DTransform

This commit fixes the following warning:

//--------
In file included from /path/to/Slicer-SuperBuild-Debug/ITKv4/Modules/Core/Transform/include/itkRigid3DTransform.h:223:0,
from /path/to/Slicer-SuperBuild-Debug/ITKv4/Modules/Core/Transform/include/itkVersorTransform.h:22,
from /path/to/Slicer-SuperBuild-Debug/ITKv4/Modules/Core/Transform/include/itkVersorRigid3DTransform.h:22,
from /path/to/Slicer/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAnisotropicSimilarity3DTransform.h:22,
from /path/to/Slicer/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkInitialImageToImageRegistrationMethod.h:28,
from /path/to/Slicer/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageToImageRegistrationHelper.h:25,
from /path/to/Slicer/Modules/CLI/ExpertAutomatedRegistration/ExpertAutomatedRegistration.cxx:3:
/path/to/Slicer/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAnisotropicSimilarity3DTransform.h: In instantiation of ‘class itk::AnisotropicSimilarity3DTransform<double>’:
/path/to/Slicer/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkInitialImageToImageRegistrationMethod.txx:80:37: required from here
/path/to/Slicer-SuperBuild-Debug/ITKv4/Modules/Core/Transform/include/itkRigid3DTransform.hxx:89:1: warning: ‘void itk::Rigid3DTransform<TScalar>::SetMatrix(const MatrixType&, double) [with TScalar = double; itk::Rigid3DTransform<TScalar>::MatrixType = itk::Matrix<double, 3u, 3u>]’ was hidden [-Woverloaded-virtual]
Rigid3DTransform< TScalar >
^
In file included from /path/to/Slicer/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAnisotropicSimilarity3DTransform.h:160:0,
from /path/to/Slicer/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkInitialImageToImageRegistrationMethod.h:28,
from /path/to/Slicer/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageToImageRegistrationHelper.h:25,
from /path/to/Slicer/Modules/CLI/ExpertAutomatedRegistration/ExpertAutomatedRegistration.cxx:3:
/path/to/Slicer/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAnisotropicSimilarity3DTransform.txx:80:1: warning: by ‘void itk::AnisotropicSimilarity3DTransform<TScalarType>::SetMatrix(const MatrixType&) [with TScalarType = double; itk::AnisotropicSimilarity3DTransform<TScalarType>::MatrixType = itk::Matrix<double, 3u, 3u>]’ [-Woverloaded-virtual]
AnisotropicSimilarity3DTransform<TScalarType>
//--------

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23949 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAnisotropicSimilarity3DTransform.h Diff File

master 6ee3af2f

2015-02-03 00:41:54

jcfr

Details Diff 		STYLE: Fix parentheses warning in qMRMLSceneHierarchyModel

This commit fixes a warning introduced by r23845 (BUG: 3926. Added
null pointer checks into reparenting code.)

//----------------
/path/to/Slicer/Libs/MRML/Widgets/qMRMLSceneHierarchyModel.cxx: In member function ‘virtual bool qMRMLSceneHierarchyModel::reparent(vtkMRMLNode*, vtkMRMLNode*)’:
/path/to/Slicer/Libs/MRML/Widgets/qMRMLSceneHierarchyModel.cxx:306:39: warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
if (!hierarchyNode || newParent && strcmp(newParent->GetClassName(), hierarchyNode->GetClassName()))
^
//----------------

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

master 3342bd5f

2015-02-03 00:35:02

jcfr

Details Diff 		COMP: Fix sign-compare warning in vtkSlicerVolumesLogic

This commit fixes are a warning introduced by r23934 (BUG: avoid false
positives on geometry check)

// -----------
/path/to/Slicer/Modules/Loadable/Volumes/Logic/vtkSlicerVolumesLogic.cxx:96:41: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
for (int i = 0; i < fractional.length(); ++i)
^
/path/to/Slicer/Modules/Loadable/Volumes/Logic/vtkSlicerVolumesLogic.cxx:114:36: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (i == fractional.length() - 1)
// ----------- ^

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23947 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Volumes/Logic/vtkSlicerVolumesLogic.cxx Diff File

master 875b42a1

2015-02-03 00:34:59

jcfr

Details Diff 		ENH: Update version of ITK to 4.7.1

$ git shortlog 0f6c2b3..9c9b310 --no-merges
Brad King (1):
COMP: Fix variable reference in ITKVtkGlue module files

Bradley Lowekamp (7):
BUG: Enable setting all zeroes for fixed parameters for displacement
COMP: Fix unsafe usage of sprintf
BUG: Fix incorrectly ordering of template parameters
COMP: check for search.h in libtiff
BUG: restore the center point fixed parameters for scale transforms
COMP: Use _timezone for Visual Studio
BUG: Restore IO support for BSplineDeformableTransform

Christopher Mullins (2):
BUG: Return a correct voronoi partition in Danielsson filter example.
STYLE: Fix Latex blocks in documentation to include newlines.

Dženan Zukić (2):
COMP: VS 2012+ compile fixes and CMake warnings
COMP: fixing quote matching in vtkGlue-related .cmake file

Jean-Christophe Fillion-Robin (1):
Ensure ITKDeprecated is always excluded from the default module list.

Julien Jomier (1):
BUG: Output pointer origin is not set causing a memory access error.

Matthew McCormick (3):
ENH: Bump CMakeLists.txt version to 4.8.0.
ENH: Bump release branch version to 4.7.1.
BUG: Clear TransformIO's list of transforms in TransformFileReader.

Niels Dekker (1):
BUG: workaround for 64bit VS2013 Release segfault

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

master ce85710f

2015-02-02 23:39:37

jcfr

Details Diff 		BUG: Fix IndentationError in DICOMPlugin.py

This commit fixes regression introduced in r23939 (ENH: Transfer
referencedInstanceUIDs to the MRML attribute).

Runtime error:

// -------------
Fail to instantiate module "DICOMSlicerDataBundlePlugin"
Traceback (most recent call last):
File "<string>", line 1, in <module>
File "/path/to/Slicer-build/lib/Slicer-4.4/qt-scripted-modules/MultiVolumeImporterPlugin.py", line 4, in <module>
from DICOMLib import DICOMPlugin
File "/path/to/Slicer-build/lib/Slicer-4.4/qt-scripted-modules/DICOMLib/__init__.py", line 5, in <module>
from DICOMPlugin import *
File "/path/to/Slicer-build/lib/Slicer-4.4/qt-scripted-modules/DICOMLib/DICOMPlugin.py", line 208
referencedInstanceUIDs += instanceUID + " "
^
IndentationError: expected an indented bloc
// -------------

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

master cc560ec8

2015-02-02 23:24:28

jcfr

Details Diff 		COMP: Fix VTKv5 build error associated with new reslice pipeline

This commit fixes build error introduced by the two previous commit
and happening when enabling VTKv5 build.

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

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

master c4501bf9

2015-02-02 23:24:25

jcfr

Details Diff 		BUG: Fixed background image mask usage in all volume display nodes

From: Andras Lasso <lasso@queensu.ca>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23943 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/vtkMRMLDiffusionTensorVolumeDisplayNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLDiffusionTensorVolumeDisplayNode.h Diff File
mod - Libs/MRML/Core/vtkMRMLScalarVolumeDisplayNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLScalarVolumeDisplayNode.h Diff File
mod - Libs/MRML/Core/vtkMRMLVectorVolumeDisplayNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLVectorVolumeDisplayNode.h Diff File
mod - Libs/MRML/Core/vtkMRMLVolumeDisplayNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLVolumeDisplayNode.h Diff File
mod - Libs/MRML/Logic/vtkMRMLSliceLayerLogic.cxx Diff File

master c355e705

2015-02-02 23:24:20

jcfr

Details Diff 		ENH: Use the latest vtkImageReslice filter instead of vtkImageResliceMask

Features:

* Performance optimization: about 2x speed increase in slice rendering
speed when the volume is linearly transformed (e.g., transformed MRHead
refresh rate 25fps -> 50fps)

* Thick slices, MIP, DRR, etc. display modes are available (no GUI yet,
but already can be enabled using Python), see the code samples below

Implementation:

* Convert composite transform to simple linear filter before setting it
in the reslice filter (because vtkImageResliceMask can do some additional
optimizations if it gets a simple linear transform)

* Use the latest vtkImageReslice filter instead of vtkImageResliceMask:
** mask output of vtkImageReslice is a stencil, therefore slice processing
pipeline is simplified: vtkImageCast filter is not needed anymore and
the more efficient vtkImageStencil is used instead of vtkImageMathematics
** custom vtkImageResliceMask class is removed: no need to maintain it
any longer, etc.

Thick slice:

sliceNode = slicer.mrmlScene.GetNodeByID('vtkMRMLSliceNodeRed')
appLogic = slicer.app.applicationLogic()
sliceLogic = appLogic.GetSliceLogic(sliceNode)
sliceLayerLogic = sliceLogic.GetBackgroundLayer()
reslice = sliceLayerLogic.GetReslice()
reslice.SetSlabModeToMean()
reslice.SetSlabNumberOfSlices(10)
reslice.SetSlabSliceSpacingFraction(0.3)
sliceNode.Modified()

Maximum intensity projection (MIP):

sliceNode = slicer.mrmlScene.GetNodeByID('vtkMRMLSliceNodeRed')
appLogic = slicer.app.applicationLogic()
sliceLogic = appLogic.GetSliceLogic(sliceNode)
sliceLayerLogic = sliceLogic.GetBackgroundLayer()
reslice = sliceLayerLogic.GetReslice()
reslice.SetSlabModeToMax()
reslice.SetSlabNumberOfSlices(600)
reslice.SetSlabSliceSpacingFraction(0.5)
sliceNode.Modified()

Conflicts:
Modules/Loadable/Volumes/Logic/vtkSlicerVolumesLogic.cxx

From: Andras Lasso <lasso@queensu.ca>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23942 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/CMakeLists.txt Diff File
mod - Libs/MRML/Core/vtkITKTransformConverter.h Diff File
mod - Libs/MRML/Core/vtkITKTransformInverse.h Diff File
rm - Libs/MRML/Core/vtkImageResliceMask.cxx Diff File
rm - Libs/MRML/Core/vtkImageResliceMask.h Diff File
mod - Libs/MRML/Core/vtkMRMLScalarVolumeDisplayNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLScalarVolumeDisplayNode.h Diff File
mod - Libs/MRML/Core/vtkMRMLTransformNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLTransformNode.h Diff File
mod - Libs/MRML/Core/vtkMRMLVolumeNode.cxx Diff File
mod - Libs/MRML/Logic/CMakeLists.txt Diff File
mod - Libs/MRML/Logic/Testing/Cxx/vtkMRMLSliceLayerLogicTest.cxx Diff File
mod - Libs/MRML/Logic/Testing/Cxx/vtkMRMLSliceLogicTest2.cxx Diff File
rm - Libs/MRML/Logic/vtkImageLinearReslice.cxx Diff File
rm - Libs/MRML/Logic/vtkImageLinearReslice.h Diff File
mod - Libs/MRML/Logic/vtkMRMLSliceLayerLogic.cxx Diff File
mod - Libs/MRML/Logic/vtkMRMLSliceLayerLogic.h Diff File
mod - Modules/Loadable/Volumes/Logic/vtkSlicerVolumesLogic.cxx Diff File

master b6bdebc5

2015-02-02 23:21:17

jcfr

Details Diff 		COMP: Fix VTKv5 build conditionally disabling DataProbe/Logic

When building against VTKv5, this commit partially revert Slicer r23675
to remove the need for class "vtkPVScalarBarActor" depending on VTKv6
features.

If fixes the compile error related to missing "vtkScalarBarActorInternal.h"

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

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

master 09a53309

2015-02-02 23:21:13

jcfr

Details Diff 		COMP: Build FiberTractMeasurements only if diffusion support is enabled

This commit fixes a build error ensuring that the module
FiberTractMeasurements first introduced in r23831 (ENH: Added first
implementation of FiberTractMeasurements CLI module) is build only
when needed.

Build error:

[...]
[ 34%] Built target vtkSlicerSubjectHierarchyModuleMRMLPythonD
/path/to/Slicer/Modules/CLI/FiberTractMeasurements/FiberTractMeasurements.cxx:23:36: fatal error: vtkMRMLFiberBundleNode.h: No such file or directory
#include <vtkMRMLFiberBundleNode.h>
[...]

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

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

master 7bf46439

2015-02-02 17:55:39

pinter

Details Diff 		ENH: Transfer referencedInstanceUIDs to the MRML attribute

If DICOM import plugin wants to store referenced instance UIDs, then it fills referencedInstanceUIDs attribute in the loadable. This commit makes sure this is transferred to the loaded subject hierarchy node so that the referenced nodes are highlighted in subject hierarchy.

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

master 1a4d9786

2015-02-02 17:39:08

pinter

Details Diff 		ENH: Highlight nodes in subject hierarchy referenced by DICOM

SOP instance UIDs are saved in subject hierarchy nodes in DICOMPlugin::addSeriesInSubjectHierarchy.
As long as this function is called from the DICOM import plugin to create subject hierarchy nodes for the loaded loadables, and the referencedInstanceUIDs attribute is filled in the loadable by the same plugin, the referenced nodes are highlighted in subject hierarchy when a node is selected.
For details see https://www.assembla.com/spaces/slicerrt/tickets/696

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23938 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/SubjectHierarchy/MRML/vtkMRMLSubjectHierarchyConstants.h Diff File
mod - Modules/Loadable/SubjectHierarchy/MRML/vtkMRMLSubjectHierarchyNode.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/MRML/vtkMRMLSubjectHierarchyNode.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSubjectHierarchyTreeView.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSubjectHierarchyTreeView.h Diff File
mod - Modules/Scripted/DICOMLib/DICOMPlugin.py Diff File
mod - Modules/Scripted/DICOMLib/Logic/vtkSlicerDICOMLoadable.cxx Diff File
mod - Modules/Scripted/DICOMLib/Logic/vtkSlicerDICOMLoadable.h Diff File
mod - Modules/Scripted/DICOMLib/Widgets/qSlicerDICOMLoadable.cxx Diff File
mod - Modules/Scripted/DICOMLib/Widgets/qSlicerDICOMLoadable.h Diff File

master a5bdfa58

2015-02-02 13:20:26

pinter

Details Diff 		BUG: Fixed crash in volumes logic due to uninitialized variable

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23937 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Volumes/Logic/vtkSlicerVolumesLogic.cxx Diff File

master 20f61bf3

2015-01-30 22:14:08

jcfr

Details Diff 		COMP: Update teem to allow configuration with CMake < 2.8.12.1

Thanks to the following community members for their investigation and
issue reports:
Anderle, Kristjan <K.Anderle@gsi.de>
Andras Lasso <lasso@queensu.ca>
Sharp, Gregory C. <GCSHARP@mgh.harvard.edu>
Steve Pieper <pieper@isomics.com>
Csaba Pinter <csaba.pinter@queensu.ca>
Matthew Woehlke <matthew.woehlke@kitware.com>
Christopher Mullins <christopher.mullins@kitware.com>

// ------------------
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: Fri Jan 30 22:00:50 2015 -0500

COMP: Prevent target double inclusion with older version of CMake

This commit fixes a regression introduced by Slicer/teem@e590e60c
(COMP: Build/Install modernization) where "export(TARGETS tee, ...)"
call has been introduced.

With older version of CMake, the generated target file didn't have the
multiple inclusion safe guard. Since this feature has been introduced
in CMake < 2.8.12.1 [1], this commit removes the existing
test and add a valid multiple inclusion guard.

[1] http://slicer-devel.65872.n3.nabble.com/Problems-with-building-Slicer-tp4033327p4033330.html
// ------------------

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

master b2603447

2015-01-30 22:14:07

jcfr

Details Diff 		STYLE: Display icon path associated with the launcher

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

master 9fe70aaf

2015-01-29 16:34:03

naucoin

Details Diff 		BUG: avoid false positives on geometry check

Add an epsilon value to the volumes logic and use it in the fuzzy compare instead
of the VTK default value. Add a precision calculation from the epsilon so that
any warning messages are printed out with the same precision as was used to
check the values.
Added a sanity check to see if the smallest volume spacing is within 3-10 orders
of magnitude of epsilon and print a warning if not.
Use a copy of the CTK significant decimals utility method to calculate the
precision with which to display differences in compared volumes.
Use a copy of the CTK order of magnitude utility method to compare the
spacing of the volumes with the current epsilon being used to
check them.
To avoid CTK includes which pull in a dependency on Qt, rehome the CTK
core utility methods here in the anonymous namespace until they get ported
to VTK. Reimplemented significantDecimals and orderOfMagnitude using standard
strings and stringstreams rather than Qt strings.
Added a python test to exercise the epsilon, precision and geometry check.

TBD: GUI for setting epsilon or just always use a volume spacing based value.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23934 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Volumes/Logic/vtkSlicerVolumesLogic.cxx Diff File
mod - Modules/Loadable/Volumes/Logic/vtkSlicerVolumesLogic.h Diff File
mod - Modules/Loadable/Volumes/Testing/Python/CMakeLists.txt Diff File
add - Modules/Loadable/Volumes/Testing/Python/VolumesLogicCompareVolumeGeometry.py Diff File

master 1e495954

2015-01-29 03:54:15

jcfr

Details Diff 		ENH: Extend volume rendering logic API adding GetPresetByName function

This commit add a convenience function allowing to retrieve a volume
rendering preset given its name.

Co-authored-by: Sergey Aleshin <4memph@gmail.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23933 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/VolumeRendering/Logic/Testing/Cxx/vtkSlicerVolumeRenderingLogicTest.cxx Diff File
mod - Modules/Loadable/VolumeRendering/Logic/vtkSlicerVolumeRenderingLogic.cxx Diff File
mod - Modules/Loadable/VolumeRendering/Logic/vtkSlicerVolumeRenderingLogic.h Diff File

master 07784683

2015-01-29 02:25:13

jcfr

Details Diff 		ENH: Associate loaded node IDs with core IOManager newFileLoaded signal

This commit generalizes the usage of the signal originally added
in r20685 (ENH: Adds 'Recently Loaded' File menu entry) by allowing
client code to know the list of node IDs associated with a file.

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

master 7a076df1

2015-01-28 23:16:24

jcfr

Details Diff 		STYLE: Fixed typos in doxygen comments

From: Sergey Aleshin <4memph@gmail.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23931 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTGUI/qSlicerModuleSelectorToolBar.h Diff File
mod - Libs/MRML/Core/vtkEventBroker.cxx Diff File
mod - Libs/MRML/Core/vtkEventBroker.h Diff File
mod - Libs/MRML/Core/vtkMRMLNode.h Diff File
mod - Libs/MRML/Core/vtkMRMLScene.h Diff File
mod - Libs/MRML/DisplayableManager/vtkMRMLDisplayableManagerFactory.h Diff File
mod - Libs/MRML/DisplayableManager/vtkMRMLDisplayableManagerGroup.h Diff File

master d025dd56

2015-01-28 23:16:20

jcfr

Details Diff 		COMP: Add missing definition for qMRMLThreeDWidget::threeDController

From: Sergey Aleshin <4memph@gmail.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23930 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Widgets/qMRMLThreeDWidget.cxx Diff File
 First  Prev  1 2 3 ... 10 ... 20 ... 30 ... 40 ... 50 ... 60 ... 70 ... 80 ... 82 83 84 85 86 87 88 ... 90 ... 100 ... 110 ... 120 ... 130 ... 133 134 135  Next  Last