X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=plugins%2FPlugins%2FSimpleImageDijkstraCost.cxx;h=dbd3f7e1e3aa8d9c6c7023e89c318f6d5587999e;hb=3e69c5942ef8dd71c4e25da906eac97ffb63a79d;hp=6557a7f07fbf09688c24b5037b381e1d2b57e9c2;hpb=ea46079b5aef76c1782648ed23e70ea944649635;p=FrontAlgorithms.git

diff --git a/plugins/Plugins/SimpleImageDijkstraCost.cxx b/plugins/Plugins/SimpleImageDijkstraCost.cxx
index 6557a7f..dbd3f7e 100644
--- a/plugins/Plugins/SimpleImageDijkstraCost.cxx
+++ b/plugins/Plugins/SimpleImageDijkstraCost.cxx
@@ -1,8 +1,9 @@
-#include <plugins/Plugins/SimpleImageDijkstraCost.h>
-#include <cpPlugins/DataObjects/Image.h>
+#include <Plugins/SimpleImageDijkstraCost.h>
+#include <cpInstances/Image.h>
+#include <cpInstances/Image_Demanglers.h>
 
+#include <itkImage.h>
 #include <fpa/Image/Functors/SimpleDijkstraCost.h>
-#include <fpa/Image/Functors/SimpleDijkstraCost.hxx>
 
 // -------------------------------------------------------------------------
 fpaPlugins::SimpleImageDijkstraCost::
@@ -10,7 +11,7 @@ SimpleImageDijkstraCost( )
   : Superclass( )
 {
   typedef cpPlugins::BaseObjects::DataObject _TData;
-  typedef cpPlugins::DataObjects::Image _TImage;
+  typedef cpInstances::Image _TImage;
 
   this->_ConfigureInput< _TImage >( "Input", true, false );
   this->_ConfigureOutput< _TData >( "Output" );
@@ -19,10 +20,8 @@ SimpleImageDijkstraCost( )
   choices.push_back( "float" );
   choices.push_back( "double" );
   this->m_Parameters.ConfigureAsChoices( "ResultType", choices );
-  this->m_Parameters.ConfigureAsBool( "UseImageSpacing" );
-
   this->m_Parameters.SetSelectedChoice( "ResultType", "float" );
-  this->m_Parameters.SetBool( "UseImageSpacing", false );
+  this->m_Parameters.ConfigureAsBool( "UseImageSpacing", false );
 }
 
 // -------------------------------------------------------------------------
@@ -36,8 +35,8 @@ void fpaPlugins::SimpleImageDijkstraCost::
 _GenerateData( )
 {
   auto o = this->GetInputData( "Input" );
-  cpPlugins_Demangle_ImageScalars_Dims( o, _GD0 );
-  else this->_Error( "Invalid input image." );
+  cpPlugins_Demangle_Image_ScalarPixels_AllDims_1( o, _GD0 )
+    this->_Error( "Invalid input image." );
 }
 
 // -------------------------------------------------------------------------