Commit 7ad3516d authored by Emmanuel Promayon's avatar Emmanuel Promayon

Merge branch 'release-4.0.0'

CamiTK 4.0.0 release
parents f2ca47fa 3de5ddd1
......@@ -3,7 +3,7 @@
# CamiTK Open Source CEP Set
#
#--------------------------------------------
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 3.0)
project(camitkopensource)
......@@ -33,6 +33,9 @@ set(CAMITK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
include(camitk/packaging/CamiTKOpenSourcePackaging)
camitk_opensource_packaging()
# CamiTK 4.0 is C++11 compliant
set(CMAKE_CXX_FLAGS "-std=c++11")
# Specific to SDK: first compile the SDK (it looks like a CEP but is sooooo special...)
add_subdirectory(sdk)
......@@ -48,7 +51,4 @@ if(CAMITK_BINDING_PYTHON)
add_subdirectory(python_sdk)
endif()
camitk_sub_project_validate(CEP_SET)
$CAMITK_LICENCE_BEGIN$
CamiTK - Computer Assisted Medical Intervention ToolKit
(c) 2001-2014 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
(c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
Visit http://camitk.imag.fr for more information
......
#--------------------------------------------
# Imaging extension project
#--------------------------------------------
cmake_minimum_required(VERSION 2.6)
# Mini find CamiTK inside SDK
set(CAMITK_DIR ${CMAKE_BINARY_DIR})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CAMITK_DIR}/share/${CAMITK_SHORT_VERSION_STRING}/cmake)
......
$CAMITK_LICENCE_BEGIN$
CamiTK - Computer Assisted Medical Intervention ToolKit
(c) 2001-2013 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
(c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
Visit http://camitk.imag.fr for more information
......
......@@ -239,7 +239,6 @@ vtkSmartPointer<vtkImageData> AnisotropicDiffusion::itkProcessGradientAnisotropi
resultImage->GetExtent(extent);
result->SetExtent(extent);
result->DeepCopy(resultImage);
result->Update();
// Set CamiTK progress bar back to zero (the processing filter is over)
observer->Reset();
......@@ -336,7 +335,6 @@ vtkSmartPointer<vtkImageData> AnisotropicDiffusion::itkProcessCurvatureAnisotrop
resultImage->GetExtent(extent);
result->SetExtent(extent);
result->DeepCopy(resultImage);
result->Update();
// Set CamiTK progress bar back to zero (the processing filter is over)
observer->Reset();
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
......
......@@ -201,7 +201,6 @@ vtkSmartPointer<vtkImageData> CannyEdgeDetection::itkProcess(vtkSmartPointer<vtk
resultImage->GetExtent(extent);
result->SetExtent(extent);
result->DeepCopy(resultImage);
result->Update();
// Set CamiTK progress bar back to zero (the processing filter is over)
observer->Reset();
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
......
......@@ -153,7 +153,6 @@ vtkSmartPointer<vtkImageData> ConnectedComponents::itkProcess(vtkSmartPointer<vt
resultImage->GetExtent(extent);
filteredImage->SetExtent(extent);
filteredImage->DeepCopy(resultImage);
filteredImage->Update();
observer->Reset();
observerRelabel->Reset();
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
......
......@@ -211,8 +211,7 @@ vtkSmartPointer<vtkImageData> Derivative::itkProcess(vtkSmartPointer<vtkImageDat
resultImage->GetExtent(extent);
result->SetExtent(extent);
result->DeepCopy(resultImage);
result->Update();
// Set CamiTK progress bar back to zero (the processing filter is over)
observer->Reset();
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
......
......@@ -211,7 +211,6 @@ vtkSmartPointer<vtkImageData> GaussianFilter::itkProcessStandardGaussian(vtkSmar
resultImage->GetExtent(extent);
result->SetExtent(extent);
result->DeepCopy(resultImage);
result->Update();
observerCast->Reset();
observerBlur->Reset();
......@@ -320,7 +319,6 @@ vtkSmartPointer<vtkImageData> GaussianFilter::itkProcessIIRGaussian(vtkSmartPoin
resultImage->GetExtent(extent);
imageCopy->SetExtent(extent);
imageCopy->DeepCopy(resultImage);
imageCopy->Update();
observerX->Reset();
observerY->Reset();
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
......
......@@ -140,7 +140,6 @@ vtkSmartPointer<vtkImageData> GradientMagnitude::itkProcess(vtkSmartPointer<vtkI
resultImage->GetExtent(extent);
result->SetExtent(extent);
result->DeepCopy(resultImage);
result->Update();
// Set CamiTK progress bar back to zero (the processing filter is over)
observer->Reset();
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
......
......@@ -165,7 +165,6 @@ vtkSmartPointer<vtkImageData> GradientMagnitudeRecursiveGaussian::itkProcess(vtk
resultImage->GetExtent(extent);
result->SetExtent(extent);
result->DeepCopy(resultImage);
result->Update();
// Set CamiTK progress bar back to zero (the processing filter is over)
observer->Reset();
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
......
......@@ -40,9 +40,6 @@
#include "ConnectedComponents.h"
// --------------- declare the extension -------------------
Q_EXPORT_PLUGIN2(itkfiltersextension, ITKFiltersExtension);
// --------------- getActions -------------------
void ITKFiltersExtension::init() {
registerNewAction(CannyEdgeDetection);
......
......@@ -37,14 +37,15 @@
**/
class ITKFiltersExtension : public camitk::ActionExtension {
Q_OBJECT
Q_INTERFACES(camitk::ActionExtension);
Q_INTERFACES(camitk::ActionExtension)
Q_PLUGIN_METADATA(IID "fr.imag.camitk.imaging.action.itkfilters")
public:
/// the constructor
ITKFiltersExtension() : ActionExtension() {};
ITKFiltersExtension() : ActionExtension() {}
/// the destructor
virtual ~ITKFiltersExtension() {};
virtual ~ITKFiltersExtension() {}
/// Method that return the action extension name
virtual QString getName() {
......
......@@ -186,7 +186,6 @@ vtkSmartPointer<vtkImageData> Laplacian::itkProcess(vtkSmartPointer<vtkImageData
resultImage->GetExtent(extent);
result->SetExtent(extent);
result->DeepCopy(resultImage);
result->Update();
// Set CamiTK progress bar back to zero (the processing filter is over)
observer->Reset();
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
......
......@@ -181,7 +181,6 @@ vtkSmartPointer<vtkImageData> LaplacianRecursiveGaussian::itkProcess(vtkSmartPoi
resultImage->GetExtent(extent);
result->SetExtent(extent);
result->DeepCopy(resultImage);
result->Update();
// Set CamiTK progress bar back to zero (the processing filter is over)
observer->Reset();
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
......
......@@ -137,7 +137,6 @@ vtkSmartPointer<vtkImageData> LaplacianSharpening::itkProcess(vtkSmartPointer<vt
resultImage->GetExtent(extent);
result->SetExtent(extent);
result->DeepCopy(resultImage);
result->Update();
// Set CamiTK progress bar back to zero (the processing filter is over)
observer->Reset();
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
......
......@@ -186,7 +186,6 @@ vtkSmartPointer<vtkImageData> MeanFilter::itkProcess(vtkSmartPointer<vtkImageDat
resultImage->GetExtent(extent);
result->SetExtent(extent);
result->DeepCopy(resultImage);
result->Update();
// Set CamiTK progress bar back to zero (the processing filter is over)
observer->Reset();
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
......
......@@ -189,7 +189,6 @@ vtkSmartPointer<vtkImageData> MedianFilter::itkProcess(vtkSmartPointer<vtkImageD
resultImage->GetExtent(extent);
result->SetExtent(extent);
result->DeepCopy(resultImage);
result->Update();
// Set CamiTK progress bar back to zero (the processing filter is over)
observer->Reset();
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
......
......@@ -247,7 +247,6 @@ vtkSmartPointer<vtkImageData> MorphologicalOperators::binaryErosionFilter(vtkSma
resultImage->GetExtent(extent);
filteredImage->SetExtent(extent);
filteredImage->DeepCopy(resultImage);
filteredImage->Update();
observer->Reset();
observer = NULL;
......@@ -313,7 +312,6 @@ vtkSmartPointer<vtkImageData> MorphologicalOperators::binaryDilationFilter(vtkSm
resultImage->GetExtent(extent);
filteredImage->SetExtent(extent);
filteredImage->DeepCopy(resultImage);
filteredImage->Update();
observer->Reset();
observer = NULL;
......@@ -390,7 +388,6 @@ vtkSmartPointer<vtkImageData> MorphologicalOperators::binaryClosureFilter(vtkSma
resultImage->GetExtent(extent);
filteredImage->SetExtent(extent);
filteredImage->DeepCopy(resultImage);
filteredImage->Update();
observerErosion->Reset();
observerDilation->Reset();
......@@ -471,7 +468,6 @@ vtkSmartPointer<vtkImageData> MorphologicalOperators::binaryOpeningFilter(vtkSma
resultImage->GetExtent(extent);
filteredImage->SetExtent(extent);
filteredImage->DeepCopy(resultImage);
filteredImage->Update();
observerErosion->Reset();
observerDilation->Reset();
......@@ -541,7 +537,6 @@ vtkSmartPointer<vtkImageData> MorphologicalOperators::greyLevelErosionFilter(vtk
resultImage->GetExtent(extent);
filteredImage->SetExtent(extent);
filteredImage->DeepCopy(resultImage);
filteredImage->Update();
observer->Reset();
observer = NULL;
......@@ -608,7 +603,6 @@ vtkSmartPointer<vtkImageData> MorphologicalOperators::greyLevelDilationFilter(vt
resultImage->GetExtent(extent);
filteredImage->SetExtent(extent);
filteredImage->DeepCopy(resultImage);
filteredImage->Update();
observer->Reset();
observer = NULL;
......@@ -684,7 +678,6 @@ vtkSmartPointer<vtkImageData> MorphologicalOperators::greyLevelClosureFilter(vtk
resultImage->GetExtent(extent);
filteredImage->SetExtent(extent);
filteredImage->DeepCopy(resultImage);
filteredImage->Update();
observerErosion->Reset();
observerDilation->Reset();
......@@ -763,7 +756,6 @@ vtkSmartPointer<vtkImageData> MorphologicalOperators::greyLevelOpeningFilter(vtk
resultImage->GetExtent(extent);
filteredImage->SetExtent(extent);
filteredImage->DeepCopy(resultImage);
filteredImage->Update();
observerErosion->Reset();
observerDilation->Reset();
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
......
......@@ -182,7 +182,6 @@ vtkSmartPointer<vtkImageData> SobelEdgeDetection::itkProcess(vtkSmartPointer<vtk
resultImage->GetExtent(extent);
result->SetExtent(extent);
result->DeepCopy(resultImage);
result->Update();
// Set CamiTK progress bar back to zero (the processing filter is over)
observer->Reset();
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
......
......@@ -30,9 +30,6 @@
#include "ManualThreshold.h"
#include "RegionGrowing.h"
// --------------- declare the extension -------------------
Q_EXPORT_PLUGIN2(itksegmentationextension, ITKSegmentationExtension);
// --------------- getActions -------------------
void ITKSegmentationExtension::init() {
registerNewAction(OtsuFilter);
......
......@@ -37,7 +37,8 @@
**/
class ITKSegmentationExtension : public camitk::ActionExtension {
Q_OBJECT
Q_INTERFACES(camitk::ActionExtension);
Q_INTERFACES(camitk::ActionExtension)
Q_PLUGIN_METADATA(IID "fr.imag.camitk.imaging.action.itksegmentation")
public:
/// the constructor
......
......@@ -162,7 +162,6 @@ vtkSmartPointer<vtkImageData> ManualThreshold::itkProcess(vtkSmartPointer<vtkIma
resultImage->GetExtent(extent);
result->SetExtent(extent);
result->DeepCopy(resultImage);
result->Update();
// Set CamiTK progress bar back to zero (the processing filter is over)
observer->Reset();
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
......
......@@ -328,7 +328,6 @@ vtkSmartPointer<vtkImageData> OtsuFilter::itkProcess(vtkSmartPointer<vtkImageDat
resultImage->GetExtent(extent);
result->SetExtent(extent);
result->DeepCopy(resultImage);
result->Update();
// Set CamiTK progress bar back to zero (the processing filter is over)
observer->Reset();
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
......
......@@ -243,7 +243,6 @@ vtkSmartPointer<vtkImageData> RegionGrowing::itkProcess(vtkSmartPointer<vtkImage
resultImage->GetExtent(extent);
result->SetExtent(extent);
result->DeepCopy(resultImage);
result->Update();
return result;
}
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
......
......@@ -110,7 +110,7 @@ DicomComponent::DicomComponent(DicomSerie* dicomSerie) throw(AbortException) : I