Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CamiTK
CamiTK Community Edition
Commits
7ad3516d
Commit
7ad3516d
authored
Mar 31, 2016
by
Emmanuel Promayon
Browse files
Merge branch 'release-4.0.0'
CamiTK 4.0.0 release
parents
f2ca47fa
3de5ddd1
Changes
488
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
7ad3516d
...
...
@@ -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
View file @
7ad3516d
$CAMITK_LICENCE_BEGIN$
CamiTK - Computer Assisted Medical Intervention ToolKit
(c) 2001-201
4
U
JF-
Grenoble
1
, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
(c) 2001-201
6
U
niv.
Grenoble
Alpes
, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
Visit http://camitk.imag.fr for more information
...
...
imaging/CMakeLists.txt
View file @
7ad3516d
#--------------------------------------------
# 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
View file @
7ad3516d
$CAMITK_LICENCE_BEGIN$
CamiTK - Computer Assisted Medical Intervention ToolKit
(c) 2001-201
3
U
JF-
Grenoble
1
, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
(c) 2001-201
6
U
niv.
Grenoble
Alpes
, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
Visit http://camitk.imag.fr for more information
...
...
imaging/actions/itkfilters/AnisotropicDiffusion.cpp
View file @
7ad3516d
...
...
@@ -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
View file @
7ad3516d
...
...
@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-201
2
U
JF-
Grenoble
1
, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-201
6
U
niv.
Grenoble
Alpes
, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
...
...
imaging/actions/itkfilters/CannyEdgeDetection.cpp
View file @
7ad3516d
...
...
@@ -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
View file @
7ad3516d
...
...
@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-201
2
U
JF-
Grenoble
1
, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-201
6
U
niv.
Grenoble
Alpes
, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
...
...
imaging/actions/itkfilters/ConnectedComponents.cpp
View file @
7ad3516d
...
...
@@ -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
View file @
7ad3516d
...
...
@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-201
2
U
JF-
Grenoble
1
, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-201
6
U
niv.
Grenoble
Alpes
, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
...
...
imaging/actions/itkfilters/Derivative.cpp
View file @
7ad3516d
...
...
@@ -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
View file @
7ad3516d
...
...
@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-201
2
U
JF-
Grenoble
1
, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-201
6
U
niv.
Grenoble
Alpes
, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
...
...
imaging/actions/itkfilters/GaussianFilter.cpp
View file @
7ad3516d
...
...
@@ -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
View file @
7ad3516d
...
...
@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-201
2
U
JF-
Grenoble
1
, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-201
6
U
niv.
Grenoble
Alpes
, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
...
...
imaging/actions/itkfilters/GradientMagnitude.cpp
View file @
7ad3516d
...
...
@@ -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
View file @
7ad3516d
...
...
@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-201
2
U
JF-
Grenoble
1
, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-201
6
U
niv.
Grenoble
Alpes
, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
...
...
imaging/actions/itkfilters/GradientMagnitudeRecursiveGaussian.cpp
View file @
7ad3516d
...
...
@@ -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
View file @
7ad3516d
...
...
@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-201
2
U
JF-
Grenoble
1
, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
* (c) 2001-201
6
U
niv.
Grenoble
Alpes
, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
...
...
imaging/actions/itkfilters/ITKFiltersExtension.cpp
View file @
7ad3516d
...
...
@@ -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
View file @
7ad3516d
...
...
@@ -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
()
{
...
...
Prev
1
2
3
4
5
…
25
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment