Merge branch 'release-4.0.0'

CamiTK 4.0.0 release

CMakeLists.txt

@@ -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)
-

COPYRIGHT

 $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/CMakeLists.txt

 #--------------------------------------------
 # 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)

imaging/COPYRIGHT

 $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
 

imaging/actions/itkfilters/AnisotropicDiffusion.cpp

@@ -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();

imaging/actions/itkfilters/AnisotropicDiffusion.impl

@@ -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
  *

imaging/actions/itkfilters/CannyEdgeDetection.cpp

@@ -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();

imaging/actions/itkfilters/CannyEdgeDetection.impl

@@ -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
  *

imaging/actions/itkfilters/ConnectedComponents.cpp

@@ -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();

imaging/actions/itkfilters/ConnectedComponents.impl

@@ -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
  *

imaging/actions/itkfilters/Derivative.cpp

@@ -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();
 

imaging/actions/itkfilters/Derivative.impl

@@ -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
  *

imaging/actions/itkfilters/GaussianFilter.cpp

@@ -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();

imaging/actions/itkfilters/GaussianFilter.impl

@@ -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
  *

imaging/actions/itkfilters/GradientMagnitude.cpp

@@ -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();

imaging/actions/itkfilters/GradientMagnitude.impl

@@ -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
  *

imaging/actions/itkfilters/GradientMagnitudeRecursiveGaussian.cpp

@@ -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();

imaging/actions/itkfilters/GradientMagnitudeRecursiveGaussian.impl

@@ -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
  *

imaging/actions/itkfilters/ITKFiltersExtension.cpp

@@ -40,9 +40,6 @@
 #include "ConnectedComponents.h"
 
 
-// --------------- declare the extension -------------------
-Q_EXPORT_PLUGIN2(itkfiltersextension, ITKFiltersExtension);
-
 // --------------- getActions -------------------
 void ITKFiltersExtension::init() {
     registerNewAction(CannyEdgeDetection);

imaging/actions/itkfilters/ITKFiltersExtension.h

@@ -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() {