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 ae72f936 authored by saubatn's avatar saubatn
Browse files

UPDATED Compilation of CamiTK SDK + Imaging (+ Modeling) ok.

parent 03b15d50
......@@ -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();
......
......@@ -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();
......
......@@ -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();
......
......@@ -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();
......
......@@ -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();
......
......@@ -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();
......
......@@ -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();
......
......@@ -40,9 +40,6 @@
#include "ConnectedComponents.h"
// --------------- declare the extension -------------------
Q_EXPORT_PLUGIN2(itkfiltersextension, ITKFiltersExtension);
// --------------- getActions -------------------
void ITKFiltersExtension::init() {
registerNewAction(CannyEdgeDetection);
......
......@@ -37,7 +37,8 @@
**/
class ITKFiltersExtension : public camitk::ActionExtension {
Q_OBJECT
Q_INTERFACES(camitk::ActionExtension);
Q_INTERFACES(camitk::ActionExtension)
Q_PLUGIN_METADATA(IID "fr.imag.camitk.action.itkfilters")
public:
/// the constructor
......
......@@ -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();
......
......@@ -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();
......
......@@ -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();
......
......@@ -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();
......
......@@ -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();
......
......@@ -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();
......
......@@ -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();
......
......@@ -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.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();
......
......@@ -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();
......
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