Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit dbff05f5 authored by jean-loup's avatar jean-loup
Browse files

Rename due to the manipulation error

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@2279 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 9d8fafaa
......@@ -30,7 +30,7 @@ set(CAMITK_EXTENSION_PROJECT_SET_NAME "camitk-opensource" CACHE STRING "CEP Set
# Must be done before parsing extensions CMakeLists.txt files.
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/sdk/cmake/modules/macros)
set(CAMITK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
include(CamiTKOpenSourcePackaging)
include(camitk/packaging/CamiTKOpenSourcePackaging)
camitk_opensource_packaging()
# Specific to SDK: first compile the SDK (it looks like a CEP but is sooooo special...)
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2016 Univ. Grenoble Alpes, 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
*
......@@ -122,10 +122,10 @@ void AnisotropicDiffusion::process(ImageComponent * comp) {
QString newName;
QTextStream(&newName) << comp->getName() << "_anisoDiff";
ImageComponent* outputComp = new ImageComponent(outputImage, newName);
// consider frame policy on new image created
Action::applyTargetPosition(comp, outputComp);
Application::refresh();
}
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2016 Univ. Grenoble Alpes, 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
*
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2016 Univ. Grenoble Alpes, 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
*
......@@ -103,10 +103,10 @@ void CannyEdgeDetection::process(ImageComponent * comp) {
QString newName;
QTextStream(&newName) << comp->getName() << "_edges";
ImageComponent* outputComp = new ImageComponent(outputImage, newName);
// consider frame policy on new image created
Action::applyTargetPosition(comp, outputComp);
Application::refresh();
}
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2016 Univ. Grenoble Alpes, 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
*
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2016 Univ. Grenoble Alpes, 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
*
......@@ -83,10 +83,10 @@ void ConnectedComponents::process(ImageComponent * comp) {
QString newName;
QTextStream(&newName) << comp->getName() << "_cc";
ImageComponent* outputComp = new ImageComponent(outputImage, newName);
// consider frame policy on new image created
Action::applyTargetPosition(comp, outputComp);
Application::refresh();
}
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2016 Univ. Grenoble Alpes, 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
*
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2016 Univ. Grenoble Alpes, 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
*
......@@ -117,10 +117,10 @@ void Derivative::process(ImageComponent * comp) {
QString newName;
QTextStream(&newName) << comp->getName() << "_processed";
ImageComponent* outputComp = new ImageComponent(outputImage, newName);
// consider frame policy on new image created
Action::applyTargetPosition(comp, outputComp);
Application::refresh();
}
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2016 Univ. Grenoble Alpes, 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
*
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2016 Univ. Grenoble Alpes, 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
*
......@@ -65,7 +65,7 @@ GaussianFilter::GaussianFilter(ActionExtension * extension) : Action(extension)
varianceProperty->setAttribute("minimum", 0);
varianceProperty->setAttribute("maximum", 100);
varianceProperty->setAttribute("singleStep", 0.001);
varianceProperty->setAttribute("decimals", 3);
varianceProperty->setAttribute("decimals", 3);
addParameter(varianceProperty);
Property* gaussianTypeProperty = new Property(tr("Gaussian Type"), STANDARD, tr("Choose the type of kernel for the gaussian filtering"), "");
......@@ -76,7 +76,7 @@ GaussianFilter::GaussianFilter(ActionExtension * extension) : Action(extension)
addParameter(gaussianTypeProperty);
Property* useImageSpacingProperty = new Property(tr("Use Image Spacing"), true, tr("The variance or standard deviation (sigma) will be evaluated as pixel units if this is off or as physical units if this is on."), "");
addParameter(useImageSpacingProperty);
addParameter(useImageSpacingProperty);
}
......@@ -110,10 +110,10 @@ void GaussianFilter::process(ImageComponent * comp) {
QString newName;
QTextStream(&newName) << comp->getName() << "_gaussian";
ImageComponent* outputComp = new ImageComponent(outputImage, newName);
// consider frame policy on new image created
Action::applyTargetPosition(comp, outputComp);
Application::refresh();
}
......@@ -132,8 +132,8 @@ vtkSmartPointer<vtkImageData> GaussianFilter::itkProcess(vtkSmartPointer<vtkImag
case GaussianFilter::RECURSIVE_IIR:
outputImage = itkProcessIIRGaussian<InputPixelType, OutputPixelType, dim>(img);
break;
default:
break;
default:
break;
}
return outputImage;
......@@ -192,7 +192,7 @@ vtkSmartPointer<vtkImageData> GaussianFilter::itkProcessStandardGaussian(vtkSmar
filter->SetInput( castFilter->GetOutput());
filter->AddObserver( itk::ProgressEvent(), observerBlur );
filter->SetVariance( this->variance );
filter->SetUseImageSpacing( property("Use Image Spacing").toBool() );
filter->SetUseImageSpacing( property("Use Image Spacing").toBool() );
rescaleFilter->SetInput(filter->GetOutput());
rescaleFilter->AddObserver( itk::ProgressEvent(), observerRescale );
......@@ -217,13 +217,13 @@ vtkSmartPointer<vtkImageData> GaussianFilter::itkProcessStandardGaussian(vtkSmar
observerBlur->Reset();
observerRescale->Reset();
observerBlur = NULL;
observerCast = NULL;
observerRescale = NULL;
observerBlur = NULL;
observerCast = NULL;
observerRescale = NULL;
castFilter = NULL;
filter = NULL;
rescaleFilter = NULL;
castFilter = NULL;
filter = NULL;
rescaleFilter = NULL;
return result;
}
......@@ -326,10 +326,10 @@ vtkSmartPointer<vtkImageData> GaussianFilter::itkProcessIIRGaussian(vtkSmartPoin
observerY->Reset();
observerZ->Reset();
// Set CamiTK progress bar back to zero (the processing filter is over)
observerX = NULL;
observerY = NULL;
observerZ = NULL;
// Set CamiTK progress bar back to zero (the processing filter is over)
observerX = NULL;
observerY = NULL;
observerZ = NULL;
return imageCopy;
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2016 Univ. Grenoble Alpes, 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
*
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2016 Univ. Grenoble Alpes, 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
*
......@@ -71,12 +71,12 @@ void GradientMagnitude::process(ImageComponent * comp) {
vtkSmartPointer<vtkImageData> outputImage = implementProcess (inputImage);
QString newName;
QTextStream(&newName) << comp->getName() << "_gradient";
ImageComponent* outputComp = new ImageComponent(outputImage, newName);
// consider frame policy on new image created
Action::applyTargetPosition(comp, outputComp);
Application::refresh();
}
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2016 Univ. Grenoble Alpes, 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
*
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2016 Univ. Grenoble Alpes, 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
*
......@@ -95,12 +95,12 @@ void GradientMagnitudeRecursiveGaussian::process(ImageComponent * comp) {
vtkSmartPointer<vtkImageData> outputImage = implementProcess (inputImage);
QString newName;
QTextStream(&newName) << comp->getName() << "_smoothedGradient";
ImageComponent* outputComp = new ImageComponent(outputImage, newName);
// consider frame policy on new image created
Action::applyTargetPosition(comp, outputComp);
Application::refresh();
}
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2016 Univ. Grenoble Alpes, 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
*
......
#if defined(_WIN32) // MSVC and mingw
#ifdef COMPILE_ITKFILTER_API
#define ITKFILTER_API __declspec(dllexport)
#else
#define ITKFILTER_API __declspec(dllimport)
#endif // COMPILE_MY_COMPONENT_API
#ifdef COMPILE_ITKFILTER_API
#define ITKFILTER_API __declspec(dllexport)
#else
#define ITKFILTER_API __declspec(dllimport)
#endif // COMPILE_MY_COMPONENT_API
#else // for all other platforms ITKFILTER_API is defined to be "nothing"
#define ITKFILTER_API
#define ITKFILTER_API
#endif // MSVC and mingw
\ No newline at end of file
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2016 Univ. Grenoble Alpes, 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
*
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2016 Univ. Grenoble Alpes, 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
*
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2016 Univ. Grenoble Alpes, 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
*
......@@ -89,12 +89,12 @@ void Laplacian::process(ImageComponent * comp) {
vtkSmartPointer<vtkImageData> outputImage = implementProcess (inputImage);
QString newName;
QTextStream(&newName) << comp->getName() << "_laplacian";
ImageComponent* outputComp = new ImageComponent(outputImage, newName);
// consider frame policy on new image created
Action::applyTargetPosition(comp, outputComp);
Application::refresh();
}
......
......@@ -2,7 +2,7 @@
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2016 Univ. Grenoble Alpes, 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
*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment